From patchwork Tue Nov 14 20:13:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cezary Rojewski X-Patchwork-Id: 13455882 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7ADA8C54E69 for ; Tue, 14 Nov 2023 20:11:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233054AbjKNULX (ORCPT ); Tue, 14 Nov 2023 15:11:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37196 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233302AbjKNULW (ORCPT ); Tue, 14 Nov 2023 15:11:22 -0500 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F2987B7 for ; Tue, 14 Nov 2023 12:11:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699992679; x=1731528679; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=6fM7s4NNkv3z1N+O+uXHvUYY8ctVtZqzA1AQ3GtPJWI=; b=MshV79EPA6BwdwUOdbBwj4P1UQULc5dVOSriFkhDUUaP1XP/RKsGzVoJ cdhbaHU6jVpH7RVrQUmiDnJt7Wpu2pLtiCAIhOTSHPZHzSE2iJXjHN/2+ zMC4pzHGPOv5ybsL2PNxVHTKs2qLMrZik431s8hw0n0tm2C6+QMedAcYC bAwoUF92PnDQ3bOfNJdgWjWG9rhRCqcNNiVhLn6POcqeC6v49+1tiS10A g3KeuYgXpxTcIwjyk45oyo3kq7AmZH27N5M25louGJEb6TugGJ0yjrJPa HICwiLU8OajUf7aZbMSaU6DbeMq+ewg9ihIHo8x745AB1Nsb2AxQ9M3Nc Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10894"; a="381134614" X-IronPort-AV: E=Sophos;i="6.03,302,1694761200"; d="scan'208";a="381134614" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Nov 2023 12:11:17 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10894"; a="855422386" X-IronPort-AV: E=Sophos;i="6.03,302,1694761200"; d="scan'208";a="855422386" Received: from crojewsk-ctrl.igk.intel.com ([10.102.9.28]) by FMSMGA003.fm.intel.com with ESMTP; 14 Nov 2023 12:11:14 -0800 From: Cezary Rojewski To: broonie@kernel.org, tiwai@suse.com, perex@perex.cz Cc: alsa-devel@alsa-project.org, amadeuszx.slawinski@linux.intel.com, pierre-louis.bossart@linux.intel.com, hdegoede@redhat.com, linux-sound@vger.kernel.org, Cezary Rojewski Subject: [PATCH v3 00/16] ALSA/ASoC: hda: Address format selection limitations and ambiguity Date: Tue, 14 Nov 2023 21:13:01 +0100 Message-Id: <20231114201317.1348066-1-cezary.rojewski@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-sound@vger.kernel.org Patchset aims to address format selection restrictions present currently in the HDAudio library. Formats which we are concerned about are 20 and 24 valid bits per sample within 32 bit depth container. One may identify them as S20_LE and S24_LE except that those, according to comments found in include/uapi/sound/asound.h, are for LSB-aligned scenarios. HDAudio streams expect MSB-aligned data, no matter if we are speaking of HOST (SDxFMT) or LINK (PPLCxFMT) side - chapter 4.5.1 of the public HDAudio specification. In short, S20_LE and S24_LE are invalid options. Right now, given the implementation of snd_hdac_query_supported_pcm() within sound/hda/hdac_device.c, even if a codec responds with: "I support all possible formats specified within HDAudio specification", there will be no option to open a 20/32 or 24/32 stream. The kernel will force the stream to be opened using the highest available bit depth. After discussing subject initially with Jaroslav and Takashi, suggestion was made to utilize 'subformat' option to address the problem. The eye-opening discussion begun much earlier though, in 2019 [1]. Paired with PRs for alsa-utils [2] and alsa-lib [3]. Flow of changes: The very first patch adds MSBITS subformat options to allow for granular 20/32, 24/32 and 32/32 format selection. The next three make sure subformat is actually honored during runtime. Most of that code is based on format-related API. Follow up is upgrade to the hda stream-format interface - several functions are added to make the granular format selection simple in the HDAudio world. Core of the implementation is based on the existing snd_hdac_calc_stream_format(). The next ten patches are straightforward switch from one interface to another with cleanup of now-unsed function as a finishing touch. Last but not least - the avs-driver, on which the problem analyzed and debugged, is updated to no longer acknowledge S24_LE as a valid format option. Results with skylake-driver and snd_hda_intel show status quo on our RVPs. PR filed on SOF github shows promising results too [4]. Changes in v3: - merged the first two patches as suggested by Jaroslav - re-authored patch 01 to Jaroslav, added my Co-developed-by. - added Jaroslav' Co-developed-by to patch 02. - 'subformats' field now S32_LE-specific. Given the fact that it is the only format currently requiring subformat-intervention, functionality is narrowed to reduce amount of memory allocations and cleanup. Suggested by Jaroslav. - note to the above: the hdaudio part converted 1:1 as requested, patch 02/16 - note #2: alsa part converted to S32_LE-specific yet without addition of the chicken bit. Instead, struct snd_pcm_hardware is updated with u32 subformat mask to do the job. - ALSA-core additions in form of snd_pcm_subformat_width() and snd_pcm_hw_params_bps() relocated from 01/16 to the user, patch 05. Changes in v2: - patch 01/17, introduced struct snd_pcm_subformat which task is to represent subformat-mask on per format basis. Expectation is that manipulated arrays of subformats always end with a sentinel entry - patch 01/17, added snd_pcm_hw_copy() as the copying snd_pcm_hardware becomes non-trivial - patch 02/17, added hw_rule that produces final subformat mask based on provided formats as suggested by Jaroslav - patch 04/17, soc_pcm_hw_update_subformat() refactored as the subformat intersection becomes non-trivial - relevant functions releasing resources occupied by hda_pcm and snd_pcm_runtime updated to also kfree() subformats - except for 16/17, no changes to patches past 04/17, retaining acks for these Changes in v1: - fixed UBSAN due to missing snd_pcm_subformat_names[] entries for new subformats - as HDMI stream capabilities are assigned on PCM open, patch 16/17 has been updated to ignore such codecs for now. A separate patchset will take care of this case - params_bps() reworded to snd_pcm_hw_params_bps() - fixed compilation issues in sof-driver, patch 13/17 [1]: https://lore.kernel.org/alsa-devel/20190905053302.9262-1-pawel.harlozinski@linux.intel.com/ [2]: https://github.com/alsa-project/alsa-utils/pull/228 [3]: https://github.com/alsa-project/alsa-lib/pull/342 [4]: https://github.com/thesofproject/linux/pull/4539 Cezary Rojewski (15): ALSA: hda: Honor subformat when querying PCMs ASoC: pcm: Honor subformat when configuring runtime ALSA: hda: Upgrade stream-format infrastructure ALSA: hda: Switch to new stream-format interface ALSA: hda/hdmi: Switch to new stream-format interface ALSA: hda/ca0132: Switch to new stream-format interface ASoC: codecs: hda: Switch to new stream-format interface ASoC: codecs: hdac_hda: Switch to new stream-format interface ASoC: codecs: hdac_hdmi: Switch to new stream-format interface ASoC: Intel Skylake: Switch to new stream-format interface ASoC: SOF: Intel: Switch to new stream-format interface ASoC: Intel: avs: Switch to new stream-format interface ALSA: hda: Drop snd_hdac_calc_stream_format() ASoC: Intel: avs: Kill S24_LE format ASoC: Intel: avs: Unhardcode HDAudio BE DAI drivers description Jaroslav Kysela (1): ALSA: pcm: Introduce MSBITS subformat interface include/sound/hda_codec.h | 5 +- include/sound/hdaudio.h | 13 +-- include/sound/pcm.h | 8 ++ include/sound/pcm_params.h | 2 + include/sound/soc.h | 1 + include/uapi/sound/asound.h | 7 +- sound/core/pcm.c | 3 + sound/core/pcm_lib.c | 28 ++++++ sound/core/pcm_misc.c | 22 +++++ sound/core/pcm_native.c | 55 ++++++++++- sound/hda/hdac_device.c | 156 +++++++++++++++++++++--------- sound/pci/hda/hda_codec.c | 2 + sound/pci/hda/hda_controller.c | 10 +- sound/pci/hda/patch_ca0132.c | 3 +- sound/pci/hda/patch_hdmi.c | 6 +- sound/soc/codecs/hda-dai.c | 6 +- sound/soc/codecs/hda.c | 2 + sound/soc/codecs/hdac_hda.c | 8 +- sound/soc/codecs/hdac_hdmi.c | 10 +- sound/soc/intel/avs/loader.c | 4 +- sound/soc/intel/avs/path.c | 2 +- sound/soc/intel/avs/pcm.c | 58 +++++++++-- sound/soc/intel/avs/probes.c | 3 +- sound/soc/intel/avs/topology.c | 13 ++- sound/soc/intel/skylake/skl-pcm.c | 11 ++- sound/soc/soc-pcm.c | 10 ++ sound/soc/sof/intel/hda-dai-ops.c | 5 +- tools/include/uapi/sound/asound.h | 7 +- 28 files changed, 358 insertions(+), 102 deletions(-) Acked-by: Mark Brown