From patchwork Thu Jul 22 11:18:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: You-Sheng Yang X-Patchwork-Id: 1508641 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GVqhq6Bzyz9shx; Thu, 22 Jul 2021 21:19:07 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1m6WjI-0006ky-4F; Thu, 22 Jul 2021 11:19:04 +0000 Received: from mail-pl1-f173.google.com ([209.85.214.173]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1m6WjF-0006jR-MB for kernel-team@lists.ubuntu.com; Thu, 22 Jul 2021 11:19:01 +0000 Received: by mail-pl1-f173.google.com with SMTP id c15so4061098pls.13 for ; Thu, 22 Jul 2021 04:19:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HjrwoF1Bax0IQqw7v/3YHDnVprFagEuOt0MFSwxV5gw=; b=eEMnaLt6AHnkjZ31art1yger1hIpznAPYhKkm0LH4KeVY7+f/6CM3oh+jnpdfQj5/P GFeH7quMMmfDIUijG0tD5PYSVLzhK5Udm6F9sWcfRUQ20DQMwa4pfD6g91Fcr7JN3dU4 Ir/PDxdW5wwCsTk0nzOz2QXn19NiGy1veJ/R+kuamOuW8Ld3agVw4aNq2NuTv0keUGP/ d/h5444ahzrQXIhvBeu0tyxw5X+ASVya26ZNpGgDB8ySHkFkCKMFk9gWL2jJsGDLQQ7Y qp+RYYCz4a3JcJl/Qfhv67K+YiewQVKf5IWxEL3/v+xdfM2YwuEORl9y0w1M4RUbLrKR iq9Q== X-Gm-Message-State: AOAM533VCvyQIMlHwaqnJwn98C2kgHPNseUvdRx33We8+ICBrbsCjtoF w9tb2uD6EyhkfzZ7mug7An1Rf/jQJCesVw== X-Google-Smtp-Source: ABdhPJy8nVaL51jmqYRVI+SsDTrQ9IQP7v/aYIUTyBbgvphCtmR3xLuwhdUmqyG3GsCIwrNgYme48A== X-Received: by 2002:a62:ed06:0:b029:32c:a800:ba47 with SMTP id u6-20020a62ed060000b029032ca800ba47mr40450842pfh.56.1626952739836; Thu, 22 Jul 2021 04:18:59 -0700 (PDT) Received: from localhost (61-220-137-37.HINET-IP.hinet.net. [61.220.137.37]) by smtp.gmail.com with ESMTPSA id cx4sm2754815pjb.53.2021.07.22.04.18.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jul 2021 04:18:59 -0700 (PDT) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [PATCH v2 1/6][SRU][H] Bluetooth: btusb: Fixed too many in-token issue for Mediatek Chip. Date: Thu, 22 Jul 2021 19:18:48 +0800 Message-Id: <20210722111853.909459-3-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210722111853.909459-1-vicamo.yang@canonical.com> References: <20210722111853.909459-1-vicamo.yang@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.214.173; envelope-from=vicamo@gmail.com; helo=mail-pl1-f173.google.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: "mark-yw.chen" BugLink: https://bugs.launchpad.net/bugs/1937004 This patch reduce in-token during download patch procedure. Don't submit urb for polling event before sending hci command. Signed-off-by: mark-yw.chen Signed-off-by: Marcel Holtmann (cherry picked from commit 8454ed9ff9647e31e061fb5eb2e39ce79bc5e960) Signed-off-by: You-Sheng Yang --- drivers/bluetooth/btusb.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 9875cb4078a1..2be2cbf51475 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -3330,11 +3330,6 @@ static int btusb_mtk_hci_wmt_sync(struct hci_dev *hdev, struct btmtk_wmt_hdr *hdr; int err; - /* Submit control IN URB on demand to process the WMT event */ - err = btusb_mtk_submit_wmt_recv_urb(hdev); - if (err < 0) - return err; - /* Send the WMT command and wait until the WMT event returns */ hlen = sizeof(*hdr) + wmt_params->dlen; if (hlen > 255) @@ -3356,6 +3351,11 @@ static int btusb_mtk_hci_wmt_sync(struct hci_dev *hdev, return err; } + /* Submit control IN URB on demand to process the WMT event */ + err = btusb_mtk_submit_wmt_recv_urb(hdev); + if (err < 0) + return err; + /* The vendor specific WMT commands are all answered by a vendor * specific event and will have the Command Status or Command * Complete as with usual HCI command flow control.