Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2898EC433F5 for ; Thu, 2 Dec 2021 16:23:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1359284AbhLBQ0W (ORCPT ); Thu, 2 Dec 2021 11:26:22 -0500 Received: from smtp-out1.suse.de ([195.135.220.28]:54250 "EHLO smtp-out1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347508AbhLBQ0W (ORCPT ); Thu, 2 Dec 2021 11:26:22 -0500 Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out1.suse.de (Postfix) with ESMTP id F0FDD218A4; Thu, 2 Dec 2021 16:22:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1638462178; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=LSLxuh09b8G+BI4K8Qot10D/UYgbZa1tgpgrgWauM2g=; b=TlF9L0YiKBEDVI7gmxKcBeJjs6/YBQvgHkUBfC9Pmi/ZRIUjw3uqofRukh/f3QsNXFQMuf Uq0y9LcL2+0PFFBmVUV1Us1IpaEIAiBoFrCd05krXtGxIwne0vb2HBlpqaAJTYkAgLRqHD ZVDSDgm4a94IAHXTbT2QHgYGtIrI8Sg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1638462178; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=LSLxuh09b8G+BI4K8Qot10D/UYgbZa1tgpgrgWauM2g=; b=HQut+JjlznOLzeAs6MrmiPziiV4ivxLPUB7Bp/G5mfZ23slkbE2lSA0ZS2TO3CB2Dtpym1 zZtjfeSIvj+zsCAQ== Received: from alsa1.nue.suse.com (alsa1.suse.de [10.160.4.42]) by relay2.suse.de (Postfix) with ESMTP id DFFECA3B81; Thu, 2 Dec 2021 16:22:58 +0000 (UTC) From: Takashi Iwai To: linux-bluetooth@vger.kernel.org Cc: Marcel Holtmann , Johan Hedberg , Luiz Augusto von Dentz , Tedd Ho-Jeong An , linux-kernel@vger.kernel.org Subject: [PATCH] Bluetooth: Apply initial command workaround for more Intel chips Date: Thu, 2 Dec 2021 17:22:56 +0100 Message-Id: <20211202162256.31837-1-tiwai@suse.de> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org It seems that a few more Intel chips require the workaround for the broken initial command. At least, per openSUSE Bugzilla reports, 8087:0a2a and 8087:0026 need BTUSB_INTEL_BROKEN_INITIAL_NCMD flag. Fixes: 83f2dafe2a62 ("Bluetooth: btintel: Refactoring setup routine for legacy ROM sku") Buglink: https://bugzilla.opensuse.org/show_bug.cgi?id=1193124 Signed-off-by: Takashi Iwai --- drivers/bluetooth/btusb.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 75c83768c257..b26989b2df23 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -359,14 +359,16 @@ static const struct usb_device_id blacklist_table[] = { /* Intel Bluetooth devices */ { USB_DEVICE(0x8087, 0x0025), .driver_info = BTUSB_INTEL_COMBINED }, - { USB_DEVICE(0x8087, 0x0026), .driver_info = BTUSB_INTEL_COMBINED }, + { USB_DEVICE(0x8087, 0x0026), .driver_info = BTUSB_INTEL_COMBINED | + BTUSB_INTEL_BROKEN_INITIAL_NCMD }, { USB_DEVICE(0x8087, 0x0029), .driver_info = BTUSB_INTEL_COMBINED }, { USB_DEVICE(0x8087, 0x0032), .driver_info = BTUSB_INTEL_COMBINED }, { USB_DEVICE(0x8087, 0x0033), .driver_info = BTUSB_INTEL_COMBINED }, { USB_DEVICE(0x8087, 0x07da), .driver_info = BTUSB_CSR }, { USB_DEVICE(0x8087, 0x07dc), .driver_info = BTUSB_INTEL_COMBINED | BTUSB_INTEL_BROKEN_INITIAL_NCMD }, - { USB_DEVICE(0x8087, 0x0a2a), .driver_info = BTUSB_INTEL_COMBINED }, + { USB_DEVICE(0x8087, 0x0a2a), .driver_info = BTUSB_INTEL_COMBINED | + BTUSB_INTEL_BROKEN_INITIAL_NCMD }, { USB_DEVICE(0x8087, 0x0a2b), .driver_info = BTUSB_INTEL_COMBINED }, { USB_DEVICE(0x8087, 0x0aa7), .driver_info = BTUSB_INTEL_COMBINED }, { USB_DEVICE(0x8087, 0x0aaa), .driver_info = BTUSB_INTEL_COMBINED }, -- 2.31.1