On Tue, Jan 2, 2024 at 6:49 AM Hao Qin <hao.qin@xxxxxxxxxxxx> wrote: > > From: "hao.qin" <hao.qin@xxxxxxxxxxxx> > > Extract function btusb_mtk_subsys_reset from btusb_mtk_reset > for future handling of resetting bluetooth controller without > USB reset. > > Signed-off-by: hao.qin <hao.qin@xxxxxxxxxxxx> > The patch doesn't modify any logic; it simply divides the existing logic into two parts, each prepared to be called in a specific context. Thus, Acked-by: Sean Wang <sean.wang@xxxxxxxxxx> > --- > V1 -> V2: refactor btusb_mtk_reset function > > Link: > https://lore.kernel.org/all/20231215063714.7684-1-hao.qin@xxxxxxxxxxxx/ > --- > drivers/bluetooth/btusb.c | 45 +++++++++++++++++++++++---------------- > 1 file changed, 27 insertions(+), 18 deletions(-) > > diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c > index 0926e4451802..abefcd1a089d 100644 > --- a/drivers/bluetooth/btusb.c > +++ b/drivers/bluetooth/btusb.c > @@ -2994,28 +2994,13 @@ static u32 btusb_mtk_reset_done(struct hci_dev *hdev) > return val & MTK_BT_RST_DONE; > } > > -static int btusb_mtk_reset(struct hci_dev *hdev, void *rst_data) > +static int btusb_mtk_subsys_reset(struct hci_dev *hdev, u32 dev_id) > { > struct btusb_data *data = hci_get_drvdata(hdev); > - struct btmediatek_data *mediatek; > u32 val; > int err; > > - /* It's MediaTek specific bluetooth reset mechanism via USB */ > - if (test_and_set_bit(BTUSB_HW_RESET_ACTIVE, &data->flags)) { > - bt_dev_err(hdev, "last reset failed? Not resetting again"); > - return -EBUSY; > - } > - > - err = usb_autopm_get_interface(data->intf); > - if (err < 0) > - return err; > - > - btusb_stop_traffic(data); > - usb_kill_anchored_urbs(&data->tx_anchor); > - mediatek = hci_get_priv(hdev); > - > - if (mediatek->dev_id == 0x7925) { > + if (dev_id == 0x7925) { > btusb_mtk_uhw_reg_read(data, MTK_BT_RESET_REG_CONNV3, &val); > val |= (1 << 5); > btusb_mtk_uhw_reg_write(data, MTK_BT_RESET_REG_CONNV3, val); > @@ -3059,8 +3044,32 @@ static int btusb_mtk_reset(struct hci_dev *hdev, void *rst_data) > if (!val) > bt_dev_err(hdev, "Can't get device id, subsys reset fail."); > > - usb_queue_reset_device(data->intf); > + return err; > +} > > +static int btusb_mtk_reset(struct hci_dev *hdev, void *rst_data) > +{ > + struct btusb_data *data = hci_get_drvdata(hdev); > + struct btmediatek_data *mediatek; > + int err; > + > + /* It's MediaTek specific bluetooth reset mechanism via USB */ > + if (test_and_set_bit(BTUSB_HW_RESET_ACTIVE, &data->flags)) { > + bt_dev_err(hdev, "last reset failed? Not resetting again"); > + return -EBUSY; > + } > + > + err = usb_autopm_get_interface(data->intf); > + if (err < 0) > + return err; > + > + btusb_stop_traffic(data); > + usb_kill_anchored_urbs(&data->tx_anchor); > + mediatek = hci_get_priv(hdev); > + > + err = btusb_mtk_subsys_reset(hdev, mediatek->dev_id); > + > + usb_queue_reset_device(data->intf); > clear_bit(BTUSB_HW_RESET_ACTIVE, &data->flags); > > return err; > -- > 2.18.0 > >
