Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp1397731ybz; Thu, 16 Apr 2020 08:28:01 -0700 (PDT) X-Google-Smtp-Source: APiQypJuQASQSJOGbp9xIumzjrgB5QocAgSZyDHL2DUBFnHfcDuHFbbKelQKR/4/NRC7IL8vdS9k X-Received: by 2002:a17:906:300a:: with SMTP id 10mr10324079ejz.139.1587050880908; Thu, 16 Apr 2020 08:28:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587050880; cv=none; d=google.com; s=arc-20160816; b=qsLACC+XhzzoH2upmihRFf/Qb777r8j8npXL8FFeKMEzvYKm2O9larymnQZXv81iEW Lvlw/LV6e9L5G82wyc3PgLh1UxZDEkM3h6k6hmsh5KyAISdilbAllATm4mbreA8UwB/J rJK58VSrAcsztbHjASEamOFTwBkbbrgoxiY0zImnAWzrPRrwqp28Z5v7m+58fistG5Jt UM3qoc1jXcoKtA9H0xR6LUI8FSTpPVDhhqhSZQVk+VIzNj2hv+rWN68OQJsm76p6UXZF hIQBmExbeyJqyXmzLRtm1L57WRnulE6w7HJaKnbC8IBTYGPdsNw3cOX1v7A/oVfhWVnI GKiQ== 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=xmfEamwl0UEHsAksPMidglinM5MDGmEc5qD2Th3mPbA=; b=fSMuLNGG+TcKRoWyFF0MlMkqZhCc67r9gSYKrQQT6rEga/HusqYslYgCkqavWLYtjL bBp9oVTs9Li1NExVu3ujFEexLVJtw06cxer3PJWQKrwAckZFjcba/efZHbCAm2jsyP9X ijMasbCkPF2RcWGMxkpfRHrn2c9ntFrd4BnBQbPoAlDFYZ2AjAA27RPwQkU1ytFx9G6Z FwWKZcmVBkxujhZ3tI0lHUQ9aRl6Riyr44LX4x5dK+5QQuSJSUnLCh386sG/IKgCR8B/ HRCjePoLzdg3ufozK0vxEBoE2aZ/6rFRYpdYFqy/pyAJhcB8NElFLXUH110Ea+aH7b+6 gZRA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=rHYASLNR; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id n25si11866767ejl.342.2020.04.16.08.27.37; Thu, 16 Apr 2020 08:28:00 -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=rHYASLNR; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2442436AbgDPPXF (ORCPT + 99 others); Thu, 16 Apr 2020 11:23:05 -0400 Received: from mail.kernel.org ([198.145.29.99]:58878 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2898508AbgDPNpZ (ORCPT ); Thu, 16 Apr 2020 09:45:25 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 0D97020732; Thu, 16 Apr 2020 13:45:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587044725; bh=/QZYw7QTWqP41HlNZ8UmRopMV6mswugDKj2mQSlQ36w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rHYASLNR/dbEpm/gzENO4F3OVfEYXp0sYlDcvJWic3TjTwyAY2u/qpwp0LMndFBIM Fy27AC0kx4nJZfMqM/Yr8Kb60+wMHFFhLuzQtsW+ua6SuKROFSbLWklvYy51sKUyQO Kck5crW1CS46sw+fSPmNi/qiqiQimBPADe0yYIdE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Takashi Iwai Subject: [PATCH 5.4 075/232] ALSA: usb-audio: Add mixer workaround for TRX40 and co Date: Thu, 16 Apr 2020 15:22:49 +0200 Message-Id: <20200416131324.631946621@linuxfoundation.org> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200416131316.640996080@linuxfoundation.org> References: <20200416131316.640996080@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 Iwai commit 2a48218f8e23d47bd3e23cfdfb8aa9066f7dc3e6 upstream. Some recent boards (supposedly with a new AMD platform) contain the USB audio class 2 device that is often tied with HD-audio. The device exposes an Input Gain Pad control (id=19, control=12) but this node doesn't behave correctly, returning an error for each inquiry of GET_MIN and GET_MAX that should have been mandatory. As a workaround, simply ignore this node by adding a usbmix_name_map table entry. The currently known devices are: * 0414:a002 - Gigabyte TRX40 Aorus Pro WiFi * 0b05:1916 - ASUS ROG Zenith II * 0b05:1917 - ASUS ROG Strix * 0db0:0d64 - MSI TRX40 Creator * 0db0:543d - MSI TRX40 BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=206543 Cc: Link: https://lore.kernel.org/r/20200408140449.22319-1-tiwai@suse.de Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/usb/mixer_maps.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) --- a/sound/usb/mixer_maps.c +++ b/sound/usb/mixer_maps.c @@ -349,6 +349,14 @@ static const struct usbmix_name_map dell { 0 } }; +/* Some mobos shipped with a dummy HD-audio show the invalid GET_MIN/GET_MAX + * response for Input Gain Pad (id=19, control=12). Skip it. + */ +static const struct usbmix_name_map asus_rog_map[] = { + { 19, NULL, 12 }, /* FU, Input Gain Pad */ + {} +}; + /* * Control map entries */ @@ -468,6 +476,26 @@ static struct usbmix_ctl_map usbmix_ctl_ .id = USB_ID(0x05a7, 0x1020), .map = bose_companion5_map, }, + { /* Gigabyte TRX40 Aorus Pro WiFi */ + .id = USB_ID(0x0414, 0xa002), + .map = asus_rog_map, + }, + { /* ASUS ROG Zenith II */ + .id = USB_ID(0x0b05, 0x1916), + .map = asus_rog_map, + }, + { /* ASUS ROG Strix */ + .id = USB_ID(0x0b05, 0x1917), + .map = asus_rog_map, + }, + { /* MSI TRX40 Creator */ + .id = USB_ID(0x0db0, 0x0d64), + .map = asus_rog_map, + }, + { /* MSI TRX40 */ + .id = USB_ID(0x0db0, 0x543d), + .map = asus_rog_map, + }, { 0 } /* terminator */ };