| Message ID | 20210926150657.v4.1.Iaa4a0269e51d8e8d8784a6ac8e05899b49a1377d@changeid (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v4,1/4] Bluetooth: aosp: Support AOSP Bluetooth Quality Report | expand |
| Context | Check | Description |
|---|---|---|
| tedd_an/checkpatch | success | Checkpatch PASS |
| tedd_an/gitlint | success | Gitlint PASS |
| tedd_an/buildkernel | success | Build Kernel PASS |
| tedd_an/testrunnersetup | success | Test Runner Setup PASS |
| tedd_an/testrunnerl2cap-tester | success | Total: 40, Passed: 40 (100.0%), Failed: 0, Not Run: 0 |
| tedd_an/testrunnerbnep-tester | success | Total: 1, Passed: 1 (100.0%), Failed: 0, Not Run: 0 |
| tedd_an/testrunnermgmt-tester | success | Total: 452, Passed: 452 (100.0%), Failed: 0, Not Run: 0 |
| tedd_an/testrunnerrfcomm-tester | success | Total: 9, Passed: 9 (100.0%), Failed: 0, Not Run: 0 |
| tedd_an/testrunnersco-tester | success | Total: 12, Passed: 12 (100.0%), Failed: 0, Not Run: 0 |
| tedd_an/testrunnersmp-tester | success | Total: 8, Passed: 8 (100.0%), Failed: 0, Not Run: 0 |
| tedd_an/testrunneruserchan-tester | success | Total: 4, Passed: 4 (100.0%), Failed: 0, Not Run: 0 |
This is automated email and please do not reply to this email! Dear submitter, Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series: PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=552941 ---Test result--- Test Summary: CheckPatch PASS 6.65 seconds GitLint PASS 3.74 seconds BuildKernel PASS 657.27 seconds TestRunner: Setup PASS 467.76 seconds TestRunner: l2cap-tester PASS 10.96 seconds TestRunner: bnep-tester PASS 5.44 seconds TestRunner: mgmt-tester PASS 86.03 seconds TestRunner: rfcomm-tester PASS 6.68 seconds TestRunner: sco-tester PASS 7.05 seconds TestRunner: smp-tester PASS 6.70 seconds TestRunner: userchan-tester PASS 5.67 seconds --- Regards, Linux Bluetooth
Hi Joseph, > This patch adds the support of the AOSP Bluetooth Quality Report > (BQR) events. > > Multiple vendors have supported the AOSP Bluetooth Quality Report. > When a Bluetooth controller supports the capability, it can enable > the capability through hci_set_aosp_capable. Then hci_core will > set up the hdev->set_quality_report callback accordingly. > > Note that Intel also supports a distinct telemetry quality report > specification. Intel sets up the hdev->set_quality_report callback > in the btusb driver module. > > Reviewed-by: Miao-chen Chou <mcchou@chromium.org> > Signed-off-by: Joseph Hwang <josephsih@chromium.org> > > --- > > Changes in v4: > - Move the AOSP BQR support from the driver level to net/bluetooth/aosp. > - Fix the drivers to use hci_set_aosp_capable to enable aosp. > - Add Mediatek to support the capability too. > > Changes in v3: > - Fix the auto build test ERROR > "undefined symbol: btandroid_set_quality_report" that occurred > with some kernel configs. > - Note that the mgmt-tester "Read Exp Feature - Success" failed. > But on my test device, the same test passed. Please kindly let me > know what may be going wrong. These patches do not actually > modify read/set experimental features. > - As to CheckPatch failed. No need to modify the MAINTAINERS file. > Thanks. > > Changes in v2: > - Fix the titles of patches 2/3 and 3/3 and reduce their lengths. > > net/bluetooth/aosp.c | 79 ++++++++++++++++++++++++++++++++++++++++ > net/bluetooth/aosp.h | 7 ++++ > net/bluetooth/hci_core.c | 17 +++++++++ > 3 files changed, 103 insertions(+) > > diff --git a/net/bluetooth/aosp.c b/net/bluetooth/aosp.c > index a1b7762335a5..c2b22bc83fb2 100644 > --- a/net/bluetooth/aosp.c > +++ b/net/bluetooth/aosp.c > @@ -33,3 +33,82 @@ void aosp_do_close(struct hci_dev *hdev) > > bt_dev_dbg(hdev, "Cleanup of AOSP extension"); > } > + > +/* BQR command */ > +#define BQR_OPCODE hci_opcode_pack(0x3f, 0x015e) > + > +/* BQR report action */ > +#define REPORT_ACTION_ADD 0x00 > +#define REPORT_ACTION_DELETE 0x01 > +#define REPORT_ACTION_CLEAR 0x02 > + > +/* BQR event masks */ > +#define QUALITY_MONITORING BIT(0) > +#define APPRAOCHING_LSTO BIT(1) > +#define A2DP_AUDIO_CHOPPY BIT(2) > +#define SCO_VOICE_CHOPPY BIT(3) > + > +#define DEFAULT_BQR_EVENT_MASK (QUALITY_MONITORING | APPRAOCHING_LSTO | \ > + A2DP_AUDIO_CHOPPY | SCO_VOICE_CHOPPY) > + > +/* Reporting at milliseconds so as not to stress the controller too much. > + * Range: 0 ~ 65535 ms > + */ > +#define DEFALUT_REPORT_INTERVAL_MS 5000 > + > +struct aosp_bqr_cp { > + __u8 report_action; > + __u32 event_mask; > + __u16 min_report_interval; > +} __packed; > + > +static int enable_quality_report(struct hci_dev *hdev) > +{ > + struct sk_buff *skb; > + struct aosp_bqr_cp cp; > + > + cp.report_action = REPORT_ACTION_ADD; > + cp.event_mask = DEFAULT_BQR_EVENT_MASK; > + cp.min_report_interval = DEFALUT_REPORT_INTERVAL_MS; > + > + skb = __hci_cmd_sync(hdev, BQR_OPCODE, sizeof(cp), &cp, > + HCI_CMD_TIMEOUT); > + if (IS_ERR(skb)) { > + bt_dev_err(hdev, "Enabling Android BQR failed (%ld)", > + PTR_ERR(skb)); > + return PTR_ERR(skb); > + } > + > + kfree_skb(skb); > + return 0; > +} > + > +static int disable_quality_report(struct hci_dev *hdev) > +{ > + struct sk_buff *skb; > + struct aosp_bqr_cp cp = { 0 }; > + > + cp.report_action = REPORT_ACTION_CLEAR; > + > + skb = __hci_cmd_sync(hdev, BQR_OPCODE, sizeof(cp), &cp, > + HCI_CMD_TIMEOUT); > + if (IS_ERR(skb)) { > + bt_dev_err(hdev, "Disabling Android BQR failed (%ld)", > + PTR_ERR(skb)); > + return PTR_ERR(skb); > + } > + > + kfree_skb(skb); > + return 0; > +} > + > +int aosp_set_quality_report(struct hci_dev *hdev, bool enable) > +{ > + bt_dev_info(hdev, "quality report enable %d", enable); > + > + /* Enable or disable the quality report feature. */ > + if (enable) > + return enable_quality_report(hdev); > + else > + return disable_quality_report(hdev); > +} > diff --git a/net/bluetooth/aosp.h b/net/bluetooth/aosp.h > index 328fc6d39f70..384e111c1260 100644 > --- a/net/bluetooth/aosp.h > +++ b/net/bluetooth/aosp.h > @@ -8,9 +8,16 @@ > void aosp_do_open(struct hci_dev *hdev); > void aosp_do_close(struct hci_dev *hdev); > > +int aosp_set_quality_report(struct hci_dev *hdev, bool enable); > + > #else > > static inline void aosp_do_open(struct hci_dev *hdev) {} > static inline void aosp_do_close(struct hci_dev *hdev) {} > > +static inline int aosp_set_quality_report(struct hci_dev *hdev, bool enable) > +{ > + return false; > +} > + > #endif > diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c > index aeec5a3031a6..a2c22a4921d4 100644 > --- a/net/bluetooth/hci_core.c > +++ b/net/bluetooth/hci_core.c > @@ -1315,6 +1315,21 @@ static void hci_dev_get_bd_addr_from_property(struct hci_dev *hdev) > bacpy(&hdev->public_addr, &ba); > } > > +static void hci_set_quality_report(struct hci_dev *hdev) > +{ > +#ifdef CONFIG_BT_AOSPEXT > + if (hdev->aosp_capable) { > + /* The hdev->set_quality_report callback is setup here for > + * the vendors that support AOSP quality report specification. > + * Note that Intel, while supporting a distinct telemetry > + * quality report specification, sets up the > + * hdev->set_quality_report callback in the btusb module. > + */ > + hdev->set_quality_report = aosp_set_quality_report; > + } > +#endif > +} > + I think that I wasn’t super clear in my review on how I wanted this feature. So hdev->set_quality_report should really only ever set by a transport driver. The core stack should never touch it. So I wanted something like this: if (hdev->set_quality_report) err = hdev->set_quality_report(hdev, val); else err = aosp_set_quality_report(hdev, val); I send a RFC showing you how I think this should be done. An extra important step of course is to check if the Android extension actually supports the quality report feature in the first place. And while writing that patch, I realized that your initial support has a mistake. I send a patch for fixing it. The mgmt document is pretty clear on how experimental flags are defined. Read Experimental Features Information Command ============================================== Command Code: 0x0049 Controller Index: <controller id> or <non-controller> Command Parameters: Return Parameters: Feature_Count (2 Octets) Feature1 { UUID (16 Octets) Flags (4 Octets) } Feature2 { } ... This command is used to retrieve the supported experimental features by the host stack. The UUID values are not defined here. They can change over time and are on purpose not stable. Features that mature will be removed at some point. The mapping of feature UUID to the actual functionality of a given feature is out of scope here. The following bits are defined for the Flags parameter: 0 Feature active 1 Causes change in supported settings So please don’t just make up things and exp UUID should only be present if they are supported. If they are not supported because the hardware is lacking support, they should not be reported. Regards Marcel
Hi Marcel: Thanks for the RFC. I have fixed the patches per your request and submitted them for re-review. Thanks and regards! On Tue, Sep 28, 2021 at 6:45 PM Marcel Holtmann <marcel@holtmann.org> wrote: > > Hi Joseph, > > > This patch adds the support of the AOSP Bluetooth Quality Report > > (BQR) events. > > > > Multiple vendors have supported the AOSP Bluetooth Quality Report. > > When a Bluetooth controller supports the capability, it can enable > > the capability through hci_set_aosp_capable. Then hci_core will > > set up the hdev->set_quality_report callback accordingly. > > > > Note that Intel also supports a distinct telemetry quality report > > specification. Intel sets up the hdev->set_quality_report callback > > in the btusb driver module. > > > > Reviewed-by: Miao-chen Chou <mcchou@chromium.org> > > Signed-off-by: Joseph Hwang <josephsih@chromium.org> > > > > --- > > > > Changes in v4: > > - Move the AOSP BQR support from the driver level to net/bluetooth/aosp. > > - Fix the drivers to use hci_set_aosp_capable to enable aosp. > > - Add Mediatek to support the capability too. > > > > Changes in v3: > > - Fix the auto build test ERROR > > "undefined symbol: btandroid_set_quality_report" that occurred > > with some kernel configs. > > - Note that the mgmt-tester "Read Exp Feature - Success" failed. > > But on my test device, the same test passed. Please kindly let me > > know what may be going wrong. These patches do not actually > > modify read/set experimental features. > > - As to CheckPatch failed. No need to modify the MAINTAINERS file. > > Thanks. > > > > Changes in v2: > > - Fix the titles of patches 2/3 and 3/3 and reduce their lengths. > > > > net/bluetooth/aosp.c | 79 ++++++++++++++++++++++++++++++++++++++++ > > net/bluetooth/aosp.h | 7 ++++ > > net/bluetooth/hci_core.c | 17 +++++++++ > > 3 files changed, 103 insertions(+) > > > > diff --git a/net/bluetooth/aosp.c b/net/bluetooth/aosp.c > > index a1b7762335a5..c2b22bc83fb2 100644 > > --- a/net/bluetooth/aosp.c > > +++ b/net/bluetooth/aosp.c > > @@ -33,3 +33,82 @@ void aosp_do_close(struct hci_dev *hdev) > > > > bt_dev_dbg(hdev, "Cleanup of AOSP extension"); > > } > > + > > +/* BQR command */ > > +#define BQR_OPCODE hci_opcode_pack(0x3f, 0x015e) > > + > > +/* BQR report action */ > > +#define REPORT_ACTION_ADD 0x00 > > +#define REPORT_ACTION_DELETE 0x01 > > +#define REPORT_ACTION_CLEAR 0x02 > > + > > +/* BQR event masks */ > > +#define QUALITY_MONITORING BIT(0) > > +#define APPRAOCHING_LSTO BIT(1) > > +#define A2DP_AUDIO_CHOPPY BIT(2) > > +#define SCO_VOICE_CHOPPY BIT(3) > > + > > +#define DEFAULT_BQR_EVENT_MASK (QUALITY_MONITORING | APPRAOCHING_LSTO | \ > > + A2DP_AUDIO_CHOPPY | SCO_VOICE_CHOPPY) > > + > > +/* Reporting at milliseconds so as not to stress the controller too much. > > + * Range: 0 ~ 65535 ms > > + */ > > +#define DEFALUT_REPORT_INTERVAL_MS 5000 > > + > > +struct aosp_bqr_cp { > > + __u8 report_action; > > + __u32 event_mask; > > + __u16 min_report_interval; > > +} __packed; > > + > > +static int enable_quality_report(struct hci_dev *hdev) > > +{ > > + struct sk_buff *skb; > > + struct aosp_bqr_cp cp; > > + > > + cp.report_action = REPORT_ACTION_ADD; > > + cp.event_mask = DEFAULT_BQR_EVENT_MASK; > > + cp.min_report_interval = DEFALUT_REPORT_INTERVAL_MS; > > + > > + skb = __hci_cmd_sync(hdev, BQR_OPCODE, sizeof(cp), &cp, > > + HCI_CMD_TIMEOUT); > > + if (IS_ERR(skb)) { > > + bt_dev_err(hdev, "Enabling Android BQR failed (%ld)", > > + PTR_ERR(skb)); > > + return PTR_ERR(skb); > > + } > > + > > + kfree_skb(skb); > > + return 0; > > +} > > + > > +static int disable_quality_report(struct hci_dev *hdev) > > +{ > > + struct sk_buff *skb; > > + struct aosp_bqr_cp cp = { 0 }; > > + > > + cp.report_action = REPORT_ACTION_CLEAR; > > + > > + skb = __hci_cmd_sync(hdev, BQR_OPCODE, sizeof(cp), &cp, > > + HCI_CMD_TIMEOUT); > > + if (IS_ERR(skb)) { > > + bt_dev_err(hdev, "Disabling Android BQR failed (%ld)", > > + PTR_ERR(skb)); > > + return PTR_ERR(skb); > > + } > > + > > + kfree_skb(skb); > > + return 0; > > +} > > + > > +int aosp_set_quality_report(struct hci_dev *hdev, bool enable) > > +{ > > + bt_dev_info(hdev, "quality report enable %d", enable); > > + > > + /* Enable or disable the quality report feature. */ > > + if (enable) > > + return enable_quality_report(hdev); > > + else > > + return disable_quality_report(hdev); > > +} > > diff --git a/net/bluetooth/aosp.h b/net/bluetooth/aosp.h > > index 328fc6d39f70..384e111c1260 100644 > > --- a/net/bluetooth/aosp.h > > +++ b/net/bluetooth/aosp.h > > @@ -8,9 +8,16 @@ > > void aosp_do_open(struct hci_dev *hdev); > > void aosp_do_close(struct hci_dev *hdev); > > > > +int aosp_set_quality_report(struct hci_dev *hdev, bool enable); > > + > > #else > > > > static inline void aosp_do_open(struct hci_dev *hdev) {} > > static inline void aosp_do_close(struct hci_dev *hdev) {} > > > > +static inline int aosp_set_quality_report(struct hci_dev *hdev, bool enable) > > +{ > > + return false; > > +} > > + > > #endif > > diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c > > index aeec5a3031a6..a2c22a4921d4 100644 > > --- a/net/bluetooth/hci_core.c > > +++ b/net/bluetooth/hci_core.c > > @@ -1315,6 +1315,21 @@ static void hci_dev_get_bd_addr_from_property(struct hci_dev *hdev) > > bacpy(&hdev->public_addr, &ba); > > } > > > > +static void hci_set_quality_report(struct hci_dev *hdev) > > +{ > > +#ifdef CONFIG_BT_AOSPEXT > > + if (hdev->aosp_capable) { > > + /* The hdev->set_quality_report callback is setup here for > > + * the vendors that support AOSP quality report specification. > > + * Note that Intel, while supporting a distinct telemetry > > + * quality report specification, sets up the > > + * hdev->set_quality_report callback in the btusb module. > > + */ > > + hdev->set_quality_report = aosp_set_quality_report; > > + } > > +#endif > > +} > > + > > I think that I wasn’t super clear in my review on how I wanted this feature. So hdev->set_quality_report should really only ever set by a transport driver. The core stack should never touch it. > > So I wanted something like this: > > if (hdev->set_quality_report) > err = hdev->set_quality_report(hdev, val); > else > err = aosp_set_quality_report(hdev, val); > > I send a RFC showing you how I think this should be done. > > An extra important step of course is to check if the Android extension actually supports the quality report feature in the first place. > > And while writing that patch, I realized that your initial support has a mistake. I send a patch for fixing it. The mgmt document is pretty clear on how experimental flags are defined. > > Read Experimental Features Information Command > ============================================== > > Command Code: 0x0049 > Controller Index: <controller id> or <non-controller> > Command Parameters: > Return Parameters: Feature_Count (2 Octets) > Feature1 { > UUID (16 Octets) > Flags (4 Octets) > } > Feature2 { } > ... > > This command is used to retrieve the supported experimental features > by the host stack. > > The UUID values are not defined here. They can change over time and > are on purpose not stable. Features that mature will be removed at > some point. The mapping of feature UUID to the actual functionality > of a given feature is out of scope here. > > The following bits are defined for the Flags parameter: > > 0 Feature active > 1 Causes change in supported settings > > So please don’t just make up things and exp UUID should only be present if they are supported. If they are not supported because the hardware is lacking support, they should not be reported. > > Regards > > Marcel >
diff --git a/net/bluetooth/aosp.c b/net/bluetooth/aosp.c index a1b7762335a5..c2b22bc83fb2 100644 --- a/net/bluetooth/aosp.c +++ b/net/bluetooth/aosp.c @@ -33,3 +33,82 @@ void aosp_do_close(struct hci_dev *hdev) bt_dev_dbg(hdev, "Cleanup of AOSP extension"); } + +/* BQR command */ +#define BQR_OPCODE hci_opcode_pack(0x3f, 0x015e) + +/* BQR report action */ +#define REPORT_ACTION_ADD 0x00 +#define REPORT_ACTION_DELETE 0x01 +#define REPORT_ACTION_CLEAR 0x02 + +/* BQR event masks */ +#define QUALITY_MONITORING BIT(0) +#define APPRAOCHING_LSTO BIT(1) +#define A2DP_AUDIO_CHOPPY BIT(2) +#define SCO_VOICE_CHOPPY BIT(3) + +#define DEFAULT_BQR_EVENT_MASK (QUALITY_MONITORING | APPRAOCHING_LSTO | \ + A2DP_AUDIO_CHOPPY | SCO_VOICE_CHOPPY) + +/* Reporting at milliseconds so as not to stress the controller too much. + * Range: 0 ~ 65535 ms + */ +#define DEFALUT_REPORT_INTERVAL_MS 5000 + +struct aosp_bqr_cp { + __u8 report_action; + __u32 event_mask; + __u16 min_report_interval; +} __packed; + +static int enable_quality_report(struct hci_dev *hdev) +{ + struct sk_buff *skb; + struct aosp_bqr_cp cp; + + cp.report_action = REPORT_ACTION_ADD; + cp.event_mask = DEFAULT_BQR_EVENT_MASK; + cp.min_report_interval = DEFALUT_REPORT_INTERVAL_MS; + + skb = __hci_cmd_sync(hdev, BQR_OPCODE, sizeof(cp), &cp, + HCI_CMD_TIMEOUT); + if (IS_ERR(skb)) { + bt_dev_err(hdev, "Enabling Android BQR failed (%ld)", + PTR_ERR(skb)); + return PTR_ERR(skb); + } + + kfree_skb(skb); + return 0; +} + +static int disable_quality_report(struct hci_dev *hdev) +{ + struct sk_buff *skb; + struct aosp_bqr_cp cp = { 0 }; + + cp.report_action = REPORT_ACTION_CLEAR; + + skb = __hci_cmd_sync(hdev, BQR_OPCODE, sizeof(cp), &cp, + HCI_CMD_TIMEOUT); + if (IS_ERR(skb)) { + bt_dev_err(hdev, "Disabling Android BQR failed (%ld)", + PTR_ERR(skb)); + return PTR_ERR(skb); + } + + kfree_skb(skb); + return 0; +} + +int aosp_set_quality_report(struct hci_dev *hdev, bool enable) +{ + bt_dev_info(hdev, "quality report enable %d", enable); + + /* Enable or disable the quality report feature. */ + if (enable) + return enable_quality_report(hdev); + else + return disable_quality_report(hdev); +} diff --git a/net/bluetooth/aosp.h b/net/bluetooth/aosp.h index 328fc6d39f70..384e111c1260 100644 --- a/net/bluetooth/aosp.h +++ b/net/bluetooth/aosp.h @@ -8,9 +8,16 @@ void aosp_do_open(struct hci_dev *hdev); void aosp_do_close(struct hci_dev *hdev); +int aosp_set_quality_report(struct hci_dev *hdev, bool enable); + #else static inline void aosp_do_open(struct hci_dev *hdev) {} static inline void aosp_do_close(struct hci_dev *hdev) {} +static inline int aosp_set_quality_report(struct hci_dev *hdev, bool enable) +{ + return false; +} + #endif diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index aeec5a3031a6..a2c22a4921d4 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -1315,6 +1315,21 @@ static void hci_dev_get_bd_addr_from_property(struct hci_dev *hdev) bacpy(&hdev->public_addr, &ba); } +static void hci_set_quality_report(struct hci_dev *hdev) +{ +#ifdef CONFIG_BT_AOSPEXT + if (hdev->aosp_capable) { + /* The hdev->set_quality_report callback is setup here for + * the vendors that support AOSP quality report specification. + * Note that Intel, while supporting a distinct telemetry + * quality report specification, sets up the + * hdev->set_quality_report callback in the btusb module. + */ + hdev->set_quality_report = aosp_set_quality_report; + } +#endif +} + static int hci_dev_do_open(struct hci_dev *hdev) { int ret = 0; @@ -1394,6 +1409,8 @@ static int hci_dev_do_open(struct hci_dev *hdev) if (ret) goto setup_failed; + hci_set_quality_report(hdev); + if (test_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks)) { if (!bacmp(&hdev->public_addr, BDADDR_ANY)) hci_dev_get_bd_addr_from_property(hdev);