From d0bec10a7f7962c9435267caba3684f209280319 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Tue, 20 Feb 2024 11:20:56 +0100 Subject: Revert "PCI: layerscape: Add the endpoint linkup notifier support" This reverts commit 4be323c73797bcebd0f9d1642e4705c13c3749d2. Downstream NXP and stable have deviated to far, do not pull this in. Signed-off-by: Max Krummenacher --- drivers/pci/controller/dwc/pci-layerscape-ep.c | 100 +------------------------ 1 file changed, 1 insertion(+), 99 deletions(-) diff --git a/drivers/pci/controller/dwc/pci-layerscape-ep.c b/drivers/pci/controller/dwc/pci-layerscape-ep.c index 5b27554e071a..ad99707b3b99 100644 --- a/drivers/pci/controller/dwc/pci-layerscape-ep.c +++ b/drivers/pci/controller/dwc/pci-layerscape-ep.c @@ -18,20 +18,6 @@ #include "pcie-designware.h" -#define PEX_PF0_CONFIG 0xC0014 -#define PEX_PF0_CFG_READY BIT(0) - -/* PEX PFa PCIE PME and message interrupt registers*/ -#define PEX_PF0_PME_MES_DR 0xC0020 -#define PEX_PF0_PME_MES_DR_LUD BIT(7) -#define PEX_PF0_PME_MES_DR_LDD BIT(9) -#define PEX_PF0_PME_MES_DR_HRD BIT(10) - -#define PEX_PF0_PME_MES_IER 0xC0028 -#define PEX_PF0_PME_MES_IER_LUDIE BIT(7) -#define PEX_PF0_PME_MES_IER_LDDIE BIT(9) -#define PEX_PF0_PME_MES_IER_HRDIE BIT(10) - #define to_ls_pcie_ep(x) dev_get_drvdata((x)->dev) struct ls_pcie_ep_drvdata { @@ -44,84 +30,8 @@ struct ls_pcie_ep { struct dw_pcie *pci; struct pci_epc_features *ls_epc; const struct ls_pcie_ep_drvdata *drvdata; - int irq; - bool big_endian; }; -static u32 ls_lut_readl(struct ls_pcie_ep *pcie, u32 offset) -{ - struct dw_pcie *pci = pcie->pci; - - if (pcie->big_endian) - return ioread32be(pci->dbi_base + offset); - else - return ioread32(pci->dbi_base + offset); -} - -static void ls_lut_writel(struct ls_pcie_ep *pcie, u32 offset, u32 value) -{ - struct dw_pcie *pci = pcie->pci; - - if (pcie->big_endian) - iowrite32be(value, pci->dbi_base + offset); - else - iowrite32(value, pci->dbi_base + offset); -} - -static irqreturn_t ls_pcie_ep_event_handler(int irq, void *dev_id) -{ - struct ls_pcie_ep *pcie = dev_id; - struct dw_pcie *pci = pcie->pci; - u32 val, cfg; - - val = ls_lut_readl(pcie, PEX_PF0_PME_MES_DR); - ls_lut_writel(pcie, PEX_PF0_PME_MES_DR, val); - - if (!val) - return IRQ_NONE; - - if (val & PEX_PF0_PME_MES_DR_LUD) { - cfg = ls_lut_readl(pcie, PEX_PF0_CONFIG); - cfg |= PEX_PF0_CFG_READY; - ls_lut_writel(pcie, PEX_PF0_CONFIG, cfg); - dw_pcie_ep_linkup(&pci->ep); - - dev_dbg(pci->dev, "Link up\n"); - } else if (val & PEX_PF0_PME_MES_DR_LDD) { - dev_dbg(pci->dev, "Link down\n"); - } else if (val & PEX_PF0_PME_MES_DR_HRD) { - dev_dbg(pci->dev, "Hot reset\n"); - } - - return IRQ_HANDLED; -} - -static int ls_pcie_ep_interrupt_init(struct ls_pcie_ep *pcie, - struct platform_device *pdev) -{ - u32 val; - int ret; - - pcie->irq = platform_get_irq_byname(pdev, "pme"); - if (pcie->irq < 0) - return pcie->irq; - - ret = devm_request_irq(&pdev->dev, pcie->irq, ls_pcie_ep_event_handler, - IRQF_SHARED, pdev->name, pcie); - if (ret) { - dev_err(&pdev->dev, "Can't register PCIe IRQ\n"); - return ret; - } - - /* Enable interrupts */ - val = ls_lut_readl(pcie, PEX_PF0_PME_MES_IER); - val |= PEX_PF0_PME_MES_IER_LDDIE | PEX_PF0_PME_MES_IER_HRDIE | - PEX_PF0_PME_MES_IER_LUDIE; - ls_lut_writel(pcie, PEX_PF0_PME_MES_IER, val); - - return 0; -} - static const struct pci_epc_features* ls_pcie_ep_get_features(struct dw_pcie_ep *ep) { @@ -214,7 +124,6 @@ static int __init ls_pcie_ep_probe(struct platform_device *pdev) struct ls_pcie_ep *pcie; struct pci_epc_features *ls_epc; struct resource *dbi_base; - int ret; pcie = devm_kzalloc(dev, sizeof(*pcie), GFP_KERNEL); if (!pcie) @@ -234,7 +143,6 @@ static int __init ls_pcie_ep_probe(struct platform_device *pdev) pci->ops = pcie->drvdata->dw_pcie_ops; ls_epc->bar_fixed_64bit = (1 << BAR_2) | (1 << BAR_4); - ls_epc->linkup_notifier = true; pcie->pci = pci; pcie->ls_epc = ls_epc; @@ -246,15 +154,9 @@ static int __init ls_pcie_ep_probe(struct platform_device *pdev) pci->ep.ops = &ls_pcie_ep_ops; - pcie->big_endian = of_property_read_bool(dev->of_node, "big-endian"); - platform_set_drvdata(pdev, pcie); - ret = dw_pcie_ep_init(&pci->ep); - if (ret) - return ret; - - return ls_pcie_ep_interrupt_init(pcie, pdev); + return dw_pcie_ep_init(&pci->ep); } static struct platform_driver ls_pcie_ep_driver = { -- cgit v1.2.3