Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b31e79f8 authored by Daniel Axtens's avatar Daniel Axtens Committed by Michael Ellerman
Browse files

powerpc: Create pci_controller_ops.enable_device_hook and shim 



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: default avatarDaniel Axtens <dja@axtens.net>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent ff9df8c8

arch/powerpc/include/asm/pci-bridge.h

+15 −0
Original line number Diff line number Diff line
@@ -27,6 +27,10 @@ struct pci_controller_ops { 
	void		(*dma_bus_setup)(struct pci_bus *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;

}



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	/* _ASM_POWERPC_PCI_BRIDGE_H */

arch/powerpc/kernel/pci-common.c

+2 −3
Original line number Diff line number Diff line
@@ -1448,8 +1448,7 @@ EXPORT_SYMBOL_GPL(pcibios_finish_adding_to_bus); 


int pcibios_enable_device(struct pci_dev *dev, int mask)

{

	if (ppc_md.pcibios_enable_device_hook)

		if (!ppc_md.pcibios_enable_device_hook(dev))

	if (!pcibios_enable_device_hook(dev))

		return -EINVAL;



	return pci_enable_resources(dev, mask);