From patchwork Tue May 2 23:02:40 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: 89516 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp954760vqo; Tue, 2 May 2023 16:19:16 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4n0IaZZvZ4Yj2lmyUiPQSdlwcYPgG7xqzUrg4nsXP35FPWMSc4NKUqQz5DsfvyzQhb9inE X-Received: by 2002:a17:902:6a8b:b0:1a8:4506:a36f with SMTP id n11-20020a1709026a8b00b001a84506a36fmr176404plk.25.1683069556578; Tue, 02 May 2023 16:19:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683069556; cv=none; d=google.com; s=arc-20160816; b=UNh8X3nW+eFwKTtXwpeiPOGplZ75pds1veN6rA9lr9mHvoFWio2tRyU1UE2+joH97y Tkftyi1XEtFt7vzKgGHdfBQTRGw7HnsaNax6jIo9okg8oi8Yg74EPQHWBXb52Fwsn7Pa qy6/dZAL58cR/iex8+VT/cBLJECK5pKOr32T6CURi8R1Cwi2H+8NoZyK6rdv+hIKHy7X OnvJ5rLWC2naC6DshDOn7vNxaE364PBbD9SqcycsXmv0Ilv8wYXdYxyiDnoDb005w6sb 2XQEqBZv75d5YJAelNE1ISJKvc45POHmhPOVzopZB7xDer3GLf8mkicFX1CMgF917oDW kbQw== 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=nHVEPYLguKcpy/6oCAIqC8r0dEnyeHELgnO194+UDO8=; b=aMyctDcVrYfI8rsx532e25ImDujLA5RERGfq2KTUxMJ6QNHCNmrpLwgBNHLGcPdMqf i51wXcDCOHVGYJsi9uKZWaPetnT629sVvIq+8gdSjG/uWXtcln2NNnMtro5mOcjTFGeO Vamhk0EninmgN2xHDp4kg+IH4+B1ybi9dq6vexubqClNYSpHbrKs1kiUFf8gKTXlBqrs ogaExO7IwQz0MUm/cBKNnaAYvHMs5Rqb+V2UpZG7KF8vcJhilINHcm98nJllc+h2lVCQ 6krN1YlIPtoq5SkjvuIrqhLDGAzVglo5buxaD6+h6TpyJWs44tTLbAZbnh7ievI3xaqO xi3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@mediatek.com header.s=dk header.b=OfII5III; 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 a8-20020a170902ecc800b001a0ae87878dsi33359201plh.388.2023.05.02.16.19.01; Tue, 02 May 2023 16:19:16 -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=OfII5III; 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 S229838AbjEBXDC (ORCPT + 99 others); Tue, 2 May 2023 19:03:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52612 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229756AbjEBXDA (ORCPT ); Tue, 2 May 2023 19:03:00 -0400 Received: from mailgw01.mediatek.com (unknown [60.244.123.138]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 75E4B273A; Tue, 2 May 2023 16:02:54 -0700 (PDT) X-UUID: 744a450ee93d11ed9cb5633481061a41-20230503 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=nHVEPYLguKcpy/6oCAIqC8r0dEnyeHELgnO194+UDO8=; b=OfII5IIIAH67W5Jw3t9yvTKmYpDpHXuwS6kK1PqjJRaXXTG70FY7MUVpFvzJRwkpOwd3t/jCaRzOiVOm5qnrc0UnUHaaaD/RP3nF8O+9gjgm6/I2l/pJ44g6kA8t3sL2Kq6yZmLdvbOlRSmm80iEzA7XRBja8xCiTKxcoUJ7zkk=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.22,REQID:78669f1f-9b67-4eca-b5c3-32aea9918a9b,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:75288f6a-2f20-4998-991c-3b78627e4938,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: 744a450ee93d11ed9cb5633481061a41-20230503 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 1190135545; Wed, 03 May 2023 07:02:47 +0800 Received: from mtkmbs13n2.mediatek.inc (172.21.101.108) by mtkmbs11n2.mediatek.inc (172.21.101.187) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Wed, 3 May 2023 07:02:45 +0800 Received: from mtkswgap22.mediatek.inc (172.21.77.33) by mtkmbs13n2.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1118.26 via Frontend Transport; Wed, 3 May 2023 07:02:45 +0800 From: To: , , CC: , , , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v5 1/3] Bluetooth: btusb: mediatek: use readx_poll_timeout instead of open coding Date: Wed, 3 May 2023 07:02:40 +0800 Message-ID: X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 X-MTK: N X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE,UNPARSEABLE_RELAY autolearn=no 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?1764826343016511931?= X-GMAIL-MSGID: =?utf-8?q?1764826343016511931?= 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, v5: 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)