From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 78BF2C43387 for ; Mon, 31 Dec 2018 08:11:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 54F3C21019 for ; Mon, 31 Dec 2018 08:11:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727131AbeLaILW (ORCPT ); Mon, 31 Dec 2018 03:11:22 -0500 Received: from mx2.suse.de ([195.135.220.15]:34210 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726033AbeLaILV (ORCPT ); Mon, 31 Dec 2018 03:11:21 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 069F2AE55; Mon, 31 Dec 2018 08:11:20 +0000 (UTC) Date: Mon, 31 Dec 2018 09:11:19 +0100 Message-ID: From: Takashi Iwai To: Pierre-Louis Bossart Cc: Takashi Iwai , Linus Torvalds , Ingo Molnar , Mark Brown , Liam Girdwood , Linux Kernel Mailing List Subject: Re: [GIT PULL] sound updates for 4.21 In-Reply-To: <82bb7f60-c3c2-4715-a0a0-f1f2a8b14c74@linux.intel.com> References: <20181228124303.GA16558@gmail.com> <82bb7f60-c3c2-4715-a0a0-f1f2a8b14c74@linux.intel.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/26 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 31 Dec 2018 00:17:58 +0100, Pierre-Louis Bossart wrote: > > > BTW, one thing I'd really like to avoid is to rearrange the probe > > procedure of the legacy HDA driver (so that we can get codec_mask > > during pci probe() call). The async probe is the result of the many > > struggles with the various and complex configurations. Moving the > > codec probe to the beginning isn't trivial and quite risky to break > > something else. > Agree, mucking with the probe isn't something we should look into, > especially with this Skylake driver being eventually deprecated once > SOF is at feature parity. This set of autodetection patches for 4.21 > was really targeting CFL/WHL+ devices, where the DSP usage is > mandatory when directly-attached digital microphones are used. For > Skylake and kabylake using the legacy by default is just fine. OK, then how about applying the PCI class check only for such ones like the patch below? The macro isn't sexy and can be replaced with another way, but you have an idea. thanks, Takashi --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -380,6 +380,13 @@ enum { #define IS_BXT(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x5a98) #define IS_CFL(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0xa348) +/* CFL and later models, preferring ASoC when DSP is available */ +#define IS_CFL_PLUS(pci) \ + ((pci)->vendor == 0x8086 && \ + ((pci)->device == 0xa348 || \ + (pci)->device == 0x9dc8 || \ + (pci)->device == 0x34c8)) + static char *driver_short_names[] = { [AZX_DRIVER_ICH] = "HDA Intel", [AZX_DRIVER_PCH] = "HDA Intel PCH", @@ -2056,7 +2063,7 @@ static int azx_probe(struct pci_dev *pci, if (pci_id->driver_data & AZX_DCAPS_INTEL_SHARED) { switch (skl_pci_binding) { case SND_SKL_PCI_BIND_AUTO: - if (pci->class != 0x040300) { + if (pci->class != 0x040300 && IS_CFL_PLUS(pci)) { dev_info(&pci->dev, "The DSP is enabled on this platform, aborting probe\n"); return -ENODEV; }