From patchwork Mon Jul 25 11:10:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Icenowy Zheng X-Patchwork-Id: 593758 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 alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7D8DCC19F28 for ; Wed, 27 Jul 2022 05:42:00 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id B669320B; Wed, 27 Jul 2022 07:41:07 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz B669320B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1658900517; bh=ZykHilbaIsVR1jGsFUV7J/1ZBCbkia6ZB2qmlDaIPTk=; h=From:To:Subject:Date:Cc:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=LMd6GYPuClsT9VSZSW3vWKsqXNHEiPTsy7FMNu3W8owj/iukiat5bmKWYa6Q2vY1L 081M43vXW5M/8TjosgfQ4uYQ8MHt9IHOry3N/7nG38Q3WIZ+hzbeD8GyJyEo9jS/xG PmXixfKWQQrLCfnLiBbAm7LvZb0g5AyXxZbWxO2I= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 2BBADF80155; Wed, 27 Jul 2022 07:41:07 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id EB376F80155; Mon, 25 Jul 2022 13:11:17 +0200 (CEST) Received: from sender4-op-o18.zoho.com (sender4-op-o18.zoho.com [136.143.188.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id EAC77F80088 for ; Mon, 25 Jul 2022 13:11:10 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz EAC77F80088 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=icenowy.me header.i=uwu@icenowy.me header.b="IUt4JzvZ" ARC-Seal: i=1; a=rsa-sha256; t=1658747415; cv=none; d=zohomail.com; s=zohoarc; b=fByinlQtj3jM8pGcdQhkBTz3yEYHgopvAsss8Fvbd1iNfVZL1SjjIWrKRmIUAxtngJT/GxkBIhv4VL1w95A2C1f3trDCyAkexJk/TAaLewo+jSfiC53UznPZ/XuTELDSdpIWTapKrBNF819937vW8Kzn7UuM6NXwgRR5HPkYwFg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658747415; h=Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Subject:To; bh=Vw8o+PvqiksN2gP8/VvlaOtw5GwqSrnHaBqgfUiELlY=; b=n7NI7C66JvDd8m+LljyeWkLLfom/IbMYRYG5kqpbfondXP3S7TIapce9R+Uc3couwN5GJ7tyYXOfe1joQ/BXf1WngNld91SYk6tJDDkQWkW0djWhaOP7iQ7xDUOn2o37w7C9YG9u05jotOuCxlTw31ZdUnpoodYZmCDbD+LqfuA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=icenowy.me; spf=pass smtp.mailfrom=uwu@icenowy.me; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1658747415; s=zmail; d=icenowy.me; i=uwu@icenowy.me; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-Id:Message-Id:MIME-Version:Content-Transfer-Encoding:Reply-To; bh=Vw8o+PvqiksN2gP8/VvlaOtw5GwqSrnHaBqgfUiELlY=; b=IUt4JzvZIwxHEvuj94kvZVinjoTDaWc8aiizDGKJV6kDZGzCmASJJhQ4HuMtdXnI aNfwfHm9/5KIucBttU/sqrYg7wb9h+i6E3gvWsgY5veBpyPHeH42uag9+ymBDQ+IOg0 ZFWXkqvYErEBUFDR+BxXHjtQGoCIkfKF8c88OiSo= Received: from edelgard.icenowy.me (59.41.162.230 [59.41.162.230]) by mx.zohomail.com with SMTPS id 1658747413181482.9075417342268; Mon, 25 Jul 2022 04:10:13 -0700 (PDT) From: Icenowy Zheng To: Cezary Rojewski , Pierre-Louis Bossart , Liam Girdwood , Peter Ujfalusi , Bard Liao , Ranjani Sridharan , Kai Vehmanen , Mark Brown , Jaroslav Kysela , Takashi Iwai Subject: [PATCH 1/2] ASoC: Intel: Skylake: fix error message of NHLT blob selection Date: Mon, 25 Jul 2022 19:10:01 +0800 Message-Id: <20220725111002.143765-1-uwu@icenowy.me> X-Mailer: git-send-email 2.37.1 MIME-Version: 1.0 X-ZohoMailClient: External X-Mailman-Approved-At: Wed, 27 Jul 2022 07:41:04 +0200 Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Icenowy Zheng X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" The query to select NHLT blob had been changed to use parameters of the pipeline instead of PCM, however the error message returned when it fails still uses PCM properties. Fix this inconsistency. Fixes: 87b265260046 ("ASoC: Intel: Skylake: Select proper format for NHLT blob") Signed-off-by: Icenowy Zheng --- sound/soc/intel/skylake/skl-topology.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c index 9bdf020a2b64..19994ec8bba1 100644 --- a/sound/soc/intel/skylake/skl-topology.c +++ b/sound/soc/intel/skylake/skl-topology.c @@ -1864,7 +1864,8 @@ static int skl_tplg_be_fill_pipe_params(struct snd_soc_dai *dai, } else { dev_err(dai->dev, "Blob NULL for id:%d type:%d dirn:%d ch:%d, freq:%d, fmt:%d\n", mconfig->vbus_id, link_type, params->stream, - params->ch, params->s_freq, params->s_fmt); + pipe_fmt->channels, pipe_fmt->freq, + pipe_fmt->bps); return -EINVAL; } From patchwork Mon Jul 25 11:10:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Icenowy Zheng X-Patchwork-Id: 594090 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 alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A25A3C19F21 for ; Wed, 27 Jul 2022 05:42:28 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id DFAF5847; Wed, 27 Jul 2022 07:41:36 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz DFAF5847 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1658900547; bh=xxfpDZrbm7zCSfGjVdSridYCJTF/7C6BhRwRfwFXKWE=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=RvVsXMCjn4ihDKwKIdn0LJ7DG/mSWUq2G/Oa8f/JdY43T0zNY2UedXYyZAowowK3j syCBVlYG1gciV2P9TgLyoBYDUGMKz2WiwOrjMz7+xWaixbZjBjJDceYi4zXEpiXYRU CKruTtCzL7oAYapuaZqEJORL3dHyb7bUSrszZUVM= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 36CB9F80310; Wed, 27 Jul 2022 07:41:08 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id F00BFF80115; Mon, 25 Jul 2022 13:11:22 +0200 (CEST) Received: from sender4-op-o13.zoho.com (sender4-op-o13.zoho.com [136.143.188.13]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 3BCD3F80115 for ; Mon, 25 Jul 2022 13:11:15 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 3BCD3F80115 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=icenowy.me header.i=uwu@icenowy.me header.b="NSK+g8ly" ARC-Seal: i=1; a=rsa-sha256; t=1658747433; cv=none; d=zohomail.com; s=zohoarc; b=fW8TaQMdY65k4a6PKbwO5EvXQYUat5GJl3nk4ojQxYKztgFdxYaf+Hzzd+ScGnx0RY/pxBnIEDpHFwgGtCL6CdpzZlQH+Cfqvz/pgOM3LaBoFg1MLc5bIbv1rMTjmGGozmtprtA3Y13eoVpsfefJ6aaX8QXHz2/kSFY2UkIXxXQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658747433; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=td2HD537TFOqVAXGmobMSbf6TwwoP0HqZ6KHlLX2n6Q=; b=DvLAml3IlrBKQOcRZbveXUhmdO6ZcRNg7fPMsr428hc65vAErcS820j243ZZcuF2L9w/NHdKB+JAzukmV5woADgN74+/o4Ko51MwHVcP58lVnV7koQe/2UGEMiFDfEPyhJHHCXZg9Jd1aIeVypWZ5SQ1LXt7mQ6ncdUkcWpW/jc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=icenowy.me; spf=pass smtp.mailfrom=uwu@icenowy.me; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1658747433; s=zmail; d=icenowy.me; i=uwu@icenowy.me; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-Id:Message-Id:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Reply-To; bh=td2HD537TFOqVAXGmobMSbf6TwwoP0HqZ6KHlLX2n6Q=; b=NSK+g8lymnxFsW3NBxxSdluCZuP91qRNACJuzv0Vu4ZueHaC7FrumKdnPz6ml8Kk mOcm2peOuCbTo1acgIkx0CrpIBDzCHflXN3ygeXkfNmel1c/kh6vCtQrd+f3ghqU5VI r5NPUJo98R7/rctNerhhHYq+wPd8WsDaVe9yaQfo= Received: from edelgard.icenowy.me (59.41.162.230 [59.41.162.230]) by mx.zohomail.com with SMTPS id 1658747431498424.62638727725675; Mon, 25 Jul 2022 04:10:31 -0700 (PDT) From: Icenowy Zheng To: Cezary Rojewski , Pierre-Louis Bossart , Liam Girdwood , Peter Ujfalusi , Bard Liao , Ranjani Sridharan , Kai Vehmanen , Mark Brown , Jaroslav Kysela , Takashi Iwai Subject: [PATCH 2/2] ASoC: Intel: Skylake: try to get NHLT blob with PCM params as fallback Date: Mon, 25 Jul 2022 19:10:02 +0800 Message-Id: <20220725111002.143765-2-uwu@icenowy.me> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220725111002.143765-1-uwu@icenowy.me> References: <20220725111002.143765-1-uwu@icenowy.me> MIME-Version: 1.0 X-ZohoMailClient: External X-Mailman-Approved-At: Wed, 27 Jul 2022 07:41:04 +0200 Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Icenowy Zheng X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" Switching to use pipeline parameters to get NHLT blob breaks audio on HP Chromebook 13 G1 (at least with MrChromeBox firmware). Fix this by retrying to get NHLT blob with PCM parameters (which is the old behavior) if pipeline parameters fail. Fixes: 87b265260046 ("ASoC: Intel: Skylake: Select proper format for NHLT blob") Signed-off-by: Icenowy Zheng --- sound/soc/intel/skylake/skl-topology.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c index 19994ec8bba1..3d5a3ee1c82c 100644 --- a/sound/soc/intel/skylake/skl-topology.c +++ b/sound/soc/intel/skylake/skl-topology.c @@ -1858,6 +1858,15 @@ static int skl_tplg_be_fill_pipe_params(struct snd_soc_dai *dai, pipe_fmt->bps, params->s_cont, pipe_fmt->channels, pipe_fmt->freq, pipe->direction, dev_type); + if (!cfg) { + /* Retry with PCM parameters, as the old behavior */ + cfg = intel_nhlt_get_endpoint_blob(dai->dev, skl->nhlt, + mconfig->vbus_id, link_type, + params->s_fmt, params->s_cont, + params->ch, params->s_freq, + params->stream, dev_type); + } + if (cfg) { mconfig->formats_config[SKL_PARAM_INIT].caps_size = cfg->size; mconfig->formats_config[SKL_PARAM_INIT].caps = (u32 *)&cfg->caps; @@ -1866,6 +1875,8 @@ static int skl_tplg_be_fill_pipe_params(struct snd_soc_dai *dai, mconfig->vbus_id, link_type, params->stream, pipe_fmt->channels, pipe_fmt->freq, pipe_fmt->bps); + dev_err(dai->dev, "PCM: ch %d, freq %d, fmt %d\n", + params->ch, params->s_freq, params->s_fmt); return -EINVAL; }