@@ -93,7 +93,7 @@
/* RSCFDnCFDGAFLECTR / RSCFDnGAFLECTR */
#define RCANFD_GAFLECTR_AFLDAE BIT(8)
-#define RCANFD_GAFLECTR_AFLPN(gpriv, x) ((x) & reg_gen4(gpriv, 0x7f, 0x1f))
+#define RCANFD_GAFLECTR_AFLPN(gpriv, x) ((x) & (gpriv)->info->max_aflpn)
/* RSCFDnCFDGAFLIDj / RSCFDnGAFLIDj */
#define RCANFD_GAFLID_GAFLLB BIT(29)
@@ -507,6 +507,7 @@ struct rcar_canfd_hw_info {
u16 num_supported_rules;
u8 rnc_stride;
u8 rnc_field_width;
+ u8 max_aflpn;
u8 max_channels;
u8 postdiv;
/* hardware features */
@@ -586,6 +587,7 @@ static const struct rcar_canfd_hw_info rcar_gen3_hw_info = {
.num_supported_rules = 256,
.rnc_stride = 4,
.rnc_field_width = 8,
+ .max_aflpn = 31,
.max_channels = 2,
.postdiv = 2,
.shared_global_irqs = 1,
@@ -595,6 +597,7 @@ static const struct rcar_canfd_hw_info rcar_gen4_hw_info = {
.num_supported_rules = 512,
.rnc_stride = 2,
.rnc_field_width = 16,
+ .max_aflpn = 127,
.max_channels = 8,
.postdiv = 2,
.shared_global_irqs = 1,
@@ -604,6 +607,7 @@ static const struct rcar_canfd_hw_info rzg2l_hw_info = {
.num_supported_rules = 256,
.rnc_stride = 4,
.rnc_field_width = 8,
+ .max_aflpn = 31,
.max_channels = 2,
.postdiv = 1,
.multi_channel_irqs = 1,
R-Car Gen3 has maximum acceptance filter list page number of 31 whereas on R-Car Gen4 it is 127. Add max_aflpn variable to struct rcar_canfd_hw_info in order to support RZ/G3E that has max AFLPN of 63. Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com> --- v6: * New patch. --- drivers/net/can/rcar/rcar_canfd.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)