From: Biju Das <biju.das.jz@bp.renesas.com>
To: Marc Kleine-Budde <mkl@pengutronix.de>,
Vincent Mailhol <mailhol.vincent@wanadoo.fr>
Cc: "Biju Das" <biju.das.jz@bp.renesas.com>,
"Wolfram Sang" <wsa+renesas@sang-engineering.com>,
"Geert Uytterhoeven" <geert+renesas@glider.be>,
"Uwe Kleine-König" <u.kleine-koenig@baylibre.com>,
linux-can@vger.kernel.org,
"Prabhakar Mahadev Lad" <prabhakar.mahadev-lad.rj@bp.renesas.com>,
"Biju Das" <biju.das.au@gmail.com>,
linux-renesas-soc@vger.kernel.org
Subject: [PATCH v4 08/11] can: rcar_canfd: Add shift table to struct rcar_canfd_hw_info
Date: Thu, 6 Mar 2025 12:42:47 +0000 [thread overview]
Message-ID: <20250306124256.93033-9-biju.das.jz@bp.renesas.com> (raw)
In-Reply-To: <20250306124256.93033-1-biju.das.jz@bp.renesas.com>
R-Car Gen3 and Gen4 has some differences in the shift bits. Add a
shift table to handle these differences. After this drop the unused
functions reg_gen4() and is_gen4().
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
---
v3->v4:
* Added prefix RCANFD_* to enum rcar_canfd_shift_id.
v3:
* New patch.
---
drivers/net/can/rcar/rcar_canfd.c | 84 +++++++++++++++++++++++--------
1 file changed, 62 insertions(+), 22 deletions(-)
diff --git a/drivers/net/can/rcar/rcar_canfd.c b/drivers/net/can/rcar/rcar_canfd.c
index dd9d73b37d02..f84b88ccb1de 100644
--- a/drivers/net/can/rcar/rcar_canfd.c
+++ b/drivers/net/can/rcar/rcar_canfd.c
@@ -90,11 +90,13 @@
/* RSCFDnCFDGAFLCFG0 / RSCFDnGAFLCFG0 */
#define RCANFD_GAFLCFG_SETRNC(gpriv, n, x) \
(((x) & (gpriv)->info->mask_table[RCANFD_RNC_MASK]) << \
- (reg_gen4(gpriv, 16, 24) - ((n) & 1) * reg_gen4(gpriv, 16, 8)))
+ ((gpriv)->info->shift_table[RCANFD_FIRST_RNC_SH] - ((n) & 1) * \
+ (gpriv)->info->shift_table[RCANFD_SECOND_RNC_SH]))
#define RCANFD_GAFLCFG_GETRNC(gpriv, n, x) \
- (((x) >> (reg_gen4(gpriv, 16, 24) - ((n) & 1) * reg_gen4(gpriv, 16, 8))) & \
- (gpriv)->info->mask_table[RCANFD_RNC_MASK])
+ (((x) >> ((gpriv)->info->shift_table[RCANFD_FIRST_RNC_SH] - ((n) & 1) * \
+ (gpriv)->info->shift_table[RCANFD_SECOND_RNC_SH])) & \
+ (gpriv)->info->mask_table[RCANFD_RNC_MASK])
/* RSCFDnCFDGAFLECTR / RSCFDnGAFLECTR */
#define RCANFD_GAFLECTR_AFLDAE BIT(8)
@@ -117,13 +119,16 @@
/* RSCFDnCFDCmNCFG - CAN FD only */
#define RCANFD_NCFG_NTSEG2(gpriv, x) \
- (((x) & (gpriv)->info->mask_table[RCANFD_NTSEG2_MASK]) << reg_gen4(gpriv, 25, 24))
+ (((x) & (gpriv)->info->mask_table[RCANFD_NTSEG2_MASK]) << \
+ (gpriv)->info->shift_table[RCANFD_NTSEG2_SH])
#define RCANFD_NCFG_NTSEG1(gpriv, x) \
- (((x) & (gpriv)->info->mask_table[RCANFD_NTSEG1_MASK]) << reg_gen4(gpriv, 17, 16))
+ (((x) & (gpriv)->info->mask_table[RCANFD_NTSEG1_MASK]) << \
+ (gpriv)->info->shift_table[RCANFD_NTSEG1_SH])
#define RCANFD_NCFG_NSJW(gpriv, x) \
- (((x) & (gpriv)->info->mask_table[RCANFD_NSJW_MASK]) << reg_gen4(gpriv, 10, 11))
+ (((x) & (gpriv)->info->mask_table[RCANFD_NSJW_MASK]) << \
+ (gpriv)->info->shift_table[RCANFD_NSJW_SH])
#define RCANFD_NCFG_NBRP(x) (((x) & 0x3ff) << 0)
@@ -188,10 +193,12 @@
#define RCANFD_DCFG_DSJW(gpriv, x) (((x) & (gpriv)->info->mask_table[RCANFD_DSJW_MASK]) << 24)
#define RCANFD_DCFG_DTSEG2(gpriv, x) \
- (((x) & (gpriv)->info->mask_table[RCANFD_DTSEG2_MASK]) << reg_gen4(gpriv, 16, 20))
+ (((x) & (gpriv)->info->mask_table[RCANFD_DTSEG2_MASK]) << \
+ (gpriv)->info->shift_table[RCANFD_DTSEG2_SH])
#define RCANFD_DCFG_DTSEG1(gpriv, x) \
- (((x) & (gpriv)->info->mask_table[RCANFD_DTSEG1_MASK]) << reg_gen4(gpriv, 8, 16))
+ (((x) & (gpriv)->info->mask_table[RCANFD_DTSEG1_MASK]) << \
+ (gpriv)->info->shift_table[RCANFD_DTSEG1_SH])
#define RCANFD_DCFG_DBRP(x) (((x) & 0xff) << 0)
@@ -233,10 +240,11 @@
/* RSCFDnCFDCFCCk */
#define RCANFD_CFCC_CFTML(gpriv, x) \
- (((x) & (gpriv)->info->mask_table[RCANFD_CFTML_MASK]) << reg_gen4(gpriv, 16, 20))
-#define RCANFD_CFCC_CFM(gpriv, x) (((x) & 0x3) << reg_gen4(gpriv, 8, 16))
+ (((x) & (gpriv)->info->mask_table[RCANFD_CFTML_MASK]) << \
+ (gpriv)->info->shift_table[RCANFD_CFTML_SH])
+#define RCANFD_CFCC_CFM(gpriv, x) (((x) & 0x3) << (gpriv)->info->shift_table[RCANFD_CFM_SH])
#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->shift_table[RCANFD_CFDC_SH])
#define RCANFD_CFCC_CFPLS(x) (((x) & 0x7) << 4)
#define RCANFD_CFCC_CFTXIE BIT(2)
#define RCANFD_CFCC_CFE BIT(0)
@@ -530,11 +538,25 @@ enum rcar_canfd_mask_id {
RCANFD_CFTML_MASK, /* Common FIFO TX Message Buffer Link */
};
+enum rcar_canfd_shift_id {
+ RCANFD_FIRST_RNC_SH, /* Rule Number for Channel x */
+ RCANFD_SECOND_RNC_SH, /* Rule Number for Channel x + 1 */
+ RCANFD_NTSEG2_SH, /* Nominal Bit Rate Time Segment 2 Control */
+ RCANFD_NTSEG1_SH, /* Nominal Bit Rate Time Segment 1 Control */
+ RCANFD_NSJW_SH, /* Nominal Bit Rate Resynchronization Jump Width Control */
+ RCANFD_DTSEG2_SH, /* Data Bit Rate Time Segment 2 Control */
+ RCANFD_DTSEG1_SH, /* Data Bit Rate Time Segment 1 Control */
+ RCANFD_CFTML_SH, /* Common FIFO TX Message Buffer Link */
+ RCANFD_CFM_SH, /* Common FIFO Mode */
+ RCANFD_CFDC_SH, /* Common FIFO Depth Configuration */
+};
+
struct rcar_canfd_global;
struct rcar_canfd_hw_info {
const u32 *mask_table;
const u16 *regs;
+ const u8 *shift_table;
u8 max_channels;
u8 postdiv;
/* hardware features */
@@ -658,8 +680,35 @@ static const u32 rcar_gen4_mask_table[] = {
[RCANFD_CFTML_MASK] = 0x1f,
};
+static const u8 rcar_gen3_shift_table[] = {
+ [RCANFD_FIRST_RNC_SH] = 24,
+ [RCANFD_SECOND_RNC_SH] = 8,
+ [RCANFD_NTSEG2_SH] = 24,
+ [RCANFD_NTSEG1_SH] = 16,
+ [RCANFD_NSJW_SH] = 11,
+ [RCANFD_DTSEG2_SH] = 20,
+ [RCANFD_DTSEG1_SH] = 16,
+ [RCANFD_CFTML_SH] = 20,
+ [RCANFD_CFM_SH] = 16,
+ [RCANFD_CFDC_SH] = 8,
+};
+
+static const u8 rcar_gen4_shift_table[] = {
+ [RCANFD_FIRST_RNC_SH] = 16,
+ [RCANFD_SECOND_RNC_SH] = 16,
+ [RCANFD_NTSEG2_SH] = 25,
+ [RCANFD_NTSEG1_SH] = 17,
+ [RCANFD_NSJW_SH] = 10,
+ [RCANFD_DTSEG2_SH] = 16,
+ [RCANFD_DTSEG1_SH] = 8,
+ [RCANFD_CFTML_SH] = 16,
+ [RCANFD_CFM_SH] = 8,
+ [RCANFD_CFDC_SH] = 21,
+};
+
static const struct rcar_canfd_hw_info rcar_gen3_hw_info = {
.mask_table = rcar_gen3_mask_table,
+ .shift_table = rcar_gen3_shift_table,
.regs = rcar_gen3_regs,
.max_channels = 2,
.postdiv = 2,
@@ -668,6 +717,7 @@ static const struct rcar_canfd_hw_info rcar_gen3_hw_info = {
static const struct rcar_canfd_hw_info rcar_gen4_hw_info = {
.mask_table = rcar_gen4_mask_table,
+ .shift_table = rcar_gen4_shift_table,
.regs = rcar_gen4_regs,
.max_channels = 8,
.postdiv = 2,
@@ -678,6 +728,7 @@ static const struct rcar_canfd_hw_info rcar_gen4_hw_info = {
static const struct rcar_canfd_hw_info rzg2l_hw_info = {
.mask_table = rcar_gen3_mask_table,
+ .shift_table = rcar_gen3_shift_table,
.regs = rcar_gen3_regs,
.max_channels = 2,
.postdiv = 1,
@@ -685,17 +736,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);
--
2.43.0
next prev parent reply other threads:[~2025-03-06 12:43 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-06 12:42 [PATCH v4 00/11] Add support for RZ/G3E CANFD Biju Das
2025-03-06 12:42 ` [PATCH v4 01/11] dt-bindings: can: renesas,rcar-canfd: Simplify the conditional schema Biju Das
2025-03-14 13:31 ` Geert Uytterhoeven
2025-03-14 13:53 ` Biju Das
2025-03-06 12:42 ` [PATCH v4 02/11] dt-bindings: can: renesas,rcar-canfd: Document RZ/G3E support Biju Das
2025-03-14 13:40 ` Geert Uytterhoeven
2025-03-14 13:59 ` Biju Das
2025-03-06 12:42 ` [PATCH v4 03/11] can: rcar_canfd: Use of_get_available_child_by_name() Biju Das
2025-03-06 12:42 ` [PATCH v4 04/11] can: rcar_canfd: Add ch_interface_mode variable to struct rcar_canfd_hw_info Biju Das
2025-03-14 14:45 ` Geert Uytterhoeven
2025-03-06 12:42 ` [PATCH v4 05/11] can: rcar_canfd: Add shared_can_regs " Biju Das
2025-03-14 14:46 ` Geert Uytterhoeven
2025-03-15 17:25 ` Biju Das
2025-03-06 12:42 ` [PATCH v4 06/11] can: rcar_canfd: Add register mapping table " Biju Das
2025-03-14 14:46 ` Geert Uytterhoeven
2025-03-15 17:26 ` Biju Das
2025-03-06 12:42 ` [PATCH v4 07/11] can: rcar_canfd: Add mask " Biju Das
2025-03-14 14:47 ` Geert Uytterhoeven
2025-03-15 17:29 ` Biju Das
2025-03-06 12:42 ` Biju Das [this message]
2025-03-14 14:47 ` [PATCH v4 08/11] can: rcar_canfd: Add shift " Geert Uytterhoeven
2025-03-14 18:39 ` Biju Das
2025-03-15 17:31 ` Biju Das
2025-03-16 9:53 ` Geert Uytterhoeven
2025-03-16 17:02 ` Biju Das
2025-03-17 9:53 ` Geert Uytterhoeven
2025-03-17 9:58 ` Biju Das
2025-03-06 12:42 ` [PATCH v4 09/11] can: rcar_canfd: Add only_internal_clks variable " Biju Das
2025-03-14 14:47 ` Geert Uytterhoeven
2025-03-15 17:33 ` Biju Das
2025-03-16 9:50 ` Geert Uytterhoeven
2025-03-06 12:42 ` [PATCH v4 10/11] can: rcar_canfd: Enhance multi_channel_irqs handling Biju Das
2025-03-14 14:47 ` Geert Uytterhoeven
2025-03-06 12:42 ` [PATCH v4 11/11] can: rcar_canfd: Add RZ/G3E support Biju Das
2025-03-14 14:48 ` Geert Uytterhoeven
2025-03-14 14:59 ` Biju Das
2025-03-14 15:12 ` Geert Uytterhoeven
2025-03-14 12:38 ` [PATCH v4 00/11] Add support for RZ/G3E CANFD Marc Kleine-Budde
2025-03-14 12:51 ` Biju Das
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250306124256.93033-9-biju.das.jz@bp.renesas.com \
--to=biju.das.jz@bp.renesas.com \
--cc=biju.das.au@gmail.com \
--cc=geert+renesas@glider.be \
--cc=linux-can@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=mailhol.vincent@wanadoo.fr \
--cc=mkl@pengutronix.de \
--cc=prabhakar.mahadev-lad.rj@bp.renesas.com \
--cc=u.kleine-koenig@baylibre.com \
--cc=wsa+renesas@sang-engineering.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox