From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Waskiewicz Jr, Peter P" Subject: Re: [E1000-devel] [PATCH RESEND 3/3] e1000e: fix accessing to suspended device Date: Mon, 25 Feb 2013 17:09:45 -0800 Message-ID: <512C0B59.4020209@intel.com> References: <20130225051010.12689.28611.stgit@zurg> <20130225051911.12689.11167.stgit@zurg> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, e1000-devel@lists.sourceforge.net, "Rafael J. Wysocki" , Bruce Allan To: Konstantin Khlebnikov Return-path: In-Reply-To: <20130225051911.12689.11167.stgit@zurg> Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org On 2/24/2013 9:19 PM, Konstantin Khlebnikov wrote: > This patch fixes some annoying messages like 'Error reading PHY register' and > 'Hardware Erorr' and saves several seconds on reboot. Any networking-related patches should also include netdev@vger.kernel.org. I'm also a bit confused how the changes below match the patch description. Elaborating a bit more how the changes suppress the messages might be a good thing. > > Signed-off-by: Konstantin Khlebnikov > Acked-by: Rafael J. Wysocki > Cc: e1000-devel@lists.sourceforge.net > Cc: Jeff Kirsher > Cc: Bruce Allan > --- > drivers/net/ethernet/intel/e1000e/ethtool.c | 13 +++++++++++++ > drivers/net/ethernet/intel/e1000e/netdev.c | 2 ++ > 2 files changed, 15 insertions(+) > > diff --git a/drivers/net/ethernet/intel/e1000e/ethtool.c b/drivers/net/ethernet/intel/e1000e/ethtool.c > index 2c18137..f91a8f3 100644 > --- a/drivers/net/ethernet/intel/e1000e/ethtool.c > +++ b/drivers/net/ethernet/intel/e1000e/ethtool.c > @@ -36,6 +36,7 @@ > #include > #include > #include > +#include > > #include "e1000.h" > > @@ -2229,7 +2230,19 @@ static int e1000e_get_ts_info(struct net_device *netdev, > return 0; > } > > +static int e1000e_ethtool_begin(struct net_device *netdev) > +{ > + return pm_runtime_get_sync(netdev->dev.parent); > +} > + > +static void e1000e_ethtool_complete(struct net_device *netdev) > +{ > + pm_runtime_put_sync(netdev->dev.parent); > +} > + > static const struct ethtool_ops e1000_ethtool_ops = { > + .begin = e1000e_ethtool_begin, > + .complete = e1000e_ethtool_complete, > .get_settings = e1000_get_settings, > .set_settings = e1000_set_settings, > .get_drvinfo = e1000_get_drvinfo, What do the ethtool additions have to do with this patch? The patch description really doesn't seem to cover why these are here. > diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c > index 2954cc7..948b86ff 100644 > --- a/drivers/net/ethernet/intel/e1000e/netdev.c > +++ b/drivers/net/ethernet/intel/e1000e/netdev.c > @@ -4663,6 +4663,7 @@ static void e1000_phy_read_status(struct e1000_adapter *adapter) > (adapter->hw.phy.media_type == e1000_media_type_copper)) { > int ret_val; > > + pm_runtime_get_sync(&adapter->pdev->dev); > ret_val = e1e_rphy(hw, MII_BMCR, &phy->bmcr); > ret_val |= e1e_rphy(hw, MII_BMSR, &phy->bmsr); > ret_val |= e1e_rphy(hw, MII_ADVERTISE, &phy->advertise); > @@ -4673,6 +4674,7 @@ static void e1000_phy_read_status(struct e1000_adapter *adapter) > ret_val |= e1e_rphy(hw, MII_ESTATUS, &phy->estatus); > if (ret_val) > e_warn("Error reading PHY register\n"); > + pm_runtime_put_sync(&adapter->pdev->dev); > } else { > /* Do not read PHY registers if link is not up > * Set values to typical power-on defaults > > > ------------------------------------------------------------------------------ > Everyone hates slow websites. So do we. > Make your web apps faster with AppDynamics > Download AppDynamics Lite for free today: > http://p.sf.net/sfu/appdyn_d2d_feb > _______________________________________________ > E1000-devel mailing list > E1000-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/e1000-devel > To learn more about Intel® Ethernet, visit http://communities.intel.com/community/wired >