From 5ce5135682fa49639c7fd04b407be2c5c53efae0 Mon Sep 17 00:00:00 2001 From: Vinayak Menon Date: Tue, 6 Feb 2018 10:07:54 +0530 Subject: ARM: dts: msm: enable kpti on msm8996 and msm8996pro Pass the kernel command line argument 'kpti=1' to enable Kernel Page Table Isolation feature on msm8996 and msm8996pro. Change-Id: I6f7753caf0d293ada27d7da898ae277fa8781b00 Signed-off-by: Vinayak Menon Signed-off-by: Vivek Kumar --- arch/arm/boot/dts/qcom/msm8996.dtsi | 2 +- arch/arm/boot/dts/qcom/msm8996pro.dtsi | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/qcom/msm8996.dtsi b/arch/arm/boot/dts/qcom/msm8996.dtsi index ed88cfeac053..d910a02e89f9 100644 --- a/arch/arm/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm/boot/dts/qcom/msm8996.dtsi @@ -22,7 +22,7 @@ interrupt-parent = <&intc>; chosen { - bootargs = "fpsimd.fpsimd_settings=1 app_setting.use_app_setting=1 app_setting.use_32bit_app_setting=1"; + bootargs = "fpsimd.fpsimd_settings=1 app_setting.use_app_setting=1 app_setting.use_32bit_app_setting=1 kpti=1"; }; aliases { diff --git a/arch/arm/boot/dts/qcom/msm8996pro.dtsi b/arch/arm/boot/dts/qcom/msm8996pro.dtsi index b9a2ccb973f2..f140e78a16d7 100644 --- a/arch/arm/boot/dts/qcom/msm8996pro.dtsi +++ b/arch/arm/boot/dts/qcom/msm8996pro.dtsi @@ -1,4 +1,4 @@ -/* Copyright (c) 2014-2017, The Linux Foundation. All rights reserved. +/* Copyright (c) 2014-2018, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -22,7 +22,7 @@ qcom,msm-id = <305 0x10000>; chosen { - bootargs = "lpm_levels.sleep_disabled=1 fpsimd.fpsimd_settings=1 app_setting.use_app_setting=0 app_setting.use_32bit_app_setting_pro=1"; + bootargs = "lpm_levels.sleep_disabled=1 fpsimd.fpsimd_settings=1 app_setting.use_app_setting=0 app_setting.use_32bit_app_setting_pro=1 kpti=1"; }; }; -- cgit v1.2.3