Revert "PCI: dw-rockchip: Enumerate endpoints based on dll_link_up IRQ"

This reverts commit 0e0b45ab5d770a748487ba0ae8f77d1fb0f0de3e.

While this fake hotplugging was a nice idea, it has shown that this feature
does not handle PCIe switches correctly:
pci_bus 0004:43: busn_res: can not insert [bus 43-41] under [bus 42-41] (conflicts with (null) [bus 42-41])
pci_bus 0004:43: busn_res: [bus 43-41] end is updated to 43
pci_bus 0004:43: busn_res: can not insert [bus 43] under [bus 42-41] (conflicts with (null) [bus 42-41])
pci 0004:42:00.0: devices behind bridge are unusable because [bus 43] cannot be assigned for them
pci_bus 0004:44: busn_res: can not insert [bus 44-41] under [bus 42-41] (conflicts with (null) [bus 42-41])
pci_bus 0004:44: busn_res: [bus 44-41] end is updated to 44
pci_bus 0004:44: busn_res: can not insert [bus 44] under [bus 42-41] (conflicts with (null) [bus 42-41])
pci 0004:42:02.0: devices behind bridge are unusable because [bus 44] cannot be assigned for them
pci_bus 0004:45: busn_res: can not insert [bus 45-41] under [bus 42-41] (conflicts with (null) [bus 42-41])
pci_bus 0004:45: busn_res: [bus 45-41] end is updated to 45
pci_bus 0004:45: busn_res: can not insert [bus 45] under [bus 42-41] (conflicts with (null) [bus 42-41])
pci 0004:42:06.0: devices behind bridge are unusable because [bus 45] cannot be assigned for them
pci_bus 0004:46: busn_res: can not insert [bus 46-41] under [bus 42-41] (conflicts with (null) [bus 42-41])
pci_bus 0004:46: busn_res: [bus 46-41] end is updated to 46
pci_bus 0004:46: busn_res: can not insert [bus 46] under [bus 42-41] (conflicts with (null) [bus 42-41])
pci 0004:42:0e.0: devices behind bridge are unusable because [bus 46] cannot be assigned for them
pci_bus 0004:42: busn_res: [bus 42-41] end is updated to 46
pci_bus 0004:42: busn_res: can not insert [bus 42-46] under [bus 41] (conflicts with (null) [bus 41])
pci 0004:41:00.0: devices behind bridge are unusable because [bus 42-46] cannot be assigned for them
pcieport 0004:40:00.0: bridge has subordinate 41 but max busn 46

During the initial scan, PCI core doesn't see the switch and since the Root
Port is not hot plug capable, the secondary bus number gets assigned as the
subordinate bus number. This means, the PCI core assumes that only one bus
will appear behind the Root Port since the Root Port is not hot plug
capable.

This works perfectly fine for PCIe endpoints connected to the Root Port,
since they don't extend the bus. However, if a PCIe switch is connected,
then there is a problem when the downstream busses starts showing up and
the PCI core doesn't extend the subordinate bus number and bridge resources
after initial scan during boot.

The long term plan is to migrate this driver to the upcoming pwrctrl APIs
that are supposed to handle this problem elegantly.

Suggested-by: Manivannan Sadhasivam <mani@kernel.org>
Signed-off-by: Niklas Cassel <cassel@kernel.org>
Signed-off-by: Manivannan Sadhasivam <mani@kernel.org>
Tested-by: Shawn Lin <shawn.lin@rock-chips.com>
Acked-by: Shawn Lin <shawn.lin@rock-chips.com>
Cc: stable@vger.kernel.org
Link: https://patch.msgid.link/20251222064207.3246632-10-cassel@kernel.org

diff --git a/drivers/pci/controller/dwc/pcie-dw-rockchip.c b/drivers/pci/controller/dwc/pcie-dw-rockchip.c
index ca808d8f797537184566130c035bac43ce2453f6..352f513ebf0363ff0ec79fdd8d8b245eeb28474c 100644 (file)
--- a/drivers/pci/controller/dwc/pcie-dw-rockchip.c
+++ b/drivers/pci/controller/dwc/pcie-dw-rockchip.c
@@ -508,34 +508,6 @@ static const struct dw_pcie_ops dw_pcie_ops = {
        .get_ltssm = rockchip_pcie_get_ltssm,
 };
 
