From: Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>
To: Will Deacon <will@kernel.org>
Cc: Robin Murphy <robin.murphy@arm.com>,
Joerg Roedel <joro@8bytes.org>,
Jordan Crouse <jcrouse@codeaurora.org>,
Rob Clark <robdclark@gmail.com>,
Akhil P Oommen <akhilpo@codeaurora.org>,
freedreno@lists.freedesktop.org,
"Kristian H . Kristensen" <hoegsberg@google.com>,
dri-devel@lists.freedesktop.org,
iommu@lists.linux-foundation.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org
Subject: Re: [PATCHv9 3/8] iommu/arm-smmu: Move non-strict mode to use io_pgtable_domain_attr
Date: Wed, 25 Nov 2020 11:06:02 +0530 [thread overview]
Message-ID: <d4c7f311fbea91bb63d3b0eb164cf0d3@codeaurora.org> (raw)
In-Reply-To: <20201124213917.GA14252@willie-the-truck>
On 2020-11-25 03:09, Will Deacon wrote:
> On Mon, Nov 23, 2020 at 10:35:56PM +0530, Sai Prakash Ranjan wrote:
>> Now that we have a struct io_pgtable_domain_attr with quirks,
>> use that for non_strict mode as well thereby removing the need
>> for more members of arm_smmu_domain in the future.
>>
>> Signed-off-by: Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>
>> ---
>> drivers/iommu/arm/arm-smmu/arm-smmu.c | 8 +++-----
>> drivers/iommu/arm/arm-smmu/arm-smmu.h | 1 -
>> 2 files changed, 3 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu.c
>> b/drivers/iommu/arm/arm-smmu/arm-smmu.c
>> index 4b9b10fe50ed..f56f266ebdf7 100644
>> --- a/drivers/iommu/arm/arm-smmu/arm-smmu.c
>> +++ b/drivers/iommu/arm/arm-smmu/arm-smmu.c
>> @@ -786,9 +786,6 @@ static int arm_smmu_init_domain_context(struct
>> iommu_domain *domain,
>> goto out_clear_smmu;
>> }
>>
>> - if (smmu_domain->non_strict)
>> - pgtbl_cfg.quirks |= IO_PGTABLE_QUIRK_NON_STRICT;
>> -
>> if (smmu_domain->pgtbl_cfg.quirks)
>> pgtbl_cfg.quirks |= smmu_domain->pgtbl_cfg.quirks;
>>
>> @@ -1527,7 +1524,8 @@ static int arm_smmu_domain_get_attr(struct
>> iommu_domain *domain,
>> case IOMMU_DOMAIN_DMA:
>> switch (attr) {
>> case DOMAIN_ATTR_DMA_USE_FLUSH_QUEUE:
>> - *(int *)data = smmu_domain->non_strict;
>> + if (smmu_domain->pgtbl_cfg.quirks & IO_PGTABLE_QUIRK_NON_STRICT)
>> + *(int *)data = smmu_domain->pgtbl_cfg.quirks;
>
> I still don't think this is right :(
> We need to set *data to 1 or 0 depending on whether or not the
> non-strict
> quirk is set, i.e:
>
> bool non_strict = smmu_domain->pgtbl_cfg.quirks &
> IO_PGTABLE_QUIRK_NON_STRICT;
> *(int *)data = non_strict;
>
> Your code above leaves *data uninitialised if non_strict is not set.
Ugh sorry, I should have looked at this some more before hurrying up
to post, will fix it.
>
>> return 0;
>> default:
>> return -ENODEV;
>> @@ -1578,7 +1576,7 @@ static int arm_smmu_domain_set_attr(struct
>> iommu_domain *domain,
>> case IOMMU_DOMAIN_DMA:
>> switch (attr) {
>> case DOMAIN_ATTR_DMA_USE_FLUSH_QUEUE:
>> - smmu_domain->non_strict = *(int *)data;
>> + smmu_domain->pgtbl_cfg.quirks |= IO_PGTABLE_QUIRK_NON_STRICT;
>
> And this is broken because if *data is 0, then you _set_ the quirk,
> which is
> the opposite of what we should be doing.
>
> In other words, although the implementation has changed, the semantics
> have
> not.
>
Will fix this to have quirk set only when *data = 1 and unset in case of
0.
Thanks,
Sai
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a
member
of Code Aurora Forum, hosted by The Linux Foundation
next prev parent reply other threads:[~2020-11-25 5:36 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-23 17:05 [PATCHv9 0/8] System Cache support for GPU and required SMMU support Sai Prakash Ranjan
2020-11-23 17:05 ` [PATCHv9 1/8] iommu/io-pgtable-arm: Add support to use system cache Sai Prakash Ranjan
2020-11-23 17:05 ` [PATCHv9 2/8] iommu/arm-smmu: Add domain attribute for pagetable configuration Sai Prakash Ranjan
2020-11-24 21:41 ` Will Deacon
2020-11-25 6:58 ` Sai Prakash Ranjan
2020-11-23 17:05 ` [PATCHv9 3/8] iommu/arm-smmu: Move non-strict mode to use io_pgtable_domain_attr Sai Prakash Ranjan
2020-11-24 21:39 ` Will Deacon
2020-11-25 5:36 ` Sai Prakash Ranjan [this message]
2020-11-23 17:05 ` [PATCHv9 4/8] drm/msm: rearrange the gpu_rmw() function Sai Prakash Ranjan
2020-11-23 17:05 ` [PATCHv9 5/8] drm/msm/a6xx: Add support for using system cache(LLC) Sai Prakash Ranjan
2020-11-23 17:05 ` [PATCHv9 6/8] drm/msm/a6xx: Add support for using system cache on MMU500 based targets Sai Prakash Ranjan
2020-11-23 17:06 ` [PATCHv9 7/8] iommu: arm-smmu-impl: Use table to list QCOM implementations Sai Prakash Ranjan
2020-11-23 17:06 ` [PATCHv9 8/8] iommu: arm-smmu-impl: Add a space before open parenthesis Sai Prakash Ranjan
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=d4c7f311fbea91bb63d3b0eb164cf0d3@codeaurora.org \
--to=saiprakash.ranjan@codeaurora.org \
--cc=akhilpo@codeaurora.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=freedreno@lists.freedesktop.org \
--cc=hoegsberg@google.com \
--cc=iommu@lists.linux-foundation.org \
--cc=jcrouse@codeaurora.org \
--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@gmail.com \
--cc=robin.murphy@arm.com \
--cc=will@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).