powerpc: Remove PPC_OF_PLATFORM_PCI

The Cell blade support was the last user of PPC_OF_PLATFORM_PCI, so
remove it.

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Madhavan Srinivasan <maddy@linux.ibm.com>
Link: https://patch.msgid.link/20241218105523.416573-8-mpe@ellerman.id.au

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 68d57d435bc10018762b661336f9250f0f198df6..7eafdc5ecff50557eee432965a68b19a4502778e 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -440,11 +440,6 @@ config PPC_PCI_BUS_NUM_DOMAIN_DEPENDENT
          PCI domain dependent and each PCI controller on own domain can have
          256 PCI buses, like it is on other Linux architectures.
 
-config PPC_OF_PLATFORM_PCI
-       bool
-       depends on PCI
-       depends on PPC64 # not supported on 32 bits yet
-
 config ARCH_SUPPORTS_UPROBES
        def_bool y
 

diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index f43c1198768c6402fef37ff1e3dc09f303fd6a90..d6febd297e72c9a92019d21465194013d467902a 100644 (file)
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -70,7 +70,7 @@ obj-y                         := cputable.o syscalls.o switch.o \
                                   signal.o sysfs.o cacheinfo.o time.o \
                                   prom.o traps.o setup-common.o \
                                   udbg.o misc.o io.o misc_$(BITS).o \
-                                  of_platform.o prom_parse.o firmware.o \
+                                  prom_parse.o firmware.o \
                                   hw_breakpoint_constraints.o interrupt.o \
                                   kdebugfs.o stacktrace.o syscall.o
 obj-y                          += ptrace/

diff --git a/arch/powerpc/kernel/of_platform.c b/arch/powerpc/kernel/of_platform.c
deleted file mode 100644 (file)
index adc76fa..0000000
--- a/arch/powerpc/kernel/of_platform.c
+++ /dev/null
@@ -1,102 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- *    Copyright (C) 2006 Benjamin Herrenschmidt, IBM Corp.
- *                      <benh@kernel.crashing.org>
- *    and               Arnd Bergmann, IBM Corp.
- */
-
-#undef DEBUG
-
-#include <linux/string.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/export.h>
-#include <linux/mod_devicetable.h>
-#include <linux/pci.h>
-#include <linux/platform_device.h>
-#include <linux/atomic.h>
-
-#include <asm/errno.h>
-#include <asm/topology.h>
-#include <asm/pci-bridge.h>
-#include <asm/ppc-pci.h>
-#include <asm/eeh.h>
-
-#ifdef CONFIG_PPC_OF_PLATFORM_PCI
-
-/* The probing of PCI controllers from of_platform is currently
- * 64 bits only, mostly due to gratuitous differences between
- * the 32 and 64 bits PCI code on PowerPC and the 32 bits one
- * lacking some bits needed here.
- */
-
-static int of_pci_phb_probe(struct platform_device *dev)
-{
-       struct pci_controller *phb;
-
-       /* Check if we can do that ... */
-       if (ppc_md.pci_setup_phb == NULL)
-               return -ENODEV;
-
-       pr_info("Setting up PCI bus %pOF\n", dev->dev.of_node);
-
-       /* Alloc and setup PHB data structure */
-       phb = pcibios_alloc_controller(dev->dev.of_node);
-       if (!phb)
-               return -ENODEV;
-
-       /* Setup parent in sysfs */
-       phb->parent = &dev->dev;
-
-       /* Setup the PHB using arch provided callback */
-       if (ppc_md.pci_setup_phb(phb)) {
-               pcibios_free_controller(phb);
-               return -ENODEV;
-       }
-
-       /* Process "ranges" property */
-       pci_process_bridge_OF_ranges(phb, dev->dev.of_node, 0);
-
-       /* Init pci_dn data structures */
-       pci_devs_phb_init_dynamic(phb);
-
-       /* Create EEH PE for the PHB */
-       eeh_phb_pe_create(phb);
-
-       /* Scan the bus */
-       pcibios_scan_phb(phb);
-       if (phb->bus == NULL)
-               return -ENXIO;
-
-       /* Claim resources. This might need some rework as well depending
-        * whether we are doing probe-only or not, like assigning unassigned
-        * resources etc...
-        */
-       pcibios_claim_one_bus(phb->bus);
-
-       /* Add probed PCI devices to the device model */
-       pci_bus_add_devices(phb->bus);
-
-       return 0;
-}
-
-static const struct of_device_id of_pci_phb_ids[] = {
-       { .type = "pci", },
-       { .type = "pcix", },
-       { .type = "pcie", },
-       { .type = "pciex", },
-       { .type = "ht", },
-       {}
-};
-
-static struct platform_driver of_pci_phb_driver = {
-       .probe = of_pci_phb_probe,
-       .driver = {
-               .name = "of-pci",
-               .of_match_table = of_pci_phb_ids,
-       },
-};
-
-builtin_platform_driver(of_pci_phb_driver);
-
-#endif /* CONFIG_PPC_OF_PLATFORM_PCI */