aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-07-24 16:53:31 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-07-24 16:53:31 -0400
commit28cfd8af52a9ed4e5bd1751ea6bc0b8c870f68ec (patch)
tree77491546baa6572cfc22ba7a93062cc857f9adbe
parent2a8f7450f828eaee49d66f41f99ac2e54f1160a6 (diff)
ide: include PCI device name in messages from IDE PCI host drivers
While at it: * Apply small fixes to messages (s/dma/DMA/, remove trailing '.', etc). * Fix printk() call in ide_setup_pci_baseregs() to use KERN_INFO. * Move printk() call from ide_pci_clear_simplex() to the caller. * Cleanup do_ide_setup_pci_device() a bit. * amd74xx.c: remove superfluous PCI device revision information. * hpt366.c: fix two printk() calls in ->init_chipset to use KERN_INFO. * pdc202xx_new.c: fix printk() call in ->init_chipset to use KERN_INFO. * pdc202xx_old.c: fix driver message in pdc202xx_init_one(). * via82cxxx.c: fix driver warning message in via_init_one(). Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat
-rw-r--r--drivers/ide/pci/amd74xx.c11
-rw-r--r--drivers/ide/pci/generic.c4
-rw-r--r--drivers/ide/pci/hpt366.c31
-rw-r--r--drivers/ide/pci/it821x.c11
-rw-r--r--drivers/ide/pci/pdc202xx_new.c21
-rw-r--r--drivers/ide/pci/pdc202xx_old.c9
-rw-r--r--drivers/ide/pci/serverworks.c3
-rw-r--r--drivers/ide/pci/siimage.c7
-rw-r--r--drivers/ide/pci/sis5513.c17
-rw-r--r--drivers/ide/pci/trm290.c4
-rw-r--r--drivers/ide/pci/via82cxxx.c13
-rw-r--r--drivers/ide/setup-pci.c99
12 files changed, 131 insertions, 99 deletions
diff --git a/drivers/ide/pci/amd74xx.c b/drivers/ide/pci/amd74xx.c
index a91f2e873ba4..2b118f80fab6 100644
--- a/drivers/ide/pci/amd74xx.c
+++ b/drivers/ide/pci/amd74xx.c
@@ -129,9 +129,9 @@ static void __devinit amd7411_cable_detect(struct pci_dev *dev,
129 amd_80w = ((t & 0x3) ? 1 : 0) | ((t & 0xc) ? 2 : 0); 129 amd_80w = ((t & 0x3) ? 1 : 0) | ((t & 0xc) ? 2 : 0);
130 for (i = 24; i >= 0; i -= 8) 130 for (i = 24; i >= 0; i -= 8)
131 if (((u >> i) & 4) && !(amd_80w & (1 << (1 - (i >> 4))))) { 131 if (((u >> i) & 4) && !(amd_80w & (1 << (1 - (i >> 4))))) {
132 printk(KERN_WARNING "%s: BIOS didn't set cable bits " 132 printk(KERN_WARNING "%s %s: BIOS didn't set cable bits "
133 "correctly. Enabling workaround.\n", 133 "correctly. Enabling workaround.\n",
134 name); 134 name, pci_name(dev));
135 amd_80w |= (1 << (1 - (i >> 4))); 135 amd_80w |= (1 << (1 - (i >> 4)));
136 } 136 }
137} 137}
@@ -280,9 +280,8 @@ static int __devinit amd74xx_probe(struct pci_dev *dev, const struct pci_device_
280 d.udma_mask = ATA_UDMA5; 280 d.udma_mask = ATA_UDMA5;
281 } 281 }
282 282
283 printk(KERN_INFO "%s: %s (rev %02x) UDMA%s controller\n", 283 printk(KERN_INFO "%s %s: UDMA%s controller\n",
284 d.name, pci_name(dev), dev->revision, 284 d.name, pci_name(dev), amd_dma[fls(d.udma_mask) - 1]);
285 amd_dma[fls(d.udma_mask) - 1]);
286 285
287 /* 286 /*
288 * Determine the system bus clock. 287 * Determine the system bus clock.
diff --git a/drivers/ide/pci/generic.c b/drivers/ide/pci/generic.c
index 81fc171f8ffc..e034e21af7fe 100644
--- a/drivers/ide/pci/generic.c
+++ b/drivers/ide/pci/generic.c
@@ -134,8 +134,8 @@ static int __devinit generic_init_one(struct pci_dev *dev, const struct pci_devi
134 u16 command; 134 u16 command;
135 pci_read_config_word(dev, PCI_COMMAND, &command); 135 pci_read_config_word(dev, PCI_COMMAND, &command);
136 if (!(command & PCI_COMMAND_IO)) { 136 if (!(command & PCI_COMMAND_IO)) {
137 printk(KERN_INFO "Skipping disabled %s IDE " 137 printk(KERN_INFO "%s %s: skipping disabled "
138 "controller.\n", d->name); 138 "controller\n", d->name, pci_name(dev));
139 goto out; 139 goto out;
140 } 140 }
141 } 141 }
diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c
index 398808905f94..b8004c331edb 100644
--- a/drivers/ide/pci/hpt366.c
+++ b/drivers/ide/pci/hpt366.c
@@ -1044,8 +1044,8 @@ static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev, const cha
1044 if ((temp & 0xFFFFF000) != 0xABCDE000) { 1044 if ((temp & 0xFFFFF000) != 0xABCDE000) {
1045 int i; 1045 int i;
1046 1046
1047 printk(KERN_WARNING "%s: no clock data saved by BIOS\n", 1047 printk(KERN_WARNING "%s %s: no clock data saved by "
1048 name); 1048 "BIOS\n", name, pci_name(dev));
1049 1049
1050 /* Calculate the average value of f_CNT. */ 1050 /* Calculate the average value of f_CNT. */
1051 for (temp = i = 0; i < 128; i++) { 1051 for (temp = i = 0; i < 128; i++) {
@@ -1070,8 +1070,9 @@ static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev, const cha
1070 else 1070 else
1071 pci_clk = 66; 1071 pci_clk = 66;
1072 1072
1073 printk(KERN_INFO "%s: DPLL base: %d MHz, f_CNT: %d, " 1073 printk(KERN_INFO "%s %s: DPLL base: %d MHz, f_CNT: %d, "
1074 "assuming %d MHz PCI\n", name, dpll_clk, f_cnt, pci_clk); 1074 "assuming %d MHz PCI\n", name, pci_name(dev),
1075 dpll_clk, f_cnt, pci_clk);
1075 } else { 1076 } else {
1076 u32 itr1 = 0; 1077 u32 itr1 = 0;
1077 1078
@@ -1137,7 +1138,8 @@ static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev, const cha
1137 } 1138 }
1138 1139
1139 if (info->timings->clock_table[clock] == NULL) { 1140 if (info->timings->clock_table[clock] == NULL) {
1140 printk(KERN_ERR "%s: unknown bus timing!\n", name); 1141 printk(KERN_ERR "%s %s: unknown bus timing!\n",
1142 name, pci_name(dev));
1141 return -EIO; 1143 return -EIO;
1142 } 1144 }
1143 1145
@@ -1163,16 +1165,19 @@ static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev, const cha
1163 f_low += adjust >> 1; 1165 f_low += adjust >> 1;
1164 } 1166 }
1165 if (adjust == 8) { 1167 if (adjust == 8) {
1166 printk(KERN_ERR "%s: DPLL did not stabilize!\n", name); 1168 printk(KERN_ERR "%s %s: DPLL did not stabilize!\n",
1169 name, pci_name(dev));
1167 return -EIO; 1170 return -EIO;
1168 } 1171 }
1169 1172
1170 printk("%s: using %d MHz DPLL clock\n", name, dpll_clk); 1173 printk(KERN_INFO "%s %s: using %d MHz DPLL clock\n",
1174 name, pci_name(dev), dpll_clk);
1171 } else { 1175 } else {
1172 /* Mark the fact that we're not using the DPLL. */ 1176 /* Mark the fact that we're not using the DPLL. */
1173 dpll_clk = 0; 1177 dpll_clk = 0;
1174 1178
1175 printk("%s: using %d MHz PCI clock\n", name, pci_clk); 1179 printk(KERN_INFO "%s %s: using %d MHz PCI clock\n",
1180 name, pci_name(dev), pci_clk);
1176 } 1181 }
1177 1182
1178 /* Store the clock frequencies. */ 1183 /* Store the clock frequencies. */
@@ -1357,7 +1362,8 @@ static void __devinit hpt374_init(struct pci_dev *dev, struct pci_dev *dev2)
1357 if (dev2->irq != dev->irq) { 1362 if (dev2->irq != dev->irq) {
1358 /* FIXME: we need a core pci_set_interrupt() */ 1363 /* FIXME: we need a core pci_set_interrupt() */
1359 dev2->irq = dev->irq; 1364 dev2->irq = dev->irq;
1360 printk(KERN_INFO "HPT374: PCI config space interrupt fixed\n"); 1365 printk(KERN_INFO "HPT374 %s: PCI config space interrupt "
1366 "fixed\n", pci_name(dev2));
1361 } 1367 }
1362} 1368}
1363 1369
@@ -1392,8 +1398,8 @@ static int __devinit hpt36x_init(struct pci_dev *dev, struct pci_dev *dev2)
1392 pci_read_config_byte(dev2, PCI_INTERRUPT_PIN, &pin2); 1398 pci_read_config_byte(dev2, PCI_INTERRUPT_PIN, &pin2);
1393 1399
1394 if (pin1 != pin2 && dev->irq == dev2->irq) { 1400 if (pin1 != pin2 && dev->irq == dev2->irq) {
1395 printk(KERN_INFO "HPT36x: onboard version of chipset, " 1401 printk(KERN_INFO "HPT36x %s: onboard version of chipset, "
1396 "pin1=%d pin2=%d\n", pin1, pin2); 1402 "pin1=%d pin2=%d\n", pci_name(dev), pin1, pin2);
1397 return 1; 1403 return 1;
1398 } 1404 }
1399 1405
@@ -1591,7 +1597,8 @@ static int __devinit hpt366_init_one(struct pci_dev *dev, const struct pci_devic
1591 1597
1592 dyn_info = kzalloc(sizeof(*dyn_info) * (dev2 ? 2 : 1), GFP_KERNEL); 1598 dyn_info = kzalloc(sizeof(*dyn_info) * (dev2 ? 2 : 1), GFP_KERNEL);
1593 if (dyn_info == NULL) { 1599 if (dyn_info == NULL) {
1594 printk(KERN_ERR "%s: out of memory!\n", d.name); 1600 printk(KERN_ERR "%s %s: out of memory!\n",
1601 d.name, pci_name(dev));
1595 pci_dev_put(dev2); 1602 pci_dev_put(dev2);
1596 return -ENOMEM; 1603 return -ENOMEM;
1597 } 1604 }
diff --git a/drivers/ide/pci/it821x.c b/drivers/ide/pci/it821x.c
index c5c91f2109d4..4ce5db98f89a 100644
--- a/drivers/ide/pci/it821x.c
+++ b/drivers/ide/pci/it821x.c
@@ -569,7 +569,8 @@ static void __devinit init_hwif_it821x(ide_hwif_t *hwif)
569 idev->timing10 = 1; 569 idev->timing10 = 1;
570 hwif->host_flags |= IDE_HFLAG_NO_ATAPI_DMA; 570 hwif->host_flags |= IDE_HFLAG_NO_ATAPI_DMA;
571 if (idev->smart == 0) 571 if (idev->smart == 0)
572 printk(KERN_WARNING "it821x: Revision 0x10, workarounds activated.\n"); 572 printk(KERN_WARNING "it821x %s: revision 0x10, "
573 "workarounds activated\n", pci_name(dev));
573 } 574 }
574 575
575 if (idev->smart == 0) { 576 if (idev->smart == 0) {
@@ -609,11 +610,13 @@ static unsigned int __devinit init_chipset_it821x(struct pci_dev *dev, const cha
609 610
610 /* Force the card into bypass mode if so requested */ 611 /* Force the card into bypass mode if so requested */
611 if (it8212_noraid) { 612 if (it8212_noraid) {
612 printk(KERN_INFO "it8212: forcing bypass mode.\n"); 613 printk(KERN_INFO "it821x %s: forcing bypass mode\n",
614 pci_name(dev));
613 it8212_disable_raid(dev); 615 it8212_disable_raid(dev);
614 } 616 }
615 pci_read_config_byte(dev, 0x50, &conf); 617 pci_read_config_byte(dev, 0x50, &conf);
616 printk(KERN_INFO "it821x: controller in %s mode.\n", mode[conf & 1]); 618 printk(KERN_INFO "it821x %s: controller in %s mode\n",
619 pci_name(dev), mode[conf & 1]);
617 return 0; 620 return 0;
618} 621}
619 622
@@ -654,7 +657,7 @@ static int __devinit it821x_init_one(struct pci_dev *dev, const struct pci_devic
654 657
655 itdevs = kzalloc(2 * sizeof(*itdevs), GFP_KERNEL); 658 itdevs = kzalloc(2 * sizeof(*itdevs), GFP_KERNEL);
656 if (itdevs == NULL) { 659 if (itdevs == NULL) {
657 printk(KERN_ERR "it821x: out of memory\n"); 660 printk(KERN_ERR "it821x %s: out of memory\n", pci_name(dev));
658 return -ENOMEM; 661 return -ENOMEM;
659 } 662 }
660 663
diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c
index 9881a1a8b89c..4c2b669d7de6 100644
--- a/drivers/ide/pci/pdc202xx_new.c
+++ b/drivers/ide/pci/pdc202xx_new.c
@@ -358,12 +358,13 @@ static unsigned int __devinit init_chipset_pdcnew(struct pci_dev *dev, const cha
358 * registers setting. 358 * registers setting.
359 */ 359 */
360 pll_input = detect_pll_input_clock(dma_base); 360 pll_input = detect_pll_input_clock(dma_base);
361 printk("%s: PLL input clock is %ld kHz\n", name, pll_input / 1000); 361 printk(KERN_INFO "%s %s: PLL input clock is %ld kHz\n",
362 name, pci_name(dev), pll_input / 1000);
362 363
363 /* Sanity check */ 364 /* Sanity check */
364 if (unlikely(pll_input < 5000000L || pll_input > 70000000L)) { 365 if (unlikely(pll_input < 5000000L || pll_input > 70000000L)) {
365 printk(KERN_ERR "%s: Bad PLL input clock %ld Hz, giving up!\n", 366 printk(KERN_ERR "%s %s: Bad PLL input clock %ld Hz, giving up!"
366 name, pll_input); 367 "\n", name, pci_name(dev), pll_input);
367 goto out; 368 goto out;
368 } 369 }
369 370
@@ -399,7 +400,8 @@ static unsigned int __devinit init_chipset_pdcnew(struct pci_dev *dev, const cha
399 r = 0x00; 400 r = 0x00;
400 } else { 401 } else {
401 /* Invalid ratio */ 402 /* Invalid ratio */
402 printk(KERN_ERR "%s: Bad ratio %ld, giving up!\n", name, ratio); 403 printk(KERN_ERR "%s %s: Bad ratio %ld, giving up!\n",
404 name, pci_name(dev), ratio);
403 goto out; 405 goto out;
404 } 406 }
405 407
@@ -409,7 +411,8 @@ static unsigned int __devinit init_chipset_pdcnew(struct pci_dev *dev, const cha
409 411
410 if (unlikely(f < 0 || f > 127)) { 412 if (unlikely(f < 0 || f > 127)) {
411 /* Invalid F */ 413 /* Invalid F */
412 printk(KERN_ERR "%s: F[%d] invalid!\n", name, f); 414 printk(KERN_ERR "%s %s: F[%d] invalid!\n",
415 name, pci_name(dev), f);
413 goto out; 416 goto out;
414 } 417 }
415 418
@@ -455,8 +458,8 @@ static struct pci_dev * __devinit pdc20270_get_dev2(struct pci_dev *dev)
455 458
456 if (dev2->irq != dev->irq) { 459 if (dev2->irq != dev->irq) {
457 dev2->irq = dev->irq; 460 dev2->irq = dev->irq;
458 printk(KERN_INFO "PDC20270: PCI config space " 461 printk(KERN_INFO "PDC20270 %s: PCI config space "
459 "interrupt fixed\n"); 462 "interrupt fixed\n", pci_name(dev));
460 } 463 }
461 464
462 return dev2; 465 return dev2;
@@ -535,8 +538,8 @@ static int __devinit pdc202new_init_one(struct pci_dev *dev, const struct pci_de
535 bridge->vendor == PCI_VENDOR_ID_INTEL && 538 bridge->vendor == PCI_VENDOR_ID_INTEL &&
536 (bridge->device == PCI_DEVICE_ID_INTEL_I960 || 539 (bridge->device == PCI_DEVICE_ID_INTEL_I960 ||
537 bridge->device == PCI_DEVICE_ID_INTEL_I960RM)) { 540 bridge->device == PCI_DEVICE_ID_INTEL_I960RM)) {
538 printk(KERN_INFO "PDC20276: attached to I2O RAID controller, " 541 printk(KERN_INFO "PDC20276 %s: attached to I2O RAID controller,"
539 "skipping\n"); 542 " skipping\n", pci_name(dev));
540 return -ENODEV; 543 return -ENODEV;
541 } 544 }
542 545
diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c
index 17d99ce273af..5cb2731047e9 100644
--- a/drivers/ide/pci/pdc202xx_old.c
+++ b/drivers/ide/pci/pdc202xx_old.c
@@ -304,8 +304,8 @@ static void __devinit pdc202ata4_fixup_irq(struct pci_dev *dev,
304 if (irq != irq2) { 304 if (irq != irq2) {
305 pci_write_config_byte(dev, 305 pci_write_config_byte(dev,
306 (PCI_INTERRUPT_LINE)|0x80, irq); /* 0xbc */ 306 (PCI_INTERRUPT_LINE)|0x80, irq); /* 0xbc */
307 printk(KERN_INFO "%s: PCI config space interrupt " 307 printk(KERN_INFO "%s %s: PCI config space interrupt "
308 "mirror fixed\n", name); 308 "mirror fixed\n", name, pci_name(dev));
309 } 309 }
310 } 310 }
311} 311}
@@ -406,8 +406,9 @@ static int __devinit pdc202xx_init_one(struct pci_dev *dev, const struct pci_dev
406 bridge->vendor == PCI_VENDOR_ID_INTEL && 406 bridge->vendor == PCI_VENDOR_ID_INTEL &&
407 (bridge->device == PCI_DEVICE_ID_INTEL_I960 || 407 (bridge->device == PCI_DEVICE_ID_INTEL_I960 ||
408 bridge->device == PCI_DEVICE_ID_INTEL_I960RM)) { 408 bridge->device == PCI_DEVICE_ID_INTEL_I960RM)) {
409 printk(KERN_INFO "ide: Skipping Promise PDC20265 " 409 printk(KERN_INFO "pdc202xx_old %s: skipping Promise "
410 "attached to I2O RAID controller\n"); 410 "PDC20265 attached to I2O RAID controller\n",
411 pci_name(dev));
411 return -ENODEV; 412 return -ENODEV;
412 } 413 }
413 } 414 }
diff --git a/drivers/ide/pci/serverworks.c b/drivers/ide/pci/serverworks.c
index eca52fede281..1106ff44cdee 100644
--- a/drivers/ide/pci/serverworks.c
+++ b/drivers/ide/pci/serverworks.c
@@ -188,7 +188,8 @@ static unsigned int __devinit init_chipset_svwks (struct pci_dev *dev, const cha
188 pci_read_config_dword(isa_dev, 0x64, &reg); 188 pci_read_config_dword(isa_dev, 0x64, &reg);
189 reg &= ~0x00002000; /* disable 600ns interrupt mask */ 189 reg &= ~0x00002000; /* disable 600ns interrupt mask */
190 if(!(reg & 0x00004000)) 190 if(!(reg & 0x00004000))
191 printk(KERN_DEBUG "%s: UDMA not BIOS enabled.\n", name); 191 printk(KERN_DEBUG "%s %s: UDMA not BIOS "
192 "enabled.\n", name, pci_name(dev));
192 reg |= 0x00004000; /* enable UDMA/33 support */ 193 reg |= 0x00004000; /* enable UDMA/33 support */
193 pci_write_config_dword(isa_dev, 0x64, reg); 194 pci_write_config_dword(isa_dev, 0x64, reg);
194 } 195 }
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c
index f2e4dac9b719..fc29f1ca503a 100644
--- a/drivers/ide/pci/siimage.c
+++ b/drivers/ide/pci/siimage.c
@@ -539,7 +539,8 @@ static unsigned int __devinit init_chipset_siimage(struct pci_dev *dev,
539 { "== 100", "== 133", "== 2X PCI", "DISABLED!" }; 539 { "== 100", "== 133", "== 2X PCI", "DISABLED!" };
540 540
541 tmp >>= 4; 541 tmp >>= 4;
542 printk(KERN_INFO "%s: BASE CLOCK %s\n", name, clk_str[tmp & 3]); 542 printk(KERN_INFO "%s %s: BASE CLOCK %s\n",
543 name, pci_name(dev), clk_str[tmp & 3]);
543 } 544 }
544 545
545 return 0; 546 return 0;
@@ -779,8 +780,8 @@ static int __devinit siimage_init_one(struct pci_dev *dev,
779 * seem to get terminally confused in the PCI spaces. 780 * seem to get terminally confused in the PCI spaces.
780 */ 781 */
781 if (!request_mem_region(bar5, barsize, d.name)) { 782 if (!request_mem_region(bar5, barsize, d.name)) {
782 printk(KERN_WARNING "siimage: IDE controller MMIO " 783 printk(KERN_WARNING "siimage %s: MMIO ports not "
783 "ports not available.\n"); 784 "available\n", pci_name(dev));
784 } else { 785 } else {
785 ioaddr = ioremap(bar5, barsize); 786 ioaddr = ioremap(bar5, barsize);
786 if (ioaddr == NULL) 787 if (ioaddr == NULL)
diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c
index f3cf7c6c0cc3..518d8ab413f3 100644
--- a/drivers/ide/pci/sis5513.c
+++ b/drivers/ide/pci/sis5513.c
@@ -380,8 +380,9 @@ static int __devinit sis_find_family(struct pci_dev *dev)
380 } 380 }
381 pci_dev_put(host); 381 pci_dev_put(host);
382 382
383 printk(KERN_INFO "SIS5513: %s %s controller\n", 383 printk(KERN_INFO "SIS5513 %s: %s %s controller\n",
384 SiSHostChipInfo[i].name, chipset_capability[chipset_family]); 384 pci_name(dev), SiSHostChipInfo[i].name,
385 chipset_capability[chipset_family]);
385 } 386 }
386 387
387 if (!chipset_family) { /* Belongs to pci-quirks */ 388 if (!chipset_family) { /* Belongs to pci-quirks */
@@ -396,7 +397,8 @@ static int __devinit sis_find_family(struct pci_dev *dev)
396 pci_write_config_dword(dev, 0x54, idemisc); 397 pci_write_config_dword(dev, 0x54, idemisc);
397 398
398 if (trueid == 0x5518) { 399 if (trueid == 0x5518) {
399 printk(KERN_INFO "SIS5513: SiS 962/963 MuTIOL IDE UDMA133 controller\n"); 400 printk(KERN_INFO "SIS5513 %s: SiS 962/963 MuTIOL IDE UDMA133 controller\n",
401 pci_name(dev));
400 chipset_family = ATA_133; 402 chipset_family = ATA_133;
401 403
402 /* Check for 5513 compability mapping 404 /* Check for 5513 compability mapping
@@ -405,7 +407,8 @@ static int __devinit sis_find_family(struct pci_dev *dev)
405 */ 407 */
406 if ((idemisc & 0x40000000) == 0) { 408 if ((idemisc & 0x40000000) == 0) {
407 pci_write_config_dword(dev, 0x54, idemisc | 0x40000000); 409 pci_write_config_dword(dev, 0x54, idemisc | 0x40000000);
408 printk(KERN_INFO "SIS5513: Switching to 5513 register mapping\n"); 410 printk(KERN_INFO "SIS5513 %s: Switching to 5513 register mapping\n",
411 pci_name(dev));
409 } 412 }
410 } 413 }
411 } 414 }
@@ -429,10 +432,12 @@ static int __devinit sis_find_family(struct pci_dev *dev)
429 pci_dev_put(lpc_bridge); 432 pci_dev_put(lpc_bridge);
430 433
431 if (lpc_bridge->revision == 0x10 && (prefctl & 0x80)) { 434 if (lpc_bridge->revision == 0x10 && (prefctl & 0x80)) {
432 printk(KERN_INFO "SIS5513: SiS 961B MuTIOL IDE UDMA133 controller\n"); 435 printk(KERN_INFO "SIS5513 %s: SiS 961B MuTIOL IDE UDMA133 controller\n",
436 pci_name(dev));
433 chipset_family = ATA_133a; 437 chipset_family = ATA_133a;
434 } else { 438 } else {
435 printk(KERN_INFO "SIS5513: SiS 961 MuTIOL IDE UDMA100 controller\n"); 439 printk(KERN_INFO "SIS5513 %s: SiS 961 MuTIOL IDE UDMA100 controller\n",
440 pci_name(dev));
436 chipset_family = ATA_100; 441 chipset_family = ATA_100;
437 } 442 }
438 } 443 }
diff --git a/drivers/ide/pci/trm290.c b/drivers/ide/pci/trm290.c
index 449f4de9a702..7bda5ed92e1e 100644
--- a/drivers/ide/pci/trm290.c
+++ b/drivers/ide/pci/trm290.c
@@ -245,10 +245,10 @@ static void __devinit init_hwif_trm290(ide_hwif_t *hwif)
245 u8 reg = 0; 245 u8 reg = 0;
246 246
247 if ((dev->class & 5) && cfg_base) 247 if ((dev->class & 5) && cfg_base)
248 printk(KERN_INFO "TRM290: chip"); 248 printk(KERN_INFO "TRM290 %s: chip", pci_name(dev));
249 else { 249 else {
250 cfg_base = 0x3df0; 250 cfg_base = 0x3df0;
251 printk(KERN_INFO "TRM290: using default"); 251 printk(KERN_INFO "TRM290 %s: using default", pci_name(dev));
252 } 252 }
253 printk(KERN_CONT " config base at 0x%04x\n", cfg_base); 253 printk(KERN_CONT " config base at 0x%04x\n", cfg_base);
254 hwif->config_data = cfg_base; 254 hwif->config_data = cfg_base;
diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c
index 5f07eeb736ab..23332556e616 100644
--- a/drivers/ide/pci/via82cxxx.c
+++ b/drivers/ide/pci/via82cxxx.c
@@ -401,20 +401,19 @@ static int __devinit via_init_one(struct pci_dev *dev, const struct pci_device_i
401 */ 401 */
402 via_config = via_config_find(&isa); 402 via_config = via_config_find(&isa);
403 if (!via_config->id) { 403 if (!via_config->id) {
404 printk(KERN_WARNING "VP_IDE: Unknown VIA SouthBridge, disabling DMA.\n"); 404 printk(KERN_WARNING "VP_IDE %s: unknown chipset, skipping\n",
405 pci_name(dev));
405 return -ENODEV; 406 return -ENODEV;
406 } 407 }
407 408
408 /* 409 /*
409 * Print the boot message. 410 * Print the boot message.
410 */ 411 */
411 printk(KERN_INFO "VP_IDE: VIA %s (rev %02x) IDE %sDMA%s " 412 printk(KERN_INFO "VP_IDE %s: VIA %s (rev %02x) IDE %sDMA%s\n",
412 "controller on pci%s\n", 413 pci_name(dev), via_config->name, isa->revision,
413 via_config->name, isa->revision,
414 via_config->udma_mask ? "U" : "MW", 414 via_config->udma_mask ? "U" : "MW",
415 via_dma[via_config->udma_mask ? 415 via_dma[via_config->udma_mask ?
416 (fls(via_config->udma_mask) - 1) : 0], 416 (fls(via_config->udma_mask) - 1) : 0]);
417 pci_name(dev));
418 417
419 pci_dev_put(isa); 418 pci_dev_put(isa);
420 419
@@ -454,7 +453,7 @@ static int __devinit via_init_one(struct pci_dev *dev, const struct pci_device_i
454 453
455 vdev = kzalloc(sizeof(*vdev), GFP_KERNEL); 454 vdev = kzalloc(sizeof(*vdev), GFP_KERNEL);
456 if (!vdev) { 455 if (!vdev) {
457 printk(KERN_ERR "VP_IDE: out of memory :(\n"); 456 printk(KERN_ERR "VP_IDE %s: out of memory :(\n", pci_name(dev));
458 return -ENOMEM; 457 return -ENOMEM;
459 } 458 }
460 459
diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c
index 20f0ee004695..d9655aeb013b 100644
--- a/drivers/ide/setup-pci.c
+++ b/drivers/ide/setup-pci.c
@@ -39,17 +39,18 @@ static int ide_setup_pci_baseregs(struct pci_dev *dev, const char *name)
39 if (pci_read_config_byte(dev, PCI_CLASS_PROG, &progif) || 39 if (pci_read_config_byte(dev, PCI_CLASS_PROG, &progif) ||
40 (progif & 5) != 5) { 40 (progif & 5) != 5) {
41 if ((progif & 0xa) != 0xa) { 41 if ((progif & 0xa) != 0xa) {
42 printk(KERN_INFO "%s: device not capable of full " 42 printk(KERN_INFO "%s %s: device not capable of full "
43 "native PCI mode\n", name); 43 "native PCI mode\n", name, pci_name(dev));
44 return -EOPNOTSUPP; 44 return -EOPNOTSUPP;
45 } 45 }
46 printk("%s: placing both ports into native PCI mode\n", name); 46 printk(KERN_INFO "%s %s: placing both ports into native PCI "
47 "mode\n", name, pci_name(dev));
47 (void) pci_write_config_byte(dev, PCI_CLASS_PROG, progif|5); 48 (void) pci_write_config_byte(dev, PCI_CLASS_PROG, progif|5);
48 if (pci_read_config_byte(dev, PCI_CLASS_PROG, &progif) || 49 if (pci_read_config_byte(dev, PCI_CLASS_PROG, &progif) ||
49 (progif & 5) != 5) { 50 (progif & 5) != 5) {
50 printk(KERN_ERR "%s: rewrite of PROGIF failed, wanted " 51 printk(KERN_ERR "%s %s: rewrite of PROGIF failed, "
51 "0x%04x, got 0x%04x\n", 52 "wanted 0x%04x, got 0x%04x\n",
52 name, progif|5, progif); 53 name, pci_name(dev), progif | 5, progif);
53 return -EOPNOTSUPP; 54 return -EOPNOTSUPP;
54 } 55 }
55 } 56 }
@@ -57,14 +58,14 @@ static int ide_setup_pci_baseregs(struct pci_dev *dev, const char *name)
57} 58}
58 59
59#ifdef CONFIG_BLK_DEV_IDEDMA_PCI 60#ifdef CONFIG_BLK_DEV_IDEDMA_PCI
60static void ide_pci_clear_simplex(unsigned long dma_base, const char *name) 61static int ide_pci_clear_simplex(unsigned long dma_base, const char *name)
61{ 62{
62 u8 dma_stat = inb(dma_base + 2); 63 u8 dma_stat = inb(dma_base + 2);
63 64
64 outb(dma_stat & 0x60, dma_base + 2); 65 outb(dma_stat & 0x60, dma_base + 2);
65 dma_stat = inb(dma_base + 2); 66 dma_stat = inb(dma_base + 2);
66 if (dma_stat & 0x80) 67
67 printk(KERN_INFO "%s: simplex device: DMA forced\n", name); 68 return (dma_stat & 0x80) ? 1 : 0;
68} 69}
69 70
70/** 71/**
@@ -91,7 +92,8 @@ unsigned long ide_pci_dma_base(ide_hwif_t *hwif, const struct ide_port_info *d)
91 dma_base = pci_resource_start(dev, baridx); 92 dma_base = pci_resource_start(dev, baridx);
92 93
93 if (dma_base == 0) { 94 if (dma_base == 0) {
94 printk(KERN_ERR "%s: DMA base is invalid\n", d->name); 95 printk(KERN_ERR "%s %s: DMA base is invalid\n",
96 d->name, pci_name(dev));
95 return 0; 97 return 0;
96 } 98 }
97 } 99 }
@@ -105,13 +107,16 @@ EXPORT_SYMBOL_GPL(ide_pci_dma_base);
105 107
106int ide_pci_check_simplex(ide_hwif_t *hwif, const struct ide_port_info *d) 108int ide_pci_check_simplex(ide_hwif_t *hwif, const struct ide_port_info *d)
107{ 109{
110 struct pci_dev *dev = to_pci_dev(hwif->dev);
108 u8 dma_stat; 111 u8 dma_stat;
109 112
110 if (d->host_flags & (IDE_HFLAG_MMIO | IDE_HFLAG_CS5520)) 113 if (d->host_flags & (IDE_HFLAG_MMIO | IDE_HFLAG_CS5520))
111 goto out; 114 goto out;
112 115
113 if (d->host_flags & IDE_HFLAG_CLEAR_SIMPLEX) { 116 if (d->host_flags & IDE_HFLAG_CLEAR_SIMPLEX) {
114 ide_pci_clear_simplex(hwif->dma_base, d->name); 117 if (ide_pci_clear_simplex(hwif->dma_base, d->name))
118 printk(KERN_INFO "%s %s: simplex device: DMA forced\n",
119 d->name, pci_name(dev));
115 goto out; 120 goto out;
116 } 121 }
117 122
@@ -127,7 +132,8 @@ int ide_pci_check_simplex(ide_hwif_t *hwif, const struct ide_port_info *d)
127 */ 132 */
128 dma_stat = hwif->tp_ops->read_sff_dma_status(hwif); 133 dma_stat = hwif->tp_ops->read_sff_dma_status(hwif);
129 if ((dma_stat & 0x80) && hwif->mate && hwif->mate->dma_base) { 134 if ((dma_stat & 0x80) && hwif->mate && hwif->mate->dma_base) {
130 printk(KERN_INFO "%s: simplex device: DMA disabled\n", d->name); 135 printk(KERN_INFO "%s %s: simplex device: DMA disabled\n",
136 d->name, pci_name(dev));
131 return -1; 137 return -1;
132 } 138 }
133out: 139out:
@@ -149,8 +155,8 @@ int ide_pci_set_master(struct pci_dev *dev, const char *name)
149 155
150 if (pci_read_config_word(dev, PCI_COMMAND, &pcicmd) || 156 if (pci_read_config_word(dev, PCI_COMMAND, &pcicmd) ||
151 (pcicmd & PCI_COMMAND_MASTER) == 0) { 157 (pcicmd & PCI_COMMAND_MASTER) == 0) {
152 printk(KERN_ERR "%s: error updating PCICMD on %s\n", 158 printk(KERN_ERR "%s %s: error updating PCICMD\n",
153 name, pci_name(dev)); 159 name, pci_name(dev));
154 return -EIO; 160 return -EIO;
155 } 161 }
156 } 162 }
@@ -162,9 +168,9 @@ EXPORT_SYMBOL_GPL(ide_pci_set_master);
162 168
163void ide_setup_pci_noise(struct pci_dev *dev, const struct ide_port_info *d) 169void ide_setup_pci_noise(struct pci_dev *dev, const struct ide_port_info *d)
164{ 170{
165 printk(KERN_INFO "%s: IDE controller (0x%04x:0x%04x rev 0x%02x) at " 171 printk(KERN_INFO "%s %s: IDE controller (0x%04x:0x%04x rev 0x%02x)\n",
166 " PCI slot %s\n", d->name, dev->vendor, dev->device, 172 d->name, pci_name(dev),
167 dev->revision, pci_name(dev)); 173 dev->vendor, dev->device, dev->revision);
168} 174}
169EXPORT_SYMBOL_GPL(ide_setup_pci_noise); 175EXPORT_SYMBOL_GPL(ide_setup_pci_noise);
170 176
@@ -189,11 +195,12 @@ static int ide_pci_enable(struct pci_dev *dev, const struct ide_port_info *d)
189 if (pci_enable_device(dev)) { 195 if (pci_enable_device(dev)) {
190 ret = pci_enable_device_io(dev); 196 ret = pci_enable_device_io(dev);
191 if (ret < 0) { 197 if (ret < 0) {
192 printk(KERN_WARNING "%s: (ide_setup_pci_device:) " 198 printk(KERN_WARNING "%s %s: couldn't enable device\n",
193 "Could not enable device.\n", d->name); 199 d->name, pci_name(dev));
194 goto out; 200 goto out;
195 } 201 }
196 printk(KERN_WARNING "%s: BIOS configuration fixed.\n", d->name); 202 printk(KERN_WARNING "%s %s: BIOS configuration fixed\n",
203 d->name, pci_name(dev));
197 } 204 }
198 205
199 /* 206 /*
@@ -203,7 +210,8 @@ static int ide_pci_enable(struct pci_dev *dev, const struct ide_port_info *d)
203 */ 210 */
204 ret = pci_set_dma_mask(dev, DMA_32BIT_MASK); 211 ret = pci_set_dma_mask(dev, DMA_32BIT_MASK);
205 if (ret < 0) { 212 if (ret < 0) {
206 printk(KERN_ERR "%s: can't set dma mask\n", d->name); 213 printk(KERN_ERR "%s %s: can't set DMA mask\n",
214 d->name, pci_name(dev));
207 goto out; 215 goto out;
208 } 216 }
209 217
@@ -221,7 +229,8 @@ static int ide_pci_enable(struct pci_dev *dev, const struct ide_port_info *d)
221 229
222 ret = pci_request_selected_regions(dev, bars, d->name); 230 ret = pci_request_selected_regions(dev, bars, d->name);
223 if (ret < 0) 231 if (ret < 0)
224 printk(KERN_ERR "%s: can't reserve resources\n", d->name); 232 printk(KERN_ERR "%s %s: can't reserve resources\n",
233 d->name, pci_name(dev));
225out: 234out:
226 return ret; 235 return ret;
227} 236}
@@ -247,15 +256,18 @@ static int ide_pci_configure(struct pci_dev *dev, const struct ide_port_info *d)
247 */ 256 */
248 if (ide_setup_pci_baseregs(dev, d->name) || 257 if (ide_setup_pci_baseregs(dev, d->name) ||
249 pci_write_config_word(dev, PCI_COMMAND, pcicmd | PCI_COMMAND_IO)) { 258 pci_write_config_word(dev, PCI_COMMAND, pcicmd | PCI_COMMAND_IO)) {
250 printk(KERN_INFO "%s: device disabled (BIOS)\n", d->name); 259 printk(KERN_INFO "%s %s: device disabled (BIOS)\n",
260 d->name, pci_name(dev));
251 return -ENODEV; 261 return -ENODEV;
252 } 262 }
253 if (pci_read_config_word(dev, PCI_COMMAND, &pcicmd)) { 263 if (pci_read_config_word(dev, PCI_COMMAND, &pcicmd)) {
254 printk(KERN_ERR "%s: error accessing PCI regs\n", d->name); 264 printk(KERN_ERR "%s %s: error accessing PCI regs\n",
265 d->name, pci_name(dev));
255 return -EIO; 266 return -EIO;
256 } 267 }
257 if (!(pcicmd & PCI_COMMAND_IO)) { 268 if (!(pcicmd & PCI_COMMAND_IO)) {
258 printk(KERN_ERR "%s: unable to enable IDE controller\n", d->name); 269 printk(KERN_ERR "%s %s: unable to enable IDE controller\n",
270 d->name, pci_name(dev));
259 return -ENXIO; 271 return -ENXIO;
260 } 272 }
261 return 0; 273 return 0;
@@ -311,8 +323,9 @@ static int ide_hw_configure(struct pci_dev *dev, const struct ide_port_info *d,
311 if ((d->host_flags & IDE_HFLAG_ISA_PORTS) == 0) { 323 if ((d->host_flags & IDE_HFLAG_ISA_PORTS) == 0) {
312 if (ide_pci_check_iomem(dev, d, 2 * port) || 324 if (ide_pci_check_iomem(dev, d, 2 * port) ||
313 ide_pci_check_iomem(dev, d, 2 * port + 1)) { 325 ide_pci_check_iomem(dev, d, 2 * port + 1)) {
314 printk(KERN_ERR "%s: I/O baseregs (BIOS) are reported " 326 printk(KERN_ERR "%s %s: I/O baseregs (BIOS) are "
315 "as MEM for port %d!\n", d->name, port); 327 "reported as MEM for port %d!\n",
328 d->name, pci_name(dev), port);
316 return -EINVAL; 329 return -EINVAL;
317 } 330 }
318 331
@@ -325,8 +338,8 @@ static int ide_hw_configure(struct pci_dev *dev, const struct ide_port_info *d,
325 } 338 }
326 339
327 if (!base || !ctl) { 340 if (!base || !ctl) {
328 printk(KERN_ERR "%s: bad PCI BARs for port %d, skipping\n", 341 printk(KERN_ERR "%s %s: bad PCI BARs for port %d, skipping\n",
329 d->name, port); 342 d->name, pci_name(dev), port);
330 return -EINVAL; 343 return -EINVAL;
331 } 344 }
332 345
@@ -414,14 +427,16 @@ static int ide_setup_pci_controller(struct pci_dev *dev,
414 427
415 ret = pci_read_config_word(dev, PCI_COMMAND, &pcicmd); 428 ret = pci_read_config_word(dev, PCI_COMMAND, &pcicmd);
416 if (ret < 0) { 429 if (ret < 0) {
417 printk(KERN_ERR "%s: error accessing PCI regs\n", d->name); 430 printk(KERN_ERR "%s %s: error accessing PCI regs\n",
431 d->name, pci_name(dev));
418 goto out; 432 goto out;
419 } 433 }
420 if (!(pcicmd & PCI_COMMAND_IO)) { /* is device disabled? */ 434 if (!(pcicmd & PCI_COMMAND_IO)) { /* is device disabled? */
421 ret = ide_pci_configure(dev, d); 435 ret = ide_pci_configure(dev, d);
422 if (ret < 0) 436 if (ret < 0)
423 goto out; 437 goto out;
424 printk(KERN_INFO "%s: device enabled (Linux)\n", d->name); 438 printk(KERN_INFO "%s %s: device enabled (Linux)\n",
439 d->name, pci_name(dev));
425 } 440 }
426 441
427out: 442out:
@@ -460,7 +475,8 @@ void ide_pci_setup_ports(struct pci_dev *dev, const struct ide_port_info *d,
460 475
461 if (e->reg && (pci_read_config_byte(dev, e->reg, &tmp) || 476 if (e->reg && (pci_read_config_byte(dev, e->reg, &tmp) ||
462 (tmp & e->mask) != e->val)) { 477 (tmp & e->mask) != e->val)) {
463 printk(KERN_INFO "%s: IDE port disabled\n", d->name); 478 printk(KERN_INFO "%s %s: IDE port disabled\n",
479 d->name, pci_name(dev));
464 continue; /* port not enabled */ 480 continue; /* port not enabled */
465 } 481 }
466 482
@@ -506,18 +522,15 @@ static int do_ide_setup_pci_device(struct pci_dev *dev,
506 /* Is it an "IDE storage" device in non-PCI mode? */ 522 /* Is it an "IDE storage" device in non-PCI mode? */
507 if ((dev->class >> 8) == PCI_CLASS_STORAGE_IDE && (dev->class & 5) != 5) { 523 if ((dev->class >> 8) == PCI_CLASS_STORAGE_IDE && (dev->class & 5) != 5) {
508 if (noisy) 524 if (noisy)
509 printk(KERN_INFO "%s: not 100%% native mode: " 525 printk(KERN_INFO "%s %s: not 100%% native mode: will "
510 "will probe irqs later\n", d->name); 526 "probe irqs later\n", d->name, pci_name(dev));
511 pciirq = ret; 527 pciirq = ret;
512 } else if (!pciirq) { 528 } else if (!pciirq && noisy) {
513 if (noisy) 529 printk(KERN_WARNING "%s %s: bad irq (%d): will probe later\n",
514 printk(KERN_WARNING "%s: bad irq (%d): will probe later\n", 530 d->name, pci_name(dev), pciirq);
515 d->name, pciirq); 531 } else if (noisy) {
516 pciirq = 0; 532 printk(KERN_INFO "%s %s: 100%% native mode on irq %d\n",
517 } else { 533 d->name, pci_name(dev), pciirq);
518 if (noisy)
519 printk(KERN_INFO "%s: 100%% native mode on irq %d\n",
520 d->name, pciirq);
521 } 534 }
522 535
523 ret = pciirq; 536 ret = pciirq;
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-10 11:17:54 -0500