Skip to content

Commit

Permalink
iommu: remove iommu_set_cmd_line_dma_api and iommu_cmd_line_dma_api
Browse files Browse the repository at this point in the history
Don't obsfucate the trivial bit flag check.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Will Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/20210401155256.298656-18-hch@lst.de
Signed-off-by: Joerg Roedel <jroedel@suse.de>
  • Loading branch information
Christoph Hellwig authored and Joerg Roedel committed Apr 7, 2021
1 parent 7e14754 commit 3189713
Showing 1 changed file with 5 additions and 18 deletions.
23 changes: 5 additions & 18 deletions drivers/iommu/iommu.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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
Expand All @@ -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;
}
Expand Down Expand Up @@ -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;
}

Expand Down

0 comments on commit 3189713

Please sign in to comment.