Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 98555C74A5B for ; Thu, 16 Mar 2023 02:28:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229799AbjCPC2p (ORCPT ); Wed, 15 Mar 2023 22:28:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51668 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229459AbjCPC2m (ORCPT ); Wed, 15 Mar 2023 22:28:42 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F3352CA1F9; Wed, 15 Mar 2023 19:28:36 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 7920DB81FA5; Thu, 16 Mar 2023 02:28:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8621BC433D2; Thu, 16 Mar 2023 02:28:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678933714; bh=fCHFhdAX7m1VRphIKdIGA13W+APsH2JPvpLNFFV5sgg=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=i48dT3Zx8xrYfQE2ooVABgu839aC3czFWHfNJV16L5UiapI8ZRgkWiMzzew0Xrlf6 zKefvSHUA1LS5J8AFI6Jq3fZEmMXL6kzeyoWycTc0Euw2SsSBniz8IbNxCY3/JoTtv bx+Gx9jdwVoGH1VM0NpVA/SYW8UGhU2K0myGeGtYMEvpv5l9fZA9oEI2G/V2AQDtyn Iej0kbqVO4q/kCLlj/anfhdGdu2gYcdPGtsQwlzePjhconWh8Vg1l7xjE1YbtCLg4p DGS2X99Jx0EyGdM5fwjv52RTUhIOkeVOHCCBxjBuJaRTDI9Jv13WOeWQJGNlegdmV8 KOA97kI0uq1kQ== Date: Wed, 15 Mar 2023 19:31:55 -0700 From: Bjorn Andersson To: Manivannan Sadhasivam Cc: robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, konrad.dybcio@linaro.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Rob Herring Subject: Re: [PATCH] arm64: dts: qcom: Remove "iommus" property from PCIe nodes Message-ID: <20230316023155.avkvmqrsrys22lge@ripper> References: <20230308075648.134119-1-manivannan.sadhasivam@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230308075648.134119-1-manivannan.sadhasivam@linaro.org> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Mar 08, 2023 at 01:26:48PM +0530, Manivannan Sadhasivam wrote: > Currently, most of the Qualcomm SoCs specify both "iommus" and "iommu-map" > properties for the PCIe nodes. First one passes the SMR mask to the iommu > driver and the latter specifies the SID for each PCIe device. > > But with "iommus" property, the PCIe controller will be added to the > iommu group along with the devices. This makes no sense because the > controller will not initiate any DMA transaction on its own. And moreover, > it is not strictly required to pass the SMR mask to the iommu driver. If > the "iommus" property is not present, then the default mask of "0" would be > used which should work for all PCIe devices. > > On the other side, if the SMR mask specified doesn't match the one expected > by the hypervisor, then all the PCIe transactions will end up triggering > "Unidentified Stream Fault" by the SMMU. > > So to get rid of these hassles and also prohibit PCIe controllers from > adding to the iommu group, let's remove the "iommus" property from PCIe > nodes. > > Reported-by: Rob Herring > Link: https://lore.kernel.org/linux-arm-msm/20230227195535.GA749409-robh@kernel.org > Signed-off-by: Manivannan Sadhasivam Reviewed-by: Bjorn Andersson > --- > arch/arm64/boot/dts/qcom/sc7280.dtsi | 2 -- > arch/arm64/boot/dts/qcom/sdm845.dtsi | 2 -- > arch/arm64/boot/dts/qcom/sm8150.dtsi | 2 -- > arch/arm64/boot/dts/qcom/sm8250.dtsi | 3 --- > arch/arm64/boot/dts/qcom/sm8350.dtsi | 2 -- > arch/arm64/boot/dts/qcom/sm8450.dtsi | 2 -- > arch/arm64/boot/dts/qcom/sm8550.dtsi | 2 -- > 7 files changed, 15 deletions(-) > > diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi > index 8f4ab6bd2886..9f7269029a02 100644 > --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi > +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi > @@ -2133,8 +2133,6 @@ pcie1: pci@1c08000 { > > dma-coherent; > > - iommus = <&apps_smmu 0x1c80 0x1>; > - > iommu-map = <0x0 &apps_smmu 0x1c80 0x1>, > <0x100 &apps_smmu 0x1c81 0x1>; > > diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi > index 479859bd8ab3..5f110b0062d9 100644 > --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi > +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi > @@ -2319,7 +2319,6 @@ pcie0: pci@1c00000 { > "slave_q2a", > "tbu"; > > - iommus = <&apps_smmu 0x1c10 0xf>; > iommu-map = <0x0 &apps_smmu 0x1c10 0x1>, > <0x100 &apps_smmu 0x1c11 0x1>, > <0x200 &apps_smmu 0x1c12 0x1>, > @@ -2429,7 +2428,6 @@ pcie1: pci@1c08000 { > assigned-clocks = <&gcc GCC_PCIE_1_AUX_CLK>; > assigned-clock-rates = <19200000>; > > - iommus = <&apps_smmu 0x1c00 0xf>; > iommu-map = <0x0 &apps_smmu 0x1c00 0x1>, > <0x100 &apps_smmu 0x1c01 0x1>, > <0x200 &apps_smmu 0x1c02 0x1>, > diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qcom/sm8150.dtsi > index 13e0ce828606..6a383e918329 100644 > --- a/arch/arm64/boot/dts/qcom/sm8150.dtsi > +++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi > @@ -1826,7 +1826,6 @@ pcie0: pci@1c00000 { > "slave_q2a", > "tbu"; > > - iommus = <&apps_smmu 0x1d80 0x3f>; > iommu-map = <0x0 &apps_smmu 0x1d80 0x1>, > <0x100 &apps_smmu 0x1d81 0x1>; > > @@ -1925,7 +1924,6 @@ pcie1: pci@1c08000 { > assigned-clocks = <&gcc GCC_PCIE_1_AUX_CLK>; > assigned-clock-rates = <19200000>; > > - iommus = <&apps_smmu 0x1e00 0x3f>; > iommu-map = <0x0 &apps_smmu 0x1e00 0x1>, > <0x100 &apps_smmu 0x1e01 0x1>; > > diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi > index 2f0e460acccd..c7682fda9d8c 100644 > --- a/arch/arm64/boot/dts/qcom/sm8250.dtsi > +++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi > @@ -1871,7 +1871,6 @@ pcie0: pci@1c00000 { > "tbu", > "ddrss_sf_tbu"; > > - iommus = <&apps_smmu 0x1c00 0x7f>; > iommu-map = <0x0 &apps_smmu 0x1c00 0x1>, > <0x100 &apps_smmu 0x1c01 0x1>; > > @@ -1977,7 +1976,6 @@ pcie1: pci@1c08000 { > assigned-clocks = <&gcc GCC_PCIE_1_AUX_CLK>; > assigned-clock-rates = <19200000>; > > - iommus = <&apps_smmu 0x1c80 0x7f>; > iommu-map = <0x0 &apps_smmu 0x1c80 0x1>, > <0x100 &apps_smmu 0x1c81 0x1>; > > @@ -2085,7 +2083,6 @@ pcie2: pci@1c10000 { > assigned-clocks = <&gcc GCC_PCIE_2_AUX_CLK>; > assigned-clock-rates = <19200000>; > > - iommus = <&apps_smmu 0x1d00 0x7f>; > iommu-map = <0x0 &apps_smmu 0x1d00 0x1>, > <0x100 &apps_smmu 0x1d01 0x1>; > > diff --git a/arch/arm64/boot/dts/qcom/sm8350.dtsi b/arch/arm64/boot/dts/qcom/sm8350.dtsi > index 1c97e28da6ad..365b9d773b5c 100644 > --- a/arch/arm64/boot/dts/qcom/sm8350.dtsi > +++ b/arch/arm64/boot/dts/qcom/sm8350.dtsi > @@ -1526,7 +1526,6 @@ pcie0: pci@1c00000 { > "aggre1", > "aggre0"; > > - iommus = <&apps_smmu 0x1c00 0x7f>; > iommu-map = <0x0 &apps_smmu 0x1c00 0x1>, > <0x100 &apps_smmu 0x1c01 0x1>; > > @@ -1610,7 +1609,6 @@ pcie1: pci@1c08000 { > "ddrss_sf_tbu", > "aggre1"; > > - iommus = <&apps_smmu 0x1c80 0x7f>; > iommu-map = <0x0 &apps_smmu 0x1c80 0x1>, > <0x100 &apps_smmu 0x1c81 0x1>; > > diff --git a/arch/arm64/boot/dts/qcom/sm8450.dtsi b/arch/arm64/boot/dts/qcom/sm8450.dtsi > index 1a744a33bcf4..e3201b1b07a5 100644 > --- a/arch/arm64/boot/dts/qcom/sm8450.dtsi > +++ b/arch/arm64/boot/dts/qcom/sm8450.dtsi > @@ -1790,7 +1790,6 @@ pcie0: pci@1c00000 { > "aggre0", > "aggre1"; > > - iommus = <&apps_smmu 0x1c00 0x7f>; > iommu-map = <0x0 &apps_smmu 0x1c00 0x1>, > <0x100 &apps_smmu 0x1c01 0x1>; > > @@ -1904,7 +1903,6 @@ pcie1: pci@1c08000 { > "ddrss_sf_tbu", > "aggre1"; > > - iommus = <&apps_smmu 0x1c80 0x7f>; > iommu-map = <0x0 &apps_smmu 0x1c80 0x1>, > <0x100 &apps_smmu 0x1c81 0x1>; > > diff --git a/arch/arm64/boot/dts/qcom/sm8550.dtsi b/arch/arm64/boot/dts/qcom/sm8550.dtsi > index 25f51245fe9b..6edb3acb91ef 100644 > --- a/arch/arm64/boot/dts/qcom/sm8550.dtsi > +++ b/arch/arm64/boot/dts/qcom/sm8550.dtsi > @@ -1692,7 +1692,6 @@ pcie0: pci@1c00000 { > interconnect-names = "pcie-mem"; > interconnects = <&pcie_noc MASTER_PCIE_0 0 &mc_virt SLAVE_EBI1 0>; > > - iommus = <&apps_smmu 0x1400 0x7f>; > iommu-map = <0x0 &apps_smmu 0x1400 0x1>, > <0x100 &apps_smmu 0x1401 0x1>; > > @@ -1796,7 +1795,6 @@ pcie1: pci@1c08000 { > interconnect-names = "pcie-mem"; > interconnects = <&pcie_noc MASTER_PCIE_1 0 &mc_virt SLAVE_EBI1 0>; > > - iommus = <&apps_smmu 0x1480 0x7f>; > iommu-map = <0x0 &apps_smmu 0x1480 0x1>, > <0x100 &apps_smmu 0x1481 0x1>; > > -- > 2.25.1 >