[pull] master from gregkh:master

arch/parisc/include/asm/pdcpat.h

@@ -179,6 +179,7 @@
 #define PDC_PAT_PD		74L         /* Protection Domain Info   */
 #define PDC_PAT_PD_GET_ADDR_MAP		0L  /* Get Address Map          */
 #define PDC_PAT_PD_GET_PDC_INTERF_REV	1L  /* Get PDC Interface Revisions */
+#define PDC_PAT_PD_GET_PLATFORM_COUNTER	10L /* Get 64-bit free running counter */
 
 #define PDC_PAT_CAPABILITY_BIT_PDC_SERIALIZE	(1UL << 0)
 #define PDC_PAT_CAPABILITY_BIT_PDC_POLLING	(1UL << 1)
@@ -373,9 +374,11 @@ extern int pdc_pat_pd_get_addr_map(unsigned long *actual_len, void *mem_addr,
 		unsigned long count, unsigned long offset);
 extern int pdc_pat_pd_get_pdc_revisions(unsigned long *legacy_rev,
 		unsigned long *pat_rev, unsigned long *pdc_cap);
+extern int pdc_pat_pd_get_platform_counter(uint64_t **addr,
+		unsigned long *freq, unsigned long *uniq);
 
-extern int pdc_pat_io_pci_cfg_read(unsigned long pci_addr, int pci_size, u32 *val); 
-extern int pdc_pat_io_pci_cfg_write(unsigned long pci_addr, int pci_size, u32 val); 
+extern int pdc_pat_io_pci_cfg_read(unsigned long pci_addr, int pci_size, u32 *val);
+extern int pdc_pat_io_pci_cfg_write(unsigned long pci_addr, int pci_size, u32 val);
 
 extern int pdc_pat_mem_pdt_info(struct pdc_pat_mem_retinfo *rinfo);
 extern int pdc_pat_mem_pdt_cell_info(struct pdc_pat_mem_cell_pdt_retinfo *rinfo,

arch/parisc/kernel/drivers.c

@@ -435,7 +435,7 @@ static struct parisc_device * __init create_tree_node(char id,
 	dev->dev.dma_mask = &dev->dma_mask;
 	dev->dev.coherent_dma_mask = dev->dma_mask;
 	if (device_register(&dev->dev)) {
-		kfree(dev);
+		put_device(&dev->dev);
 		return NULL;
 	}
 
@@ -916,14 +916,18 @@ static __init void qemu_header(void)
 {
 	int num;
 	unsigned long *p;
+	char name_mpe[80];
 
 	pr_info("--- cut here ---\n");
 	pr_info("/* AUTO-GENERATED HEADER FILE FOR SEABIOS FIRMWARE */\n");
 	pr_cont("/* generated with Linux kernel */\n");
 	pr_cont("/* search for PARISC_QEMU_MACHINE_HEADER in Linux */\n\n");
 
-	pr_info("#define PARISC_MODEL \"%s\"\n\n",
+	pr_info("#define PARISC_MODEL     \"%s\"\n",
 			boot_cpu_data.pdc.sys_model_name);
+	strcpy(name_mpe, boot_cpu_data.pdc.sys_model_name);
+	pdc_model_sysmodel(OS_ID_MPEXL, name_mpe);
+	pr_info("#define PARISC_MODEL_MPE \"%s\"\n\n", name_mpe);
 
 	#define p ((unsigned long *)&boot_cpu_data.pdc.model)
 	pr_info("#define PARISC_PDC_MODEL 0x%lx, 0x%lx, 0x%lx, "
@@ -1036,14 +1040,14 @@ static __init int qemu_print_iodc_data(struct device *lin_dev, void *data)
 		"mod_path_hpa_%08lx = {\n", hpa);
 	pr_cont("\t.path = { ");
 	pr_cont(".flags = 0x%x, ", mod_path.path.flags);
-	pr_cont(".bc = { 0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x }, ",
+	pr_cont(".bc = { 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x }, ",
 		(unsigned char)mod_path.path.bc[0],
 		(unsigned char)mod_path.path.bc[1],
 		(unsigned char)mod_path.path.bc[2],
 		(unsigned char)mod_path.path.bc[3],
 		(unsigned char)mod_path.path.bc[4],
 		(unsigned char)mod_path.path.bc[5]);
-	pr_cont(".mod = 0x%x }\n", mod_path.path.mod);
+	pr_cont(".mod = 0x%02x }\n", (unsigned char)mod_path.path.mod);
 	pr_cont("};\n");
 
 	pr_info("static struct pdc_iodc iodc_data_hpa_%08lx = {\n", hpa);

arch/parisc/kernel/firmware.c

@@ -1643,11 +1643,36 @@ int pdc_pat_pd_get_pdc_revisions(unsigned long *legacy_rev,
 	return retval;
 }
 
+/**
+ * pdc_pat_pd_get_platform_counter - Retrieve address of free-running 64-bit counter.
+ * @addr: The address of the 64-bit counter.
+ * @freq: The frequency of the counter, or -1 if unknown.
+ * @unique: Although monotonic growing, may it return the same number twice?
+ *
+ */
+int pdc_pat_pd_get_platform_counter(uint64_t **addr,
+		unsigned long *freq, unsigned long *unique)
+{
+	int retval;
+	unsigned long flags;
+
+	spin_lock_irqsave(&pdc_lock, flags);
+	retval = mem_pdc_call(PDC_PAT_PD, PDC_PAT_PD_GET_PLATFORM_COUNTER,
+				__pa(pdc_result));
+	if (retval == PDC_OK) {
+		*addr = (uint64_t *)pdc_result[0];
+		*freq = pdc_result[1];
+		*unique = pdc_result[2];
+	}
+	spin_unlock_irqrestore(&pdc_lock, flags);
+
+	return retval;
+}
 
 /**
  * pdc_pat_io_pci_cfg_read - Read PCI configuration space.
  * @pci_addr: PCI configuration space address for which the read request is being made.
- * @pci_size: Size of read in bytes. Valid values are 1, 2, and 4. 
+ * @pci_size: Size of read in bytes. Valid values are 1, 2, and 4.
  * @mem_addr: Pointer to return memory buffer.
  *
  */

arch/parisc/kernel/inventory.c

@@ -207,6 +207,19 @@ pat_query_module(ulong pcell_loc, ulong mod_index)
 		return status;
 	}
 
+#ifdef DEBUG_PAT
+	pr_debug("PAT INDEX: %lu: cba 0x%lx, "
+		"mod_info 0x%lx, mod_location 0x%lx, "
+		"mod: 0x%lx 0x%lx 0x%lx 0x%lx 0x%lx 0x%lx "
+		"0x%lx 0x%lx 0x%lx 0x%lx 0x%lx 0x%lx\n",
+		mod_index + 1, pa_pdc_cell->cba,
+		pa_pdc_cell->mod_info, pa_pdc_cell->mod_location,
+		pa_pdc_cell->mod[0], pa_pdc_cell->mod[1], pa_pdc_cell->mod[2],
+		pa_pdc_cell->mod[3], pa_pdc_cell->mod[4], pa_pdc_cell->mod[5],
+		pa_pdc_cell->mod[6], pa_pdc_cell->mod[7], pa_pdc_cell->mod[8],
+		pa_pdc_cell->mod[9], pa_pdc_cell->mod[10], pa_pdc_cell->mod[11]);
+#endif
+
 	temp = pa_pdc_cell->cba;
 	dev = alloc_pa_dev(PAT_GET_CBA(temp), &(pa_pdc_cell->mod_path));
 	if (!dev) {

arch/parisc/kernel/process.c

@@ -85,6 +85,9 @@ void machine_restart(char *cmd)
 #endif
 	/* set up a new led state on systems shipped with a LED State panel */
 	pdc_chassis_send_status(PDC_CHASSIS_DIRECT_SHUTDOWN);
+
+	/* prevent interrupts during reboot */
+	set_eiem(0);
 
 	/* "Normal" system reset */
 	pdc_do_reset();

arch/parisc/kernel/processor.c

@@ -3,7 +3,7 @@
  *    Initial setup-routines for HP 9000 based hardware.
  *
  *    Copyright (C) 1991, 1992, 1995  Linus Torvalds
- *    Modifications for PA-RISC (C) 1999-2008 Helge Deller <deller@gmx.de>
+ *    Modifications for PA-RISC (C) 1999-2026 Helge Deller <deller@gmx.de>
  *    Modifications copyright 1999 SuSE GmbH (Philipp Rumpf)
  *    Modifications copyright 2000 Martin K. Petersen <mkp@mkp.net>
  *    Modifications copyright 2000 Philipp Rumpf <prumpf@tux.org>
@@ -41,7 +41,7 @@ EXPORT_SYMBOL(_parisc_requires_coherency);
 DEFINE_PER_CPU(struct cpuinfo_parisc, cpu_data);
 
 /*
-**  	PARISC CPU driver - claim "device" and initialize CPU data structures.
+**	PARISC CPU driver - claim "device" and initialize CPU data structures.
 **
 ** Consolidate per CPU initialization into (mostly) one module.
 ** Monarch CPU will initialize boot_cpu_data which shouldn't
@@ -74,8 +74,8 @@ init_percpu_prof(unsigned long cpunum)
  * processor_probe - Determine if processor driver should claim this device.
  * @dev: The device which has been found.
  *
- * Determine if processor driver should claim this chip (return 0) or not 
- * (return 1).  If so, initialize the chip and tell other partners in crime 
+ * Determine if processor driver should claim this chip (return 0) or not
+ * (return 1).  If so, initialize the chip and tell other partners in crime
  * they have work to do.
  */
 static int __init processor_probe(struct parisc_device *dev)
@@ -207,7 +207,7 @@ static int __init processor_probe(struct parisc_device *dev)
 	}
 #endif
 
-	/* 
+	/*
 	 * Bring this CPU up now! (ignore bootstrap cpuid == 0)
 	 */
 #ifdef CONFIG_SMP
@@ -241,25 +241,25 @@ void __init collect_boot_cpu_data(void)
 	/* get CPU-Model Information... */
 #define p ((unsigned long *)&boot_cpu_data.pdc.model)
 	if (pdc_model_info(&boot_cpu_data.pdc.model) == PDC_OK) {
-		printk(KERN_INFO
-			"model %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
-			p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7], p[8], p[9]);
+		pr_info("model 0x%04lx 0x%04lx 0x%04lx 0x%04lx 0x%04lx "
+			"0x%04lx 0x%04lx 0x%04lx 0x%04lx 0x%04lx\n",
+			p[0], p[1], p[2], p[3], p[4],
+			p[5], p[6], p[7], p[8], p[9]);
 
 		add_device_randomness(&boot_cpu_data.pdc.model,
 			sizeof(boot_cpu_data.pdc.model));
 	}
 #undef p
 
 	if (pdc_model_versions(&boot_cpu_data.pdc.versions, 0) == PDC_OK) {
-		printk(KERN_INFO "vers  %08lx\n", 
-			boot_cpu_data.pdc.versions);
+		pr_info("vers  0x%04lx\n", boot_cpu_data.pdc.versions);
 
 		add_device_randomness(&boot_cpu_data.pdc.versions,
 			sizeof(boot_cpu_data.pdc.versions));
 	}
 
 	if (pdc_model_cpuid(&boot_cpu_data.pdc.cpuid) == PDC_OK) {
-		printk(KERN_INFO "CPUID vers %ld rev %ld (0x%08lx)\n",
+		pr_info("CPUID vers %ld rev %ld (0x%04lx)\n",
 			(boot_cpu_data.pdc.cpuid >> 5) & 127,
 			boot_cpu_data.pdc.cpuid & 31,
 			boot_cpu_data.pdc.cpuid);
@@ -437,8 +437,8 @@ show_cpuinfo (struct seq_file *m, void *v)
 				 boot_cpu_data.pdc.sys_model_name,
 				 cpu_name);
 
-		seq_printf(m, "hversion\t: 0x%08x\n"
-			        "sversion\t: 0x%08x\n",
+		seq_printf(m, "hversion\t: 0x%04x\n"
+				"sversion\t: 0x%04x\n",
 				 boot_cpu_data.hversion,
 				 boot_cpu_data.sversion );
 

arch/parisc/kernel/time.c

@@ -16,6 +16,7 @@
 #include <linux/rtc.h>
 #include <linux/platform_device.h>
 #include <asm/processor.h>
+#include <asm/pdcpat.h>
 
 static u64 cr16_clock_freq;
 static unsigned long clocktick;
@@ -99,6 +100,22 @@ void parisc_clockevent_init(void)
 	clockevents_config_and_register(cd, cr16_clock_freq, min_delta, max_delta);
 }
 
+static void parisc_find_64bit_counter(void)
+{
+#ifdef CONFIG_64BIT
+	uint64_t *pclock;
+	unsigned long freq, unique;
+	int ret;
+
+	ret = pdc_pat_pd_get_platform_counter(&pclock, &freq, &unique);
+	if (ret == PDC_OK)
+		pr_info("64-bit counter found at %px, freq: %lu, unique: %lu\n",
+			pclock, freq, unique);
+	else
+		pr_info("64-bit counter not found.\n");
+#endif
+}
+
 unsigned long notrace profile_pc(struct pt_regs *regs)
 {
 	unsigned long pc = instruction_pointer(regs);
@@ -213,6 +230,9 @@ void __init time_init(void)
 
 	parisc_clockevent_init();
 
+	/* check for free-running 64-bit platform counter */
+	parisc_find_64bit_counter();
+
 	/* register at clocksource framework */
 	clocksource_register_hz(&clocksource_cr16, cr16_clock_freq);
 }

drivers/parisc/iosapic.c

@@ -262,9 +262,9 @@ iosapic_load_irt(unsigned long cell_num, struct irt_entry **irt)
 
 	if (is_pdc_pat()) {
 		/* Use pat pdc routine to get interrupt routing table size */
-		DBG("calling get_irt_size (cell %ld)\n", cell_num);
 		status = pdc_pat_get_irt_size(&num_entries, cell_num);
-		DBG("get_irt_size: %ld\n", status);
+		DBG("calling get_irt_size (cell %ld) ", cell_num);
+		DBG("returned %ld, entries: %lu\n", status, num_entries);
 
 		BUG_ON(status != PDC_OK);
 		BUG_ON(num_entries == 0);
@@ -327,7 +327,7 @@ iosapic_load_irt(unsigned long cell_num, struct irt_entry **irt)
 	int i;
 
 	printk(MODULE_NAME " Interrupt Routing Table (cell %ld)\n", cell_num);
-	printk(MODULE_NAME " start = 0x%p num_entries %ld entry_size %d\n",
+	printk(MODULE_NAME " start = 0x%px num_entries %ld entry_size %d\n",
 		table,
 		num_entries,
 		(int) sizeof(struct irt_entry));
@@ -455,7 +455,7 @@ iosapic_xlate_pin(struct iosapic_info *isi, struct pci_dev *pcidev)
 	pci_read_config_byte(pcidev, PCI_INTERRUPT_PIN, &intr_pin);
 
 	DBG_IRT("iosapic_xlate_pin(%s) SLOT %d pin %d\n",
-		pcidev->slot_name, PCI_SLOT(pcidev->devfn), intr_pin);
+		pci_name(pcidev), PCI_SLOT(pcidev->devfn), intr_pin);
 
 	if (intr_pin == 0) {
 		/* The device does NOT support/use IRQ lines.  */
@@ -508,7 +508,7 @@ iosapic_xlate_pin(struct iosapic_info *isi, struct pci_dev *pcidev)
 	} else {
 		intr_slot = PCI_SLOT(pcidev->devfn);
 	}
-	DBG_IRT("iosapic_xlate_pin:  bus %d slot %d pin %d\n",
+	DBG_IRT("iosapic_xlate_pin:  bus %lld slot %d pin %d\n",
 			pcidev->bus->busn_res.start, intr_slot, intr_pin);
 
 	return irt_find_irqline(isi, intr_slot, intr_pin);
@@ -733,7 +733,7 @@ int iosapic_fixup_irq(void *isi_obj, struct pci_dev *pcidev)
 				pci_name(pcidev));
 		return -1;
 	}
-	DBG_IRT("iosapic_fixup_irq(): irte %p %x %x %x %x %x %x %x %x\n",
+	DBG_IRT("iosapic_fixup_irq(): irte %px %02x %02x %02x %02x %02x %02x %02x %04llx\n",
 		irte,
 		irte->entry_type,
 		irte->entry_length,
@@ -742,12 +742,12 @@ int iosapic_fixup_irq(void *isi_obj, struct pci_dev *pcidev)
 		irte->src_bus_id,
 		irte->src_seg_id,
 		irte->dest_iosapic_intin,
-		(u32) irte->dest_iosapic_addr);
+		irte->dest_iosapic_addr);
 	isi_line = irte->dest_iosapic_intin;
 
 	/* get vector info for this input line */
 	vi = isi->isi_vector + isi_line;
-	DBG_IRT("iosapic_fixup_irq:  line %d vi 0x%p\n", isi_line, vi);
+	DBG_IRT("iosapic_fixup_irq:  line %d vi 0x%px\n", isi_line, vi);
 
 	/* If this IRQ line has already been setup, skip it */
 	if (vi->irte)
@@ -772,6 +772,8 @@ int iosapic_fixup_irq(void *isi_obj, struct pci_dev *pcidev)
 	/* enable_irq() will use txn_* to program IRdT */
 	vi->txn_addr = txn_alloc_addr(vi->txn_irq);
 	vi->txn_data = txn_alloc_data(vi->txn_irq);
+	DBG_IRT("iosapic_fixup_irq() TXN: 0x%lx 0x%x\n",
+		vi->txn_addr, vi->txn_data);
 
 	vi->eoi_addr = isi->addr + IOSAPIC_REG_EOI;
 	vi->eoi_data = cpu_to_le32(vi->txn_data);
@@ -831,7 +833,7 @@ int iosapic_serial_irq(struct parisc_device *dev)
 
 	/* get vector info for this input line */
 	vi = isi->isi_vector + intin;
-	DBG_IRT("iosapic_serial_irq:  line %d vi 0x%p\n", iosapic_intin, vi);
+	DBG_IRT("iosapic_serial_irq:  line %d vi 0x%p\n", intin, vi);
 
 	/* If this IRQ line has already been setup, skip it */
 	if (vi->irte)
@@ -923,6 +925,7 @@ void *iosapic_register(unsigned long hpa, void __iomem *vaddr)
 	isi->isi_hpa = hpa;
 	isi->isi_version = iosapic_rd_version(isi);
 	isi->isi_num_vectors = IOSAPIC_IRDT_MAX_ENTRY(isi->isi_version) + 1;
+	DBG_IRT("iosapic_register: num vectors = %d\n", isi->isi_num_vectors);
 
 	vip = isi->isi_vector = kcalloc(isi->isi_num_vectors,
 					sizeof(struct vector_info), GFP_KERNEL);

drivers/parisc/lba_pci.c

@@ -1066,6 +1066,10 @@ lba_pat_resources(struct parisc_device *pa_dev, struct lba_device *lba_dev)
 
 		p = (void *) &(pa_pdc_cell->mod[2+i*3]);
 		io = (void *) &(io_pdc_cell->mod[2+i*3]);
+		DBG_PAT("PA #%d : TYPE 0x%08lx,  start 0x%08lx, end 0x%08lx\n",
+			i, p->type, p->start, p->end);
+		DBG_PAT("IO #%d : TYPE 0x%08lx,  start 0x%08lx, end 0x%08lx\n",
+			i, io->type, io->start, io->end);
 
 		/* Convert the PAT range data to PCI "struct resource" */
 		switch(p->type & 0xff) {