From patchwork Mon Nov 27 12:53:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Pundir X-Patchwork-Id: 119700 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp241594qgn; Mon, 27 Nov 2017 05:08:37 -0800 (PST) X-Google-Smtp-Source: AGs4zMZEIz7AyZC2FvY7AKze2BEhsLpiI1rB7yn0W2WzQIGlt/rYRTt7MWne1wzqJufiprj7zbST X-Received: by 10.99.145.199 with SMTP id l190mr36645583pge.132.1511788117690; Mon, 27 Nov 2017 05:08:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511788117; cv=none; d=google.com; s=arc-20160816; b=j+NOeLHCRa+rrf4KLQiw4DdFcCAfT8vR271IAKBD6ccib/WRyGjJU8Z3XLNEvN+dgA SG19AQ7jf16e1ojZ4y0a0z+TpaFH5kwnjyTlzniGqWYnrBoExTrKCAXZoILD1fZVPsiW 3sDLhDb2WilAVR63hpyYwgW4SOpQVIxGMkjhLOTOFSx+4w7qDZnN5tWUxyu5tS4v/W5f rSMLKoNtHnx6QwTAI6u/jnoHTakg4UHgcqU08QduMkbirEiwj42NEKOpn5Z6bd/5NuEv l2YEfEEuVJa2oumIOCIyJQmQ4jSzHP3N0OaWx7BEKS2bSusIkeQTQt8noMSgqNQ9doNl Gw1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=n9j6tdPQ3scDBhKY/Sza9U9/nW8E91hUwx1qdrEZnuk=; b=TLAkZtFQKwswZ3kwHHtXcQ25pJ29Pbuj4y+gVFNyOX4zub6Rb8ZNBgeYMon+em3+io WYr3U1MiT3WTi3l0ZVu/Apnu6MCnVNDP0D5Bf5iEOs1FfW2SmprlrAn/mtYo/A+pArrh 7k0ImGBfsSzrQlbcK3k+ivlb5lU8/KbLpI1+izx8RtK3cQyW7SzwifIJMCUaFooKOKnV vUW0e6FY2Ly+BAiFjYKdts5sOoCDANERAsFL9k9DZSJ+5hF/VuWe4cBbsc4WUvd5LbuY 0ogC528k+xj962m+9WGclxP50j2Y15XDu0bog1+3zKb3HItQh0SS0X1diR+Rj5teu7Z8 OZNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QhTE7Ylh; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z13si16025288pgo.335.2017.11.27.05.08.37; Mon, 27 Nov 2017 05:08:37 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QhTE7Ylh; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752475AbdK0NIg (ORCPT + 9 others); Mon, 27 Nov 2017 08:08:36 -0500 Received: from mail-pf0-f193.google.com ([209.85.192.193]:37708 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752327AbdK0Mxq (ORCPT ); Mon, 27 Nov 2017 07:53:46 -0500 Received: by mail-pf0-f193.google.com with SMTP id t69so17338676pfg.4 for ; Mon, 27 Nov 2017 04:53:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=n9j6tdPQ3scDBhKY/Sza9U9/nW8E91hUwx1qdrEZnuk=; b=QhTE7YlhfOV/d3LLhkHBF2JfAN0lu32etzkV08epu8rjLh+0SUh6+NGhTQePk/WQ+j aMgZyiQI0a3gcgD28qtZCNH2Tx21It/Tyn8FtuyUQMb/uudrpJh1Jpr+nRMU2mwMMsDS HOKHu4n1lu+D/GIFr21PKpSn35r5crC1/9Dfo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=n9j6tdPQ3scDBhKY/Sza9U9/nW8E91hUwx1qdrEZnuk=; b=fMO5p92J0THnObpRG77caj1Yb8TimOWdU90yuIrgTsCY6UX8u8HtRwhW4oJSoMRgHd t76haAnGWrhG/dIcu2GSJq3uoyximc5jT4QG/oqA0P19G6G2BknuR6wov/9Us/iivVyq YtZk2IOMI4htKwGjLtbi69gH35uspfTywyrt+Z1CgN7CuDAFMybfnE+lu6MA2a0CUs2u ctLL4GBTgumkfX/8T4NqQoRSLrwmIVQcPD5GwLklimEOeD8DGFjB5Lk/ziBPi01dG9HW /xWe0tJDrl5eF13biSjaZc+QKfd5CCXssfAvxcUWh5fkY29XjUp2+DTyER/gr7zqFXLp F5Vw== X-Gm-Message-State: AJaThX5G9LGcwvmr5Ce8/Jfvks6J+TFvPyDj/i0gssMrnv39uVt+NZT/ dYylrVE7oi/O4faupj+rQJGNi71k0r4= X-Received: by 10.98.160.70 with SMTP id r67mr36547620pfe.153.1511787225491; Mon, 27 Nov 2017 04:53:45 -0800 (PST) Received: from localhost.localdomain ([106.51.17.194]) by smtp.gmail.com with ESMTPSA id i187sm51792658pfc.96.2017.11.27.04.53.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 27 Nov 2017 04:53:44 -0800 (PST) From: Amit Pundir To: Greg KH Cc: Benjamin Poirier , Sasha Neftin , Stable , Jeff Kirsher Subject: [PATCH for-4.14.y 1/5] e1000e: Fix error path in link detection Date: Mon, 27 Nov 2017 18:23:33 +0530 Message-Id: <1511787217-10987-2-git-send-email-amit.pundir@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1511787217-10987-1-git-send-email-amit.pundir@linaro.org> References: <1511787217-10987-1-git-send-email-amit.pundir@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Benjamin Poirier 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 Tested-by: Aaron Brown Signed-off-by: Jeff Kirsher Signed-off-by: Amit Pundir --- drivers/net/ethernet/intel/e1000e/phy.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) -- 2.7.4 diff --git a/drivers/net/ethernet/intel/e1000e/phy.c b/drivers/net/ethernet/intel/e1000e/phy.c index d78d47b41a71..86ff0969efb6 100644 --- 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 e1000_hw *hw, u32 iterations, 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 e1000_hw *hw, u32 iterations, 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; }