| Message ID | 20200109051427.16426-1-rjliao@codeaurora.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v3] Bluetooth: hci_qca: Add qca_power_on() API to support both wcn399x and Rome power up | expand |
Hi Rocky, On Thu, Jan 09, 2020 at 01:14:27PM +0800, Rocky Liao wrote: > This patch adds a unified API qca_power_on() to support both wcn399x and > Rome power on. For wcn399x it calls the qca_wcn3990_init() to init the > regulators, and for Rome it pulls up the bt_en GPIO to power up the btsoc. > It also moves all the power up operation from hdev->open() to > hdev->setup(). > > Signed-off-by: Rocky Liao <rjliao@codeaurora.org> > --- > > Changes in v2: None > Changes in v3: > -combined the changes of patch 2 and 3 into this patch it would be better to actually describe what was done, "patch 2 and 3" doesn't provide much useful information. > -updated the commit message > > drivers/bluetooth/hci_qca.c | 46 ++++++++++++++++++++++++------------- > 1 file changed, 30 insertions(+), 16 deletions(-) > > diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c > index 82e4cd4b6663..427e381a08b4 100644 > --- a/drivers/bluetooth/hci_qca.c > +++ b/drivers/bluetooth/hci_qca.c > @@ -541,7 +541,6 @@ static int qca_open(struct hci_uart *hu) > { > struct qca_serdev *qcadev; > struct qca_data *qca; > - int ret; > > BT_DBG("hu %p qca_open", hu); > > @@ -582,23 +581,10 @@ static int qca_open(struct hci_uart *hu) > hu->priv = qca; > > if (hu->serdev) { > - > qcadev = serdev_device_get_drvdata(hu->serdev); > - if (!qca_is_wcn399x(qcadev->btsoc_type)) { > - gpiod_set_value_cansleep(qcadev->bt_en, 1); > - /* Controller needs time to bootup. */ > - msleep(150); > - } else { > + if (qca_is_wcn399x(qcadev->btsoc_type)) { > hu->init_speed = qcadev->init_speed; > hu->oper_speed = qcadev->oper_speed; > - ret = qca_regulator_enable(qcadev); > - if (ret) { > - destroy_workqueue(qca->workqueue); > - kfree_skb(qca->rx_skb); > - hu->priv = NULL; > - kfree(qca); > - return ret; > - } > } > } > > @@ -1531,6 +1517,31 @@ static int qca_wcn3990_init(struct hci_uart *hu) > return 0; > } > > +static int qca_power_on(struct hci_dev *hdev) > +{ > + struct hci_uart *hu = hci_get_drvdata(hdev); > + enum qca_btsoc_type soc_type = qca_soc_type(hu); > + struct qca_serdev *qcadev; > + int ret = 0; > + > + /* Non-serdev device usually is powered by external power > + * and don't need additional action in driver for power on > + */ > + if (!hu->serdev) > + return 0; > + > + if (qca_is_wcn399x(soc_type)) { > + ret = qca_wcn3990_init(hu); Since there is no real need to add the qca_regulator_enable() call from qca_open() here qca_power_on() is now essentially a fancy wrapper for qca_wcn3990_init(), but I guess that's ok. > + } else { > + qcadev = serdev_device_get_drvdata(hu->serdev); > + gpiod_set_value_cansleep(qcadev->bt_en, 1); > + /* Controller needs time to bootup. */ > + msleep(150); > + } > + > + return ret; > +} > + > static int qca_setup(struct hci_uart *hu) > { > struct hci_dev *hdev = hu->hdev; > @@ -1562,7 +1573,7 @@ static int qca_setup(struct hci_uart *hu) > set_bit(HCI_QUIRK_NON_PERSISTENT_SETUP, &hdev->quirks); > set_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks); > hu->hdev->shutdown = qca_power_off; > - ret = qca_wcn3990_init(hu); > + ret = qca_power_on(hdev); > if (ret) > return ret; > > @@ -1571,6 +1582,9 @@ static int qca_setup(struct hci_uart *hu) > return ret; > } else { > bt_dev_info(hdev, "ROME setup"); > + ret = qca_power_on(hdev); > + if (ret) > + return ret; > qca_set_speed(hu, QCA_INIT_SPEED); > } It would be nice if we could get away with a single qca_power_on() call for WCN399x and ROME. How about this before 'if (qca_is_wcn399x(soc_type))': bt_dev_info(hdev, "setting up %s", qca_is_wcn399x(soc_type)? "wcn399x" : "ROME"); ret = qca_power_on(hdev); if (ret) return ret; In any case: Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
Hi Matt, 在 2020-01-10 03:05，Matthias Kaehlcke 写道： > Hi Rocky, > > On Thu, Jan 09, 2020 at 01:14:27PM +0800, Rocky Liao wrote: >> This patch adds a unified API qca_power_on() to support both wcn399x >> and >> Rome power on. For wcn399x it calls the qca_wcn3990_init() to init the >> regulators, and for Rome it pulls up the bt_en GPIO to power up the >> btsoc. >> It also moves all the power up operation from hdev->open() to >> hdev->setup(). >> >> Signed-off-by: Rocky Liao <rjliao@codeaurora.org> >> --- >> >> Changes in v2: None >> Changes in v3: >> -combined the changes of patch 2 and 3 into this patch > > it would be better to actually describe what was done, "patch 2 and 3" > doesn't provide much useful information. > OK, will update that >> -updated the commit message >> >> drivers/bluetooth/hci_qca.c | 46 >> ++++++++++++++++++++++++------------- >> 1 file changed, 30 insertions(+), 16 deletions(-) >> >> diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c >> index 82e4cd4b6663..427e381a08b4 100644 >> --- a/drivers/bluetooth/hci_qca.c >> +++ b/drivers/bluetooth/hci_qca.c >> @@ -541,7 +541,6 @@ static int qca_open(struct hci_uart *hu) >> { >> struct qca_serdev *qcadev; >> struct qca_data *qca; >> - int ret; >> >> BT_DBG("hu %p qca_open", hu); >> >> @@ -582,23 +581,10 @@ static int qca_open(struct hci_uart *hu) >> hu->priv = qca; >> >> if (hu->serdev) { >> - >> qcadev = serdev_device_get_drvdata(hu->serdev); >> - if (!qca_is_wcn399x(qcadev->btsoc_type)) { >> - gpiod_set_value_cansleep(qcadev->bt_en, 1); >> - /* Controller needs time to bootup. */ >> - msleep(150); >> - } else { >> + if (qca_is_wcn399x(qcadev->btsoc_type)) { >> hu->init_speed = qcadev->init_speed; >> hu->oper_speed = qcadev->oper_speed; >> - ret = qca_regulator_enable(qcadev); >> - if (ret) { >> - destroy_workqueue(qca->workqueue); >> - kfree_skb(qca->rx_skb); >> - hu->priv = NULL; >> - kfree(qca); >> - return ret; >> - } >> } >> } >> >> @@ -1531,6 +1517,31 @@ static int qca_wcn3990_init(struct hci_uart >> *hu) >> return 0; >> } >> >> +static int qca_power_on(struct hci_dev *hdev) >> +{ >> + struct hci_uart *hu = hci_get_drvdata(hdev); >> + enum qca_btsoc_type soc_type = qca_soc_type(hu); >> + struct qca_serdev *qcadev; >> + int ret = 0; >> + >> + /* Non-serdev device usually is powered by external power >> + * and don't need additional action in driver for power on >> + */ >> + if (!hu->serdev) >> + return 0; >> + >> + if (qca_is_wcn399x(soc_type)) { >> + ret = qca_wcn3990_init(hu); > > Since there is no real need to add the qca_regulator_enable() call from > qca_open() here qca_power_on() is now essentially a fancy wrapper for > qca_wcn3990_init(), but I guess that's ok. > >> + } else { >> + qcadev = serdev_device_get_drvdata(hu->serdev); >> + gpiod_set_value_cansleep(qcadev->bt_en, 1); >> + /* Controller needs time to bootup. */ >> + msleep(150); >> + } >> + >> + return ret; >> +} >> + >> static int qca_setup(struct hci_uart *hu) >> { >> struct hci_dev *hdev = hu->hdev; >> @@ -1562,7 +1573,7 @@ static int qca_setup(struct hci_uart *hu) >> set_bit(HCI_QUIRK_NON_PERSISTENT_SETUP, &hdev->quirks); >> set_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks); >> hu->hdev->shutdown = qca_power_off; >> - ret = qca_wcn3990_init(hu); >> + ret = qca_power_on(hdev); >> if (ret) >> return ret; >> >> @@ -1571,6 +1582,9 @@ static int qca_setup(struct hci_uart *hu) >> return ret; >> } else { >> bt_dev_info(hdev, "ROME setup"); >> + ret = qca_power_on(hdev); >> + if (ret) >> + return ret; >> qca_set_speed(hu, QCA_INIT_SPEED); >> } > > It would be nice if we could get away with a single qca_power_on() call > for WCN399x and ROME. How about this before 'if > (qca_is_wcn399x(soc_type))': > > bt_dev_info(hdev, "setting up %s", > qca_is_wcn399x(soc_type)? "wcn399x" : "ROME"); > > ret = qca_power_on(hdev); > if (ret) > return ret; > > > In any case: > > Reviewed-by: Matthias Kaehlcke <mka@chromium.org> Makes sense will do that
diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c index 82e4cd4b6663..427e381a08b4 100644 --- a/drivers/bluetooth/hci_qca.c +++ b/drivers/bluetooth/hci_qca.c @@ -541,7 +541,6 @@ static int qca_open(struct hci_uart *hu) { struct qca_serdev *qcadev; struct qca_data *qca; - int ret; BT_DBG("hu %p qca_open", hu); @@ -582,23 +581,10 @@ static int qca_open(struct hci_uart *hu) hu->priv = qca; if (hu->serdev) { - qcadev = serdev_device_get_drvdata(hu->serdev); - if (!qca_is_wcn399x(qcadev->btsoc_type)) { - gpiod_set_value_cansleep(qcadev->bt_en, 1); - /* Controller needs time to bootup. */ - msleep(150); - } else { + if (qca_is_wcn399x(qcadev->btsoc_type)) { hu->init_speed = qcadev->init_speed; hu->oper_speed = qcadev->oper_speed; - ret = qca_regulator_enable(qcadev); - if (ret) { - destroy_workqueue(qca->workqueue); - kfree_skb(qca->rx_skb); - hu->priv = NULL; - kfree(qca); - return ret; - } } } @@ -1531,6 +1517,31 @@ static int qca_wcn3990_init(struct hci_uart *hu) return 0; } +static int qca_power_on(struct hci_dev *hdev) +{ + struct hci_uart *hu = hci_get_drvdata(hdev); + enum qca_btsoc_type soc_type = qca_soc_type(hu); + struct qca_serdev *qcadev; + int ret = 0; + + /* Non-serdev device usually is powered by external power + * and don't need additional action in driver for power on + */ + if (!hu->serdev) + return 0; + + if (qca_is_wcn399x(soc_type)) { + ret = qca_wcn3990_init(hu); + } else { + qcadev = serdev_device_get_drvdata(hu->serdev); + gpiod_set_value_cansleep(qcadev->bt_en, 1); + /* Controller needs time to bootup. */ + msleep(150); + } + + return ret; +} + static int qca_setup(struct hci_uart *hu) { struct hci_dev *hdev = hu->hdev; @@ -1562,7 +1573,7 @@ static int qca_setup(struct hci_uart *hu) set_bit(HCI_QUIRK_NON_PERSISTENT_SETUP, &hdev->quirks); set_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks); hu->hdev->shutdown = qca_power_off; - ret = qca_wcn3990_init(hu); + ret = qca_power_on(hdev); if (ret) return ret; @@ -1571,6 +1582,9 @@ static int qca_setup(struct hci_uart *hu) return ret; } else { bt_dev_info(hdev, "ROME setup"); + ret = qca_power_on(hdev); + if (ret) + return ret; qca_set_speed(hu, QCA_INIT_SPEED); }
This patch adds a unified API qca_power_on() to support both wcn399x and Rome power on. For wcn399x it calls the qca_wcn3990_init() to init the regulators, and for Rome it pulls up the bt_en GPIO to power up the btsoc. It also moves all the power up operation from hdev->open() to hdev->setup(). Signed-off-by: Rocky Liao <rjliao@codeaurora.org> --- Changes in v2: None Changes in v3: -combined the changes of patch 2 and 3 into this patch -updated the commit message drivers/bluetooth/hci_qca.c | 46 ++++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 16 deletions(-)