* [PATCH net] ixgbe: fix mdio bus registration
@ 2019-03-15 8:45 ` Ivan Vecera
0 siblings, 0 replies; 4+ messages in thread
From: Ivan Vecera @ 2019-03-15 8:45 UTC (permalink / raw)
To: netdev
Cc: Jeff Kirsher, David S. Miller,
moderated list:INTEL ETHERNET DRIVERS, open list
The ixgbe ignores errors returned from mdiobus_register() and leaves
adapter->mii_bus non-NULL and MDIO bus state as MDIOBUS_ALLOCATED.
This triggers a BUG from mdiobus_unregister() during ixgbe_remove() call.
Fixes: 8fa10ef01260 ("ixgbe: register a mdiobus")
Signed-off-by: Ivan Vecera <ivecera@redhat.com>
---
drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
index cc4907f9ff02..2fb97967961c 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
@@ -905,13 +905,12 @@ s32 ixgbe_mii_bus_init(struct ixgbe_hw *hw)
struct pci_dev *pdev = adapter->pdev;
struct device *dev = &adapter->netdev->dev;
struct mii_bus *bus;
+ int err = -ENODEV;
- adapter->mii_bus = devm_mdiobus_alloc(dev);
- if (!adapter->mii_bus)
+ bus = devm_mdiobus_alloc(dev);
+ if (!bus)
return -ENOMEM;
- bus = adapter->mii_bus;
-
switch (hw->device_id) {
/* C3000 SoCs */
case IXGBE_DEV_ID_X550EM_A_KR:
@@ -949,12 +948,15 @@ s32 ixgbe_mii_bus_init(struct ixgbe_hw *hw)
*/
hw->phy.mdio.mode_support = MDIO_SUPPORTS_C45 | MDIO_SUPPORTS_C22;
- return mdiobus_register(bus);
+ err = mdiobus_register(bus);
+ if (!err) {
+ adapter->mii_bus = bus;
+ return 0;
+ }
ixgbe_no_mii_bus:
devm_mdiobus_free(dev, bus);
- adapter->mii_bus = NULL;
- return -ENODEV;
+ return err;
}
/**
--
2.19.2
^ permalink raw reply related [flat|nested] 4+ messages in thread* [Intel-wired-lan] [PATCH net] ixgbe: fix mdio bus registration
@ 2019-03-15 8:45 ` Ivan Vecera
0 siblings, 0 replies; 4+ messages in thread
From: Ivan Vecera @ 2019-03-15 8:45 UTC (permalink / raw)
To: intel-wired-lan
The ixgbe ignores errors returned from mdiobus_register() and leaves
adapter->mii_bus non-NULL and MDIO bus state as MDIOBUS_ALLOCATED.
This triggers a BUG from mdiobus_unregister() during ixgbe_remove() call.
Fixes: 8fa10ef01260 ("ixgbe: register a mdiobus")
Signed-off-by: Ivan Vecera <ivecera@redhat.com>
---
drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
index cc4907f9ff02..2fb97967961c 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
@@ -905,13 +905,12 @@ s32 ixgbe_mii_bus_init(struct ixgbe_hw *hw)
struct pci_dev *pdev = adapter->pdev;
struct device *dev = &adapter->netdev->dev;
struct mii_bus *bus;
+ int err = -ENODEV;
- adapter->mii_bus = devm_mdiobus_alloc(dev);
- if (!adapter->mii_bus)
+ bus = devm_mdiobus_alloc(dev);
+ if (!bus)
return -ENOMEM;
- bus = adapter->mii_bus;
-
switch (hw->device_id) {
/* C3000 SoCs */
case IXGBE_DEV_ID_X550EM_A_KR:
@@ -949,12 +948,15 @@ s32 ixgbe_mii_bus_init(struct ixgbe_hw *hw)
*/
hw->phy.mdio.mode_support = MDIO_SUPPORTS_C45 | MDIO_SUPPORTS_C22;
- return mdiobus_register(bus);
+ err = mdiobus_register(bus);
+ if (!err) {
+ adapter->mii_bus = bus;
+ return 0;
+ }
ixgbe_no_mii_bus:
devm_mdiobus_free(dev, bus);
- adapter->mii_bus = NULL;
- return -ENODEV;
+ return err;
}
/**
--
2.19.2
^ permalink raw reply related [flat|nested] 4+ messages in thread* RE: [Intel-wired-lan] [PATCH net] ixgbe: fix mdio bus registration
2019-03-15 8:45 ` [Intel-wired-lan] " Ivan Vecera
@ 2019-03-21 22:32 ` Bowers, AndrewX
-1 siblings, 0 replies; 4+ messages in thread
From: Bowers, AndrewX @ 2019-03-21 22:32 UTC (permalink / raw)
To: netdev; +Cc: open list, moderated list:INTEL ETHERNET DRIVERS
> -----Original Message-----
> From: Intel-wired-lan [mailto:intel-wired-lan-bounces@osuosl.org] On
> Behalf Of Ivan Vecera
> Sent: Friday, March 15, 2019 1:45 AM
> To: netdev@vger.kernel.org
> Cc: open list <linux-kernel@vger.kernel.org>; moderated list:INTEL
> ETHERNET DRIVERS <intel-wired-lan@lists.osuosl.org>; David S. Miller
> <davem@davemloft.net>
> Subject: [Intel-wired-lan] [PATCH net] ixgbe: fix mdio bus registration
>
> The ixgbe ignores errors returned from mdiobus_register() and leaves
> adapter->mii_bus non-NULL and MDIO bus state as MDIOBUS_ALLOCATED.
> This triggers a BUG from mdiobus_unregister() during ixgbe_remove() call.
>
> Fixes: 8fa10ef01260 ("ixgbe: register a mdiobus")
> Signed-off-by: Ivan Vecera <ivecera@redhat.com>
> ---
> drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 16 +++++++++-------
> 1 file changed, 9 insertions(+), 7 deletions(-)
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
^ permalink raw reply [flat|nested] 4+ messages in thread* [Intel-wired-lan] [PATCH net] ixgbe: fix mdio bus registration
@ 2019-03-21 22:32 ` Bowers, AndrewX
0 siblings, 0 replies; 4+ messages in thread
From: Bowers, AndrewX @ 2019-03-21 22:32 UTC (permalink / raw)
To: intel-wired-lan
> -----Original Message-----
> From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On
> Behalf Of Ivan Vecera
> Sent: Friday, March 15, 2019 1:45 AM
> To: netdev at vger.kernel.org
> Cc: open list <linux-kernel@vger.kernel.org>; moderated list:INTEL
> ETHERNET DRIVERS <intel-wired-lan@lists.osuosl.org>; David S. Miller
> <davem@davemloft.net>
> Subject: [Intel-wired-lan] [PATCH net] ixgbe: fix mdio bus registration
>
> The ixgbe ignores errors returned from mdiobus_register() and leaves
> adapter->mii_bus non-NULL and MDIO bus state as MDIOBUS_ALLOCATED.
> This triggers a BUG from mdiobus_unregister() during ixgbe_remove() call.
>
> Fixes: 8fa10ef01260 ("ixgbe: register a mdiobus")
> Signed-off-by: Ivan Vecera <ivecera@redhat.com>
> ---
> drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 16 +++++++++-------
> 1 file changed, 9 insertions(+), 7 deletions(-)
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-03-21 22:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-15 8:45 [PATCH net] ixgbe: fix mdio bus registration Ivan Vecera
2019-03-15 8:45 ` [Intel-wired-lan] " Ivan Vecera
2019-03-21 22:32 ` Bowers, AndrewX
2019-03-21 22:32 ` Bowers, AndrewX
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.