PCI: dwc: Drop enum dw_pcie_region_type in favor of PCIE_ATU_REGION_DIR_IB/OB

Previously callers of dw_pcie_disable_atu() supplied enum
dw_pcie_region_type (DW_PCIE_REGION_INBOUND, DW_PCIE_REGION_OUTBOUND),
which dw_pcie_disable_atu() converted to the PCIE_ATU_REGION_DIR_IB or
PCIE_ATU_REGION_DIR_OB values needed to program the ATU registers.

Simplify the code by dropping the dw_pcie_region_type enum and passing
PCIE_ATU_REGION_DIR_IB or PCIE_ATU_REGION_DIR_OB directly.

Reorder dw_pcie_disable_atu() arguments to (dir, index) since "index"
indicates an ATU window in the regions of the corresponding direction.

[bhelgaas: commit log]
Link: https://lore.kernel.org/r/20220624143947.8991-11-Sergey.Semin@baikalelectronics.ru
Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Rob Herring <robh@kernel.org>
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>

diff --git a/drivers/pci/controller/dwc/pcie-designware-ep.c b/drivers/pci/controller/dwc/pcie-designware-ep.c
index 5a158813f6875cae1b500599873493a1f1c0fd2a..2e91222f7c986200206e55bbe83b3075f1b4ddec 100644 (file)
--- a/drivers/pci/controller/dwc/pcie-designware-ep.c
+++ b/drivers/pci/controller/dwc/pcie-designware-ep.c
@@ -212,7 +212,7 @@ static void dw_pcie_ep_clear_bar(struct pci_epc *epc, u8 func_no, u8 vfunc_no,
 
        __dw_pcie_ep_reset_bar(pci, func_no, bar, epf_bar->flags);
 
-       dw_pcie_disable_atu(pci, atu_index, DW_PCIE_REGION_INBOUND);
+       dw_pcie_disable_atu(pci, PCIE_ATU_REGION_DIR_IB, atu_index);
        clear_bit(atu_index, ep->ib_window_map);
        ep->epf_bar[bar] = NULL;
 }
@@ -286,7 +286,7 @@ static void dw_pcie_ep_unmap_addr(struct pci_epc *epc, u8 func_no, u8 vfunc_no,
        if (ret < 0)
                return;
 
-       dw_pcie_disable_atu(pci, atu_index, DW_PCIE_REGION_OUTBOUND);
+       dw_pcie_disable_atu(pci, PCIE_ATU_REGION_DIR_OB, atu_index);
        clear_bit(atu_index, ep->ob_window_map);
 }
 

diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c
index 9127b1a57bc14c96477b3ecc75d826b7fab21532..aaf1914388b271be3e188ea6e8c1d5507e7ab48a 100644 (file)
--- a/drivers/pci/controller/dwc/pcie-designware-host.c
+++ b/drivers/pci/controller/dwc/pcie-designware-host.c
@@ -618,7 +618,7 @@ void dw_pcie_setup_rc(struct dw_pcie_rp *pp)
                 * can't match multiple windows.
                 */
                for (i = 0; i < pci->num_ob_windows; i++)
