0020-PCI-microchip-Rename-two-setup-functions.patch 2.8 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576
  1. From d0e56d1ef7398bbf76be6e48d77943cbf644688e Mon Sep 17 00:00:00 2001
  2. From: Minda Chen <[email protected]>
  3. Date: Mon, 8 Jan 2024 19:05:57 +0800
  4. Subject: [PATCH 020/116] PCI: microchip: Rename two setup functions
  5. Rename two setup functions to plda prefix. Prepare to re-use these two
  6. setup function.
  7. For two setup functions names are similar, rename mc_pcie_setup_windows()
  8. to plda_pcie_setup_iomems().
  9. Signed-off-by: Minda Chen <[email protected]>
  10. Reviewed-by: Conor Dooley <[email protected]>
  11. ---
  12. .../pci/controller/plda/pcie-microchip-host.c | 24 +++++++++----------
  13. 1 file changed, 12 insertions(+), 12 deletions(-)
  14. --- a/drivers/pci/controller/plda/pcie-microchip-host.c
  15. +++ b/drivers/pci/controller/plda/pcie-microchip-host.c
  16. @@ -838,9 +838,9 @@ static int mc_pcie_init_irq_domains(stru
  17. return mc_allocate_msi_domains(port);
  18. }
  19. -static void mc_pcie_setup_window(void __iomem *bridge_base_addr, u32 index,
  20. - phys_addr_t axi_addr, phys_addr_t pci_addr,
  21. - size_t size)
  22. +static void plda_pcie_setup_window(void __iomem *bridge_base_addr, u32 index,
  23. + phys_addr_t axi_addr, phys_addr_t pci_addr,
  24. + size_t size)
  25. {
  26. u32 atr_sz = ilog2(size) - 1;
  27. u32 val;
  28. @@ -876,8 +876,8 @@ static void mc_pcie_setup_window(void __
  29. writel(0, bridge_base_addr + ATR0_PCIE_WIN0_SRC_ADDR);
  30. }
  31. -static int mc_pcie_setup_windows(struct platform_device *pdev,
  32. - struct plda_pcie_rp *port)
  33. +static int plda_pcie_setup_iomems(struct platform_device *pdev,
  34. + struct plda_pcie_rp *port)
  35. {
  36. void __iomem *bridge_base_addr = port->bridge_addr;
  37. struct pci_host_bridge *bridge = platform_get_drvdata(pdev);
  38. @@ -888,9 +888,9 @@ static int mc_pcie_setup_windows(struct
  39. resource_list_for_each_entry(entry, &bridge->windows) {
  40. if (resource_type(entry->res) == IORESOURCE_MEM) {
  41. pci_addr = entry->res->start - entry->offset;
  42. - mc_pcie_setup_window(bridge_base_addr, index,
  43. - entry->res->start, pci_addr,
  44. - resource_size(entry->res));
  45. + plda_pcie_setup_window(bridge_base_addr, index,
  46. + entry->res->start, pci_addr,
  47. + resource_size(entry->res));
  48. index++;
  49. }
  50. }
  51. @@ -1023,15 +1023,15 @@ static int mc_platform_init(struct pci_c
  52. int ret;
  53. /* Configure address translation table 0 for PCIe config space */
  54. - mc_pcie_setup_window(bridge_base_addr, 0, cfg->res.start,
  55. - cfg->res.start,
  56. - resource_size(&cfg->res));
  57. + plda_pcie_setup_window(bridge_base_addr, 0, cfg->res.start,
  58. + cfg->res.start,
  59. + resource_size(&cfg->res));
  60. /* Need some fixups in config space */
  61. mc_pcie_enable_msi(port, cfg->win);
  62. /* Configure non-config space outbound ranges */
  63. - ret = mc_pcie_setup_windows(pdev, &port->plda);
  64. + ret = plda_pcie_setup_iomems(pdev, &port->plda);
  65. if (ret)
  66. return ret;