From: Heiko Stuebner heiko.stuebner@theobroma-systems.com

As part of loading trustedfirmware, the SPL is required to place portions of code into the socs sram but the mmc controllers can only do dma transfers into the regular memory, not sram.

The results of this are not directly visible in u-boot itself, but manifest as security-relate cpu aborts during boot of for example Linux.

There were a number of attempts to solve this elegantly but so far discussion is still ongoing, so to make the board at least boot correctly put both mmc controllers into fifo-mode, which also circumvents the issue for now.

Signed-off-by: Heiko Stuebner heiko.stuebner@theobroma-systems.com --- changes in v2: - moved to a spl-specific property, as suggested by Philipp

arch/arm/dts/px30-evb-u-boot.dtsi | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/arch/arm/dts/px30-evb-u-boot.dtsi b/arch/arm/dts/px30-evb-u-boot.dtsi index 3de9c7068e..a2a2c07dcc 100644 --- a/arch/arm/dts/px30-evb-u-boot.dtsi +++ b/arch/arm/dts/px30-evb-u-boot.dtsi @@ -31,12 +31,15 @@ &sdmmc { u-boot,dm-pre-reloc;

- /* temporary till I find out why dma mode doesn't work */ - fifo-mode; + /* mmc to sram can't do dma, prevent aborts transfering TF-A parts */ + u-boot,spl-fifo-mode; };

&emmc { u-boot,dm-pre-reloc; + + /* mmc to sram can't do dma, prevent aborts transfering TF-A parts */ + u-boot,spl-fifo-mode; };

&grf {

On 19.11.2019, at 12:04, Heiko Stuebner heiko@sntech.de wrote:

From: Heiko Stuebner heiko.stuebner@theobroma-systems.com

Rockchips dwmmc controllers can't do dma to non-ddr addresses, like for example the soc-internal sram but during boot parts of TrustedFirmware need to be placed there from the read FIT image.

So add handling for a u-boot,spl-fifo-mode to not put the mmc controllers into fifo mode for all time.

The regular fifo-mode property still takes precedent and only if not set do we check for the spl-specific property.

Suggested-by: Philipp Tomsich philipp.tomsich@theobroma-systems.com Signed-off-by: Heiko Stuebner heiko.stuebner@theobroma-systems.com

Signed-off-by: Philipp Tomsich philipp.tomsich@theobroma-systems.com

---

drivers/mmc/rockchip_dw_mmc.c | 5 +++++ 1 file changed, 5 insertions(+)

diff --git a/drivers/mmc/rockchip_dw_mmc.c b/drivers/mmc/rockchip_dw_mmc.c index b2a1201631..a0e1be8794 100644 --- a/drivers/mmc/rockchip_dw_mmc.c +++ b/drivers/mmc/rockchip_dw_mmc.c @@ -72,6 +72,11 @@ static int rockchip_dwmmc_ofdata_to_platdata(struct udevice *dev) return -EINVAL; priv->fifo_mode = dev_read_bool(dev, "fifo-mode");

+#ifdef CONFIG_SPL_BUILD

• if (!priv->fifo_mode)

• priv->fifo_mode = dev_read_bool(dev, "u-boot,spl-fifo-mode");
  

+#endif

Nitpick: I would have used an “|=" instead of the "if(…)”.

• /*
  • 'clock-freq-min-max' is deprecated
  • (see https://github.com/torvalds/linux/commit/b023030f10573de738bbe8df63d43acab64...)

-- 2.24.0