From: Will Deacon <will@kernel.org>
To: Bjorn Andersson <bjorn.andersson@linaro.org>
Cc: Robin Murphy <robin.murphy@arm.com>,
Joerg Roedel <joro@8bytes.org>,
Thierry Reding <thierry.reding@gmail.com>,
Laurentiu Tudor <laurentiu.tudor@nxp.com>,
linux-arm-kernel@lists.infradead.org,
iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org,
Jonathan Marek <jonathan@marek.ca>,
linux-arm-msm@vger.kernel.org,
John Stultz <john.stultz@linaro.org>,
Vinod Koul <vkoul@kernel.org>,
jcrouse@codeaurora.org
Subject: Re: [PATCH v2 2/5] iommu/arm-smmu: Emulate bypass by using context banks
Date: Mon, 20 Jul 2020 09:58:42 +0100 [thread overview]
Message-ID: <20200720085841.GA11189@willie-the-truck> (raw)
In-Reply-To: <20200717001619.325317-3-bjorn.andersson@linaro.org>
On Thu, Jul 16, 2020 at 05:16:16PM -0700, Bjorn Andersson wrote:
> Some firmware found on various Qualcomm platforms traps writes to S2CR
> of type BYPASS and writes FAULT into the register. This prevents us from
> marking the streams for the display controller as BYPASS to allow
> continued scanout of the screen through the initialization of the ARM
> SMMU.
>
> This adds a Qualcomm specific cfg_probe function, which probes the
> behavior of the S2CR registers and if found faulty enables the related
> quirk. Based on this quirk context banks are allocated for IDENTITY
> domains as well, but with ARM_SMMU_SCTLR_M omitted.
>
> The result is valid stream mappings, without translation.
>
> Tested-by: John Stultz <john.stultz@linaro.org>
> Tested-by: Vinod Koul <vkoul@kernel.org>
> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> ---
>
> Changes since v1:
> - Picked up tested-by
>
> drivers/iommu/arm-smmu-qcom.c | 21 +++++++++++++++++++++
> drivers/iommu/arm-smmu.c | 14 ++++++++++++--
> drivers/iommu/arm-smmu.h | 3 +++
> 3 files changed, 36 insertions(+), 2 deletions(-)
[...]
> diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
> index fb85e716ae9a..5d5fe6741ed4 100644
> --- a/drivers/iommu/arm-smmu.c
> +++ b/drivers/iommu/arm-smmu.c
> @@ -654,7 +654,9 @@ static void arm_smmu_write_context_bank(struct arm_smmu_device *smmu, int idx)
>
> /* SCTLR */
> reg = ARM_SMMU_SCTLR_CFIE | ARM_SMMU_SCTLR_CFRE | ARM_SMMU_SCTLR_AFE |
> - ARM_SMMU_SCTLR_TRE | ARM_SMMU_SCTLR_M;
> + ARM_SMMU_SCTLR_TRE;
> + if (cfg->m)
> + reg |= ARM_SMMU_SCTLR_M;
> if (stage1)
> reg |= ARM_SMMU_SCTLR_S1_ASIDPNE;
> if (IS_ENABLED(CONFIG_CPU_BIG_ENDIAN))
> @@ -678,7 +680,11 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain,
> if (smmu_domain->smmu)
> goto out_unlock;
>
> - if (domain->type == IOMMU_DOMAIN_IDENTITY) {
> + /*
> + * Nothing to do for IDENTITY domains,unless disabled context banks are
> + * used to emulate bypass mappings on Qualcomm platforms.
> + */
> + if (domain->type == IOMMU_DOMAIN_IDENTITY && !smmu->qcom_bypass_quirk) {
Given that the other thread [1] with Jordan (why haven't you cc'd him?! --
adding him now) has identified the need for a callback to allocate the
context bank, why don't we use the same sort of idea here? If the impl
provides a CB allocator function, call it irrespective of the domain type.
If it allocates a domain even for an identity domain, then we can install
if with SCTLR.M clear.
Will
[1] https://lore.kernel.org/r/20200716151625.GA14526@jcrouse1-lnx.qualcomm.com
next prev parent reply other threads:[~2020-07-20 8:58 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-17 0:16 [PATCH v2 0/5] iommu/arm-smmu: Support maintaining bootloader mappings Bjorn Andersson
2020-07-17 0:16 ` [PATCH v2 1/5] iommu/arm-smmu: Make all valid stream mappings BYPASS Bjorn Andersson
2020-07-17 0:16 ` [PATCH v2 2/5] iommu/arm-smmu: Emulate bypass by using context banks Bjorn Andersson
2020-07-20 8:58 ` Will Deacon [this message]
2020-07-20 15:51 ` Jordan Crouse
2020-07-17 0:16 ` [PATCH v2 3/5] iommu/arm-smmu: Move SMR and S2CR definitions to header file Bjorn Andersson
2020-07-17 0:16 ` [PATCH v2 4/5] iommu/arm-smmu-qcom: Consistently initialize stream mappings Bjorn Andersson
2020-07-17 0:16 ` [PATCH v2 5/5] iommu/arm-smmu: Setup identity domain for boot mappings Bjorn Andersson
2020-07-20 9:03 ` Will Deacon
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=20200720085841.GA11189@willie-the-truck \
--to=will@kernel.org \
--cc=bjorn.andersson@linaro.org \
--cc=iommu@lists.linux-foundation.org \
--cc=jcrouse@codeaurora.org \
--cc=john.stultz@linaro.org \
--cc=jonathan@marek.ca \
--cc=joro@8bytes.org \
--cc=laurentiu.tudor@nxp.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robin.murphy@arm.com \
--cc=thierry.reding@gmail.com \
--cc=vkoul@kernel.org \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).