Hi Bjorn,
could you please queue also this fix? Angler needs it for booting.
Kind regards,
Petr
> As the default definition breaks booting angler:
> [ 1.862561] printk: console [ttyMSM0] enabled
> [ 1.872260] msm_serial: driver initialized
> D - 15524 - pm_driver_init, Delta
> cont_splash_mem was introduced in 74d6d0a145835, but the problem
> manifested after 86588296acbf ("fdt: Properly handle "no-map" field
> in the memory region").
> Disabling it because Angler's firmware does not report where the memory
> is allocated (dmesg from downstream kernel):
> [ 0.000000] cma: Found cont_splash_mem@0, memory base 0x0000000000000000, size 16 MiB, limit 0x0000000000000000
> [ 0.000000] cma: CMA: reserved 16 MiB at 0x0000000000000000 for cont_splash_mem
> Similar issue might be on Google Nexus 5X (lg-bullhead). Other MSM8992/4
> are known to report correct address.
> Fixes: 74d6d0a145835 ("arm64: dts: qcom: msm8994/8994-kitakami: Fix up
> the memory map")
> Suggested-by: Konrad Dybcio <konradybcio@xxxxxxxxx>
> Signed-off-by: Petr Vorel <petr.vorel@xxxxxxxxx>
> ---
> Changes v3->v4:
> * add a comment in dts (asked by Konrad)
> Kind regards,
> Petr
> arch/arm64/boot/dts/qcom/msm8994-angler-rev-101.dts | 4 ++++
> 1 file changed, 4 insertions(+)
> diff --git a/arch/arm64/boot/dts/qcom/msm8994-angler-rev-101.dts b/arch/arm64/boot/dts/qcom/msm8994-angler-rev-101.dts
> index ffe1a9bd8f70..c096b7758aa0 100644
> --- a/arch/arm64/boot/dts/qcom/msm8994-angler-rev-101.dts
> +++ b/arch/arm64/boot/dts/qcom/msm8994-angler-rev-101.dts
> @@ -1,12 +1,16 @@
> // SPDX-License-Identifier: GPL-2.0-only
> /* Copyright (c) 2015, Huawei Inc. All rights reserved.
> * Copyright (c) 2016, The Linux Foundation. All rights reserved.
> + * Copyright (c) 2021, Petr Vorel <petr.vorel@xxxxxxxxx>
> */
> /dts-v1/;
> #include "msm8994.dtsi"
> +/* Angler's firmware does not report where the memory is allocated */
> +/delete-node/ &cont_splash_mem;
> +
> / {
> model = "Huawei Nexus 6P";
> compatible = "huawei,angler", "qcom,msm8994";
