PCI: apple: Convert to {en,dis}able_device() callbacks

Now that the core host-bridge infrastructure is able to give us a callback
on each device being added or removed, convert the bus-notifier hack to it.

Link: https://lore.kernel.org/r/20241204150145.800408-3-maz@kernel.org
Signed-off-by: Marc Zyngier <maz@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Frank Li <Frank.Li@nxp.com>
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>

diff --git a/drivers/pci/controller/pcie-apple.c b/drivers/pci/controller/pcie-apple.c
index fefab2758a0646086478ae52c3ce138ef3606ad5..a7e51bc1c2fe8ec31902816e9be6749b756ec77d 100644 (file)
--- a/drivers/pci/controller/pcie-apple.c
+++ b/drivers/pci/controller/pcie-apple.c
@@ -26,7 +26,6 @@
 #include <linux/list.h>
 #include <linux/module.h>
 #include <linux/msi.h>
-#include <linux/notifier.h>
 #include <linux/of_irq.h>
 #include <linux/pci-ecam.h>
 
@@ -667,12 +666,16 @@ static struct apple_pcie_port *apple_pcie_get_port(struct pci_dev *pdev)
        return NULL;
 }
 
-static int apple_pcie_add_device(struct apple_pcie_port *port,
-                                struct pci_dev *pdev)
+static int apple_pcie_enable_device(struct pci_host_bridge *bridge, struct pci_dev *pdev)
 {
        u32 sid, rid = pci_dev_id(pdev);
+       struct apple_pcie_port *port;
        int idx, err;
 
+       port = apple_pcie_get_port(pdev);
+       if (!port)
+               return 0;
+
        dev_dbg(&pdev->dev, "added to bus %s, index %d\n",
                pci_name(pdev->bus->self), port->idx);
 
@@ -698,12 +701,16 @@ static int apple_pcie_add_device(struct apple_pcie_port *port,
        return idx >= 0 ? 0 : -ENOSPC;
 }
 
-static void apple_pcie_release_device(struct apple_pcie_port *port,
-                                     struct pci_dev *pdev)
+static void apple_pcie_disable_device(struct pci_host_bridge *bridge, struct pci_dev *pdev)
 {
+       struct apple_pcie_port *port;
        u32 rid = pci_dev_id(pdev);
        int idx;
 
+       port = apple_pcie_get_port(pdev);
+       if (!port)
+               return;
+
        mutex_lock(&port->pcie->lock);
 
        for_each_set_bit(idx, port->sid_map, port->sid_map_sz) {
@@ -721,45 +728,6 @@ static void apple_pcie_release_device(struct apple_pcie_port *port,
        mutex_unlock(&port->pcie->lock);
 }
 
-static int apple_pcie_bus_notifier(struct notifier_block *nb,
-                                  unsigned long action,
-                                  void *data)
-{
-       struct device *dev = data;
-       struct pci_dev *pdev = to_pci_dev(dev);
-       struct apple_pcie_port *port;
-       int err;
-
-       /*
-        * This is a bit ugly. We assume that if we get notified for
-        * any PCI device, we must be in charge of it, and that there
-        * is no other PCI controller in the whole system. It probably
-        * holds for now, but who knows for how long?
-        */
-       port = apple_pcie_get_port(pdev);
-       if (!port)
-               return NOTIFY_DONE;
-
-       switch (action) {
-       case BUS_NOTIFY_ADD_DEVICE:
-               err = apple_pcie_add_device(port, pdev);
-               if (err)
-                       return notifier_from_errno(err);
-               break;
-       case BUS_NOTIFY_DEL_DEVICE:
-               apple_pcie_release_device(port, pdev);
-               break;
-       default:
-               return NOTIFY_DONE;
-       }
-
-       return NOTIFY_OK;
-}
-
-static struct notifier_block apple_pcie_nb = {
-       .notifier_call = apple_pcie_bus_notifier,
-};
-
 static int apple_pcie_init(struct pci_config_window *cfg)
 {
        struct device *dev = cfg->parent;
@@ -799,23 +767,10 @@ static int apple_pcie_init(struct pci_config_window *cfg)
        return 0;
 }
 
-static int apple_pcie_probe(struct platform_device *pdev)
-{
-       int ret;
-
-       ret = bus_register_notifier(&pci_bus_type, &apple_pcie_nb);
-       if (ret)
-               return ret;
-
-       ret = pci_host_common_probe(pdev);
-       if (ret)
-               bus_unregister_notifier(&pci_bus_type, &apple_pcie_nb);
-
-       return ret;
-}
-
 static const struct pci_ecam_ops apple_pcie_cfg_ecam_ops = {
        .init           = apple_pcie_init,
+       .enable_device  = apple_pcie_enable_device,
+       .disable_device = apple_pcie_disable_device,
        .pci_ops        = {
                .map_bus        = pci_ecam_map_bus,
                .read           = pci_generic_config_read,
@@ -830,7 +785,7 @@ static const struct of_device_id apple_pcie_of_match[] = {
 MODULE_DEVICE_TABLE(of, apple_pcie_of_match);
 
 static struct platform_driver apple_pcie_driver = {
-       .probe  = apple_pcie_probe,
+       .probe  = pci_host_common_probe,
        .driver = {
                .name                   = "pcie-apple",
                .of_match_table         = apple_pcie_of_match,