- Alsa-devel - mailman.alsa-project.org

[PATCH v1] ASoC: tas2781: Remove unnecessary line feed for tasdevice_codec_remove
by Baojun Xu 21 Aug '24

21 Aug '24

Remove unnecessary line feed for tasdevice_codec_remove. Add comma at the end the last member of the array. Signed-off-by: Baojun Xu <baojun.xu(a)ti.com> --- v1: --- sound/soc/codecs/tas2781-i2c.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/tas2781-i2c.c b/sound/soc/codecs/tas2781-i2c.c index 9a32e0504857..eb8732b1bb99 100644 --- a/sound/soc/codecs/tas2781-i2c.c +++ b/sound/soc/codecs/tas2781-i2c.c @@ -582,13 +582,13 @@ static const struct snd_soc_dapm_widget tasdevice_dapm_widgets[] = { SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD), SND_SOC_DAPM_SPK("SPK", tasdevice_dapm_event), SND_SOC_DAPM_OUTPUT("OUT"), - SND_SOC_DAPM_INPUT("DMIC") + SND_SOC_DAPM_INPUT("DMIC"), }; static const struct snd_soc_dapm_route tasdevice_audio_map[] = { {"SPK", NULL, "ASI"}, {"OUT", NULL, "SPK"}, - {"ASI OUT", NULL, "DMIC"} + {"ASI OUT", NULL, "DMIC"}, }; static int tasdevice_startup(struct snd_pcm_substream *substream, @@ -730,8 +730,7 @@ static void tasdevice_deinit(void *context) tas_priv->fw_state = TASDEVICE_DSP_FW_PENDING; } -static void tasdevice_codec_remove( - struct snd_soc_component *codec) +static void tasdevice_codec_remove(struct snd_soc_component *codec) { struct tasdevice_priv *tas_priv = snd_soc_component_get_drvdata(codec); -- 2.43.0

2 2

[PATCH] ASoC: soc-pcm: remove snd_soc_dpcm_stream_lock_irqsave_nested()
by Kuninori Morimoto 21 Aug '24

21 Aug '24

soc-pcm.c has snd_soc_dpcm_stream_lock_irqsave_nested() / snd_soc_dpcm_stream_unlock_irqrestore() helper function, but it is almost nothing help. It just makes a code complex. Let's remove it. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/soc-pcm.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 58381801e41d4..4571785736f76 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -49,12 +49,6 @@ static inline int _soc_pcm_ret(struct snd_soc_pcm_runtime *rtd, return ret; } -#define snd_soc_dpcm_stream_lock_irqsave_nested(rtd, stream, flags) \ - snd_pcm_stream_lock_irqsave_nested(snd_soc_dpcm_get_substream(rtd, stream), flags) - -#define snd_soc_dpcm_stream_unlock_irqrestore(rtd, stream, flags) \ - snd_pcm_stream_unlock_irqrestore(snd_soc_dpcm_get_substream(rtd, stream), flags) - #define DPCM_MAX_BE_USERS 8 static inline const char *soc_cpu_dai_name(struct snd_soc_pcm_runtime *rtd) @@ -2144,7 +2138,7 @@ int dpcm_be_dai_trigger(struct snd_soc_pcm_runtime *fe, int stream, be = dpcm->be; be_substream = snd_soc_dpcm_get_substream(be, stream); - snd_soc_dpcm_stream_lock_irqsave_nested(be, stream, flags); + snd_pcm_stream_lock_irqsave_nested(be_substream, flags); /* is this op for this BE ? */ if (!snd_soc_dpcm_be_can_update(fe, be, stream)) @@ -2291,7 +2285,7 @@ int dpcm_be_dai_trigger(struct snd_soc_pcm_runtime *fe, int stream, break; } next: - snd_soc_dpcm_stream_unlock_irqrestore(be, stream, flags); + snd_pcm_stream_unlock_irqrestore(be_substream, flags); if (ret) break; } -- 2.43.0

2 2

Re: [PATCH] ALSA: hda: cs35l56: Don't use the device index as a calibration index
by Takashi Iwai 21 Aug '24

21 Aug '24

On Wed, 21 Aug 2024 14:47:11 +0200, Simon Trimmer wrote: > > The HDA driver cannot assume that the order that the devices are > specified in the cirrus,dev-index matches the order of calibration > entries. > > Only a calibration entry with a matching silicon id will be used. > > Fixes: cfa43aaa7948 ("ALSA: hda: cs35l56: Apply amp calibration from EFI data") > Signed-off-by: Simon Trimmer <simont(a)opensource.cirrus.com> Thanks, applied now. Takashi

1 0

Re: [RESEND] ASoC: mediatek: mt8188-mt6359: Modify key
by Mark Brown 21 Aug '24

21 Aug '24

On Wed, Aug 21, 2024 at 03:40:51PM +0800, Zhang Yi wrote: > In order to get the correct keys when using the ES8326.We will associate > SND_JACK_BTN_1 to KEY_VOLUMEUP and SND_JACK_BTN_2 to KEY_VOLUMEDOWN > when the ES8326 flag is recognized. Please please allow a reasonable time for review. People get busy, go on holiday, attend conferences and so on so unless there is some reason for urgency (like critical bug fixes) please allow at least a couple of weeks for review.

1 0

[PATCH v2 1/1] ASoC: dt-bindings: Convert tpa6130a2.txt to yaml
by Frank Li 20 Aug '24

20 Aug '24

Convert binding doc tpa6130a2.txt to yaml format. Additional change: - add ref to dai-common.yaml - add i2c node in example Fix below warning: arch/arm64/boot/dts/freescale/imx8mq-zii-ultra-rmb3.dtb: /soc@0/bus@30800000/i2c@30a20000/amp@60: failed to match any schema with compatible: ['ti,tpa6130a2'] Reviewed-by: Rob Herring (Arm) <robh(a)kernel.org> Signed-off-by: Frank Li <Frank.Li(a)nxp.com> --- Change from v1 to v2 - fix MAINTAINERS --- .../bindings/sound/ti,tpa6130a2.yaml | 55 +++++++++++++++++++ .../devicetree/bindings/sound/tpa6130a2.txt | 27 --------- MAINTAINERS | 2 +- 3 files changed, 56 insertions(+), 28 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/ti,tpa6130a2.yaml delete mode 100644 Documentation/devicetree/bindings/sound/tpa6130a2.txt diff --git a/Documentation/devicetree/bindings/sound/ti,tpa6130a2.yaml b/Documentation/devicetree/bindings/sound/ti,tpa6130a2.yaml new file mode 100644 index 0000000000000..a42bf9bde6940 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/ti,tpa6130a2.yaml @@ -0,0 +1,55 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/ti,tpa6130a2.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Texas Instruments - tpa6130a2 Codec module + +maintainers: + - Sebastian Reichel <sre(a)kernel.org> + +description: + Stereo, analog input headphone amplifier + +properties: + compatible: + enum: + - ti,tpa6130a2 + - ti,tpa6140a2 + + reg: + maxItems: 1 + + Vdd-supply: + description: power supply regulator + + power-gpio: + description: gpio pin to power the device + +required: + - compatible + - reg + - Vdd-supply + +allOf: + - $ref: dai-common.yaml# + +unevaluatedProperties: false + +examples: + - | + #include <dt-bindings/gpio/gpio.h> + + i2c { + #address-cells = <1>; + #size-cells = <0>; + + amplifier@60 { + compatible = "ti,tpa6130a2"; + reg = <0x60>; + Vdd-supply = <&vmmc2>; + power-gpio = <&gpio4 2 GPIO_ACTIVE_HIGH>; + }; + }; + diff --git a/Documentation/devicetree/bindings/sound/tpa6130a2.txt b/Documentation/devicetree/bindings/sound/tpa6130a2.txt deleted file mode 100644 index 6dfa740e4b2d8..0000000000000 --- a/Documentation/devicetree/bindings/sound/tpa6130a2.txt +++ /dev/null @@ -1,27 +0,0 @@ -Texas Instruments - tpa6130a2 Codec module - -The tpa6130a2 serial control bus communicates through I2C protocols - -Required properties: - -- compatible - "string" - One of: - "ti,tpa6130a2" - TPA6130A2 - "ti,tpa6140a2" - TPA6140A2 - - -- reg - <int> - I2C slave address - -- Vdd-supply - <phandle> - power supply regulator - -Optional properties: - -- power-gpio - gpio pin to power the device - -Example: - -tpa6130a2: tpa6130a2@60 { - compatible = "ti,tpa6130a2"; - reg = <0x60>; - Vdd-supply = <&vmmc2>; - power-gpio = <&gpio4 2 GPIO_ACTIVE_HIGH>; -}; diff --git a/MAINTAINERS b/MAINTAINERS index 118d9cf64e9cb..4ced49519930b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -22713,12 +22713,12 @@ F: Documentation/devicetree/bindings/sound/tas2552.txt F: Documentation/devicetree/bindings/sound/ti,tas2562.yaml F: Documentation/devicetree/bindings/sound/ti,tas2770.yaml F: Documentation/devicetree/bindings/sound/ti,tas27xx.yaml +F: Documentation/devicetree/bindings/sound/ti,tpa6130a2.yaml F: Documentation/devicetree/bindings/sound/ti,pcm1681.yaml F: Documentation/devicetree/bindings/sound/ti,pcm3168a.yaml F: Documentation/devicetree/bindings/sound/ti,tlv320*.yaml F: Documentation/devicetree/bindings/sound/ti,tlv320adcx140.yaml F: Documentation/devicetree/bindings/sound/tlv320aic31xx.txt -F: Documentation/devicetree/bindings/sound/tpa6130a2.txt F: include/sound/tas2*.h F: include/sound/tlv320*.h F: include/sound/tpa6130a2-plat.h -- 2.34.1

2 1

[PATCH] ASoC: amd: acp: replace desc->rev check with acp pci revision id
by Vijendar Mukunda 20 Aug '24

20 Aug '24

Replace acp descriptor structure member 'rev' check with acp pci revision id. Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda(a)amd.com> --- sound/soc/sof/amd/acp.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/sound/soc/sof/amd/acp.c b/sound/soc/sof/amd/acp.c index 0f6115c8b005..e4d46fdda88b 100644 --- a/sound/soc/sof/amd/acp.c +++ b/sound/soc/sof/amd/acp.c @@ -236,7 +236,6 @@ int configure_and_run_sha_dma(struct acp_dev_data *adata, void *image_addr, unsigned int image_length) { struct snd_sof_dev *sdev = adata->dev; - const struct sof_amd_acp_desc *desc = get_chip_info(sdev->pdata); unsigned int tx_count, fw_qualifier, val; int ret; @@ -265,8 +264,9 @@ int configure_and_run_sha_dma(struct acp_dev_data *adata, void *image_addr, snd_sof_dsp_write(sdev, ACP_DSP_BAR, ACP_SHA_DMA_DESTINATION_ADDR, dest_addr); snd_sof_dsp_write(sdev, ACP_DSP_BAR, ACP_SHA_MSG_LENGTH, image_length); - /* psp_send_cmd only required for vangogh platform (rev - 5) */ - if (desc->rev == 5 && !(adata->quirks && adata->quirks->skip_iram_dram_size_mod)) { + /* psp_send_cmd only required for vangogh platform */ + if (adata->pci_rev == ACP_VANGOGH_PCI_ID && + !(adata->quirks && adata->quirks->skip_iram_dram_size_mod)) { /* Modify IRAM and DRAM size */ ret = psp_send_cmd(adata, MBOX_ACP_IRAM_DRAM_FENCE_COMMAND | IRAM_DRAM_FENCE_2); if (ret) @@ -285,8 +285,8 @@ int configure_and_run_sha_dma(struct acp_dev_data *adata, void *image_addr, return ret; } - /* psp_send_cmd only required for renoir platform (rev - 3) */ - if (desc->rev == 3) { + /* psp_send_cmd only required for renoir platform*/ + if (adata->pci_rev == ACP_RN_PCI_ID) { ret = psp_send_cmd(adata, MBOX_ACP_SHA_DMA_COMMAND); if (ret) return ret; @@ -405,7 +405,7 @@ static irqreturn_t acp_irq_handler(int irq, void *dev_id) snd_sof_dsp_write(sdev, ACP_DSP_BAR, desc->ext_intr_stat, ACP_ERROR_IRQ_MASK); snd_sof_dsp_write(sdev, ACP_DSP_BAR, desc->acp_sw0_i2s_err_reason, 0); /* ACP_SW1_I2S_ERROR_REASON is newly added register from rmb platform onwards */ - if (desc->rev >= 6) + if (adata->pci_rev >= ACP_RMB_PCI_ID) snd_sof_dsp_write(sdev, ACP_DSP_BAR, ACP_SW1_I2S_ERROR_REASON, 0); snd_sof_dsp_write(sdev, ACP_DSP_BAR, desc->acp_error_stat, 0); irq_flag = 1; @@ -431,6 +431,7 @@ static irqreturn_t acp_irq_handler(int irq, void *dev_id) static int acp_power_on(struct snd_sof_dev *sdev) { const struct sof_amd_acp_desc *desc = get_chip_info(sdev->pdata); + struct acp_dev_data *adata = sdev->pdata->hw_pdata; unsigned int base = desc->pgfsm_base; unsigned int val; unsigned int acp_pgfsm_status_mask, acp_pgfsm_cntl_mask; @@ -441,13 +442,14 @@ static int acp_power_on(struct snd_sof_dev *sdev) if (val == ACP_POWERED_ON) return 0; - switch (desc->rev) { - case 3: - case 5: + switch (adata->pci_rev) { + case ACP_RN_PCI_ID: + case ACP_VANGOGH_PCI_ID: acp_pgfsm_status_mask = ACP3X_PGFSM_STATUS_MASK; acp_pgfsm_cntl_mask = ACP3X_PGFSM_CNTL_POWER_ON_MASK; break; - case 6: + case ACP_RMB_PCI_ID: + case ACP63_PCI_ID: acp_pgfsm_status_mask = ACP6X_PGFSM_STATUS_MASK; acp_pgfsm_cntl_mask = ACP6X_PGFSM_CNTL_POWER_ON_MASK; break; -- 2.34.1

2 1

[RFC PATCH 00/16] soundwire/ASoC: speed-up downloads with BTP/BRA protocol
by Pierre-Louis Bossart 20 Aug '24

20 Aug '24

This RFC patchset suggests a new API for ASoC codec drivers to use for firmware/table downloads. Problem statement: All existing transfers initiated by codec drivers rely on SoundWire read/write commands, which can only support ONE byte per frame. With the typical 48kHz frame rate, this means 384 kbits/s. In addition, the command/control is typically handled with a FIFO and interrupts which adds more software overhead. To give a practical reference, sending 32Kb takes 2.5s on Intel platforms, which means about 105kbit/s only. Additional non-audio activity is likely to adversely impact interrupt scheduling and further decrease the transfer speeds. New SDCA-based codecs have a need to download tables and DSP firmware which are typically between 20 and 256 Kb. The slow bus operation has a direct impact on boot/resume times, and clearly having to wait more than 300ms is a showstopper in terms of latency requirements and user-experience. Suggested solution: The MIPI specification and most of the new codecs support the Bulk Transfer Protocol (BTP) and specifically the Bulk Register Access (BRA) configuration. This mode reclaims the 'audio' data space of the SoundWire frame to send firmware/coefficients over the DataPort 0 (DP0). The API suggested is rather simple, with the following sequence expected: open(): reserve resources and prepare hardware send_async(): trigger DMAs and perform SoundWire bank switch wait(): wait for DMA completion and disable DMAs close(): release resources Benefits: Even after accounting for the protocol overhead, the data can be sent 8x or 16x faster on the link than with the regular commands. With the use of DMAs, the software overhead becomes limited to the initialization. Measured results show that transferring the same 32Kb takes about 100ms, a 25x improvement on the baseline write() commands with an actual bitrate of 2.6 Mbits/s. These results are a measure of bus/hardware performance mainly, and will typically not be too modified by the CPU activity and scheduling. The performance for reads is similar, with a 25x speedup measured. Limitations: Setting up the transfers over DP0 takes time, and the reliance on DMAs on the host side brings alignment restrictions. The BTP/BRA protocol is really only relevant for "large" transfers done during boot/resume *before* audio transfers take place. Mixing BTP/BRA and audio is a nightmare, this patchset suggests a mutual-exclusion between two usages. Scope: This patchset only exposes the API and a debugfs interface to initiate commands, validate results and measure performance. The actual use of the API is left as an exercise for codec driver developers. This patchset depends on a number of pre-requisite patches and will not build on top of any for-next branches. The main intent of this RFC is to gather comments on the usage, API, benefits and restrictions. The code and functionality was tested on an Intel LunarLake RVP platform connected to a Realtek RT711-SDCA device. Acknowledgements: Thanks to Zeek Tsai at Realtek for providing test sequences that helped reconcile the data formatted by the host driver with the expected results on the code side. Pierre-Louis Bossart (16): Documentation: driver: add SoundWire BRA description soundwire: cadence: add BTP support for DP0 soundwire: stream: extend sdw_alloc_stream() to take 'type' parameter soundwire: extend sdw_stream_type to BPT soundwire: stream: special-case the bus compute_params() routine soundwire: stream: reuse existing code for BPT stream soundwire: bus: add API for BPT protocol soundwire: bus: add bpt_stream pointer soundwire: crc8: add constant table soundwire: cadence: add BTP/BRA helpers to format data soundwire: intel_auxdevice: add indirection for BPT open/close/send_async/wait ASoC: SOF: Intel: hda-sdw-bpt: add helpers for SoundWire BPT DMA soundwire: intel: add BPT context definition soundwire: intel_ace2x: add BPT open/close/send_async/wait soundwire: debugfs: add interface for BPT/BRA transfers ASoC: rt711-sdca: add DP0 support Documentation/driver-api/soundwire/bra.rst | 478 +++++++++++++ Documentation/driver-api/soundwire/index.rst | 1 + Documentation/driver-api/soundwire/stream.rst | 2 +- .../driver-api/soundwire/summary.rst | 5 +- drivers/soundwire/Kconfig | 1 + drivers/soundwire/Makefile | 4 +- drivers/soundwire/amd_manager.c | 2 +- drivers/soundwire/bus.c | 77 +++ drivers/soundwire/bus.h | 18 + drivers/soundwire/cadence_master.c | 646 +++++++++++++++++- drivers/soundwire/cadence_master.h | 30 + drivers/soundwire/crc8.c | 277 ++++++++ drivers/soundwire/crc8.h | 11 + drivers/soundwire/debugfs.c | 122 +++- .../soundwire/generic_bandwidth_allocation.c | 84 ++- drivers/soundwire/intel.h | 12 + drivers/soundwire/intel_ace2x.c | 377 ++++++++++ drivers/soundwire/intel_auxdevice.c | 55 ++ drivers/soundwire/qcom.c | 2 +- drivers/soundwire/stream.c | 137 +++- include/linux/soundwire/sdw.h | 91 ++- include/linux/soundwire/sdw_intel.h | 16 + include/sound/hda-sdw-bpt.h | 76 +++ sound/soc/codecs/rt711-sdca-sdw.c | 8 + sound/soc/qcom/sdw.c | 2 +- sound/soc/sof/intel/Kconfig | 8 +- sound/soc/sof/intel/Makefile | 4 + sound/soc/sof/intel/hda-sdw-bpt.c | 328 +++++++++ 28 files changed, 2810 insertions(+), 64 deletions(-) create mode 100644 Documentation/driver-api/soundwire/bra.rst create mode 100644 drivers/soundwire/crc8.c create mode 100644 drivers/soundwire/crc8.h create mode 100644 include/sound/hda-sdw-bpt.h create mode 100644 sound/soc/sof/intel/hda-sdw-bpt.c -- 2.39.2

4 60

[PATCH] ASoC: dt-bindings: samsung,odroid: drop stale clocks
by Krzysztof Kozlowski 20 Aug '24

20 Aug '24

Clocks property was present only to allow usage of assigned-clocks in the sound card node, however in upstream DTS the assigned-clocks were moved in commit 4afb06afd768 ("ARM: dts: exynos: move assigned-clock* properties to i2s0 node in Odroid XU4") to respective I2S nodes. Linux drivers never parsed "clocks" so it can be safely dropped. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> --- Documentation/devicetree/bindings/sound/samsung,odroid.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/samsung,odroid.yaml b/Documentation/devicetree/bindings/sound/samsung,odroid.yaml index b77284e3e26a..c3dea852cc8d 100644 --- a/Documentation/devicetree/bindings/sound/samsung,odroid.yaml +++ b/Documentation/devicetree/bindings/sound/samsung,odroid.yaml @@ -27,11 +27,6 @@ properties: - const: samsung,odroid-xu4-audio deprecated: true - assigned-clock-parents: true - assigned-clock-rates: true - assigned-clocks: true - clocks: true - cpu: type: object additionalProperties: false -- 2.43.0

3 2

[PATCH alsa-lib] pcm: implement snd_pcm_hw_params_get_sync() and obsolete snd_pcm_info_get_sync()
by Jaroslav Kysela 20 Aug '24

20 Aug '24

Use the new clock source mechanism to get information about similar PCM clock sources for PCM streams. Link: https://lore.kernel.org/linux-sound/20240625172836.589380-1-perex@perex.cz/ Signed-off-by: Jaroslav Kysela <perex(a)perex.cz> --- include/pcm.h | 4 ++++ include/sound/uapi/asound.h | 3 ++- src/pcm/pcm.c | 30 ++++++++++++++++++++++++++---- 3 files changed, 32 insertions(+), 5 deletions(-) diff --git a/include/pcm.h b/include/pcm.h index 102ff812..b5c67889 100644 --- a/include/pcm.h +++ b/include/pcm.h @@ -508,6 +508,9 @@ typedef union _snd_pcm_sync_id { unsigned int id32[4]; } snd_pcm_sync_id_t; +/** synchronization ID size (see snd_pcm_hw_params_get_sync) */ +#define SND_PCM_HW_PARAMS_SYNC_SIZE 16 + /** Infinite wait for snd_pcm_wait() */ #define SND_PCM_WAIT_INFINITE (-1) /** Wait for next i/o in snd_pcm_wait() */ @@ -747,6 +750,7 @@ int snd_pcm_hw_params_get_rate_numden(const snd_pcm_hw_params_t *params, unsigned int *rate_den); int snd_pcm_hw_params_get_sbits(const snd_pcm_hw_params_t *params); int snd_pcm_hw_params_get_fifo_size(const snd_pcm_hw_params_t *params); +const unsigned char * snd_pcm_hw_params_get_sync(const snd_pcm_hw_params_t *params); #if 0 typedef struct _snd_pcm_hw_strategy snd_pcm_hw_strategy_t; diff --git a/include/sound/uapi/asound.h b/include/sound/uapi/asound.h index f3b2b94d..012fd890 100644 --- a/include/sound/uapi/asound.h +++ b/include/sound/uapi/asound.h @@ -426,7 +426,8 @@ struct snd_pcm_hw_params { unsigned int rate_num; /* R: rate numerator */ unsigned int rate_den; /* R: rate denominator */ snd_pcm_uframes_t fifo_size; /* R: chip FIFO size in frames */ - unsigned char reserved[64]; /* reserved for future */ + unsigned char sync[16]; /* R: synchronization ID (perfect sync - one clock source) */ + unsigned char reserved[48]; /* reserved for future */ }; enum { diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c index 62e76e7e..f8581191 100644 --- a/src/pcm/pcm.c +++ b/src/pcm/pcm.c @@ -494,8 +494,8 @@ software parameter. There are two functions allowing link multiple streams together. In the case, the linking means that all operations are synchronized. Because the drivers cannot guarantee the synchronization (sample resolution) on hardware -lacking this feature, the #snd_pcm_info_get_sync() function -returns synchronization ID - #snd_pcm_sync_id_t, which is equal +lacking this feature, the #snd_pcm_hw_params_get_sync() function +returns 16-byte synchronization ID, which is equal for hardware synchronized streams. When the #snd_pcm_link() function is called, all operations managing the stream state for these two streams are joined. The opposite function is #snd_pcm_unlink(). @@ -3948,6 +3948,25 @@ int snd_pcm_hw_params_get_fifo_size(const snd_pcm_hw_params_t *params) return params->fifo_size; } +/** + * \brief Get hardware synchronization ID from a PCM info container + * \param params Configuration space + * \return 16-byte synchronization ID (use #SND_PCM_HW_PARAMS_SYNC_SIZE) + * + * This synchronization ID determines the similar clocks for the + * PCM stream between multiple devices (including different cards). + * "All zeros" means "not set". The contents of the ID can be used + * only for a comparison with the contents of another ID returned + * from this function. Applications should not do a comparison with + * hard-coded values, because the implementation generating such + * synchronization IDs may be changed in future. + */ +const unsigned char *snd_pcm_hw_params_get_sync(const snd_pcm_hw_params_t *params) +{ + assert(params); + return params->sync; +} + /** * \brief Fill params with a full configuration space for a PCM * \param pcm PCM handle @@ -7332,7 +7351,7 @@ unsigned int snd_pcm_info_get_subdevices_avail(const snd_pcm_info_t *obj) } /** - * \brief Get hardware synchronization ID from a PCM info container + * \brief (DEPRECATED) Get hardware synchronization ID from a PCM info container * \param obj PCM info container * \return hardware synchronization ID */ @@ -7340,9 +7359,12 @@ snd_pcm_sync_id_t snd_pcm_info_get_sync(const snd_pcm_info_t *obj) { snd_pcm_sync_id_t res; assert(obj); - memcpy(&res, &obj->sync, sizeof(res)); + bzero(&res, sizeof(res)); return res; } +#ifndef DOC_HIDDEN +link_warning(snd_pcm_info_get_sync, "Warning: snd_pcm_info_get_sync is deprecated, consider to use snd_pcm_hw_params_get_sync"); +#endif /** * \brief Set wanted device inside a PCM info container (see #snd_ctl_pcm_info) -- 2.45.2

1 0

[PATCH v2 00/14] ASoC: Intel: Remove skylake driver
by Cezary Rojewski 20 Aug '24

20 Aug '24

A spiritual successor to haswell/baytrail removal series [1]. The avs-driver found in sound/soc/intel/avs is a direct replacement to the existing skylake-driver. It covers all features supported by it and more and aligns with the recommended flows and requirements based on Windows driver equivalent. The skylake-driver related UAPI has been removed with "ASoC: Drop soc-topology ABI v4 support" [2]. For the official kernel tree the deprecation begun with v6.0. Most skylake-drivers users moved to avs- or SOF-driver when AudioDSP capabilities are available on the platform or to snd-hda-intel (sound/pci/hda) when such capabilities are not. For the supported trees the deprecation begun with v5.4 with v5.15 being the first where the skylake-driver is disabled entirely. All machine board drivers that consume this DSP driver have their replacements present within sound/soc/intel/avs/boards/ directory. Changes in v2: - added two new patches (leading the series) - the first moves all device entries previously under the skylake-driver dependency under the avs-driver - the second patch drops struct skl_machine_pdata usage to fix compilation errors as pointed out by IKP - no further changes, retained Acked-by tags for these [1]: https://lore.kernel.org/alsa-devel/20201006064907.16277-1-cezary.rojewski@i… [2]: https://lore.kernel.org/alsa-devel/20240403091629.647267-1-cezary.rojewski@… Cezary Rojewski (14): ALSA: hda: Move SST device entries to AVS ASoC: Intel: Drop skl_machine_pdata usage ASoC: Intel: Remove bxt_rt298 board driver ASoC: Intel: Remove bxt_da7219_max98357a board driver ASoC: Intel: Remove kbl_rt5663_rt5514_max98927 board driver ASoC: Intel: Remove kbl_rt5663_max98927 board driver ASoC: Intel: Remove kbl_rt5660 board driver ASoC: Intel: Remove kbl_da7219_max98927 board driver ASoC: Intel: Remove kbl_da7219_max98357a board driver ASoC: Intel: Remove skl_rt286 board driver ASoC: Intel: Remove skl_nau88l25_ssm4567 board driver ASoC: Intel: Remove skl_nau88l25_max98357a board driver ASoC: Intel: Remove skylake driver ASoC: Intel: avs: Enable by default for all SST configurations sound/hda/intel-dsp-config.c | 111 +- sound/soc/intel/Kconfig | 120 - sound/soc/intel/Makefile | 1 - sound/soc/intel/avs/core.c | 8 +- sound/soc/intel/boards/Kconfig | 152 +- sound/soc/intel/boards/Makefile | 20 - sound/soc/intel/boards/bxt_da7219_max98357a.c | 720 ---- sound/soc/intel/boards/bxt_rt298.c | 670 --- sound/soc/intel/boards/kbl_da7219_max98357a.c | 688 ---- sound/soc/intel/boards/kbl_da7219_max98927.c | 1175 ------ sound/soc/intel/boards/kbl_rt5660.c | 567 --- sound/soc/intel/boards/kbl_rt5663_max98927.c | 1073 ----- .../intel/boards/kbl_rt5663_rt5514_max98927.c | 869 ---- .../soc/intel/boards/skl_nau88l25_max98357a.c | 704 ---- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 751 ---- sound/soc/intel/boards/skl_rt286.c | 568 --- .../intel/common/soc-acpi-intel-cnl-match.c | 6 - .../intel/common/soc-acpi-intel-ehl-match.c | 1 - .../intel/common/soc-acpi-intel-hda-match.c | 6 - .../intel/common/soc-acpi-intel-icl-match.c | 6 - .../intel/common/soc-acpi-intel-kbl-match.c | 11 - .../intel/common/soc-acpi-intel-skl-match.c | 5 - sound/soc/intel/skylake/Makefile | 15 - sound/soc/intel/skylake/bxt-sst.c | 629 --- sound/soc/intel/skylake/cnl-sst-dsp.c | 266 -- sound/soc/intel/skylake/cnl-sst-dsp.h | 103 - sound/soc/intel/skylake/cnl-sst.c | 508 --- sound/soc/intel/skylake/skl-debug.c | 248 -- sound/soc/intel/skylake/skl-i2s.h | 87 - sound/soc/intel/skylake/skl-messages.c | 1419 ------- sound/soc/intel/skylake/skl-nhlt.c | 269 -- sound/soc/intel/skylake/skl-pcm.c | 1507 ------- sound/soc/intel/skylake/skl-ssp-clk.c | 428 -- sound/soc/intel/skylake/skl-ssp-clk.h | 108 - sound/soc/intel/skylake/skl-sst-cldma.c | 373 -- sound/soc/intel/skylake/skl-sst-cldma.h | 243 -- sound/soc/intel/skylake/skl-sst-dsp.c | 462 --- sound/soc/intel/skylake/skl-sst-dsp.h | 256 -- sound/soc/intel/skylake/skl-sst-ipc.c | 1071 ----- sound/soc/intel/skylake/skl-sst-ipc.h | 169 - sound/soc/intel/skylake/skl-sst-utils.c | 425 -- sound/soc/intel/skylake/skl-sst.c | 599 --- sound/soc/intel/skylake/skl-topology.c | 3605 ----------------- sound/soc/intel/skylake/skl-topology.h | 524 --- sound/soc/intel/skylake/skl.c | 1177 ------ sound/soc/intel/skylake/skl.h | 207 - 46 files changed, 59 insertions(+), 22871 deletions(-) delete mode 100644 sound/soc/intel/boards/bxt_da7219_max98357a.c delete mode 100644 sound/soc/intel/boards/bxt_rt298.c delete mode 100644 sound/soc/intel/boards/kbl_da7219_max98357a.c delete mode 100644 sound/soc/intel/boards/kbl_da7219_max98927.c delete mode 100644 sound/soc/intel/boards/kbl_rt5660.c delete mode 100644 sound/soc/intel/boards/kbl_rt5663_max98927.c delete mode 100644 sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c delete mode 100644 sound/soc/intel/boards/skl_nau88l25_max98357a.c delete mode 100644 sound/soc/intel/boards/skl_nau88l25_ssm4567.c delete mode 100644 sound/soc/intel/boards/skl_rt286.c delete mode 100644 sound/soc/intel/skylake/Makefile delete mode 100644 sound/soc/intel/skylake/bxt-sst.c delete mode 100644 sound/soc/intel/skylake/cnl-sst-dsp.c delete mode 100644 sound/soc/intel/skylake/cnl-sst-dsp.h delete mode 100644 sound/soc/intel/skylake/cnl-sst.c delete mode 100644 sound/soc/intel/skylake/skl-debug.c delete mode 100644 sound/soc/intel/skylake/skl-i2s.h delete mode 100644 sound/soc/intel/skylake/skl-messages.c delete mode 100644 sound/soc/intel/skylake/skl-nhlt.c delete mode 100644 sound/soc/intel/skylake/skl-pcm.c delete mode 100644 sound/soc/intel/skylake/skl-ssp-clk.c delete mode 100644 sound/soc/intel/skylake/skl-ssp-clk.h delete mode 100644 sound/soc/intel/skylake/skl-sst-cldma.c delete mode 100644 sound/soc/intel/skylake/skl-sst-cldma.h delete mode 100644 sound/soc/intel/skylake/skl-sst-dsp.c delete mode 100644 sound/soc/intel/skylake/skl-sst-dsp.h delete mode 100644 sound/soc/intel/skylake/skl-sst-ipc.c delete mode 100644 sound/soc/intel/skylake/skl-sst-ipc.h delete mode 100644 sound/soc/intel/skylake/skl-sst-utils.c delete mode 100644 sound/soc/intel/skylake/skl-sst.c delete mode 100644 sound/soc/intel/skylake/skl-topology.c delete mode 100644 sound/soc/intel/skylake/skl-topology.h delete mode 100644 sound/soc/intel/skylake/skl.c delete mode 100644 sound/soc/intel/skylake/skl.h -- 2.25.1

4 19