From: Moritz Fischer <mdf@kernel.org>
To: Jason Gunthorpe <jgg@nvidia.com>
Cc: iommu@lists.linux.dev, Joerg Roedel <joro@8bytes.org>,
linux-arm-kernel@lists.infradead.org,
Robin Murphy <robin.murphy@arm.com>,
Will Deacon <will@kernel.org>,
Michael Shavit <mshavit@google.com>,
Nicolin Chen <nicolinc@nvidia.com>,
Shameerali Kolothum Thodi <shameerali.kolothum.thodi@huawei.com>
Subject: Re: [PATCH v2 02/19] iommu/arm-smmu-v3: Master cannot be NULL in arm_smmu_write_strtab_ent()
Date: Tue, 14 Nov 2023 07:17:12 -0800 [thread overview]
Message-ID: <ZVOPeLOmRO9zd2hv@archbook> (raw)
In-Reply-To: <2-v2-de8b10590bf5+400-smmuv3_newapi_p1_jgg@nvidia.com>
On Mon, Nov 13, 2023 at 01:53:09PM -0400, Jason Gunthorpe wrote:
> The only caller is arm_smmu_install_ste_for_dev() which never has a NULL
> master. Remove the confusing if.
>
> Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Reviewed-by: Moritz Fischer <mdf@kernel.org>
> ---
> drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 9 ++-------
> 1 file changed, 2 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
> index 519749d15fbda0..9117e769a965e1 100644
> --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
> +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
> @@ -1269,10 +1269,10 @@ static void arm_smmu_write_strtab_ent(struct arm_smmu_master *master, u32 sid,
> */
> u64 val = le64_to_cpu(dst->data[0]);
> bool ste_live = false;
> - struct arm_smmu_device *smmu = NULL;
> + struct arm_smmu_device *smmu = master->smmu;
> struct arm_smmu_ctx_desc_cfg *cd_table = NULL;
> struct arm_smmu_s2_cfg *s2_cfg = NULL;
> - struct arm_smmu_domain *smmu_domain = NULL;
> + struct arm_smmu_domain *smmu_domain = master->domain;
> struct arm_smmu_cmdq_ent prefetch_cmd = {
> .opcode = CMDQ_OP_PREFETCH_CFG,
> .prefetch = {
> @@ -1280,11 +1280,6 @@ static void arm_smmu_write_strtab_ent(struct arm_smmu_master *master, u32 sid,
> },
> };
>
> - if (master) {
> - smmu_domain = master->domain;
> - smmu = master->smmu;
> - }
> -
> if (smmu_domain) {
> switch (smmu_domain->stage) {
> case ARM_SMMU_DOMAIN_S1:
> --
> 2.42.0
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2023-11-14 15:17 UTC|newest]
Thread overview: 79+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-13 17:53 [PATCH v2 00/19] Update SMMUv3 to the modern iommu API (part 1/3) Jason Gunthorpe
2023-11-13 17:53 ` [PATCH v2 01/19] iommu/arm-smmu-v3: Add a type for the STE Jason Gunthorpe
2023-11-14 15:06 ` Moritz Fischer
2023-11-15 11:52 ` Michael Shavit
2023-11-15 13:35 ` Jason Gunthorpe
2023-11-27 16:03 ` Eric Auger
2023-11-27 17:42 ` Jason Gunthorpe
2023-11-27 17:51 ` Eric Auger
2023-11-27 18:21 ` Jason Gunthorpe
2023-12-05 0:44 ` Nicolin Chen
2023-11-13 17:53 ` [PATCH v2 02/19] iommu/arm-smmu-v3: Master cannot be NULL in arm_smmu_write_strtab_ent() Jason Gunthorpe
2023-11-14 15:17 ` Moritz Fischer [this message]
2023-11-15 11:55 ` Michael Shavit
2023-11-27 15:41 ` Eric Auger
2023-12-05 0:45 ` Nicolin Chen
2023-11-13 17:53 ` [PATCH v2 03/19] iommu/arm-smmu-v3: Remove ARM_SMMU_DOMAIN_NESTED Jason Gunthorpe
2023-11-14 15:18 ` Moritz Fischer
2023-11-27 16:35 ` Eric Auger
2023-12-05 0:46 ` Nicolin Chen
2023-11-13 17:53 ` [PATCH v2 04/19] iommu/arm-smmu-v3: Make STE programming independent of the callers Jason Gunthorpe
2023-12-05 1:38 ` Nicolin Chen
2023-11-13 17:53 ` [PATCH v2 05/19] iommu/arm-smmu-v3: Consolidate the STE generation for abort/bypass Jason Gunthorpe
2023-11-15 12:17 ` Michael Shavit
2023-12-05 1:43 ` Nicolin Chen
2023-11-13 17:53 ` [PATCH v2 06/19] iommu/arm-smmu-v3: Move arm_smmu_rmr_install_bypass_ste() Jason Gunthorpe
2023-11-15 13:57 ` Michael Shavit
2023-12-05 1:45 ` Nicolin Chen
2023-11-13 17:53 ` [PATCH v2 07/19] iommu/arm-smmu-v3: Move the STE generation for S1 and S2 domains into functions Jason Gunthorpe
2023-11-14 15:24 ` Moritz Fischer
2023-11-15 14:01 ` Michael Shavit
2023-12-05 1:55 ` Nicolin Chen
2023-12-05 14:35 ` Jason Gunthorpe
2023-11-13 17:53 ` [PATCH v2 08/19] iommu/arm-smmu-v3: Build the whole STE in arm_smmu_make_s2_domain_ste() Jason Gunthorpe
2023-11-15 14:04 ` Michael Shavit
2023-12-05 1:58 ` Nicolin Chen
2023-11-13 17:53 ` [PATCH v2 09/19] iommu/arm-smmu-v3: Hold arm_smmu_asid_lock during all of attach_dev Jason Gunthorpe
2023-11-15 14:12 ` Michael Shavit
2023-12-05 2:16 ` Nicolin Chen
2023-11-13 17:53 ` [PATCH v2 10/19] iommu/arm-smmu-v3: Compute the STE only once for each master Jason Gunthorpe
2023-11-15 14:16 ` Michael Shavit
2023-12-05 2:13 ` Nicolin Chen
2023-11-13 17:53 ` [PATCH v2 11/19] iommu/arm-smmu-v3: Do not change the STE twice during arm_smmu_attach_dev() Jason Gunthorpe
2023-11-15 15:15 ` Michael Shavit
2023-11-16 16:28 ` Jason Gunthorpe
2023-12-05 2:46 ` Nicolin Chen
2023-11-13 17:53 ` [PATCH v2 12/19] iommu/arm-smmu-v3: Put writing the context descriptor in the right order Jason Gunthorpe
2023-11-15 15:32 ` Michael Shavit
2023-11-16 16:46 ` Jason Gunthorpe
2023-11-17 4:14 ` Michael Shavit
2023-12-05 3:38 ` Nicolin Chen
2023-11-13 17:53 ` [PATCH v2 13/19] iommu/arm-smmu-v3: Pass smmu_domain to arm_enable/disable_ats() Jason Gunthorpe
2023-12-05 3:56 ` Nicolin Chen
2023-11-13 17:53 ` [PATCH v2 14/19] iommu/arm-smmu-v3: Remove arm_smmu_master->domain Jason Gunthorpe
2023-11-27 17:14 ` Eric Auger
2023-11-30 12:03 ` Jason Gunthorpe
2023-12-05 13:25 ` Eric Auger
2023-12-05 4:47 ` Nicolin Chen
2023-11-13 17:53 ` [PATCH v2 15/19] iommu/arm-smmu-v3: Add a global static IDENTITY domain Jason Gunthorpe
2023-11-15 15:50 ` Michael Shavit
2023-12-05 4:28 ` Nicolin Chen
2023-12-05 14:37 ` Jason Gunthorpe
2023-12-05 17:25 ` Nicolin Chen
2023-12-05 17:42 ` Jason Gunthorpe
2023-12-05 18:21 ` Nicolin Chen
2023-12-05 19:03 ` Jason Gunthorpe
2023-11-13 17:53 ` [PATCH v2 16/19] iommu/arm-smmu-v3: Add a global static BLOCKED domain Jason Gunthorpe
2023-11-15 15:57 ` Michael Shavit
2023-11-16 15:44 ` Jason Gunthorpe
2023-12-05 4:05 ` Nicolin Chen
2023-11-13 17:53 ` [PATCH v2 17/19] iommu/arm-smmu-v3: Use the identity/blocked domain during release Jason Gunthorpe
2023-12-05 4:07 ` Nicolin Chen
2023-11-13 17:53 ` [PATCH v2 18/19] iommu/arm-smmu-v3: Pass arm_smmu_domain and arm_smmu_device to finalize Jason Gunthorpe
2023-11-15 16:02 ` Michael Shavit
2023-12-05 4:42 ` Nicolin Chen
2023-11-13 17:53 ` [PATCH v2 19/19] iommu/arm-smmu-v3: Convert to domain_alloc_paging() Jason Gunthorpe
2023-12-05 4:40 ` Nicolin Chen
2023-11-27 16:10 ` [PATCH v2 00/19] Update SMMUv3 to the modern iommu API (part 1/3) Shameerali Kolothum Thodi
2023-11-27 17:48 ` Jason Gunthorpe
2023-12-05 3:54 ` Nicolin Chen
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=ZVOPeLOmRO9zd2hv@archbook \
--to=mdf@kernel.org \
--cc=iommu@lists.linux.dev \
--cc=jgg@nvidia.com \
--cc=joro@8bytes.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=mshavit@google.com \
--cc=nicolinc@nvidia.com \
--cc=robin.murphy@arm.com \
--cc=shameerali.kolothum.thodi@huawei.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).