Commit 30d87ef8 authored by Shawn Anastasio's avatar Shawn Anastasio Committed by Michael Ellerman

powerpc/pci: Fix pcibios_setup_device() ordering

Move PCI device setup from pcibios_add_device() and pcibios_fixup_bus() to
pcibios_bus_add_device(). This ensures that platform-specific DMA and IOMMU
setup occurs after the device has been registered in sysfs, which is a
requirement for IOMMU group assignment to work

This fixes IOMMU group assignment for hotplugged devices on pseries, where
the existing behavior results in IOMMU assignment before registration.

Thanks to Lukas Wunner <lukas@wunner.de> for the suggestion.
Signed-off-by: default avatarShawn Anastasio <shawn@anastas.io>
Tested-by: default avatarAlexey Kardashevskiy <aik@ozlabs.ru>
Reviewed-by: default avatarAlexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20191028085424.12006-2-oohall@gmail.com
parent 3b5b9997
...@@ -261,12 +261,6 @@ int pcibios_sriov_disable(struct pci_dev *pdev) ...@@ -261,12 +261,6 @@ int pcibios_sriov_disable(struct pci_dev *pdev)
#endif /* CONFIG_PCI_IOV */ #endif /* CONFIG_PCI_IOV */
void pcibios_bus_add_device(struct pci_dev *pdev)
{
if (ppc_md.pcibios_bus_add_device)
ppc_md.pcibios_bus_add_device(pdev);
}
static resource_size_t pcibios_io_size(const struct pci_controller *hose) static resource_size_t pcibios_io_size(const struct pci_controller *hose)
{ {
#ifdef CONFIG_PPC64 #ifdef CONFIG_PPC64
...@@ -987,15 +981,17 @@ static void pcibios_setup_device(struct pci_dev *dev) ...@@ -987,15 +981,17 @@ static void pcibios_setup_device(struct pci_dev *dev)
ppc_md.pci_irq_fixup(dev); ppc_md.pci_irq_fixup(dev);
} }
int pcibios_add_device(struct pci_dev *dev) void pcibios_bus_add_device(struct pci_dev *pdev)
{ {
/* /* Perform platform-specific device setup */
* We can only call pcibios_setup_device() after bus setup is complete, pcibios_setup_device(pdev);
* since some of the platform specific DMA setup code depends on it.
*/ if (ppc_md.pcibios_bus_add_device)
if (dev->bus->is_added) ppc_md.pcibios_bus_add_device(pdev);
pcibios_setup_device(dev); }
int pcibios_add_device(struct pci_dev *dev)
{
#ifdef CONFIG_PCI_IOV #ifdef CONFIG_PCI_IOV
if (ppc_md.pcibios_fixup_sriov) if (ppc_md.pcibios_fixup_sriov)
ppc_md.pcibios_fixup_sriov(dev); ppc_md.pcibios_fixup_sriov(dev);
...@@ -1037,9 +1033,6 @@ void pcibios_fixup_bus(struct pci_bus *bus) ...@@ -1037,9 +1033,6 @@ void pcibios_fixup_bus(struct pci_bus *bus)
/* Now fixup the bus bus */ /* Now fixup the bus bus */
pcibios_setup_bus_self(bus); pcibios_setup_bus_self(bus);
/* Now fixup devices on that bus */
pcibios_setup_bus_devices(bus);
} }
EXPORT_SYMBOL(pcibios_fixup_bus); EXPORT_SYMBOL(pcibios_fixup_bus);
......
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