From patchwork Sat Mar 25 16:18:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Semwal X-Patchwork-Id: 95979 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp532084qgd; Sat, 25 Mar 2017 09:19:02 -0700 (PDT) X-Received: by 10.84.195.1 with SMTP id i1mr18060905pld.176.1490458742390; Sat, 25 Mar 2017 09:19:02 -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.02; Sat, 25 Mar 2017 09:19:02 -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 S1751303AbdCYQTC (ORCPT + 5 others); Sat, 25 Mar 2017 12:19:02 -0400 Received: from mail-pg0-f41.google.com ([74.125.83.41]:36062 "EHLO mail-pg0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751277AbdCYQTB (ORCPT ); Sat, 25 Mar 2017 12:19:01 -0400 Received: by mail-pg0-f41.google.com with SMTP id g2so9133216pge.3 for ; Sat, 25 Mar 2017 09:19:00 -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=jS19mTwGYrj4XVR7yfhmXcJXGtRsnsqeCPL/4I7RaGs=; b=dmY+UTlQv6iN56qk66JV08HtzYLtd1AKBYylIDOmfPMt0EbJhqU34ybcPtJfA9/1up gs0K6c4ZKTsBp6vCustVZKgJxvM3xiO53utGobkLSM1+Btw6WjfJ3aoiqctY7b2ScCT7 ixh7okOCS0/49vsaZCXmQVJHd0Xgzxh7z4lo4= 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=jS19mTwGYrj4XVR7yfhmXcJXGtRsnsqeCPL/4I7RaGs=; b=nSwvPkR4CGEjb34t7yoH4M8k16IjFI+Ru+i1Dojp0oCAfhqLUYdv6E1edu8Ml2vjyI KKzURELqC2Ax43GMiskTishxxC49ZfyB/mp31TdwnKE6gXXg/LksL8uYGzo791KvgAQm teDF88jvC9jKQDrvNPpFXSbpOkkGokx2ER5BC4wR4KtsISMypLdgMQN7Q/5avpGm/wKk aXyo9Go28HQ3yG5zXALXJBPaD3Nhzez0e860t6khYpPxFHgFQgemJtY6sXqzqfD9eRiD Pa0N5OSrBwhF0e/jkw1xEpF0OBzHATBueEotCsDDR6j4giFYu+om2v81uR9A8JK30Acc cpbA== X-Gm-Message-State: AFeK/H3RLFD1owy8WbcbfF+96dUO0Bk3k6wBTTQ/bUk73s4i2eUYULWoAP+21wcxL+0F6HaC X-Received: by 10.99.67.6 with SMTP id q6mr15396364pga.156.1490458740307; Sat, 25 Mar 2017 09:19:00 -0700 (PDT) Received: from phantom.lan ([106.51.225.38]) by smtp.gmail.com with ESMTPSA id q194sm11469541pfq.43.2017.03.25.09.18.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 25 Mar 2017 09:18:59 -0700 (PDT) From: Sumit Semwal To: stable@vger.kernel.org Cc: Chris J Arges , Jeff Kirsher , Sasha Levin , Greg Kroah-Hartman , Sumit Semwal Subject: [PATCH for-4.4 02/19] igb: Workaround for igb i210 firmware issue Date: Sat, 25 Mar 2017 21:48:02 +0530 Message-Id: <1490458699-24484-3-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: Chris J Arges [ Upstream commit 4e684f59d760a2c7c716bb60190783546e2d08a1 ] Sometimes firmware may not properly initialize I347AT4_PAGE_SELECT causing the probe of an igb i210 NIC to fail. This patch adds an addition zeroing of this register during igb_get_phy_id to workaround this issue. Thanks for Jochen Henneberg for the idea and original patch. Signed-off-by: Chris J Arges 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 | 4 ++++ 1 file changed, 4 insertions(+) -- 2.7.4 diff --git a/drivers/net/ethernet/intel/igb/e1000_phy.c b/drivers/net/ethernet/intel/igb/e1000_phy.c index 23ec28f..13ad20b 100644 --- a/drivers/net/ethernet/intel/igb/e1000_phy.c +++ b/drivers/net/ethernet/intel/igb/e1000_phy.c @@ -77,6 +77,10 @@ s32 igb_get_phy_id(struct e1000_hw *hw) s32 ret_val = 0; u16 phy_id; + /* ensure PHY page selection to fix misconfigured i210 */ + if (hw->mac.type == e1000_i210) + phy->ops.write_reg(hw, I347AT4_PAGE_SELECT, 0); + ret_val = phy->ops.read_reg(hw, PHY_ID1, &phy_id); if (ret_val) goto out;