2021-03-30 01:50:25

by Sujit Kautkar

Subject: [PATCH] arm64: dts: qcom: Move rmtfs memory region

Move rmtfs memory region so that it does not overlap with system
RAM (kernel data) when KAsan is enabled. This puts rmtfs right
after mba_mem which is not supposed to increase beyond 0x94600000

Signed-off-by: Sujit Kautkar <[email protected]>
---
arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 2 +-
arch/arm64/boot/dts/qcom/sc7180.dtsi | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
index 07c8b2c926c0..fe052b477b72 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
@@ -45,7 +45,7 @@ trips {

/* Increase the size from 2MB to 8MB */
&rmtfs_mem {
- reg = <0x0 0x84400000 0x0 0x800000>;
+ reg = <0x0 0x94600000 0x0 0x800000>;
};

/ {
diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi
index 1ea3344ab62c..ac956488908f 100644
--- a/arch/arm64/boot/dts/qcom/sc7180.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi
@@ -110,9 +110,9 @@ tz_mem: memory@80b00000 {
no-map;
};

- rmtfs_mem: memory@84400000 {
+ rmtfs_mem: memory@94600000 {
compatible = "qcom,rmtfs-mem";
- reg = <0x0 0x84400000 0x0 0x200000>;
+ reg = <0x0 0x94600000 0x0 0x200000>;
no-map;

qcom,client-id = <1>;
--
2.29.2

2021-03-30 18:49:31

by Stephen Boyd

Subject: Re: [PATCH] arm64: dts: qcom: Move rmtfs memory region

Quoting Sujit Kautkar (2021-03-29 18:46:10)
> Move rmtfs memory region so that it does not overlap with system
> RAM (kernel data) when KAsan is enabled. This puts rmtfs right
> after mba_mem which is not supposed to increase beyond 0x94600000
>
> Signed-off-by: Sujit Kautkar <[email protected]>
> ---

Reviewed-by: Stephen Boyd <[email protected]>

2021-04-08 05:18:50

by Sibi Sankar

Subject: Re: [PATCH] arm64: dts: qcom: Move rmtfs memory region

Hey Sujit,
Thanks for the patch.

On 2021-03-30 07:16, Sujit Kautkar wrote:
> Move rmtfs memory region so that it does not overlap with system
> RAM (kernel data) when KAsan is enabled. This puts rmtfs right
> after mba_mem which is not supposed to increase beyond 0x94600000
>
> Signed-off-by: Sujit Kautkar <[email protected]>
> ---
> arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 2 +-
> arch/arm64/boot/dts/qcom/sc7180.dtsi | 4 ++--
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
> b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
> index 07c8b2c926c0..fe052b477b72 100644
> --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
> @@ -45,7 +45,7 @@ trips {
>
> /* Increase the size from 2MB to 8MB */
> &rmtfs_mem {
> - reg = <0x0 0x84400000 0x0 0x800000>;
> + reg = <0x0 0x94600000 0x0 0x800000>;

Sorry for the late comments. Can you
please do the same for sc7180-idp
as well?

Reviewed-by: Sibi Sankar <[email protected]>

> };
>
> / {
> diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi
> b/arch/arm64/boot/dts/qcom/sc7180.dtsi
> index 1ea3344ab62c..ac956488908f 100644
> --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi
> @@ -110,9 +110,9 @@ tz_mem: memory@80b00000 {
> no-map;
> };
>
> - rmtfs_mem: memory@84400000 {
> + rmtfs_mem: memory@94600000 {
> compatible = "qcom,rmtfs-mem";
> - reg = <0x0 0x84400000 0x0 0x200000>;
> + reg = <0x0 0x94600000 0x0 0x200000>;
> no-map;
>
> qcom,client-id = <1>;

--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project.