-                       dw_pcie_disable_atu(pci, i, DW_PCIE_REGION_OUTBOUND);
+                       dw_pcie_disable_atu(pci, PCIE_ATU_REGION_DIR_OB, i);
 
                /* Get last memory resource entry */
                resource_list_for_each_entry(entry, &pp->bridge->windows) {

diff --git a/drivers/pci/controller/dwc/pcie-designware.c b/drivers/pci/controller/dwc/pcie-designware.c
index 0e846c53dfb529b7aac128a7f5ad8e66846c60fa..3cf224d79a9a9a825cb50c9121b0a8e3fb9b174f 100644 (file)
--- a/drivers/pci/controller/dwc/pcie-designware.c
+++ b/drivers/pci/controller/dwc/pcie-designware.c
@@ -353,7 +353,7 @@ static void __dw_pcie_prog_outbound_atu(struct dw_pcie *pci, u8 func_no,
        limit_addr = cpu_addr + size - 1;
 
        dw_pcie_writel_dbi(pci, PCIE_ATU_VIEWPORT,
-                          PCIE_ATU_REGION_OUTBOUND | index);
+                          PCIE_ATU_REGION_DIR_OB | index);
        dw_pcie_writel_dbi(pci, PCIE_ATU_LOWER_BASE,
                           lower_32_bits(cpu_addr));
        dw_pcie_writel_dbi(pci, PCIE_ATU_UPPER_BASE,
@@ -464,7 +464,7 @@ int dw_pcie_prog_inbound_atu(struct dw_pcie *pci, u8 func_no, int index,
                return dw_pcie_prog_inbound_atu_unroll(pci, func_no, index,
                                                       type, cpu_addr, bar);
 
-       dw_pcie_writel_dbi(pci, PCIE_ATU_VIEWPORT, PCIE_ATU_REGION_INBOUND |
+       dw_pcie_writel_dbi(pci, PCIE_ATU_VIEWPORT, PCIE_ATU_REGION_DIR_IB |
                           index);
        dw_pcie_writel_dbi(pci, PCIE_ATU_LOWER_TARGET, lower_32_bits(cpu_addr));
        dw_pcie_writel_dbi(pci, PCIE_ATU_UPPER_TARGET, upper_32_bits(cpu_addr));
@@ -491,24 +491,10 @@ int dw_pcie_prog_inbound_atu(struct dw_pcie *pci, u8 func_no, int index,
        return -EBUSY;
 }
 
-void dw_pcie_disable_atu(struct dw_pcie *pci, int index,
-                        enum dw_pcie_region_type type)
+void dw_pcie_disable_atu(struct dw_pcie *pci, u32 dir, int index)
 {
-       u32 region;
-
-       switch (type) {
-       case DW_PCIE_REGION_INBOUND:
-               region = PCIE_ATU_REGION_INBOUND;
-               break;
-       case DW_PCIE_REGION_OUTBOUND:
-               region = PCIE_ATU_REGION_OUTBOUND;
-               break;
-       default:
-               return;
-       }
-
        if (pci->iatu_unroll_enabled) {
-               if (region == PCIE_ATU_REGION_INBOUND) {
+               if (dir == PCIE_ATU_REGION_DIR_IB) {
                        dw_pcie_writel_ib_unroll(pci, index, PCIE_ATU_UNR_REGION_CTRL2,
                                                 ~(u32)PCIE_ATU_ENABLE);
                } else {
@@ -516,7 +502,7 @@ void dw_pcie_disable_atu(struct dw_pcie *pci, int index,
                                                 ~(u32)PCIE_ATU_ENABLE);
                }
        } else {
-               dw_pcie_writel_dbi(pci, PCIE_ATU_VIEWPORT, region | index);
+               dw_pcie_writel_dbi(pci, PCIE_ATU_VIEWPORT, dir | index);
                dw_pcie_writel_dbi(pci, PCIE_ATU_CR2, ~(u32)PCIE_ATU_ENABLE);
        }
 }
@@ -661,7 +647,7 @@ static void dw_pcie_iatu_detect_regions(struct dw_pcie *pci)
        max_region = dw_pcie_readl_dbi(pci, PCIE_ATU_VIEWPORT) + 1;
 
        for (i = 0; i < max_region; i++) {
-               dw_pcie_writel_dbi(pci, PCIE_ATU_VIEWPORT, PCIE_ATU_REGION_OUTBOUND | i);
+               dw_pcie_writel_dbi(pci, PCIE_ATU_VIEWPORT, PCIE_ATU_REGION_DIR_OB | i);
                dw_pcie_writel_dbi(pci, PCIE_ATU_LOWER_TARGET, 0x11110000);
                val = dw_pcie_readl_dbi(pci, PCIE_ATU_LOWER_TARGET);
                if (val == 0x11110000)
@@ -671,7 +657,7 @@ static void dw_pcie_iatu_detect_regions(struct dw_pcie *pci)
        }
 
        for (i = 0; i < max_region; i++) {
-               dw_pcie_writel_dbi(pci, PCIE_ATU_VIEWPORT, PCIE_ATU_REGION_INBOUND | i);
+               dw_pcie_writel_dbi(pci, PCIE_ATU_VIEWPORT, PCIE_ATU_REGION_DIR_IB | i);
                dw_pcie_writel_dbi(pci, PCIE_ATU_LOWER_TARGET, 0x11110000);
                val = dw_pcie_readl_dbi(pci, PCIE_ATU_LOWER_TARGET);
                if (val == 0x11110000)

diff --git a/drivers/pci/controller/dwc/pcie-designware.h b/drivers/pci/controller/dwc/pcie-designware.h
index c63ace3c3f252ed0e104b4f41e0cac0d2a00712e..72d185ff72f362c6e95f1f7a1b1533bd45bbc920 100644 (file)
--- a/drivers/pci/controller/dwc/pcie-designware.h
+++ b/drivers/pci/controller/dwc/pcie-designware.h
@@ -104,8 +104,8 @@
 #define PCIE_VERSION_TYPE              0x8FC
 
 #define PCIE_ATU_VIEWPORT              0x900
-#define PCIE_ATU_REGION_INBOUND                BIT(31)
-#define PCIE_ATU_REGION_OUTBOUND       0
+#define PCIE_ATU_REGION_DIR_IB         BIT(31)
+#define PCIE_ATU_REGION_DIR_OB         0
 #define PCIE_ATU_CR1                   0x904
 #define PCIE_ATU_INCREASE_REGION_SIZE  BIT(13)
 #define PCIE_ATU_TYPE_MEM              0x0
@@ -185,12 +185,6 @@ struct dw_pcie;
 struct dw_pcie_rp;
 struct dw_pcie_ep;
 
-enum dw_pcie_region_type {
-       DW_PCIE_REGION_UNKNOWN,
-       DW_PCIE_REGION_INBOUND,
-       DW_PCIE_REGION_OUTBOUND,
-};
-
 enum dw_pcie_device_mode {
        DW_PCIE_UNKNOWN_TYPE,
        DW_PCIE_EP_TYPE,
@@ -326,8 +320,7 @@ void dw_pcie_prog_ep_outbound_atu(struct dw_pcie *pci, u8 func_no, int index,
                                  u64 size);
 int dw_pcie_prog_inbound_atu(struct dw_pcie *pci, u8 func_no, int index,
                             int type, u64 cpu_addr, u8 bar);
-void dw_pcie_disable_atu(struct dw_pcie *pci, int index,
-                        enum dw_pcie_region_type type);
+void dw_pcie_disable_atu(struct dw_pcie *pci, u32 dir, int index);
 void dw_pcie_setup(struct dw_pcie *pci);
 void dw_pcie_iatu_detect(struct dw_pcie *pci);