From: Christoph Hellwig <hch@lst.de>
To: Joerg Roedel <joro@8bytes.org>, Will Deacon <will@kernel.org>,
Li Yang <leoyang.li@nxp.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>,
David Woodhouse <dwmw2@infradead.org>,
Lu Baolu <baolu.lu@linux.intel.com>,
linuxppc-dev@lists.ozlabs.org, linux-arm-msm@vger.kernel.org,
dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org,
iommu@lists.linux-foundation.org,
linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org,
virtualization@lists.linux-foundation.org,
netdev@vger.kernel.org
Subject: [PATCH 17/20] iommu: remove iommu_set_cmd_line_dma_api and iommu_cmd_line_dma_api
Date: Thu, 1 Apr 2021 17:52:53 +0200 [thread overview]
Message-ID: <20210401155256.298656-18-hch@lst.de> (raw)
In-Reply-To: <20210401155256.298656-1-hch@lst.de>
Don't obsfucate the trivial bit flag check.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Will Deacon <will@kernel.org>
---
drivers/iommu/iommu.c | 23 +++++------------------
1 file changed, 5 insertions(+), 18 deletions(-)
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 58d1d11a8d5c10..052cef11ae30df 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -70,16 +70,6 @@ static const char * const iommu_group_resv_type_string[] = {
#define IOMMU_CMD_LINE_DMA_API BIT(0)
-static void iommu_set_cmd_line_dma_api(void)
-{
- iommu_cmd_line |= IOMMU_CMD_LINE_DMA_API;
-}
-
-static bool iommu_cmd_line_dma_api(void)
-{
- return !!(iommu_cmd_line & IOMMU_CMD_LINE_DMA_API);
-}
-
static int iommu_alloc_default_domain(struct iommu_group *group,
struct device *dev);
static struct iommu_domain *__iommu_domain_alloc(struct bus_type *bus,
@@ -130,9 +120,7 @@ static const char *iommu_domain_type_str(unsigned int t)
static int __init iommu_subsys_init(void)
{
- bool cmd_line = iommu_cmd_line_dma_api();
-
- if (!cmd_line) {
+ if (!(iommu_cmd_line & IOMMU_CMD_LINE_DMA_API)) {
if (IS_ENABLED(CONFIG_IOMMU_DEFAULT_PASSTHROUGH))
iommu_set_default_passthrough(false);
else
@@ -146,7 +134,8 @@ static int __init iommu_subsys_init(void)
pr_info("Default domain type: %s %s\n",
iommu_domain_type_str(iommu_def_domain_type),
- cmd_line ? "(set via kernel command line)" : "");
+ (iommu_cmd_line & IOMMU_CMD_LINE_DMA_API) ?
+ "(set via kernel command line)" : "");
return 0;
}
@@ -2757,16 +2746,14 @@ EXPORT_SYMBOL_GPL(iommu_alloc_resv_region);
void iommu_set_default_passthrough(bool cmd_line)
{
if (cmd_line)
- iommu_set_cmd_line_dma_api();
-
+ iommu_cmd_line |= IOMMU_CMD_LINE_DMA_API;
iommu_def_domain_type = IOMMU_DOMAIN_IDENTITY;
}
void iommu_set_default_translated(bool cmd_line)
{
if (cmd_line)
- iommu_set_cmd_line_dma_api();
-
+ iommu_cmd_line |= IOMMU_CMD_LINE_DMA_API;
iommu_def_domain_type = IOMMU_DOMAIN_DMA;
}
--
2.30.1
next prev parent reply other threads:[~2021-04-01 17:43 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 ` [PATCH 11/20] iommu/fsl_pamu: remove the snoop_id field Christoph Hellwig
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 ` Christoph Hellwig [this message]
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-18-hch@lst.de \
--to=hch@lst.de \
--cc=baolu.lu@linux.intel.com \
--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).