From patchwork Mon Dec 5 18:32:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Augusto von Dentz X-Patchwork-Id: 631119 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2C599C4332F for ; Mon, 5 Dec 2022 18:39:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233303AbiLESj1 (ORCPT ); Mon, 5 Dec 2022 13:39:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59084 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232839AbiLESjH (ORCPT ); Mon, 5 Dec 2022 13:39:07 -0500 Received: from mail-pj1-x102e.google.com (mail-pj1-x102e.google.com [IPv6:2607:f8b0:4864:20::102e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 62E45BCA for ; Mon, 5 Dec 2022 10:32:44 -0800 (PST) Received: by mail-pj1-x102e.google.com with SMTP id q15so11031889pja.0 for ; Mon, 05 Dec 2022 10:32:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=oiQ7kqQcZglR2eF387n2myjsQOhqcKBThxzbTBU0Vwo=; b=juFvt0pqMtEIIumZntfjK5LJvV1QKekoyzqEfNB7/5+UgS55rWeaC6XmMFeZFksxML P3zZrtcL2MZyUlNcKWf/JRIt2Ee47841bVdJbtkubZPeFy29ZXR8Xpf5XBXTznslBZyW 3HsYCTyeyuakUo5ViPgp35ltmqaUuqX1oBDwj0DZCJfcNlrK+iqXo1SWM3WSPVwJtoHm qDdIMeirSWfQwAOdL6/faq+lN79eGQ7TrhHHleWzfLsSiPk9HQjuinWGEGFTl7omeGgP uP1Q3kJK9+WKD2P8ZJO42x7q1sTrl8cTCGqtojs5XAcPmB61UnXPXu3Vm3lTC9PVH+l7 laEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=oiQ7kqQcZglR2eF387n2myjsQOhqcKBThxzbTBU0Vwo=; b=lja4Hje3i5nPHmcsegKoS78OWmu7sDJMmKKnUgMuv1m4s3f/0XAveHb1P5bxdvRAGf 9xpG6eryDidxPmKQgobJYqUpvB4RXAgG0sDiPch069E3sqgZVngie5f98reAk7NcdEC7 fhw9SBenqtaHpe31060RnJYeSSL9NdqdkGnbmBxj9HUPqkzoFJin3A+E/8owVVi46VW4 9cezYIWv2T2MDsz+5UXaMFs2q/0HwBuzb61pWuvKiGij93k2mEi1cGSggkUqpaUTMfoV 3GxbEfc2xezp1l60CnRu+lqNV5TgzS4UTaLlcYDliWmjI8hdvBVxtD9C2k1rQEz+3Hk/ cm0A== X-Gm-Message-State: ANoB5plTrwIyS7W5OlJR8wIwJjNcBZzGKL39DfgauotHAEs75UECkwZd IfzrMU0Cj6t+c23mcs4nElhOE3UIinr8znFT X-Google-Smtp-Source: AA0mqf6C3vwLGvv0rT1SmMUt8qZWpyuIyfpPwtj+E1kCJ4e7yyNBSFob2n9EIh/56r/hWaayzIgqiw== X-Received: by 2002:a17:90b:2642:b0:219:55d5:f30a with SMTP id pa2-20020a17090b264200b0021955d5f30amr32929451pjb.23.1670265163311; Mon, 05 Dec 2022 10:32:43 -0800 (PST) Received: from lvondent-mobl4.. (c-71-56-157-77.hsd1.or.comcast.net. [71.56.157.77]) by smtp.gmail.com with ESMTPSA id l124-20020a622582000000b00573eb4a9a66sm10204079pfl.2.2022.12.05.10.32.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Dec 2022 10:32:42 -0800 (PST) From: Luiz Augusto von Dentz To: linux-bluetooth@vger.kernel.org Subject: [PATCH v2 1/3] Bluetooth: btusb: Fix new sparce warnings Date: Mon, 5 Dec 2022 10:32:34 -0800 Message-Id: <20221205183236.3460924-1-luiz.dentz@gmail.com> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Luiz Augusto von Dentz This fix the following warnings detect with make W=1 C=1: drivers/bluetooth/btusb.c:2212:9: warning: cast to restricted __le16 drivers/bluetooth/btusb.c:2212:9: warning: cast to restricted __le16 drivers/bluetooth/btusb.c:2245:18: warning: cast to restricted __le16 drivers/bluetooth/btusb.c:2249:18: warning: cast to restricted __le16 drivers/bluetooth/btusb.c:2253:18: warning: cast to restricted __le16 drivers/bluetooth/btusb.c:2257:18: warning: cast to restricted __le16 drivers/bluetooth/btusb.c:2261:18: warning: cast to restricted __le16 drivers/bluetooth/btusb.c:2267:18: warning: cast to restricted __le16 Signed-off-by: Luiz Augusto von Dentz --- drivers/bluetooth/btusb.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index d57571cc82d4..422c878a9500 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -2201,18 +2201,19 @@ static int btusb_setup_csr(struct hci_dev *hdev) return err; } - if (skb->len != sizeof(struct hci_rp_read_local_version)) { + rp = skb_pull_data(skb, sizeof(*rp)); + if (!rp) { bt_dev_err(hdev, "CSR: Local version length mismatch"); kfree_skb(skb); return -EIO; } - rp = (struct hci_rp_read_local_version *)skb->data; + bt_dev_info(hdev, "CSR: Setting up dongle with HCI ver=%u rev=%04x", + rp->hci_ver, le16_to_cpu(rp->hci_rev)); - bt_dev_info(hdev, "CSR: Setting up dongle with HCI ver=%u rev=%04x; LMP ver=%u subver=%04x; manufacturer=%u", - le16_to_cpu(rp->hci_ver), le16_to_cpu(rp->hci_rev), - le16_to_cpu(rp->lmp_ver), le16_to_cpu(rp->lmp_subver), - le16_to_cpu(rp->manufacturer)); + bt_dev_info(hdev, "LMP ver=%u subver=%04x; manufacturer=%u", + rp->lmp_ver, le16_to_cpu(rp->lmp_subver), + le16_to_cpu(rp->manufacturer)); /* Detect a wide host of Chinese controllers that aren't CSR. * @@ -2242,29 +2243,29 @@ static int btusb_setup_csr(struct hci_dev *hdev) * third-party BT 4.0 dongle reuses it. */ else if (le16_to_cpu(rp->lmp_subver) <= 0x034e && - le16_to_cpu(rp->hci_ver) > BLUETOOTH_VER_1_1) + rp->hci_ver > BLUETOOTH_VER_1_1) is_fake = true; else if (le16_to_cpu(rp->lmp_subver) <= 0x0529 && - le16_to_cpu(rp->hci_ver) > BLUETOOTH_VER_1_2) + rp->hci_ver > BLUETOOTH_VER_1_2) is_fake = true; else if (le16_to_cpu(rp->lmp_subver) <= 0x0c5c && - le16_to_cpu(rp->hci_ver) > BLUETOOTH_VER_2_0) + rp->hci_ver > BLUETOOTH_VER_2_0) is_fake = true; else if (le16_to_cpu(rp->lmp_subver) <= 0x1899 && - le16_to_cpu(rp->hci_ver) > BLUETOOTH_VER_2_1) + rp->hci_ver > BLUETOOTH_VER_2_1) is_fake = true; else if (le16_to_cpu(rp->lmp_subver) <= 0x22bb && - le16_to_cpu(rp->hci_ver) > BLUETOOTH_VER_4_0) + rp->hci_ver > BLUETOOTH_VER_4_0) is_fake = true; /* Other clones which beat all the above checks */ else if (bcdDevice == 0x0134 && le16_to_cpu(rp->lmp_subver) == 0x0c5c && - le16_to_cpu(rp->hci_ver) == BLUETOOTH_VER_2_0) + rp->hci_ver == BLUETOOTH_VER_2_0) is_fake = true; if (is_fake) { From patchwork Mon Dec 5 18:32:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Augusto von Dentz X-Patchwork-Id: 631992 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7F12CC47089 for ; Mon, 5 Dec 2022 18:39:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233371AbiLESj2 (ORCPT ); Mon, 5 Dec 2022 13:39:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57776 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232897AbiLESjH (ORCPT ); Mon, 5 Dec 2022 13:39:07 -0500 Received: from mail-pf1-x42f.google.com (mail-pf1-x42f.google.com [IPv6:2607:f8b0:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D205CE0A6 for ; Mon, 5 Dec 2022 10:32:45 -0800 (PST) Received: by mail-pf1-x42f.google.com with SMTP id c7so8851411pfc.12 for ; Mon, 05 Dec 2022 10:32:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=yi+4zIj3+VIBsmpXYs+CMKx8m73VsncAsRBrZMj0AZw=; b=AeRdQ0Qkmnqu/bGHtRAK+wq3htiH9WZqg1Q32ZA3pzLZpxz2CAuOlcLJbmn1+8zfgM cyfsjbIAqlFMtl9VPkvHRRARPAe7HASPWlZscQd2LdBlFCKXl1fii5RmwYNME6S6bpEG 9pINWqhhkRC6IlKhCqqfhEU47ow/EABUg0SCUb+HqtKg+F1N7aO0E7IuQrgQ6zeT1jZQ xwozGbCM5rIKbNgPsfHj5Lp7PKZ1cFDgdpLBAOYS+kNo3x9xrAzYKy4KhMZz9jn1xOOH 1ytsR6hGaqTOs7hJPSuIQ641dBFyW18J9aX9jYRdddk0jrX0llwIO9a3FgOCNW+fHsAl 0imA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yi+4zIj3+VIBsmpXYs+CMKx8m73VsncAsRBrZMj0AZw=; b=G549f/Ubr/lY1fLbGoisY9Hssq0GdDudRwfPi2TUT3623npNBRU6FWwSOAWsHXy9FE W7qbhDgKIvKleH7j+/u6pdR1i9NSBrgkaU89rN6UINGh5XFmhphjHHKL9XL1w0Hh0IAY ymPz9wUcStUfGrn53gx0VVs0I2OajLMGDNf3CBqdBs7lYXppi/M6sAEqO5xPjfBGEmVy oKj+Wsj6uhAvJ+kQcaqaIEGSj0uUquwGfu3Opv/6s6RAr4jZ0hMt4UYHpekDdJ9dh5eD 1QVdNMbQOLxuSF3v3wtiK+0TUREEkkV4lacTOUfX5nXE+xUXvD/1hAFSEctAxzKWanLU 6r/Q== X-Gm-Message-State: ANoB5pklSM/HsBXCywD+P0wXuXyZzrHN8tyPGoqyuVHbV0O9kwp/YRQW ECXgWJRrovO55OmG1p4/13okmMn8+B0kV2VN X-Google-Smtp-Source: AA0mqf7K6xZWBUu/vinYKD5vupmxXLJqNz5vAXk1jTdB15iYzVqMzw2A5dU9bh3GaJFWkEYNAzgK4g== X-Received: by 2002:a62:d10b:0:b0:575:ad52:ba94 with SMTP id z11-20020a62d10b000000b00575ad52ba94mr30157318pfg.74.1670265164805; Mon, 05 Dec 2022 10:32:44 -0800 (PST) Received: from lvondent-mobl4.. (c-71-56-157-77.hsd1.or.comcast.net. [71.56.157.77]) by smtp.gmail.com with ESMTPSA id l124-20020a622582000000b00573eb4a9a66sm10204079pfl.2.2022.12.05.10.32.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Dec 2022 10:32:44 -0800 (PST) From: Luiz Augusto von Dentz To: linux-bluetooth@vger.kernel.org Subject: [PATCH v2 2/3] Bluetooth: btusb: Fix existing sparce warning Date: Mon, 5 Dec 2022 10:32:35 -0800 Message-Id: <20221205183236.3460924-2-luiz.dentz@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221205183236.3460924-1-luiz.dentz@gmail.com> References: <20221205183236.3460924-1-luiz.dentz@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Luiz Augusto von Dentz This fix the following warnings detect with make W=1 C=1: drivers/bluetooth/btusb.c:3426:28: warning: cast to restricted __le32 Signed-off-by: Luiz Augusto von Dentz --- drivers/bluetooth/btusb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 422c878a9500..16e043166055 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -3423,7 +3423,7 @@ static int btusb_setup_qca_load_rampatch(struct hci_dev *hdev, if (ver_rom & ~0xffffU) { rver_rom_high = le16_to_cpu(rver->rom_version_high); - rver_rom = le32_to_cpu(rver_rom_high << 16 | rver_rom_low); + rver_rom = rver_rom_high << 16 | rver_rom_low; } else { rver_rom = rver_rom_low; } From patchwork Mon Dec 5 18:32:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Augusto von Dentz X-Patchwork-Id: 631118 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AE042C4332F for ; Mon, 5 Dec 2022 18:39:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231555AbiLESj3 (ORCPT ); Mon, 5 Dec 2022 13:39:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57732 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232965AbiLESjI (ORCPT ); Mon, 5 Dec 2022 13:39:08 -0500 Received: from mail-pf1-x436.google.com (mail-pf1-x436.google.com [IPv6:2607:f8b0:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 00A3BE0AF for ; Mon, 5 Dec 2022 10:32:46 -0800 (PST) Received: by mail-pf1-x436.google.com with SMTP id 140so12232572pfz.6 for ; Mon, 05 Dec 2022 10:32:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=MbCff7rUx9TJgmqCOLIH71AfBuR9ItgTDRsc79Fw93U=; b=BiQa8t0/mZMe57eR0Dv0HcEbi8hDPVjoNBVEXxeERc4pgLhFp39SIXMKfcqQGVqDLK blGdnk6aKFpNsFG/i3tNyWHksrg5pwY/pAiJOoZE99oHB/xVvodGXQTm6pjSIWWsCs4P s/qYbttkbaBPkNlnwa6fl/8x8zoBSNlagxsq1xfZM9tfAqZzaMd19SCIiDwpGwWYaLpu 5Y0u+QedgHTTWTjRRuWyKMaB03VMtH7pBYlAnziXvYRl4t4sHLSfRqLe5Dei/FZYzAyM sZ6q2/UY9cdSPP+Tig3vxC4UMRVe3zdf56Aiqg3l17bRDwhp55wwl3wnNe/8S0BguOZ0 vucA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MbCff7rUx9TJgmqCOLIH71AfBuR9ItgTDRsc79Fw93U=; b=YVSL10H+gW4jsIjWUEJjy2kIdknR15WpLWSBgiW2r34BEos4qZfQj081UYStBthdgj 80uoNtncyn+GqFZDj877+QcqQPC9Gw4475wuXQB5yn+yVpkyLcQBPmqRp7L+gj5tZdy5 PC4MFZKT0BPNUXAsLodRz/DcQVpzLfAmu+GWngMQNNpfe33HQe6ReMyrvuFTExGtCZuI cUazAjdkRvI1sx1+9lQ2q7r/fy9+1GVvkmWEN+CUsfee+KwcwSNhJSnhTGHDqjK+rcu8 z6k7QP6pDfJrRupguNgygXFjU2VHxg6ezSict/jsCUMMKyz3V8/vWMtg3rdhdVeT4XIy tlVg== X-Gm-Message-State: ANoB5plqJYBuKzXbfvCO7YIvRa05cg/4KRE/rCOxXRwKoJIHbrOa8YBX MFdYbuPcIFk7AYdUqeZ2I2z1ljg3ZJqmrhOE X-Google-Smtp-Source: AA0mqf7onyUsFGOuzWgTrphrPmjueG6jaROggmr0U6rJVvnnWCbCUwQqNj7I8orS6wZKkwBWdxmDsw== X-Received: by 2002:a05:6a00:2183:b0:574:2104:5657 with SMTP id h3-20020a056a00218300b0057421045657mr63689363pfi.58.1670265165996; Mon, 05 Dec 2022 10:32:45 -0800 (PST) Received: from lvondent-mobl4.. (c-71-56-157-77.hsd1.or.comcast.net. [71.56.157.77]) by smtp.gmail.com with ESMTPSA id l124-20020a622582000000b00573eb4a9a66sm10204079pfl.2.2022.12.05.10.32.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Dec 2022 10:32:45 -0800 (PST) From: Luiz Augusto von Dentz To: linux-bluetooth@vger.kernel.org Subject: [PATCH v2 3/3] Bluetooth: btintel: Fix existing sparce warnings Date: Mon, 5 Dec 2022 10:32:36 -0800 Message-Id: <20221205183236.3460924-3-luiz.dentz@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221205183236.3460924-1-luiz.dentz@gmail.com> References: <20221205183236.3460924-1-luiz.dentz@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Luiz Augusto von Dentz This fix the following warnings detect with make W=1 C=1: drivers/bluetooth/btintel.c:1041:38: warning: cast to restricted __le32 drivers/bluetooth/btintel.c:1786:25: warning: cast to restricted __le16 drivers/bluetooth/btintel.c:1795:25: warning: cast to restricted __le16 drivers/bluetooth/btintel.c:1796:25: warning: cast to restricted __le16 drivers/bluetooth/btintel.c:1797:25: warning: cast to restricted __le16 Signed-off-by: Luiz Augusto von Dentz --- drivers/bluetooth/btintel.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c index a657e9a3e96a..7e9a0e52949f 100644 --- a/drivers/bluetooth/btintel.c +++ b/drivers/bluetooth/btintel.c @@ -26,7 +26,7 @@ #define CMD_WRITE_BOOT_PARAMS 0xfc0e struct cmd_write_boot_params { - u32 boot_addr; + __le32 boot_addr; u8 fw_build_num; u8 fw_build_ww; u8 fw_build_yy; @@ -1783,19 +1783,19 @@ static int btintel_get_fw_name(struct intel_version *ver, case 0x0b: /* SfP */ case 0x0c: /* WsP */ snprintf(fw_name, len, "intel/ibt-%u-%u.%s", - le16_to_cpu(ver->hw_variant), - le16_to_cpu(params->dev_revid), - suffix); + ver->hw_variant, + le16_to_cpu(params->dev_revid), + suffix); break; case 0x11: /* JfP */ case 0x12: /* ThP */ case 0x13: /* HrP */ case 0x14: /* CcP */ snprintf(fw_name, len, "intel/ibt-%u-%u-%u.%s", - le16_to_cpu(ver->hw_variant), - le16_to_cpu(ver->hw_revision), - le16_to_cpu(ver->fw_revision), - suffix); + ver->hw_variant, + ver->hw_revision, + ver->fw_revision, + suffix); break; default: return -EINVAL;