From 5dabbf5407b3b993886e066285bbbefdb24a620c Mon Sep 17 00:00:00 2001 From: Vinayak Menon Date: Fri, 27 Nov 2020 16:07:16 +0530 Subject: [PATCH] ARM: dts: msm: switch off kpti on shima/lahaina/yupik Turn off kpti on targets that are not vulnerable. Change-Id: I2d4aecc28f22bb460d93a79a3de34da9c8e75ba7 --- qcom/lahaina.dtsi | 2 +- qcom/shima.dtsi | 2 +- qcom/yupik.dtsi | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qcom/lahaina.dtsi b/qcom/lahaina.dtsi index e7a0171f6fc1..d130a7c3b4c3 100644 --- a/qcom/lahaina.dtsi +++ b/qcom/lahaina.dtsi @@ -34,7 +34,7 @@ #size-cells = <2>; chosen { - bootargs = "log_buf_len=256K earlycon=msm_geni_serial,0x98c000 rcupdate.rcu_expedited=1 rcu_nocbs=0-7"; + bootargs = "log_buf_len=256K earlycon=msm_geni_serial,0x98c000 rcupdate.rcu_expedited=1 rcu_nocbs=0-7 kpti=off"; }; memory { device_type = "memory"; reg = <0 0 0 0>; }; diff --git a/qcom/shima.dtsi b/qcom/shima.dtsi index 903cd3b29602..39225b49decd 100644 --- a/qcom/shima.dtsi +++ b/qcom/shima.dtsi @@ -33,7 +33,7 @@ #size-cells = <2>; chosen { - bootargs = "log_buf_len=256K earlycon=msm_geni_serial,0x994000 rcupdate.rcu_expedited=1 rcu_nocbs=0-7"; + bootargs = "log_buf_len=256K earlycon=msm_geni_serial,0x994000 rcupdate.rcu_expedited=1 rcu_nocbs=0-7 kpti=off"; }; memory { device_type = "memory"; reg = <0 0 0 0>; }; diff --git a/qcom/yupik.dtsi b/qcom/yupik.dtsi index d8daa43d8821..b7d3a5295abb 100644 --- a/qcom/yupik.dtsi +++ b/qcom/yupik.dtsi @@ -361,7 +361,7 @@ soc: soc { }; chosen { - bootargs = "log_buf_len=256K earlycon=msm_geni_serial,0x994000 rcupdate.rcu_expedited=1 rcu_nocbs=0-7"; + bootargs = "log_buf_len=256K earlycon=msm_geni_serial,0x994000 rcupdate.rcu_expedited=1 rcu_nocbs=0-7 kpti=off"; }; };