PCI: mobiveil: Clean-up program_{ib/ob}_windows()

In function program_ob_windows(), remove the redundant read
operations to registers PAB_AXI_AMAP_AXI_WIN and PAB_AXI_AMAP_PEX_WIN_H,
and remove the useless definition of 'value'. Rename the parameter
'config_io_bit' to 'type' and then remove the definition of 'type'.

In function program_ib_windows(), remove the definitions of
'pio_ctrl_val' and 'amap_ctrl_dw' and reduce to only one variable
'value' to keep the temporary value read from registers.

Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Reviewed-by: Minghuan Lian <Minghuan.Lian@nxp.com>
Reviewed-by: Subrahmanya Lingappa <l.subrahmanya@mobiveil.co.in>

diff --git a/drivers/pci/controller/pcie-mobiveil.c b/drivers/pci/controller/pcie-mobiveil.c
index ddc20d3f49e3d93c90616c94e440527bf17ba184..ccf9bb1008e19558cd7349ec248cfe6834a0afb9 100644 (file)
--- a/drivers/pci/controller/pcie-mobiveil.c
+++ b/drivers/pci/controller/pcie-mobiveil.c
@@ -455,8 +455,7 @@ static int mobiveil_pcie_parse_dt(struct mobiveil_pcie *pcie)
 static void program_ib_windows(struct mobiveil_pcie *pcie, int win_num,
                               int pci_addr, u32 type, u64 size)
 {
-       int pio_ctrl_val;
-       int amap_ctrl_dw;
+       u32 value;
        u64 size64 = ~(size - 1);
 
        if ((pcie->ib_wins_configured + 1) > pcie->ppio_wins) {
@@ -465,15 +464,15 @@ static void program_ib_windows(struct mobiveil_pcie *pcie, int win_num,
                return;
        }
 
-       pio_ctrl_val = csr_readl(pcie, PAB_PEX_PIO_CTRL);
-       pio_ctrl_val |= 1 << PIO_ENABLE_SHIFT;
-       csr_writel(pcie, pio_ctrl_val, PAB_PEX_PIO_CTRL);
+       value = csr_readl(pcie, PAB_PEX_PIO_CTRL);
+       value |= 1 << PIO_ENABLE_SHIFT;
+       csr_writel(pcie, value, PAB_PEX_PIO_CTRL);
 
-       amap_ctrl_dw = csr_readl(pcie, PAB_PEX_AMAP_CTRL(win_num));
-       amap_ctrl_dw |= (type << AMAP_CTRL_TYPE_SHIFT) |
+       value = csr_readl(pcie, PAB_PEX_AMAP_CTRL(win_num));
+       value |= (type << AMAP_CTRL_TYPE_SHIFT) |
                        (1 << AMAP_CTRL_EN_SHIFT) |
                        lower_32_bits(size64);
-       csr_writel(pcie, amap_ctrl_dw, PAB_PEX_AMAP_CTRL(win_num));
+       csr_writel(pcie, value, PAB_PEX_AMAP_CTRL(win_num));
 
        csr_writel(pcie, upper_32_bits(size64),
                   PAB_EXT_PEX_AMAP_SIZEN(win_num));
@@ -488,11 +487,8 @@ static void program_ib_windows(struct mobiveil_pcie *pcie, int win_num,
  * routine to program the outbound windows
  */
 static void program_ob_windows(struct mobiveil_pcie *pcie, int win_num,
-                              u64 cpu_addr, u64 pci_addr,
-                              u32 config_io_bit, u64 size)
+                              u64 cpu_addr, u64 pci_addr, u32 type, u64 size)
 {
-
-       u32 value, type;
        u64 size64 = ~(size - 1);
 
        if ((pcie->ob_wins_configured + 1) > pcie->apio_wins) {
@@ -505,8 +501,6 @@ static void program_ob_windows(struct mobiveil_pcie *pcie, int win_num,
         * program Enable Bit to 1, Type Bit to (00) base 2, AXI Window Size Bit
         * to 4 KB in PAB_AXI_AMAP_CTRL register
         */
-       type = config_io_bit;
-       value = csr_readl(pcie, PAB_AXI_AMAP_CTRL(win_num));
        csr_writel(pcie, 1 << WIN_ENABLE_SHIFT | type << WIN_TYPE_SHIFT |
                   lower_32_bits(size64), PAB_AXI_AMAP_CTRL(win_num));
 
@@ -516,12 +510,9 @@ static void program_ob_windows(struct mobiveil_pcie *pcie, int win_num,
         * program AXI window base with appropriate value in
         * PAB_AXI_AMAP_AXI_WIN0 register
         */
-       value = csr_readl(pcie, PAB_AXI_AMAP_AXI_WIN(win_num));
        csr_writel(pcie, cpu_addr & (~AXI_WINDOW_ALIGN_MASK),
                   PAB_AXI_AMAP_AXI_WIN(win_num));
 
-       value = csr_readl(pcie, PAB_AXI_AMAP_PEX_WIN_H(win_num));
-
        csr_writel(pcie, lower_32_bits(pci_addr),
                   PAB_AXI_AMAP_PEX_WIN_L(win_num));
        csr_writel(pcie, upper_32_bits(pci_addr),