lkml.org 
[lkml]   [2013]   [May]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 15/73] e1000e: fix accessing to suspended device
    Date
    3.8-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Konstantin Khlebnikov <khlebnikov@openvz.org>

    commit e60b22c5b7e59db09a7c9490b1e132c7e49ae904 upstream.

    This patch fixes some annoying messages like 'Error reading PHY register' and
    'Hardware Erorr' and saves several seconds on reboot.

    Signed-off-by: Konstantin Khlebnikov <khlebnikov@openvz.org>
    Cc: Bruce Allan <bruce.w.allan@intel.com>
    Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
    Tested-by: Borislav Petkov <bp@suse.de>
    Tested-by: Aaron Brown <aaron.f.brown@intel.com>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Tested-by: Tóth Attila <atoth@atoth.sote.hu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/net/ethernet/intel/e1000e/ethtool.c | 13 +++++++++++++
    drivers/net/ethernet/intel/e1000e/netdev.c | 2 ++
    2 files changed, 15 insertions(+)

    --- a/drivers/net/ethernet/intel/e1000e/ethtool.c
    +++ b/drivers/net/ethernet/intel/e1000e/ethtool.c
    @@ -35,6 +35,7 @@
    #include <linux/slab.h>
    #include <linux/delay.h>
    #include <linux/vmalloc.h>
    +#include <linux/pm_runtime.h>

    #include "e1000.h"

    @@ -2053,7 +2054,19 @@ static int e1000_get_rxnfc(struct net_de
    }
    }

    +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,
    --- a/drivers/net/ethernet/intel/e1000e/netdev.c
    +++ b/drivers/net/ethernet/intel/e1000e/netdev.c
    @@ -4313,6 +4313,7 @@ static void e1000_phy_read_status(struct
    (adapter->hw.phy.media_type == e1000_media_type_copper)) {
    int ret_val;

    + pm_runtime_get_sync(&adapter->pdev->dev);
    ret_val = e1e_rphy(hw, PHY_CONTROL, &phy->bmcr);
    ret_val |= e1e_rphy(hw, PHY_STATUS, &phy->bmsr);
    ret_val |= e1e_rphy(hw, PHY_AUTONEG_ADV, &phy->advertise);
    @@ -4323,6 +4324,7 @@ static void e1000_phy_read_status(struct
    ret_val |= e1e_rphy(hw, PHY_EXT_STATUS, &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

    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2013-05-10 02:21    [W:4.197 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site