| Message ID | 20200630081938.8131-1-sibis@codeaurora.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 08257610302159e08fd4f5d33787807374ea63c7 |
| Headers | show |
| Series | arm64: dts: qcom: sc7180: Drop the unused non-MSA SID | expand |
On 2020-06-30 13:49, Sibi Sankar wrote: > Having a non-MSA (Modem Self-Authentication) SID bypassed breaks modem > sandboxing i.e if a transaction were to originate from it, the hardware > memory protections units (XPUs) would fail to flag them (any > transaction > originating from modem are historically termed as an MSA transaction). > Drop the unused non-MSA modem SID on SC7180 SoCs and cheza so that SMMU > continues to block them. > > Fixes: bec71ba243e95 ("arm64: dts: qcom: sc7180: Update Q6V5 MSS node") > Fixes: 68aee4af5f620 ("arm64: dts: qcom: sdm845-cheza: Add iommus > property") > Cc: stable@vger.kernel.org > Reported-by: Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org> > Signed-off-by: Sibi Sankar <sibis@codeaurora.org> > --- > arch/arm64/boot/dts/qcom/sc7180-idp.dts | 2 +- > arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm64/boot/dts/qcom/sc7180-idp.dts > b/arch/arm64/boot/dts/qcom/sc7180-idp.dts > index 39dbfc89689e8..141de49a1b7d6 100644 > --- a/arch/arm64/boot/dts/qcom/sc7180-idp.dts > +++ b/arch/arm64/boot/dts/qcom/sc7180-idp.dts > @@ -312,7 +312,7 @@ &qupv3_id_1 { > &remoteproc_mpss { > status = "okay"; > compatible = "qcom,sc7180-mss-pil"; > - iommus = <&apps_smmu 0x460 0x1>, <&apps_smmu 0x444 0x3>; > + iommus = <&apps_smmu 0x461 0x0>, <&apps_smmu 0x444 0x3>; > memory-region = <&mba_mem &mpss_mem>; > }; > > diff --git a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi > b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi > index 70466cc4b4055..64fc1bfd66fad 100644 > --- a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi > +++ b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi > @@ -634,7 +634,7 @@ &mdss_mdp { > }; > > &mss_pil { > - iommus = <&apps_smmu 0x780 0x1>, > + iommus = <&apps_smmu 0x781 0x0>, > <&apps_smmu 0x724 0x3>; > }; Reviewed-by: Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>
Hi, On Tue, Jun 30, 2020 at 1:20 AM Sibi Sankar <sibis@codeaurora.org> wrote: > > Having a non-MSA (Modem Self-Authentication) SID bypassed breaks modem > sandboxing i.e if a transaction were to originate from it, the hardware > memory protections units (XPUs) would fail to flag them (any transaction > originating from modem are historically termed as an MSA transaction). > Drop the unused non-MSA modem SID on SC7180 SoCs and cheza so that SMMU > continues to block them. > > Fixes: bec71ba243e95 ("arm64: dts: qcom: sc7180: Update Q6V5 MSS node") > Fixes: 68aee4af5f620 ("arm64: dts: qcom: sdm845-cheza: Add iommus property") > Cc: stable@vger.kernel.org > Reported-by: Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org> > Signed-off-by: Sibi Sankar <sibis@codeaurora.org> > --- > arch/arm64/boot/dts/qcom/sc7180-idp.dts | 2 +- > arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) I'm not sure if my review is worth all that much since it's not my area of expertise, but as far as I can tell this is good / ready to go in. I've confirmed that a similar on my sc7180 board doesn't seem to break anything for me so restricting things like this seems sane. Reviewed-by: Douglas Anderson <dianders@chromium.org> Tested-by: Douglas Anderson <dianders@chromium.org> -Doug
diff --git a/arch/arm64/boot/dts/qcom/sc7180-idp.dts b/arch/arm64/boot/dts/qcom/sc7180-idp.dts index 39dbfc89689e8..141de49a1b7d6 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-idp.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-idp.dts @@ -312,7 +312,7 @@ &qupv3_id_1 { &remoteproc_mpss { status = "okay"; compatible = "qcom,sc7180-mss-pil"; - iommus = <&apps_smmu 0x460 0x1>, <&apps_smmu 0x444 0x3>; + iommus = <&apps_smmu 0x461 0x0>, <&apps_smmu 0x444 0x3>; memory-region = <&mba_mem &mpss_mem>; }; diff --git a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi index 70466cc4b4055..64fc1bfd66fad 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi @@ -634,7 +634,7 @@ &mdss_mdp { }; &mss_pil { - iommus = <&apps_smmu 0x780 0x1>, + iommus = <&apps_smmu 0x781 0x0>, <&apps_smmu 0x724 0x3>; };
Having a non-MSA (Modem Self-Authentication) SID bypassed breaks modem sandboxing i.e if a transaction were to originate from it, the hardware memory protections units (XPUs) would fail to flag them (any transaction originating from modem are historically termed as an MSA transaction). Drop the unused non-MSA modem SID on SC7180 SoCs and cheza so that SMMU continues to block them. Fixes: bec71ba243e95 ("arm64: dts: qcom: sc7180: Update Q6V5 MSS node") Fixes: 68aee4af5f620 ("arm64: dts: qcom: sdm845-cheza: Add iommus property") Cc: stable@vger.kernel.org Reported-by: Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org> Signed-off-by: Sibi Sankar <sibis@codeaurora.org> --- arch/arm64/boot/dts/qcom/sc7180-idp.dts | 2 +- arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)