2024-05-22 11:40:29

by Konrad Dybcio

Subject: [PATCH] arm64: dts: qcom: x1e80100-*: Allocate some CMA buffers

In a fashion identical to commit 5f84c7c35d49 ("arm64: dts: qcom:
sc8280xp: Define CMA region for CRD and X13s"), there exists a need for
more than the default 32 MiB of CMA, namely for the ath12k_pci device.

Reserve a 128MiB chunk to make boot-time failures like:
cma: cma_alloc: reserved: alloc failed, req-size: 128 pages, ret: -12
go away.

Fixes: af16b00578a7 ("arm64: dts: qcom: Add base X1E80100 dtsi and the QCP dts")
Fixes: bd50b1f5b6f3 ("arm64: dts: qcom: x1e80100: Add Compute Reference Device")
Signed-off-by: Konrad Dybcio <[email protected]>
---
arch/arm64/boot/dts/qcom/x1e80100-crd.dts | 9 +++++++++
arch/arm64/boot/dts/qcom/x1e80100-qcp.dts | 9 +++++++++
2 files changed, 18 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/x1e80100-crd.dts b/arch/arm64/boot/dts/qcom/x1e80100-crd.dts
index c5c2895b37c7..cfcedf1d26a0 100644
--- a/arch/arm64/boot/dts/qcom/x1e80100-crd.dts
+++ b/arch/arm64/boot/dts/qcom/x1e80100-crd.dts
@@ -49,6 +49,15 @@ chosen {
stdout-path = "serial0:115200n8";
};

+ reserved-memory {
+ linux,cma {
+ compatible = "shared-dma-pool";
+ size = <0x0 0x8000000>;
+ reusable;
+ linux,cma-default;
+ };
+ };
+
sound {
compatible = "qcom,x1e80100-sndcard";
model = "X1E80100-CRD";
diff --git a/arch/arm64/boot/dts/qcom/x1e80100-qcp.dts b/arch/arm64/boot/dts/qcom/x1e80100-qcp.dts
index 2061fbe7b75a..8f67c393b871 100644
--- a/arch/arm64/boot/dts/qcom/x1e80100-qcp.dts
+++ b/arch/arm64/boot/dts/qcom/x1e80100-qcp.dts
@@ -23,6 +23,15 @@ chosen {
stdout-path = "serial0:115200n8";
};

+ reserved-memory {
+ linux,cma {
+ compatible = "shared-dma-pool";
+ size = <0x0 0x8000000>;
+ reusable;
+ linux,cma-default;
+ };
+ };
+
vph_pwr: vph-pwr-regulator {
compatible = "regulator-fixed";


---
base-commit: 8314289a8d50a4e05d8ece1ae0445a3b57bb4d3b
change-id: 20240522-topic-x1e_cma-221dbb9a7d89

Best regards,
--
Konrad Dybcio <[email protected]>

2024-05-27 03:04:07

by Bjorn Andersson

Subject: Re: [PATCH] arm64: dts: qcom: x1e80100-*: Allocate some CMA buffers

On Wed, 22 May 2024 13:40:09 +0200, Konrad Dybcio wrote:
> In a fashion identical to commit 5f84c7c35d49 ("arm64: dts: qcom:
> sc8280xp: Define CMA region for CRD and X13s"), there exists a need for
> more than the default 32 MiB of CMA, namely for the ath12k_pci device.
>
> Reserve a 128MiB chunk to make boot-time failures like:
> cma: cma_alloc: reserved: alloc failed, req-size: 128 pages, ret: -12
> go away.
>
> [...]

Applied, thanks!

[1/1] arm64: dts: qcom: x1e80100-*: Allocate some CMA buffers
commit: 50b0516030fd549c9fd4498c9ac1f3a665521b2e

Best regards,
--
Bjorn Andersson <[email protected]>