net: phy: micrel: Fix warn: passing zero to PTR_ERR
Subsystems (3)
PATCH v3 1/1 net: phy: micrel: Fix warn: passing zero to PTR_ERR
Handle the NULL pointer case
Fixes New smatch warnings:drivers/net/phy/micrel.c:2613 lan8814_ptp_probe_once() warn: passing zero to 'PTR_ERR'
Fixes Old smatch warnings:drivers/net/phy/micrel.c:1750 ksz886x_cable_test_get_status() error:
uninitialized symbol 'ret'.
vim +/PTR_ERR +2613 drivers/net/phy/micrel.c
---
v2 -> v3:
- Changed subject line from net to net-next
- Removed config check for ptp and clock configuration instead added null check for ptp_clock
- Fixed one more warning related to initialisaton.
v1 -> v2:
- Handled NULL pointer case
- Changed subject line with net-next to net
--- drivers/net/phy/micrel.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)
drivers/net/phy/micrel.c +10 -8
@@ -2088,7 +2088,8 @@ static int ksz886x_cable_test_get_status(struct phy_device *phydev,const struct kszphy_type *type = phydev->drv->driver_data;unsigned long pair_mask = type->pair_mask;int retries =20 ; -int pair, ret; +int ret =0 ; +int pair; *finished = false;
@@ -2970,12 +2971,13 @@ static int lan8814_config_intr(struct phy_device *phydev)static void lan8814_ptp_init (struct phy_device *phydev) { +struct lan8814_shared_priv *shared_priv = phydev->shared->priv;struct kszphy_priv *priv = phydev->priv;struct kszphy_ptp_priv *ptp_priv = &priv->ptp_priv;u32 temp; -if (!IS_ENABLED (CONFIG_PTP_1588_CLOCK ) || - !IS_ENABLED (CONFIG_NETWORK_PHY_TIMESTAMPING )) +/* Check if PHC support is missing at the configuration level */ +if (!shared_priv->ptp_clock)return ;lanphy_write_page_reg (phydev,5 ,TSU_HARD_RESET ,TSU_HARD_RESET_ );
@@ -3016,10 +3018,6 @@ static int lan8814_ptp_probe_once(struct phy_device *phydev) {struct lan8814_shared_priv *shared = phydev->shared->priv; -if (!IS_ENABLED (CONFIG_PTP_1588_CLOCK ) || - !IS_ENABLED (CONFIG_NETWORK_PHY_TIMESTAMPING )) -return 0 ; -/* Initialise shared lock for clock*/ mutex_init (&shared->shared_lock);
@@ -3039,12 +3037,16 @@ static int lan8814_ptp_probe_once(struct phy_device *phydev) shared->ptp_clock =ptp_clock_register (&shared->ptp_clock_info, &phydev->mdio.dev); -if (IS_ERR_OR_NULL (shared->ptp_clock)) { +if (IS_ERR (shared->ptp_clock)) {phydev_err (phydev,"ptp_clock_register failed %lu\n" ,PTR_ERR (shared->ptp_clock));return -EINVAL ; } +/* Check if PHC support is missing at the configuration level */ +if (!shared->ptp_clock) +return 0 ; +phydev_dbg (phydev,"successfully registered ptp clock\n" ); shared->phydev = phydev;
Signature · 1 line
2.17.1
The 11/29/2022 15:46, Divya Koppera wrote:
Hi Divya,
Quoted 8 lines
Handle the NULL pointer case
Fixes New smatch warnings:
drivers/net/phy/micrel.c:2613lan8814_ptp_probe_once()warn: passing zero to 'PTR_ERR'Fixes Old smatch warnings:
drivers/net/phy/micrel.c:1750ksz886x_cable_test_get_status()error:
uninitialized symbol 'ret'.
Shouldn't you split this patch in 2 different patches, as you fix 2 issues.
Also any reason why you target net-next and not net? Because I can see the blamed patches on net branch.
Quoted 83 lines
vim +/PTR_ERR +2613
drivers/net/phy/micrel.cReported-by kernel test robot <[email protected]>Reported-by Dan Carpenter <[email protected]>Fixes ece19502834d ("net: phy: micrel: 1588 support for LAN8814 phy")Fixes 21b688dabecb ("net: phy: micrel: Cable Diag feature for lan8814 phy")Signed-off-by Divya Koppera <[email protected]>---
v2 -> v3:
- Changed subject line from net to net-next
- Removed config check for ptp and clock configuration instead added null check forptp_clock
- Fixed one more warning related to initialisaton.v1 -> v2:
- Handled NULL pointer case
- Changed subject line with net-next to net--- drivers/net/phy/micrel.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)drivers/net/phy/micrel.c +10
-8@@ -2088,7 +2088,8 @@ static int ksz886x_cable_test_get_status(struct phy_device *phydev,const struct kszphy_type *type = phydev->drv->driver_data;unsigned long pair_mask = type->pair_mask;int retries =20 ; -int pair, ret; +int ret =0 ; +int pair; *finished = false;@@ -2970,12 +2971,13 @@ static int lan8814_config_intr(struct phy_device *phydev)static void lan8814_ptp_init (struct phy_device *phydev) { +struct lan8814_shared_priv *shared_priv = phydev->shared->priv;struct kszphy_priv *priv = phydev->priv;struct kszphy_ptp_priv *ptp_priv = &priv->ptp_priv;u32 temp; -if (!IS_ENABLED (CONFIG_PTP_1588_CLOCK ) || - !IS_ENABLED (CONFIG_NETWORK_PHY_TIMESTAMPING )) +/* Check if PHC support is missing at the configuration level */ +if (!shared_priv->ptp_clock)return ;lanphy_write_page_reg (phydev,5 ,TSU_HARD_RESET ,TSU_HARD_RESET_ );@@ -3016,10 +3018,6 @@ static int lan8814_ptp_probe_once(struct phy_device *phydev) {struct lan8814_shared_priv *shared = phydev->shared->priv; -if (!IS_ENABLED (CONFIG_PTP_1588_CLOCK ) || - !IS_ENABLED (CONFIG_NETWORK_PHY_TIMESTAMPING )) -return 0 ; -/* Initialise shared lock for clock*/ mutex_init (&shared->shared_lock);@@ -3039,12 +3037,16 @@ static int lan8814_ptp_probe_once(struct phy_device *phydev) shared->ptp_clock =ptp_clock_register (&shared->ptp_clock_info, &phydev->mdio.dev); -if (IS_ERR_OR_NULL (shared->ptp_clock)) { +if (IS_ERR (shared->ptp_clock)) {phydev_err (phydev,"ptp_clock_register failed %lu\n" ,PTR_ERR (shared->ptp_clock));return -EINVAL ; } +/* Check if PHC support is missing at the configuration level */ +if (!shared->ptp_clock) +return 0 ; +phydev_dbg (phydev,"successfully registered ptp clock\n" ); shared->phydev = phydev;Signature · 1 line
2.17.1
Signature · 1 line
/Horatiu
Hi Horatiu,
Quoted 21 lines
-----Original Message-----
From: Horatiu Vultur <[email protected]>
Sent: Wednesday, November 30, 2022 8:21 PM
To: Divya Koppera - I30481 <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; linux- [email protected]; [email protected]; UNGLinuxDriver <[email protected]>; Madhuri Sripada - I34878 <[email protected]>
Subject: Re: [PATCH v3 net-next] net: phy: micrel: Fix warn: passing zero toPTR_ERRThe 11/29/2022 15:46, Divya Koppera wrote:
Hi Divya,
Quoted 4 lines
Handle the NULL pointer case
Fixes New smatch warnings:
drivers/net/phy/micrel.c:2613lan8814_ptp_probe_once()warn: passing
Quoted 7 lines
zero to '
PTR_ERR'Quoted 4 lines
Fixes Old smatch warnings:
drivers/net/phy/micrel.c:1750ksz886x_cable_test_get_status()error:
uninitialized symbol 'ret'.Shouldn't you split this patch in 2 different patches, as you fix 2 issues.
I got these warnings in single mail, so thought of fixing it in one patch. Also, one patch has single line change so did this way. Yeah, splitting sense good, will do in next revision.
Quoted 3 lines
Also any reason why you target net-next and not net? Because I can see the blamed patches on net branch.
Initially I targeted for net-next and in second revision I moved to net as it is fix. But I got a comment as below. So again, targeted to net-next.
"
Quoted 3 lines
v1 -> v2:
- Handled NULL pointer case
- Changed subject line with net-next to net
This is not a genuine bug fix, and so it should target next-next."
Quoted 83 lines
drivers/net/phy/micrel.c static int ksz886x_cable_test_get_status(struct
Quoted 27 lines
vim +/PTR_ERR +2613
drivers/net/phy/micrel.cReported-by kernel test robot <[email protected]>Reported-by Dan Carpenter <[email protected]>Fixes ece19502834d ("net: phy: micrel: 1588 support for LAN8814 phy")Fixes 21b688dabecb ("net: phy: micrel: Cable Diag feature for lan8814phy")
Signed-off-by Divya Koppera <[email protected]>---
v2 -> v3:
- Changed subject line from net to net-next
- Removed config check for ptp and clock configuration instead added null check forptp_clock
- Fixed one more warning related to initialisaton.v1 -> v2:
- Handled NULL pointer case
- Changed subject line with net-next to net--- drivers/net/phy/micrel.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)drivers/net/phy/micrel.c index renamed from drivers/net/phy/micrel.c +0
-0
26ce0c5defcd..3703e2fafbd4100644drivers/net/phy/micrel.c +0
-0@@ -2088,7 +2088,8 @@ static int ksz886x_cable_test_get_status(struct
phy_device*phydev,Quoted 15 lines
drivers/net/phy/micrel.c +3
-1const struct kszphy_type *type = phydev->drv->driver_data;unsigned long pair_mask = type->pair_mask;int retries =20 ; -int pair, ret; +int ret =0 ; +int pair; *finished = false;@@ -2970,12 +2971,13 @@ static int lan8814_config_intr(struct phy_device *phydev)static void lan8814_ptp_init (struct phy_device *phydev) { +struct lan8814_shared_priv *shared_priv = phydev->shared->priv;struct kszphy_priv *priv = phydev->priv;drivers/net/phy/micrel.c static int lan8814_config_intr(struct · line 2983
Quoted 10 lines
drivers/net/phy/micrel.c +2
-2struct kszphy_ptp_priv *ptp_priv = &priv->ptp_priv;u32 temp; -if (!IS_ENABLED (CONFIG_PTP_1588_CLOCK ) || - !IS_ENABLED (CONFIG_NETWORK_PHY_TIMESTAMPING )) +/* Check if PHC support is missing at the configuration level */ +if (!shared_priv->ptp_clock)return ; lanphy_write_page_reg(phydev, 5, TSU_HARD_RESET,
TSU_HARD_RESET_);Quoted 29 lines
drivers/net/phy/micrel.c +5
-5@@ -3016,10 +3018,6 @@ static int lan8814_ptp_probe_once(struct phy_device *phydev) {struct lan8814_shared_priv *shared = phydev->shared->priv; -if (!IS_ENABLED (CONFIG_PTP_1588_CLOCK ) || - !IS_ENABLED (CONFIG_NETWORK_PHY_TIMESTAMPING )) -return 0 ; -/* Initialise shared lock for clock*/ mutex_init (&shared->shared_lock);@@ -3039,12 +3037,16 @@ static int lan8814_ptp_probe_once(struct phy_device *phydev) shared->ptp_clock = ptp_clock_register(&shared->ptp_clock_info, &phydev->mdio.dev); -if (IS_ERR_OR_NULL (shared->ptp_clock)) { +if (IS_ERR (shared->ptp_clock)) {phydev_err (phydev,"ptp_clock_register failed %lu\n" ,PTR_ERR (shared->ptp_clock));return -EINVAL ; } +/* Check if PHC support is missing at the configuration level */ +if (!shared->ptp_clock) +return 0 ; +phydev_dbg (phydev,"successfully registered ptp clock\n" );
Quoted 7 lines
Quoted 4 lines
shared->phydev= phydev;
--
2.17.1--
/Horatiu
/Divya
Quoted 38 lines · The 12/01/2022 07:08, Divya Koppera - I30481 wrote:
Hi Horatiu,
Quoted 21 lines
-----Original Message-----
From: Horatiu Vultur <[email protected]>
Sent: Wednesday, November 30, 2022 8:21 PM
To: Divya Koppera - I30481 <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; linux- [email protected]; [email protected]; UNGLinuxDriver <[email protected]>; Madhuri Sripada - I34878 <[email protected]>
Subject: Re: [PATCH v3 net-next] net: phy: micrel: Fix warn: passing zero toPTR_ERRThe 11/29/2022 15:46, Divya Koppera wrote:
Hi Divya,
Quoted 4 lines
Handle the NULL pointer case
Fixes New smatch warnings:
drivers/net/phy/micrel.c:2613lan8814_ptp_probe_once()warn: passingQuoted 7 lines
zero to '
PTR_ERR'Quoted 4 lines
Fixes Old smatch warnings:
drivers/net/phy/micrel.c:1750ksz886x_cable_test_get_status()error:
uninitialized symbol 'ret'.Shouldn't you split this patch in 2 different patches, as you fix 2 issues.
I got these warnings in single mail, so thought of fixing it in one patch. Also, one patch has single line change so did this way. Yeah, splitting sense good, will do in next revision.
Quoted 3 lines
Also any reason why you target net-next and not net? Because I can see the blamed patches on net branch.
Quoted 8 lines
Initially I targeted for net-next and in second revision I moved to net as it is fix. But I got a comment as below. So again, targeted to net-next.
"
Quoted 3 lines
v1 -> v2:
- Handled NULL pointer case
- Changed subject line with net-next to netThis is not a genuine bug fix, and so it should target next-next."
That is fine by me.
...
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
static void
lan8814_ptp_init(struct phy_device *phydev){drivers/net/phy/micrel.c +1
-0+struct lan8814_shared_priv *shared_priv = phydev->shared->priv;struct kszphy_priv *priv = phydev->priv;struct kszphy_ptp_priv *ptp_priv = &priv->ptp_priv;u32 temp;
Quoted 5 lines
Quoted 5 lines
drivers/net/phy/micrel.c static int lan8814_config_intr(struct phy_device *phydev) · line 2981
Quoted 5 lines
drivers/net/phy/micrel.c +2
-2-if (!IS_ENABLED (CONFIG_PTP_1588_CLOCK ) || - !IS_ENABLED (CONFIG_NETWORK_PHY_TIMESTAMPING )) +/* Check if PHC support is missing at the configuration level */ +if (!shared_priv->ptp_clock)return ;
Sorry I forgot to mention this in the previous email.
Can you rename shared_priv to just shared. Because in all the other places it is used shared and not shared_priv.
Signature · 1 line
/Horatiu