Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp4161803pxk; Tue, 8 Sep 2020 12:15:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxWJYj87u395HzI4hvjLzQWZTCguR2oUUydIwosbzO97XuRk6/BLX0F/XSQcxmbaxUQ1jxD X-Received: by 2002:a17:906:28c4:: with SMTP id p4mr27329927ejd.345.1599592534274; Tue, 08 Sep 2020 12:15:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599592534; cv=none; d=google.com; s=arc-20160816; b=f17BIv2a5lEOeKv/hpAvVRLiDTPMqyFXVp6+9ZohnafStlFDg5khyiMftsnW6vc9WF i9WBrjZMOPOrw+Au3psRp6f2gPS7eWj09eAeuEfwvGTYGm/j53SDIP8kfuychwAuNV+9 ooV6hyoENP4VqEZd0zNnspSGDbnHfjajjyFx9ypu8/EhE+CL+K89/NVTWmIX/yalIQGH BlI2K2x2eAwqlRgSnYnpa5UOIwFjNsqVpaPr9rQU0/HIEfO1CFs7NfpqGeGNBHi9llWC sT4pijdXJ1cedbxKrBybU7TRE+PbFrVQ/Pe0L2i7FmnkOuf7IKtF9OD1ERi21xM244lj DIkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Wiq6mcdvVxcOtejmvvQKPYljUwRrTr1SOhFS2gx2tio=; b=O8hycqDZHQkdkabHXkjLeP+/Pt7qNhoB6VkiG4QyQOtgNT8kKQgNwoIdx2V8XqX5sY Z0SXilR93yatQ3kw2LJeQKBis7d60R8G9cTOcljR1WBzqtTuJN4kz8oM32a6gYuVKYG3 ykl3NvhyieNkDmEQs4PtMOYF2kqaSOn1qCa4CmWfAxRTX2yIuLbj4zMna1l9SWO/YYX9 0VUdPmYpaaI7PY2/Rp1nV8C4i5hlmIEXGTDn8vqsEno1HedZWni7gYgrxaA0L6kXyGDW X6qECsLwlZ7MB3uHLzdlrl6fOmi2sfsMPggGs1zkChBf4YXIqbaOHa+R/H8wWRmgDq4m ZnLw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=q6aw9ETK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ga23si12249314ejb.691.2020.09.08.12.15.11; Tue, 08 Sep 2020 12:15:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=q6aw9ETK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731838AbgIHTMA (ORCPT + 99 others); Tue, 8 Sep 2020 15:12:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:52180 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731220AbgIHQFW (ORCPT ); Tue, 8 Sep 2020 12:05:22 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2A7E0223C6; Tue, 8 Sep 2020 15:45:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599579944; bh=RVr8PcWE29fyPNXwUF/aGB4qkOtdGavpST2mHQkdMws=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=q6aw9ETKaZSVA2LmUUQ0G4qNdBuf0fRcU5eS60PshHg9dVnOwR8q/I7qDcvnrlD/D pd8Y7RsofM3XkEMvB6ZmmjLait1e3xAvQyMY3Xon6PJK4/VPAoFXSkL6LMVTRsWwSD 4lz9sUh8tfP+Yw7IXTsH6p10dhyuaSHdbBt/e6qc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Takashi Sakamoto , Takashi Iwai Subject: [PATCH 5.4 096/129] ALSA; firewire-tascam: exclude Tascam FE-8 from detection Date: Tue, 8 Sep 2020 17:25:37 +0200 Message-Id: <20200908152234.582088314@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200908152229.689878733@linuxfoundation.org> References: <20200908152229.689878733@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Takashi Sakamoto commit 0bd8bce897b6697bbc286b8ba473aa0705fe394b upstream. Tascam FE-8 is known to support communication by asynchronous transaction only. The support can be implemented in userspace application and snd-firewire-ctl-services project has the support. However, ALSA firewire-tascam driver is bound to the model. This commit changes device entries so that the model is excluded. In a commit 53b3ffee7885 ("ALSA: firewire-tascam: change device probing processing"), I addressed to the concern that version field in configuration differs depending on installed firmware. However, as long as I checked, the version number is fixed. It's safe to return version number back to modalias. Fixes: 53b3ffee7885 ("ALSA: firewire-tascam: change device probing processing") Cc: # 4.4+ Signed-off-by: Takashi Sakamoto Link: https://lore.kernel.org/r/20200823075537.56255-1-o-takashi@sakamocchi.jp Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/firewire/tascam/tascam.c | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) --- a/sound/firewire/tascam/tascam.c +++ b/sound/firewire/tascam/tascam.c @@ -39,9 +39,6 @@ static const struct snd_tscm_spec model_ .midi_capture_ports = 2, .midi_playback_ports = 4, }, - // This kernel module doesn't support FE-8 because the most of features - // can be implemented in userspace without any specific support of this - // module. }; static int identify_model(struct snd_tscm *tscm) @@ -211,11 +208,39 @@ static void snd_tscm_remove(struct fw_un } static const struct ieee1394_device_id snd_tscm_id_table[] = { + // Tascam, FW-1884. + { + .match_flags = IEEE1394_MATCH_VENDOR_ID | + IEEE1394_MATCH_SPECIFIER_ID | + IEEE1394_MATCH_VERSION, + .vendor_id = 0x00022e, + .specifier_id = 0x00022e, + .version = 0x800000, + }, + // Tascam, FE-8 (.version = 0x800001) + // This kernel module doesn't support FE-8 because the most of features + // can be implemented in userspace without any specific support of this + // module. + // + // .version = 0x800002 is unknown. + // + // Tascam, FW-1082. + { + .match_flags = IEEE1394_MATCH_VENDOR_ID | + IEEE1394_MATCH_SPECIFIER_ID | + IEEE1394_MATCH_VERSION, + .vendor_id = 0x00022e, + .specifier_id = 0x00022e, + .version = 0x800003, + }, + // Tascam, FW-1804. { .match_flags = IEEE1394_MATCH_VENDOR_ID | - IEEE1394_MATCH_SPECIFIER_ID, + IEEE1394_MATCH_SPECIFIER_ID | + IEEE1394_MATCH_VERSION, .vendor_id = 0x00022e, .specifier_id = 0x00022e, + .version = 0x800004, }, {} };