can: rcar_canfd: Add rcar_canfd_setrnc()

Add rcar_canfd_setrnc() to replace the macro RCANFD_GAFLCFG_SETRNC.
While at it, replace int->unsigned int for local variables offset, page
and num_rules in rcar_canfd_configure_afl_rules().

Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Link: https://patch.msgid.link/20250417054320.14100-8-biju.das.jz@bp.renesas.com
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

diff --git a/drivers/net/can/rcar/rcar_canfd.c b/drivers/net/can/rcar/rcar_canfd.c
index 45d0c34f64f69b296824384d1e9f576855ebbdca..6b87c1548f6843d782b08473931320bd0bb9caa2 100644 (file)
--- a/drivers/net/can/rcar/rcar_canfd.c
+++ b/drivers/net/can/rcar/rcar_canfd.c
@@ -90,10 +90,6 @@
 
 /* AFL Rx rules registers */
 
-/* RSCFDnCFDGAFLCFG0 / RSCFDnGAFLCFG0 */
-#define RCANFD_GAFLCFG_SETRNC(gpriv, n, x) \
-       ((x) << (reg_gen4(gpriv, 16, 24) - ((n) & 1) * reg_gen4(gpriv, 16, 8)))
-
 /* RSCFDnCFDGAFLECTR / RSCFDnGAFLECTR */
 #define RCANFD_GAFLECTR_AFLDAE         BIT(8)
 #define RCANFD_GAFLECTR_AFLPN(gpriv, x)        ((x) & reg_gen4(gpriv, 0x7f, 0x1f))
@@ -677,6 +673,15 @@ static void rcar_canfd_tx_failure_cleanup(struct net_device *ndev)
                can_free_echo_skb(ndev, i, NULL);
 }
 
+static void rcar_canfd_setrnc(struct rcar_canfd_global *gpriv, unsigned int ch,
+                             unsigned int num_rules)
+{
+       unsigned int shift = reg_gen4(gpriv, 16, 24) - (ch & 1) * reg_gen4(gpriv, 16, 8);
+       u32 rnc = num_rules << shift;
+
+       rcar_canfd_set_bit(gpriv->base, RCANFD_GAFLCFG(ch), rnc);
+}
+
 static void rcar_canfd_set_mode(struct rcar_canfd_global *gpriv)
 {
        if (is_gen4(gpriv)) {
@@ -785,7 +790,7 @@ static void rcar_canfd_configure_controller(struct rcar_canfd_global *gpriv)
 static void rcar_canfd_configure_afl_rules(struct rcar_canfd_global *gpriv,
                                           u32 ch, u32 rule_entry)
 {
-       int offset, page, num_rules = RCANFD_CHANNEL_NUMRULES;
+       unsigned int offset, page, num_rules = RCANFD_CHANNEL_NUMRULES;
        u32 rule_entry_index = rule_entry % 16;
        u32 ridx = ch + RCANFD_RFFIFO_IDX;
 
@@ -796,8 +801,7 @@ static void rcar_canfd_configure_afl_rules(struct rcar_canfd_global *gpriv,
                            RCANFD_GAFLECTR_AFLDAE));
 
        /* Write number of rules for channel */
-       rcar_canfd_set_bit(gpriv->base, RCANFD_GAFLCFG(ch),
-                          RCANFD_GAFLCFG_SETRNC(gpriv, ch, num_rules));
+       rcar_canfd_setrnc(gpriv, ch, num_rules);
        if (is_gen4(gpriv))
                offset = RCANFD_GEN4_GAFL_OFFSET;
        else if (gpriv->fdmode)