From nobody Tue Dec 16 07:10:48 2025 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C4D92205AAE for ; Tue, 14 Jan 2025 19:26:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736882810; cv=none; b=rdKl9XV8gdTTyOjWN8CUsP2y0WOSxYin1O0yckzTV65tZplmR0iTnNyCTe9YCzyt/ATCBjA3CLQWNfR9h0y6oU/s8ju+5KID3ba+txOcmF9l0TQZ/8vUggLV/DtzG9teNpdbGJc0I8G1iDRG2+LQabypIIuX/lJIU7IWN85AkHQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736882810; c=relaxed/simple; bh=RtnslbLXAI6fWAT6u5Jma/xqdzvggE3RkXqnsCbB4vk=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=iQr3H7qYO5yTSXsn8sE1M+EXtnnoKrUvKjMlOqO2yuFIDHWIWr3qVIS5ACtfZFDG8YM615p9OVbFEtJuAutfFB+lWBM4Aj/cp9EQnM9lTFs0TqT37ofv87q3t0oBG+YEm0hkF28+dmWmtTVbR60tv+QnsrbxYR7UKnj+ARsIZ0k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=PPSJbZZG; arc=none smtp.client-ip=209.85.128.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="PPSJbZZG" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-43620a5f81bso6371125e9.0 for ; Tue, 14 Jan 2025 11:26:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1736882807; x=1737487607; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=R8zbHHjDHwUKprLOJl/lBp+WlB/iIXKfc0w2QQvt1CM=; b=PPSJbZZGANQizEzFGbsA6DFUuo85eekyhwSjgWr9y93WySsmjrkYYjFKHIm6Gb3BKc SKbNZqi8K2W2g5dZ1kSpWmr89Q1cqiRpbrpxVNTIlTKspdeOOAHShxFNIIg1aG+DSJJK QB9pQR0uM7YtxZEZkQZG09kVpydfi/nPRARBEqBT71VKRXe459XhGF2s47Ove5NzxkzU mCXXRQN4pLRkAC/9ml/4clqKzAZje6XVjtzOosGA9aSY4DGDVOKULyig0oJNThKFfEZb K+l4iXhsQR5iX7dmIJNrOQzvkWKtwtIjYj2EcL+VyCSv50+zEWyUqRxV9n2G0sT1KTUE T4dQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736882807; x=1737487607; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=R8zbHHjDHwUKprLOJl/lBp+WlB/iIXKfc0w2QQvt1CM=; b=FMD8DyMA6HPELiamzvBtnfMXHuIAf1T4pLLy9fSqyIg6yu24TAGNF5AwLak+9iZ7n8 xRp+6vCBb7K7chj1vBteSb3EkVisW+gN4q10BV7j99cCSZA61btoBRkVzvR7xFFsGfSm 1kzywYaZvGmASVxLvR+EX5WBdS1uZd3fHp599C4IHyMTrCp0prvVpR4ZXY8EmP21iUm3 /yjnawfFQ3S2h/G2Li97Bd6H+BIWTm+2Jk5FKU6b94F/yIa4BTg+mT9g/fvCgjPTXbaN n0dSou17wFRCJeZs45Rr9o8bi3B16ZCqFSnXw83PssCWh0cAiv/HPqFDN9ECDYYyC4zq xOMQ== X-Forwarded-Encrypted: i=1; AJvYcCVbVEZd4EXQONbi8/mLnpqxnw734WZK+J+iSazPTipeqOCW72H0kC0KsAyeZgFzbRuL6w58iJdYZH4+T2Q=@vger.kernel.org X-Gm-Message-State: AOJu0YwGxnsGv9GOb+zxfY1TxqQzgxNlJCDI/WZDJbEyZDRwQyYnUC9Q kVZYiBXATYEfv1PDZ9IYzAyU/GMdsLt0jYE1KAfvzFI+1b6jcJ8aXOQI87GAujs= X-Gm-Gg: ASbGncuC7yhsuIxI8sjBA+elC4zedhE85Dvpo+C36dYKsPLS5TMh8yFrf6q9hdb/XpJ RQ2Ii1pMAONNUGdO/edGaj5HY6vtdmPK21MXSlVNQjsiMI64vbXGiPqTsgemVi+Jz+mJxDxx9P+ bRXeRI4ERVkTP7zntPHSTtnxTAfGDTnwNyTxrnhpMS7n5o5sGldGOjeEFcw+WvvAi7wiJr1MffN qNeMh044svKS2q6tTysSo1X0xEjyI593cf+zv2B1vvSHjakd2Q6qpx9NAtjnrGNGGuRoyk= X-Google-Smtp-Source: AGHT+IEnD9Q/PlL16atUZuQr3zo7osv/8GJqa0PNvMI0cYgqaJuTOZ+Meucj00enp/jZftDOrIqvJQ== X-Received: by 2002:a05:600c:3c8f:b0:434:f7f0:189c with SMTP id 5b1f17b1804b1-436e27007e9mr105673595e9.7.1736882807013; Tue, 14 Jan 2025 11:26:47 -0800 (PST) Received: from krzk-bin.. ([178.197.223.165]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38a8e4b8116sm15552826f8f.79.2025.01.14.11.26.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Jan 2025 11:26:45 -0800 (PST) From: Krzysztof Kozlowski To: Will Deacon , Robin Murphy , Joerg Roedel , Yong Wu , Matthias Brugger , AngeloGioacchino Del Regno , Heiko Stuebner , linux-arm-kernel@lists.infradead.org, iommu@lists.linux.dev, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-rockchip@lists.infradead.org Cc: Krzysztof Kozlowski Subject: [PATCH] iommu: Use str_enable_disable-like helpers Date: Tue, 14 Jan 2025 20:26:42 +0100 Message-ID: <20250114192642.912331-1-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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: Krzysztof Kozlowski Acked-by: Heiko Stuebner Acked-by: Pranjal Shrivastava Reviewed-by: AngeloGioacchino Del Regno Reviewed-by: Jason Gunthorpe --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 3 ++- drivers/iommu/arm/arm-smmu/arm-smmu.c | 3 ++- drivers/iommu/mtk_iommu.c | 9 +++++---- drivers/iommu/mtk_iommu_v1.c | 3 ++- drivers/iommu/rockchip-iommu.c | 3 ++- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/ar= m/arm-smmu-v3/arm-smmu-v3.c index 0e4cbb2c64d7..358072b4e293 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include =20 @@ -4321,7 +4322,7 @@ static int arm_smmu_device_hw_probe(struct arm_smmu_d= evice *smmu) */ if (!!(reg & IDR0_COHACC) !=3D coherent) dev_warn(smmu->dev, "IDR0.COHACC overridden by FW configuration (%s)\n", - coherent ? "true" : "false"); + str_true_false(coherent)); =20 switch (FIELD_GET(IDR0_STALL_MODEL, reg)) { case IDR0_STALL_MODEL_FORCE: diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu.c b/drivers/iommu/arm/arm-= smmu/arm-smmu.c index 79afc92e1d8b..de205a34ffc6 100644 --- a/drivers/iommu/arm/arm-smmu/arm-smmu.c +++ b/drivers/iommu/arm/arm-smmu/arm-smmu.c @@ -34,6 +34,7 @@ #include #include #include +#include =20 #include =20 @@ -2106,7 +2107,7 @@ static void arm_smmu_rmr_install_bypass_smr(struct ar= m_smmu_device *smmu) } =20 dev_notice(smmu->dev, "\tpreserved %d boot mapping%s\n", cnt, - cnt =3D=3D 1 ? "" : "s"); + str_plural(cnt)); iort_put_rmr_sids(dev_fwnode(smmu->dev), &rmr_list); } =20 diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c index ab60901f8f92..034b0e670384 100644 --- a/drivers/iommu/mtk_iommu.c +++ b/drivers/iommu/mtk_iommu.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include =20 @@ -510,7 +511,7 @@ static irqreturn_t mtk_iommu_isr(int irq, void *dev_id) bank->parent_dev, "fault type=3D0x%x iova=3D0x%llx pa=3D0x%llx master=3D0x%x(larb=3D%d po= rt=3D%d) layer=3D%d %s\n", int_state, fault_iova, fault_pa, regval, fault_larb, fault_port, - layer, write ? "write" : "read"); + layer, str_write_read(write)); } =20 /* Interrupt clear */ @@ -602,7 +603,7 @@ static int mtk_iommu_config(struct mtk_iommu_data *data= , struct device *dev, larb_mmu->bank[portid] =3D upper_32_bits(region->iova_base); =20 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)); =20 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; } diff --git a/drivers/iommu/mtk_iommu_v1.c b/drivers/iommu/mtk_iommu_v1.c index b6de1ca00cef..a565b9e40f4a 100644 --- a/drivers/iommu/mtk_iommu_v1.c +++ b/drivers/iommu/mtk_iommu_v1.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -243,7 +244,7 @@ static void mtk_iommu_v1_config(struct mtk_iommu_v1_dat= a *data, larb_mmu =3D &data->larb_imu[larbid]; =20 dev_dbg(dev, "%s iommu port: %d\n", - enable ? "enable" : "disable", portid); + str_enable_disable(enable), portid); =20 if (enable) larb_mmu->mmu |=3D MTK_SMI_MMU_EN(portid); diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c index 4b369419b32c..323cc665c357 100644 --- a/drivers/iommu/rockchip-iommu.c +++ b/drivers/iommu/rockchip-iommu.c @@ -25,6 +25,7 @@ #include #include #include +#include =20 #include "iommu-pages.h" =20 @@ -611,7 +612,7 @@ static irqreturn_t rk_iommu_irq(int irq, void *dev_id) =20 dev_err(iommu->dev, "Page fault at %pad of type %s\n", &iova, - (flags =3D=3D IOMMU_FAULT_WRITE) ? "write" : "read"); + str_write_read(flags =3D=3D IOMMU_FAULT_WRITE)); =20 log_iova(iommu, i, iova); =20 --=20 2.43.0