From patchwork Mon Jan 23 13:19:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manivannan Sadhasivam X-Patchwork-Id: 647307 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 D72D1C54EB4 for ; Mon, 23 Jan 2023 13:20:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231633AbjAWNT7 (ORCPT ); Mon, 23 Jan 2023 08:19:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44782 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231911AbjAWNTx (ORCPT ); Mon, 23 Jan 2023 08:19:53 -0500 Received: from mail-pf1-x42f.google.com (mail-pf1-x42f.google.com [IPv6:2607:f8b0:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3BF5C244BF for ; Mon, 23 Jan 2023 05:19:52 -0800 (PST) Received: by mail-pf1-x42f.google.com with SMTP id c124so152958pfb.8 for ; Mon, 23 Jan 2023 05:19:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=HSXdTwIFwLZZEnx1LAJCezEFnZaccRUxro2oCXT9TXo=; b=TPyusCBywQC0BzN5b7Zdbr03bCgGX4h0L6koL/iIZh7MIlY1newLiMSEQhtSBUoSh+ WwThMmSr/QG5s+rZ5c+e6hwF49E/LsBPpH+D2ZLejBKpd8+R1FqyrqKEFqkEM4havBVs FDwoWQ2iZN1nUytq38Hjjr5wkqwsa1L8mi9Fzagrl9bgMrICshTxlRG634Dr5jlQZ+q9 MyqQkAb3dmZW2a3VqKpPNh2rBV6cPbaH13T43zSD0H+rxUExAiTkTcHbehIlv7V6GVp2 UNwklV7wE7xShKN5zZXqwh1Au5OHodqLat+Xzukx2ljOOREg0J81l1ssIHC5r9sX4Z8v FT3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HSXdTwIFwLZZEnx1LAJCezEFnZaccRUxro2oCXT9TXo=; b=AwSrCphsZp8vIV+XuDNeyyBUdZlDvlYPBeB/McowQp66Ez5sWRhH92bQxRDMA3d/bi 2UQxgmyH18qECH3wUIQ9JCmnS4//nQ3U9THjeATOXxbCn13wsOcdkbrncrePTHyJd3WC 4HNSnKkbmhdwnyo0nPwy620GJ3y1aLrmChSMffuyDesgrx5H8QE9ZVTCR7nfbfWHXiGJ 7aecnr/8sCjx4JvyUocw1/wOFZnoJaPjNWS61EQNhi8HwkAceyS/64SF/DhyIR1d2JSd O9i3XX8yiiJLuTB7qzPdCG25ucTUnA71ohhjQdRuOnjNqwJM84FoJd2s/4pmzAM0VVHZ Givg== X-Gm-Message-State: AFqh2krl/WZKvCTAP6nZZSaQHksnUIBJpEEiSF1j/T958V2Yb6S8Gugr wgzrZyoefYs5i17oPjTWMyQk X-Google-Smtp-Source: AMrXdXs+78jMveGvnRmSpOEISHDDD00iyhqw51aNMSUxJsjONRBahtP73sw5F0NE6jOOhOLkjqBZlw== X-Received: by 2002:a05:6a00:4c0b:b0:58d:acc6:fd2a with SMTP id ea11-20020a056a004c0b00b0058dacc6fd2amr27259708pfb.25.1674479991710; Mon, 23 Jan 2023 05:19:51 -0800 (PST) Received: from localhost.localdomain ([117.193.209.165]) by smtp.gmail.com with ESMTPSA id q20-20020aa79834000000b0058134d2df41sm30818783pfl.146.2023.01.23.05.19.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Jan 2023 05:19:50 -0800 (PST) From: Manivannan Sadhasivam To: andersson@kernel.org, will@kernel.org, joro@8bytes.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org Cc: konrad.dybcio@linaro.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, iommu@lists.linux.dev, dmitry.baryshkov@linaro.org, Manivannan Sadhasivam Subject: [PATCH 1/3] dt-bindings: arm-smmu: Fix binding for SDX55 and SDX65 Date: Mon, 23 Jan 2023 18:49:29 +0530 Message-Id: <20230123131931.263024-2-manivannan.sadhasivam@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230123131931.263024-1-manivannan.sadhasivam@linaro.org> References: <20230123131931.263024-1-manivannan.sadhasivam@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Both SDX55 and SDX66 SoCs are using the Qualcomm version of the SMMU-500 IP. But the binding lists them under the non-qcom implementation which is not correct. So fix the binding by moving these two SoCs under "qcom,smmu-500" implementation. Fixes: 6c84bbd103d8 ("dt-bindings: arm-smmu: Add generic qcom,smmu-500 bindings") Signed-off-by: Manivannan Sadhasivam --- Documentation/devicetree/bindings/iommu/arm,smmu.yaml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Documentation/devicetree/bindings/iommu/arm,smmu.yaml b/Documentation/devicetree/bindings/iommu/arm,smmu.yaml index b28c5c2b0ff2..25fd10d39b3c 100644 --- a/Documentation/devicetree/bindings/iommu/arm,smmu.yaml +++ b/Documentation/devicetree/bindings/iommu/arm,smmu.yaml @@ -42,6 +42,8 @@ properties: - qcom,sc8280xp-smmu-500 - qcom,sdm670-smmu-500 - qcom,sdm845-smmu-500 + - qcom,sdx55-smmu-500 + - qcom,sdx65-smmu-500 - qcom,sm6115-smmu-500 - qcom,sm6350-smmu-500 - qcom,sm6375-smmu-500 @@ -52,14 +54,6 @@ properties: - const: qcom,smmu-500 - const: arm,mmu-500 - - description: Qcom SoCs implementing "arm,mmu-500" (non-qcom implementation) - deprecated: true - items: - - enum: - - qcom,sdx55-smmu-500 - - qcom,sdx65-smmu-500 - - const: arm,mmu-500 - - description: Qcom SoCs implementing "arm,mmu-500" (legacy binding) deprecated: true items: From patchwork Mon Jan 23 13:19:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manivannan Sadhasivam X-Patchwork-Id: 645620 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 B7A9CC61D9D for ; Mon, 23 Jan 2023 13:20:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232014AbjAWNUC (ORCPT ); Mon, 23 Jan 2023 08:20:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44984 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231841AbjAWNUA (ORCPT ); Mon, 23 Jan 2023 08:20:00 -0500 Received: from mail-pg1-x529.google.com (mail-pg1-x529.google.com [IPv6:2607:f8b0:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DFC0017161 for ; Mon, 23 Jan 2023 05:19:58 -0800 (PST) Received: by mail-pg1-x529.google.com with SMTP id 36so8913953pgp.10 for ; Mon, 23 Jan 2023 05:19:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PZUmagI3SrNjxAIFc/u/7wsXmsBaYydmEOg5h5RQ/H0=; b=Jj1AklBZUZFUxAjbjJiLjE+yWzx1KppOmQDis8z3iqM0Y3GqnU8mbwcEnsy5+6IhLp 2wBbJSoTv41v5b1JeUYAxT0fZMamcfDnGtgpamzJDCZtLrB47hJd/hCxBMCbIisemiyA mN4cMjAVMveLN+zqmfgeFUiYQ2lOK8q/aJeUTa3/YNFzKyKhHshohHx7onSH+Bk7cHys IOM1UTRh9hjblpZfCgjIi+srvkZLknFIM3IHnXW8ga0jcUxKT6QYcoRuPYshDoBTNcyF JYZ1bzoaNlBMjZvL1Ec6aPR541ysPlz+voy9bV0xLim4UZ/cl87/SeTgEtjn9LZh1ecD Uwow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PZUmagI3SrNjxAIFc/u/7wsXmsBaYydmEOg5h5RQ/H0=; b=Rs5xZ7bkln4wRV89GFTMaMznIpp5lQXv8ZMsTrj6P6qCturwBGP9V4UL0GwAI+IqI3 gndZokkXmmTYBlyZA9ck+KGLp0qJ7IRjO4dMETbzJUni9z1rBjevJNnM/7UZtuAvXR0n xV9NBWfemWGEjH4DDz+CAoYTlKtULD+7mTWPb1ZfNp6hiNBaKGznvWcINeJBQT48DvmO Nggh5MgsP1piRDnYRnppCU5IFq9wikVD+x+HFJarLjdXa6HGoxkmb1fnn/lXjz/zT8iK qLYhgTEn6k67FHgFpCFyrqiBW+PXHebzbguRKXD1SGBxY2SXAad+TmItWNERRlKNBfwp /4Ig== X-Gm-Message-State: AFqh2ko0/2QdqloYo0NbkdU9ovjdXoFbggYIiFhKjqYJ/vMJgJtVLpnW Vaakmw88pvkMbSX9jjPFadkh X-Google-Smtp-Source: AMrXdXsQjHjsqB0aS9D5ob+m2qCxRvjFCD6D8OtfsSOgHjwKTb7cB01DJtWwhEX3tJb8eHEulZnPrw== X-Received: by 2002:aa7:8283:0:b0:588:9c15:65c4 with SMTP id s3-20020aa78283000000b005889c1565c4mr24088303pfm.3.1674479998226; Mon, 23 Jan 2023 05:19:58 -0800 (PST) Received: from localhost.localdomain ([117.193.209.165]) by smtp.gmail.com with ESMTPSA id q20-20020aa79834000000b0058134d2df41sm30818783pfl.146.2023.01.23.05.19.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Jan 2023 05:19:57 -0800 (PST) From: Manivannan Sadhasivam To: andersson@kernel.org, will@kernel.org, joro@8bytes.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org Cc: konrad.dybcio@linaro.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, iommu@lists.linux.dev, dmitry.baryshkov@linaro.org, Manivannan Sadhasivam , stable@vger.kernel.org Subject: [PATCH 2/3] ARM: dts: qcom: sdx55: Add Qcom SMMU-500 as the fallback for IOMMU node Date: Mon, 23 Jan 2023 18:49:30 +0530 Message-Id: <20230123131931.263024-3-manivannan.sadhasivam@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230123131931.263024-1-manivannan.sadhasivam@linaro.org> References: <20230123131931.263024-1-manivannan.sadhasivam@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org SDX55 uses the Qcom version of the SMMU-500 IP. So use "qcom,smmu-500" compatible as the fallback to the SoC specific compatible. Cc: # 5.12 Fixes: a2bdfdfba2af ("ARM: dts: qcom: sdx55: Enable ARM SMMU") Signed-off-by: Manivannan Sadhasivam --- arch/arm/boot/dts/qcom-sdx55.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/qcom-sdx55.dtsi b/arch/arm/boot/dts/qcom-sdx55.dtsi index f1c0dab40992..93d71aff3fab 100644 --- a/arch/arm/boot/dts/qcom-sdx55.dtsi +++ b/arch/arm/boot/dts/qcom-sdx55.dtsi @@ -578,7 +578,7 @@ pil-reloc@94c { }; apps_smmu: iommu@15000000 { - compatible = "qcom,sdx55-smmu-500", "arm,mmu-500"; + compatible = "qcom,sdx55-smmu-500", "qcom,smmu-500", "arm,mmu-500"; reg = <0x15000000 0x20000>; #iommu-cells = <2>; #global-interrupts = <1>; From patchwork Mon Jan 23 13:19:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manivannan Sadhasivam X-Patchwork-Id: 647306 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 34E3EC54EB4 for ; Mon, 23 Jan 2023 13:20:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231940AbjAWNUK (ORCPT ); Mon, 23 Jan 2023 08:20:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45022 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231804AbjAWNUG (ORCPT ); Mon, 23 Jan 2023 08:20:06 -0500 Received: from mail-pf1-x42f.google.com (mail-pf1-x42f.google.com [IPv6:2607:f8b0:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 25483252BD for ; Mon, 23 Jan 2023 05:20:04 -0800 (PST) Received: by mail-pf1-x42f.google.com with SMTP id a184so8716992pfa.9 for ; Mon, 23 Jan 2023 05:20:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WMZ85FVbs1razWOw43g+c6f7IoFKYG0ZHhwwE8xTxuk=; b=R7WF00+j43cj6mfbSwdgDbnXqdJSVInk67fmnpePKQTkc1eEkRY1aljW9i42KBmHtI MvhiEesapa/loy+KhbJD56v+31cNMXcs+3kdI94inkovtcm+TS7VGL9DMvth7jBBZlcA gRNkj+jw3ZE+BB6jVlIvADMp/u6BEKriJCINNoIL4wm4HQDlNIi1A5jHlaPDWD3U18Fu cjh5deSJvaq7b88shlvPBXuphs1LkSjY9+pN6Hyj21UTnoOSvxltYW2AorYouJIDb0iC ZUy2CsfyiJky0rLaHaTPYzVpn2EHt2I+FLCGXsKpinP+6ttzEoU1XiMNedEAC+fL03KZ mc4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WMZ85FVbs1razWOw43g+c6f7IoFKYG0ZHhwwE8xTxuk=; b=XQLdtZKD2uYoqgI1lP6j2vNeLSx6d8G3aL26I2HaMS9Pq4IOahpgW70dKhJ2q3a9B5 z9EC8VnMVwi307mrbBhb965+ebHo5HOWBhaiLcaSXevHH0mZDNrcMBidhPpqqGEN51z6 VIrEI1ZnJCVRbfp3WQBzSj/D54zAQkdBfjmVt/0A4FyBsV/05q+Gw+9bJTX2iBt3ZDyp cnZ3TlHavFMoMCHRAj8yVcKUEQPausXKm5bfTlWxLpYq0tU7r9xX8qfyjpzap5ZpFEOu YEkkFqEOkqTg1JVWv0sv79M+5Jz2B41R5Vgquf+URt6+07XHMPTt7j+Qp4LQtSDQq/Qs ufsQ== X-Gm-Message-State: AFqh2kqkS2+CnqndITRQYIOZoDjx3Vy/Ix0d2qTM1zqjcRWbExN2Ri1h 9UP29ItN2At+fI5a4EQmV4Wr X-Google-Smtp-Source: AMrXdXsKSJ/78fSBRGoAKSM9zSxNELSCc0KEF/KCo6YUipinXSNM7DDgS0e3CeFF66QrCZvewH1Oug== X-Received: by 2002:a05:6a00:44c5:b0:580:8c2c:d0ad with SMTP id cv5-20020a056a0044c500b005808c2cd0admr23386125pfb.13.1674480003621; Mon, 23 Jan 2023 05:20:03 -0800 (PST) Received: from localhost.localdomain ([117.193.209.165]) by smtp.gmail.com with ESMTPSA id q20-20020aa79834000000b0058134d2df41sm30818783pfl.146.2023.01.23.05.19.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Jan 2023 05:20:02 -0800 (PST) From: Manivannan Sadhasivam To: andersson@kernel.org, will@kernel.org, joro@8bytes.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org Cc: konrad.dybcio@linaro.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, iommu@lists.linux.dev, dmitry.baryshkov@linaro.org, Manivannan Sadhasivam , stable@vger.kernel.org Subject: [PATCH 3/3] ARM: dts: qcom: sdx65: Add Qcom SMMU-500 as the fallback for IOMMU node Date: Mon, 23 Jan 2023 18:49:31 +0530 Message-Id: <20230123131931.263024-4-manivannan.sadhasivam@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230123131931.263024-1-manivannan.sadhasivam@linaro.org> References: <20230123131931.263024-1-manivannan.sadhasivam@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org SDX65 uses the Qcom version of the SMMU-500 IP. So use "qcom,smmu-500" compatible as the fallback to the SoC specific compatible. Cc: # 5.19 Fixes: 98187f7b74bf ("ARM: dts: qcom: sdx65: Enable ARM SMMU") Signed-off-by: Manivannan Sadhasivam --- arch/arm/boot/dts/qcom-sdx65.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/qcom-sdx65.dtsi b/arch/arm/boot/dts/qcom-sdx65.dtsi index b073e0c63df4..408c4b87d44b 100644 --- a/arch/arm/boot/dts/qcom-sdx65.dtsi +++ b/arch/arm/boot/dts/qcom-sdx65.dtsi @@ -455,7 +455,7 @@ pil-reloc@94c { }; apps_smmu: iommu@15000000 { - compatible = "qcom,sdx65-smmu-500", "arm,mmu-500"; + compatible = "qcom,sdx65-smmu-500", "qcom,smmu-500", "arm,mmu-500"; reg = <0x15000000 0x40000>; #iommu-cells = <2>; #global-interrupts = <1>;