From patchwork Wed Apr 26 23:08:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sean.wang@mediatek.com X-Patchwork-Id: 88032 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp560849vqo; Wed, 26 Apr 2023 16:21:37 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7fV6adNU+PmLkewqoZpeE18GLpE+8vfTnHi0BHIiLKzzb4kVibb2At9NlNqehamlF7WduM X-Received: by 2002:a17:90a:4803:b0:246:5787:6f5d with SMTP id a3-20020a17090a480300b0024657876f5dmr4944974pjh.10.1682551297262; Wed, 26 Apr 2023 16:21:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682551297; cv=none; d=google.com; s=arc-20160816; b=e8SBd62O47qRFwMWtKBiVyAjul8veLKUpBuxYAYYKCwfs/yc8qHoZTBUL8v9o7vLyw ijxVqIqnEoiexrnXaVwa7L4D+YsY3sCVo4if4OtDeiclbDutUWeVEiDV6qcIA1PyGO6I 07A6gq99kZGyaIMWf6CtGAnIYuE5REGCyll8D1Blo0iyAjWkcuO0Zxb1fYDVIQGEOzTV NB4DFTTfN4blhmTvQJu4yBtbRn4XFT65chvp1AerDkrNtE7HHXoSFqvmSnVCcBM+9uNL qR0Q8WdQ4/EHRiEL/ts4DUKRUqpF/YPFO38Qlew2GUQfbCZgUybxZWI1T+P94zHiP2vh YBLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:date:subject:cc:to:from :dkim-signature; bh=LvCgUr2ETcJqr1CXGO9ztSMkSpF7OTl0p7qH3bPYTe8=; b=XMcl20Qo7FCYrVepi04b5fJNQTGMmh+cUQwETmyPGmZGBGv7reMFYhfD6JkwO8ZZgx lOcAS/C0sIrqp03vgGLZLAajkY6hLuzFxIY/72G0r91dBtPLFmL8QVqm7c+UkWLgotUI UpIW+dgNZU/e1aFKHMts0TY+gTIfXS2NwOspDSo8nhaAIgdA1dqaUjJlzKkucdqSsAyF faQ9SJXU69/Ecc9RtkzqmAyYvUOD6ZZQPUd6s1iOCudeCZNdvQyHWTbGBWakIhTFdSUX A8Vl+Zvfoyuvda86pDySLGmFCPjtphBOX1d7TvHzwNjpBGyDVJZYPiN3NGRU8ch0wwQS bvcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@mediatek.com header.s=dk header.b="g/otazdZ"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=mediatek.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 33-20020a630f61000000b0052117aaa3c2si17913428pgp.225.2023.04.26.16.21.25; Wed, 26 Apr 2023 16:21:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@mediatek.com header.s=dk header.b="g/otazdZ"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=mediatek.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239759AbjDZXJH (ORCPT + 99 others); Wed, 26 Apr 2023 19:09:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36688 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239440AbjDZXJF (ORCPT ); Wed, 26 Apr 2023 19:09:05 -0400 Received: from mailgw01.mediatek.com (unknown [60.244.123.138]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EB3093AA4; Wed, 26 Apr 2023 16:09:03 -0700 (PDT) X-UUID: 4d6c53e2e48711eda9a90f0bb45854f4-20230427 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:MIME-Version:Message-ID:Date:Subject:CC:To:From; bh=LvCgUr2ETcJqr1CXGO9ztSMkSpF7OTl0p7qH3bPYTe8=; b=g/otazdZGi/r3xlORWXphLGG8MsyTKxvaNBlGPzUKw1d1YDja4ZfZawc35IKcY45Yy9cGABd5hMJ5+9LOqtOvxitYqad8yRW0HNC28jZ0sWZwLZM2vUd9KeO8Hnm73VKg3xbNqCsD8C619pzz8eq1EZdAkW43SIpQsDaKw6sZ3Y=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.22,REQID:ab947dd4-ea1d-48fb-8577-123644497f59,IP:0,U RL:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION: release,TS:0 X-CID-META: VersionHash:120426c,CLOUDID:ad2442ec-db6f-41fe-8b83-13fe7ed1ef52,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:0,EDM:-3,IP:nil,U RL:11|1,File:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0 X-CID-BVR: 0,NGT X-CID-BAS: 0,NGT,0,_ X-UUID: 4d6c53e2e48711eda9a90f0bb45854f4-20230427 Received: from mtkmbs10n2.mediatek.inc [(172.21.101.183)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 2044046433; Thu, 27 Apr 2023 07:08:48 +0800 Received: from mtkmbs11n2.mediatek.inc (172.21.101.187) by mtkmbs13n1.mediatek.inc (172.21.101.193) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.25; Thu, 27 Apr 2023 07:08:47 +0800 Received: from mtkswgap22.mediatek.inc (172.21.77.33) by mtkmbs11n2.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1118.26 via Frontend Transport; Thu, 27 Apr 2023 07:08:47 +0800 From: To: , , CC: , , , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v4 1/3] Bluetooth: btusb: mediatek: use readx_poll_timeout instead of open coding Date: Thu, 27 Apr 2023 07:08:43 +0800 Message-ID: <4699f59b36d522ec263dcea71eda40ae939004f8.1682549719.git.objelf@gmail.com> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 X-MTK: N X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, SPF_PASS,T_SCC_BODY_TEXT_LINE,UNPARSEABLE_RELAY,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1764282909288947249?= X-GMAIL-MSGID: =?utf-8?q?1764282909288947249?= From: Sean Wang Use readx_poll_timeout instead of open coding to poll the hardware reset status until it is done. Signed-off-by: Sean Wang --- v2: use 20ms as the unit to poll according to the requirement of readx_poll_timeout v3: refine btusb_mtk_reset_done and drop the necessary error check in btusb_mtk_cmd_timeout v4: rebase onto the latest codebase --- drivers/bluetooth/btusb.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 2a8e2bb038f5..275e0666503d 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -2566,8 +2566,6 @@ static int btusb_setup_realtek(struct hci_dev *hdev) #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) { @@ -2938,6 +2936,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) +{ + struct btusb_data *data = hci_get_drvdata(hdev); + u32 val = 0; + + btusb_mtk_uhw_reg_read(data, MTK_BT_MISC, &val); + + return val & MTK_BT_RST_DONE; +} + static int btusb_mtk_setup(struct hci_dev *hdev) { struct btusb_data *data = hci_get_drvdata(hdev); @@ -3127,7 +3135,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)) { @@ -3158,18 +3166,10 @@ 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; - } - - bt_dev_dbg(hdev, "Polling Bluetooth Reset CR"); - retry++; - msleep(MTK_BT_RESET_WAIT_MS); - } while (retry < MTK_BT_RESET_NUM_TRIES); + 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"); btusb_mtk_id_get(data, 0x70010200, &val); if (!val)