diff mbox series

[v7,09/18] can: rcar_canfd: Add max_aflpn variable to struct rcar_canfd_hw_info

Message ID 20250326122003.122976-10-biju.das.jz@bp.renesas.com (mailing list archive)
State New
Delegated to: Geert Uytterhoeven
Headers show
Series Add support for RZ/G3E CANFD | expand

Commit Message

Biju Das March 26, 2025, 12:19 p.m. UTC 
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.

Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
---
v6->v7:
 * Collected tag.
v6:
 * New patch.
---
 drivers/net/can/rcar/rcar_canfd.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Comments

Vincent Mailhol March 28, 2025, 11:05 a.m. UTC | #1 
On 26/03/2025 at 21:19, Biju Das wrote:
> 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.
> 
> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
> Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>

With below nitpick addressed, you can add my:

Reviewed-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr>

> ---
> v6->v7:
>  * Collected tag.
> v6:
>  * New patch.
> ---
>  drivers/net/can/rcar/rcar_canfd.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/can/rcar/rcar_canfd.c b/drivers/net/can/rcar/rcar_canfd.c
> index 62cde1efa0c0..7cef0673fbc8 100644
> --- a/drivers/net/can/rcar/rcar_canfd.c
> +++ b/drivers/net/can/rcar/rcar_canfd.c
> @@ -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)
                                        ^
While at it, can you rename that x to page_num in the next version? I
don't mind if you do it in the same patch.

I understand it was here before, but that's will be a nice quality of
life improvement.

Please do the same for the other macro which you are modifying  in this
series (I am not asking you to rewrite the full driver, so only do local
improvement on the parts you are touching).

