powerpc/eeh: Replace pci_dn with eeh_dev for EEH address cache
With original EEH implementation, struct pci_dn is used while building PCI I/O address cache, which helps on searching the corresponding PCI device according to the given physical I/O address. Besides, pci_dn is associated with the corresponding PCI device while building its I/O cache. The patch replaces struct pci_dn with struct eeh_dev so that EEH address cache won't depend on struct pci_dn. That will help EEH to become an independent module in future. Besides, the binding of eeh_dev and PCI device is done while building PCI device I/O cache. Signed-off-by: Gavin Shan <shangw@linux.vnet.ibm.com> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
parent
44da8edc6a
commit
d50a7d4c6f
|
@ -175,7 +175,7 @@ pci_addr_cache_insert(struct pci_dev *dev, unsigned long alo,
|
||||||
static void __pci_addr_cache_insert_device(struct pci_dev *dev)
|
static void __pci_addr_cache_insert_device(struct pci_dev *dev)
|
||||||
{
|
{
|
||||||
struct device_node *dn;
|
struct device_node *dn;
|
||||||
struct pci_dn *pdn;
|
struct eeh_dev *edev;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
dn = pci_device_to_OF_node(dev);
|
dn = pci_device_to_OF_node(dev);
|
||||||
|
@ -184,13 +184,19 @@ static void __pci_addr_cache_insert_device(struct pci_dev *dev)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
edev = of_node_to_eeh_dev(dn);
|
||||||
|
if (!edev) {
|
||||||
|
pr_warning("PCI: no EEH dev found for dn=%s\n",
|
||||||
|
dn->full_name);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
/* Skip any devices for which EEH is not enabled. */
|
/* Skip any devices for which EEH is not enabled. */
|
||||||
pdn = PCI_DN(dn);
|
if (!(edev->mode & EEH_MODE_SUPPORTED) ||
|
||||||
if (!(pdn->eeh_mode & EEH_MODE_SUPPORTED) ||
|
edev->mode & EEH_MODE_NOCHECK) {
|
||||||
pdn->eeh_mode & EEH_MODE_NOCHECK) {
|
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
printk(KERN_INFO "PCI: skip building address cache for=%s - %s\n",
|
pr_info("PCI: skip building address cache for=%s - %s\n",
|
||||||
pci_name(dev), pdn->node->full_name);
|
pci_name(dev), dn->full_name);
|
||||||
#endif
|
#endif
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -281,6 +287,7 @@ void pci_addr_cache_remove_device(struct pci_dev *dev)
|
||||||
void __init pci_addr_cache_build(void)
|
void __init pci_addr_cache_build(void)
|
||||||
{
|
{
|
||||||
struct device_node *dn;
|
struct device_node *dn;
|
||||||
|
struct eeh_dev *edev;
|
||||||
struct pci_dev *dev = NULL;
|
struct pci_dev *dev = NULL;
|
||||||
|
|
||||||
spin_lock_init(&pci_io_addr_cache_root.piar_lock);
|
spin_lock_init(&pci_io_addr_cache_root.piar_lock);
|
||||||
|
@ -291,8 +298,14 @@ void __init pci_addr_cache_build(void)
|
||||||
dn = pci_device_to_OF_node(dev);
|
dn = pci_device_to_OF_node(dev);
|
||||||
if (!dn)
|
if (!dn)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
edev = of_node_to_eeh_dev(dn);
|
||||||
|
if (!edev)
|
||||||
|
continue;
|
||||||
|
|
||||||
pci_dev_get(dev); /* matching put is in eeh_remove_device() */
|
pci_dev_get(dev); /* matching put is in eeh_remove_device() */
|
||||||
PCI_DN(dn)->pcidev = dev;
|
dev->dev.archdata.edev = edev;
|
||||||
|
edev->pdev = dev;
|
||||||
|
|
||||||
eeh_sysfs_add_device(dev);
|
eeh_sysfs_add_device(dev);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue