b1f9e5e355
We used to assign IRQs for all devices at boot-time, before any drivers claimed devices. The following commits:30fdfb929e("PCI: Add a call to pci_assign_irq() in pci_device_probe()")0e4c2eeb75("alpha/PCI: Replace pci_fixup_irqs() call with host bridge IRQ mapping hooks") changed this so we now call pci_assign_irq() from pci_device_probe() when we call a driver's probe method. The ide_scan_pcibus() path (enabled by CONFIG_IDEPCI_PCIBUS_ORDER) bypasses pci_device_probe() so it can guarantee devices are claimed in order of PCI bus address. It calls the driver's probe method directly, so it misses the pci_assign_irq() call (and other PCI initialization functions), which causes failures like this: ide0: disabled, no IRQ ide0: failed to initialize IDE interface ide0: disabling port cmd64x 0000:00:02.0: IDE controller (0x1095:0x0646 rev 0x07) CMD64x_IDE 0000:00:02.0: BAR 0: can't reserve [io 0x8050-0x8057] cmd64x 0000:00:02.0: can't reserve resources CMD64x_IDE: probe of 0000:00:02.0 failed with error -16 ide_generic: please use "probe_mask=0x3f" module parameter for probing all legacy ISA IDE ports ------------[ cut here ]------------ WARNING: CPU: 0 PID: 1 at fs/sysfs/dir.c:31 sysfs_warn_dup+0x94/0xd0 sysfs: cannot create duplicate filename '/class/ide_port/ide0' ... Trace: [<fffffc000048c9f4>] sysfs_warn_dup+0x94/0xd0 [<fffffc0000330928>] warn_slowpath_fmt+0x58/0x70 [<fffffc000048c9f4>] sysfs_warn_dup+0x94/0xd0 [<fffffc0000486d40>] kernfs_path_from_node+0x30/0x60 [<fffffc00004874ac>] kernfs_put+0x16c/0x2c0 [<fffffc00004874ac>] kernfs_put+0x16c/0x2c0 [<fffffc000048d010>] sysfs_do_create_link_sd.isra.2+0x100/0x120 [<fffffc00005b9d64>] device_add+0x2a4/0x7c0 [<fffffc00005ba5cc>] device_create_groups_vargs+0x14c/0x170 [<fffffc00005ba518>] device_create_groups_vargs+0x98/0x170 [<fffffc00005ba690>] device_create+0x50/0x70 [<fffffc00005df36c>] ide_host_register+0x48c/0xa00 [<fffffc00005df330>] ide_host_register+0x450/0xa00 [<fffffc00005ba2a0>] device_register+0x20/0x50 [<fffffc00005df330>] ide_host_register+0x450/0xa00 [<fffffc00005df944>] ide_host_add+0x64/0xe0 [<fffffc000079b41c>] kobject_uevent_env+0x16c/0x710 [<fffffc0000310288>] do_one_initcall+0x68/0x260 [<fffffc00007b13bc>] kernel_init+0x1c/0x1a0 ... ---[ end trace 24a70433c3e4d374 ]--- ide0: disabling port Fix the IRQ allocation issue by calling pci_assign_irq() from ide_scan_pcidev() before probing the IDE PCI drivers, so that IRQs for a given PCI device are allocated for the IDE PCI drivers to use them for device configuration. Fixes:30fdfb929e("PCI: Add a call to pci_assign_irq() in pci_device_probe()") Fixes:0e4c2eeb75("alpha/PCI: Replace pci_fixup_irqs() call with host bridge IRQ mapping hooks") Link: http://lkml.kernel.org/r/32ec730f-c1b0-5584-cd35-f8a809122b96@roeck-us.net Reported-by: Guenter Roeck <linux@roeck-us.net> Tested-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> [bhelgaas: changelog] Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Acked-by: David S. Miller <davem@davemloft.net> Cc: Richard Henderson <rth@twiddle.net> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Cc: Matt Turner <mattst88@gmail.com>
115 lines
2.7 KiB
C
115 lines
2.7 KiB
C
/*
|
|
* support for probing IDE PCI devices in the PCI bus order
|
|
*
|
|
* Copyright (c) 1998-2000 Andre Hedrick <andre@linux-ide.org>
|
|
* Copyright (c) 1995-1998 Mark Lord
|
|
*
|
|
* May be copied or modified under the terms of the GNU General Public License
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/init.h>
|
|
#include <linux/module.h>
|
|
#include <linux/ide.h>
|
|
|
|
/*
|
|
* Module interfaces
|
|
*/
|
|
|
|
static int pre_init = 1; /* Before first ordered IDE scan */
|
|
static LIST_HEAD(ide_pci_drivers);
|
|
|
|
/*
|
|
* __ide_pci_register_driver - attach IDE driver
|
|
* @driver: pci driver
|
|
* @module: owner module of the driver
|
|
*
|
|
* Registers a driver with the IDE layer. The IDE layer arranges that
|
|
* boot time setup is done in the expected device order and then
|
|
* hands the controllers off to the core PCI code to do the rest of
|
|
* the work.
|
|
*
|
|
* Returns are the same as for pci_register_driver
|
|
*/
|
|
|
|
int __ide_pci_register_driver(struct pci_driver *driver, struct module *module,
|
|
const char *mod_name)
|
|
{
|
|
if (!pre_init)
|
|
return __pci_register_driver(driver, module, mod_name);
|
|
driver->driver.owner = module;
|
|
list_add_tail(&driver->node, &ide_pci_drivers);
|
|
return 0;
|
|
}
|
|
EXPORT_SYMBOL_GPL(__ide_pci_register_driver);
|
|
|
|
/**
|
|
* ide_scan_pcidev - find an IDE driver for a device
|
|
* @dev: PCI device to check
|
|
*
|
|
* Look for an IDE driver to handle the device we are considering.
|
|
* This is only used during boot up to get the ordering correct. After
|
|
* boot up the pci layer takes over the job.
|
|
*/
|
|
|
|
static int __init ide_scan_pcidev(struct pci_dev *dev)
|
|
{
|
|
struct list_head *l;
|
|
struct pci_driver *d;
|
|
int ret;
|
|
|
|
list_for_each(l, &ide_pci_drivers) {
|
|
d = list_entry(l, struct pci_driver, node);
|
|
if (d->id_table) {
|
|
const struct pci_device_id *id =
|
|
pci_match_id(d->id_table, dev);
|
|
|
|
if (id != NULL) {
|
|
pci_assign_irq(dev);
|
|
ret = d->probe(dev, id);
|
|
if (ret >= 0) {
|
|
dev->driver = d;
|
|
pci_dev_get(dev);
|
|
return 1;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* ide_scan_pcibus - perform the initial IDE driver scan
|
|
*
|
|
* Perform the initial bus rather than driver ordered scan of the
|
|
* PCI drivers. After this all IDE pci handling becomes standard
|
|
* module ordering not traditionally ordered.
|
|
*/
|
|
|
|
static int __init ide_scan_pcibus(void)
|
|
{
|
|
struct pci_dev *dev = NULL;
|
|
struct pci_driver *d;
|
|
struct list_head *l, *n;
|
|
|
|
pre_init = 0;
|
|
for_each_pci_dev(dev)
|
|
ide_scan_pcidev(dev);
|
|
|
|
/*
|
|
* Hand the drivers over to the PCI layer now we
|
|
* are post init.
|
|
*/
|
|
|
|
list_for_each_safe(l, n, &ide_pci_drivers) {
|
|
list_del(l);
|
|
d = list_entry(l, struct pci_driver, node);
|
|
if (__pci_register_driver(d, d->driver.owner,
|
|
d->driver.mod_name))
|
|
printk(KERN_ERR "%s: failed to register %s driver\n",
|
|
__func__, d->driver.mod_name);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
device_initcall(ide_scan_pcibus);
|