| Message ID | 20230519112509.40973-1-minhuadotchen@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] net: stmmac: compare p->des0 and p->des1 with __le32 type values | expand |
On Fri, May 19, 2023 at 07:25:08PM +0800, Min-Hua Chen wrote: > Use cpu_to_le32 to convert the constants to __le32 type > before comparing them with p->des0 and p->des1 (they are __le32 type) > and to fix following sparse warnings: > > drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c:110:23: sparse: warning: restricted __le32 degrades to integer > drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c:110:50: sparse: warning: restricted __le32 degrades to integer > > Signed-off-by: Min-Hua Chen <minhuadotchen@gmail.com> Reviewed-by: Simon Horman <simon.horman@corigine.com> > --- > drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c > index 13c347ee8be9..eefbeea04964 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c > +++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c > @@ -107,7 +107,8 @@ static int dwxgmac2_rx_check_timestamp(void *desc) > ts_valid = !(rdes3 & XGMAC_RDES3_TSD) && (rdes3 & XGMAC_RDES3_TSA); > > if (likely(desc_valid && ts_valid)) { > - if ((p->des0 == 0xffffffff) && (p->des1 == 0xffffffff)) > + if ((p->des0 == cpu_to_le32(0xffffffff)) && > + (p->des1 == cpu_to_le32(0xffffffff))) nit: Sorry for not noticing this in v1. There are unnecessary parentheses (both before and after this change).
>On Fri, May 19, 2023 at 07:25:08PM +0800, Min-Hua Chen wrote: >> Use cpu_to_le32 to convert the constants to __le32 type >> before comparing them with p->des0 and p->des1 (they are __le32 type) >> and to fix following sparse warnings: >> >> drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c:110:23: sparse: warning: restricted __le32 degrades to integer >> drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c:110:50: sparse: warning: restricted __le32 degrades to integer >> >> Signed-off-by: Min-Hua Chen <minhuadotchen@gmail.com> > >Reviewed-by: Simon Horman <simon.horman@corigine.com> > >> --- >> drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c >> index 13c347ee8be9..eefbeea04964 100644 >> --- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c >> +++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c >> @@ -107,7 +107,8 @@ static int dwxgmac2_rx_check_timestamp(void *desc) >> ts_valid = !(rdes3 & XGMAC_RDES3_TSD) && (rdes3 & XGMAC_RDES3_TSA); >> >> if (likely(desc_valid && ts_valid)) { >> - if ((p->des0 == 0xffffffff) && (p->des1 == 0xffffffff)) >> + if ((p->des0 == cpu_to_le32(0xffffffff)) && >> + (p->des1 == cpu_to_le32(0xffffffff))) > >nit: Sorry for not noticing this in v1. > There are unnecessary parentheses (both before and after this change). > Thanks, I noticed this before submitting v2 (by checkpath.pl) but I keep the original parentheses. I will do v3 with your Reviewed-by tag. :-) thanks, Min-Hua
On Fri, May 19, 2023 at 07:46:52PM +0800, Min-Hua Chen wrote: > [You don't often get email from minhuadotchen@gmail.com. Learn why this is important at https://aka.ms/LearnAboutSenderIdentification ] > > >On Fri, May 19, 2023 at 07:25:08PM +0800, Min-Hua Chen wrote: > >> Use cpu_to_le32 to convert the constants to __le32 type > >> before comparing them with p->des0 and p->des1 (they are __le32 type) > >> and to fix following sparse warnings: > >> > >> drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c:110:23: sparse: warning: restricted __le32 degrades to integer > >> drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c:110:50: sparse: warning: restricted __le32 degrades to integer > >> > >> Signed-off-by: Min-Hua Chen <minhuadotchen@gmail.com> > > > >Reviewed-by: Simon Horman <simon.horman@corigine.com> > > > >> --- > >> drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c | 3 ++- > >> 1 file changed, 2 insertions(+), 1 deletion(-) > >> > >> diff --git a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c > >> index 13c347ee8be9..eefbeea04964 100644 > >> --- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c > >> +++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c > >> @@ -107,7 +107,8 @@ static int dwxgmac2_rx_check_timestamp(void *desc) > >> ts_valid = !(rdes3 & XGMAC_RDES3_TSD) && (rdes3 & XGMAC_RDES3_TSA); > >> > >> if (likely(desc_valid && ts_valid)) { > >> - if ((p->des0 == 0xffffffff) && (p->des1 == 0xffffffff)) > >> + if ((p->des0 == cpu_to_le32(0xffffffff)) && > >> + (p->des1 == cpu_to_le32(0xffffffff))) > > > >nit: Sorry for not noticing this in v1. > > There are unnecessary parentheses (both before and after this change). > > > Thanks, I noticed this before submitting v2 (by checkpath.pl) but I keep > the original parentheses. > > I will do v3 with your Reviewed-by tag. :-) Thanks.
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c index 13c347ee8be9..eefbeea04964 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c @@ -107,7 +107,8 @@ static int dwxgmac2_rx_check_timestamp(void *desc) ts_valid = !(rdes3 & XGMAC_RDES3_TSD) && (rdes3 & XGMAC_RDES3_TSA); if (likely(desc_valid && ts_valid)) { - if ((p->des0 == 0xffffffff) && (p->des1 == 0xffffffff)) + if ((p->des0 == cpu_to_le32(0xffffffff)) && + (p->des1 == cpu_to_le32(0xffffffff))) return -EINVAL; return 0; }
Use cpu_to_le32 to convert the constants to __le32 type before comparing them with p->des0 and p->des1 (they are __le32 type) and to fix following sparse warnings: drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c:110:23: sparse: warning: restricted __le32 degrades to integer drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c:110:50: sparse: warning: restricted __le32 degrades to integer Signed-off-by: Min-Hua Chen <minhuadotchen@gmail.com> --- drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)