Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp2746498pxu; Sun, 29 Nov 2020 03:47:19 -0800 (PST) X-Google-Smtp-Source: ABdhPJzJN5KIK1F3u66CHwfiRgsGggG4uyhxOlnJKGonJzJXTZJxUY/tHdiznWEXsW0oShQ12Awf X-Received: by 2002:a50:ff0c:: with SMTP id a12mr16745577edu.79.1606650439486; Sun, 29 Nov 2020 03:47:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606650439; cv=none; d=google.com; s=arc-20160816; b=Hbg7GY7Hs7ER3P85cSxcCebjJaXR5KRg/S1vpxJXlQ6isxameCOHMpoACrhAUryrhX jO++zmN0EOtHMdFXkUoPpLeyHrFw9OVd3ztb62dahuHC/2Wn5LEWa7quFNPUaUw/XBdB Za4bqJ0jRUEnSzzYBWvCxOsprAkJ3xnQWvHXmFC1qZO9Gt3KR8uHLwkbFqL/qeP+4eD1 G5XMtpMfP15aV62u9msQdBb+B4eBakkDRb38YkwEzhjEP+vvVXWuB81VrP5yqwMaNWyZ 9rzSuRUxsMuATjRLoZjyy/JmNq3xIjKShVonK915Yc55BpJXd8Oq2BXGs0aBjeWe4NTl VITw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:ironport-sdr:ironport-sdr; bh=xUEZqLrGY8KVnCsCdA6JzeQ6I2dXH+HlRKxrTcJubls=; b=pZCi0rzIw+vyM8/C+I/hAK+rCJ/1g0//DRhS/eIKpxzBA70OG6OerJXnd+exPhvx/j W15dxVZw4wzreWjcIBa2f5WpnLpL37NIGfpZgeH9TTbwpzgfa+FR9KaWlGc3FTu7/4wl r7USLUBWddwwW3mm1EYS4QIP7wRR6f0pH2zcjUBoicuzNm1ZShF+Do0vIQuXFY5Iy3W4 gZ0TYrkzZVpEEQsNmTtI0UEkBEKd3KDZe509bP7CqgB3R8fYl9nHOna2syBWZYng85g2 YTchxJjwxq8nSSNbAng2ggwBCzSE9rUt1XWhGC/bNdlpeMx7pIeljj3VAgzFAw0ivad/ 9o5Q== ARC-Authentication-Results: i=1; mx.google.com; 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=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g12si9506846edl.16.2020.11.29.03.46.57; Sun, 29 Nov 2020 03:47:19 -0800 (PST) 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; 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=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727430AbgK2LoR (ORCPT + 99 others); Sun, 29 Nov 2020 06:44:17 -0500 Received: from mga07.intel.com ([134.134.136.100]:8057 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725882AbgK2LoQ (ORCPT ); Sun, 29 Nov 2020 06:44:16 -0500 IronPort-SDR: 9XJCbksmqvV3e+lMWAdZgst8xQldZTX4pnIxYeBnZcdVyM6DDiNHXDzxkINJhK4lpt/ujbYlJu YI6sL8b9ymRw== X-IronPort-AV: E=McAfee;i="6000,8403,9819"; a="236654206" X-IronPort-AV: E=Sophos;i="5.78,379,1599548400"; d="scan'208";a="236654206" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Nov 2020 03:43:08 -0800 IronPort-SDR: e6FxUq+c38QrQ3pfi43xX1jzZQCLzWXnXpe8OtcujVG42ueXhaG331UTnQhoTpm3RV1wmbHHHy WQtzmZMU3IiA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.78,379,1599548400"; d="scan'208";a="480261614" Received: from crojewsk-ctrl.igk.intel.com ([10.102.9.28]) by orsmga004.jf.intel.com with ESMTP; 29 Nov 2020 03:43:06 -0800 From: Cezary Rojewski To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: alsa-devel@alsa-project.org, broonie@kernel.org, tiwai@suse.com, pierre-louis.bossart@linux.intel.com, mateusz.gorski@linux.intel.com, Cezary Rojewski Subject: [PATCH 2/8] ASoC: Intel: Skylake: Select hda configuration permissively Date: Sun, 29 Nov 2020 12:41:42 +0100 Message-Id: <20201129114148.13772-3-cezary.rojewski@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201129114148.13772-1-cezary.rojewski@intel.com> References: <20201129114148.13772-1-cezary.rojewski@intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org commit a66f88394a78fec9a05fa6e517e9603e8eca8363 upstream. With _reset_link removed from the probe sequence, codec_mask at the time skl_find_hda_machine() is invoked will always be 0, so hda machine will never be chosen. Rather than reorganizing boot flow, be permissive about invalid mask. codec_mask will be set to proper value during probe_work - before skl_codec_create() ever gets called. Signed-off-by: Cezary Rojewski Reviewed-by: Pierre-Louis Bossart Link: https://lore.kernel.org/r/20200305145314.32579-3-cezary.rojewski@intel.com Signed-off-by: Mark Brown Cc: # 5.4.x --- sound/soc/intel/skylake/skl.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c index 861c07417fed..f46b90ccb46f 100644 --- a/sound/soc/intel/skylake/skl.c +++ b/sound/soc/intel/skylake/skl.c @@ -480,13 +480,8 @@ static struct skl_ssp_clk skl_ssp_clks[] = { static struct snd_soc_acpi_mach *skl_find_hda_machine(struct skl_dev *skl, struct snd_soc_acpi_mach *machines) { - struct hdac_bus *bus = skl_to_bus(skl); struct snd_soc_acpi_mach *mach; - /* check if we have any codecs detected on bus */ - if (bus->codec_mask == 0) - return NULL; - /* point to common table */ mach = snd_soc_acpi_intel_hda_machines; -- 2.17.1