R-Car Gen4 packs 2 RNC values in a 32-bit word, whereas R-Car Gen3 packs
up to 4 values in a 32-bit word. Handle this difference by adding
rnc_field_width variable to struct rcar_canfd_hw_info and update the macro
RCANFD_GAFLCFG.
Signed-off-by: Biju Das <biju.das.jz@xxxxxxxxxxxxxx>
---
v5:
* New patch.
---
drivers/net/can/rcar/rcar_canfd.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/net/can/rcar/rcar_canfd.c b/drivers/net/can/rcar/rcar_canfd.c
index 32d700962d69..924a116cd9ab 100644
--- a/drivers/net/can/rcar/rcar_canfd.c
+++ b/drivers/net/can/rcar/rcar_canfd.c
@@ -85,6 +85,7 @@
((gpriv)->fdmode ? RCANFD_GERFL_CMPOF : 0)))
/* AFL Rx rules registers */
+#define RCANFD_RNC_PER_REG(gpriv) (32 / (gpriv)->info->rnc_field_width)
/* RSCFDnCFDGAFLCFG0 / RSCFDnGAFLCFG0 */
#define RCANFD_GAFLCFG_SETRNC(gpriv, n, x) \
@@ -291,7 +292,7 @@
/* RSCFDnCFDGAFLECTR / RSCFDnGAFLECTR */
#define RCANFD_GAFLECTR (0x0098)
/* RSCFDnCFDGAFLCFG / RSCFDnGAFLCFG */
-#define RCANFD_GAFLCFG(ch) (0x009c + (0x04 * ((ch) / 2)))
+#define RCANFD_GAFLCFG(gpriv, ch) (0x009c + (0x04 * ((ch) / RCANFD_RNC_PER_REG(gpriv))))
/* RSCFDnCFDRMNB / RSCFDnRMNB */
#define RCANFD_RMNB (0x00a4)
/* RSCFDnCFDRMND / RSCFDnRMND */
@@ -505,6 +506,7 @@ struct rcar_canfd_global;
struct rcar_canfd_hw_info {
u16 num_supported_rules;
+ u8 rnc_field_width;
u8 max_channels;
u8 postdiv;
/* hardware features */
@@ -582,6 +584,7 @@ static const struct can_bittiming_const rcar_canfd_bittiming_const = {
static const struct rcar_canfd_hw_info rcar_gen3_hw_info = {
.num_supported_rules = 256,
+ .rnc_field_width = 8,
.max_channels = 2,
.postdiv = 2,
.shared_global_irqs = 1,
@@ -589,6 +592,7 @@ static const struct rcar_canfd_hw_info rcar_gen3_hw_info = {
static const struct rcar_canfd_hw_info rcar_gen4_hw_info = {
.num_supported_rules = 512,
+ .rnc_field_width = 16,
.max_channels = 8,
.postdiv = 2,
.shared_global_irqs = 1,
@@ -596,6 +600,7 @@ static const struct rcar_canfd_hw_info rcar_gen4_hw_info = {
static const struct rcar_canfd_hw_info rzg2l_hw_info = {
.num_supported_rules = 256,
+ .rnc_field_width = 8,
.max_channels = 2,
.postdiv = 1,
.multi_channel_irqs = 1,
@@ -797,7 +802,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),
+ rcar_canfd_set_bit(gpriv->base, RCANFD_GAFLCFG(gpriv, ch),
RCANFD_GAFLCFG_SETRNC(gpriv, ch, num_rules));
if (is_gen4(gpriv))
offset = RCANFD_GEN4_GAFL_OFFSET;
--
2.43.0
