[PATCH 0/2] arm64: dts: qcom: sdm845-xiaomi: Recent firmware needs bigger XBL

[PATCH 0/2] arm64: dts: qcom: sdm845-xiaomi: Recent firmware needs bigger XBL

[David Heidelberg via B4 Relay]

Applies to all known Snapdragon 845 Xiaomi devices.

Verified against the vendor trees, only vendor trees with smaller XBL
are < Android 9.0.

Needs some Tested-by, I don't own any of these two devices.

Signed-off-by: David Heidelberg <david@ixit.cz>
---
David Heidelberg (2):
      arm64: dts: qcom: sdm845-xiaomi-beryllium: Extend the xbl_mem region
      arm64: dts: qcom: sdm845-xiaomi-polaris: Extend the xbl_mem region

 arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi | 6 ++++++
 arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts           | 6 ++++++
 2 files changed, 12 insertions(+)
---
base-commit: 7079a12d7506b07fb53b54a664bfad5fa9b16d70
change-id: 20260916-sdm845-xbl-mem-12c64fcff8af

Best regards,
--  
David Heidelberg <david@ixit.cz>

[PATCH 1/2] arm64: dts: qcom: sdm845-xiaomi-beryllium: Extend the xbl_mem region

[David Heidelberg via B4 Relay]

From: David Heidelberg <david@ixit.cz>

Xiaomi's Oreo-era tree still had the CAF 1 MiB region, the 2 MiB version
arrived with the Pie import. This isn't a board-layout quirk, it tracks
the firmware. The later XBL wants one extra MiB below the old region.

Cc: stable@vger.kernel.org
Fixes: 77809cf74a8c ("arm64: dts: qcom: Add support for Xiaomi Poco F1 (Beryllium)")
Signed-off-by: David Heidelberg <david@ixit.cz>
---
 arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
index 080f5294988d3..35babe8c5f757 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
@@ -22,16 +22,17 @@
 /delete-node/ &wlan_msa_mem;
 /delete-node/ &mpss_region;
 /delete-node/ &venus_mem;
 /delete-node/ &cdsp_mem;
 /delete-node/ &mba_region;
 /delete-node/ &slpi_mem;
 /delete-node/ &spss_mem;
 /delete-node/ &rmtfs_mem;
+/delete-node/ &xbl_mem;
 
 / {
 	chassis-type = "handset";
 
 	/* required for bootloader to select correct board */
 	qcom,board-id = <69 0>;
 	qcom,msm-id = <QCOM_ID_SDM845 0x20001>;
 
@@ -66,16 +67,21 @@ key-vol-up {
 			label = "Volume Up";
 			linux,code = <KEY_VOLUMEUP>;
 			gpios = <&pm8998_gpios 6 GPIO_ACTIVE_LOW>;
 		};
 	};
 
 	/* Reserved memory changes from downstream */
 	reserved-memory {
+		xbl-mem@85d00000 {
+			reg = <0 0x85d00000 0 0x200000>;
+			no-map;
+		};
+
 		tz_mem: memory@86200000 {
 			reg = <0 0x86200000 0 0x4900000>;
 			no-map;
 		};
 
 		adsp_mem: memory@8c500000 {
 			reg = <0 0x8c500000 0 0x1e00000>;
 			no-map;

-- 
2.55.0

[PATCH 2/2] arm64: dts: qcom: sdm845-xiaomi-polaris: Extend the xbl_mem region

[David Heidelberg via B4 Relay]

From: David Heidelberg <david@ixit.cz>

Xiaomi's Oreo-era tree still had the CAF 1 MiB region, the 2 MiB version
arrived with the Pie import. This isn't a board-layout quirk, it tracks
the firmware. The later XBL wants one extra MiB below the old region.

Cc: stable@vger.kernel.org
Fixes: be497abe19bf ("arm64: dts: qcom: Add support for Xiaomi Mi Mix2s")

Signed-off-by: David Heidelberg <david@ixit.cz>
---
 arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
index d3162e4444532..a782023d0dcb3 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
@@ -27,16 +27,17 @@
 /delete-node/ &adsp_mem;
 /delete-node/ &wlan_msa_mem;
 /delete-node/ &mpss_region;
 /delete-node/ &venus_mem;
 /delete-node/ &cdsp_mem;
 /delete-node/ &mba_region;
 /delete-node/ &slpi_mem;
 /delete-node/ &spss_mem;
+/delete-node/ &xbl_mem;
 
 / {
 	model = "Xiaomi Mi MIX 2S";
 	compatible = "xiaomi,polaris", "qcom,sdm845";
 	chassis-type = "handset";
 
 	/* required for bootloader to select correct board */
 	qcom,msm-id = <QCOM_ID_SDM845 0x20001>;
@@ -58,16 +59,21 @@ key-vol-up {
 			label = "Volume Up";
 			linux,code = <KEY_VOLUMEUP>;
 			gpios = <&pm8998_gpios 6 GPIO_ACTIVE_LOW>;
 			debounce-interval = <15>;
 		};
 	};
 
 	reserved-memory {
+		xbl-mem@85d00000 {
+			reg = <0 0x85d00000 0 0x200000>;
+			no-map;
+		};
+
 		adsp_mem: memory@8c500000 {
 			reg = <0 0x8c500000 0 0x1e00000>;
 			no-map;
 		};
 
 		wlan_msa_mem: memory@8e300000 {
 			reg = <0 0x8e300000 0 0x100000>;
 			no-map;

-- 
2.55.0

Re: [PATCH 1/2] arm64: dts: qcom: sdm845-xiaomi-beryllium: Extend the xbl_mem region

[Konrad Dybcio]

On 9/16/26 12:25 AM, David Heidelberg via B4 Relay wrote:
> From: David Heidelberg <david@ixit.cz>
> 
> Xiaomi's Oreo-era tree still had the CAF 1 MiB region, the 2 MiB version
> arrived with the Pie import. This isn't a board-layout quirk, it tracks
> the firmware. The later XBL wants one extra MiB below the old region.

Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>

Konrad