Commit 2bbbd963 authored by Jan Luebbe's avatar Jan Luebbe Committed by Gregory CLEMENT

bus: mbus: fix window size calculation for 4GB windows

At least the Armada XP SoC supports 4GB on a single DRAM window. Because
the size register values contain the actual size - 1, the MSB is set in
that case. For example, the SDRAM window's control register's value is
0xffffffe1 for 4GB (bits 31 to 24 contain the size).

The MBUS driver reads back each window's size from registers and
calculates the actual size as (control_reg | ~DDR_SIZE_MASK) + 1, which
overflows for 32 bit values, resulting in other miscalculations further
on (a bad RAM window for the CESA crypto engine calculated by
mvebu_mbus_setup_cpu_target_nooverlap() in my case).

This patch changes the type in 'struct mbus_dram_window' from u32 to
u64, which allows us to keep using the same register calculation code in
most MBUS-using drivers (which calculate ->size - 1 again).

Fixes: fddddb52 ("bus: introduce an Marvell EBU MBus driver")
CC: stable@vger.kernel.org
Signed-off-by: default avatarJan Luebbe <jlu@pengutronix.de>
Signed-off-by: default avatarGregory CLEMENT <gregory.clement@free-electrons.com>
parent fbffee74
...@@ -720,7 +720,7 @@ mvebu_mbus_default_setup_cpu_target(struct mvebu_mbus_state *mbus) ...@@ -720,7 +720,7 @@ mvebu_mbus_default_setup_cpu_target(struct mvebu_mbus_state *mbus)
if (mbus->hw_io_coherency) if (mbus->hw_io_coherency)
w->mbus_attr |= ATTR_HW_COHERENCY; w->mbus_attr |= ATTR_HW_COHERENCY;
w->base = base & DDR_BASE_CS_LOW_MASK; w->base = base & DDR_BASE_CS_LOW_MASK;
w->size = (size | ~DDR_SIZE_MASK) + 1; w->size = (u64)(size | ~DDR_SIZE_MASK) + 1;
} }
} }
mvebu_mbus_dram_info.num_cs = cs; mvebu_mbus_dram_info.num_cs = cs;
......
...@@ -31,8 +31,8 @@ struct mbus_dram_target_info ...@@ -31,8 +31,8 @@ struct mbus_dram_target_info
struct mbus_dram_window { struct mbus_dram_window {
u8 cs_index; u8 cs_index;
u8 mbus_attr; u8 mbus_attr;
u32 base; u64 base;
u32 size; u64 size;
} cs[4]; } cs[4];
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment