From: Bjorn Andersson <bjorn.andersson@linaro.org> To: Rob Clark <robdclark@gmail.com> Cc: dri-devel@lists.freedesktop.org, iommu@lists.linux-foundation.org, freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Jordan Crouse <jordan@cosmicpenguin.net>, Rob Clark <robdclark@chromium.org>, Will Deacon <will@kernel.org>, Robin Murphy <robin.murphy@arm.com>, Joerg Roedel <joro@8bytes.org>, "Isaac J. Manjarres" <isaacm@codeaurora.org>, "moderated list:ARM SMMU DRIVERS" <linux-arm-kernel@lists.infradead.org>, open list <linux-kernel@vger.kernel.org> Subject: Re: [PATCH v5 4/5] iommu/arm-smmu-qcom: Add stall support Date: Mon, 14 Jun 2021 12:54:56 -0500 [thread overview] Message-ID: <YMeX8NnVw80b9Qpe@yoga> (raw) In-Reply-To: <20210610214431.539029-5-robdclark@gmail.com> On Thu 10 Jun 16:44 CDT 2021, Rob Clark wrote: > From: Rob Clark <robdclark@chromium.org> > > Add, via the adreno-smmu-priv interface, a way for the GPU to request > the SMMU to stall translation on faults, and then later resume the > translation, either retrying or terminating the current translation. > > This will be used on the GPU side to "freeze" the GPU while we snapshot > useful state for devcoredump. > > Signed-off-by: Rob Clark <robdclark@chromium.org> Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> Regards, Bjorn > --- > drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 33 ++++++++++++++++++++++ > include/linux/adreno-smmu-priv.h | 7 +++++ > 2 files changed, 40 insertions(+) > > diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c > index b2e31ea84128..61fc645c1325 100644 > --- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c > +++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c > @@ -13,6 +13,7 @@ struct qcom_smmu { > struct arm_smmu_device smmu; > bool bypass_quirk; > u8 bypass_cbndx; > + u32 stall_enabled; > }; > > static struct qcom_smmu *to_qcom_smmu(struct arm_smmu_device *smmu) > @@ -23,12 +24,17 @@ static struct qcom_smmu *to_qcom_smmu(struct arm_smmu_device *smmu) > static void qcom_adreno_smmu_write_sctlr(struct arm_smmu_device *smmu, int idx, > u32 reg) > { > + struct qcom_smmu *qsmmu = to_qcom_smmu(smmu); > + > /* > * On the GPU device we want to process subsequent transactions after a > * fault to keep the GPU from hanging > */ > reg |= ARM_SMMU_SCTLR_HUPCF; > > + if (qsmmu->stall_enabled & BIT(idx)) > + reg |= ARM_SMMU_SCTLR_CFCFG; > + > arm_smmu_cb_write(smmu, idx, ARM_SMMU_CB_SCTLR, reg); > } > > @@ -48,6 +54,31 @@ static void qcom_adreno_smmu_get_fault_info(const void *cookie, > info->contextidr = arm_smmu_cb_read(smmu, cfg->cbndx, ARM_SMMU_CB_CONTEXTIDR); > } > > +static void qcom_adreno_smmu_set_stall(const void *cookie, bool enabled) > +{ > + struct arm_smmu_domain *smmu_domain = (void *)cookie; > + struct arm_smmu_cfg *cfg = &smmu_domain->cfg; > + struct qcom_smmu *qsmmu = to_qcom_smmu(smmu_domain->smmu); > + > + if (enabled) > + qsmmu->stall_enabled |= BIT(cfg->cbndx); > + else > + qsmmu->stall_enabled &= ~BIT(cfg->cbndx); > +} > + > +static void qcom_adreno_smmu_resume_translation(const void *cookie, bool terminate) > +{ > + struct arm_smmu_domain *smmu_domain = (void *)cookie; > + struct arm_smmu_cfg *cfg = &smmu_domain->cfg; > + struct arm_smmu_device *smmu = smmu_domain->smmu; > + u32 reg = 0; > + > + if (terminate) > + reg |= ARM_SMMU_RESUME_TERMINATE; > + > + arm_smmu_cb_write(smmu, cfg->cbndx, ARM_SMMU_CB_RESUME, reg); > +} > + > #define QCOM_ADRENO_SMMU_GPU_SID 0 > > static bool qcom_adreno_smmu_is_gpu_device(struct device *dev) > @@ -173,6 +204,8 @@ static int qcom_adreno_smmu_init_context(struct arm_smmu_domain *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; > + priv->set_stall = qcom_adreno_smmu_set_stall; > + priv->resume_translation = qcom_adreno_smmu_resume_translation; > > return 0; > } > diff --git a/include/linux/adreno-smmu-priv.h b/include/linux/adreno-smmu-priv.h > index 53fe32fb9214..c637e0997f6d 100644 > --- a/include/linux/adreno-smmu-priv.h > +++ b/include/linux/adreno-smmu-priv.h > @@ -45,6 +45,11 @@ struct adreno_smmu_fault_info { > * TTBR0 translation is enabled with the specified cfg > * @get_fault_info: Called by the GPU fault handler to get information about > * the fault > + * @set_stall: Configure whether stall on fault (CFCFG) is enabled. Call > + * before set_ttbr0_cfg(). If stalling on fault is enabled, > + * the GPU driver must call resume_translation() > + * @resume_translation: Resume translation after a 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 > @@ -60,6 +65,8 @@ struct adreno_smmu_priv { > 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); > + void (*set_stall)(const void *cookie, bool enabled); > + void (*resume_translation)(const void *cookie, bool terminate); > }; > > #endif /* __ADRENO_SMMU_PRIV_H */ > -- > 2.31.1 >
next prev parent reply other threads:[~2021-06-14 17:55 UTC|newest] Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-06-10 21:44 [PATCH v5 0/5] iommu/arm-smmu: adreno-smmu page fault handling Rob Clark 2021-06-10 21:44 ` [PATCH v5 1/5] iommu/arm-smmu: Add support for driver IOMMU fault handlers Rob Clark 2021-06-14 17:26 ` Bjorn Andersson 2021-06-10 21:44 ` [PATCH v5 2/5] iommu/arm-smmu-qcom: Add an adreno-smmu-priv callback to get pagefault info Rob Clark 2021-06-14 17:30 ` Bjorn Andersson 2021-06-10 21:44 ` [PATCH v5 3/5] drm/msm: Improve the a6xx page fault handler Rob Clark 2021-06-14 17:46 ` Bjorn Andersson 2021-06-25 3:39 ` Bjorn Andersson 2021-06-25 15:42 ` Rob Clark 2021-06-10 21:44 ` [PATCH v5 4/5] iommu/arm-smmu-qcom: Add stall support Rob Clark 2021-06-11 13:49 ` Jordan Crouse 2021-06-14 17:54 ` Bjorn Andersson [this message] 2021-06-10 21:44 ` [PATCH v5 5/5] drm/msm: devcoredump iommu fault support Rob Clark 2021-06-11 13:49 ` Jordan Crouse 2021-07-04 12:53 ` [PATCH v5 0/5] iommu/arm-smmu: adreno-smmu page fault handling Dmitry Baryshkov 2021-07-04 18:20 ` Rob Clark 2021-07-06 21:36 ` Bjorn Andersson 2021-07-07 5:12 ` John Stultz 2021-07-07 17:38 ` Rob Clark
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=YMeX8NnVw80b9Qpe@yoga \ --to=bjorn.andersson@linaro.org \ --cc=dri-devel@lists.freedesktop.org \ --cc=freedreno@lists.freedesktop.org \ --cc=iommu@lists.linux-foundation.org \ --cc=isaacm@codeaurora.org \ --cc=jordan@cosmicpenguin.net \ --cc=joro@8bytes.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-arm-msm@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=robdclark@chromium.org \ --cc=robdclark@gmail.com \ --cc=robin.murphy@arm.com \ --cc=will@kernel.org \ --subject='Re: [PATCH v5 4/5] iommu/arm-smmu-qcom: Add stall support' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).