Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp81872pxj; Tue, 1 Jun 2021 15:45:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzGkzC8annYXVdH/q8r07p13x7z7rW1NDuLKFiaIQew3s8o8Cx4WhepGV8tQOJR7/h5UgIn X-Received: by 2002:a92:7403:: with SMTP id p3mr12889752ilc.290.1622587525264; Tue, 01 Jun 2021 15:45:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622587525; cv=none; d=google.com; s=arc-20160816; b=Hb7XW3Cd39PwDCX2HHlhaw2BRhx1GdlfDbhzZumzfaZcnzktYPHISiY/EOHOI4I+KE yJnHHZOMNwOG9LJUcV1DyZbmJI6gJLi0adC2bwmnQQapmgr3CEgALenxndq2TNReNBps 0CAnJNci/jCoRsRnsXzIN9AtBsPrhA6MppmGBYwruW1yuRgpJj7F+0Kij6gGyNmlxGM1 F9Ymm/X6McMaAtpBAxMkVB7nAwGNkRG9/x4AVuMdq8CFmqq4+esXsGkKNPGJVaUYBTac zFIpbQVJBEUXs77NnbXJFOA/rVHzkQcCCoWFwRm9mTLeiUM3aM/wO2l0ZGeKTAS2iOOG SEHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=HIFc0p7RPawTOWte2X5RUNbAQ3QNHzruJUPp0tR4Akc=; b=HVyrPmHg/lyKozsjwU8gYjvfGxLYu2z6hu8dxzB/4f9lxPygoJvSKupnggn9xYlBnV NADiBmWdQuwEDd5qJzfWrL+rPvc2kTuyGeBA3Ys9T8GRFewOqba0w3Bjda00aWNjGmN2 NDb06ldCbmlG5prWXoXW2ey0SsTw0QNH2xtRsHB8SSmNtKYpaU9z4niVD/hdm6HiQeaY UpAifUZjicSHgm8oF0g1xHkOEPmg87PK6nsPNJ++c9YV0iA+5ZcaKEvSNE8H6oql7dn9 29LdUvn+txa/JlJmzpXMKDC3q9rDfXVjJWsKRsCuQM1Yrtw2qgUfP2I2DgJA/7UabQDS hWJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=MmqhSHv4; 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=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r133si11205845jac.80.2021.06.01.15.45.11; Tue, 01 Jun 2021 15:45:25 -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=pass header.i=@gmail.com header.s=20161025 header.b=MmqhSHv4; 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=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235061AbhFAWqB (ORCPT + 99 others); Tue, 1 Jun 2021 18:46:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53018 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235064AbhFAWp4 (ORCPT ); Tue, 1 Jun 2021 18:45:56 -0400 Received: from mail-pj1-x102e.google.com (mail-pj1-x102e.google.com [IPv6:2607:f8b0:4864:20::102e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E0F5AC061574 for ; Tue, 1 Jun 2021 15:44:13 -0700 (PDT) Received: by mail-pj1-x102e.google.com with SMTP id m13-20020a17090b068db02901656cc93a75so2301644pjz.3 for ; Tue, 01 Jun 2021 15:44:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HIFc0p7RPawTOWte2X5RUNbAQ3QNHzruJUPp0tR4Akc=; b=MmqhSHv4pVmqOUQWG/JUj1wtc2XO84UZVkcICuPLv/X/UETgtt2ZbucwGxhjEH00nc bN8YjynQlzHWvDYsjzwlcNWjwNFby8q3j/4BRcH9BXO+v3BM+fPBI3iqtdMeJyhupBiu pZYqL8hYupt9XkK56b+yY4BGXo21+AY9V3B+54vWz5jEuWfJAuYRWiuULjBDEmadb0Ix JxrnR3HIkfOsyOvHjaX0HYlLr/w2VTqzEVDbjVRmylejTG2jTkZ0Js5fzvNYag3ft+ha gPijtYVLNlgVm2wvCtYDgfGv0oc3NZPdyHzFs1VdTAWcDV9EpTCkO9EWdLK3d+uCBvhA /JYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HIFc0p7RPawTOWte2X5RUNbAQ3QNHzruJUPp0tR4Akc=; b=bECd/V9fvhtEGbTSCmBdYyJkZQi3eue0pWInSUzPqs5z9PI8tASLWe5s1tBDrVZFuk 3mRqRIoDOS858K/U07Lg+Tjg8pnzzP0pQ25vf32J1DJ4w34Fm8UjPwB3fmVraVDqZQ2q D4fLNY+9LmrycA95Yai2AWPvrnKe2oItDqml7kQeeTcc8OFtRQmi1gKevkltlGhHOA9/ 34+GKlLB+4Nsk/AjEk+vbqAhWmqOOWhtmr9rG9O3Sa5EKPWCN/g4JsWmKYUwhSx4sCoN WVGJ6Ef+cvNDk7dht0n+S/ywBk1oSG5bb7CDsCewOCEYkcidUqjGL6cp7aJ1lY5FFPzl cv/w== X-Gm-Message-State: AOAM533PSecA5txlHb8vcTisyXDmaF7PkJ4gLCVg3yqUJP23vNLLdAdw i6TBGmHrIOC+XQWklfIGEyQ= X-Received: by 2002:a17:90a:b796:: with SMTP id m22mr26919264pjr.220.1622587453472; Tue, 01 Jun 2021 15:44:13 -0700 (PDT) Received: from localhost (c-73-25-156-94.hsd1.or.comcast.net. [73.25.156.94]) by smtp.gmail.com with ESMTPSA id r4sm13660868pff.197.2021.06.01.15.44.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Jun 2021 15:44:12 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: Jordan Crouse , Jordan Crouse , Rob Clark , Will Deacon , Robin Murphy , Joerg Roedel , Bjorn Andersson , Vinod Koul , Krishna Reddy , Sai Prakash Ranjan , linux-arm-kernel@lists.infradead.org (moderated list:ARM SMMU DRIVERS), iommu@lists.linux-foundation.org (open list:IOMMU DRIVERS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v4 2/6] iommu/arm-smmu-qcom: Add an adreno-smmu-priv callback to get pagefault info Date: Tue, 1 Jun 2021 15:47:21 -0700 Message-Id: <20210601224750.513996-4-robdclark@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210601224750.513996-1-robdclark@gmail.com> References: <20210601224750.513996-1-robdclark@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jordan Crouse Add a callback in adreno-smmu-priv to read interesting SMMU registers to provide an opportunity for a richer debug experience in the GPU driver. Signed-off-by: Jordan Crouse Signed-off-by: Rob Clark --- drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 17 ++++++++++++ drivers/iommu/arm/arm-smmu/arm-smmu.h | 2 ++ include/linux/adreno-smmu-priv.h | 31 +++++++++++++++++++++- 3 files changed, 49 insertions(+), 1 deletion(-) diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c index 98b3a1c2a181..b2e31ea84128 100644 --- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c +++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c @@ -32,6 +32,22 @@ static void qcom_adreno_smmu_write_sctlr(struct arm_smmu_device *smmu, int idx, arm_smmu_cb_write(smmu, idx, ARM_SMMU_CB_SCTLR, reg); } +static void qcom_adreno_smmu_get_fault_info(const void *cookie, + struct adreno_smmu_fault_info *info) +{ + struct arm_smmu_domain *smmu_domain = (void *)cookie; + struct arm_smmu_cfg *cfg = &smmu_domain->cfg; + struct arm_smmu_device *smmu = smmu_domain->smmu; + + info->fsr = arm_smmu_cb_read(smmu, cfg->cbndx, ARM_SMMU_CB_FSR); + info->fsynr0 = arm_smmu_cb_read(smmu, cfg->cbndx, ARM_SMMU_CB_FSYNR0); + info->fsynr1 = arm_smmu_cb_read(smmu, cfg->cbndx, ARM_SMMU_CB_FSYNR1); + info->far = arm_smmu_cb_readq(smmu, cfg->cbndx, ARM_SMMU_CB_FAR); + info->cbfrsynra = arm_smmu_gr1_read(smmu, ARM_SMMU_GR1_CBFRSYNRA(cfg->cbndx)); + info->ttbr0 = arm_smmu_cb_read(smmu, cfg->cbndx, ARM_SMMU_CB_TTBR0); + info->contextidr = arm_smmu_cb_read(smmu, cfg->cbndx, ARM_SMMU_CB_CONTEXTIDR); +} + #define QCOM_ADRENO_SMMU_GPU_SID 0 static bool qcom_adreno_smmu_is_gpu_device(struct device *dev) @@ -156,6 +172,7 @@ static int qcom_adreno_smmu_init_context(struct arm_smmu_domain *smmu_domain, priv->cookie = smmu_domain; priv->get_ttbr1_cfg = qcom_adreno_smmu_get_ttbr1_cfg; priv->set_ttbr0_cfg = qcom_adreno_smmu_set_ttbr0_cfg; + priv->get_fault_info = qcom_adreno_smmu_get_fault_info; return 0; } diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu.h b/drivers/iommu/arm/arm-smmu/arm-smmu.h index c31a59d35c64..84c21c4b0691 100644 --- a/drivers/iommu/arm/arm-smmu/arm-smmu.h +++ b/drivers/iommu/arm/arm-smmu/arm-smmu.h @@ -224,6 +224,8 @@ enum arm_smmu_cbar_type { #define ARM_SMMU_CB_FSYNR0 0x68 #define ARM_SMMU_FSYNR0_WNR BIT(4) +#define ARM_SMMU_CB_FSYNR1 0x6c + #define ARM_SMMU_CB_S1_TLBIVA 0x600 #define ARM_SMMU_CB_S1_TLBIASID 0x610 #define ARM_SMMU_CB_S1_TLBIVAL 0x620 diff --git a/include/linux/adreno-smmu-priv.h b/include/linux/adreno-smmu-priv.h index a889f28afb42..53fe32fb9214 100644 --- a/include/linux/adreno-smmu-priv.h +++ b/include/linux/adreno-smmu-priv.h @@ -8,6 +8,32 @@ #include +/** + * struct adreno_smmu_fault_info - container for key fault information + * + * @far: The faulting IOVA from ARM_SMMU_CB_FAR + * @ttbr0: The current TTBR0 pagetable from ARM_SMMU_CB_TTBR0 + * @contextidr: The value of ARM_SMMU_CB_CONTEXTIDR + * @fsr: The fault status from ARM_SMMU_CB_FSR + * @fsynr0: The value of FSYNR0 from ARM_SMMU_CB_FSYNR0 + * @fsynr1: The value of FSYNR1 from ARM_SMMU_CB_FSYNR0 + * @cbfrsynra: The value of CBFRSYNRA from ARM_SMMU_GR1_CBFRSYNRA(idx) + * + * This struct passes back key page fault information to the GPU driver + * through the get_fault_info function pointer. + * The GPU driver can use this information to print informative + * log messages and provide deeper GPU specific insight into the fault. + */ +struct adreno_smmu_fault_info { + u64 far; + u64 ttbr0; + u32 contextidr; + u32 fsr; + u32 fsynr0; + u32 fsynr1; + u32 cbfrsynra; +}; + /** * struct adreno_smmu_priv - private interface between adreno-smmu and GPU * @@ -17,6 +43,8 @@ * @set_ttbr0_cfg: Set the TTBR0 config for the GPUs context bank. A * NULL config disables TTBR0 translation, otherwise * TTBR0 translation is enabled with the specified cfg + * @get_fault_info: Called by the GPU fault handler to get information about + * the fault * * The GPU driver (drm/msm) and adreno-smmu work together for controlling * the GPU's SMMU instance. This is by necessity, as the GPU is directly @@ -31,6 +59,7 @@ struct adreno_smmu_priv { const void *cookie; const struct io_pgtable_cfg *(*get_ttbr1_cfg)(const void *cookie); int (*set_ttbr0_cfg)(const void *cookie, const struct io_pgtable_cfg *cfg); + void (*get_fault_info)(const void *cookie, struct adreno_smmu_fault_info *info); }; -#endif /* __ADRENO_SMMU_PRIV_H */ \ No newline at end of file +#endif /* __ADRENO_SMMU_PRIV_H */ -- 2.31.1