From patchwork Tue Dec 16 10:28:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhu Yanjun X-Patchwork-Id: 421847 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 1CA651400E9 for ; Tue, 16 Dec 2014 21:29:00 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751489AbaLPK2z (ORCPT ); Tue, 16 Dec 2014 05:28:55 -0500 Received: from mail-pa0-f50.google.com ([209.85.220.50]:44205 "EHLO mail-pa0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751116AbaLPK2x (ORCPT ); Tue, 16 Dec 2014 05:28:53 -0500 Received: by mail-pa0-f50.google.com with SMTP id bj1so13772013pad.23 for ; Tue, 16 Dec 2014 02:28:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=5vis3cEmuT5BiTmPgWO79bmQei3lAktKL+pwJtLYcbY=; b=v/tLPYJN0ZBgAPI7YnXReWAyiA2O4VDSv861Y2JBtjkf4ehO73RmH6SVhLFVfJJQ+a w8aGA3gnO2qX7xvBJE7YLW8Ldt8DU2+tDjPIvMvlM0MWR03aa1TD6sQSSurjX2bSFcNb aVK5JHJMmscpBNoWRVT60vVA1HvlKhiqUiewt5zSPiBI4Jx6KKSlstk5RuTV9Pmap2aE 3Mlc+mb3FeEG4mhXurHquOcnhVHiBP4x3UfGRKDbsW0hTR35xa+L6mnQf9ISo6EGkn24 njsi9jt4oOXwVHffTPgMWcekC41AGxpdohx5qU2kCNlG/tfmL5xAIE1dcimtpXdeHe7W ZTcA== X-Received: by 10.66.253.100 with SMTP id zz4mr13990279pac.16.1418725732747; Tue, 16 Dec 2014 02:28:52 -0800 (PST) Received: from wind-OptiPlex-780.corp.ad.wrs.com ([106.120.101.38]) by mx.google.com with ESMTPSA id oq6sm538666pdb.45.2014.12.16.02.28.48 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 16 Dec 2014 02:28:51 -0800 (PST) From: Zhu Yanjun X-Google-Original-From: Zhu Yanjun To: netdev@vger.kernel.org, w@1wt.eu, zyjzyj2000@gmail.com Cc: Zhu Yanjun , Bruce Allan , Jeff Kirsher Subject: [PATCH 4/5] e1000e: update workaround for 82579 intermittently disabled during S0->Sx Date: Tue, 16 Dec 2014 18:28:19 +0800 Message-Id: <1418725700-31465-5-git-send-email-Yanjun.Zhu@windriver.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1418725700-31465-1-git-send-email-Yanjun.Zhu@windriver.com> References: <1418725700-31465-1-git-send-email-Yanjun.Zhu@windriver.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 2.6.x kernels require a similar logic change as commit 90b8298 [e1000e: update workaround for 82579 intermittently disabled during S0->Sx] introduces for newer kernels. The workaround which toggles the LANPHYPC (LAN PHY Power Control) value bit to force the MAC-Phy interconnect into PCIe mode from SMBus mode during driver load and resume should always be done except if PHY resets are blocked by the Manageability Engine (ME). Previously, the toggle was done only if PHY resets are blocked and the ME was disabled. The rest of the patch is just indentation changes as a consequence of the updated workaround. [yanjun.zhu: indentation changes are removed. function e1000_init_phy_workarounds_pchlan does not exist] Signed-off-by: Bruce Allan Tested-by: Aaron Brown Signed-off-by: Jeff Kirsher Signed-off-by: Zhu Yanjun --- drivers/net/e1000e/ich8lan.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c index 8c7e4aa..0da2c2c 100644 --- a/drivers/net/e1000e/ich8lan.c +++ b/drivers/net/e1000e/ich8lan.c @@ -280,8 +280,7 @@ static s32 e1000_init_phy_params_pchlan(struct e1000_hw *hw) phy->ops.write_phy_reg_locked = e1000_write_phy_reg_hv_locked; phy->autoneg_mask = AUTONEG_ADVERTISE_SPEED_DEFAULT; - if (!(er32(FWSM) & E1000_ICH_FWSM_FW_VALID) && - !e1000_check_reset_block(hw)) { + if (!e1000_check_reset_block(hw)) { /*Set Phy Config Counter to 50msec */ ctrl = er32(FEXTNVM3); ctrl &= ~E1000_FEXTNVM3_PHY_CFG_COUNTER_MASK;