Commit 3ff32efb authored by Oliver O'Halloran's avatar Oliver O'Halloran Committed by Michael Ellerman

powerpc/eeh: Remove PHB check in probe

This check for a missing PHB has existing in various forms since the
initial PPC64 port was upstreamed in 2002. The idea seems to be that we
need to guard against creating pci-specific data structures for the non-pci
children of a PCI device tree node (e.g. USB devices). However, we only
create pci_dn structures for DT nodes that correspond to PCI devices so
there's not much point in doing this check in the eeh_probe path.
Reviewed-by: default avatarSam Bobroff <sbobroff@linux.ibm.com>
Signed-off-by: default avatarOliver O'Halloran <oohall@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200306073904.4737-4-oohall@gmail.com
parent a4b4f61d
...@@ -1120,7 +1120,6 @@ core_initcall_sync(eeh_init); ...@@ -1120,7 +1120,6 @@ core_initcall_sync(eeh_init);
*/ */
void eeh_add_device_early(struct pci_dn *pdn) void eeh_add_device_early(struct pci_dn *pdn)
{ {
struct pci_controller *phb = pdn ? pdn->phb : NULL;
struct eeh_dev *edev = pdn_to_eeh_dev(pdn); struct eeh_dev *edev = pdn_to_eeh_dev(pdn);
if (!edev) if (!edev)
...@@ -1129,11 +1128,6 @@ void eeh_add_device_early(struct pci_dn *pdn) ...@@ -1129,11 +1128,6 @@ void eeh_add_device_early(struct pci_dn *pdn)
if (!eeh_has_flag(EEH_PROBE_MODE_DEVTREE)) if (!eeh_has_flag(EEH_PROBE_MODE_DEVTREE))
return; return;
/* USB Bus children of PCI devices will not have BUID's */
if (NULL == phb ||
(eeh_has_flag(EEH_PROBE_MODE_DEVTREE) && 0 == phb->buid))
return;
eeh_ops->probe(pdn, NULL); eeh_ops->probe(pdn, NULL);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment