From patchwork Thu Jan 18 21:00:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 125031 Delivered-To: patch@linaro.org Received: by 10.46.64.27 with SMTP id n27csp294674lja; Thu, 18 Jan 2018 13:01:18 -0800 (PST) X-Google-Smtp-Source: ACJfBotHE03wXHUmtFJTNFWWwvcRYH7oFhPPUerOReAWZSZpS019nWoksucXeWIhstLRY1bjwpkb X-Received: by 10.101.80.72 with SMTP id k8mr37106810pgo.6.1516309278179; Thu, 18 Jan 2018 13:01:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516309278; cv=none; d=google.com; s=arc-20160816; b=A4YgRIrivfF/ZJfrESh7srOHSJTJ02mf3uqVhhcvsByPsXMSOOfy3EOQ00AVl7lRHa sep03LBHkyIMabqAPbfgfvJTIB9SqIlaGoIbiEVggUKPEDNbrdltXxUnKyRwhQ6uveVy XY7MLfDB53cA5SfpYQz4uoNoqyRa2P2UPC2wOkTAEnYL8MiSrolxYHz2iIZ6xRsXqbKm pTitKdFfQ7LBITwb/R1Xsq87gzt2ViI3m1UfczAw1yq3cTP2ZfytRQvl4WSdHzDGv9Ss 9bnB7IYB48t1qSdblqCDI1YUkJADQAYFF5UK8kRdqeiUL9pAdAsC7ss+70ReTjwXCXTD yOHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=3nrqXL8hJ9tkLUtZb8fh7bdo2yj2MFCbcLgqzeRBs3c=; b=YNaKELiovD0gU+kwh+TJ5OdPN5YPGyo6tkynbXJlgq94PFxLtbjhUe1FTzOJbRP4OU qMvlMjSAShqCnZdDXRyduV2OO4/C0KyCG2kayODOgnGvpbKeWX7aUeFnnVA1Yay67u8j LjTUupuy35ODuHQBhyREv+Xu4kubTzHi1KXN7PjUcd7cBYHlQPi40qVRYHxIGsQRppwW ZpZLqTmODg5E3gT1/Q6zXxhHRmXScZ9dUISacZ+94x0gO0DwAFB4sGHtprfXORVbBaSq l5nvjD4iDaZzmCp5nHqf7Vhxph11LxHq1ycoEB/ObpMqd/G38EolOb+eJlZHL37QBeWj FUxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=Ewg4Dg1i; 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=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c16si4933770pgu.706.2018.01.18.13.01.17; Thu, 18 Jan 2018 13:01:18 -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=@microsoft.com header.s=selector1 header.b=Ewg4Dg1i; 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=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754842AbeARVBQ (ORCPT + 10 others); Thu, 18 Jan 2018 16:01:16 -0500 Received: from mail-dm3nam03on0105.outbound.protection.outlook.com ([104.47.41.105]:26547 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754812AbeARVBO (ORCPT ); Thu, 18 Jan 2018 16:01:14 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=3nrqXL8hJ9tkLUtZb8fh7bdo2yj2MFCbcLgqzeRBs3c=; b=Ewg4Dg1iAO/pJtXUmoGVdGStpC1hPMIjkuutqLZJX86Na4i/np3tthi9T9P44i1KfBw5XbXQwpD/htW+2V3fbrO7cq9EaTcKCgtJx1kii5DNnjt2nYbLTdUnwO9wHxvjlCiwRkOv/a2mr9dAcuxuzLatl7cnMLcKSTdf5tuofJM= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB0917.namprd21.prod.outlook.com (52.132.132.162) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.444.7; Thu, 18 Jan 2018 21:01:11 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::6485:b98:d15e:9da7]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::6485:b98:d15e:9da7%2]) with mapi id 15.20.0428.008; Thu, 18 Jan 2018 21:01:11 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "stable-commits@vger.kernel.org" CC: Sumit Semwal , Todd Fujinaka , Jeff Kirsher , "Sasha Levin" Subject: [added to the 4.1 stable tree] igb: add i211 to i210 PHY workaround Thread-Topic: [added to the 4.1 stable tree] igb: add i211 to i210 PHY workaround Thread-Index: AQHTkJ9OszuYWJKdVE2ORiT2ZXaimQ== Date: Thu, 18 Jan 2018 21:00:01 +0000 Message-ID: <20180118205908.3220-72-alexander.levin@microsoft.com> References: <20180118205908.3220-1-alexander.levin@microsoft.com> In-Reply-To: <20180118205908.3220-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [167.220.98.9] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM5PR2101MB0917; 7:m//3O/V2dJVCR0aCW9HWBURwpXMvqmwlom2rtPmGWt7pFCEaElbF7O6dx9qyZNiZpXXRk0o7fBzgfRwHJdWZHDoVxEoRafZgA+4WjB8PTfiv+U1eOHT+c5I48VCdy2hh4l9T+dij1T4idJ/5GaxDaJ9LLAH3yGPvXLOnwW33KCLDT7dhUt+R7FitRnrPEcn9AsnpuSWNf58sE1aJYvnYBNfygdeuvnnShXaSBGdwbla+VCHWMwGaJKc3+Ox/deFS x-ms-office365-filtering-correlation-id: 06ac89f4-5c8e-459d-cdf0-08d55eb69adf x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(3008032)(4534125)(4602075)(4627221)(201703031133081)(201702281549075)(48565401081)(2017052603307)(7193020); SRVR:DM5PR2101MB0917; x-ms-traffictypediagnostic: DM5PR2101MB0917: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(228905959029699); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(61425038)(6040495)(2401047)(8121501046)(5005006)(93006095)(93001095)(3002001)(3231046)(2400067)(944501161)(10201501046)(6055026)(61426038)(61427038)(6041282)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:DM5PR2101MB0917; BCL:0; PCL:0; RULEID:(100000803126)(100110400120); SRVR:DM5PR2101MB0917; x-forefront-prvs: 05568D1FF7 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(979002)(366004)(346002)(39860400002)(396003)(376002)(39380400002)(199004)(189003)(59450400001)(53936002)(6512007)(5250100002)(102836004)(107886003)(72206003)(6506007)(5660300001)(2900100001)(6486002)(478600001)(6666003)(14454004)(86612001)(26005)(10290500003)(6346003)(2950100002)(4326008)(2501003)(6436002)(25786009)(97736004)(76176011)(22452003)(8936002)(106356001)(6116002)(3846002)(66066001)(1076002)(36756003)(99286004)(316002)(2906002)(110136005)(54906003)(86362001)(68736007)(305945005)(7736002)(105586002)(3660700001)(3280700002)(81156014)(8676002)(81166006)(10090500001)(22906009)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB0917; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: ewmwajI5QsNU6uQEEp/ZF29DqmwOvKRyos/jD/ffyOOIitmVknIai8rHG8ZIYBTso5obo9mr8ygC+0xDdtmErw== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 06ac89f4-5c8e-459d-cdf0-08d55eb69adf X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Jan 2018 21:00:01.4316 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0917 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Sumit Semwal This patch has been added to the stable tree. If you have any objections, please let us know. -- 2.11.0 =============== [ 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 --- drivers/net/ethernet/intel/igb/e1000_phy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/igb/e1000_phy.c b/drivers/net/ethernet/intel/igb/e1000_phy.c index bffbcc085689..62e36649ea09 100644 --- a/drivers/net/ethernet/intel/igb/e1000_phy.c +++ b/drivers/net/ethernet/intel/igb/e1000_phy.c @@ -84,7 +84,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);