| Message ID | 20210304010649.1858916-2-anthony.l.nguyen@intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | [net,1/3] net: ethernet: ixgbe: don't propagate -ENODEV from ixgbe_mii_bus_init() | expand |
On Wed, 3 Mar 2021 17:06:47 -0800 Tony Nguyen wrote: > From: Bartosz Golaszewski <bgolaszewski@baylibre.com> > > It's a valid use-case for ixgbe_mii_bus_init() to return -ENODEV - we > still want to finalize the registration of the ixgbe device. Check the > error code and don't bail out if err == -ENODEV. > > This fixes an issue on C3000 family of SoCs where four ixgbe devices > share a single MDIO bus and ixgbe_mii_bus_init() returns -ENODEV for > three of them but we still want to register them. > > Fixes: 09ef193fef7e ("net: ethernet: ixgbe: check the return value of ixgbe_mii_bus_init()") > Reported-by: Yongxin Liu <yongxin.liu@windriver.com> > Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> > Tested-by: Tony Brelinski <tonyx.brelinski@intel.com> > Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com> Are you sure this is not already fixed upstream by: bd7f14df9492 ("ixgbe: fix probing of multi-port devices with one MDIO") ?
On Thu, 2021-03-04 at 10:50 -0800, Jakub Kicinski wrote: > On Wed, 3 Mar 2021 17:06:47 -0800 Tony Nguyen wrote: > > From: Bartosz Golaszewski <bgolaszewski@baylibre.com> > > > > It's a valid use-case for ixgbe_mii_bus_init() to return -ENODEV - > > we > > still want to finalize the registration of the ixgbe device. Check > > the > > error code and don't bail out if err == -ENODEV. > > > > This fixes an issue on C3000 family of SoCs where four ixgbe > > devices > > share a single MDIO bus and ixgbe_mii_bus_init() returns -ENODEV > > for > > three of them but we still want to register them. > > > > Fixes: 09ef193fef7e ("net: ethernet: ixgbe: check the return value > > of ixgbe_mii_bus_init()") > > Reported-by: Yongxin Liu <yongxin.liu@windriver.com> > > Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> > > Tested-by: Tony Brelinski <tonyx.brelinski@intel.com> > > Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com> > > Are you sure this is not already fixed upstream by: > > bd7f14df9492 ("ixgbe: fix probing of multi-port devices with one > MDIO") > > ? That looks to solve this issue. I'll drop this patch and resend the series. Thanks, Tony
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index fae84202d870..aa3b0a7ab786 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -11033,7 +11033,7 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent) true); err = ixgbe_mii_bus_init(hw); - if (err) + if (err && err != -ENODEV) goto err_netdev; return 0;