iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

powerpc: Create pci_controller_ops.enable_device_hook and shim

Browse Source 
Add pci_controller_ops.enable_device_hook,
shadowing ppc_md.pcibios_enable_device_hook.
Add a shim, and changes the callsites to use the shim.

Signed-off-by: Daniel Axtens <dja@axtens.net>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Daniel Axtens 2015-03-31 16:00:45 +11:00 committed by Michael Ellerman
parent ff9df8c87d
commit b31e79f8d9
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
arch/powerpc/include/asm/pci-bridge.h
View File

@ -27,6 +27,10 @@ struct pci_controller_ops {
void (*dma_bus_setup)(struct pci_bus *bus); void (*dma_bus_setup)(struct pci_bus *bus);
int (*probe_mode)(struct pci_bus *); int (*probe_mode)(struct pci_bus *);
/* Called when pci_enable_device() is called. Returns true to
* allow assignment/enabling of the device. */
bool (*enable_device_hook)(struct pci_dev *);
}; };
/* /*
@ -310,5 +314,16 @@ static inline int pci_probe_mode(struct pci_bus *bus)
return PCI_PROBE_NORMAL; return PCI_PROBE_NORMAL;
} }
static inline bool pcibios_enable_device_hook(struct pci_dev *dev)
{
struct pci_controller *phb = pci_bus_to_host(dev->bus);
if (phb->controller_ops.enable_device_hook)
return phb->controller_ops.enable_device_hook(dev);
if (ppc_md.pcibios_enable_device_hook)
return ppc_md.pcibios_enable_device_hook(dev);
return true;
}
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* _ASM_POWERPC_PCI_BRIDGE_H */ #endif /* _ASM_POWERPC_PCI_BRIDGE_H */

5
arch/powerpc/kernel/pci-common.c
View File

@ -1448,9 +1448,8 @@ EXPORT_SYMBOL_GPL(pcibios_finish_adding_to_bus);
int pcibios_enable_device(struct pci_dev *dev, int mask) int pcibios_enable_device(struct pci_dev *dev, int mask)
{ {
if (ppc_md.pcibios_enable_device_hook) if (!pcibios_enable_device_hook(dev))
if (!ppc_md.pcibios_enable_device_hook(dev)) return -EINVAL;
return -EINVAL;
return pci_enable_resources(dev, mask); return pci_enable_resources(dev, mask);
} }