From: will.deacon@arm•com (Will Deacon)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH v2 2/2] iommu/arm-smmu: Do not access non-existing SMR registers
Date: Wed, 6 Aug 2014 18:35:18 +0100 [thread overview]
Message-ID: <20140806173518.GG25953@arm.com> (raw)
In-Reply-To: <53E25B76.6090208@codeaurora.org>
Hi Olav,
On Wed, Aug 06, 2014 at 05:44:38PM +0100, Olav Haugan wrote:
> On 8/6/2014 3:19 AM, Will Deacon wrote:
> > On Mon, Aug 04, 2014 at 07:01:03PM +0100, Olav Haugan wrote:
> >> The SMR registers do not exist when stream matching is not
> >> supported by the hardware. Avoid writing to this register if not needed.
> >>
> >> Signed-off-by: Olav Haugan <ohaugan@codeaurora•org>
> >> ---
> >> drivers/iommu/arm-smmu.c | 5 ++++-
> >> 1 file changed, 4 insertions(+), 1 deletion(-)
> >>
> >> diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
> >> index c16431f..1f3a5b3 100644
> >> --- a/drivers/iommu/arm-smmu.c
> >> +++ b/drivers/iommu/arm-smmu.c
> >> @@ -1731,7 +1731,10 @@ static void arm_smmu_device_reset(struct arm_smmu_device *smmu)
> >>
> >> /* Mark all SMRn as invalid and all S2CRn as bypass */
> >> for (i = 0; i < smmu->num_mapping_groups; ++i) {
> >> - writel_relaxed(~SMR_VALID, gr0_base + ARM_SMMU_GR0_SMR(i));
> >> + if (smmu->features & ARM_SMMU_FEAT_STREAM_MATCH) {
> >> + writel_relaxed(~SMR_VALID,
> >> + gr0_base + ARM_SMMU_GR0_SMR(i));
> >> + }
> >> writel_relaxed(S2CR_TYPE_BYPASS,
> >> gr0_base + ARM_SMMU_GR0_S2CR(i));
> >
> > smmu->num_mapping_groups should be zero for an SMMU that doesn't include
> > the SMR registers, so I don't think this change is needed. Are you seeing
> > problems with real hardware?
>
> Yes, you are correct. However, since that is the case we wouldn't be
> setting the S2CR registers to bypass then? Seems like
> num_mappings_groups should be initialized regardless whether stream
> matching or stream indexing is used. SMMU_IDR0.NUMSMRG specifies the
> number of stream mapping register groups (Section 2.5.2 of the ARM
> SMMUv1-v2 spec). So with stream indexing support this register should
> still tell us how many S2CR registers exist?
Hmm, I'm checking this with the architects because the TRMs aren't exactly
clear. The NUMSMRG works for stream-indexing (i.e. reports the number of
S2CRs), then all we have to do is change the above ~SMR_VALID to 0x0, since
those registers will be SBZP.
> As far as I can tell there are no other register telling us how many S2CR
> registers exist. That also brings up another point that there is no check
> in the code to ensure we are not trying to program more than the available
> S2CR registers when we use stream indexing.
On an SMMU using stream-indexing, if the StreamID goes off the end of the
S2CRs that's a fairly serious hardware configuration issue which I don't
think Linux is in a position to handle. I agree that a warning wouldn't
hurt on device add/attach though.
Will
next prev parent reply other threads:[~2014-08-06 17:35 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-04 18:01 [PATCH v2 0/2] arm-smmu fixes for CBn_TCR and S2CR/SMR programming Olav Haugan
2014-08-04 18:01 ` [PATCH v2 1/2] iommu/arm-smmu: Fix programming of SMMU_CBn_TCR for stage 1 Olav Haugan
2014-08-04 18:01 ` [PATCH v2 2/2] iommu/arm-smmu: Do not access non-existing SMR registers Olav Haugan
2014-08-06 10:19 ` Will Deacon
2014-08-06 16:44 ` Olav Haugan
2014-08-06 17:35 ` Will Deacon [this message]
2014-08-06 23:34 ` Olav Haugan
2014-08-07 9:22 ` Will Deacon
2014-08-08 18:51 ` Olav Haugan
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=20140806173518.GG25953@arm.com \
--to=will.deacon@arm$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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