mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-30 10:39:04 +00:00
e2e2fc3cd0
Add updated patches for 6.6. DMA/cache-handling patches have been reworked / backported from upstream. Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
77 lines
2.8 KiB
Diff
77 lines
2.8 KiB
Diff
From d0e56d1ef7398bbf76be6e48d77943cbf644688e Mon Sep 17 00:00:00 2001
|
|
From: Minda Chen <minda.chen@starfivetech.com>
|
|
Date: Mon, 8 Jan 2024 19:05:57 +0800
|
|
Subject: [PATCH 020/116] PCI: microchip: Rename two setup functions
|
|
|
|
Rename two setup functions to plda prefix. Prepare to re-use these two
|
|
setup function.
|
|
|
|
For two setup functions names are similar, rename mc_pcie_setup_windows()
|
|
to plda_pcie_setup_iomems().
|
|
|
|
Signed-off-by: Minda Chen <minda.chen@starfivetech.com>
|
|
Reviewed-by: Conor Dooley <conor.dooley@microchip.com>
|
|
---
|
|
.../pci/controller/plda/pcie-microchip-host.c | 24 +++++++++----------
|
|
1 file changed, 12 insertions(+), 12 deletions(-)
|
|
|
|
--- a/drivers/pci/controller/plda/pcie-microchip-host.c
|
|
+++ b/drivers/pci/controller/plda/pcie-microchip-host.c
|
|
@@ -838,9 +838,9 @@ static int mc_pcie_init_irq_domains(stru
|
|
return mc_allocate_msi_domains(port);
|
|
}
|
|
|
|
-static void mc_pcie_setup_window(void __iomem *bridge_base_addr, u32 index,
|
|
- phys_addr_t axi_addr, phys_addr_t pci_addr,
|
|
- size_t size)
|
|
+static void plda_pcie_setup_window(void __iomem *bridge_base_addr, u32 index,
|
|
+ phys_addr_t axi_addr, phys_addr_t pci_addr,
|
|
+ size_t size)
|
|
{
|
|
u32 atr_sz = ilog2(size) - 1;
|
|
u32 val;
|
|
@@ -876,8 +876,8 @@ static void mc_pcie_setup_window(void __
|
|
writel(0, bridge_base_addr + ATR0_PCIE_WIN0_SRC_ADDR);
|
|
}
|
|
|
|
-static int mc_pcie_setup_windows(struct platform_device *pdev,
|
|
- struct plda_pcie_rp *port)
|
|
+static int plda_pcie_setup_iomems(struct platform_device *pdev,
|
|
+ struct plda_pcie_rp *port)
|
|
{
|
|
void __iomem *bridge_base_addr = port->bridge_addr;
|
|
struct pci_host_bridge *bridge = platform_get_drvdata(pdev);
|
|
@@ -888,9 +888,9 @@ static int mc_pcie_setup_windows(struct
|
|
resource_list_for_each_entry(entry, &bridge->windows) {
|
|
if (resource_type(entry->res) == IORESOURCE_MEM) {
|
|
pci_addr = entry->res->start - entry->offset;
|
|
- mc_pcie_setup_window(bridge_base_addr, index,
|
|
- entry->res->start, pci_addr,
|
|
- resource_size(entry->res));
|
|
+ plda_pcie_setup_window(bridge_base_addr, index,
|
|
+ entry->res->start, pci_addr,
|
|
+ resource_size(entry->res));
|
|
index++;
|
|
}
|
|
}
|
|
@@ -1023,15 +1023,15 @@ static int mc_platform_init(struct pci_c
|
|
int ret;
|
|
|
|
/* Configure address translation table 0 for PCIe config space */
|
|
- mc_pcie_setup_window(bridge_base_addr, 0, cfg->res.start,
|
|
- cfg->res.start,
|
|
- resource_size(&cfg->res));
|
|
+ plda_pcie_setup_window(bridge_base_addr, 0, cfg->res.start,
|
|
+ cfg->res.start,
|
|
+ resource_size(&cfg->res));
|
|
|
|
/* Need some fixups in config space */
|
|
mc_pcie_enable_msi(port, cfg->win);
|
|
|
|
/* Configure non-config space outbound ranges */
|
|
- ret = mc_pcie_setup_windows(pdev, &port->plda);
|
|
+ ret = plda_pcie_setup_iomems(pdev, &port->plda);
|
|
if (ret)
|
|
return ret;
|
|
|