From patchwork Sat Mar 25 16:18:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Semwal X-Patchwork-Id: 95980 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp532100qgd; Sat, 25 Mar 2017 09:19:05 -0700 (PDT) X-Received: by 10.84.168.4 with SMTP id e4mr18371093plb.138.1490458745372; Sat, 25 Mar 2017 09:19:05 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r3si6723034pli.62.2017.03.25.09.19.05; Sat, 25 Mar 2017 09:19:05 -0700 (PDT) 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; 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 S1751312AbdCYQTF (ORCPT + 5 others); Sat, 25 Mar 2017 12:19:05 -0400 Received: from mail-pf0-f170.google.com ([209.85.192.170]:34101 "EHLO mail-pf0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751277AbdCYQTE (ORCPT ); Sat, 25 Mar 2017 12:19:04 -0400 Received: by mail-pf0-f170.google.com with SMTP id p189so7998947pfp.1 for ; Sat, 25 Mar 2017 09:19:03 -0700 (PDT) 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=CtDz0hyTqGfhP+bze3GLi0dvewdC27HU+qmWY6h08fI=; b=UofBbIq/K3/oIoantzTbsChci0Kw/dlDMsnfvwe0u/Ls76vEZlFXB8mlLYwH90Z/f8 ZKbOGwUoNTrgOA6EUwGV1nLw/Zq9fT3R+XV8i03yhB1eXn6e4aUYraTsO6/yj4E25D5P NW7l2iFOjY9ha/QxJP3jLAnNdK1TAzAumasjo= 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=CtDz0hyTqGfhP+bze3GLi0dvewdC27HU+qmWY6h08fI=; b=rLNDY0ddtSRefH045Qq+H0PzuFPRRvON0rmZ8rgnBne3j+6LGb34oHlyzxeV4hu3CK TrFctmAsjBo2qVWyl7kP4nnHaian/bh9tN52J13Q+lDhGjk9HoLAtmj9DVoUg+PSwqjh GyGRlWogEbsRRw+B0Rpbve54lx/ZGBNEdcjYk5KwcxrWvj44+J6IFtDVsbRLiWBdogLG Tn75viWXKa2702WQCAueSQknJO2o/Ko1zXlRImhR/BndMb8dYjOaXE63nPsmiApFAOiP L///I01+r23Kp6/uvmZ9gy1PXCDeKLexQoWVVBLMrNfZ3lOnesXTrEJx5v6YJ1xj3Ttp +zvA== X-Gm-Message-State: AFeK/H03H9G4mHXorymlVLOSJYiGDieJbegoP9W42R+3PIxVPlVyE5ZYGG5Po1i8XPLNcvRA X-Received: by 10.84.174.131 with SMTP id r3mr18586173plb.136.1490458743303; Sat, 25 Mar 2017 09:19:03 -0700 (PDT) Received: from phantom.lan ([106.51.225.38]) by smtp.gmail.com with ESMTPSA id q194sm11469541pfq.43.2017.03.25.09.19.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 25 Mar 2017 09:19:02 -0700 (PDT) From: Sumit Semwal To: stable@vger.kernel.org Cc: Todd Fujinaka , Jeff Kirsher , Sasha Levin , Greg Kroah-Hartman , Sumit Semwal Subject: [PATCH for-4.4 03/19] igb: add i211 to i210 PHY workaround Date: Sat, 25 Mar 2017 21:48:03 +0530 Message-Id: <1490458699-24484-4-git-send-email-sumit.semwal@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1490458699-24484-1-git-send-email-sumit.semwal@linaro.org> References: <1490458699-24484-1-git-send-email-sumit.semwal@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Todd Fujinaka [ Upstream commit 5bc8c230e2a993b49244f9457499f17283da9ec7 ] i210 and i211 share the same PHY but have different PCI IDs. Don't forget i211 for any i210 workarounds. Signed-off-by: Todd Fujinaka Tested-by: Aaron Brown Signed-off-by: Jeff Kirsher Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sumit Semwal --- drivers/net/ethernet/intel/igb/e1000_phy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.4 diff --git a/drivers/net/ethernet/intel/igb/e1000_phy.c b/drivers/net/ethernet/intel/igb/e1000_phy.c index 13ad20b..afaa98d 100644 --- a/drivers/net/ethernet/intel/igb/e1000_phy.c +++ b/drivers/net/ethernet/intel/igb/e1000_phy.c @@ -78,7 +78,7 @@ s32 igb_get_phy_id(struct e1000_hw *hw) u16 phy_id; /* ensure PHY page selection to fix misconfigured i210 */ - if (hw->mac.type == e1000_i210) + if ((hw->mac.type == e1000_i210) || (hw->mac.type == e1000_i211)) phy->ops.write_reg(hw, I347AT4_PAGE_SELECT, 0); ret_val = phy->ops.read_reg(hw, PHY_ID1, &phy_id);