From: Rocky Liao <rjliao@codeaurora.org>
To: Matthias Kaehlcke <mka@chromium.org>
Cc: marcel@holtmann.org, johan.hedberg@gmail.com,
linux-kernel@vger.kernel.org, linux-bluetooth@vger.kernel.org,
linux-arm-msm@vger.kernel.org,
linux-bluetooth-owner@vger.kernel.org
Subject: Re: [PATCH v3] Bluetooth: hci_qca: Add qca_power_on() API to support both wcn399x and Rome power up
Date: Fri, 10 Jan 2020 11:07:01 +0800 [thread overview]
Message-ID: <0bb0cf0a61324da281767fe9d01bc5c3@codeaurora.org> (raw)
In-Reply-To: <20200109190547.GF89495@google.com>
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
next prev parent reply other threads:[~2020-01-10 3:07 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-07 5:26 [PATCH v1] Bluetooth: hci_qca: Add qca_power_on() API to support both wcn399x and Rome power up Rocky Liao
2020-01-07 17:31 ` Matthias Kaehlcke
2020-01-08 3:02 ` Rocky Liao
2020-01-08 9:08 ` [PATCH v2 1/3] " Rocky Liao
2020-01-08 9:08 ` [PATCH v2 2/3] Bluetooth: hci_qca: Move the power on from open() to setup() for QCA Rome Rocky Liao
2020-01-08 9:08 ` [PATCH v2 3/3] Bluetooth: hci_qca: Use unified API qca_power_on() to power up wcn399x Rocky Liao
2020-01-08 18:34 ` [PATCH v2 1/3] Bluetooth: hci_qca: Add qca_power_on() API to support both wcn399x and Rome power up Matthias Kaehlcke
2020-01-09 3:22 ` Rocky Liao
2020-01-09 3:37 ` Rocky Liao
2020-01-09 5:14 ` [PATCH v3] " Rocky Liao
2020-01-09 19:05 ` Matthias Kaehlcke
2020-01-10 3:07 ` Rocky Liao [this message]
2020-01-10 3:32 ` [PATCH v4] " Rocky Liao
2020-01-11 0:31 ` Matthias Kaehlcke
2020-01-13 3:53 ` Rocky Liao
2020-01-13 4:29 ` Rocky Liao
2020-01-13 4:31 ` Rocky Liao
2020-01-13 4:31 ` Rocky Liao
2020-01-13 4:30 ` [PATCH v5] " Rocky Liao
2020-01-14 13:55 ` Marcel Holtmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0bb0cf0a61324da281767fe9d01bc5c3@codeaurora.org \
--to=rjliao@codeaurora.org \
--cc=johan.hedberg@gmail.com \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-bluetooth-owner@vger.kernel.org \
--cc=linux-bluetooth@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marcel@holtmann.org \
--cc=mka@chromium.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).