Message ID | 20190916081719.21976-4-lokeshvutla@ti.com |
---|---|
State | Accepted |
Commit | d0a37a5e510a6772bb86d3cda8d1a2c14c01a0e2 |
Delegated to: | Tom Rini |
Headers | show |
Series | arm: omap: dra7: Fix ECC test and memory priming | expand |
On Mon, Sep 16, 2019 at 01:47:17PM +0530, Lokesh Vutla wrote: > From: Krunal Bhargav <k-bhargav@ti.com> > > If ECC is enabled, we need to ensure interleaving is disabled for higher > address space. > > Signed-off-by: Krunal Bhargav <k-bhargav@ti.com> > Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> Applied to u-boot/master, thanks!
diff --git a/arch/arm/mach-omap2/emif-common.c b/arch/arm/mach-omap2/emif-common.c index 04bbfd84a2..9bdaa388c9 100644 --- a/arch/arm/mach-omap2/emif-common.c +++ b/arch/arm/mach-omap2/emif-common.c @@ -355,6 +355,9 @@ static void dra7_enable_ecc(u32 base, const struct emif_regs *regs) return; if (regs->emif_ecc_ctrl_reg & EMIF_ECC_CTRL_REG_ECC_EN_MASK) { + /* Disable high-order interleaving */ + clrbits_le32(MA_PRIORITY, MA_HIMEM_INTERLEAVE_UN_MASK); + writel(regs->emif_ecc_address_range_1, &emif->emif_ecc_address_range_1); writel(regs->emif_ecc_address_range_2,