From patchwork Mon Aug 19 12:59:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Gonzalez X-Patchwork-Id: 13768338 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 00C05C3DA4A for ; Mon, 19 Aug 2024 13:01:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=zVMVRQOB9AZeZcrL1pyuhibENnemorFZ5VMqehHXlcs=; b=Xwh48ru4txjuo3nrGGlp0zntcs Z9I3xrjfTfvRCM5aNgDzbxZK2vL9GftvyEWrTt5F2Udpz5EMz/+rpbuwqT/rpvKiu1pi+mNCAUnwb +oIElbP3eGEqTpSpgoWjYQG33fb/2XdCePc4pyeo9VxFTYiPa33u4286hUQ0ajjJGQHX+4dZ47a9y Op4QpXnQOdHojkcqP6KmLhoZ3Pklu9/fNz4QK/lhRBDA/7eCEdiPs7yKb6+P3ObRAtWJjLwstnNnY rn6xxGzkH6x3qRjnqR6xmb3M4AtzCdDt3mlzYsQu5EivsFiDXSiFPr+NKyOApWSf0jPB05jeq4WR2 i3gBsBEQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sg20Q-00000001WW0-2WEX; Mon, 19 Aug 2024 13:01:06 +0000 Received: from ns.iliad.fr ([212.27.33.1]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sg1z5-00000001WD2-1oSG for linux-arm-kernel@lists.infradead.org; Mon, 19 Aug 2024 12:59:46 +0000 Received: from ns.iliad.fr (localhost [127.0.0.1]) by ns.iliad.fr (Postfix) with ESMTP id 936A820990; Mon, 19 Aug 2024 14:59:37 +0200 (CEST) Received: from [127.0.1.1] (freebox.vlq16.iliad.fr [213.36.7.13]) by ns.iliad.fr (Postfix) with ESMTP id 83A9C20987; Mon, 19 Aug 2024 14:59:37 +0200 (CEST) From: Marc Gonzalez Date: Mon, 19 Aug 2024 14:59:35 +0200 Subject: [PATCH 1/2] iommu/arm-smmu-qcom: hide last LPASS SMMU context bank from linux MIME-Version: 1.0 Message-Id: <20240819-smmu-v1-1-bce6e4738825@freebox.fr> References: <20240819-smmu-v1-0-bce6e4738825@freebox.fr> In-Reply-To: <20240819-smmu-v1-0-bce6e4738825@freebox.fr> To: Rob Clark , Will Deacon , Robin Murphy , Joerg Roedel , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: iommu@lists.linux.dev, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Bjorn Andersson , Konrad Dybcio , Arnaud Vrac , Pierre-Hugues Husson , Marijn Suijten , Caleb Connolly , Marc Gonzalez X-Mailer: b4 0.13.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240819_055943_663875_3509E5D7 X-CRM114-Status: GOOD ( 10.85 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On qcom msm8998, writing to the last context bank of lpass_q6_smmu (base address 0x05100000) produces a system freeze & reboot. The hardware/hypervisor reports 13 context banks for the LPASS SMMU on msm8998, but only the first 12 are accessible... Override the number of context banks [ 2.546101] arm-smmu 5100000.iommu: probing hardware configuration... [ 2.552439] arm-smmu 5100000.iommu: SMMUv2 with: [ 2.558945] arm-smmu 5100000.iommu: stage 1 translation [ 2.563627] arm-smmu 5100000.iommu: address translation ops [ 2.568923] arm-smmu 5100000.iommu: non-coherent table walk [ 2.574566] arm-smmu 5100000.iommu: (IDR0.CTTW overridden by FW configuration) [ 2.580220] arm-smmu 5100000.iommu: stream matching with 12 register groups [ 2.587263] arm-smmu 5100000.iommu: 13 context banks (0 stage-2 only) [ 2.614447] arm-smmu 5100000.iommu: Supported page sizes: 0x63315000 [ 2.621358] arm-smmu 5100000.iommu: Stage-1: 36-bit VA -> 36-bit IPA [ 2.627772] arm-smmu 5100000.iommu: preserved 0 boot mappings Specifically, the crashes occur here: qsmmu->bypass_cbndx = smmu->num_context_banks - 1; arm_smmu_cb_write(smmu, qsmmu->bypass_cbndx, ARM_SMMU_CB_SCTLR, 0); and here: arm_smmu_write_context_bank(smmu, i); arm_smmu_cb_write(smmu, i, ARM_SMMU_CB_FSR, ARM_SMMU_CB_FSR_FAULT); It is likely that FW reserves the last context bank for its own use, thus a simple work-around is: DON'T USE IT in Linux. If we decrease the number of context banks, last one will be "hidden". Signed-off-by: Marc Gonzalez --- drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c index 7e65189ca7b8c..d08c18edf5732 100644 --- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c +++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c @@ -282,6 +282,11 @@ static int qcom_smmu_cfg_probe(struct arm_smmu_device *smmu) u32 smr; int i; + if (of_device_is_compatible(smmu->dev->of_node, "qcom,msm8998-lpass-smmu")) { + dev_warn(smmu->dev, "hide last ctx bank from linux"); + --smmu->num_context_banks; + } + /* * Some platforms support more than the Arm SMMU architected maximum of * 128 stream matching groups. For unknown reasons, the additional From patchwork Mon Aug 19 12:59:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Gonzalez X-Patchwork-Id: 13768337 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 02960C3DA4A for ; Mon, 19 Aug 2024 13:00:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=BFfbyRw+f/1Z57J8kD0F5jjk6CfrY+dulzE3+zJ7Kts=; b=LtbAVowesAgE0Y8OocMLFx1+Dp cY9rbWtOgvbJ+VbSU/Eano0A9qCkbdxU1UWQvQtdburHPDviwBNBZGWiKKKjbVh9WB2uoDkpL8N9w HODWJRP28KgwMpmoS5GEYsg5ruePWG8XA5i3G/5bPUnVszMwQ8mYmIbPWQZwUvcL40DRLYC0xoSwB eabubVWGmdKbTRrtZgzvBLSWlIi02H2v2u3ZY2YkJt3v++hw8KQdlqkgw7cN8XN0VldAmLbwhMw3x eQ98SutrUDJf5Z0yWXaIU8Ogd+3M9B8VMs5ZSRg0aNgXOOq1yAaVysype752bqr9oCw2ZbZjgdrke r2buaZ5w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sg1zm-00000001WQW-2PGe; Mon, 19 Aug 2024 13:00:26 +0000 Received: from ns.iliad.fr ([212.27.33.1]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sg1z5-00000001WD3-0V2S for linux-arm-kernel@lists.infradead.org; Mon, 19 Aug 2024 12:59:45 +0000 Received: from ns.iliad.fr (localhost [127.0.0.1]) by ns.iliad.fr (Postfix) with ESMTP id 9B2B220998; Mon, 19 Aug 2024 14:59:37 +0200 (CEST) Received: from [127.0.1.1] (freebox.vlq16.iliad.fr [213.36.7.13]) by ns.iliad.fr (Postfix) with ESMTP id 88DF420988; Mon, 19 Aug 2024 14:59:37 +0200 (CEST) From: Marc Gonzalez Date: Mon, 19 Aug 2024 14:59:36 +0200 Subject: [PATCH 2/2] arm64: dts: qcom: msm8998: add qcom,msm8998-lpass-smmu compatible MIME-Version: 1.0 Message-Id: <20240819-smmu-v1-2-bce6e4738825@freebox.fr> References: <20240819-smmu-v1-0-bce6e4738825@freebox.fr> In-Reply-To: <20240819-smmu-v1-0-bce6e4738825@freebox.fr> To: Rob Clark , Will Deacon , Robin Murphy , Joerg Roedel , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: iommu@lists.linux.dev, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Bjorn Andersson , Konrad Dybcio , Arnaud Vrac , Pierre-Hugues Husson , Marijn Suijten , Caleb Connolly , Marc Gonzalez X-Mailer: b4 0.13.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240819_055943_460495_D46B8082 X-CRM114-Status: GOOD ( 10.36 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The msm8998 LPASS SMMU requires special treatment, because FW reserves the last context bank for its own use. Signed-off-by: Marc Gonzalez --- arch/arm64/boot/dts/qcom/msm8998.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi index 1537e42fa03ca..f169f2dd281c3 100644 --- a/arch/arm64/boot/dts/qcom/msm8998.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi @@ -1616,7 +1616,7 @@ gpucc: clock-controller@5065000 { }; lpass_q6_smmu: iommu@5100000 { - compatible = "qcom,msm8998-smmu-v2", "qcom,smmu-v2"; + compatible = "qcom,msm8998-lpass-smmu", "qcom,msm8998-smmu-v2", "qcom,smmu-v2"; reg = <0x05100000 0x40000>; clocks = <&gcc HLOS1_VOTE_LPASS_ADSP_SMMU_CLK>; clock-names = "iface";