can: rcar_canfd: Add sh variable to struct rcar_canfd_hw_info

R-Car Gen3 and Gen4 have some differences in the shift bits. Introduce a
struct rcar_canfd_shift_data to hold these values and add the struct
rcar_canfd_shift_data variable sh to struct rcar_canfd_hw_info to handle
these differences. After this, drop the unused functions reg_gen4() and
is_gen4().

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-17-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 fbfe2d6484f1eb0bbd8830defdb56c39873c2443..67f7b5f6376c4a285a55fa32f7897bcc9ee15ead 100644 (file)
--- a/drivers/net/can/rcar/rcar_canfd.c
+++ b/drivers/net/can/rcar/rcar_canfd.c
@@ -110,13 +110,13 @@
 
 /* RSCFDnCFDCmNCFG - CAN FD only */
 #define RCANFD_NCFG_NTSEG2(gpriv, x) \
-       (((x) & ((gpriv)->info->nom_bittiming->tseg2_max - 1)) << reg_gen4(gpriv, 25, 24))
+       (((x) & ((gpriv)->info->nom_bittiming->tseg2_max - 1)) << (gpriv)->info->sh->ntseg2)
 
 #define RCANFD_NCFG_NTSEG1(gpriv, x) \
-       (((x) & ((gpriv)->info->nom_bittiming->tseg1_max - 1)) << reg_gen4(gpriv, 17, 16))
+       (((x) & ((gpriv)->info->nom_bittiming->tseg1_max - 1)) << (gpriv)->info->sh->ntseg1)
 
 #define RCANFD_NCFG_NSJW(gpriv, x) \
-       (((x) & ((gpriv)->info->nom_bittiming->sjw_max - 1)) << reg_gen4(gpriv, 10, 11))
+       (((x) & ((gpriv)->info->nom_bittiming->sjw_max - 1)) << (gpriv)->info->sh->nsjw)
 
 #define RCANFD_NCFG_NBRP(x)            (((x) & 0x3ff) << 0)
 
@@ -181,10 +181,10 @@
 #define RCANFD_DCFG_DSJW(gpriv, x)     (((x) & ((gpriv)->info->data_bittiming->sjw_max - 1)) << 24)
 
 #define RCANFD_DCFG_DTSEG2(gpriv, x) \
-       (((x) & ((gpriv)->info->data_bittiming->tseg2_max - 1)) << reg_gen4(gpriv, 16, 20))
+       (((x) & ((gpriv)->info->data_bittiming->tseg2_max - 1)) << (gpriv)->info->sh->dtseg2)
 
 #define RCANFD_DCFG_DTSEG1(gpriv, x) \
-       (((x) & ((gpriv)->info->data_bittiming->tseg1_max - 1)) << reg_gen4(gpriv, 8, 16))
+       (((x) & ((gpriv)->info->data_bittiming->tseg1_max - 1)) << (gpriv)->info->sh->dtseg1)
 
 #define RCANFD_DCFG_DBRP(x)            (((x) & 0xff) << 0)
 
@@ -228,11 +228,11 @@
 #define RCANFD_CFCC_CFTML(gpriv, cftml) \
 ({\
        typeof(gpriv) (_gpriv) = (gpriv); \
-       (((cftml) & (_gpriv)->info->max_cftml) << reg_gen4(_gpriv, 16, 20)); \
+       (((cftml) & (_gpriv)->info->max_cftml) << (_gpriv)->info->sh->cftml); \
 })
-#define RCANFD_CFCC_CFM(gpriv, x)      (((x) & 0x3) << reg_gen4(gpriv,  8, 16))
+#define RCANFD_CFCC_CFM(gpriv, x)      (((x) & 0x3) << (gpriv)->info->sh->cfm)
 #define RCANFD_CFCC_CFIM               BIT(12)
-#define RCANFD_CFCC_CFDC(gpriv, x)     (((x) & 0x7) << reg_gen4(gpriv, 21,  8))
+#define RCANFD_CFCC_CFDC(gpriv, x)     (((x) & 0x7) << (gpriv)->info->sh->cfdc)
 #define RCANFD_CFCC_CFPLS(x)           (((x) & 0x7) << 4)
 #define RCANFD_CFCC_CFTXIE             BIT(2)
 #define RCANFD_CFCC_CFE                        BIT(0)
