From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1369136-1517180962-2-12573701445729527605 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.001, 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=1517180961; b=n8rVSbJsGdbPceEH26H5Ic7rJzFTKhGK3th23Bv5H2QmWX4 X+VOa2LaJNTAiPaHogFZys+oL2bbhtnHAHdUkHjjiSL09kD30CBgM1L8dKW9y8t0 DkExODq4UIEiEBBlU79c2cKJUGN6K37OfuaUhr2LhvjnYDiPSabaBL66A4sE+Hki pj/lHyOzILI9YDbTTLDSHVSrD8EbX8CKjpXgt55x06yhRfJ9nrouBePQpRtpLa6M JC2Fgsa7NgxPbSsLRpiCxUmos/SAMoTm+FLRUZImPd7OEQbPKFXuK1//qDVlm1ia QJRrBEvKtQLbzvTwJp0wJ71EfOjde/sg8V6K22A== 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=1517180961; bh=yXfuK5 +ix82/LZh5jG7Pw8ashEBLd9zBnhl6EmFWP1E=; b=dy8d5iyg2TszKCbQM9E6yZ PaVHRtpykm30Jnk/wbEgDhE741PQsjq7Qb/Wdq+S6T2xk1HTogdF55V8izyJD7WL HWRuNqWZnGncCq9Kirbg9GsYmd+4cy/oA6Mk7P0TLrz5K8l4cA3ZGyP0uslGQp83 ojmkDP/rtShnicS2fSB7UOnOxcSB2KRjZRIw/lK07nfLacsDr0Ohyfpftp7Z1tIa znQsAWjqfceblxO/6Q5/XVvmy1EVWbeDW8qZ8o/ohSje8HJaoYqTg6EolqwtD9sr YrxM7YKa0ysjSfoVUJjIEmz/tRC46WlrlZ4ljI5xrF5MobdSjOqy52AuZfFyRcBg == ARC-Authentication-Results: i=1; mx5.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=ELj435fN 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: mx5.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=ELj435fN 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 S1753103AbeA1XJS (ORCPT ); Sun, 28 Jan 2018 18:09:18 -0500 Received: from mail-by2nam03on0110.outbound.protection.outlook.com ([104.47.42.110]:1213 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753306AbeA1W07 (ORCPT ); Sun, 28 Jan 2018 17:26:59 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Russell King , "David S . Miller" , Sasha Levin Subject: [PATCH AUTOSEL for 4.14 038/100] sfp: fix RX_LOS signal handling Thread-Topic: [PATCH AUTOSEL for 4.14 038/100] sfp: fix RX_LOS signal handling Thread-Index: AQHTmIcH+H2eWXg3l0eS2iFdRrxZSQ== Date: Sun, 28 Jan 2018 22:26:23 +0000 Message-ID: <20180128222547.7398-38-alexander.levin@microsoft.com> References: <20180128222547.7398-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222547.7398-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;MWHSPR01MB344;7:IR/ECDx5iWAdo1OhcNVbpeNaOnNBqkYs6AWGuE0xDZwF7HkEerTuGJPVE3G1+CPMQAy90ZKbZD5oHJ1hhNAAjSw6tbZvjE+WUWI+WfF2apnw/x63TuZeH/QJFwo4DGttYsUDnFtWzE+R2tXqRa4lXPKs594+9fr8S1/vv+GYOmAcbPqwkE7inxWtb/OUv0eie641ZN8RSb1dA8yLd7fJUVDZOc4MsoRy6ndFkZPurd2etggLFLDDw7na3V+WplLs x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: f216f1d9-a704-4d11-caf3-08d5669e3bac x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MWHSPR01MB344; x-ms-traffictypediagnostic: MWHSPR01MB344: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(85827821059158); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(8121501046)(5005006)(93006095)(93001095)(3002001)(10201501046)(3231101)(944501161)(6055026)(61426038)(61427038)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(20161123560045)(6072148)(201708071742011);SRVR:MWHSPR01MB344;BCL:0;PCL:0;RULEID:;SRVR:MWHSPR01MB344; x-forefront-prvs: 05669A7924 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(346002)(39860400002)(366004)(396003)(376002)(39380400002)(189003)(199004)(10090500001)(86362001)(36756003)(99286004)(2900100001)(6486002)(6512007)(7736002)(1076002)(6436002)(3846002)(76176011)(2906002)(8676002)(86612001)(81156014)(105586002)(316002)(5250100002)(81166006)(66066001)(102836004)(478600001)(3280700002)(6116002)(14454004)(2501003)(4326008)(110136005)(10290500003)(26005)(54906003)(107886003)(53936002)(6666003)(186003)(25786009)(68736007)(6506007)(305945005)(5660300001)(106356001)(22452003)(2950100002)(8936002)(97736004)(3660700001)(72206003)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MWHSPR01MB344;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; x-microsoft-antispam-message-info: yFBx27QEHoycrBB9UoXNyam6/TAbLbsJ5BPVJ7IoU5V2H44P08odEpi9a3AYiieC8JN4+rnBz4x1nhMGgEFMGQ== 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: f216f1d9-a704-4d11-caf3-08d5669e3bac X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:26:23.1021 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHSPR01MB344 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: Russell King [ Upstream commit acf1c02f023926b8b04672a9e81b1711ae681619 ] The options word is a be16 quantity, so we need to test the flags having converted the endian-ness. Convert the flag bits to be16, which can be optimised by the compiler, rather than converting a variable at runtime. Reported-by: Florian Fainelli Signed-off-by: Russell King Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/phy/sfp.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c index baee371bf767..8bf10aba7452 100644 --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c @@ -358,7 +358,7 @@ static void sfp_sm_link_check_los(struct sfp *sfp) * SFP_OPTIONS_LOS_NORMAL are set? For now, we assume * the same as SFP_OPTIONS_LOS_NORMAL set. */ - if (sfp->id.ext.options & SFP_OPTIONS_LOS_INVERTED) + if (sfp->id.ext.options & cpu_to_be16(SFP_OPTIONS_LOS_INVERTED)) los ^=3D SFP_F_LOS; =20 if (los) @@ -583,7 +583,8 @@ static void sfp_sm_event(struct sfp *sfp, unsigned int = event) if (event =3D=3D SFP_E_TX_FAULT) sfp_sm_fault(sfp, true); else if (event =3D=3D - (sfp->id.ext.options & SFP_OPTIONS_LOS_INVERTED ? + (sfp->id.ext.options & + cpu_to_be16(SFP_OPTIONS_LOS_INVERTED) ? SFP_E_LOS_HIGH : SFP_E_LOS_LOW)) sfp_sm_link_up(sfp); break; @@ -593,7 +594,8 @@ static void sfp_sm_event(struct sfp *sfp, unsigned int = event) sfp_sm_link_down(sfp); sfp_sm_fault(sfp, true); } else if (event =3D=3D - (sfp->id.ext.options & SFP_OPTIONS_LOS_INVERTED ? + (sfp->id.ext.options & + cpu_to_be16(SFP_OPTIONS_LOS_INVERTED) ? SFP_E_LOS_LOW : SFP_E_LOS_HIGH)) { sfp_sm_link_down(sfp); sfp_sm_next(sfp, SFP_S_WAIT_LOS, 0); --=20 2.11.0