* [PATCH v2] Bluetooth: hci_h5: Add RTL8822CS capabilities
@ 2021-05-27 7:19 Archie Pusaka
2021-05-27 15:22 ` Marcel Holtmann
0 siblings, 1 reply; 3+ messages in thread
From: Archie Pusaka @ 2021-05-27 7:19 UTC (permalink / raw)
To: linux-bluetooth, Marcel Holtmann
Cc: CrosBT Upstreaming, Archie Pusaka, Abhishek Pandit-Subedi,
Johan Hedberg, Luiz Augusto von Dentz, linux-kernel
From: Archie Pusaka <apusaka@chromium.org>
RTL8822 chipset supports WBS, and this information is conveyed in
btusb.c. However, the UART driver doesn't have this information just
yet.
Signed-off-by: Archie Pusaka <apusaka@chromium.org>
Reviewed-by: Abhishek Pandit-Subedi <abhishekpandit@chromium.org>
---
Changes in v2:
* Add declaration for the case when CONFIG_BT_RTL is not enabled
drivers/bluetooth/btrtl.c | 26 ++++++++++++++++----------
drivers/bluetooth/btrtl.h | 7 +++++++
drivers/bluetooth/hci_h5.c | 5 +----
3 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/drivers/bluetooth/btrtl.c b/drivers/bluetooth/btrtl.c
index e7fe5fb22753..988a09860c6b 100644
--- a/drivers/bluetooth/btrtl.c
+++ b/drivers/bluetooth/btrtl.c
@@ -719,17 +719,8 @@ int btrtl_download_firmware(struct hci_dev *hdev,
}
EXPORT_SYMBOL_GPL(btrtl_download_firmware);
-int btrtl_setup_realtek(struct hci_dev *hdev)
+void btrtl_set_quirks(struct hci_dev *hdev, struct btrtl_device_info *btrtl_dev)
{
- struct btrtl_device_info *btrtl_dev;
- int ret;
-
- btrtl_dev = btrtl_initialize(hdev, NULL);
- if (IS_ERR(btrtl_dev))
- return PTR_ERR(btrtl_dev);
-
- ret = btrtl_download_firmware(hdev, btrtl_dev);
-
/* Enable controller to do both LE scan and BR/EDR inquiry
* simultaneously.
*/
@@ -750,6 +741,21 @@ int btrtl_setup_realtek(struct hci_dev *hdev)
rtl_dev_dbg(hdev, "WBS supported not enabled.");
break;
}
+}
+EXPORT_SYMBOL_GPL(btrtl_set_quirks);
+
+int btrtl_setup_realtek(struct hci_dev *hdev)
+{
+ struct btrtl_device_info *btrtl_dev;
+ int ret;
+
+ btrtl_dev = btrtl_initialize(hdev, NULL);
+ if (IS_ERR(btrtl_dev))
+ return PTR_ERR(btrtl_dev);
+
+ ret = btrtl_download_firmware(hdev, btrtl_dev);
+
+ btrtl_set_quirks(hdev, btrtl_dev);
btrtl_free(btrtl_dev);
return ret;
diff --git a/drivers/bluetooth/btrtl.h b/drivers/bluetooth/btrtl.h
index 2a582682136d..2c441bda390a 100644
--- a/drivers/bluetooth/btrtl.h
+++ b/drivers/bluetooth/btrtl.h
@@ -54,6 +54,8 @@ struct btrtl_device_info *btrtl_initialize(struct hci_dev *hdev,
void btrtl_free(struct btrtl_device_info *btrtl_dev);
int btrtl_download_firmware(struct hci_dev *hdev,
struct btrtl_device_info *btrtl_dev);
+void btrtl_set_quirks(struct hci_dev *hdev,
+ struct btrtl_device_info *btrtl_dev);
int btrtl_setup_realtek(struct hci_dev *hdev);
int btrtl_shutdown_realtek(struct hci_dev *hdev);
int btrtl_get_uart_settings(struct hci_dev *hdev,
@@ -79,6 +81,11 @@ static inline int btrtl_download_firmware(struct hci_dev *hdev,
return -EOPNOTSUPP;
}
+static inline void btrtl_set_quirks(struct hci_dev *hdev,
+ struct btrtl_device_info *btrtl_dev)
+{
+}
+
static inline int btrtl_setup_realtek(struct hci_dev *hdev)
{
return -EOPNOTSUPP;
diff --git a/drivers/bluetooth/hci_h5.c b/drivers/bluetooth/hci_h5.c
index 27e96681d583..e0520639f4ba 100644
--- a/drivers/bluetooth/hci_h5.c
+++ b/drivers/bluetooth/hci_h5.c
@@ -906,10 +906,7 @@ static int h5_btrtl_setup(struct h5 *h5)
/* Give the device some time before the hci-core sends it a reset */
usleep_range(10000, 20000);
- /* Enable controller to do both LE scan and BR/EDR inquiry
- * simultaneously.
- */
- set_bit(HCI_QUIRK_SIMULTANEOUS_DISCOVERY, &h5->hu->hdev->quirks);
+ btrtl_set_quirks(h5->hu->hdev, btrtl_dev);
out_free:
btrtl_free(btrtl_dev);
--
2.31.1.818.g46aad6cb9e-goog
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] Bluetooth: hci_h5: Add RTL8822CS capabilities
2021-05-27 7:19 [PATCH v2] Bluetooth: hci_h5: Add RTL8822CS capabilities Archie Pusaka
@ 2021-05-27 15:22 ` Marcel Holtmann
2021-05-31 8:55 ` Archie Pusaka
0 siblings, 1 reply; 3+ messages in thread
From: Marcel Holtmann @ 2021-05-27 15:22 UTC (permalink / raw)
To: Archie Pusaka
Cc: linux-bluetooth, CrosBT Upstreaming, Archie Pusaka,
Abhishek Pandit-Subedi, Johan Hedberg, Luiz Augusto von Dentz,
linux-kernel
Hi Archie,
> RTL8822 chipset supports WBS, and this information is conveyed in
> btusb.c. However, the UART driver doesn't have this information just
> yet.
>
> Signed-off-by: Archie Pusaka <apusaka@chromium.org>
> Reviewed-by: Abhishek Pandit-Subedi <abhishekpandit@chromium.org>
>
> ---
>
> Changes in v2:
> * Add declaration for the case when CONFIG_BT_RTL is not enabled
>
> drivers/bluetooth/btrtl.c | 26 ++++++++++++++++----------
> drivers/bluetooth/btrtl.h | 7 +++++++
> drivers/bluetooth/hci_h5.c | 5 +----
> 3 files changed, 24 insertions(+), 14 deletions(-)
patch has been applied to bluetooth-next tree ..
.. however I am not super happy with this. I think it is time that we clean this stuff up. The vendor support for Realtek is getting messy and I don’t like that.
Regards
Marcel
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] Bluetooth: hci_h5: Add RTL8822CS capabilities
2021-05-27 15:22 ` Marcel Holtmann
@ 2021-05-31 8:55 ` Archie Pusaka
0 siblings, 0 replies; 3+ messages in thread
From: Archie Pusaka @ 2021-05-31 8:55 UTC (permalink / raw)
To: Marcel Holtmann
Cc: linux-bluetooth, CrosBT Upstreaming, Archie Pusaka,
Abhishek Pandit-Subedi, Johan Hedberg, Luiz Augusto von Dentz,
LKML
Hi Marcel,
On Thu, 27 May 2021 at 23:22, Marcel Holtmann <marcel@holtmann.org> wrote:
>
> Hi Archie,
>
> > RTL8822 chipset supports WBS, and this information is conveyed in
> > btusb.c. However, the UART driver doesn't have this information just
> > yet.
> >
> > Signed-off-by: Archie Pusaka <apusaka@chromium.org>
> > Reviewed-by: Abhishek Pandit-Subedi <abhishekpandit@chromium.org>
> >
> > ---
> >
> > Changes in v2:
> > * Add declaration for the case when CONFIG_BT_RTL is not enabled
> >
> > drivers/bluetooth/btrtl.c | 26 ++++++++++++++++----------
> > drivers/bluetooth/btrtl.h | 7 +++++++
> > drivers/bluetooth/hci_h5.c | 5 +----
> > 3 files changed, 24 insertions(+), 14 deletions(-)
>
> patch has been applied to bluetooth-next tree ..
>
> .. however I am not super happy with this. I think it is time that we clean this stuff up. The vendor support for Realtek is getting messy and I don’t like that.
Thanks for your concern. I will initiate internal discussion to
hopefully shape things up.
Cheers,
Archie
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-05-31 8:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-27 7:19 [PATCH v2] Bluetooth: hci_h5: Add RTL8822CS capabilities Archie Pusaka
2021-05-27 15:22 ` Marcel Holtmann
2021-05-31 8:55 ` Archie Pusaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).