From: Xenia Ragiadakou <burzalodowa@gmail.com>
Date: Thu, 11 Aug 2022 09:47:34 +0000 (+0200)
Subject: arm/vgic: fix coding style in macro REG_RANK_INDEX()
X-Git-Tag: archive/raspbian/4.17.0-1+rpi1^2~33^2~325
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=fc9e089ad2d4739336c7b2553a325c9b6c02c40d;p=xen.git

arm/vgic: fix coding style in macro REG_RANK_INDEX()

Add parentheses around the macro parameter 's' to prevent against unintended
expansions. This, also, resolves a MISRA C 2012 Rule 20.7 violation warning.

Add white spaces around the subtraction operator.

Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com>
Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>
---

diff --git a/xen/arch/arm/include/asm/vgic.h b/xen/arch/arm/include/asm/vgic.h
index d2a9fc7d83..3d44868039 100644
--- a/xen/arch/arm/include/asm/vgic.h
+++ b/xen/arch/arm/include/asm/vgic.h
@@ -286,7 +286,7 @@ static inline paddr_t vgic_dist_base(const struct vgic_dist *vgic)
  * Offset of GICD_<FOO><n> with its rank, for GICD_<FOO> size <s> with
  * <b>-bits-per-interrupt.
  */
-#define REG_RANK_INDEX(b, n, s) ((((n) >> s) & ((b)-1)) % 32)
+#define REG_RANK_INDEX(b, n, s) ((((n) >> (s)) & ((b) - 1)) % 32)
 
 
 extern struct vcpu *vgic_get_target_vcpu(struct vcpu *v, unsigned int virq);