From: Christoph Hellwig <hch@lst.de>
To: Joerg Roedel <joro@8bytes.org>, Will Deacon <will@kernel.org>,
Li Yang <leoyang.li@nxp.com>
Cc: freedreno@lists.freedesktop.org, kvm@vger.kernel.org,
Michael Ellerman <mpe@ellerman.id.au>,
linuxppc-dev@lists.ozlabs.org, dri-devel@lists.freedesktop.org,
virtualization@lists.linux-foundation.org,
iommu@lists.linux-foundation.org, netdev@vger.kernel.org,
linux-arm-msm@vger.kernel.org,
David Woodhouse <dwmw2@infradead.org>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH 11/20] iommu/fsl_pamu: remove the snoop_id field
Date: Thu, 1 Apr 2021 17:52:47 +0200 [thread overview]
Message-ID: <20210401155256.298656-12-hch@lst.de> (raw)
In-Reply-To: <20210401155256.298656-1-hch@lst.de>
The snoop_id is always set to ~(u32)0.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Will Deacon <will@kernel.org>
Acked-by: Li Yang <leoyang.li@nxp.com>
---
drivers/iommu/fsl_pamu_domain.c | 5 ++---
drivers/iommu/fsl_pamu_domain.h | 1 -
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/iommu/fsl_pamu_domain.c b/drivers/iommu/fsl_pamu_domain.c
index c2e7e17570e76d..e9c1e0dd68f084 100644
--- a/drivers/iommu/fsl_pamu_domain.c
+++ b/drivers/iommu/fsl_pamu_domain.c
@@ -97,12 +97,12 @@ static int pamu_set_liodn(struct fsl_dma_domain *dma_domain, struct device *dev,
goto out_unlock;
ret = pamu_config_ppaace(liodn, geom->aperture_start,
geom->aperture_end + 1, omi_index, 0,
- dma_domain->snoop_id, dma_domain->stash_id, 0);
+ ~(u32)0, dma_domain->stash_id, 0);
if (ret)
goto out_unlock;
ret = pamu_config_ppaace(liodn, geom->aperture_start,
geom->aperture_end + 1, ~(u32)0,
- 0, dma_domain->snoop_id, dma_domain->stash_id,
+ 0, ~(u32)0, dma_domain->stash_id,
PAACE_AP_PERMS_QUERY | PAACE_AP_PERMS_UPDATE);
out_unlock:
spin_unlock_irqrestore(&iommu_lock, flags);
@@ -210,7 +210,6 @@ static struct iommu_domain *fsl_pamu_domain_alloc(unsigned type)
return NULL;
dma_domain->stash_id = ~(u32)0;
- dma_domain->snoop_id = ~(u32)0;
INIT_LIST_HEAD(&dma_domain->devices);
spin_lock_init(&dma_domain->domain_lock);
diff --git a/drivers/iommu/fsl_pamu_domain.h b/drivers/iommu/fsl_pamu_domain.h
index 5f4ed253f61b31..95ac1b3cab3b69 100644
--- a/drivers/iommu/fsl_pamu_domain.h
+++ b/drivers/iommu/fsl_pamu_domain.h
@@ -13,7 +13,6 @@ struct fsl_dma_domain {
/* list of devices associated with the domain */
struct list_head devices;
u32 stash_id;
- u32 snoop_id;
struct iommu_domain iommu_domain;
spinlock_t domain_lock;
};
--
2.30.1
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
next prev parent reply other threads:[~2021-04-01 16:59 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-01 15:52 cleanup unused or almost unused IOMMU APIs and the FSL PAMU driver v3 Christoph Hellwig
2021-04-01 15:52 ` [PATCH 01/20] iommu: remove the unused domain_window_disable method Christoph Hellwig
2021-04-01 15:52 ` [PATCH 02/20] iommu/fsl_pamu: remove fsl_pamu_get_domain_attr Christoph Hellwig
2021-04-01 15:52 ` [PATCH 03/20] iommu/fsl_pamu: remove support for setting DOMAIN_ATTR_GEOMETRY Christoph Hellwig
2021-04-01 15:52 ` [PATCH 04/20] iommu/fsl_pamu: merge iommu_alloc_dma_domain into fsl_pamu_domain_alloc Christoph Hellwig
2021-04-01 15:52 ` [PATCH 05/20] iommu/fsl_pamu: remove support for multiple windows Christoph Hellwig
2021-04-01 15:52 ` [PATCH 06/20] iommu/fsl_pamu: remove ->domain_window_enable Christoph Hellwig
2021-04-01 15:52 ` [PATCH 07/20] iommu/fsl_pamu: replace DOMAIN_ATTR_FSL_PAMU_STASH with a direct call Christoph Hellwig
2021-04-01 15:52 ` [PATCH 08/20] iommu/fsl_pamu: merge pamu_set_liodn and map_liodn Christoph Hellwig
2021-04-01 15:52 ` [PATCH 09/20] iommu/fsl_pamu: merge handle_attach_device into fsl_pamu_attach_device Christoph Hellwig
2021-04-01 15:52 ` [PATCH 10/20] iommu/fsl_pamu: enable the liodn when attaching a device Christoph Hellwig
2021-04-01 15:52 ` Christoph Hellwig [this message]
2021-04-01 15:52 ` [PATCH 12/20] iommu/fsl_pamu: remove the rpn and snoop_id arguments to pamu_config_ppaac Christoph Hellwig
2021-04-01 15:52 ` [PATCH 13/20] iommu/fsl_pamu: hardcode the window address and size in pamu_config_ppaace Christoph Hellwig
2021-04-01 15:52 ` [PATCH 14/20] iommu: remove DOMAIN_ATTR_PAGING Christoph Hellwig
2021-04-01 15:52 ` [PATCH 15/20] iommu: remove DOMAIN_ATTR_GEOMETRY Christoph Hellwig
2021-04-01 15:52 ` [PATCH 16/20] iommu: remove DOMAIN_ATTR_NESTING Christoph Hellwig
2021-04-01 15:52 ` [PATCH 17/20] iommu: remove iommu_set_cmd_line_dma_api and iommu_cmd_line_dma_api Christoph Hellwig
2021-04-01 15:52 ` [PATCH 18/20] iommu: remove DOMAIN_ATTR_DMA_USE_FLUSH_QUEUE Christoph Hellwig
2021-04-01 15:52 ` [PATCH 19/20] iommu: remove DOMAIN_ATTR_IO_PGTABLE_CFG Christoph Hellwig
2021-04-01 15:52 ` [PATCH 20/20] iommu: remove iommu_domain_{get,set}_attr Christoph Hellwig
2021-04-07 8:57 ` cleanup unused or almost unused IOMMU APIs and the FSL PAMU driver v3 Joerg Roedel
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=20210401155256.298656-12-hch@lst.de \
--to=hch@lst.de \
--cc=dri-devel@lists.freedesktop.org \
--cc=dwmw2@infradead.org \
--cc=freedreno@lists.freedesktop.org \
--cc=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.org \
--cc=kvm@vger.kernel.org \
--cc=leoyang.li@nxp.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=netdev@vger.kernel.org \
--cc=virtualization@lists.linux-foundation.org \
--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).