Commit cf22c591 authored by Hou Zhiqiang's avatar Hou Zhiqiang Committed by Lorenzo Pieralisi
Browse files

PCI: mobiveil: Clear the control fields before updating it 



While programming the inbound and outbound windows in

program_{ib/ob}_windows()

we shoud clear the control fields in the registers before programming
it with a new value to prevent stale bits from older configuration.

Signed-off-by: default avatarHou Zhiqiang <Zhiqiang.Hou@nxp.com>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Reviewed-by: default avatarMinghuan Lian <Minghuan.Lian@nxp.com>
Reviewed-by: default avatarSubrahmanya Lingappa <l.subrahmanya@mobiveil.co.in>
parent 4b7e2e59

drivers/pci/controller/pcie-mobiveil.c

+12 −5
Original line number Diff line number Diff line
@@ -65,6 +65,8 @@ 
#define PAB_AXI_AMAP_CTRL(win)		PAB_REG_ADDR(0x0ba0, win)

#define  WIN_ENABLE_SHIFT		0

#define  WIN_TYPE_SHIFT			1

#define  WIN_TYPE_MASK			0x3

#define  WIN_SIZE_MASK			0xfffffc00



#define PAB_EXT_AXI_AMAP_SIZE(win)	PAB_EXT_REG_ADDR(0xbaf0, win)
@@ -82,6 +84,7 @@ 
#define PAB_PEX_AMAP_CTRL(win)		PAB_REG_ADDR(0x4ba0, win)

#define  AMAP_CTRL_EN_SHIFT		0

#define  AMAP_CTRL_TYPE_SHIFT		1

#define  AMAP_CTRL_TYPE_MASK		3



#define PAB_EXT_PEX_AMAP_SIZEN(win)	PAB_EXT_REG_ADDR(0xbef0, win)

#define PAB_PEX_AMAP_AXI_WIN(win)	PAB_REG_ADDR(0x4ba4, win)
@@ -469,8 +472,8 @@ static void program_ib_windows(struct mobiveil_pcie *pcie, int win_num, 
	csr_writel(pcie, value, PAB_PEX_PIO_CTRL);



	value = csr_readl(pcie, PAB_PEX_AMAP_CTRL(win_num));

	value |= (type << AMAP_CTRL_TYPE_SHIFT) |

			(1 << AMAP_CTRL_EN_SHIFT) |

	value &= ~(AMAP_CTRL_TYPE_MASK << AMAP_CTRL_TYPE_SHIFT | WIN_SIZE_MASK);

	value |= type << AMAP_CTRL_TYPE_SHIFT | 1 << AMAP_CTRL_EN_SHIFT |

		 lower_32_bits(size64);

	csr_writel(pcie, value, PAB_PEX_AMAP_CTRL(win_num));
@@ -490,6 +493,7 @@ static void program_ib_windows(struct mobiveil_pcie *pcie, int win_num, 
static void program_ob_windows(struct mobiveil_pcie *pcie, int win_num,

			       u64 cpu_addr, u64 pci_addr, u32 type, u64 size)

{

	u32 value;

	u64 size64 = ~(size - 1);



	if (win_num >= pcie->apio_wins) {
@@ -502,8 +506,11 @@ 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

	 */

	csr_writel(pcie, 1 << WIN_ENABLE_SHIFT | type << WIN_TYPE_SHIFT |

		   lower_32_bits(size64), PAB_AXI_AMAP_CTRL(win_num));

	value = csr_readl(pcie, PAB_AXI_AMAP_CTRL(win_num));

	value &= ~(WIN_TYPE_MASK << WIN_TYPE_SHIFT | WIN_SIZE_MASK);

	value |= 1 << WIN_ENABLE_SHIFT | type << WIN_TYPE_SHIFT |

		 lower_32_bits(size64);

	csr_writel(pcie, value, PAB_AXI_AMAP_CTRL(win_num));



	csr_writel(pcie, upper_32_bits(size64), PAB_EXT_AXI_AMAP_SIZE(win_num));

CRA Git | Maintained and supported by SUSTech CRA and CCSE