Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
parisc: Fix minor printk issues in iosapic debug code
Signed-off-by: Helge Deller <deller@gmx.de>
+12
-9
+12
-9
drivers/parisc/iosapic.c
+12
-9
drivers/parisc/iosapic.c
···
262
262
263
263
if (is_pdc_pat()) {
264
264
/* Use pat pdc routine to get interrupt routing table size */
265
-
DBG("calling get_irt_size (cell %ld)\n", cell_num);
266
265
status = pdc_pat_get_irt_size(&num_entries, cell_num);
267
-
DBG("get_irt_size: %ld\n", status);
266
+
DBG("calling get_irt_size (cell %ld) ", cell_num);
267
+
DBG("returned %ld, entries: %lu\n", status, num_entries);
268
268
269
269
BUG_ON(status != PDC_OK);
270
270
BUG_ON(num_entries == 0);
···
327
327
int i;
328
328
329
329
printk(MODULE_NAME " Interrupt Routing Table (cell %ld)\n", cell_num);
330
-
printk(MODULE_NAME " start = 0x%p num_entries %ld entry_size %d\n",
330
+
printk(MODULE_NAME " start = 0x%px num_entries %ld entry_size %d\n",
331
331
table,
332
332
num_entries,
333
333
(int) sizeof(struct irt_entry));
···
455
455
pci_read_config_byte(pcidev, PCI_INTERRUPT_PIN, &intr_pin);
456
456
457
457
DBG_IRT("iosapic_xlate_pin(%s) SLOT %d pin %d\n",
458
-
pcidev->slot_name, PCI_SLOT(pcidev->devfn), intr_pin);
458
+
pci_name(pcidev), PCI_SLOT(pcidev->devfn), intr_pin);
459
459
460
460
if (intr_pin == 0) {
461
461
/* The device does NOT support/use IRQ lines. */
···
508
508
} else {
509
509
intr_slot = PCI_SLOT(pcidev->devfn);
510
510
}
511
-
DBG_IRT("iosapic_xlate_pin: bus %d slot %d pin %d\n",
511
+
DBG_IRT("iosapic_xlate_pin: bus %lld slot %d pin %d\n",
512
512
pcidev->bus->busn_res.start, intr_slot, intr_pin);
513
513
514
514
return irt_find_irqline(isi, intr_slot, intr_pin);
···
733
733
pci_name(pcidev));
734
734
return -1;
735
735
}
736
-
DBG_IRT("iosapic_fixup_irq(): irte %p %x %x %x %x %x %x %x %x\n",
736
+
DBG_IRT("iosapic_fixup_irq(): irte %px %02x %02x %02x %02x %02x %02x %02x %04llx\n",
737
737
irte,
738
738
irte->entry_type,
739
739
irte->entry_length,
···
742
742
irte->src_bus_id,
743
743
irte->src_seg_id,
744
744
irte->dest_iosapic_intin,
745
-
(u32) irte->dest_iosapic_addr);
745
+
irte->dest_iosapic_addr);
746
746
isi_line = irte->dest_iosapic_intin;
747
747
748
748
/* get vector info for this input line */
749
749
vi = isi->isi_vector + isi_line;
750
-
DBG_IRT("iosapic_fixup_irq: line %d vi 0x%p\n", isi_line, vi);
750
+
DBG_IRT("iosapic_fixup_irq: line %d vi 0x%px\n", isi_line, vi);
751
751
752
752
/* If this IRQ line has already been setup, skip it */
753
753
if (vi->irte)
···
772
772
/* enable_irq() will use txn_* to program IRdT */
773
773
vi->txn_addr = txn_alloc_addr(vi->txn_irq);
774
774
vi->txn_data = txn_alloc_data(vi->txn_irq);
775
+
DBG_IRT("iosapic_fixup_irq() TXN: 0x%lx 0x%x\n",
776
+
vi->txn_addr, vi->txn_data);
775
777
776
778
vi->eoi_addr = isi->addr + IOSAPIC_REG_EOI;
777
779
vi->eoi_data = cpu_to_le32(vi->txn_data);
···
833
831
834
832
/* get vector info for this input line */
835
833
vi = isi->isi_vector + intin;
836
-
DBG_IRT("iosapic_serial_irq: line %d vi 0x%p\n", iosapic_intin, vi);
834
+
DBG_IRT("iosapic_serial_irq: line %d vi 0x%p\n", intin, vi);
837
835
838
836
/* If this IRQ line has already been setup, skip it */
839
837
if (vi->irte)
···
925
923
isi->isi_hpa = hpa;
926
924
isi->isi_version = iosapic_rd_version(isi);
927
925
isi->isi_num_vectors = IOSAPIC_IRDT_MAX_ENTRY(isi->isi_version) + 1;
926
+
DBG_IRT("iosapic_register: num vectors = %d\n", isi->isi_num_vectors);
928
927
929
928
vip = isi->isi_vector = kcalloc(isi->isi_num_vectors,
930
929
sizeof(struct vector_info), GFP_KERNEL);