@@ -515,10 +515,22 @@ struct rcar_canfd_regs {
        u16 cfoffset;   /* Transmit/receive FIFO buffer access ID register */
 };
 
+struct rcar_canfd_shift_data {
+       u8 ntseg2;      /* Nominal Bit Rate Time Segment 2 Control */
+       u8 ntseg1;      /* Nominal Bit Rate Time Segment 1 Control */
+       u8 nsjw;        /* Nominal Bit Rate Resynchronization Jump Width Control */
+       u8 dtseg2;      /* Data Bit Rate Time Segment 2 Control */
+       u8 dtseg1;      /* Data Bit Rate Time Segment 1 Control */
+       u8 cftml;       /* Common FIFO TX Message Buffer Link */
+       u8 cfm;         /* Common FIFO Mode */
+       u8 cfdc;        /* Common FIFO Depth Configuration */
+};
+
 struct rcar_canfd_hw_info {
        const struct can_bittiming_const *nom_bittiming;
        const struct can_bittiming_const *data_bittiming;
        const struct rcar_canfd_regs *regs;
+       const struct rcar_canfd_shift_data *sh;
        u8 rnc_field_width;
        u8 max_aflpn;
        u8 max_cftml;
@@ -643,10 +655,33 @@ static const struct rcar_canfd_regs rcar_gen4_regs = {
        .cfoffset = 0x6400,
 };
 
+static const struct rcar_canfd_shift_data rcar_gen3_shift_data = {
+       .ntseg2 = 24,
+       .ntseg1 = 16,
+       .nsjw = 11,
+       .dtseg2 = 20,
+       .dtseg1 = 16,
+       .cftml = 20,
+       .cfm = 16,
+       .cfdc = 8,
+};
+
+static const struct rcar_canfd_shift_data rcar_gen4_shift_data = {
+       .ntseg2 = 25,
+       .ntseg1 = 17,
+       .nsjw = 10,
+       .dtseg2 = 16,
+       .dtseg1 = 8,
+       .cftml = 16,
+       .cfm = 8,
+       .cfdc = 21,
+};
+
 static const struct rcar_canfd_hw_info rcar_gen3_hw_info = {
        .nom_bittiming = &rcar_canfd_gen3_nom_bittiming_const,
        .data_bittiming = &rcar_canfd_gen3_data_bittiming_const,
        .regs = &rcar_gen3_regs,
+       .sh = &rcar_gen3_shift_data,
        .rnc_field_width = 8,
        .max_aflpn = 31,
        .max_cftml = 15,
@@ -661,6 +696,7 @@ static const struct rcar_canfd_hw_info rcar_gen4_hw_info = {
        .nom_bittiming = &rcar_canfd_gen4_nom_bittiming_const,
        .data_bittiming = &rcar_canfd_gen4_data_bittiming_const,
        .regs = &rcar_gen4_regs,
+       .sh = &rcar_gen4_shift_data,
        .rnc_field_width = 16,
        .max_aflpn = 127,
        .max_cftml = 31,
@@ -675,6 +711,7 @@ static const struct rcar_canfd_hw_info rzg2l_hw_info = {
        .nom_bittiming = &rcar_canfd_gen3_nom_bittiming_const,
        .data_bittiming = &rcar_canfd_gen3_data_bittiming_const,
        .regs = &rcar_gen3_regs,
+       .sh = &rcar_gen3_shift_data,
        .rnc_field_width = 8,
        .max_aflpn = 31,
        .max_cftml = 15,
@@ -686,17 +723,6 @@ static const struct rcar_canfd_hw_info rzg2l_hw_info = {
 };
 
 /* Helper functions */
-static inline bool is_gen4(struct rcar_canfd_global *gpriv)
-{
-       return gpriv->info == &rcar_gen4_hw_info;
-}
-
-static inline u32 reg_gen4(struct rcar_canfd_global *gpriv,
-                          u32 gen4, u32 not_gen4)
-{
-       return is_gen4(gpriv) ? gen4 : not_gen4;
-}
-
 static inline void rcar_canfd_update(u32 mask, u32 val, u32 __iomem *reg)
 {
        u32 data = readl(reg);