* [PATCH] iommu/riscv: Simplify maximum determination in riscv_iommu_init_check()
@ 2025-02-28 18:02 Markus Elfring
2026-01-16 2:22 ` Paul Walmsley
0 siblings, 1 reply; 2+ messages in thread
From: Markus Elfring @ 2025-02-28 18:02 UTC (permalink / raw)
To: linux-riscv, iommu, Albert Ou, Alexandre Ghiti,
Jörg Rödel, Palmer Dabbelt, Paul Walmsley, Robin Murphy,
Tomasz Jeznach, Will Deacon
Cc: LKML, kernel-janitors, Qasim Ijaz
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Fri, 28 Feb 2025 18:56:00 +0100
Reduce nested max() calls by a single max3() call in this
function implementation.
This issue was detected by using the Coccinelle software.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/iommu/riscv/iommu.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/iommu/riscv/iommu.c b/drivers/iommu/riscv/iommu.c
index 8f049d4a0e2c..31d20016a0df 100644
--- a/drivers/iommu/riscv/iommu.c
+++ b/drivers/iommu/riscv/iommu.c
@@ -1588,10 +1588,10 @@ static int riscv_iommu_init_check(struct riscv_iommu_device *iommu)
FIELD_PREP(RISCV_IOMMU_ICVEC_PMIV, 3 % iommu->irqs_count);
riscv_iommu_writeq(iommu, RISCV_IOMMU_REG_ICVEC, iommu->icvec);
iommu->icvec = riscv_iommu_readq(iommu, RISCV_IOMMU_REG_ICVEC);
- if (max(max(FIELD_GET(RISCV_IOMMU_ICVEC_CIV, iommu->icvec),
- FIELD_GET(RISCV_IOMMU_ICVEC_FIV, iommu->icvec)),
- max(FIELD_GET(RISCV_IOMMU_ICVEC_PIV, iommu->icvec),
- FIELD_GET(RISCV_IOMMU_ICVEC_PMIV, iommu->icvec))) >= iommu->irqs_count)
+ if (max3(FIELD_GET(RISCV_IOMMU_ICVEC_CIV, iommu->icvec),
+ FIELD_GET(RISCV_IOMMU_ICVEC_FIV, iommu->icvec),
+ max(FIELD_GET(RISCV_IOMMU_ICVEC_PIV, iommu->icvec),
+ FIELD_GET(RISCV_IOMMU_ICVEC_PMIV, iommu->icvec))) >= iommu->irqs_count)
return -EINVAL;
return 0;
--
2.48.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] iommu/riscv: Simplify maximum determination in riscv_iommu_init_check()
2025-02-28 18:02 [PATCH] iommu/riscv: Simplify maximum determination in riscv_iommu_init_check() Markus Elfring
@ 2026-01-16 2:22 ` Paul Walmsley
0 siblings, 0 replies; 2+ messages in thread
From: Paul Walmsley @ 2026-01-16 2:22 UTC (permalink / raw)
To: Markus Elfring
Cc: linux-riscv, iommu, Albert Ou, Alexandre Ghiti,
Jörg Rödel, Palmer Dabbelt, Paul Walmsley, Robin Murphy,
Tomasz Jeznach, Will Deacon, LKML, kernel-janitors, Qasim Ijaz,
Markus Elfring
On Fri, 28 Feb 2025, Markus Elfring wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Fri, 28 Feb 2025 18:56:00 +0100
>
> Reduce nested max() calls by a single max3() call in this
> function implementation.
>
> This issue was detected by using the Coccinelle software.
>
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Thanks, queued for v6.20.
- Paul
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-01-16 2:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-02-28 18:02 [PATCH] iommu/riscv: Simplify maximum determination in riscv_iommu_init_check() Markus Elfring
2026-01-16 2:22 ` Paul Walmsley
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox