Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <4208aece-0aea-ba86-9a00-9e217546e1dd@intel.com>
Date:   Tue, 2 Aug 2022 12:30:11 +0200
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101
 Firefox/91.0 Thunderbird/91.11.0
Subject: Re: [PATCH 2/2] ASoC: Intel: Skylake: try to get NHLT blob with PCM
 params as fallback
Content-Language: en-US
To:     Icenowy Zheng <uwu@icenowy.me>
CC:     <alsa-devel@alsa-project.org>, <linux-kernel@vger.kernel.org>,
        Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
        Liam Girdwood <liam.r.girdwood@linux.intel.com>,
        Peter Ujfalusi <peter.ujfalusi@linux.intel.com>,
        Bard Liao <yung-chuan.liao@linux.intel.com>,
        Ranjani Sridharan <ranjani.sridharan@linux.intel.com>,
        Kai Vehmanen <kai.vehmanen@linux.intel.com>,
        Mark Brown <broonie@kernel.org>,
        "Jaroslav Kysela" <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>
References: <20220725111002.143765-1-uwu@icenowy.me>
 <20220725111002.143765-2-uwu@icenowy.me>
From:   Cezary Rojewski <cezary.rojewski@intel.com>
In-Reply-To: <20220725111002.143765-2-uwu@icenowy.me>
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?NWFCRFhyK1lXSzcvTEZETHVVamZNa2Z3U0lUR3A0c2ZFdTd6ZkpPTGpnM25C?=
 =?utf-8?B?bUFwMzlrd0syM2hoNi9VR2E3MkFKdHJsTWlpeHA2QUwxYzhRc1VJa010ZGZU?=
 =?utf-8?B?N043aTh1RzR5d1dwS01mSUExU21qVnRhRURRaVBwb2JHNkZYTzFiQWVHOGFq?=
 =?utf-8?B?ZkZvWkdBR0tNWlVISEYyUVFqUWxjTnNSNFpYN1AwdEIvVXhYT2Vtako5elBZ?=
 =?utf-8?B?U1VNNVhGQ3drS0EwRGxMZ2RUTEVzalpVQk5BZFBBc3NSU2hsRFpoODAxaCtK?=
 =?utf-8?B?bmNRZmd3SXBOVGV1dWNRZlFnRFNPYnRQTnVyK2xSbmFUV1Y0WDFReHlEUUhn?=
 =?utf-8?B?c0FTMnJVcDExZDJ3V0dPdWFNNm5aaUFERE9TTjNTK295MitNbHpaQkNHSlo5?=
 =?utf-8?B?ZXdtYStIMXk0eXV0UUJadmZVdzc5ckcza1V4NHNHcHdFZXF0a2tUODcybnJy?=
 =?utf-8?B?YzdJdkE1b0RXVnFZVHBtT1RFbm5EenZHWm9Tc2c3MVJpVHBHRmFPUTI4OHk4?=
 =?utf-8?B?QWNDNmNnTXN4cUR0T1hadWVNNzBRc2dUZG1MSENXa3ZXQ1ljZnFaZUR4THd4?=
 =?utf-8?B?eVU0eHJwYitBZ25Iai9ZV3NPNDI4dDB0d2N4UWdXZEM0d2o3R3ZKSmJ5OXZz?=
 =?utf-8?B?cTcvdVQ3cC9LRjMrblYrNkw4bWp1QUtGaTRCYlNtQkV1RXNZU1FNVVhwbUx0?=
 =?utf-8?B?a1B1RlhQb1pGS3ozWGRhelFueDd0VGpXMWl5a0g3Wk5KT1lFSHlycWNHbCty?=
 =?utf-8?B?LzRQTXBlMDdwbzFMOE8vbm9scEUxOEFmaEljeXhidzRIL1h1RUg0bUtaTFdz?=
 =?utf-8?B?NStkU2dkR0t0bEJCUHhPdjJxMk5vcTZZRHFpUENXbXhkQ0tBQnpxb0pwOGpt?=
 =?utf-8?B?WEtkRXdTaVZiZ0FqemRhT1NVVEg5QUY1ODdiZVQvbllCenJKcWRJWFZNZ2Fu?=
 =?utf-8?B?M04yeWV6RytERDgvQ01qZlNleFBUZUlnZG81eDJjVXM5TVZLWHZaRFFSaWYr?=
 =?utf-8?B?QkdRb1dFQ0c4RmVMWTROTFNBZDhiM3hnVWd5WWlGZjVGM200SmFNdUcrRG1j?=
 =?utf-8?B?YjQ3SkRsSzB4cVB1aE1OQTAxcms3TExaaGdUTXdCNTJpTnZlclVpM2J0aVZt?=
 =?utf-8?B?dVlyMnNjSUxWMmpEU3hFYjhNMlhYSExCZnlYT0k4amhnL1QrK0ptaWxRamlM?=
 =?utf-8?B?ZS9FMmsvR1R3NjdtY3AweDNOeERtaEo5aHJtMHBjN0FpTnIyT1Rtb2tPRVJK?=
 =?utf-8?B?T3ovWnR3MUxqRHlFS0NtcTNXWERZWmcycEFTcTlzb3VaYUJsOXFxc1graDAr?=
 =?utf-8?B?SzJ0R2VnMDcvUEpBTjVWakVzanpJazk5VGZzc0I3YWVrWi9jbE9zTzVtQ3k4?=
 =?utf-8?B?dTdUbkR2NzlHODJOYjJzK1pRcHhuVjVRd3R3Ty9hcDZ5RnczZzhkdktUUFVv?=
 =?utf-8?B?cS82Q3ZjOGk4aXdXSllTSEhYRzN0TG5hMklMTUhvODhYQmJhK0tmZ1gvemVw?=
 =?utf-8?B?YmlwSUlGTCsxRk9uMzBVOGE0ZkNwcG5yRFhZdERZdStJUHNIQ0lzYkFXR3N4?=
 =?utf-8?B?R0pJS0NCVS9pcW5peTNpMVRhSVllOGQvNnVSSG15Q0NVQk9yY3RnNmxKbm1v?=
 =?utf-8?B?SzNnNTBPZWRTbGN0TGJ0Y0ZkQ0xIWE5ZNFhjMlBNRWN6eDZlQ29KVHBOeHBn?=
 =?utf-8?B?SDB2R3VyYVVnN0V4cUFRbWpYNmR6UC9JSXBXdURjRUkzYjFGQzVtalp3YUdr?=
 =?utf-8?B?NjRaSFNzYndGd3NDZllnMlFOV3htcDdxeURBcnlINURCcHlxdEdsS0dQa3h2?=
 =?utf-8?B?VzF6OXZ6ZGJ4ZTBMQU83ZXZTdi9NNlVDVE1Ca1VSamx3anpnR3NYWU5vRzRM?=
 =?utf-8?B?V3d4VG1udjRzd09SK0I4N0trQW81bGJJZ2JlN2FyOWhIN1huV1VFQ2J0dTYr?=
 =?utf-8?B?OFpHZy9jajVpYldYeGJ1WVpHbGlKTVJIYmZiQjQ4T2Q2NjdEWW9aS1dCTWl0?=
 =?utf-8?B?K1hvNG1SY0x0elk1Zkp5anMwMHE0azlBQmk3YktmM1JLcWVoL3R1ek03bUxJ?=
 =?utf-8?B?eWhpR0J1WVhIT0gzSzJ5SXdCMnRPTDNsbTNJTTdwd2dMZmtoQ1AzMXpmdDgx?=
 =?utf-8?B?SFB1eGpvVEg2cTdtMnNBa3BNMTl1cGdIR2FlNVJ2V1BTSWVvb2wyOGd4QXRT?=
 =?utf-8?B?MHc9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: ea84ca6a-f077-4de2-275f-08da7471fdea
X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB6375.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2022 10:30:16.8328
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: B3Fu8xNGR39Bix7SOHJWx1SndbXdUy/KK2zDtmGFnUfGgQAK7CO2ByacF4LSfmKPOHK1dhTGwpd081L0NA/BuZpJuGufOwacITdJLOekTBA=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB3869
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-5.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,
        RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 2022-07-25 1:10 PM, Icenowy Zheng wrote:
> 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 <uwu@icenowy.me>

Hello,


Could you share the NHLT file from your platform plus the format used by 
the cras/userspace tool? Did you try playing over simple aplay tool instead?


>   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 */

Drop the "old behavior" - most of the readers are not aware of what that 
actually means.

> +		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;
>   	}
>