From patchwork Mon May 27 03:55:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yangbo Lu X-Patchwork-Id: 1105644 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="OYFu8TDR"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 45C3656djyz9s5c for ; Mon, 27 May 2019 13:55:25 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726264AbfE0DzZ (ORCPT ); Sun, 26 May 2019 23:55:25 -0400 Received: from mail-eopbgr130057.outbound.protection.outlook.com ([40.107.13.57]:30978 "EHLO EUR01-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726245AbfE0DzY (ORCPT ); Sun, 26 May 2019 23:55:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=oVzAYGV0thpVJ+86/5qPKv62Ya3YTbvp6+m3oa/pYTg=; b=OYFu8TDRx9+cxbfhCOLN1sqBKcsWMTvJx7k+mpTAiYmo4rYJj1sTzbWMdVcrd2hUifCJJwAws3tEgVebXR4Xi1UNQ7Ta59FaF0nbqwYq/vso8cmZFqJdgMqzZf/uI+dig9qlk2E03q+llR9Hsr+DLFoLDUS4XwFVTJO+Y7ZVdAw= Received: from VI1PR0401MB2237.eurprd04.prod.outlook.com (10.169.132.138) by VI1PR0401MB2544.eurprd04.prod.outlook.com (10.168.65.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1922.16; Mon, 27 May 2019 03:55:20 +0000 Received: from VI1PR0401MB2237.eurprd04.prod.outlook.com ([fe80::b091:6395:e853:5986]) by VI1PR0401MB2237.eurprd04.prod.outlook.com ([fe80::b091:6395:e853:5986%3]) with mapi id 15.20.1922.021; Mon, 27 May 2019 03:55:20 +0000 From: "Y.b. Lu" To: "netdev@vger.kernel.org" , David Miller , Claudiu Manoil CC: "Y.b. Lu" Subject: [PATCH] enetc: fix le32/le16 degrading to integer warnings Thread-Topic: [PATCH] enetc: fix le32/le16 degrading to integer warnings Thread-Index: AQHVFEAATo7Mi8M7KEuVJ1P9gzvomw== Date: Mon, 27 May 2019 03:55:20 +0000 Message-ID: <20190527035653.7552-1-yangbo.lu@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HK0PR03CA0097.apcprd03.prod.outlook.com (2603:1096:203:b0::13) To VI1PR0401MB2237.eurprd04.prod.outlook.com (2603:10a6:800:27::10) authentication-results: spf=none (sender IP is ) smtp.mailfrom=yangbo.lu@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [119.31.174.73] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: d5ac862a-c8e5-4775-cb09-08d6e2572308 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020); SRVR:VI1PR0401MB2544; x-ms-traffictypediagnostic: VI1PR0401MB2544: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:510; x-forefront-prvs: 0050CEFE70 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(376002)(366004)(39860400002)(346002)(396003)(136003)(199004)(189003)(26005)(186003)(14444005)(71190400001)(71200400001)(256004)(6116002)(316002)(110136005)(486006)(3846002)(476003)(2616005)(102836004)(14454004)(478600001)(99286004)(52116002)(2501003)(36756003)(6506007)(386003)(66066001)(5660300002)(305945005)(53936002)(73956011)(6636002)(1076003)(68736007)(81156014)(6436002)(2906002)(25786009)(50226002)(8936002)(81166006)(8676002)(6486002)(7736002)(66476007)(64756008)(66446008)(86362001)(6512007)(66556008)(66946007)(4326008); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR0401MB2544; H:VI1PR0401MB2237.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: qLAlWlL5ldK4v+fXtKiue+1LF/SnHGKAeR95Nb90uD8DD8PhNNLFwcisHSNy2J2JWTUGCwAIKTpKOtfLe2N6fO61RiaDnE71gOkD/+O61DmDoGlBfP2reVZCQmUFslAatHqY9gZ3F4m+t/WbKukp6hzsEV2jT+u2qtwGKCkndDOipA9TIyhSy8qJVMStcA9VjxEw7wtC4dAZ3OPSrFwUMR5U9PDFRtXAcFCFWddPWAEghisI+2U1UlWX7K6OlEdyv2u+SlZ9Xj0Re6F3qablN1BxBLV25X2qs67PT9Bu+8tfV/AV/U9Ntm4abc+1FtPi4TdMGjk7LfpS1aVCFSSXlgk++zZKrxQmRy3apPpe9zAlvjtnuULGUYDL/WebytMzhX63mwI+qMztyWJ4B3PIo1V3cK0NF11RrneVMC/d6GQ= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: d5ac862a-c8e5-4775-cb09-08d6e2572308 X-MS-Exchange-CrossTenant-originalarrivaltime: 27 May 2019 03:55:20.1168 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: yangbo.lu@nxp.com X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0401MB2544 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fix blow sparse warning introduced by a previous patch. - restricted __le32 degrades to integer - restricted __le16 degrades to integer Fixes: d39823121911 ("enetc: add hardware timestamping support") Signed-off-by: Yangbo Lu --- drivers/net/ethernet/freescale/enetc/enetc.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/freescale/enetc/enetc.c b/drivers/net/ethernet/freescale/enetc/enetc.c index d2ace299bed0..79bbc86abe77 100644 --- a/drivers/net/ethernet/freescale/enetc/enetc.c +++ b/drivers/net/ethernet/freescale/enetc/enetc.c @@ -307,13 +307,14 @@ static int enetc_bd_ready_count(struct enetc_bdr *tx_ring, int ci) static void enetc_get_tx_tstamp(struct enetc_hw *hw, union enetc_tx_bd *txbd, u64 *tstamp) { - u32 lo, hi; + u32 lo, hi, tstamp_lo; lo = enetc_rd(hw, ENETC_SICTR0); hi = enetc_rd(hw, ENETC_SICTR1); - if (lo <= txbd->wb.tstamp) + tstamp_lo = le32_to_cpu(txbd->wb.tstamp); + if (lo <= tstamp_lo) hi -= 1; - *tstamp = (u64)hi << 32 | txbd->wb.tstamp; + *tstamp = (u64)hi << 32 | tstamp_lo; } static void enetc_tstamp_tx(struct sk_buff *skb, u64 tstamp) @@ -483,16 +484,17 @@ static void enetc_get_rx_tstamp(struct net_device *ndev, struct skb_shared_hwtstamps *shhwtstamps = skb_hwtstamps(skb); struct enetc_ndev_priv *priv = netdev_priv(ndev); struct enetc_hw *hw = &priv->si->hw; - u32 lo, hi; + u32 lo, hi, tstamp_lo; u64 tstamp; - if (rxbd->r.flags & ENETC_RXBD_FLAG_TSTMP) { + if (le16_to_cpu(rxbd->r.flags) & ENETC_RXBD_FLAG_TSTMP) { lo = enetc_rd(hw, ENETC_SICTR0); hi = enetc_rd(hw, ENETC_SICTR1); - if (lo <= rxbd->r.tstamp) + tstamp_lo = le32_to_cpu(rxbd->r.tstamp); + if (lo <= tstamp_lo) hi -= 1; - tstamp = (u64)hi << 32 | rxbd->r.tstamp; + tstamp = (u64)hi << 32 | tstamp_lo; memset(shhwtstamps, 0, sizeof(*shhwtstamps)); shhwtstamps->hwtstamp = ns_to_ktime(tstamp); }