| Message ID | 20210615131601.57900-1-colin.king@canonical.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [next] net: pcs: xpcs: Fix a less than zero u16 comparision error | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Guessed tree name to be net-next |
| netdev/subject_prefix | warning | Target tree name not specified in the subject |
| netdev/cc_maintainers | success | CCed 7 of 7 maintainers |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 15 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/header_inline | success | Link |
Some nitpicks, fix them if you'd like, ignore them if not: s/comparision/comparison/ On Tue, Jun 15, 2021 at 02:16:01PM +0100, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > Currently the check for the u16 variable val being less than zero is > always false because val is unsigned. Fix this by using the int > variable for the assignment and less than zero check. > > Addresses-Coverity: ("Unsigned compared against 0") > Fixes: f7380bba42fd ("net: pcs: xpcs: add support for NXP SJA1110") > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > drivers/net/pcs/pcs-xpcs-nxp.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/pcs/pcs-xpcs-nxp.c b/drivers/net/pcs/pcs-xpcs-nxp.c > index de99c37cf2ae..80430ca94fbf 100644 > --- a/drivers/net/pcs/pcs-xpcs-nxp.c > +++ b/drivers/net/pcs/pcs-xpcs-nxp.c > @@ -152,11 +152,11 @@ static int nxp_sja1110_pma_config(struct dw_xpcs *xpcs, > /* Enable TX and RX PLLs and circuits. > * Release reset of PMA to enable data flow to/from PCS. > */ > - val = xpcs_read(xpcs, MDIO_MMD_VEND2, SJA1110_POWERDOWN_ENABLE); > - if (val < 0) > - return val; > + ret = xpcs_read(xpcs, MDIO_MMD_VEND2, SJA1110_POWERDOWN_ENABLE); > + if (ret < 0) > + return ret; > > - val &= ~(SJA1110_TXPLL_PD | SJA1110_TXPD | SJA1110_RXCH_PD | > + val = ret & ~(SJA1110_TXPLL_PD | SJA1110_TXPD | SJA1110_RXCH_PD | You could have realigned the following 2 lines as well with the new position of SJA1110_TXPLL_PD. > SJA1110_RXBIAS_PD | SJA1110_RESET_SER_EN | > SJA1110_RESET_SER | SJA1110_RESET_DES); > val |= SJA1110_RXPKDETEN | SJA1110_RCVEN; > -- > 2.31.1 > Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
diff --git a/drivers/net/pcs/pcs-xpcs-nxp.c b/drivers/net/pcs/pcs-xpcs-nxp.c index de99c37cf2ae..80430ca94fbf 100644 --- a/drivers/net/pcs/pcs-xpcs-nxp.c +++ b/drivers/net/pcs/pcs-xpcs-nxp.c @@ -152,11 +152,11 @@ static int nxp_sja1110_pma_config(struct dw_xpcs *xpcs, /* Enable TX and RX PLLs and circuits. * Release reset of PMA to enable data flow to/from PCS. */ - val = xpcs_read(xpcs, MDIO_MMD_VEND2, SJA1110_POWERDOWN_ENABLE); - if (val < 0) - return val; + ret = xpcs_read(xpcs, MDIO_MMD_VEND2, SJA1110_POWERDOWN_ENABLE); + if (ret < 0) + return ret; - val &= ~(SJA1110_TXPLL_PD | SJA1110_TXPD | SJA1110_RXCH_PD | + val = ret & ~(SJA1110_TXPLL_PD | SJA1110_TXPD | SJA1110_RXCH_PD | SJA1110_RXBIAS_PD | SJA1110_RESET_SER_EN | SJA1110_RESET_SER | SJA1110_RESET_DES); val |= SJA1110_RXPKDETEN | SJA1110_RCVEN;