Enable the pcibios_after_init hook on all powerpc platforms.
This hook is executed at the end of pcibios_init and was previously
only available on CONFIG_PPC32.

Since it is useful and not inherently limited to 32-bit mode,
remove the limitation and allow it on all powerpc platforms.

Signed-off-by: Shawn Anastasio <sh...@anastas.io>
---
 arch/powerpc/include/asm/machdep.h | 3 +--
 arch/powerpc/kernel/pci_64.c       | 4 ++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/arch/powerpc/include/asm/machdep.h 
b/arch/powerpc/include/asm/machdep.h
index 2f0ca6560e47..2fbfaa9176ed 100644
--- a/arch/powerpc/include/asm/machdep.h
+++ b/arch/powerpc/include/asm/machdep.h
@@ -150,6 +150,7 @@ struct machdep_calls {
        void            (*init)(void);
 
        void            (*kgdb_map_scc)(void);
+#endif /* CONFIG_PPC32 */
 
        /*
         * optional PCI "hooks"
@@ -157,8 +158,6 @@ struct machdep_calls {
        /* Called at then very end of pcibios_init() */
        void (*pcibios_after_init)(void);
 
-#endif /* CONFIG_PPC32 */
-
        /* Called in indirect_* to avoid touching devices */
        int (*pci_exclude_device)(struct pci_controller *, unsigned char, 
unsigned char);
 
diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c
index 9d8c10d55407..fba7fe6e4a50 100644
--- a/arch/powerpc/kernel/pci_64.c
+++ b/arch/powerpc/kernel/pci_64.c
@@ -68,6 +68,10 @@ static int __init pcibios_init(void)
 
        printk(KERN_DEBUG "PCI: Probing PCI hardware done\n");
 
+       /* Call machine dependent post-init code */
+       if (ppc_md.pcibios_after_init)
+               ppc_md.pcibios_after_init();
+
        return 0;
 }
 
-- 
2.20.1

Reply via email to