>  /* 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,


Yours sincerely,
Vincent Mailhol
Biju Das March 28, 2025, 11:17 a.m. UTC | #2 
Hi Vincent,

> -----Original Message-----
> From: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
> Sent: 28 March 2025 11:06
> To: Biju Das <biju.das.jz@bp.renesas.com>; Marc Kleine-Budde <mkl@pengutronix.de>
> Cc: 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.au <biju.das.au@gmail.com>; linux-renesas-
> soc@vger.kernel.org
> Subject: Re: [PATCH v7 09/18] can: rcar_canfd: Add max_aflpn variable to struct rcar_canfd_hw_info
> 
> On 26/03/2025 at 21:19, Biju Das wrote:
> > 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.
> >
> > Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
> > Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
> 
> With below nitpick addressed, you can add my:
> 
> Reviewed-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
> 
> > ---
> > v6->v7:
> >  * Collected tag.
> > v6:
> >  * New patch.
> > ---
> >  drivers/net/can/rcar/rcar_canfd.c | 6 +++++-
> >  1 file changed, 5 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/net/can/rcar/rcar_canfd.c
> > b/drivers/net/can/rcar/rcar_canfd.c
> > index 62cde1efa0c0..7cef0673fbc8 100644
> > --- a/drivers/net/can/rcar/rcar_canfd.c
> > +++ b/drivers/net/can/rcar/rcar_canfd.c
> > @@ -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)
>                                         ^ While at it, can you rename that x to page_num in the next
> version? I don't mind if you do it in the same patch.
> 
> I understand it was here before, but that's will be a nice quality of life improvement.
> 
> Please do the same for the other macro which you are modifying  in this series (I am not asking you to
> rewrite the full driver, so only do local improvement on the parts you are touching).

Is it ok, if I send a separate patch for that conversion for all macros
which will avoid inconsistency in the driver as some macros will have x and
some macros with meaning full name?

Cheers,
Biju

> 
> >  /* 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,
> 
> 
> Yours sincerely,
> Vincent Mailhol
Vincent Mailhol March 28, 2025, 12:41 p.m. UTC | #3 
On 28/03/2025 at 20:17, Biju Das wrote:
> Hi Vincent,
> 
>> -----Original Message-----
>> From: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
>> Sent: 28 March 2025 11:06
>> To: Biju Das <biju.das.jz@bp.renesas.com>; Marc Kleine-Budde <mkl@pengutronix.de>
>> Cc: 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.au <biju.das.au@gmail.com>; linux-renesas-
>> soc@vger.kernel.org
>> Subject: Re: [PATCH v7 09/18] can: rcar_canfd: Add max_aflpn variable to struct rcar_canfd_hw_info
>>
>> On 26/03/2025 at 21:19, Biju Das wrote:
>>> 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.
>>>
>>> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
>>> Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
>>
>> With below nitpick addressed, you can add my:
>>
>> Reviewed-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
>>
>>> ---
>>> v6->v7:
>>>  * Collected tag.
>>> v6:
>>>  * New patch.
>>> ---
>>>  drivers/net/can/rcar/rcar_canfd.c | 6 +++++-
>>>  1 file changed, 5 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/net/can/rcar/rcar_canfd.c
>>> b/drivers/net/can/rcar/rcar_canfd.c
>>> index 62cde1efa0c0..7cef0673fbc8 100644
>>> --- a/drivers/net/can/rcar/rcar_canfd.c
>>> +++ b/drivers/net/can/rcar/rcar_canfd.c
>>> @@ -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)
>>                                         ^ While at it, can you rename that x to page_num in the next
>> version? I don't mind if you do it in the same patch.
>>
>> I understand it was here before, but that's will be a nice quality of life improvement.
>>
>> Please do the same for the other macro which you are modifying  in this series (I am not asking you to
>> rewrite the full driver, so only do local improvement on the parts you are touching).
> 
> Is it ok, if I send a separate patch for that conversion for all macros
> which will avoid inconsistency in the driver as some macros will have x and
> some macros with meaning full name?

This also works! Also OK if you prefer to send this in a separate series
together with the removal of the unused macros.

> Cheers,
> Biju

(...)

Yours sincerely,
Vincent Mailhol
Biju Das March 28, 2025, 12:47 p.m. UTC | #4 
Hi Vincent,

> -----Original Message-----
> From: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
> Sent: 28 March 2025 12:41
> Subject: Re: [PATCH v7 09/18] can: rcar_canfd: Add max_aflpn variable to struct rcar_canfd_hw_info
> 
> On 28/03/2025 at 20:17, Biju Das wrote:
> > Hi Vincent,
> >
> >> -----Original Message-----
> >> From: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
> >> Sent: 28 March 2025 11:06
> >> Subject: Re: [PATCH v7 09/18] can: rcar_canfd: Add max_aflpn variable
> >> to struct rcar_canfd_hw_info
> >>
> >> On 26/03/2025 at 21:19, Biju Das wrote:
> >>> 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.
> >>>
> >>> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
> >>> Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
> >>
> >> With below nitpick addressed, you can add my:
> >>
> >> Reviewed-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
> >>
> >>> ---
> >>> v6->v7:
> >>>  * Collected tag.
> >>> v6:
> >>>  * New patch.
> >>> ---
> >>>  drivers/net/can/rcar/rcar_canfd.c | 6 +++++-
> >>>  1 file changed, 5 insertions(+), 1 deletion(-)
> >>>
> >>> diff --git a/drivers/net/can/rcar/rcar_canfd.c
> >>> b/drivers/net/can/rcar/rcar_canfd.c
> >>> index 62cde1efa0c0..7cef0673fbc8 100644
> >>> --- a/drivers/net/can/rcar/rcar_canfd.c
> >>> +++ b/drivers/net/can/rcar/rcar_canfd.c
> >>> @@ -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)
> >>                                         ^ While at it, can you rename
> >> that x to page_num in the next version? I don't mind if you do it in the same patch.
> >>
> >> I understand it was here before, but that's will be a nice quality of life improvement.
> >>
> >> Please do the same for the other macro which you are modifying  in
> >> this series (I am not asking you to rewrite the full driver, so only do local improvement on the
> parts you are touching).
> >
> > Is it ok, if I send a separate patch for that conversion for all
> > macros which will avoid inconsistency in the driver as some macros
> > will have x and some macros with meaning full name?
> 
> This also works! Also OK if you prefer to send this in a separate series together with the removal of
> the unused macros.

Thanks.

Biju
diff mbox series

Patch

diff --git a/drivers/net/can/rcar/rcar_canfd.c b/drivers/net/can/rcar/rcar_canfd.c
index 62cde1efa0c0..7cef0673fbc8 100644
--- a/drivers/net/can/rcar/rcar_canfd.c
+++ b/drivers/net/can/rcar/rcar_canfd.c
@@ -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,