From patchwork Tue Feb 15 13:35:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Hwang X-Patchwork-Id: 12747093 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 DD1BCC433F5 for ; Tue, 15 Feb 2022 13:35:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238313AbiBONfz (ORCPT ); Tue, 15 Feb 2022 08:35:55 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:60420 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238292AbiBONfy (ORCPT ); Tue, 15 Feb 2022 08:35:54 -0500 Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [IPv6:2607:f8b0:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E7F7D106CAB for ; Tue, 15 Feb 2022 05:35:43 -0800 (PST) Received: by mail-pl1-x62e.google.com with SMTP id 10so13124469plj.1 for ; Tue, 15 Feb 2022 05:35:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=9MJIzY5l7AT5NNwAXwNp2tquSh+F6n6ZwluW0+d3AvQ=; b=DUpKlw9ezpaH8Ed7r9qGeoputCJwcaTlkhryolXoD7D+siGXKxvHeEWw0PAYZzWh0y 5Rfe3jDdPOZnw91RbmaZEansH1K9OnKbcxqXLz83PJNp1K7hVR8F9o9tROX77C7tEMHP bOeSnLtyJcCb05PFgvj9+hIDe71aLOyqrWIOI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=9MJIzY5l7AT5NNwAXwNp2tquSh+F6n6ZwluW0+d3AvQ=; b=tH0T3lR9sE0CX7H0YvmiWRdiH2Lx04E12SWWZwMCqAMjUU/L2kW58UW0DcV1/zbmz2 bf1HC+YdSG32wRbj9n6xDWw7bnRtzfKVQOAoLrlZk68jpIX0BZEglcFqJzM6B3YyE20/ 9alI7WdDHLQ8KF/GNV3RUOdxx90SRps8cxDv+RlKn892CUl+VfwYdm/SH23oo256+ro2 F80jN3CJQBxV0kunW/roiu8si/3yK3tZModsFXYES1796Um5dQ/UPenKUI4gDXfAmQK7 4ySFWSzKHSlvNboqJ8XGtlneDqzgTNOuotzItlBHUzVjhBGwjrjpNw10ldJfyij7TG93 /H0Q== X-Gm-Message-State: AOAM533qHWp16wCJCrUVJEhJKoZsSDzkb5z+yDhNreQuOTceOojdhPpk LH6v7wpjKyl/8nhIvbw5LcUXe5Kc6hodQA== X-Google-Smtp-Source: ABdhPJzLS+VzHoIIOEKh2Vf9YgDphhOo1OWRvxuyjr8KoVC2aV+vbtGwQQW9p61s5++uSK/btQr2AA== X-Received: by 2002:a17:90b:4d82:: with SMTP id oj2mr4369265pjb.133.1644932142968; Tue, 15 Feb 2022 05:35:42 -0800 (PST) Received: from localhost (208.158.221.35.bc.googleusercontent.com. [35.221.158.208]) by smtp.gmail.com with UTF8SMTPSA id m20sm41392961pfk.215.2022.02.15.05.35.39 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 15 Feb 2022 05:35:42 -0800 (PST) From: Joseph Hwang To: linux-bluetooth@vger.kernel.org, marcel@holtmann.org, luiz.dentz@gmail.com, pali@kernel.org Cc: chromeos-bluetooth-upstreaming@chromium.org, josephsih@google.com, Joseph Hwang , Archie Pusaka , "David S. Miller" , Jakub Kicinski , Johan Hedberg , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v4 1/3] Bluetooth: aosp: surface AOSP quality report through mgmt Date: Tue, 15 Feb 2022 21:35:30 +0800 Message-Id: <20220215213519.v4.1.I2015b42d2d0a502334c9c3a2983438b89716d4f0@changeid> X-Mailer: git-send-email 2.35.1.265.g69c8d7142f-goog MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org When receiving a HCI vendor event, the kernel checks if it is an AOSP bluetooth quality report. If yes, the event is sent to bluez user space through the mgmt socket. Signed-off-by: Joseph Hwang Reviewed-by: Archie Pusaka Reported-by: kernel test robot --- (no changes since v3) Changes in v3: - Rebase to resolve the code conflict. - Move aosp_quality_report_evt() from hci_event.c to aosp.c. - A new patch (3/3) is added to enable the quality report feature. Changes in v2: - Scrap the two structures defined in aosp.c and use constants for size check. - Do a basic size check about the quality report event. Do not pull data from the event in which the kernel has no interest. - Define vendor event prefixes with which vendor events of distinct vendor specifications can be clearly differentiated. - Use mgmt helpers to add the header and data to a mgmt skb. include/net/bluetooth/hci_core.h | 5 ++ include/net/bluetooth/mgmt.h | 7 +++ net/bluetooth/aosp.c | 27 ++++++++++ net/bluetooth/aosp.h | 13 +++++ net/bluetooth/hci_event.c | 84 +++++++++++++++++++++++++++++++- net/bluetooth/mgmt.c | 20 ++++++++ net/bluetooth/msft.c | 14 ++++++ net/bluetooth/msft.h | 12 +++++ 8 files changed, 181 insertions(+), 1 deletion(-) diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index f5caff1ddb29..ea83619ac4de 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h @@ -1864,6 +1864,8 @@ int mgmt_add_adv_patterns_monitor_complete(struct hci_dev *hdev, u8 status); int mgmt_remove_adv_monitor_complete(struct hci_dev *hdev, u8 status); void mgmt_adv_monitor_device_lost(struct hci_dev *hdev, u16 handle, bdaddr_t *bdaddr, u8 addr_type); +int mgmt_quality_report(struct hci_dev *hdev, void *data, u32 data_len, + u8 quality_spec); u8 hci_le_conn_update(struct hci_conn *conn, u16 min, u16 max, u16 latency, u16 to_multiplier); @@ -1882,4 +1884,7 @@ void hci_copy_identity_address(struct hci_dev *hdev, bdaddr_t *bdaddr, #define TRANSPORT_TYPE_MAX 0x04 +#define QUALITY_SPEC_AOSP_BQR 0x0 +#define QUALITY_SPEC_INTEL_TELEMETRY 0x1 + #endif /* __HCI_CORE_H */ diff --git a/include/net/bluetooth/mgmt.h b/include/net/bluetooth/mgmt.h index 3d26e6a3478b..83b602636262 100644 --- a/include/net/bluetooth/mgmt.h +++ b/include/net/bluetooth/mgmt.h @@ -1120,3 +1120,10 @@ struct mgmt_ev_adv_monitor_device_lost { __le16 monitor_handle; struct mgmt_addr_info addr; } __packed; + +#define MGMT_EV_QUALITY_REPORT 0x0031 +struct mgmt_ev_quality_report { + __u8 quality_spec; + __u32 data_len; + __u8 data[]; +} __packed; diff --git a/net/bluetooth/aosp.c b/net/bluetooth/aosp.c index 432ae3aac9e3..4a336433180d 100644 --- a/net/bluetooth/aosp.c +++ b/net/bluetooth/aosp.c @@ -199,3 +199,30 @@ int aosp_set_quality_report(struct hci_dev *hdev, bool enable) else return disable_quality_report(hdev); } + +#define BLUETOOTH_QUALITY_REPORT_EV 0x58 + +/* The following LEN = 1-byte Sub-event code + 48-byte Sub-event Parameters */ +#define BLUETOOTH_QUALITY_REPORT_LEN 49 + +bool aosp_check_quality_report_len(struct sk_buff *skb) +{ + /* skb->len is allowed to be larger than BLUETOOTH_QUALITY_REPORT_LEN + * to accommodate an additional Vendor Specific Parameter (vsp) field. + */ + if (skb->len < BLUETOOTH_QUALITY_REPORT_LEN) { + BT_ERR("AOSP evt data len %d too short (%u expected)", + skb->len, BLUETOOTH_QUALITY_REPORT_LEN); + return false; + } + + return true; +} + +void aosp_quality_report_evt(struct hci_dev *hdev, void *data, + struct sk_buff *skb) +{ + if (aosp_has_quality_report(hdev) && aosp_check_quality_report_len(skb)) + mgmt_quality_report(hdev, skb->data, skb->len, + QUALITY_SPEC_AOSP_BQR); +} diff --git a/net/bluetooth/aosp.h b/net/bluetooth/aosp.h index 2fd8886d51b2..b21751e012de 100644 --- a/net/bluetooth/aosp.h +++ b/net/bluetooth/aosp.h @@ -10,6 +10,9 @@ void aosp_do_close(struct hci_dev *hdev); bool aosp_has_quality_report(struct hci_dev *hdev); int aosp_set_quality_report(struct hci_dev *hdev, bool enable); +bool aosp_check_quality_report_len(struct sk_buff *skb); +void aosp_quality_report_evt(struct hci_dev *hdev, void *data, + struct sk_buff *skb); #else @@ -26,4 +29,14 @@ static inline int aosp_set_quality_report(struct hci_dev *hdev, bool enable) return -EOPNOTSUPP; } +static inline bool aosp_check_quality_report_len(struct sk_buff *skb) +{ + return false; +} + +static inline void aosp_quality_report_evt(struct hci_dev *hdev, void *data, + struct sk_buff *skb) +{ +} + #endif diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 63b925921c87..6468ea0f71bd 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -37,6 +37,7 @@ #include "smp.h" #include "msft.h" #include "eir.h" +#include "aosp.h" #define ZERO_KEY "\x00\x00\x00\x00\x00\x00\x00\x00" \ "\x00\x00\x00\x00\x00\x00\x00\x00" @@ -4241,6 +4242,87 @@ static void hci_num_comp_blocks_evt(struct hci_dev *hdev, void *data, queue_work(hdev->workqueue, &hdev->tx_work); } +/* Define the fixed vendor event prefixes below. + * Note: AOSP HCI Requirements use 0x54 and up as sub-event codes without + * actually defining a vendor prefix. Refer to + * https://source.android.com/devices/bluetooth/hci_requirements + * Hence, the other vendor event prefixes should not use the same + * space to avoid collision. + */ +static unsigned char AOSP_BQR_PREFIX[] = { 0x58 }; + +/* Some vendor prefixes are fixed values and lengths. */ +#define FIXED_EVT_PREFIX(_prefix, _vendor_func) \ +{ \ + .prefix = _prefix, \ + .prefix_len = sizeof(_prefix), \ + .vendor_func = _vendor_func, \ + .get_prefix = NULL, \ + .get_prefix_len = NULL, \ +} + +/* Some vendor prefixes are only available at run time. The + * values and lengths are variable. + */ +#define DYNAMIC_EVT_PREFIX(_prefix_func, _prefix_len_func, _vendor_func)\ +{ \ + .prefix = NULL, \ + .prefix_len = 0, \ + .vendor_func = _vendor_func, \ + .get_prefix = _prefix_func, \ + .get_prefix_len = _prefix_len_func, \ +} + +/* Every distinct vendor specification must have a well-defined vendor + * event prefix to determine if a vendor event meets the specification. + * If an event prefix is fixed, it should be delcared with FIXED_EVT_PREFIX. + * Otherwise, DYNAMIC_EVT_PREFIX should be used for variable prefixes. + */ +struct vendor_event_prefix { + __u8 *prefix; + __u8 prefix_len; + void (*vendor_func)(struct hci_dev *hdev, void *data, + struct sk_buff *skb); + __u8 *(*get_prefix)(struct hci_dev *hdev); + __u8 (*get_prefix_len)(struct hci_dev *hdev); +} evt_prefixes[] = { + FIXED_EVT_PREFIX(AOSP_BQR_PREFIX, aosp_quality_report_evt), + DYNAMIC_EVT_PREFIX(get_msft_evt_prefix, get_msft_evt_prefix_len, + msft_vendor_evt), + + /* end with a null entry */ + {}, +}; + +static void hci_vendor_evt(struct hci_dev *hdev, void *data, + struct sk_buff *skb) +{ + int i; + __u8 *prefix; + __u8 prefix_len; + + for (i = 0; evt_prefixes[i].vendor_func; i++) { + if (evt_prefixes[i].get_prefix) + prefix = evt_prefixes[i].get_prefix(hdev); + else + prefix = evt_prefixes[i].prefix; + + if (evt_prefixes[i].get_prefix_len) + prefix_len = evt_prefixes[i].get_prefix_len(hdev); + else + prefix_len = evt_prefixes[i].prefix_len; + + if (!prefix || prefix_len == 0) + continue; + + /* Compare the raw prefix data directly. */ + if (!memcmp(prefix, skb->data, prefix_len)) { + evt_prefixes[i].vendor_func(hdev, data, skb); + break; + } + } +} + static void hci_mode_change_evt(struct hci_dev *hdev, void *data, struct sk_buff *skb) { @@ -6844,7 +6926,7 @@ static const struct hci_ev { HCI_EV(HCI_EV_NUM_COMP_BLOCKS, hci_num_comp_blocks_evt, sizeof(struct hci_ev_num_comp_blocks)), /* [0xff = HCI_EV_VENDOR] */ - HCI_EV_VL(HCI_EV_VENDOR, msft_vendor_evt, 0, HCI_MAX_EVENT_SIZE), + HCI_EV_VL(HCI_EV_VENDOR, hci_vendor_evt, 0, HCI_MAX_EVENT_SIZE), }; static void hci_event_func(struct hci_dev *hdev, u8 event, struct sk_buff *skb, diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index 914e2f2d3586..5e48576041fb 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c @@ -4389,6 +4389,26 @@ static int set_exp_feature(struct sock *sk, struct hci_dev *hdev, MGMT_STATUS_NOT_SUPPORTED); } +int mgmt_quality_report(struct hci_dev *hdev, void *data, u32 data_len, + u8 quality_spec) +{ + struct mgmt_ev_quality_report *ev; + struct sk_buff *skb; + + skb = mgmt_alloc_skb(hdev, MGMT_EV_QUALITY_REPORT, + sizeof(*ev) + data_len); + if (!skb) + return -ENOMEM; + + ev = skb_put(skb, sizeof(*ev)); + ev->quality_spec = quality_spec; + ev->data_len = data_len; + skb_put_data(skb, data, data_len); + + return mgmt_event_skb(skb, NULL); +} +EXPORT_SYMBOL(mgmt_quality_report); + static int get_device_flags(struct sock *sk, struct hci_dev *hdev, void *data, u16 data_len) { diff --git a/net/bluetooth/msft.c b/net/bluetooth/msft.c index 9a3d77d3ca86..3edf64baf479 100644 --- a/net/bluetooth/msft.c +++ b/net/bluetooth/msft.c @@ -731,6 +731,20 @@ static void msft_monitor_device_evt(struct hci_dev *hdev, struct sk_buff *skb) handle_data->mgmt_handle); } +__u8 *get_msft_evt_prefix(struct hci_dev *hdev) +{ + struct msft_data *msft = hdev->msft_data; + + return msft->evt_prefix; +} + +__u8 get_msft_evt_prefix_len(struct hci_dev *hdev) +{ + struct msft_data *msft = hdev->msft_data; + + return msft->evt_prefix_len; +} + void msft_vendor_evt(struct hci_dev *hdev, void *data, struct sk_buff *skb) { struct msft_data *msft = hdev->msft_data; diff --git a/net/bluetooth/msft.h b/net/bluetooth/msft.h index afcaf7d3b1cb..a354ebf61fed 100644 --- a/net/bluetooth/msft.h +++ b/net/bluetooth/msft.h @@ -27,6 +27,8 @@ int msft_set_filter_enable(struct hci_dev *hdev, bool enable); int msft_suspend_sync(struct hci_dev *hdev); int msft_resume_sync(struct hci_dev *hdev); bool msft_curve_validity(struct hci_dev *hdev); +__u8 *get_msft_evt_prefix(struct hci_dev *hdev); +__u8 get_msft_evt_prefix_len(struct hci_dev *hdev); #else @@ -77,4 +79,14 @@ static inline bool msft_curve_validity(struct hci_dev *hdev) return false; } +static inline __u8 *get_msft_evt_prefix(struct hci_dev *hdev) +{ + return NULL; +} + +static inline __u8 get_msft_evt_prefix_len(struct hci_dev *hdev) +{ + return 0; +} + #endif From patchwork Tue Feb 15 13:35:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Hwang X-Patchwork-Id: 12747094 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 33E12C433EF for ; Tue, 15 Feb 2022 13:35:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238334AbiBONgD (ORCPT ); Tue, 15 Feb 2022 08:36:03 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:60632 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238333AbiBONgC (ORCPT ); Tue, 15 Feb 2022 08:36:02 -0500 Received: from mail-pl1-x636.google.com (mail-pl1-x636.google.com [IPv6:2607:f8b0:4864:20::636]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 51EC1106CB4 for ; Tue, 15 Feb 2022 05:35:47 -0800 (PST) Received: by mail-pl1-x636.google.com with SMTP id l9so11504174plg.0 for ; Tue, 15 Feb 2022 05:35:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5pLk2TtiVET/mS6ZsI1zq61AicplaTsASGX27V0i7pA=; b=TOYkrgg7lJgb5vHU3Se8S54lQ2+4qeDdNQXoguuZRBbzn3aMvIy1paiTDUYrdVDxxM wlc0SSFYU+IUydgX7REd3c01+ESnZSkQGjDdKVtLuaG4Lk27mUyjGmDvMR2kMGawj5cU /BAri+54hTOiuE741J9/AU6AnBTgfYAS+yjRo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5pLk2TtiVET/mS6ZsI1zq61AicplaTsASGX27V0i7pA=; b=x1KY3ezNYnOK8vGYiT8BVCA+c6QY5RRCwlkmS85FImtICMw+s9QUQEPdtSicBYVaiy xOfa73HllGh8VFjoWsnTV8fnBSZEM66u2/t5CRdG1UnznowF4meA65Ab+gr3QaMm4ePP LUvxaBxGSBsn4xYGWOrTW2GZjIcyqvvnhtxz0cYT3do6a/TyMFMuy+ll/2aEIEzu4NL8 ET+7KA0smKCPMB+Xrm/Zvip1udL7P2uML1KvdOzzwS2ThmxgPJaJabYIzRkZR+2mopR7 4wElXyoTjYV6KtRdoXLr3ppOQ4+ip9WA2MaEsmPd/XCI8XcyzyjLyJ4bqg7CwVaAukIm gl8g== X-Gm-Message-State: AOAM531GTOhqteAqh9SAaRj+KBcw5qpOPiGDMWTCcS3nQbwy8hEIpDdf DqI5IMaiDCDoMDs7gLnUm72OxA9HMjfp+g== X-Google-Smtp-Source: ABdhPJw+O2tcswE3MmpizEK6bDamDlQUXC3F7DLbA5QLW/kYiwv8e7r6bdvzVGdm57JBksISAIGlIA== X-Received: by 2002:a17:902:d4d2:: with SMTP id o18mr4380527plg.70.1644932146467; Tue, 15 Feb 2022 05:35:46 -0800 (PST) Received: from localhost (208.158.221.35.bc.googleusercontent.com. [35.221.158.208]) by smtp.gmail.com with UTF8SMTPSA id h5sm41531249pfi.111.2022.02.15.05.35.44 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 15 Feb 2022 05:35:46 -0800 (PST) From: Joseph Hwang To: linux-bluetooth@vger.kernel.org, marcel@holtmann.org, luiz.dentz@gmail.com, pali@kernel.org Cc: chromeos-bluetooth-upstreaming@chromium.org, josephsih@google.com, Joseph Hwang , Archie Pusaka , "David S. Miller" , Jakub Kicinski , Johan Hedberg , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v4 2/3] Bluetooth: btintel: surface Intel telemetry events through mgmt Date: Tue, 15 Feb 2022 21:35:31 +0800 Message-Id: <20220215213519.v4.2.I63681490281b2392aa1ac05dff91a126394ab649@changeid> X-Mailer: git-send-email 2.35.1.265.g69c8d7142f-goog In-Reply-To: <20220215213519.v4.1.I2015b42d2d0a502334c9c3a2983438b89716d4f0@changeid> References: <20220215213519.v4.1.I2015b42d2d0a502334c9c3a2983438b89716d4f0@changeid> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org When receiving a HCI vendor event, the kernel checks if it is an Intel telemetry event. If yes, the event is sent to bluez user space through the mgmt socket. Signed-off-by: Joseph Hwang Reviewed-by: Archie Pusaka --- (no changes since v3) Changes in v3: - Move intel_vendor_evt() from hci_event.c to the btintel driver. Changes in v2: - Drop the pull_quality_report_data function from hci_dev. Do not bother hci_dev with it. Do not bleed the details into the core. drivers/bluetooth/btintel.c | 37 +++++++++++++++++++++++++++++++- drivers/bluetooth/btintel.h | 7 ++++++ include/net/bluetooth/hci_core.h | 2 ++ net/bluetooth/hci_event.c | 12 +++++++++++ 4 files changed, 57 insertions(+), 1 deletion(-) diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c index 06514ed66022..c7732da2752f 100644 --- a/drivers/bluetooth/btintel.c +++ b/drivers/bluetooth/btintel.c @@ -2401,9 +2401,12 @@ static int btintel_setup_combined(struct hci_dev *hdev) set_bit(HCI_QUIRK_SIMULTANEOUS_DISCOVERY, &hdev->quirks); set_bit(HCI_QUIRK_NON_PERSISTENT_DIAG, &hdev->quirks); - /* Set up the quality report callback for Intel devices */ + /* Set up the quality report callbacks for Intel devices */ hdev->set_quality_report = btintel_set_quality_report; + /* Set up the vendor specific callback for Intel devices */ + hdev->vendor_evt = btintel_vendor_evt; + /* For Legacy device, check the HW platform value and size */ if (skb->len == sizeof(ver) && skb->data[1] == 0x37) { bt_dev_dbg(hdev, "Read the legacy Intel version information"); @@ -2650,6 +2653,38 @@ void btintel_secure_send_result(struct hci_dev *hdev, } EXPORT_SYMBOL_GPL(btintel_secure_send_result); +#define INTEL_PREFIX 0x8087 +#define TELEMETRY_CODE 0x03 + +struct intel_prefix_evt_data { + __le16 vendor_prefix; + __u8 code; + __u8 data[]; /* a number of struct intel_tlv subevents */ +} __packed; + +static bool is_quality_report_evt(struct sk_buff *skb) +{ + struct intel_prefix_evt_data *ev; + u16 vendor_prefix; + + if (skb->len < sizeof(struct intel_prefix_evt_data)) + return false; + + ev = (struct intel_prefix_evt_data *)skb->data; + vendor_prefix = __le16_to_cpu(ev->vendor_prefix); + + return vendor_prefix == INTEL_PREFIX && ev->code == TELEMETRY_CODE; +} + +void btintel_vendor_evt(struct hci_dev *hdev, void *data, struct sk_buff *skb) +{ + /* Only interested in the telemetry event for now. */ + if (hdev->set_quality_report && is_quality_report_evt(skb)) + mgmt_quality_report(hdev, skb->data, skb->len, + QUALITY_SPEC_INTEL_TELEMETRY); +} +EXPORT_SYMBOL_GPL(btintel_vendor_evt); + MODULE_AUTHOR("Marcel Holtmann "); MODULE_DESCRIPTION("Bluetooth support for Intel devices ver " VERSION); MODULE_VERSION(VERSION); diff --git a/drivers/bluetooth/btintel.h b/drivers/bluetooth/btintel.h index e0060e58573c..82dc278b09eb 100644 --- a/drivers/bluetooth/btintel.h +++ b/drivers/bluetooth/btintel.h @@ -211,6 +211,7 @@ void btintel_bootup(struct hci_dev *hdev, const void *ptr, unsigned int len); void btintel_secure_send_result(struct hci_dev *hdev, const void *ptr, unsigned int len); int btintel_set_quality_report(struct hci_dev *hdev, bool enable); +void btintel_vendor_evt(struct hci_dev *hdev, void *data, struct sk_buff *skb); #else static inline int btintel_check_bdaddr(struct hci_dev *hdev) @@ -306,4 +307,10 @@ static inline int btintel_set_quality_report(struct hci_dev *hdev, bool enable) { return -ENODEV; } + +static inline void btintel_vendor_evt(struct hci_dev *hdev, void *data, + struct sk_buff *skb) +{ +} + #endif diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index ea83619ac4de..3505ffe20779 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h @@ -635,6 +635,8 @@ struct hci_dev { void (*cmd_timeout)(struct hci_dev *hdev); bool (*wakeup)(struct hci_dev *hdev); int (*set_quality_report)(struct hci_dev *hdev, bool enable); + void (*vendor_evt)(struct hci_dev *hdev, void *data, + struct sk_buff *skb); int (*get_data_path_id)(struct hci_dev *hdev, __u8 *data_path); int (*get_codec_config_data)(struct hci_dev *hdev, __u8 type, struct bt_codec *codec, __u8 *vnd_len, diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 6468ea0f71bd..e34dea0f0c2e 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -4250,6 +4250,7 @@ static void hci_num_comp_blocks_evt(struct hci_dev *hdev, void *data, * space to avoid collision. */ static unsigned char AOSP_BQR_PREFIX[] = { 0x58 }; +static unsigned char INTEL_PREFIX[] = { 0x87, 0x80 }; /* Some vendor prefixes are fixed values and lengths. */ #define FIXED_EVT_PREFIX(_prefix, _vendor_func) \ @@ -4273,6 +4274,16 @@ static unsigned char AOSP_BQR_PREFIX[] = { 0x58 }; .get_prefix_len = _prefix_len_func, \ } +/* Every vendor that handles particular vendor events in its driver should + * 1. set up the vendor_evt callback in its driver and + * 2. add an entry in struct vendor_event_prefix. + */ +static void vendor_evt(struct hci_dev *hdev, void *data, struct sk_buff *skb) +{ + if (hdev->vendor_evt) + hdev->vendor_evt(hdev, data, skb); +} + /* Every distinct vendor specification must have a well-defined vendor * event prefix to determine if a vendor event meets the specification. * If an event prefix is fixed, it should be delcared with FIXED_EVT_PREFIX. @@ -4287,6 +4298,7 @@ struct vendor_event_prefix { __u8 (*get_prefix_len)(struct hci_dev *hdev); } evt_prefixes[] = { FIXED_EVT_PREFIX(AOSP_BQR_PREFIX, aosp_quality_report_evt), + FIXED_EVT_PREFIX(INTEL_PREFIX, vendor_evt), DYNAMIC_EVT_PREFIX(get_msft_evt_prefix, get_msft_evt_prefix_len, msft_vendor_evt), From patchwork Tue Feb 15 13:35:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Hwang X-Patchwork-Id: 12747095 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 5CB23C4332F for ; Tue, 15 Feb 2022 13:35:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238342AbiBONgF (ORCPT ); Tue, 15 Feb 2022 08:36:05 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:60678 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238352AbiBONgD (ORCPT ); Tue, 15 Feb 2022 08:36:03 -0500 Received: from mail-pf1-x430.google.com (mail-pf1-x430.google.com [IPv6:2607:f8b0:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2BF301074D4 for ; Tue, 15 Feb 2022 05:35:51 -0800 (PST) Received: by mail-pf1-x430.google.com with SMTP id u16so868088pfg.12 for ; Tue, 15 Feb 2022 05:35:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=i2L/2d/WummzhFYZmp1J8UiAMxM3AINvBVUjQlggREQ=; b=kj8IUBBuHK/FjcZjTmdoH2RE+Bpk8jfs7BUNHvhM5Wc8eI/UqpyAQH1PGr2NXcmtLM UVrM/XLB+mOD1+baEvaCQayzYlXwGvsWJfwGSpytQ8JghgZRG6Ngdvoi3AJGCe7QDX4y 2xyZOhowzR7AHS0Le8X5T3kClixmf6gVCk/mI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=i2L/2d/WummzhFYZmp1J8UiAMxM3AINvBVUjQlggREQ=; b=LAki2V8PlwYSkBAaWyJbzi92M6f/dvj3Nnmds2IaBLqYHU3V+LlE+44NqqOgbNmHWJ ETryh12sXQCxAJq9PfxFCwjBYwODwaJ9vLmJ91yh4NecJFf41S7AqxtThfns93ZFRzwW IFvVfENUUKAHtPclaBTd1uP5Iy6Zaq79Z7+RQ4MJ/KnQqJtKdCbx2HCzj1nNEtmw43Sl Xs/qpwy3M0W4twsGYLp1j/hcfeZE8TvKbiWcgGV2wNw+QntzZ4CmgqlhrJE39coYtLAI 40oPVPMWcjH/qZAly57T+FQDmKH8D7VaLOngIx6jYWpDkz7gz5VwAPwr+4bDzr/8YUae XtQg== X-Gm-Message-State: AOAM533/ekK2V1b+5GkjKkNjDX8oHa2DMeoD9NHcSrDbLTUKVipS12JU ycqz6ICxVsyfhW5TSVrSEzbhXQrvIHsz9Q== X-Google-Smtp-Source: ABdhPJwEAb4o6qpPYrC7QhCmP4NQ0wbU1OWlS/M7Pmy/QuwmEMkjFtbzCUkKpXLwuQaimIojabiVnQ== X-Received: by 2002:a05:6a00:148b:: with SMTP id v11mr4172298pfu.82.1644932150369; Tue, 15 Feb 2022 05:35:50 -0800 (PST) Received: from localhost (208.158.221.35.bc.googleusercontent.com. [35.221.158.208]) by smtp.gmail.com with UTF8SMTPSA id l2sm17178483pju.52.2022.02.15.05.35.48 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 15 Feb 2022 05:35:49 -0800 (PST) From: Joseph Hwang To: linux-bluetooth@vger.kernel.org, marcel@holtmann.org, luiz.dentz@gmail.com, pali@kernel.org Cc: chromeos-bluetooth-upstreaming@chromium.org, josephsih@google.com, Joseph Hwang , "David S. Miller" , Jakub Kicinski , Johan Hedberg , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v4 3/3] Bluetooth: mgmt: add set_quality_report for MGMT_OP_SET_QUALITY_REPORT Date: Tue, 15 Feb 2022 21:35:32 +0800 Message-Id: <20220215133546.2826837-1-josephsih@chromium.org> X-Mailer: git-send-email 2.35.1.265.g69c8d7142f-goog In-Reply-To: <20220215213519.v4.1.I2015b42d2d0a502334c9c3a2983438b89716d4f0@changeid> References: <20220215213519.v4.1.I2015b42d2d0a502334c9c3a2983438b89716d4f0@changeid> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org This patch adds a new set_quality_report mgmt handler to set the quality report feature. The feature is removed from the experimental features at the same time. Signed-off-by: Joseph Hwang Reported-by: kernel test robot Reported-by: Dan Carpenter --- Changes in v4: - return current settings for set_quality_report. Changes in v3: - This is a new patch to enable the quality report feature. The reading and setting of the quality report feature are removed from the experimental features. include/net/bluetooth/mgmt.h | 7 ++ net/bluetooth/mgmt.c | 168 +++++++++++++++-------------------- 2 files changed, 81 insertions(+), 94 deletions(-) diff --git a/include/net/bluetooth/mgmt.h b/include/net/bluetooth/mgmt.h index 83b602636262..74d253ff617a 100644 --- a/include/net/bluetooth/mgmt.h +++ b/include/net/bluetooth/mgmt.h @@ -109,6 +109,7 @@ struct mgmt_rp_read_index_list { #define MGMT_SETTING_STATIC_ADDRESS 0x00008000 #define MGMT_SETTING_PHY_CONFIGURATION 0x00010000 #define MGMT_SETTING_WIDEBAND_SPEECH 0x00020000 +#define MGMT_SETTING_QUALITY_REPORT 0x00040000 #define MGMT_OP_READ_INFO 0x0004 #define MGMT_READ_INFO_SIZE 0 @@ -838,6 +839,12 @@ struct mgmt_cp_add_adv_patterns_monitor_rssi { } __packed; #define MGMT_ADD_ADV_PATTERNS_MONITOR_RSSI_SIZE 8 +#define MGMT_OP_SET_QUALITY_REPORT 0x0057 +struct mgmt_cp_set_quality_report { + __u8 action; +} __packed; +#define MGMT_SET_QUALITY_REPORT_SIZE 1 + #define MGMT_EV_CMD_COMPLETE 0x0001 struct mgmt_ev_cmd_complete { __le16 opcode; diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index 5e48576041fb..ccd77b94905b 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c @@ -857,6 +857,10 @@ static u32 get_supported_settings(struct hci_dev *hdev) settings |= MGMT_SETTING_PHY_CONFIGURATION; + if (hdev && (aosp_has_quality_report(hdev) || + hdev->set_quality_report)) + settings |= MGMT_SETTING_QUALITY_REPORT; + return settings; } @@ -928,6 +932,9 @@ static u32 get_current_settings(struct hci_dev *hdev) if (hci_dev_test_flag(hdev, HCI_WIDEBAND_SPEECH_ENABLED)) settings |= MGMT_SETTING_WIDEBAND_SPEECH; + if (hci_dev_test_flag(hdev, HCI_QUALITY_REPORT)) + settings |= MGMT_SETTING_QUALITY_REPORT; + return settings; } @@ -3871,12 +3878,6 @@ static const u8 debug_uuid[16] = { }; #endif -/* 330859bc-7506-492d-9370-9a6f0614037f */ -static const u8 quality_report_uuid[16] = { - 0x7f, 0x03, 0x14, 0x06, 0x6f, 0x9a, 0x70, 0x93, - 0x2d, 0x49, 0x06, 0x75, 0xbc, 0x59, 0x08, 0x33, -}; - /* a6695ace-ee7f-4fb9-881a-5fac66c629af */ static const u8 offload_codecs_uuid[16] = { 0xaf, 0x29, 0xc6, 0x66, 0xac, 0x5f, 0x1a, 0x88, @@ -3898,7 +3899,7 @@ static const u8 rpa_resolution_uuid[16] = { static int read_exp_features_info(struct sock *sk, struct hci_dev *hdev, void *data, u16 data_len) { - char buf[102]; /* Enough space for 5 features: 2 + 20 * 5 */ + char buf[82]; /* Enough space for 4 features: 2 + 20 * 4 */ struct mgmt_rp_read_exp_features_info *rp = (void *)buf; u16 idx = 0; u32 flags; @@ -3939,18 +3940,6 @@ static int read_exp_features_info(struct sock *sk, struct hci_dev *hdev, idx++; } - if (hdev && (aosp_has_quality_report(hdev) || - hdev->set_quality_report)) { - if (hci_dev_test_flag(hdev, HCI_QUALITY_REPORT)) - flags = BIT(0); - else - flags = 0; - - memcpy(rp->features[idx].uuid, quality_report_uuid, 16); - rp->features[idx].flags = cpu_to_le32(flags); - idx++; - } - if (hdev && hdev->get_data_path_id) { if (hci_dev_test_flag(hdev, HCI_OFFLOAD_CODECS_ENABLED)) flags = BIT(0); @@ -4163,80 +4152,6 @@ static int set_rpa_resolution_func(struct sock *sk, struct hci_dev *hdev, return err; } -static int set_quality_report_func(struct sock *sk, struct hci_dev *hdev, - struct mgmt_cp_set_exp_feature *cp, - u16 data_len) -{ - struct mgmt_rp_set_exp_feature rp; - bool val, changed; - int err; - - /* Command requires to use a valid controller index */ - if (!hdev) - return mgmt_cmd_status(sk, MGMT_INDEX_NONE, - MGMT_OP_SET_EXP_FEATURE, - MGMT_STATUS_INVALID_INDEX); - - /* Parameters are limited to a single octet */ - if (data_len != MGMT_SET_EXP_FEATURE_SIZE + 1) - return mgmt_cmd_status(sk, hdev->id, - MGMT_OP_SET_EXP_FEATURE, - MGMT_STATUS_INVALID_PARAMS); - - /* Only boolean on/off is supported */ - if (cp->param[0] != 0x00 && cp->param[0] != 0x01) - return mgmt_cmd_status(sk, hdev->id, - MGMT_OP_SET_EXP_FEATURE, - MGMT_STATUS_INVALID_PARAMS); - - hci_req_sync_lock(hdev); - - val = !!cp->param[0]; - changed = (val != hci_dev_test_flag(hdev, HCI_QUALITY_REPORT)); - - if (!aosp_has_quality_report(hdev) && !hdev->set_quality_report) { - err = mgmt_cmd_status(sk, hdev->id, - MGMT_OP_SET_EXP_FEATURE, - MGMT_STATUS_NOT_SUPPORTED); - goto unlock_quality_report; - } - - if (changed) { - if (hdev->set_quality_report) - err = hdev->set_quality_report(hdev, val); - else - err = aosp_set_quality_report(hdev, val); - - if (err) { - err = mgmt_cmd_status(sk, hdev->id, - MGMT_OP_SET_EXP_FEATURE, - MGMT_STATUS_FAILED); - goto unlock_quality_report; - } - - if (val) - hci_dev_set_flag(hdev, HCI_QUALITY_REPORT); - else - hci_dev_clear_flag(hdev, HCI_QUALITY_REPORT); - } - - bt_dev_dbg(hdev, "quality report enable %d changed %d", val, changed); - - memcpy(rp.uuid, quality_report_uuid, 16); - rp.flags = cpu_to_le32(val ? BIT(0) : 0); - hci_sock_set_flag(sk, HCI_MGMT_EXP_FEATURE_EVENTS); - - err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_SET_EXP_FEATURE, 0, - &rp, sizeof(rp)); - - if (changed) - exp_feature_changed(hdev, quality_report_uuid, val, sk); - -unlock_quality_report: - hci_req_sync_unlock(hdev); - return err; -} - static int set_offload_codec_func(struct sock *sk, struct hci_dev *hdev, struct mgmt_cp_set_exp_feature *cp, u16 data_len) @@ -4363,7 +4278,6 @@ static const struct mgmt_exp_feature { EXP_FEAT(debug_uuid, set_debug_func), #endif EXP_FEAT(rpa_resolution_uuid, set_rpa_resolution_func), - EXP_FEAT(quality_report_uuid, set_quality_report_func), EXP_FEAT(offload_codecs_uuid, set_offload_codec_func), EXP_FEAT(le_simultaneous_roles_uuid, set_le_simultaneous_roles_func), @@ -8653,6 +8567,71 @@ static int get_adv_size_info(struct sock *sk, struct hci_dev *hdev, MGMT_STATUS_SUCCESS, &rp, sizeof(rp)); } +static int set_quality_report(struct sock *sk, struct hci_dev *hdev, + void *data, u16 data_len) +{ + struct mgmt_cp_set_quality_report *cp = data; + bool enable, changed; + int err; + + /* Command requires to use a valid controller index */ + if (!hdev) + return mgmt_cmd_status(sk, MGMT_INDEX_NONE, + MGMT_OP_SET_QUALITY_REPORT, + MGMT_STATUS_INVALID_INDEX); + + /* Only 0 (off) and 1 (on) is supported */ + if (cp->action != 0x00 && cp->action != 0x01) + return mgmt_cmd_status(sk, hdev->id, + MGMT_OP_SET_QUALITY_REPORT, + MGMT_STATUS_INVALID_PARAMS); + + hci_req_sync_lock(hdev); + + enable = !!cp->action; + changed = (enable != hci_dev_test_flag(hdev, HCI_QUALITY_REPORT)); + + if (!aosp_has_quality_report(hdev) && !hdev->set_quality_report) { + err = mgmt_cmd_status(sk, hdev->id, + MGMT_OP_SET_QUALITY_REPORT, + MGMT_STATUS_NOT_SUPPORTED); + goto unlock_quality_report; + } + + if (changed) { + if (hdev->set_quality_report) + err = hdev->set_quality_report(hdev, enable); + else + err = aosp_set_quality_report(hdev, enable); + + if (err) { + err = mgmt_cmd_status(sk, hdev->id, + MGMT_OP_SET_QUALITY_REPORT, + MGMT_STATUS_FAILED); + goto unlock_quality_report; + } + + if (enable) + hci_dev_set_flag(hdev, HCI_QUALITY_REPORT); + else + hci_dev_clear_flag(hdev, HCI_QUALITY_REPORT); + } + + bt_dev_dbg(hdev, "quality report enable %d changed %d", + enable, changed); + + err = send_settings_rsp(sk, MGMT_OP_SET_QUALITY_REPORT, hdev); + if (err < 0) + goto unlock_quality_report; + + if (changed) + err = new_settings(hdev, sk); + +unlock_quality_report: + hci_req_sync_unlock(hdev); + return err; +} + static const struct hci_mgmt_handler mgmt_handlers[] = { { NULL }, /* 0x0000 (no command) */ { read_version, MGMT_READ_VERSION_SIZE, @@ -8779,6 +8758,7 @@ static const struct hci_mgmt_handler mgmt_handlers[] = { { add_adv_patterns_monitor_rssi, MGMT_ADD_ADV_PATTERNS_MONITOR_RSSI_SIZE, HCI_MGMT_VAR_LEN }, + { set_quality_report, MGMT_SET_QUALITY_REPORT_SIZE }, }; void mgmt_index_added(struct hci_dev *hdev)