PCI: microchip: Add bridge_addr field to struct mc_pcie

Bridge address base is common PLDA field, add this to struct mc_pcie first.

INTx and MSI interrupt code will be changed to common code, so get the
bridge base address from port->bridge_addr instead of axi_base_addr.
The axi_base_addr is Microchip-specific data.

Link: https://lore.kernel.org/linux-pci/20240328091835.14797-5-minda.chen@starfivetech.com
Signed-off-by: Minda Chen <minda.chen@starfivetech.com>
Signed-off-by: Krzysztof Wilczyński <kwilczynski@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Conor Dooley <conor.dooley@microchip.com>

diff --git a/drivers/pci/controller/plda/pcie-microchip-host.c b/drivers/pci/controller/plda/pcie-microchip-host.c
index d9030d550482b3e68d32decbf98140c24bd394fa..c55ede80a6d0577eb652440a08ff4282ef576027 100644 (file)
--- a/drivers/pci/controller/plda/pcie-microchip-host.c
+++ b/drivers/pci/controller/plda/pcie-microchip-host.c
@@ -195,6 +195,7 @@ struct mc_pcie {
        struct irq_domain *event_domain;
        raw_spinlock_t lock;
        struct mc_msi msi;
+       void __iomem *bridge_addr;
 };
 
 struct cause {
@@ -339,8 +340,7 @@ static void mc_handle_msi(struct irq_desc *desc)
        struct irq_chip *chip = irq_desc_get_chip(desc);
        struct device *dev = port->dev;
        struct mc_msi *msi = &port->msi;
-       void __iomem *bridge_base_addr =
-               port->axi_base_addr + MC_PCIE_BRIDGE_ADDR;
+       void __iomem *bridge_base_addr = port->bridge_addr;
        unsigned long status;
        u32 bit;
        int ret;
@@ -365,8 +365,7 @@ static void mc_handle_msi(struct irq_desc *desc)
 static void mc_msi_bottom_irq_ack(struct irq_data *data)
 {
        struct mc_pcie *port = irq_data_get_irq_chip_data(data);
-       void __iomem *bridge_base_addr =
-               port->axi_base_addr + MC_PCIE_BRIDGE_ADDR;
+       void __iomem *bridge_base_addr = port->bridge_addr;
        u32 bitpos = data->hwirq;
 
        writel_relaxed(BIT(bitpos), bridge_base_addr + ISTATUS_MSI);
@@ -488,8 +487,7 @@ static void mc_handle_intx(struct irq_desc *desc)
        struct mc_pcie *port = irq_desc_get_handler_data(desc);
        struct irq_chip *chip = irq_desc_get_chip(desc);
        struct device *dev = port->dev;
-       void __iomem *bridge_base_addr =
-               port->axi_base_addr + MC_PCIE_BRIDGE_ADDR;
+       void __iomem *bridge_base_addr = port->bridge_addr;
        unsigned long status;
        u32 bit;
        int ret;
@@ -514,8 +512,7 @@ static void mc_handle_intx(struct irq_desc *desc)
 static void mc_ack_intx_irq(struct irq_data *data)
 {
        struct mc_pcie *port = irq_data_get_irq_chip_data(data);
-       void __iomem *bridge_base_addr =
-               port->axi_base_addr + MC_PCIE_BRIDGE_ADDR;
+       void __iomem *bridge_base_addr = port->bridge_addr;
        u32 mask = BIT(data->hwirq + PM_MSI_INT_INTX_SHIFT);
 
        writel_relaxed(mask, bridge_base_addr + ISTATUS_LOCAL);
@@ -524,8 +521,7 @@ static void mc_ack_intx_irq(struct irq_data *data)
 static void mc_mask_intx_irq(struct irq_data *data)
 {
        struct mc_pcie *port = irq_data_get_irq_chip_data(data);
-       void __iomem *bridge_base_addr =
-               port->axi_base_addr + MC_PCIE_BRIDGE_ADDR;
+       void __iomem *bridge_base_addr = port->bridge_addr;
        unsigned long flags;
        u32 mask = BIT(data->hwirq + PM_MSI_INT_INTX_SHIFT);
        u32 val;
@@ -540,8 +536,7 @@ static void mc_mask_intx_irq(struct irq_data *data)
 static void mc_unmask_intx_irq(struct irq_data *data)
 {
        struct mc_pcie *port = irq_data_get_irq_chip_data(data);
-       void __iomem *bridge_base_addr =
-               port->axi_base_addr + MC_PCIE_BRIDGE_ADDR;
+       void __iomem *bridge_base_addr = port->bridge_addr;
        unsigned long flags;
        u32 mask = BIT(data->hwirq + PM_MSI_INT_INTX_SHIFT);
        u32 val;
@@ -896,8 +891,7 @@ static void mc_pcie_setup_window(void __iomem *bridge_base_addr, u32 index,
 static int mc_pcie_setup_windows(struct platform_device *pdev,
                                 struct mc_pcie *port)
 {
-       void __iomem *bridge_base_addr =
-               port->axi_base_addr + MC_PCIE_BRIDGE_ADDR;
+       void __iomem *bridge_base_addr = port->bridge_addr;
        struct pci_host_bridge *bridge = platform_get_drvdata(pdev);
        struct resource_entry *entry;
        u64 pci_addr;
@@ -1081,6 +1075,7 @@ static int mc_host_probe(struct platform_device *pdev)
        mc_disable_interrupts(port);
 
        bridge_base_addr = port->axi_base_addr + MC_PCIE_BRIDGE_ADDR;
+       port->bridge_addr = bridge_base_addr;
 
        /* Allow enabling MSI by disabling MSI-X */
        val = readl(bridge_base_addr + PCIE_PCI_IRQ_DW0);