-static irqreturn_t rockchip_pcie_rc_sys_irq_thread(int irq, void *arg)
-{
-       struct rockchip_pcie *rockchip = arg;
-       struct dw_pcie *pci = &rockchip->pci;
-       struct dw_pcie_rp *pp = &pci->pp;
-       struct device *dev = pci->dev;
-       u32 reg;
-
-       reg = rockchip_pcie_readl_apb(rockchip, PCIE_CLIENT_INTR_STATUS_MISC);
-       rockchip_pcie_writel_apb(rockchip, reg, PCIE_CLIENT_INTR_STATUS_MISC);
-
-       dev_dbg(dev, "PCIE_CLIENT_INTR_STATUS_MISC: %#x\n", reg);
-       dev_dbg(dev, "LTSSM_STATUS: %#x\n", rockchip_pcie_get_ltssm_reg(rockchip));
-
-       if (reg & PCIE_RDLH_LINK_UP_CHGED) {
-               if (rockchip_pcie_link_up(pci)) {
-                       msleep(PCIE_RESET_CONFIG_WAIT_MS);
-                       dev_dbg(dev, "Received Link up event. Starting enumeration!\n");
-                       /* Rescan the bus to enumerate endpoint devices */
-                       pci_lock_rescan_remove();
-                       pci_rescan_bus(pp->bridge->bus);
-                       pci_unlock_rescan_remove();
-               }
-       }
-
-       return IRQ_HANDLED;
-}
-
 static irqreturn_t rockchip_pcie_ep_sys_irq_thread(int irq, void *arg)
 {
        struct rockchip_pcie *rockchip = arg;
@@ -568,29 +540,14 @@ static irqreturn_t rockchip_pcie_ep_sys_irq_thread(int irq, void *arg)
        return IRQ_HANDLED;
 }
 
-static int rockchip_pcie_configure_rc(struct platform_device *pdev,
-                                     struct rockchip_pcie *rockchip)
+static int rockchip_pcie_configure_rc(struct rockchip_pcie *rockchip)
 {
-       struct device *dev = &pdev->dev;
        struct dw_pcie_rp *pp;
-       int irq, ret;
        u32 val;
 
        if (!IS_ENABLED(CONFIG_PCIE_ROCKCHIP_DW_HOST))
                return -ENODEV;
 
-       irq = platform_get_irq_byname(pdev, "sys");
-       if (irq < 0)
-               return irq;
-
-       ret = devm_request_threaded_irq(dev, irq, NULL,
-                                       rockchip_pcie_rc_sys_irq_thread,
-                                       IRQF_ONESHOT, "pcie-sys-rc", rockchip);
-       if (ret) {
-               dev_err(dev, "failed to request PCIe sys IRQ\n");
-               return ret;
-       }
-
        /* LTSSM enable control mode */
        val = FIELD_PREP_WM16(PCIE_LTSSM_ENABLE_ENHANCE, 1);
        rockchip_pcie_writel_apb(rockchip, val, PCIE_CLIENT_HOT_RESET_CTRL);
@@ -602,17 +559,7 @@ static int rockchip_pcie_configure_rc(struct platform_device *pdev,
        pp = &rockchip->pci.pp;
        pp->ops = &rockchip_pcie_host_ops;
 
-       ret = dw_pcie_host_init(pp);
-       if (ret) {
-               dev_err(dev, "failed to initialize host\n");
-               return ret;
-       }
-
-       /* unmask DLL up/down indicator */
-       val = FIELD_PREP_WM16(PCIE_RDLH_LINK_UP_CHGED, 0);
-       rockchip_pcie_writel_apb(rockchip, val, PCIE_CLIENT_INTR_MASK_MISC);
-
-       return ret;
+       return dw_pcie_host_init(pp);
 }
 
 static int rockchip_pcie_configure_ep(struct platform_device *pdev,
@@ -731,7 +678,7 @@ static int rockchip_pcie_probe(struct platform_device *pdev)
 
        switch (data->mode) {
        case DW_PCIE_RC_TYPE:
-               ret = rockchip_pcie_configure_rc(pdev, rockchip);
+               ret = rockchip_pcie_configure_rc(rockchip);
                if (ret)
                        goto deinit_clk;
                break;