Commit 54e7d900 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Joerg Roedel
Browse files

iommu: Use str_enable_disable-like helpers 



Replace ternary (condition ? "enable" : "disable") syntax with helpers
from string_choices.h because:
1. Simple function call with one argument is easier to read.  Ternary
   operator has three arguments and with wrapping might lead to quite
   long code.
2. Is slightly shorter thus also easier to read.
3. It brings uniformity in the text - same string.
4. Allows deduping by the linker, which results in a smaller binary
   file.

Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Acked-by: default avatarHeiko Stuebner <heiko@sntech.de>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Acked-by: default avatarPranjal Shrivastava <praan@google.com>
Link: https://lore.kernel.org/r/20250114192642.912331-1-krzysztof.kozlowski@linaro.org


Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 647b7aad

drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c

+2 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/pci.h>

#include <linux/pci-ats.h>

#include <linux/platform_device.h>

#include <linux/string_choices.h>

#include <kunit/visibility.h>

#include <uapi/linux/iommufd.h>
@@ -4239,7 +4240,7 @@ static int arm_smmu_device_hw_probe(struct arm_smmu_device *smmu) 
	 */

	if (!!(reg & IDR0_COHACC) != coherent)

		dev_warn(smmu->dev, "IDR0.COHACC overridden by FW configuration (%s)\n",

			 coherent ? "true" : "false");

			 str_true_false(coherent));



	switch (FIELD_GET(IDR0_STALL_MODEL, reg)) {

	case IDR0_STALL_MODEL_FORCE:

drivers/iommu/arm/arm-smmu/arm-smmu.c

+2 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <linux/pm_runtime.h>

#include <linux/ratelimit.h>

#include <linux/slab.h>

#include <linux/string_choices.h>



#include <linux/fsl/mc.h>
@@ -2117,7 +2118,7 @@ static void arm_smmu_rmr_install_bypass_smr(struct arm_smmu_device *smmu) 
	}



	dev_notice(smmu->dev, "\tpreserved %d boot mapping%s\n", cnt,

		   cnt == 1 ? "" : "s");

		   str_plural(cnt));

	iort_put_rmr_sids(dev_fwnode(smmu->dev), &rmr_list);

}

drivers/iommu/mtk_iommu.c

+5 −4
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <linux/spinlock.h>

#include <linux/soc/mediatek/infracfg.h>

#include <linux/soc/mediatek/mtk_sip_svc.h>

#include <linux/string_choices.h>

#include <asm/barrier.h>

#include <soc/mediatek/smi.h>
@@ -510,7 +511,7 @@ static irqreturn_t mtk_iommu_isr(int irq, void *dev_id) 
			bank->parent_dev,

			"fault type=0x%x iova=0x%llx pa=0x%llx master=0x%x(larb=%d port=%d) layer=%d %s\n",

			int_state, fault_iova, fault_pa, regval, fault_larb, fault_port,

			layer, write ? "write" : "read");

			layer, str_write_read(write));

	}



	/* Interrupt clear */
@@ -602,7 +603,7 @@ static int mtk_iommu_config(struct mtk_iommu_data *data, struct device *dev, 
			larb_mmu->bank[portid] = upper_32_bits(region->iova_base);



		dev_dbg(dev, "%s iommu for larb(%s) port 0x%lx region %d rgn-bank %d.\n",

			enable ? "enable" : "disable", dev_name(larb_mmu->dev),

			str_enable_disable(enable), dev_name(larb_mmu->dev),

			portid_msk, regionid, upper_32_bits(region->iova_base));



		if (enable)
@@ -630,8 +631,8 @@ static int mtk_iommu_config(struct mtk_iommu_data *data, struct device *dev, 
		}

		if (ret)

			dev_err(dev, "%s iommu(%s) inframaster 0x%lx fail(%d).\n",

				enable ? "enable" : "disable",

				dev_name(data->dev), portid_msk, ret);

				str_enable_disable(enable), dev_name(data->dev),

				portid_msk, ret);

	}

	return ret;

}

drivers/iommu/mtk_iommu_v1.c

+2 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/platform_device.h>

#include <linux/slab.h>

#include <linux/spinlock.h>

#include <linux/string_choices.h>

#include <asm/barrier.h>

#include <asm/dma-iommu.h>

#include <dt-bindings/memory/mtk-memory-port.h>
@@ -243,7 +244,7 @@ static void mtk_iommu_v1_config(struct mtk_iommu_v1_data *data, 
		larb_mmu = &data->larb_imu[larbid];



		dev_dbg(dev, "%s iommu port: %d\n",

			enable ? "enable" : "disable", portid);

			str_enable_disable(enable), portid);



		if (enable)

			larb_mmu->mmu |= MTK_SMI_MMU_EN(portid);

drivers/iommu/rockchip-iommu.c

+2 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/pm_runtime.h>

#include <linux/slab.h>

#include <linux/spinlock.h>

#include <linux/string_choices.h>



#include "iommu-pages.h"
@@ -611,7 +612,7 @@ static irqreturn_t rk_iommu_irq(int irq, void *dev_id) 


			dev_err(iommu->dev, "Page fault at %pad of type %s\n",

				&iova,

				(flags == IOMMU_FAULT_WRITE) ? "write" : "read");

				str_write_read(flags == IOMMU_FAULT_WRITE));



			log_iova(iommu, i, iova);