Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3158607ybt; Mon, 29 Jun 2020 17:14:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyYKix86e/6+Xs6JBsSvMuth2IUO8xext5YKoO1SONBIQeGoo04wqwqusHMwPn5PohICYJQ X-Received: by 2002:a17:906:1986:: with SMTP id g6mr3688763ejd.404.1593476070590; Mon, 29 Jun 2020 17:14:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593476070; cv=none; d=google.com; s=arc-20160816; b=Baikj9KkFgTHI1pzJ8ecQrtbCLL5bqlKn6VBbNvao9BiX4UWRkjvO6+28gSzluIjTk w4YLget7ymD24xc2Kig1dcY6t13g5iJ/QQV0yIWi5Tf8Sbz1oy03U+8qD6VEehA5POpb Bzvk2BuIlfvgs2tXxLnk8Q6Zv74pK00bJhEXeEZmuDboefHmV33JSihbNtUALr6e7CY3 As9msk8jW4aVofYU27Uu2Ony8UMvvDC6CC8wUg9zc7R5/aOwRF+ZUsSsRfs6PtejcXXk VS31u8Fz1qHRittKDJpQIV0DGFYynM6IatFn8D0VlyTRlEBU8QV1LP0eOkr9SfX574Oj os/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:to:dkim-signature :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:from; bh=CT+HeTTm9sHN5mWCX2mMB7p1JwQt4iBmpY1WaRa0rv0=; b=i+aoN+lK3/aV8skRxBRUQdccXHDCGZfIxPVcXKk07RygSC2HP6dAb0XPB1kJ7TJYIS DPp2FHAQ7FvOwXCNsnveTntax89HoAe9AjITTuHdftJ3Hmjotdh+fKEpbDINgQmxVtVA WGDD9dbJw5odCcVtRXzoo6m/LmxAmE0dZG0h+fxnKisN4gTY+oLjgjmy83jqIQzoyABI W/oP1z3w9vdZeJD+aekApMPqjXBhS2zf0fktrK/P5UFHIGtyJE+jRBMFkPzJflh1gq+S vA32MBkyP/9TpP+a89Ghj38YKBK8ohrrQUcYT6K/I8hEoGV44zh5W91R5hRTl06ab5Yr L95Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@nvidia.com header.s=n1 header.b=icW9w2tH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nvidia.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id 17si733102ejw.686.2020.06.29.17.14.06; Mon, 29 Jun 2020 17:14:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=fail header.i=@nvidia.com header.s=n1 header.b=icW9w2tH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nvidia.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728629AbgF3AK6 (ORCPT + 99 others); Mon, 29 Jun 2020 20:10:58 -0400 Received: from hqnvemgate25.nvidia.com ([216.228.121.64]:8829 "EHLO hqnvemgate25.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728613AbgF3AK5 (ORCPT ); Mon, 29 Jun 2020 20:10:57 -0400 Received: from hqpgpgate102.nvidia.com (Not Verified[216.228.121.13]) by hqnvemgate25.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA) id ; Mon, 29 Jun 2020 17:10:07 -0700 Received: from hqmail.nvidia.com ([172.20.161.6]) by hqpgpgate102.nvidia.com (PGP Universal service); Mon, 29 Jun 2020 17:10:56 -0700 X-PGP-Universal: processed; by hqpgpgate102.nvidia.com on Mon, 29 Jun 2020 17:10:56 -0700 Received: from HQMAIL109.nvidia.com (172.20.187.15) by HQMAIL111.nvidia.com (172.20.187.18) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Tue, 30 Jun 2020 00:10:52 +0000 Received: from rnnvemgw01.nvidia.com (10.128.109.123) by HQMAIL109.nvidia.com (172.20.187.15) with Microsoft SMTP Server (TLS) id 15.0.1473.3 via Frontend Transport; Tue, 30 Jun 2020 00:10:52 +0000 Received: from vdumpa-ubuntu.nvidia.com (Not Verified[172.17.173.140]) by rnnvemgw01.nvidia.com with Trustwave SEG (v7,5,8,10121) id ; Mon, 29 Jun 2020 17:10:52 -0700 From: Krishna Reddy CC: , , , , , , , , , , , , , , , , , Krishna Reddy Subject: [PATCH v8 3/3] iommu/arm-smmu: Add global/context fault implementation hooks Date: Mon, 29 Jun 2020 17:10:51 -0700 Message-ID: <20200630001051.12350-4-vdumpa@nvidia.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200630001051.12350-1-vdumpa@nvidia.com> References: <20200630001051.12350-1-vdumpa@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public Content-Transfer-Encoding: quoted-printable Content-Type: text/plain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1; t=1593475807; bh=CT+HeTTm9sHN5mWCX2mMB7p1JwQt4iBmpY1WaRa0rv0=; h=X-PGP-Universal:From:To:CC:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:MIME-Version:X-NVConfidentiality: Content-Transfer-Encoding:Content-Type; b=icW9w2tHh3cddF+I93ABrnfI7DZGe0YF/GdmpgXNWWQH+/ix3wa/iiM1YIpuZVj81 s8tERjyoXu3TZh1sF4CNnz/qv9pJWYQiXeYDHafhExho4T23d8oh3qBKymbS22t+JL ZwUteCX/KL9WQmAjLqZQfcvrGnoYOqOj8WOY0cS0ykX+jgixSc6r4W4vuyUUUgkgNF 81DIk4mHbpoVh69TzqP6QJPKzaOjqzDbmPuJ6Mr6an1FGalnvkzZDnJ1eNHe3k+Cuw zJL0Jvy1f10kEOMhbqTFtueP9N4BQsL/D4oIA00wl2dAChDMnymQEPMwx8IWHhfSNN 9IY/95Rap5d8g== To: unlisted-recipients:; (no To-header on input) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add global/context fault hooks to allow NVIDIA SMMU implementation handle faults across multiple SMMUs. Signed-off-by: Krishna Reddy --- drivers/iommu/arm-smmu-nvidia.c | 98 +++++++++++++++++++++++++++++++++ drivers/iommu/arm-smmu.c | 17 +++++- drivers/iommu/arm-smmu.h | 3 + 3 files changed, 116 insertions(+), 2 deletions(-) diff --git a/drivers/iommu/arm-smmu-nvidia.c b/drivers/iommu/arm-smmu-nvidi= a.c index 1124f0ac1823a..c9423b4199c65 100644 --- a/drivers/iommu/arm-smmu-nvidia.c +++ b/drivers/iommu/arm-smmu-nvidia.c @@ -147,6 +147,102 @@ static int nvidia_smmu_reset(struct arm_smmu_device *= smmu) return 0; } =20 +static struct arm_smmu_domain *to_smmu_domain(struct iommu_domain *dom) +{ + return container_of(dom, struct arm_smmu_domain, domain); +} + +static irqreturn_t nvidia_smmu_global_fault_inst(int irq, + struct arm_smmu_device *smmu, + int inst) +{ + u32 gfsr, gfsynr0, gfsynr1, gfsynr2; + void __iomem *gr0_base =3D nvidia_smmu_page(smmu, inst, 0); + + gfsr =3D readl_relaxed(gr0_base + ARM_SMMU_GR0_sGFSR); + if (!gfsr) + return IRQ_NONE; + + gfsynr0 =3D readl_relaxed(gr0_base + ARM_SMMU_GR0_sGFSYNR0); + gfsynr1 =3D readl_relaxed(gr0_base + ARM_SMMU_GR0_sGFSYNR1); + gfsynr2 =3D readl_relaxed(gr0_base + ARM_SMMU_GR0_sGFSYNR2); + + dev_err_ratelimited(smmu->dev, + "Unexpected global fault, this could be serious\n"); + dev_err_ratelimited(smmu->dev, + "\tGFSR 0x%08x, GFSYNR0 0x%08x, GFSYNR1 0x%08x, GFSYNR2 0x%08x\n", + gfsr, gfsynr0, gfsynr1, gfsynr2); + + writel_relaxed(gfsr, gr0_base + ARM_SMMU_GR0_sGFSR); + return IRQ_HANDLED; +} + +static irqreturn_t nvidia_smmu_global_fault(int irq, void *dev) +{ + int inst; + irqreturn_t irq_ret =3D IRQ_NONE; + struct arm_smmu_device *smmu =3D dev; + struct nvidia_smmu *nvidia_smmu =3D to_nvidia_smmu(smmu); + + for (inst =3D 0; inst < nvidia_smmu->num_inst; inst++) { + irq_ret =3D nvidia_smmu_global_fault_inst(irq, smmu, inst); + if (irq_ret =3D=3D IRQ_HANDLED) + return irq_ret; + } + + return irq_ret; +} + +static irqreturn_t nvidia_smmu_context_fault_bank(int irq, + struct arm_smmu_device *smmu, + int idx, int inst) +{ + u32 fsr, fsynr, cbfrsynra; + unsigned long iova; + void __iomem *gr1_base =3D nvidia_smmu_page(smmu, inst, 1); + void __iomem *cb_base =3D nvidia_smmu_page(smmu, inst, smmu->numpage + id= x); + + fsr =3D readl_relaxed(cb_base + ARM_SMMU_CB_FSR); + if (!(fsr & ARM_SMMU_FSR_FAULT)) + return IRQ_NONE; + + fsynr =3D readl_relaxed(cb_base + ARM_SMMU_CB_FSYNR0); + iova =3D readq_relaxed(cb_base + ARM_SMMU_CB_FAR); + cbfrsynra =3D readl_relaxed(gr1_base + ARM_SMMU_GR1_CBFRSYNRA(idx)); + + dev_err_ratelimited(smmu->dev, + "Unhandled context fault: fsr=3D0x%x, iova=3D0x%08lx, fsynr=3D0x%x, cbfrs= ynra=3D0x%x, cb=3D%d\n", + fsr, iova, fsynr, cbfrsynra, idx); + + writel_relaxed(fsr, cb_base + ARM_SMMU_CB_FSR); + return IRQ_HANDLED; +} + +static irqreturn_t nvidia_smmu_context_fault(int irq, void *dev) +{ + int inst, idx; + irqreturn_t irq_ret =3D IRQ_NONE; + struct iommu_domain *domain =3D dev; + struct arm_smmu_domain *smmu_domain =3D to_smmu_domain(domain); + struct arm_smmu_device *smmu =3D smmu_domain->smmu; + + for (inst =3D 0; inst < to_nvidia_smmu(smmu)->num_inst; inst++) { + /* + * Interrupt line shared between all context faults. + * Check for faults across all contexts. + */ + for (idx =3D 0; idx < smmu->num_context_banks; idx++) { + irq_ret =3D nvidia_smmu_context_fault_bank(irq, smmu, + idx, inst); + + if (irq_ret =3D=3D IRQ_HANDLED) + return irq_ret; + } + } + + return irq_ret; +} + static const struct arm_smmu_impl nvidia_smmu_impl =3D { .read_reg =3D nvidia_smmu_read_reg, .write_reg =3D nvidia_smmu_write_reg, @@ -154,6 +250,8 @@ static const struct arm_smmu_impl nvidia_smmu_impl =3D = { .write_reg64 =3D nvidia_smmu_write_reg64, .reset =3D nvidia_smmu_reset, .tlb_sync =3D nvidia_smmu_tlb_sync, + .global_fault =3D nvidia_smmu_global_fault, + .context_fault =3D nvidia_smmu_context_fault, }; =20 struct arm_smmu_device *nvidia_smmu_impl_init(struct arm_smmu_device *smmu= ) diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index 243bc4cb2705b..3bb0aba15a356 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -673,6 +673,7 @@ static int arm_smmu_init_domain_context(struct iommu_do= main *domain, enum io_pgtable_fmt fmt; struct arm_smmu_domain *smmu_domain =3D to_smmu_domain(domain); struct arm_smmu_cfg *cfg =3D &smmu_domain->cfg; + irqreturn_t (*context_fault)(int irq, void *dev); =20 mutex_lock(&smmu_domain->init_mutex); if (smmu_domain->smmu) @@ -835,7 +836,13 @@ static int arm_smmu_init_domain_context(struct iommu_d= omain *domain, * handler seeing a half-initialised domain state. */ irq =3D smmu->irqs[smmu->num_global_irqs + cfg->irptndx]; - ret =3D devm_request_irq(smmu->dev, irq, arm_smmu_context_fault, + + if (smmu->impl && smmu->impl->context_fault) + context_fault =3D smmu->impl->context_fault; + else + context_fault =3D arm_smmu_context_fault; + + ret =3D devm_request_irq(smmu->dev, irq, context_fault, IRQF_SHARED, "arm-smmu-context-fault", domain); if (ret < 0) { dev_err(smmu->dev, "failed to request context IRQ %d (%u)\n", @@ -2107,6 +2114,7 @@ static int arm_smmu_device_probe(struct platform_devi= ce *pdev) struct arm_smmu_device *smmu; struct device *dev =3D &pdev->dev; int num_irqs, i, err; + irqreturn_t (*global_fault)(int irq, void *dev); =20 smmu =3D devm_kzalloc(dev, sizeof(*smmu), GFP_KERNEL); if (!smmu) { @@ -2193,9 +2201,14 @@ static int arm_smmu_device_probe(struct platform_dev= ice *pdev) smmu->num_context_irqs =3D smmu->num_context_banks; } =20 + if (smmu->impl && smmu->impl->global_fault) + global_fault =3D smmu->impl->global_fault; + else + global_fault =3D arm_smmu_global_fault; + for (i =3D 0; i < smmu->num_global_irqs; ++i) { err =3D devm_request_irq(smmu->dev, smmu->irqs[i], - arm_smmu_global_fault, + global_fault, IRQF_SHARED, "arm-smmu global fault", smmu); diff --git a/drivers/iommu/arm-smmu.h b/drivers/iommu/arm-smmu.h index 8cf1511ed9874..8b330076ff2af 100644 --- a/drivers/iommu/arm-smmu.h +++ b/drivers/iommu/arm-smmu.h @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -387,6 +388,8 @@ struct arm_smmu_impl { void (*tlb_sync)(struct arm_smmu_device *smmu, int page, int sync, int status); int (*def_domain_type)(struct device *dev); + irqreturn_t (*global_fault)(int irq, void *dev); + irqreturn_t (*context_fault)(int irq, void *dev); }; =20 static inline void __iomem *arm_smmu_page(struct arm_smmu_device *smmu, in= t n) --=20 2.26.2