From: Abhishek Pandit-Subedi <[email protected]>
Without updating the patchram, the BCM4354 does not support a higher
operating speed. The normal bcm_setup follows the correct order
(init_speed, patchram and then oper_speed) but the serdev driver will
set the operating speed before calling the hu->setup function. Thus,
for the BCM4354, don't set the operating speed before patchram.
Signed-off-by: Abhishek Pandit-Subedi <[email protected]>
Signed-off-by: Marcel Holtmann <[email protected]>
---
drivers/bluetooth/hci_bcm.c | 27 +++++++++++++++++++++++++--
1 file changed, 25 insertions(+), 2 deletions(-)
diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c
index d2a6a4afdbbb..d48044276895 100644
--- a/drivers/bluetooth/hci_bcm.c
+++ b/drivers/bluetooth/hci_bcm.c
@@ -47,6 +47,14 @@
#define BCM_NUM_SUPPLIES 2
+/**
+ * struct bcm_device_data - device specific data
+ * @no_early_set_baudrate: Disallow set baudrate before driver setup()
+ */
+struct bcm_device_data {
+ bool no_early_set_baudrate;
+};
+
/**
* struct bcm_device - device driver resources
* @serdev_hu: HCI UART controller struct
@@ -79,6 +87,7 @@
* @hu: pointer to HCI UART controller struct,
* used to disable flow control during runtime suspend and system sleep
* @is_suspended: whether flow control is currently disabled
+ * @no_early_set_baudrate: don't set_baudrate before setup()
*/
struct bcm_device {
/* Must be the first member, hci_serdev.c expects this. */
@@ -112,6 +121,7 @@ struct bcm_device {
struct hci_uart *hu;
bool is_suspended;
#endif
+ bool no_early_set_baudrate;
};
/* generic bcm uart resources */
@@ -447,7 +457,13 @@ static int bcm_open(struct hci_uart *hu)
if (bcm->dev) {
hci_uart_set_flow_control(hu, true);
hu->init_speed = bcm->dev->init_speed;
- hu->oper_speed = bcm->dev->oper_speed;
+
+ /* If oper_speed is set, ldisc/serdev will set the baudrate
+ * before calling setup()
+ */
+ if (!bcm->dev->no_early_set_baudrate)
+ hu->oper_speed = bcm->dev->oper_speed;
+
err = bcm_gpio_set_power(bcm->dev, true);
hci_uart_set_flow_control(hu, false);
if (err)
@@ -565,6 +581,8 @@ static int bcm_setup(struct hci_uart *hu)
/* Operational speed if any */
if (hu->oper_speed)
speed = hu->oper_speed;
+ else if (bcm->dev && bcm->dev->oper_speed)
+ speed = bcm->dev->oper_speed;
else if (hu->proto->oper_speed)
speed = hu->proto->oper_speed;
else
@@ -1374,6 +1392,7 @@ static struct platform_driver bcm_driver = {
static int bcm_serdev_probe(struct serdev_device *serdev)
{
struct bcm_device *bcmdev;
+ const struct bcm_device_data *data;
int err;
bcmdev = devm_kzalloc(&serdev->dev, sizeof(*bcmdev), GFP_KERNEL);
@@ -1408,6 +1427,10 @@ static int bcm_serdev_probe(struct serdev_device *serdev)
if (err)
dev_err(&serdev->dev, "Failed to power down\n");
+ data = device_get_match_data(bcmdev->dev);
+ if (data)
+ bcmdev->no_early_set_baudrate = data->no_early_set_baudrate;
+
return hci_uart_register_device(&bcmdev->serdev_hu, &bcm_proto);
}
@@ -1424,7 +1447,7 @@ static const struct of_device_id bcm_bluetooth_of_match[] = {
{ .compatible = "brcm,bcm4345c5" },
{ .compatible = "brcm,bcm4330-bt" },
{ .compatible = "brcm,bcm43438-bt" },
- { .compatible = "brcm,bcm43540-bt" },
+ { .compatible = "brcm,bcm43540-bt", .data = &bcm4354_device_data },
{ .compatible = "brcm,bcm4335a0" },
{ },
};
--
2.23.0
Hi Marcel,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on next-20191122]
[cannot apply to bluetooth-next/master bluetooth/master net-next/master v5.4-rc8 v5.4-rc7 v5.4-rc6 v5.4-rc8]
[if your patch is applied to the wrong git tree, please drop us a note to help
improve the system. BTW, we also suggest to use '--base' option to specify the
base tree in git format-patch, please see https://stackoverflow.com/a/37406982]
url: https://github.com/0day-ci/linux/commits/Marcel-Holtmann/Bluetooth-hci_bcm-Disallow-set_baudrate-for-BCM4354/20191125-034727
base: b9d3d01405061bb42358fe53f824e894a1922ced
config: sh-allmodconfig (attached as .config)
compiler: sh4-linux-gcc (GCC) 7.4.0
reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
GCC_VERSION=7.4.0 make.cross ARCH=sh
If you fix the issue, kindly add following tag
Reported-by: kbuild test robot <[email protected]>
All errors (new ones prefixed by >>):
>> drivers/bluetooth/hci_bcm.c:1450:47: error: 'bcm4354_device_data' undeclared here (not in a function); did you mean 'bcm_device_data'?
{ .compatible = "brcm,bcm43540-bt", .data = &bcm4354_device_data },
^~~~~~~~~~~~~~~~~~~
bcm_device_data
vim +1450 drivers/bluetooth/hci_bcm.c
1443
1444 #ifdef CONFIG_OF
1445 static const struct of_device_id bcm_bluetooth_of_match[] = {
1446 { .compatible = "brcm,bcm20702a1" },
1447 { .compatible = "brcm,bcm4345c5" },
1448 { .compatible = "brcm,bcm4330-bt" },
1449 { .compatible = "brcm,bcm43438-bt" },
> 1450 { .compatible = "brcm,bcm43540-bt", .data = &bcm4354_device_data },
1451 { .compatible = "brcm,bcm4335a0" },
1452 { },
1453 };
1454 MODULE_DEVICE_TABLE(of, bcm_bluetooth_of_match);
1455 #endif
1456
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/hyperkitty/list/[email protected] Intel Corporation
On Sat, Nov 23, 2019 at 2:01 AM Marcel Holtmann <[email protected]> wrote:
>
> From: Abhishek Pandit-Subedi <[email protected]>
>
> Without updating the patchram, the BCM4354 does not support a higher
> operating speed. The normal bcm_setup follows the correct order
> (init_speed, patchram and then oper_speed) but the serdev driver will
> set the operating speed before calling the hu->setup function. Thus,
> for the BCM4354, don't set the operating speed before patchram.
>
> Signed-off-by: Abhishek Pandit-Subedi <[email protected]>
> Signed-off-by: Marcel Holtmann <[email protected]>
> ---
> drivers/bluetooth/hci_bcm.c | 27 +++++++++++++++++++++++++--
> 1 file changed, 25 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c
> index d2a6a4afdbbb..d48044276895 100644
> --- a/drivers/bluetooth/hci_bcm.c
> +++ b/drivers/bluetooth/hci_bcm.c
> @@ -47,6 +47,14 @@
>
> #define BCM_NUM_SUPPLIES 2
>
> +/**
> + * struct bcm_device_data - device specific data
> + * @no_early_set_baudrate: Disallow set baudrate before driver setup()
> + */
> +struct bcm_device_data {
> + bool no_early_set_baudrate;
> +};
> +
> /**
> * struct bcm_device - device driver resources
> * @serdev_hu: HCI UART controller struct
> @@ -79,6 +87,7 @@
> * @hu: pointer to HCI UART controller struct,
> * used to disable flow control during runtime suspend and system sleep
> * @is_suspended: whether flow control is currently disabled
> + * @no_early_set_baudrate: don't set_baudrate before setup()
> */
> struct bcm_device {
> /* Must be the first member, hci_serdev.c expects this. */
> @@ -112,6 +121,7 @@ struct bcm_device {
> struct hci_uart *hu;
> bool is_suspended;
> #endif
> + bool no_early_set_baudrate;
> };
>
> /* generic bcm uart resources */
> @@ -447,7 +457,13 @@ static int bcm_open(struct hci_uart *hu)
> if (bcm->dev) {
> hci_uart_set_flow_control(hu, true);
> hu->init_speed = bcm->dev->init_speed;
> - hu->oper_speed = bcm->dev->oper_speed;
> +
> + /* If oper_speed is set, ldisc/serdev will set the baudrate
> + * before calling setup()
> + */
> + if (!bcm->dev->no_early_set_baudrate)
> + hu->oper_speed = bcm->dev->oper_speed;
> +
> err = bcm_gpio_set_power(bcm->dev, true);
> hci_uart_set_flow_control(hu, false);
> if (err)
> @@ -565,6 +581,8 @@ static int bcm_setup(struct hci_uart *hu)
> /* Operational speed if any */
> if (hu->oper_speed)
> speed = hu->oper_speed;
> + else if (bcm->dev && bcm->dev->oper_speed)
> + speed = bcm->dev->oper_speed;
> else if (hu->proto->oper_speed)
> speed = hu->proto->oper_speed;
> else
> @@ -1374,6 +1392,7 @@ static struct platform_driver bcm_driver = {
> static int bcm_serdev_probe(struct serdev_device *serdev)
> {
> struct bcm_device *bcmdev;
> + const struct bcm_device_data *data;
> int err;
>
> bcmdev = devm_kzalloc(&serdev->dev, sizeof(*bcmdev), GFP_KERNEL);
> @@ -1408,6 +1427,10 @@ static int bcm_serdev_probe(struct serdev_device *serdev)
> if (err)
> dev_err(&serdev->dev, "Failed to power down\n");
>
> + data = device_get_match_data(bcmdev->dev);
> + if (data)
> + bcmdev->no_early_set_baudrate = data->no_early_set_baudrate;
> +
> return hci_uart_register_device(&bcmdev->serdev_hu, &bcm_proto);
> }
>
> @@ -1424,7 +1447,7 @@ static const struct of_device_id bcm_bluetooth_of_match[] = {
> { .compatible = "brcm,bcm4345c5" },
> { .compatible = "brcm,bcm4330-bt" },
> { .compatible = "brcm,bcm43438-bt" },
> - { .compatible = "brcm,bcm43540-bt" },
> + { .compatible = "brcm,bcm43540-bt", .data = &bcm4354_device_data },
> { .compatible = "brcm,bcm4335a0" },
> { },
> };
> --
> 2.23.0
>
Looks good except missing `bcm4354_device_data` as noted by kbuild test robot.