Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

irqchip/renesas-rzv2h: Update macros ICU_TSSR_TSSEL_{MASK,PREP}

On RZ/G3E, TSSEL register field is 8 bits wide compared to 7 on RZ/V2H.
Also bits 8..14 is reserved on RZ/G3E and any writes on these reserved
bits is ignored.

Use bitmask GENMASK(field_width - 2, 0) on both SoCs for extracting TSSEL
and then update the macros ICU_TSSR_TSSEL_PREP and ICU_TSSR_TSSEL_MASK for
supporting both SoCs.

Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/all/20250224131253.134199-12-biju.das.jz@bp.renesas.com

authored by

Biju Das and committed by
Thomas Gleixner
e3a16c33 76c3b774

+9 -4
+9 -4
drivers/irqchip/irq-renesas-rzv2h.c
··· 64 64 #define ICU_TINT_LEVEL_HIGH 2 65 65 #define ICU_TINT_LEVEL_LOW 3 66 66 67 - #define ICU_TSSR_TSSEL_PREP(tssel, n) ((tssel) << ((n) * 8)) 68 - #define ICU_TSSR_TSSEL_MASK(n) ICU_TSSR_TSSEL_PREP(0x7F, n) 67 + #define ICU_TSSR_TSSEL_PREP(tssel, n, field_width) ((tssel) << ((n) * (field_width))) 68 + #define ICU_TSSR_TSSEL_MASK(n, field_width) \ 69 + ({\ 70 + typeof(field_width) (_field_width) = (field_width); \ 71 + ICU_TSSR_TSSEL_PREP((GENMASK(((_field_width) - 2), 0)), (n), _field_width); \ 72 + }) 73 + 69 74 #define ICU_TSSR_TIEN(n, field_width) \ 70 75 ({\ 71 76 typeof(field_width) (_field_width) = (field_width); \ ··· 331 326 guard(raw_spinlock)(&priv->lock); 332 327 333 328 tssr = readl_relaxed(priv->base + priv->info->t_offs + ICU_TSSR(tssr_k)); 334 - tssr &= ~(ICU_TSSR_TSSEL_MASK(tssel_n) | tien); 335 - tssr |= ICU_TSSR_TSSEL_PREP(tint, tssel_n); 329 + tssr &= ~(ICU_TSSR_TSSEL_MASK(tssel_n, priv->info->field_width) | tien); 330 + tssr |= ICU_TSSR_TSSEL_PREP(tint, tssel_n, priv->info->field_width); 336 331 337 332 writel_relaxed(tssr, priv->base + priv->info->t_offs + ICU_TSSR(tssr_k)); 338 333