net: phy: micrel: Allow probing without .driver_data
Subsystems (3)
PATCH 1/2 net: phy: micrel: Allow probing without .driver_data
From: Fabio Estevam <[email protected]>
Currently, if the .probe element is present in the phy_driver structure and the .driver_data is not, a NULL pointer dereference happens.
Allow passing .probe without .driver_data by inserting NULL checks for priv->type.
--- drivers/net/phy/micrel.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/net/phy/micrel.c +6 -5
@@ -520,7 +520,7 @@ static int kszphy_config_reset(struct phy_device *phydev) } } -if (priv->led_mode >=0 ) +if (priv->type && priv->led_mode >=0 )kszphy_setup_led (phydev, priv->type->led_mode_reg, priv->led_mode);return 0 ;
@@ -536,10 +536,10 @@ static int kszphy_config_init(struct phy_device *phydev) type = priv->type; -if (type->has_broadcast_disable) +if (type && type->has_broadcast_disable)kszphy_broadcast_disable (phydev); -if (type->has_nand_tree_disable) +if (type && type->has_nand_tree_disable)kszphy_nand_tree_disable (phydev);return kszphy_config_reset (phydev);
@@ -1730,7 +1730,7 @@ static int kszphy_probe(struct phy_device *phydev) priv->type = type; -if (type->led_mode_reg) { +if (type && type->led_mode_reg) { ret =of_property_read_u32 (np,"micrel,led-mode" , &priv->led_mode);if (ret)
@@ -1751,7 +1751,8 @@ static int kszphy_probe(struct phy_device *phydev)unsigned long rate =clk_get_rate (clk);bool rmii_ref_clk_sel_25_mhz; - priv->rmii_ref_clk_sel = type->has_rmii_ref_clk_sel; +if (type) + priv->rmii_ref_clk_sel = type->has_rmii_ref_clk_sel; rmii_ref_clk_sel_25_mhz =of_property_read_bool (np,"micrel,rmii-reference-clock-select-25-mhz" );
Signature · 1 line
2.25.1
PATCH 2/2 net: phy: micrel: Use the kszphy probe/suspend/resume
From: Fabio Estevam <[email protected]>
Now that it is possible to use .probe without having .driver_data, let KSZ8061 use the kszphy specific hooks for probe,suspend and resume, which is preferred.
Switch to using the dedicated kszphy probe/suspend/resume functions.
--- drivers/net/phy/micrel.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/phy/micrel.c +3 -2
@@ -3019,11 +3019,12 @@ static struct phy_driver ksphy_driver[] = { .name = "Micrel KSZ8061", .phy_id_mask = MICREL_PHY_ID_MASK,/* PHY_BASIC_FEATURES */ + .probe = kszphy_probe, .config_init = ksz8061_config_init, .config_intr = kszphy_config_intr, .handle_interrupt = kszphy_handle_interrupt, - .suspend = genphy_suspend, - .resume = genphy_resume, + .suspend = kszphy_suspend, + .resume = kszphy_resume, }, { .phy_id = PHY_ID_KSZ9021, .phy_id_mask = 0x000ffffe,
Signature · 1 line
2.25.1
Re: [PATCH net-next 2/2] net: phy: micrel: Use the kszphy probe/suspend/resume
Quoted 9 lines · Fabio Estevam
From: Fabio Estevam <[email protected]>
Now that it is possible to use .probe without having .driver_data, let KSZ8061 use the kszphy specific hooks for probe,suspend and resume, which is preferred.
Switch to using the dedicated kszphy probe/suspend/resume functions.
Signed-off-by Fabio Estevam <[email protected]>
Andrew
Quoted 9 lines · Fabio Estevam
From: Fabio Estevam <[email protected]>
Currently, if the .probe element is present in the
phy_driverstructure and the .driver_data is not, a NULL pointer dereference happens.Allow passing .probe without .driver_data by inserting NULL checks for
priv->type.Signed-off-by Fabio Estevam <[email protected]>
Andrew
This series was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:
Quoted 9 lines · On Fri, 13 May 2022 08:46:12 -0300 you wrote:
From: Fabio Estevam <[email protected]>
Currently, if the .probe element is present in the
phy_driverstructure and the .driver_data is not, a NULL pointer dereference happens.Allow passing .probe without .driver_data by inserting NULL checks for
priv->type.[...]
Here is the summary with links:
- [net-next,1/2] net: phy: micrel: Allow probing without .driver_data
https://git.kernel.org/netdev/net-next/c/f2ef6f7539c6 - [net-next,2/2] net: phy: micrel: Use the kszphy probe/suspend/resume https://git.kernel.org/netdev/net-next/c/8e6004dfecb7
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html