From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-901460-1516769553-2-6179522636478016085 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1516769552; b=CB9/sOGjMeEyDyWRtqGqaUZE7Ssfd2/bHUZX229gBRUtoC9 m+My5miWJG14KyeCQFTKoPghR8HsxpWdKiPIGyKDD5APPefYvg+PuFWz/XxRCD6q KLXELYeCC5bGRc8Rl2WyOC3+tOO1ROogajsqn5vSCkPvi+jsGxaslQH6ILO6gRDI LrkuYA0oouM0CXaW30E9BY3MUONIQBJxmVibraYs5kVw0Ylo7Fn064gKjT3iBT7O guI8IM7NlP1dtvBEX00JR5IyUmWOlHzsp4TXzvoFrVLAfoRJGA1N2eMS27f4lJ2j 9OZcXUYY109K1LI0po1osXjfcTXc0952OVINf8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1516769552; bh=NIB88H ug+t/l5Ydxhznyfr2GKyMn4z+jqkk5yDxffBU=; b=CMVp8pYWfb5wo5wgYwRZf8 0cnfSRpIwg6Y48a4cLcilOniWcskHORMNEWrLnArEOBEjn9YxtMV+/IOGrebevdD NsX91zNQ2ohrU0CLarjyJ4YF36Mp4/W+/6foQqtwpnF67OCopeaxcDwsIYVDeWXr aBfNJg2HuxqQooIry2X2U/32xL2HMYLYRsjEG0cLnmL1zv0HI3ecJ3a0aEml7hNa hvRHRUOBnCKYpB6eoozHX8i1MXr1tr+1xOWV4D0zxDwFmw8g/FyATn1L5814RphL n4Rw50PjntekEod+0jOzlZpI2Qy7YdtksoDN8oymnWC98CZ98yTMh9CEbzS19MXw == ARC-Authentication-Results: i=1; mx4.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=FdjnBcRZ x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx4.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=FdjnBcRZ x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932482AbeAXEwP (ORCPT ); Tue, 23 Jan 2018 23:52:15 -0500 Received: from mail-sn1nam01on0120.outbound.protection.outlook.com ([104.47.32.120]:45079 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932462AbeAXEQC (ORCPT ); Tue, 23 Jan 2018 23:16:02 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Antoine Tenart , "David S . Miller" , Sasha Levin Subject: [PATCH AUTOSEL for 4.14 067/100] net: phy: marvell10g: fix the PHY id mask Thread-Topic: [PATCH AUTOSEL for 4.14 067/100] net: phy: marvell10g: fix the PHY id mask Thread-Index: AQHTlMnlK/w6HwfZ9US2JGKCtBb4ag== Date: Wed, 24 Jan 2018 04:14:59 +0000 Message-ID: <20180124041414.32065-67-alexander.levin@microsoft.com> References: <20180124041414.32065-1-alexander.levin@microsoft.com> In-Reply-To: <20180124041414.32065-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;DM5PR2101MB1015;7:krvr1eI/rPy81Jm1Gdi58cKRktjqt6s3I82C5/YHUxQSdPLlY2CcXsKlDUoiYcILsFNKJt/f+Le/yZEL398/dQ2woXNDMBG9mCxKAGjhEuFNaw5aq4ataBp9p2uQZH6cx9U5M8aa2MQa79aKpnF30HID6vXHdMmOA4M9C6zQ/KGG9PYXSZqy9rDe+aX9KuL+kKiYx06PA8wmTUXnQ7eB7tzr+cryzNLl8iz2ou9N51p+kI21C3ss8k8SVNjCBmU/ x-ms-office365-filtering-correlation-id: 9327d9a2-c40b-4419-e454-08d562e12a0c x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(2017052603307)(7193020);SRVR:DM5PR2101MB1015; x-ms-traffictypediagnostic: DM5PR2101MB1015: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(58145275503218); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(5005006)(8121501046)(3002001)(10201501046)(3231046)(2400081)(944501161)(93006095)(93001095)(6055026)(61426038)(61427038)(6041288)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011);SRVR:DM5PR2101MB1015;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB1015; x-forefront-prvs: 056297E276 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(396003)(39380400002)(376002)(366004)(39860400002)(346002)(199004)(189003)(478600001)(106356001)(6512007)(53936002)(2900100001)(36756003)(102836004)(2950100002)(2501003)(10290500003)(97736004)(14454004)(81166006)(72206003)(8936002)(6486002)(1076002)(10090500001)(6346003)(26005)(54906003)(4326008)(76176011)(99286004)(86362001)(3660700001)(105586002)(6116002)(8676002)(68736007)(22452003)(66066001)(25786009)(6506007)(5660300001)(305945005)(59450400001)(7736002)(3280700002)(5250100002)(2906002)(107886003)(86612001)(6436002)(316002)(81156014)(3846002)(110136005)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB1015;H:DM5PR2101MB1032.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: jVqcf1Mz45ag1rb8qmxV6RmytUdt29zjMS1EKygB8wZc/Eo0Zcl1xlpfO7VR0Gnpwc+CIgB4zV6d1bi6g+6HWw== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9327d9a2-c40b-4419-e454-08d562e12a0c X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Jan 2018 04:14:59.1444 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1015 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Antoine Tenart [ Upstream commit 952b6b3b07877419386e719ff20917170e1ce684 ] The Marvell 10G PHY driver supports different hardware revisions, which have their bits 3..0 differing. To get the correct revision number these bits should be ignored. This patch fixes this by using the already defined MARVELL_PHY_ID_MASK (0xfffffff0) instead of the custom 0xffffffff mask. Fixes: 20b2af32ff3f ("net: phy: add Marvell Alaska X 88X3310 10Gigabit PHY = support") Suggested-by: Yan Markman Signed-off-by: Antoine Tenart Reviewed-by: Andrew Lunn Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/phy/marvell10g.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c index aebc08beceba..21b3f36e023a 100644 --- a/drivers/net/phy/marvell10g.c +++ b/drivers/net/phy/marvell10g.c @@ -16,6 +16,7 @@ * link takes priority and the other port is completely locked out. */ #include +#include =20 enum { MV_PCS_BASE_T =3D 0x0000, @@ -338,7 +339,7 @@ static int mv3310_read_status(struct phy_device *phydev= ) static struct phy_driver mv3310_drivers[] =3D { { .phy_id =3D 0x002b09aa, - .phy_id_mask =3D 0xffffffff, + .phy_id_mask =3D MARVELL_PHY_ID_MASK, .name =3D "mv88x3310", .features =3D SUPPORTED_10baseT_Full | SUPPORTED_100baseT_Full | @@ -360,7 +361,7 @@ static struct phy_driver mv3310_drivers[] =3D { module_phy_driver(mv3310_drivers); =20 static struct mdio_device_id __maybe_unused mv3310_tbl[] =3D { - { 0x002b09aa, 0xffffffff }, + { 0x002b09aa, MARVELL_PHY_ID_MASK }, { }, }; MODULE_DEVICE_TABLE(mdio, mv3310_tbl); --=20 2.11.0