From patchwork Wed Feb 8 15:52:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bastian Germann X-Patchwork-Id: 13133181 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 0D9E1C636D7 for ; Wed, 8 Feb 2023 15:52:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231327AbjBHPwj (ORCPT ); Wed, 8 Feb 2023 10:52:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37578 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230295AbjBHPwi (ORCPT ); Wed, 8 Feb 2023 10:52:38 -0500 Received: from stravinsky.debian.org (stravinsky.debian.org [IPv6:2001:41b8:202:deb::311:108]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 58F0C2413E; Wed, 8 Feb 2023 07:52:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debian.org; s=smtpauto.stravinsky; h=X-Debian-User:Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Reply-To: Content-Type:Content-ID:Content-Description; bh=d2aAI7nq5qjPdi4iyodyYV5YWQahnsSAlmEeUrEnhGQ=; b=TcgZUGM/dpDAjJGLu0G1WPlrja u0EnrITUAUh5Q/GUbg1P/N1rhOC1X3DtuqtRsxd2Lo0AdUTERBCmmNGT2wjXItW3TuCzD3UretAhX M/e4Z5j7MQuc1OZ4ORSHVTHbys/W9hAber0GtasmbcIohWVPK2GGYh5F+oMzZ775xQ2Tg4WNjQZab /vjEWXGlJK/tmgOV38ofM79NQd18gwT0ogPtGOfkzcOsCz7nS92RO2nNK2VDqwBlwl3S8ZjZRwq7T BQEa+LgBdt5zSLVbao/9q7KM+dIWpQ2aU8XTBHF9bfW0qA9+ZNqUVCO876repSr1ebM9HgUAF7fe4 gMKfC+Bg==; Received: from authenticated user by stravinsky.debian.org with esmtpsa (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.94.2) (envelope-from ) id 1pPmkD-00DxsN-KC; Wed, 08 Feb 2023 15:52:25 +0000 From: Bastian Germann To: Marcel Holtmann , Luiz Augusto von Dentz Cc: Vasily Khoruzhick , Johan Hedberg , "David S . Miller" , Eric Dumazet , Jakub Kicinski , linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Bastian Germann Subject: [PATCH v4 1/2] Bluetooth: Add new quirk for broken local ext features page 2 Date: Wed, 8 Feb 2023 16:52:18 +0100 Message-Id: <20230208155220.1640-2-bage@debian.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230208155220.1640-1-bage@debian.org> References: <20230208155220.1640-1-bage@debian.org> MIME-Version: 1.0 X-Debian-User: bage Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Vasily Khoruzhick Some adapters (e.g. RTL8723CS) advertise that they have more than 2 pages for local ext features, but they don't support any features declared in these pages. RTL8723CS reports max_page = 2 and declares support for sync train and secure connection, but it responds with either garbage or with error in status on corresponding commands. Signed-off-by: Vasily Khoruzhick Signed-off-by: Bastian Germann --- include/net/bluetooth/hci.h | 7 +++++++ net/bluetooth/hci_event.c | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h index 8d773b042c85..7127313140cf 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h @@ -294,6 +294,13 @@ enum { * during the hdev->setup vendor callback. */ HCI_QUIRK_BROKEN_MWS_TRANSPORT_CONFIG, + + /* When this quirk is set, max_page for local extended features + * is set to 1, even if controller reports higher number. Some + * controllers (e.g. RTL8723CS) report more pages, but they + * don't actually support features declared there. + */ + HCI_QUIRK_BROKEN_LOCAL_EXT_FEATURES_PAGE_2, }; /* HCI device flags */ diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index ad92a4be5851..83ebc8e65b42 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -886,7 +886,9 @@ static u8 hci_cc_read_local_ext_features(struct hci_dev *hdev, void *data, if (rp->status) return rp->status; - if (hdev->max_page < rp->max_page) + if (!test_bit(HCI_QUIRK_BROKEN_LOCAL_EXT_FEATURES_PAGE_2, + &hdev->quirks) && + hdev->max_page < rp->max_page) hdev->max_page = rp->max_page; if (rp->page < HCI_MAX_PAGES)