| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <7d932461-bb81-5a6e-4252-fa56ddf2ace5@nexus-software.ie>
Date: Fri, 18 Aug 2023 10:24:43 +0100
From: Bryan O'Donoghue <pure.logic@...us-software.ie>
To: Luca Weiss <luca.weiss@...rphone.com>,
Andy Gross <agross@...nel.org>,
Bjorn Andersson <andersson@...nel.org>,
Konrad Dybcio <konrad.dybcio@...aro.org>,
Rob Herring <robh+dt@...nel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@...aro.org>,
Conor Dooley <conor+dt@...nel.org>,
cros-qcom-dts-watchers@...omium.org
Cc: ~postmarketos/upstreaming@...ts.sr.ht, phone-devel@...r.kernel.org,
linux-arm-msm@...r.kernel.org, devicetree@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: Re: [PATCH] arm64: dts: qcom: Use QCOM_SCM_VMID defines for qcom,vmid
On 18/08/2023 09:06, Luca Weiss wrote:
> Since we have those defines available in a header, let's use them
> everywhere where qcom,vmid property is used.
>
> Signed-off-by: Luca Weiss <luca.weiss@...rphone.com>
> ---
> arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi | 2 +-
> arch/arm64/boot/dts/qcom/msm8996.dtsi | 3 ++-
> arch/arm64/boot/dts/qcom/msm8998.dtsi | 3 ++-
> arch/arm64/boot/dts/qcom/sc7180.dtsi | 3 ++-
> arch/arm64/boot/dts/qcom/sc7280.dtsi | 3 ++-
> arch/arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts | 3 ++-
> arch/arm64/boot/dts/qcom/sc8180x-primus.dts | 3 ++-
> arch/arm64/boot/dts/qcom/sdm630.dtsi | 3 ++-
> arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi | 2 +-
> arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 2 +-
> arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi | 2 +-
> arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts | 2 +-
> arch/arm64/boot/dts/qcom/sdm845.dtsi | 2 +-
> arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts | 3 ++-
> arch/arm64/boot/dts/qcom/sm8150.dtsi | 3 ++-
> arch/arm64/boot/dts/qcom/sm8350.dtsi | 3 ++-
> arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara.dtsi | 2 +-
> arch/arm64/boot/dts/qcom/sm8450.dtsi | 3 ++-
> arch/arm64/boot/dts/qcom/sm8550.dtsi | 3 ++-
> 19 files changed, 31 insertions(+), 19 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi
> index bcd2397eb373..baa7472b7a28 100644
> --- a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi
> @@ -117,7 +117,7 @@ rmtfs@...00000 {
> no-map;
>
> qcom,client-id = <1>;
> - qcom,vmid = <15>;
> + qcom,vmid = <QCOM_SCM_VMID_MSS_MSA>;
> };
>
> /delete-node/ mba@...00000;
> diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
> index c8e0986425ab..6ba9da9e6a8b 100644
> --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
> @@ -9,6 +9,7 @@
> #include <dt-bindings/clock/qcom,rpmcc.h>
> #include <dt-bindings/interconnect/qcom,msm8996.h>
> #include <dt-bindings/interconnect/qcom,msm8996-cbf.h>
> +#include <dt-bindings/firmware/qcom,scm.h>
> #include <dt-bindings/gpio/gpio.h>
> #include <dt-bindings/power/qcom-rpmpd.h>
> #include <dt-bindings/soc/qcom,apr.h>
> @@ -538,7 +539,7 @@ rmtfs_mem: rmtfs {
> no-map;
>
> qcom,client-id = <1>;
> - qcom,vmid = <15>;
> + qcom,vmid = <QCOM_SCM_VMID_MSS_MSA>;
> };
>
> mpss_mem: mpss@...00000 {
> diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi
> index f180047cacb0..aac23a8ef6c8 100644
> --- a/arch/arm64/boot/dts/qcom/msm8998.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi
> @@ -6,6 +6,7 @@
> #include <dt-bindings/clock/qcom,gpucc-msm8998.h>
> #include <dt-bindings/clock/qcom,mmcc-msm8998.h>
> #include <dt-bindings/clock/qcom,rpmcc.h>
> +#include <dt-bindings/firmware/qcom,scm.h>
> #include <dt-bindings/power/qcom-rpmpd.h>
> #include <dt-bindings/gpio/gpio.h>
>
> @@ -56,7 +57,7 @@ rmtfs_mem: memory@...00000 {
> no-map;
>
> qcom,client-id = <1>;
> - qcom,vmid = <15>;
> + qcom,vmid = <QCOM_SCM_VMID_MSS_MSA>;
> };
>
> spss_mem: memory@...00000 {
> diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi
> index a79c0f2e1879..d57418113b36 100644
> --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi
> @@ -11,6 +11,7 @@
> #include <dt-bindings/clock/qcom,lpasscorecc-sc7180.h>
> #include <dt-bindings/clock/qcom,rpmh.h>
> #include <dt-bindings/clock/qcom,videocc-sc7180.h>
> +#include <dt-bindings/firmware/qcom,scm.h>
> #include <dt-bindings/interconnect/qcom,icc.h>
> #include <dt-bindings/interconnect/qcom,osm-l3.h>
> #include <dt-bindings/interconnect/qcom,sc7180.h>
> @@ -687,7 +688,7 @@ rmtfs_mem: memory@...00000 {
> no-map;
>
> qcom,client-id = <1>;
> - qcom,vmid = <15>;
> + qcom,vmid = <QCOM_SCM_VMID_MSS_MSA>;
> };
> };
>
> diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi
> index 925428a5f6ae..042908048d09 100644
> --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi
> @@ -13,6 +13,7 @@
> #include <dt-bindings/clock/qcom,rpmh.h>
> #include <dt-bindings/clock/qcom,videocc-sc7280.h>
> #include <dt-bindings/dma/qcom-gpi.h>
> +#include <dt-bindings/firmware/qcom,scm.h>
> #include <dt-bindings/gpio/gpio.h>
> #include <dt-bindings/interconnect/qcom,osm-l3.h>
> #include <dt-bindings/interconnect/qcom,sc7280.h>
> @@ -156,7 +157,7 @@ rmtfs_mem: memory@...00000 {
> no-map;
>
> qcom,client-id = <1>;
> - qcom,vmid = <15>;
> + qcom,vmid = <QCOM_SCM_VMID_MSS_MSA>;
> };
> };
>
> diff --git a/arch/arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts b/arch/arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts
> index abc66613ccaa..3ea07d094b60 100644
> --- a/arch/arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts
> +++ b/arch/arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts
> @@ -6,6 +6,7 @@
>
> /dts-v1/;
>
> +#include <dt-bindings/firmware/qcom,scm.h>
> #include <dt-bindings/gpio/gpio.h>
> #include <dt-bindings/input/gpio-keys.h>
> #include <dt-bindings/input/input.h>
> @@ -130,7 +131,7 @@ rmtfs_mem: rmtfs-region@...00000 {
> no-map;
>
> qcom,client-id = <1>;
> - qcom,vmid = <15>;
> + qcom,vmid = <QCOM_SCM_VMID_MSS_MSA>;
> };
>
> wlan_mem: wlan-region@...00000 {
> diff --git a/arch/arm64/boot/dts/qcom/sc8180x-primus.dts b/arch/arm64/boot/dts/qcom/sc8180x-primus.dts
> index 834e6f9fb7c8..fd2fab4895b3 100644
> --- a/arch/arm64/boot/dts/qcom/sc8180x-primus.dts
> +++ b/arch/arm64/boot/dts/qcom/sc8180x-primus.dts
> @@ -6,6 +6,7 @@
>
> /dts-v1/;
>
> +#include <dt-bindings/firmware/qcom,scm.h>
> #include <dt-bindings/gpio/gpio.h>
> #include <dt-bindings/input/gpio-keys.h>
> #include <dt-bindings/input/input.h>
> @@ -135,7 +136,7 @@ rmtfs_mem: rmtfs-region@...00000 {
> no-map;
>
> qcom,client-id = <1>;
> - qcom,vmid = <15>;
> + qcom,vmid = <QCOM_SCM_VMID_MSS_MSA>;
> };
>
> wlan_mem: wlan-region@...00000 {
> diff --git a/arch/arm64/boot/dts/qcom/sdm630.dtsi b/arch/arm64/boot/dts/qcom/sdm630.dtsi
> index ec6003212c4d..c17719086085 100644
> --- a/arch/arm64/boot/dts/qcom/sdm630.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sdm630.dtsi
> @@ -8,6 +8,7 @@
> #include <dt-bindings/clock/qcom,gpucc-sdm660.h>
> #include <dt-bindings/clock/qcom,mmcc-sdm660.h>
> #include <dt-bindings/clock/qcom,rpmcc.h>
> +#include <dt-bindings/firmware/qcom,scm.h>
> #include <dt-bindings/interconnect/qcom,sdm660.h>
> #include <dt-bindings/power/qcom-rpmpd.h>
> #include <dt-bindings/gpio/gpio.h>
> @@ -453,7 +454,7 @@ rmtfs_mem: memory@...00000 {
> no-map;
>
> qcom,client-id = <1>;
> - qcom,vmid = <15>;
> + qcom,vmid = <QCOM_SCM_VMID_MSS_MSA>;
> };
>
> smem_region: smem-mem@...00000 {
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi
> index f942c5afea9b..99dafc6716e7 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi
> @@ -111,7 +111,7 @@ rmtfs_mem: memory@...01000 {
> no-map;
>
> qcom,client-id = <1>;
> - qcom,vmid = <15>;
> + qcom,vmid = <QCOM_SCM_VMID_MSS_MSA>;
> };
>
> /* rmtfs upper guard */
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
> index 122c7128dea9..b523b5fff702 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
> @@ -90,7 +90,7 @@ rmtfs_mem: rmtfs-mem@...01000 {
> no-map;
>
> qcom,client-id = <1>;
> - qcom,vmid = <15>;
> + qcom,vmid = <QCOM_SCM_VMID_MSS_MSA>;
> };
> rmtfs_upper_guard: rmtfs-upper-guard@...01000 {
> no-map;
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
> index 9d6faeb65624..93b1582e807d 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
> @@ -111,7 +111,7 @@ rmtfs_mem: memory@...01000 {
> no-map;
>
> qcom,client-id = <1>;
> - qcom,vmid = <15>;
> + qcom,vmid = <QCOM_SCM_VMID_MSS_MSA>;
> };
> };
>
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
> index 6db12abaa88d..e386b504e978 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
> +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
> @@ -108,7 +108,7 @@ rmtfs_mem: memory@...01000 {
> no-map;
>
> qcom,client-id = <1>;
> - qcom,vmid = <15>;
> + qcom,vmid = <QCOM_SCM_VMID_MSS_MSA>;
> };
> };
>
> diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
> index 055ca80c0075..eede4b18fb98 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
> @@ -813,7 +813,7 @@ rmtfs_mem: rmtfs@...00000 {
> no-map;
>
> qcom,client-id = <1>;
> - qcom,vmid = <15>;
> + qcom,vmid = <QCOM_SCM_VMID_MSS_MSA>;
> };
>
> qseecom_mem: qseecom@...00000 {
> diff --git a/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts b/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts
> index 18171c5d8a38..136e273d09a7 100644
> --- a/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts
> +++ b/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts
> @@ -8,6 +8,7 @@
> /* PMK8350 (in reality a PMK8003) is configured to use SID6 instead of 0 */
> #define PMK8350_SID 6
>
> +#include <dt-bindings/firmware/qcom,scm.h>
> #include <dt-bindings/gpio/gpio.h>
> #include <dt-bindings/iio/qcom,spmi-adc7-pmk8350.h>
> #include <dt-bindings/input/input.h>
> @@ -75,7 +76,7 @@ memory@...01000 {
> no-map;
>
> qcom,client-id = <1>;
> - qcom,vmid = <15>;
> + qcom,vmid = <QCOM_SCM_VMID_MSS_MSA>;
> };
> };
>
> diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qcom/sm8150.dtsi
> index a7c3020a5de4..fd5c3139f4ce 100644
> --- a/arch/arm64/boot/dts/qcom/sm8150.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi
> @@ -5,6 +5,7 @@
> */
>
> #include <dt-bindings/dma/qcom-gpi.h>
> +#include <dt-bindings/firmware/qcom,scm.h>
> #include <dt-bindings/interrupt-controller/arm-gic.h>
> #include <dt-bindings/power/qcom-rpmpd.h>
> #include <dt-bindings/soc/qcom,rpmh-rsc.h>
> @@ -720,7 +721,7 @@ rmtfs_mem: memory@...00000 {
> no-map;
>
> qcom,client-id = <1>;
> - qcom,vmid = <15>;
> + qcom,vmid = <QCOM_SCM_VMID_MSS_MSA>;
> };
>
> camera_mem: memory@...00000 {
> diff --git a/arch/arm64/boot/dts/qcom/sm8350.dtsi b/arch/arm64/boot/dts/qcom/sm8350.dtsi
> index 00604bf7724f..4989a3971c94 100644
> --- a/arch/arm64/boot/dts/qcom/sm8350.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sm8350.dtsi
> @@ -10,6 +10,7 @@
> #include <dt-bindings/clock/qcom,gpucc-sm8350.h>
> #include <dt-bindings/clock/qcom,rpmh.h>
> #include <dt-bindings/dma/qcom-gpi.h>
> +#include <dt-bindings/firmware/qcom,scm.h>
> #include <dt-bindings/gpio/gpio.h>
> #include <dt-bindings/interconnect/qcom,sm8350.h>
> #include <dt-bindings/mailbox/qcom-ipcc.h>
> @@ -503,7 +504,7 @@ rmtfs_mem: memory@...00000 {
> no-map;
>
> qcom,client-id = <1>;
> - qcom,vmid = <15>;
> + qcom,vmid = <QCOM_SCM_VMID_MSS_MSA>;
> };
>
> hyp_reserved_mem: memory@...00000 {
> diff --git a/arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara.dtsi b/arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara.dtsi
> index 001fb2723fbb..8b29fcf483a3 100644
> --- a/arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara.dtsi
> @@ -80,7 +80,7 @@ rmtfs_mem: memory@...00000 {
> no-map;
>
> qcom,client-id = <1>;
> - qcom,vmid = <15>;
> + qcom,vmid = <QCOM_SCM_VMID_MSS_MSA>;
> };
>
> ramoops@...00000 {
> diff --git a/arch/arm64/boot/dts/qcom/sm8450.dtsi b/arch/arm64/boot/dts/qcom/sm8450.dtsi
> index 2a60cf8bd891..09a0c35dd514 100644
> --- a/arch/arm64/boot/dts/qcom/sm8450.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sm8450.dtsi
> @@ -10,6 +10,7 @@
> #include <dt-bindings/clock/qcom,sm8450-dispcc.h>
> #include <dt-bindings/clock/qcom,sm8450-videocc.h>
> #include <dt-bindings/dma/qcom-gpi.h>
> +#include <dt-bindings/firmware/qcom,scm.h>
> #include <dt-bindings/gpio/gpio.h>
> #include <dt-bindings/mailbox/qcom-ipcc.h>
> #include <dt-bindings/phy/phy-qcom-qmp.h>
> @@ -540,7 +541,7 @@ rmtfs_mem: memory@...00000 {
> no-map;
>
> qcom,client-id = <1>;
> - qcom,vmid = <15>;
> + qcom,vmid = <QCOM_SCM_VMID_MSS_MSA>;
> };
>
> xbl_sc_mem2: memory@...00000 {
> diff --git a/arch/arm64/boot/dts/qcom/sm8550.dtsi b/arch/arm64/boot/dts/qcom/sm8550.dtsi
> index d115960bdeec..1a3bbd62e540 100644
> --- a/arch/arm64/boot/dts/qcom/sm8550.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sm8550.dtsi
> @@ -10,6 +10,7 @@
> #include <dt-bindings/clock/qcom,sm8550-tcsr.h>
> #include <dt-bindings/clock/qcom,sm8550-dispcc.h>
> #include <dt-bindings/dma/qcom-gpi.h>
> +#include <dt-bindings/firmware/qcom,scm.h>
> #include <dt-bindings/gpio/gpio.h>
> #include <dt-bindings/interrupt-controller/arm-gic.h>
> #include <dt-bindings/interconnect/qcom,sm8550-rpmh.h>
> @@ -570,7 +571,7 @@ rmtfs_mem: rmtfs-region@...80000 {
> no-map;
>
> qcom,client-id = <1>;
> - qcom,vmid = <15>;
> + qcom,vmid = <QCOM_SCM_VMID_MSS_MSA>;
> };
>
> mpss_dsm_mem: mpss-dsm-region@...00000 {
>
> ---
> base-commit: 7271b2a530428b879443b274c191b34536a4ea11
> change-id: 20230818-qcom-vmid-defines-adc1794c6d01
>
> Best regards,
Obvioiusly correct
Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@...aro.org>
Powered by blists - more mailing lists