Hi Rocky,
On Fri, Jan 10, 2020 at 11:32:14AM +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@xxxxxxxxxxxxxx>
> Reviewed-by: Matthias Kaehlcke <mka@xxxxxxxxxxxx>
> ---
>
> Changes in v2: None
> Changes in v3:
> -moved all the power up operation from open() to setup()
> -updated the commit message
> Changes in v4:
> -made a single call to qca_power_on() in setup()
>
>
> drivers/bluetooth/hci_qca.c | 48 +++++++++++++++++++++++--------------
> 1 file changed, 30 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
> index 82e4cd4b6663..6a67e5489b16 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;
> @@ -1553,6 +1564,10 @@ static int qca_setup(struct hci_uart *hu)
> */
> set_bit(HCI_QUIRK_SIMULTANEOUS_DISCOVERY, &hdev->quirks);
>
> + ret = qca_power_on(hdev);
> + if (ret)
> + return ret;
> +
Now if qca_power_on() fails there is no log entry indicating that Bluetooth
setup was running. That's why I suggested to put this log entry before
the call, and remove the corresponding entries from the if/else branches:
bt_dev_info(hdev, "setting up %s",
qca_is_wcn399x(soc_type)? "wcn399x" : "ROME");
> if (qca_is_wcn399x(soc_type)) {
> bt_dev_info(hdev, "setting up wcn3990");
>
> @@ -1562,9 +1577,6 @@ 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);
> - if (ret)
> - return ret;
>
> ret = qca_read_soc_version(hdev, &soc_ver, soc_type);
> if (ret)
> --
> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
