| Message ID | 20240325222951.1460656-3-helgaas@kernel.org (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net/e1000e, igb, igc: Remove redundant runtime resume | expand |
On Mon, Mar 25, 2024 at 05:29:50PM -0500, Bjorn Helgaas wrote: > From: Bjorn Helgaas <bhelgaas@google.com> > > 749ab2cd1270 ("igb: add basic runtime PM support") added > ethtool_ops.begin() and .complete(), which used pm_runtime_get_sync() to > resume suspended devices before any ethtool_ops callback and allow suspend > after it completed. > > Subsequently, f32a21376573 ("ethtool: runtime-resume netdev parent before > ethtool ioctl ops") added pm_runtime_get_sync() in the dev_ethtool() path, > so the device is resumed before any ethtool_ops callback even if the driver > didn't supply a .begin() callback. > > Remove the .begin() and .complete() callbacks, which are now redundant > because dev_ethtool() already resumes the device. > > Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Simon Horman <horms@kernel.org>
> -----Original Message----- > From: Intel-wired-lan <intel-wired-lan-bounces@osuosl.org> On Behalf Of Bjorn Helgaas > Sent: Monday, March 25, 2024 3:30 PM > To: Brandeburg, Jesse <jesse.brandeburg@intel.com>; Nguyen, Anthony L <anthony.l.nguyen@intel.com>; David S . Miller <davem@davemloft.net>; Eric Dumazet <edumazet@google.com>; Jakub Kicinski <kuba@kernel.org>; Paolo Abeni <pabeni@redhat.com> > Cc: Neftin, Sasha <sasha.neftin@intel.com>; netdev@vger.kernel.org; Wysocki, Rafael J <rafael.j.wysocki@intel.com>; linux-kernel@vger.kernel.org; Bjorn Helgaas <bhelgaas@google.com>; intel-wired-lan@lists.osuosl.org; Zheng Yan <zheng.z.yan@intel.com>; Konstantin Khlebnikov <khlebnikov@openvz.org>; Heiner Kallweit <hkallweit1@gmail.com> > Subject: [Intel-wired-lan] [PATCH 2/3] igb: Remove redundant runtime resume for ethtool_ops > > From: Bjorn Helgaas <bhelgaas@google.com> > > 749ab2cd1270 ("igb: add basic runtime PM support") added > ethtool_ops.begin() and .complete(), which used pm_runtime_get_sync() to > resume suspended devices before any ethtool_ops callback and allow suspend > after it completed. > > Subsequently, f32a21376573 ("ethtool: runtime-resume netdev parent before > ethtool ioctl ops") added pm_runtime_get_sync() in the dev_ethtool() path, > so the device is resumed before any ethtool_ops callback even if the driver > didn't supply a .begin() callback. > > Remove the .begin() and .complete() callbacks, which are now redundant > because dev_ethtool() already resumes the device. > >Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> >--- > drivers/net/ethernet/intel/igb/igb_ethtool.c | 15 --------------- > 1 file changed, 15 deletions(-) > Tested-by: Sunitha Mekala <sunithax.d.mekala@intel.com> (A Contingent worker at Intel)
diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c index 99977a22b843..61d72250c0ed 100644 --- a/drivers/net/ethernet/intel/igb/igb_ethtool.c +++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c @@ -3272,19 +3272,6 @@ static int igb_get_module_eeprom(struct net_device *netdev, return 0; } -static int igb_ethtool_begin(struct net_device *netdev) -{ - struct igb_adapter *adapter = netdev_priv(netdev); - pm_runtime_get_sync(&adapter->pdev->dev); - return 0; -} - -static void igb_ethtool_complete(struct net_device *netdev) -{ - struct igb_adapter *adapter = netdev_priv(netdev); - pm_runtime_put(&adapter->pdev->dev); -} - static u32 igb_get_rxfh_indir_size(struct net_device *netdev) { return IGB_RETA_SIZE; @@ -3508,8 +3495,6 @@ static const struct ethtool_ops igb_ethtool_ops = { .set_channels = igb_set_channels, .get_priv_flags = igb_get_priv_flags, .set_priv_flags = igb_set_priv_flags, - .begin = igb_ethtool_begin, - .complete = igb_ethtool_complete, .get_link_ksettings = igb_get_link_ksettings, .set_link_ksettings = igb_set_link_ksettings, };