From patchwork Wed Sep 7 17:09:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Peter X-Patchwork-Id: 12969302 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9B616C54EE9 for ; Wed, 7 Sep 2022 17:12:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ac7SBJ7p0PJzmlYx3hJzAoIZJ/xzOQ6lLsrgNgig3ZI=; b=WIa1ywc2emLi6e PzCR9JY2795IguZQsf35dBjPcSKF57iM3S75V2J7FUAFXqilHdw4TXiVxPZhvGi1UTywR4WUcx+IV Q3TnolEotxqprZJZUBpSrsW+ymv7Hpf1oj1p8udCoTOHn1h41evjC6bu94ly9BOvAe16Q+VqlkX0F IjbjmEMr7cgVdVmYjGXKE/bp7K0EuRj75QKlwGfmVt+hfjcRgMAOHbBU1XzjrWbEDIKmQbRclfwbs 2ZN+XYqqV+sxwHtoYQAuAHnRkawUsibtoIExgnBze2E+dbMduW6vroZgfojFI+Vyg0YHwUF0v/xuS c7GZDW4rabvkWeAWVmuQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oVyZu-0085ns-PY; Wed, 07 Sep 2022 17:11:07 +0000 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oVyYr-0085Cr-QJ for linux-arm-kernel@lists.infradead.org; Wed, 07 Sep 2022 17:10:03 +0000 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id A5FF63200909; Wed, 7 Sep 2022 13:09:59 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Wed, 07 Sep 2022 13:10:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=svenpeter.dev; h=cc:cc:content-transfer-encoding:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm2; t=1662570599; x= 1662656999; bh=O0i+3x8u3vyjUZfSMJXIAqHFz1c12i5gH79nN7Zcbc8=; b=z ybVx4BAdJ1CiIbO9JbPK7nTcCSrz+FxAuxaOl6PeFUYs8GxocM85E1cZq5HSQnyQ 3WijFOFi2N7PyoLMtXxwDq4q76OejAHeR3MZBqHbQHCPu6W7aemzuzRvRcGuMrTj bnJ7DVugNuG+0M77oiu5MU+Y0bymFg5pD+E2ubwurgs7B5DuYSl/4QZpvKJFajHU 7FneHEZZigsCRPt0I5Ylah3Nn5wdPQrbbxc/QTc8rmNlF3P/aE2Mla8I7/UjQnUD KiJueMjclzNC029gp8bqlYBN0IKd0cV7yUvlubkHkdenGEKytq7CrtNnrDyJQfR0 dsXLNj6L+2GSqWhbhsuSQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1662570599; x=1662656999; bh=O0i+3x8u3vyjU ZfSMJXIAqHFz1c12i5gH79nN7Zcbc8=; b=2EXTqnGO4cyuOXRUN4Klywp/BpY4e 9NGYfFtELQic0Ump4xnr0xglB8MgWD5w6KYznhqJOQkfEH7RmhH3NqnmQXBUbSbN 6soZTCSbw9TRTcysu8I7kdioR3hz2CyUm/CgX3+ffsYYYlQGVzHdyePRftK/eOBC iRXD4WYQHvubUIM5MLDwWV5eK3yB6OpyN4BM670emErZ1J3LU720fgjnyr86njr2 T8gIHZX/yATWllibtfioaq84dvhkKCnjuZ7GxsWyMunU3cYP7labafZrCE8gU7vC NhRyVGRzztaiXbNR2GumCYL5pOTCO+FSLUuRSXhTq2N33uNv8ClPxp0xA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrfedttddguddutdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefuvhgv nhcurfgvthgvrhcuoehsvhgvnhesshhvvghnphgvthgvrhdruggvvheqnecuggftrfgrth htvghrnhepjeeiheehkeegvdejhfevkeejgfdutdefhfethedtieffleekieeuudefleek jeegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepsh hvvghnsehsvhgvnhhpvghtvghrrdguvghv X-ME-Proxy: Feedback-ID: i51094778:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 7 Sep 2022 13:09:56 -0400 (EDT) From: Sven Peter To: Marcel Holtmann , Johan Hedberg , Luiz Augusto von Dentz Cc: Sven Peter , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Krzysztof Kozlowski , Paolo Abeni , Rob Herring , Hector Martin , Alyssa Rosenzweig , asahi@lists.linux.dev, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/5] Bluetooth: hci_event: Add quirk to ignore byte in LE Extended Adv Report Date: Wed, 7 Sep 2022 19:09:33 +0200 Message-Id: <20220907170935.11757-4-sven@svenpeter.dev> X-Mailer: git-send-email 2.30.1 (Apple Git-130) In-Reply-To: <20220907170935.11757-1-sven@svenpeter.dev> References: <20220907170935.11757-1-sven@svenpeter.dev> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220907_101001_988379_B6CA8993 X-CRM114-Status: GOOD ( 15.22 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Broadcom controllers present on Apple Silicon devices use the upper 8 bits of the event type in the LE Extended Advertising Report for the channel on which the frame has been received. Add a quirk to drop the upper byte to ensure that the advertising results are parsed correctly. The following excerpt from a btmon trace shows a report received on channel 37 by these controllers: > HCI Event: LE Meta Event (0x3e) plen 55 LE Extended Advertising Report (0x0d) Num reports: 1 Entry 0 Event type: 0x2513 Props: 0x0013 Connectable Scannable Use legacy advertising PDUs Data status: Complete Reserved (0x2500) Legacy PDU Type: Reserved (0x2513) Address type: Public (0x00) Address: XX:XX:XX:XX:XX:XX (Shenzhen Jingxun Software [...]) Primary PHY: LE 1M Secondary PHY: No packets SID: no ADI field (0xff) TX power: 127 dBm RSSI: -76 dBm (0xb4) Periodic advertising interval: 0.00 msec (0x0000) Direct address type: Public (0x00) Direct address: 00:00:00:00:00:00 (OUI 00-00-00) Data length: 0x1d [...] Flags: 0x18 Simultaneous LE and BR/EDR (Controller) Simultaneous LE and BR/EDR (Host) Company: Harman International Industries, Inc. (87) Data: [...] Service Data (UUID 0xfddf): Name (complete): JBL Flip 5 Signed-off-by: Sven Peter --- changes from v1: - adjusted the commit message a bit to make checkpatch happy include/net/bluetooth/hci.h | 11 +++++++++++ net/bluetooth/hci_event.c | 4 ++++ 2 files changed, 15 insertions(+) diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h index cf29511b25a8..62539c1a6bf2 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h @@ -263,6 +263,17 @@ enum { * during the hdev->setup vendor callback. */ HCI_QUIRK_BROKEN_ENHANCED_SETUP_SYNC_CONN, + + /* + * When this quirk is set, the upper 8 bits of the evt_type field of + * the LE Extended Advertising Report events are discarded. + * Some Broadcom controllers found in Apple machines put the channel + * the report was received on into these reserved bits. + * + * This quirk can be set before hci_register_dev is called or + * during the hdev->setup vendor callback. + */ + HCI_QUIRK_FIXUP_LE_EXT_ADV_REPORT_EVT_TYPE, }; /* HCI device flags */ diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 485c814cf44a..b50d05211f0d 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -6471,6 +6471,10 @@ static void hci_le_ext_adv_report_evt(struct hci_dev *hdev, void *data, break; evt_type = __le16_to_cpu(info->type); + if (test_bit(HCI_QUIRK_FIXUP_LE_EXT_ADV_REPORT_EVT_TYPE, + &hdev->quirks)) + evt_type &= 0xff; + legacy_evt_type = ext_evt_type_to_legacy(hdev, evt_type); if (legacy_evt_type != LE_ADV_INVALID) { process_adv_report(hdev, legacy_evt_type, &info->bdaddr,