Merge "Revert "ARM: dts: msm: Restore disable_dma32=on to disable ZONE_DMA32""

This commit is contained in:
qctecmdr
2022-04-27 11:13:40 -07:00
committed by Gerrit - the friendly Code Review server

View File

@@ -28,7 +28,7 @@
chosen: chosen {
bootargs = "console=ttyMSM0,115200n8 loglevel=6 kpti=0 log_buf_len=256K kernel.panic_on_rcu_stall=1 service_locator.enable=1 msm_rtb.filter=0x237 rcupdate.rcu_expedited=1 rcu_nocbs=0-7 ftrace_dump_on_oops swiotlb=noforce loop.max_part=7 fw_devlink.strict=1 allow_mismatched_32bit_el0 cpufreq.default_governor=performance kasan=off mem-offline.bypass_send_msg=1 sysctl.kernel.sched_pelt_multiplier=4 can.stats_timer=0 disable_dma32=on";
bootargs = "console=ttyMSM0,115200n8 loglevel=6 kpti=0 log_buf_len=256K kernel.panic_on_rcu_stall=1 service_locator.enable=1 msm_rtb.filter=0x237 rcupdate.rcu_expedited=1 rcu_nocbs=0-7 ftrace_dump_on_oops swiotlb=noforce loop.max_part=7 fw_devlink.strict=1 allow_mismatched_32bit_el0 cpufreq.default_governor=performance kasan=off mem-offline.bypass_send_msg=1 sysctl.kernel.sched_pelt_multiplier=4 can.stats_timer=0";
};
reserved_memory: reserved-memory { };
@@ -3773,7 +3773,6 @@
qcom_scm {
compatible = "qcom,scm";
qcom,dload-mode = <&tcsr 0x19000>;
memory-region = <&system_cma>;
};
android {