From patchwork Mon May 11 15:49:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= X-Patchwork-Id: 219464 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.7 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 38067C54E91 for ; Mon, 11 May 2020 15:50:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0ED91206DB for ; Mon, 11 May 2020 15:50:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.b="VNaxzE40" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730696AbgEKPu0 (ORCPT ); Mon, 11 May 2020 11:50:26 -0400 Received: from mail-mw2nam12on2062.outbound.protection.outlook.com ([40.107.244.62]:10442 "EHLO NAM12-MW2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1730648AbgEKPuX (ORCPT ); Mon, 11 May 2020 11:50:23 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iqqlr3ksIwJvkPAcJa328TivnfWX5PqSvkQ1wxBQ16FsYZRJMqVLg5mmtJ0kblkP1Ry9UomY2zMu7m9Lj3PuuMvfS3bgw4WjM/LpwHMPF3yTPFJqNBAJOzlO2ciSx0DKdhcCzyWoJejQcRWOteQpuEQN6Jbj1LLzQnAKuViIFILaAhz7Bfn/JaUVfI1RCGW1iCyN/U5rV7fwBwkg59t1JMsZNJz3dsc7aRl8vVbS7dlQW3Ik/E8d3icQcNn7WC7edXuSD7IwOq6cEq2pHwcDPkfUi5wtc89l1YZnYKtUkjI90vdn2w6BhvSnJlSZN8SM/ycuYIan3KUQxYoWAgXFfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3LQYkPoc0RQAR5LzTUVWy0B2tnXgQEhlr7F3BHwJCcM=; b=DHahhZ7py4KHddAtE5/cXXVCUU5CQGKGjGNxHnmdw37UnPcF7ABj+W8pLQudtq7midVobESxjuAaYCfu6fTzAoapKjLhBSg1Hkfsh2yu7ZVJ9f2goTJTaMd5HDuVkeD8xDLPqz6r9Ejixwg9DkA6b797bK8R8IwuFOhkftUia21Xlygwqo5JiHW7oNUihIrn2O35JOv3OHZ/HpWKOXEP9Zhr8eGXacQnQbgdAkltwnny1O4HAx+YQSzF+ZbfnBIrV8JIukGuFGQREFlRO9n0YmfMAk+sCNtVcvBp1xO7kv3OrsN4EAWrHXI/VZcdfr9rSWZ6dSoAGnYecvGjSvLcmw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=silabs.com; dmarc=pass action=none header.from=silabs.com; dkim=pass header.d=silabs.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=silabs.onmicrosoft.com; s=selector2-silabs-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3LQYkPoc0RQAR5LzTUVWy0B2tnXgQEhlr7F3BHwJCcM=; b=VNaxzE40mG45cfAyNXI+uHQzcdABcKHMx0yy1J0O9/lgO/W9LYRu0wm22PTj+YaaNo90Naj+Dll7FpoPNrMLkDgx1U7KKtZLLghkOSCzq/K5ElFE1laO7X69dWk+niMgmx68w2tpqQ/wkB8rThcA2IC3aSZNFu+1JvsVtITSDyA= Authentication-Results: driverdev.osuosl.org; dkim=none (message not signed) header.d=none; driverdev.osuosl.org; dmarc=none action=none header.from=silabs.com; Received: from MWHPR11MB1775.namprd11.prod.outlook.com (2603:10b6:300:10e::14) by MWHPR11MB1968.namprd11.prod.outlook.com (2603:10b6:300:113::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.26; Mon, 11 May 2020 15:50:12 +0000 Received: from MWHPR11MB1775.namprd11.prod.outlook.com ([fe80::e055:3e6d:ff4:56da]) by MWHPR11MB1775.namprd11.prod.outlook.com ([fe80::e055:3e6d:ff4:56da%5]) with mapi id 15.20.2979.033; Mon, 11 May 2020 15:50:12 +0000 From: Jerome Pouiller To: devel@driverdev.osuosl.org, linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Kalle Valo , "David S . Miller" , =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= Subject: [PATCH 13/17] staging: wfx: fix endianness of the field 'len' Date: Mon, 11 May 2020 17:49:26 +0200 Message-Id: <20200511154930.190212-14-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200511154930.190212-1-Jerome.Pouiller@silabs.com> References: <20200511154930.190212-1-Jerome.Pouiller@silabs.com> X-ClientProxiedBy: SN6PR2101CA0026.namprd21.prod.outlook.com (2603:10b6:805:106::36) To MWHPR11MB1775.namprd11.prod.outlook.com (2603:10b6:300:10e::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pc-42.silabs.com (82.67.86.106) by SN6PR2101CA0026.namprd21.prod.outlook.com (2603:10b6:805:106::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3021.2 via Frontend Transport; Mon, 11 May 2020 15:50:10 +0000 X-Mailer: git-send-email 2.26.2 X-Originating-IP: [82.67.86.106] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: eba1d5b8-b836-41fc-5b9b-08d7f5c2fd60 X-MS-TrafficTypeDiagnostic: MWHPR11MB1968: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:262; X-Forefront-PRVS: 04004D94E2 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: otkoD0oN7zSie20PriKkequBtKH+blYy7Lk98JPYljkR6mGhgbY22IhwndUvY+9+8Zji6YBBT20G2sYgZRn4F3RfF8CgHYwaUx6OA9J7Onu4FplAy1m3MsE0ZgVOHI9KIU5qpfq8oj8TcWklBUf6ELVS14ox1mOt7NOiywQwKR5uZELfsG9yLoa+SPlgIF2uKovdXP4vkY9bMkOqX9lGuo1+rSgU0Vzyj6uCmfOFiviLDAikty4MtTxemUXpQ68tNHmjW6xLomqOOPxnA1zcOv/KJx1iht5HQfo50au6ljrGQ1X+L2PI77t5Ezaby8wVSvF/zLAAH+PAC6YaIFQR8ugsye4YT8NXo9SyyiTu6Waj2CH58EaPirR6KUMpV4wivEWxshEKqPK/LRI3SMsXlT4BFGgV1Oa0KGGoWJCnAclJ4ixGNHIVZ9whM5z7X9tomfykIzttBSq/m32PaNIKE4biBWWX+lSZvKDGAD3l1/4FX43CMabl4QqTquVtW7oSpQgNwLynQulAmkS2lwaLlA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MWHPR11MB1775.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(39850400004)(346002)(136003)(396003)(376002)(366004)(33430700001)(186003)(52116002)(86362001)(316002)(5660300002)(7696005)(6486002)(33440700001)(478600001)(54906003)(6666004)(4326008)(107886003)(66574014)(36756003)(16526019)(26005)(8936002)(956004)(2616005)(8676002)(1076003)(66476007)(66946007)(66556008)(2906002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 9Of47LK5+xfzG5RsBH9QlMWnbolxZh9tZ4RasTQLG1CW5B7+f9+wdoc0bvmueACjor2O/NZVN3av7/RxjypSmKLtadzbgPkqjV2OipxWGa6cpz9pQ7nSntJFolZ24Vq7jxo3dD6Hngw7ibaItuXMrifD1wSj78SlWmPHjyEBNQmCRg0SxKB3f9FEJSznPN6Nj/qkVjaSAuuG1/dL7DwYNvMA8wIHjoT/0Rzl3jM1lwqmtvTwuBVPFWeiG1URzAz+124oDMJXwLdyzahKxJETMiV4094o+vSFuEFfIZSDCN1bd1ax2xQIYk9ezD2qTfdQABBitXiced+mNTC0a2ys7ZpWaJNizffijyQdW4+1WdU4z88m/mPRhW8ozB4vnUxKWs7qE6hUtVASYB0Z7ZRobWhOZvJxCqOvBpDYQu/P42eoNmtvsLJJmUfKDFy8NAhSP/ZG3Tf3EEfB5Ag1iy7DyzZMlXRSJ07qljP5Jt85uzI= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: eba1d5b8-b836-41fc-5b9b-08d7f5c2fd60 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2020 15:50:12.2614 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 54dbd822-5231-4b20-944d-6f4abcd541fb X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: zXqIwIHk+pxXxQJTzl9Ng3h4C+XggEcZI+dfhnA3542HVU/y7IqiM5Aft3jy4J7941LdTNVfn3wwvksraCcUMg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB1968 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jérôme Pouiller The struct hif_msg is received from the hardware. So, it declared as little endian. However, it is also accessed from many places in the driver. Sparse complains about that: drivers/staging/wfx/bh.c:88:32: warning: restricted __le16 degrades to integer drivers/staging/wfx/bh.c:88:32: warning: restricted __le16 degrades to integer drivers/staging/wfx/bh.c:93:32: warning: restricted __le16 degrades to integer drivers/staging/wfx/bh.c:93:32: warning: cast to restricted __le16 drivers/staging/wfx/bh.c:93:32: warning: restricted __le16 degrades to integer drivers/staging/wfx/bh.c:121:25: warning: incorrect type in argument 2 (different base types) drivers/staging/wfx/bh.c:121:25: expected unsigned int len drivers/staging/wfx/bh.c:121:25: got restricted __le16 [usertype] len drivers/staging/wfx/hif_rx.c:27:22: warning: restricted __le16 degrades to integer drivers/staging/wfx/hif_rx.c:347:39: warning: incorrect type in argument 7 (different base types) drivers/staging/wfx/hif_rx.c:347:39: expected unsigned int [usertype] len drivers/staging/wfx/hif_rx.c:347:39: got restricted __le16 const [usertype] len drivers/staging/wfx/hif_rx.c:365:39: warning: incorrect type in argument 7 (different base types) drivers/staging/wfx/hif_rx.c:365:39: expected unsigned int [usertype] len drivers/staging/wfx/hif_rx.c:365:39: got restricted __le16 const [usertype] len drivers/staging/wfx/./traces.h:195:1: warning: incorrect type in assignment (different base types) drivers/staging/wfx/./traces.h:195:1: expected int msg_len drivers/staging/wfx/./traces.h:195:1: got restricted __le16 const [usertype] len drivers/staging/wfx/./traces.h:195:1: warning: incorrect type in assignment (different base types) drivers/staging/wfx/./traces.h:195:1: expected int msg_len drivers/staging/wfx/./traces.h:195:1: got restricted __le16 const [usertype] len drivers/staging/wfx/debug.c:319:20: warning: restricted __le16 degrades to integer drivers/staging/wfx/secure_link.c:85:27: warning: restricted __le16 degrades to integer drivers/staging/wfx/secure_link.c:85:27: warning: restricted __le16 degrades to integer In order to make Sparse happy and to keep access from the driver easy, this patch declare 'len' with native endianness. On reception of hardware data, this patch takes care to do byte-swap and keep Sparse happy. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/bh.c | 7 ++++--- drivers/staging/wfx/data_tx.c | 2 +- drivers/staging/wfx/hif_api_general.h | 8 ++++++-- drivers/staging/wfx/hif_tx.c | 2 +- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/drivers/staging/wfx/bh.c b/drivers/staging/wfx/bh.c index 55724e4295c4..0355b1a1c4bb 100644 --- a/drivers/staging/wfx/bh.c +++ b/drivers/staging/wfx/bh.c @@ -74,6 +74,7 @@ static int rx_helper(struct wfx_dev *wdev, size_t read_len, int *is_cnf) _trace_piggyback(piggyback, false); hif = (struct hif_msg *)skb->data; + le16_to_cpus((__le16 *)&hif->len); WARN(hif->encrypted & 0x1, "unsupported encryption type"); if (hif->encrypted == 0x2) { if (wfx_sl_decode(wdev, (void *)hif)) { @@ -84,12 +85,11 @@ static int rx_helper(struct wfx_dev *wdev, size_t read_len, int *is_cnf) // piggyback is probably correct. return piggyback; } - le16_to_cpus(&hif->len); + le16_to_cpus((__le16 *)&hif->len); computed_len = round_up(hif->len - sizeof(hif->len), 16) + sizeof(struct hif_sl_msg) + sizeof(struct hif_sl_tag); } else { - le16_to_cpus(&hif->len); computed_len = round_up(hif->len, 2); } if (computed_len != read_len) { @@ -172,7 +172,7 @@ static void tx_helper(struct wfx_dev *wdev, struct hif_msg *hif) int ret; void *data; bool is_encrypted = false; - size_t len = le16_to_cpu(hif->len); + size_t len = hif->len; WARN(len < sizeof(*hif), "try to send corrupted data"); @@ -199,6 +199,7 @@ static void tx_helper(struct wfx_dev *wdev, struct hif_msg *hif) WARN(len > wdev->hw_caps.size_inp_ch_buf, "%s: request exceed WFx capability: %zu > %d\n", __func__, len, wdev->hw_caps.size_inp_ch_buf); + cpu_to_le16s(((struct hif_msg *)data)->len); len = wdev->hwbus_ops->align_size(wdev->hwbus_priv, len); ret = wfx_data_write(wdev, data, len); if (ret) diff --git a/drivers/staging/wfx/data_tx.c b/drivers/staging/wfx/data_tx.c index 014fa36c8f78..84656d1a6278 100644 --- a/drivers/staging/wfx/data_tx.c +++ b/drivers/staging/wfx/data_tx.c @@ -384,7 +384,7 @@ static int wfx_tx_inner(struct wfx_vif *wvif, struct ieee80211_sta *sta, skb_push(skb, wmsg_len); memset(skb->data, 0, wmsg_len); hif_msg = (struct hif_msg *)skb->data; - hif_msg->len = cpu_to_le16(skb->len); + hif_msg->len = skb->len; hif_msg->id = HIF_REQ_ID_TX; hif_msg->interface = wvif->id; if (skb->len > wvif->wdev->hw_caps.size_inp_ch_buf) { diff --git a/drivers/staging/wfx/hif_api_general.h b/drivers/staging/wfx/hif_api_general.h index 995752b9f168..a359ae76511a 100644 --- a/drivers/staging/wfx/hif_api_general.h +++ b/drivers/staging/wfx/hif_api_general.h @@ -23,7 +23,10 @@ #define HIF_COUNTER_MAX 7 struct hif_msg { - __le16 len; + // len is in fact little endian. However, it is widely used in the + // driver, so we declare it in native byte order and we reorder just + // before/after send/receive it (see bh.c). + u16 len; u8 id; u8 reserved:1; u8 interface:2; @@ -277,7 +280,8 @@ struct hif_sl_msg_hdr { struct hif_sl_msg { struct hif_sl_msg_hdr hdr; - __le16 len; + // Same note than struct hif_msg + u16 len; u8 payload[]; } __packed; diff --git a/drivers/staging/wfx/hif_tx.c b/drivers/staging/wfx/hif_tx.c index 490a9de54faf..6c6618197b91 100644 --- a/drivers/staging/wfx/hif_tx.c +++ b/drivers/staging/wfx/hif_tx.c @@ -33,7 +33,7 @@ static void wfx_fill_header(struct hif_msg *hif, int if_id, WARN(size > 0xFFF, "requested buffer is too large: %zu bytes", size); WARN(if_id > 0x3, "invalid interface ID %d", if_id); - hif->len = cpu_to_le16(size + 4); + hif->len = size + 4; hif->id = cmd; hif->interface = if_id; }