From: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
To: sean.wang@mediatek.com, marcel@holtmann.org,
johan.hedberg@gmail.com, luiz.dentz@gmail.com
Cc: Soul.Huang@mediatek.com, YN.Chen@mediatek.com,
Leon.Yen@mediatek.com, Eric-SY.Chang@mediatek.com,
Deren.Wu@mediatek.com, km.lin@mediatek.com,
robin.chiu@mediatek.com, Eddie.Chen@mediatek.com,
ch.yeh@mediatek.com, posh.sun@mediatek.com,
ted.huang@mediatek.com, Stella.Chang@mediatek.com,
Tom.Chou@mediatek.com, steve.lee@mediatek.com, jsiuda@google.com,
frankgor@google.com, abhishekpandit@google.com,
michaelfsun@google.com, abhishekpandit@chromium.org,
mcchou@chromium.org, shawnku@google.com,
linux-bluetooth@vger.kernel.org,
linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 1/3] Bluetooth: btusb: mediatek: use readx_poll_timeout instead of open coding
Date: Fri, 30 Sep 2022 10:48:22 +0200 [thread overview]
Message-ID: <58a119b4-78a7-8254-b986-e1dd6b515e23@collabora.com> (raw)
In-Reply-To: <ab8958da839ecadc0ebff9f0a221ef49a2e5a4cc.1664497281.git.objelf@gmail.com>
Il 30/09/22 02:23, sean.wang@mediatek.com ha scritto:
> From: Sean Wang <sean.wang@mediatek.com>
>
> Use readx_poll_timeout instead of open coding to poll the hardware reset
> status until it is done.
>
> Signed-off-by: Sean Wang <sean.wang@mediatek.com>
> ---
> The patch is built and tested on the top of the patches
> [v6,1/3] Bluetooth: Add support for hci devcoredump
> [v6,2/3] Bluetooth: btusb: Add btusb devcoredump support
> [v6,3/3] Bluetooth: btintel: Add Intel devcoredump support
> which are contributed from Manish Mandlik
>
> v2: use 20ms as the unit to poll according to the requirement of
> readx_poll_timeout
> ---
> drivers/bluetooth/btusb.c | 32 ++++++++++++++++++--------------
> 1 file changed, 18 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
> index 4eb79e88f1d9..9ef0dc648573 100644
> --- a/drivers/bluetooth/btusb.c
> +++ b/drivers/bluetooth/btusb.c
> @@ -2361,8 +2361,6 @@ static int btusb_send_frame_intel(struct hci_dev *hdev, struct sk_buff *skb)
> #define MTK_EP_RST_OPT 0x74011890
> #define MTK_EP_RST_IN_OUT_OPT 0x00010001
> #define MTK_BT_RST_DONE 0x00000100
> -#define MTK_BT_RESET_WAIT_MS 100
> -#define MTK_BT_RESET_NUM_TRIES 10
>
> static void btusb_mtk_wmt_recv(struct urb *urb)
> {
> @@ -2733,6 +2731,16 @@ static int btusb_mtk_id_get(struct btusb_data *data, u32 reg, u32 *id)
> return btusb_mtk_reg_read(data, reg, id);
> }
>
> +static u32 btusb_mtk_reset_done(struct hci_dev *hdev)
I'm sorry for not noticing that in v1, but...
...If you call this function "btusb_mtk_reset_done"...
> +{
> + struct btusb_data *data = hci_get_drvdata(hdev);
> + u32 val = 0;
> +
> + btusb_mtk_uhw_reg_read(data, MTK_BT_MISC, &val);
> +
> + return val;
...you shouldn't return the value of the entire MTK_BT_MISC register,
otherwise you should call this "btusb_mtk_read_bt_misc_reg".
I think that here, you should do
return val & MTK_BT_RST_DONE;
and then, for the readx_poll_timeout, you simply check if this function
returned 1, like:
err = readx_poll_timeout(btusb_mtk_reset_done, hdev, val, val,
20000, 1000000);
> +}
> +
> static int btusb_mtk_setup(struct hci_dev *hdev)
> {
> struct btusb_data *data = hci_get_drvdata(hdev);
> @@ -2922,7 +2930,7 @@ static void btusb_mtk_cmd_timeout(struct hci_dev *hdev)
> {
> struct btusb_data *data = hci_get_drvdata(hdev);
> u32 val;
> - int err, retry = 0;
> + int err;
>
> /* It's MediaTek specific bluetooth reset mechanism via USB */
> if (test_and_set_bit(BTUSB_HW_RESET_ACTIVE, &data->flags)) {
> @@ -2953,18 +2961,14 @@ static void btusb_mtk_cmd_timeout(struct hci_dev *hdev)
> btusb_mtk_uhw_reg_write(data, MTK_BT_SUBSYS_RST, 0);
> btusb_mtk_uhw_reg_read(data, MTK_BT_SUBSYS_RST, &val);
>
> - /* Poll the register until reset is completed */
> - do {
> - btusb_mtk_uhw_reg_read(data, MTK_BT_MISC, &val);
> - if (val & MTK_BT_RST_DONE) {
> - bt_dev_dbg(hdev, "Bluetooth Reset Successfully");
> - break;
> - }
> + err = readx_poll_timeout(btusb_mtk_reset_done, hdev, val,
> + val & MTK_BT_RST_DONE,
> + 20000, 1000000);
> + if (err < 0)
> + bt_dev_err(hdev, "Reset timeout");
>
> - bt_dev_dbg(hdev, "Polling Bluetooth Reset CR");
> - retry++;
> - msleep(MTK_BT_RESET_WAIT_MS);
> - } while (retry < MTK_BT_RESET_NUM_TRIES);
> + if (val & MTK_BT_RST_DONE)
You're already checking `if (err < 0)`, so this check is redundant.
If the polling didn't return a timeout, the register value contains
MTK_BT_RST_DONE for sure, so you can safely remove this check.
> + bt_dev_dbg(hdev, "Bluetooth Reset Successfully");
>
Regards,
Angelo
prev parent reply other threads:[~2022-09-30 8:48 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-30 0:23 [PATCH v2 1/3] Bluetooth: btusb: mediatek: use readx_poll_timeout instead of open coding sean.wang
2022-09-30 0:23 ` [PATCH v2 2/3] Bluetooth: btmtk: introduce btmtk reset work sean.wang
2022-09-30 0:23 ` [PATCH v2 3/3] Bluetooth: btusb: mediatek: add MediaTek devcoredump support sean.wang
2022-09-30 11:38 ` kernel test robot
2022-09-30 12:21 ` kernel test robot
2022-09-30 12:41 ` kernel test robot
2022-10-03 0:02 ` kernel test robot
2022-09-30 4:01 ` [v2,1/3] Bluetooth: btusb: mediatek: use readx_poll_timeout instead of open coding bluez.test.bot
2022-09-30 8:48 ` AngeloGioacchino Del Regno [this message]
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=58a119b4-78a7-8254-b986-e1dd6b515e23@collabora.com \
--to=angelogioacchino.delregno@collabora.com \
--cc=Deren.Wu@mediatek.com \
--cc=Eddie.Chen@mediatek.com \
--cc=Eric-SY.Chang@mediatek.com \
--cc=Leon.Yen@mediatek.com \
--cc=Soul.Huang@mediatek.com \
--cc=Stella.Chang@mediatek.com \
--cc=Tom.Chou@mediatek.com \
--cc=YN.Chen@mediatek.com \
--cc=abhishekpandit@chromium.org \
--cc=abhishekpandit@google.com \
--cc=ch.yeh@mediatek.com \
--cc=frankgor@google.com \
--cc=johan.hedberg@gmail.com \
--cc=jsiuda@google.com \
--cc=km.lin@mediatek.com \
--cc=linux-bluetooth@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=luiz.dentz@gmail.com \
--cc=marcel@holtmann.org \
--cc=mcchou@chromium.org \
--cc=michaelfsun@google.com \
--cc=posh.sun@mediatek.com \
--cc=robin.chiu@mediatek.com \
--cc=sean.wang@mediatek.com \
--cc=shawnku@google.com \
--cc=steve.lee@mediatek.com \
--cc=ted.huang@mediatek.com \
/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).