admin/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-12-07 20:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

arm64: dts: qcom: sdm845: Define guard pages within the rmtfs region

Browse Source 
Use qcom,use-guard-pages property instead of polluting device-tree with
lower and upper rmtfs guard nodes.

No functional change intended.

cosmetic: set name the node rmtfs-region.

Signed-off-by: David Heidelberg <david@ixit.cz>
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Tested-By: Paul Sajna <sajattack@postmarketos.org>
Link: https://lore.kernel.org/r/20251020-sdm845-use-guard-pages-v1-1-64d714f8bd73@ixit.cz
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
This commit is contained in:
David Heidelberg
2025-10-20 23:12:56 +02:00
committed by Bjorn Andersson
parent 720ebcc3e6
commit ab9a2c821a
2 changed files with 6 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi
View File

@@ -99,26 +99,15 @@
no-map;
};
/* rmtfs lower guard */
memory@f0800000 {
reg = <0 0xf0800000 0 0x1000>;
no-map;
};
rmtfs_mem: memory@f0801000 {
rmtfs_mem: rmtfs-region@f0800000 {
compatible = "qcom,rmtfs-mem";
reg = <0 0xf0801000 0 0x200000>;
reg = <0 0xf0800000 0 0x202000>;
qcom,use-guard-pages;
no-map;
qcom,client-id = <1>;
qcom,vmid = <QCOM_SCM_VMID_MSS_MSA>;
};
/* rmtfs upper guard */
memory@f0a01000 {
reg = <0 0xf0a01000 0 0x1000>;
no-map;
};
};
gpio-keys {

18
arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
View File

@@ -75,32 +75,20 @@
};
reserved-memory {
/*
* The rmtfs_mem needs to be guarded due to "XPU limitations"
* it is otherwise possible for an allocation adjacent to the
* rmtfs_mem region to trigger an XPU violation, causing a crash.
*/
rmtfs_lower_guard: rmtfs-lower-guard@f5b00000 {
no-map;
reg = <0 0xf5b00000 0 0x1000>;
};
/*
* The rmtfs memory region in downstream is 'dynamically allocated'
* but given the same address every time. Hard code it as this address is
* where the modem firmware expects it to be.
*/
rmtfs_mem: rmtfs-mem@f5b01000 {
rmtfs_mem: rmtfs-region@f5b00000 {
compatible = "qcom,rmtfs-mem";
reg = <0 0xf5b01000 0 0x200000>;
reg = <0 0xf5b00000 0 0x202000>;
qcom,use-guard-pages;
no-map;
qcom,client-id = <1>;
qcom,vmid = <QCOM_SCM_VMID_MSS_MSA>;
};
rmtfs_upper_guard: rmtfs-upper-guard@f5d01000 {
no-map;
reg = <0 0xf5d01000 0 0x1000>;
};
/*
* It seems like reserving the old rmtfs_mem region is also needed to prevent