lkml.org 
[lkml]   [2017]   [Nov]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 69/96] e1000e: Fix error path in link detection
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

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

    From: Benjamin Poirier <bpoirier@suse.com>

    commit c4c40e51f9c32c6dd8adf606624c930a1c4d9bbb upstream.

    In case of error from e1e_rphy(), the loop will exit early and "success"
    will be set to true erroneously.

    Signed-off-by: Benjamin Poirier <bpoirier@suse.com>
    Tested-by: Aaron Brown <aaron.f.brown@intel.com>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/net/ethernet/intel/e1000e/phy.c | 7 ++++---
    1 file changed, 4 insertions(+), 3 deletions(-)

    --- a/drivers/net/ethernet/intel/e1000e/phy.c
    +++ b/drivers/net/ethernet/intel/e1000e/phy.c
    @@ -1744,6 +1744,7 @@ s32 e1000e_phy_has_link_generic(struct e
    s32 ret_val = 0;
    u16 i, phy_status;

    + *success = false;
    for (i = 0; i < iterations; i++) {
    /* Some PHYs require the MII_BMSR register to be read
    * twice due to the link bit being sticky. No harm doing
    @@ -1763,16 +1764,16 @@ s32 e1000e_phy_has_link_generic(struct e
    ret_val = e1e_rphy(hw, MII_BMSR, &phy_status);
    if (ret_val)
    break;
    - if (phy_status & BMSR_LSTATUS)
    + if (phy_status & BMSR_LSTATUS) {
    + *success = true;
    break;
    + }
    if (usec_interval >= 1000)
    msleep(usec_interval / 1000);
    else
    udelay(usec_interval);
    }

    - *success = (i < iterations);
    -
    return ret_val;
    }


    \
     
     \ /
      Last update: 2017-11-28 13:12    [W:4.136 / U:0.988 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site