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

Can anyone test with AMD onboard or HDMI/DP?
by Takashi Iwai 17 Jun '22

17 Jun '22

Hi, can anyone have an AMD onboard audio device and/or AMD HDMI/DP output for testing a patch below with 5.18.x or 5.19-rc kernels? It's a pending fix (for 5.18+), but currently it can't be verified whether it causes a regression on the actual audio I/O (while it fixes the kernel crash). If the generic allocator still doesn't work as expected here, it should show some audio stuttering or such effect. Thanks! Takashi -- 8< -- From: Takashi Iwai <tiwai(a)suse.de> Subject: [PATCH] ALSA: memalloc: Drop x86-specific hack for WC allocations The recent report for a crash on Haswell machines implied that the x86-specific (rather hackish) implementation for write-cache memory buffer allocation in ALSA core is buggy with the recent kernel in some corner cases. This patch drops the x86-specific implementation and uses the standard dma_alloc_wc() & co generically for avoiding the bug and also for simplification. BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=216112 Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/core/memalloc.c | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c index 15dc7160ba34..8cfdaee77905 100644 --- a/sound/core/memalloc.c +++ b/sound/core/memalloc.c @@ -431,33 +431,17 @@ static const struct snd_malloc_ops snd_dma_iram_ops = { */ static void *snd_dma_dev_alloc(struct snd_dma_buffer *dmab, size_t size) { - void *p; - - p = dma_alloc_coherent(dmab->dev.dev, size, &dmab->addr, DEFAULT_GFP); -#ifdef CONFIG_X86 - if (p && dmab->dev.type == SNDRV_DMA_TYPE_DEV_WC) - set_memory_wc((unsigned long)p, PAGE_ALIGN(size) >> PAGE_SHIFT); -#endif - return p; + return dma_alloc_coherent(dmab->dev.dev, size, &dmab->addr, DEFAULT_GFP); } static void snd_dma_dev_free(struct snd_dma_buffer *dmab) { -#ifdef CONFIG_X86 - if (dmab->dev.type == SNDRV_DMA_TYPE_DEV_WC) - set_memory_wb((unsigned long)dmab->area, - PAGE_ALIGN(dmab->bytes) >> PAGE_SHIFT); -#endif dma_free_coherent(dmab->dev.dev, dmab->bytes, dmab->area, dmab->addr); } static int snd_dma_dev_mmap(struct snd_dma_buffer *dmab, struct vm_area_struct *area) { -#ifdef CONFIG_X86 - if (dmab->dev.type == SNDRV_DMA_TYPE_DEV_WC) - area->vm_page_prot = pgprot_writecombine(area->vm_page_prot); -#endif return dma_mmap_coherent(dmab->dev.dev, area, dmab->area, dmab->addr, dmab->bytes); } @@ -471,10 +455,6 @@ static const struct snd_malloc_ops snd_dma_dev_ops = { /* * Write-combined pages */ -#ifdef CONFIG_X86 -/* On x86, share the same ops as the standard dev ops */ -#define snd_dma_wc_ops snd_dma_dev_ops -#else /* CONFIG_X86 */ static void *snd_dma_wc_alloc(struct snd_dma_buffer *dmab, size_t size) { return dma_alloc_wc(dmab->dev.dev, size, &dmab->addr, DEFAULT_GFP); @@ -497,7 +477,6 @@ static const struct snd_malloc_ops snd_dma_wc_ops = { .free = snd_dma_wc_free, .mmap = snd_dma_wc_mmap, }; -#endif /* CONFIG_X86 */ #ifdef CONFIG_SND_DMA_SGBUF static void *snd_dma_sg_fallback_alloc(struct snd_dma_buffer *dmab, size_t size); -- 2.35.3

2 3

[PATCH 00/23] tests: refine test implementation
by GitHub pull_request - opened 17 Jun '22

17 Jun '22

alsa-project/alsa-gobject pull request #76 was opened from takaswie: Current implementation of test just supports GObject-derived object, enumerations, and flags. It's not possible to test the other types of glib/gobject elements such as boxed structure. This patchset refines test implementation. Some helper functions for boxed structure and namespace/object functions are added. The existent helper function is renamed as 'test_object' and rewritten to walk through Python MRO hierarchy to check properties, virtual methods, and signals, defined by both GObject-derived objects and interfaces. I note that the tests are not done to execute actual symbols. They are just to check they are available or not via interface described in metadata of GObject Introspection. ``` Takashi Sakamoto (23): tests: rename helper function to test object interface tests: add helper function to test enumerations and flags tests: add test script for ALSACtl.ElemId boxed structure tests: add test script for ALSATimer.DeviceId boxed structure tests: add test script for ALSATimer.TickEvent boxed structure tests: add test script for ALSATimer.TstampEvent boxed structure tests: add test script for ALSASeq.Addr boxed structure tests: add test script for ALSASeq.EventCntr boxed structure tests: add test script for ALSASeq.Event boxed structure tests: add test script for ALSASeq.EventDataConnect boxed object tests: add test script for ALSASeq.EventDataCtl boxed structure tests: add test script for ALSASeq.EventDataNote boxed structure tests: add test script for ALSASeq.EventDataQueue boxed structure tests: add test script for ALSASeq.EventDataResult boxed structure tests: add test script for ALSASeq.RemoveFilter boxed structure tests: test object type instead of its instance tests: refine helper function to test object tests: test virtual functions in object tests: add test script for ALSACtl.ElemInfoCommon interface tests: add test script for ALSACtl.ElemInfoSingleArray interface tests: add test script for ALSAHwdep.DeviceCommon interface tests: add test script for ALSASeq.QueueTimerCommon interface tests: add test scripts for namespace functions tests/alsactl-card | 8 ++-- tests/alsactl-card-info | 7 +-- tests/alsactl-elem-id | 14 +++--- tests/alsactl-elem-info-boolean | 8 ++-- tests/alsactl-elem-info-bytes | 8 ++-- tests/alsactl-elem-info-common | 24 +++++++++++ tests/alsactl-elem-info-enumerated | 10 +++-- tests/alsactl-elem-info-iec60958 | 8 ++-- tests/alsactl-elem-info-integer | 14 +++--- tests/alsactl-elem-info-integer64 | 14 +++--- tests/alsactl-elem-info-single-array | 21 +++++++++ tests/alsactl-elem-value | 7 +-- tests/alsactl-enums | 11 ++--- tests/alsactl-functions | 26 +++++++++++ tests/alsahwdep-device-common | 32 ++++++++++++++ tests/alsahwdep-device-info | 7 +-- tests/alsahwdep-enums | 11 ++--- tests/alsahwdep-functions | 27 ++++++++++++ tests/alsarawmidi-enums | 11 ++--- tests/alsarawmidi-functions | 27 ++++++++++++ tests/alsarawmidi-stream-pair | 8 ++-- tests/alsarawmidi-substream-info | 7 +-- tests/alsarawmidi-substream-params | 7 +-- tests/alsarawmidi-substream-status | 7 +-- tests/alsaseq-addr | 21 +++++++++ tests/alsaseq-client-info | 7 +-- tests/alsaseq-client-pool | 7 +-- tests/alsaseq-enums | 13 +++--- tests/alsaseq-event | 61 ++++++++++++++++++++++++++ tests/alsaseq-event-cntr | 18 ++++++++ tests/alsaseq-event-data-connect | 21 +++++++++ tests/alsaseq-event-data-ctl | 23 ++++++++++ tests/alsaseq-event-data-note | 27 ++++++++++++ tests/alsaseq-event-data-queue | 33 ++++++++++++++ tests/alsaseq-event-data-result | 24 +++++++++++ tests/alsaseq-functions | 35 +++++++++++++++ tests/alsaseq-port-info | 7 +-- tests/alsaseq-queue-info | 7 +-- tests/alsaseq-queue-status | 7 +-- tests/alsaseq-queue-tempo | 7 +-- tests/alsaseq-queue-timer-alsa | 14 +++--- tests/alsaseq-queue-timer-common | 22 ++++++++++ tests/alsaseq-remove-filter | 21 +++++++++ tests/alsaseq-subscribe-data | 7 +-- tests/alsaseq-system-info | 7 +-- tests/alsaseq-user-client | 13 ++++-- tests/alsatimer-device-id | 18 +++----- tests/alsatimer-device-info | 7 +-- tests/alsatimer-device-params | 7 +-- tests/alsatimer-device-status | 7 +-- tests/alsatimer-enums | 10 ++--- tests/alsatimer-functions | 29 +++++++++++++ tests/alsatimer-instance-info | 7 +-- tests/alsatimer-instance-params | 7 +-- tests/alsatimer-instance-status | 7 +-- tests/alsatimer-tick-event | 19 +++++++++ tests/alsatimer-tstamp-event | 20 +++++++++ tests/alsatimer-user-instance | 14 +++--- tests/helper.py | 64 +++++++++++++++++++++++----- tests/meson.build | 22 ++++++++++ 60 files changed, 800 insertions(+), 164 deletions(-) create mode 100644 tests/alsactl-elem-info-common create mode 100644 tests/alsactl-elem-info-single-array create mode 100644 tests/alsactl-functions create mode 100644 tests/alsahwdep-device-common create mode 100644 tests/alsahwdep-functions create mode 100644 tests/alsarawmidi-functions create mode 100644 tests/alsaseq-addr create mode 100644 tests/alsaseq-event create mode 100644 tests/alsaseq-event-cntr create mode 100644 tests/alsaseq-event-data-connect create mode 100644 tests/alsaseq-event-data-ctl create mode 100644 tests/alsaseq-event-data-note create mode 100644 tests/alsaseq-event-data-queue create mode 100644 tests/alsaseq-event-data-result create mode 100644 tests/alsaseq-functions create mode 100644 tests/alsaseq-queue-timer-common create mode 100644 tests/alsaseq-remove-filter create mode 100644 tests/alsatimer-functions create mode 100644 tests/alsatimer-tick-event create mode 100644 tests/alsatimer-tstamp-event ``` Request URL : https://github.com/alsa-project/alsa-gobject/pull/76 Patch URL : https://github.com/alsa-project/alsa-gobject/pull/76.patch Repository URL: https://github.com/alsa-project/alsa-gobject

1 0

[PATCH 0/2] ALSA: x86: intel_hdmi_audio: pm_runtime updates
by Pierre-Louis Bossart 17 Jun '22

17 Jun '22

While cleaning up the code to use pm_runtime_resume_and_get(), I realized we never called pm_runtime_enable() for this driver. This is potentially very invasive and error-prone, so feedback and test results are welcome - all my BYT/CHT devices are not longer functional unfortunately, and our CI MinnowBoard uses the 'other' HDMI solution based on HDaudio. In addition, the resume was assumed to be always successful, which isn't a very good idea. Pierre-Louis Bossart (2): ALSA: x86: intel_hdmi_audio: enable pm_runtime and set autosuspend delay ALSA: x86: intel_hdmi_audio: use pm_runtime_resume_and_get() sound/x86/intel_hdmi_audio.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) -- 2.34.1

2 3

[PATCH] ALSA: hda: intel-nhlt: remove use of __func__ in dev_dbg
by Pierre-Louis Bossart 17 Jun '22

17 Jun '22

The module and function information can be added with 'modprobe foo dyndbg=+pmf' Suggested-by: Greg KH <gregkh(a)linuxfoundation.org> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Reviewed-by: Péter Ujfalusi <peter.ujfalusi(a)linux.intel.com> Reviewed-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> --- sound/hda/intel-nhlt.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/sound/hda/intel-nhlt.c b/sound/hda/intel-nhlt.c index 4063da3782833..9db5ccd9aa2db 100644 --- a/sound/hda/intel-nhlt.c +++ b/sound/hda/intel-nhlt.c @@ -55,8 +55,8 @@ int intel_nhlt_get_dmic_geo(struct device *dev, struct nhlt_acpi_table *nhlt) /* find max number of channels based on format_configuration */ if (fmt_configs->fmt_count) { - dev_dbg(dev, "%s: found %d format definitions\n", - __func__, fmt_configs->fmt_count); + dev_dbg(dev, "found %d format definitions\n", + fmt_configs->fmt_count); for (i = 0; i < fmt_configs->fmt_count; i++) { struct wav_fmt_ext *fmt_ext; @@ -66,9 +66,9 @@ int intel_nhlt_get_dmic_geo(struct device *dev, struct nhlt_acpi_table *nhlt) if (fmt_ext->fmt.channels > max_ch) max_ch = fmt_ext->fmt.channels; } - dev_dbg(dev, "%s: max channels found %d\n", __func__, max_ch); + dev_dbg(dev, "max channels found %d\n", max_ch); } else { - dev_dbg(dev, "%s: No format information found\n", __func__); + dev_dbg(dev, "No format information found\n"); } if (cfg->device_config.config_type != NHLT_CONFIG_TYPE_MIC_ARRAY) { @@ -95,17 +95,16 @@ int intel_nhlt_get_dmic_geo(struct device *dev, struct nhlt_acpi_table *nhlt) } if (dmic_geo > 0) { - dev_dbg(dev, "%s: Array with %d dmics\n", __func__, dmic_geo); + dev_dbg(dev, "Array with %d dmics\n", dmic_geo); } if (max_ch > dmic_geo) { - dev_dbg(dev, "%s: max channels %d exceed dmic number %d\n", - __func__, max_ch, dmic_geo); + dev_dbg(dev, "max channels %d exceed dmic number %d\n", + max_ch, dmic_geo); } } } - dev_dbg(dev, "%s: dmic number %d max_ch %d\n", - __func__, dmic_geo, max_ch); + dev_dbg(dev, "dmic number %d max_ch %d\n", dmic_geo, max_ch); return dmic_geo; } -- 2.34.1

2 1

[PATCH] ALSA: hda: intel-dspcfg: use SOF for UpExtreme and UpExtreme11 boards
by Pierre-Louis Bossart 17 Jun '22

17 Jun '22

The UpExtreme BIOS reports microphones that are not physically present, so this module ends-up selecting SOF, while the UpExtreme11 BIOS does not report microphones so the snd-hda-intel driver is selected. For consistency use SOF unconditionally in autodetection mode. The use of the snd-hda-intel driver can still be enabled with 'options snd-intel-dspcfg dsp_driver=1' Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> Reviewed-by: Péter Ujfalusi <peter.ujfalusi(a)linux.intel.com> --- sound/hda/intel-dsp-config.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sound/hda/intel-dsp-config.c b/sound/hda/intel-dsp-config.c index a8fe01764b254..ec9cbb219bc14 100644 --- a/sound/hda/intel-dsp-config.c +++ b/sound/hda/intel-dsp-config.c @@ -196,6 +196,12 @@ static const struct config_entry config_table[] = { DMI_MATCH(DMI_SYS_VENDOR, "Google"), } }, + { + .ident = "UP-WHL", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "AAEON"), + } + }, {} } }, @@ -358,6 +364,12 @@ static const struct config_entry config_table[] = { DMI_MATCH(DMI_SYS_VENDOR, "Google"), } }, + { + .ident = "UPX-TGL", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "AAEON"), + } + }, {} } }, -- 2.34.1

2 1

[PATCH] firewire: cdev: fix potential leak of kernel stack due to uninitialized value
by Takashi Sakamoto 17 Jun '22

17 Jun '22

Recent change brings potential leak of value on kernel stack to userspace due to uninitialized value. This commit fixes the bug. Reported-by: Dan Carpenter <dan.carpenter(a)oracle.com> Fixes: baa914cd81f ("firewire: add kernel API to access CYCLE_TIME register") Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- drivers/firewire/core-cdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c index 8e9670036e5c..032ee56c34a3 100644 --- a/drivers/firewire/core-cdev.c +++ b/drivers/firewire/core-cdev.c @@ -1211,7 +1211,7 @@ static int ioctl_get_cycle_timer2(struct client *client, union ioctl_arg *arg) struct fw_cdev_get_cycle_timer2 *a = &arg->get_cycle_timer2; struct fw_card *card = client->device->card; struct timespec64 ts = {0, 0}; - u32 cycle_time; + u32 cycle_time = 0; int ret = 0; local_irq_disable(); -- 2.34.1

2 4

Regression: Upgrade to 1.2.7 Causes No HDMI Audio Device on AMD Trinity APU
by GitHub issues - opened 17 Jun '22

17 Jun '22

alsa-project/alsa-lib issue #239 was opened from lovenemesis: After upgrading to alsa-lib 1.2.7, HDMI Audio from AMD A10-5800K "Trinity" series APU stopped working. HDMI Audio is no longer presented as a Output Device in GNOME Setting - Audio. aplay -l shows error for HDMI device: `aplay: device_list:304: control digital audio info (0): Input/output error` **Downgrading to alsa-lib to 1.2.6** restore the HDMI audio device on A10-5800K system. Below are some system info I collected when running alsa-lib-1.2.6 and alsa-lib-1.2.7 [alsa-lib-1.2.6.txt](https://github.com/alsa-project/alsa-lib/files/8923675/… [alsa-lib-1.2.7.txt](https://github.com/alsa-project/alsa-lib/files/8923676/… It appears to me that kernel, pipewire, wireplumber versions have no impact on the occurrence of the issue. It is also reported in [RedHat Bugzilla](https://bugzilla.redhat.com/show_bug.cgi?id=2097574) Issue URL : https://github.com/alsa-project/alsa-lib/issues/239 Repository URL: https://github.com/alsa-project/alsa-lib

1 0

Re: [PATCH v2] ASoC: ti: omap-mcbsp: duplicate sysfs error
by Mark Brown 16 Jun '22

16 Jun '22

On Wed, Jun 15, 2022 at 10:09:55AM -0500, David Owens wrote: > Convert to managed versions of sysfs and clk allocation to simplify > unbinding and error handling in probe. Managed sysfs node > creation specifically addresses the following error seen the second time > probe is attempted after sdma_pcm_platform_register() previously requsted > probe deferral: This doesn't apply against current code (either for-5.19 or for-5.20), please check and resend.

1 0

Re: [PATCH v2] ASoC: ti: omap-mcbsp: duplicate sysfs error
by Péter Ujfalusi 16 Jun '22

16 Jun '22

Hi David, On 6/15/22 18:09, David Owens wrote: > Convert to managed versions of sysfs and clk allocation to simplify > unbinding and error handling in probe. Managed sysfs node > creation specifically addresses the following error seen the second time > probe is attempted after sdma_pcm_platform_register() previously requsted > probe deferral: > > sysfs: cannot create duplicate filename '/devices/platform/68000000.ocp/49022000.mcbsp/max_tx_thres' I have tried to looked up devm_sysfs_remove_group(), which did not existed, but you found the correct devm ;) Looks good, thank you! Acked-by: Peter Ujfalusi <peter.ujfalusi(a)gmail.com> > Signed-off-by: David Owens <dowens(a)precisionplanting.com> > --- > sound/soc/ti/omap-mcbsp-priv.h | 2 -- > sound/soc/ti/omap-mcbsp-st.c | 21 ++++----------------- > sound/soc/ti/omap-mcbsp.c | 26 ++++---------------------- > 3 files changed, 8 insertions(+), 41 deletions(-) > > diff --git a/sound/soc/ti/omap-mcbsp-priv.h b/sound/soc/ti/omap-mcbsp-priv.h > index 7865cda4bf0a..da519ea1f303 100644 > --- a/sound/soc/ti/omap-mcbsp-priv.h > +++ b/sound/soc/ti/omap-mcbsp-priv.h > @@ -316,8 +316,6 @@ static inline int omap_mcbsp_read(struct omap_mcbsp *mcbsp, u16 reg, > > /* Sidetone specific API */ > int omap_mcbsp_st_init(struct platform_device *pdev); > -void omap_mcbsp_st_cleanup(struct platform_device *pdev); > - > int omap_mcbsp_st_start(struct omap_mcbsp *mcbsp); > int omap_mcbsp_st_stop(struct omap_mcbsp *mcbsp); > > diff --git a/sound/soc/ti/omap-mcbsp-st.c b/sound/soc/ti/omap-mcbsp-st.c > index 0bc7d26c660a..402a57a502e6 100644 > --- a/sound/soc/ti/omap-mcbsp-st.c > +++ b/sound/soc/ti/omap-mcbsp-st.c > @@ -292,14 +292,11 @@ static ssize_t st_taps_store(struct device *dev, > > static DEVICE_ATTR_RW(st_taps); > > -static const struct attribute *sidetone_attrs[] = { > +static struct attribute *sidetone_attrs[] = { > &dev_attr_st_taps.attr, > NULL, > }; > - > -static const struct attribute_group sidetone_attr_group = { > - .attrs = (struct attribute **)sidetone_attrs, > -}; > +ATTRIBUTE_GROUPS(sidetone); > > int omap_mcbsp_st_start(struct omap_mcbsp *mcbsp) > { > @@ -347,7 +344,7 @@ int omap_mcbsp_st_init(struct platform_device *pdev) > if (!st_data) > return -ENOMEM; > > - st_data->mcbsp_iclk = clk_get(mcbsp->dev, "ick"); > + st_data->mcbsp_iclk = devm_clk_get(mcbsp->dev, "ick"); > if (IS_ERR(st_data->mcbsp_iclk)) { > dev_warn(mcbsp->dev, > "Failed to get ick, sidetone might be broken\n"); > @@ -359,7 +356,7 @@ int omap_mcbsp_st_init(struct platform_device *pdev) > if (!st_data->io_base_st) > return -ENOMEM; > > - ret = sysfs_create_group(&mcbsp->dev->kobj, &sidetone_attr_group); > + ret = devm_device_add_group(mcbsp->dev, &sidetone_group); > if (ret) > return ret; > > @@ -368,16 +365,6 @@ int omap_mcbsp_st_init(struct platform_device *pdev) > return 0; > } > > -void omap_mcbsp_st_cleanup(struct platform_device *pdev) > -{ > - struct omap_mcbsp *mcbsp = platform_get_drvdata(pdev); > - > - if (mcbsp->st_data) { > - sysfs_remove_group(&mcbsp->dev->kobj, &sidetone_attr_group); > - clk_put(mcbsp->st_data->mcbsp_iclk); > - } > -} > - > static int omap_mcbsp_st_info_volsw(struct snd_kcontrol *kcontrol, > struct snd_ctl_elem_info *uinfo) > { > diff --git a/sound/soc/ti/omap-mcbsp.c b/sound/soc/ti/omap-mcbsp.c > index 4479d74f0a45..395493a2d965 100644 > --- a/sound/soc/ti/omap-mcbsp.c > +++ b/sound/soc/ti/omap-mcbsp.c > @@ -595,16 +595,13 @@ static ssize_t dma_op_mode_store(struct device *dev, > > static DEVICE_ATTR_RW(dma_op_mode); > > -static const struct attribute *additional_attrs[] = { > +static struct attribute *additional_attrs[] = { > &dev_attr_max_tx_thres.attr, > &dev_attr_max_rx_thres.attr, > &dev_attr_dma_op_mode.attr, > NULL, > }; > - > -static const struct attribute_group additional_attr_group = { > - .attrs = (struct attribute **)additional_attrs, > -}; > +ATTRIBUTE_GROUPS(additional); > > /* > * McBSP1 and McBSP3 are directly mapped on 1610 and 1510. > @@ -702,8 +699,7 @@ static int omap_mcbsp_init(struct platform_device *pdev) > mcbsp->max_tx_thres = max_thres(mcbsp) - 0x10; > mcbsp->max_rx_thres = max_thres(mcbsp) - 0x10; > > - ret = sysfs_create_group(&mcbsp->dev->kobj, > - &additional_attr_group); > + ret = devm_device_add_group(mcbsp->dev, &additional_group); > if (ret) { > dev_err(mcbsp->dev, > "Unable to create additional controls\n"); > @@ -711,16 +707,7 @@ static int omap_mcbsp_init(struct platform_device *pdev) > } > } > > - ret = omap_mcbsp_st_init(pdev); > - if (ret) > - goto err_st; > - > - return 0; > - > -err_st: > - if (mcbsp->pdata->buffer_size) > - sysfs_remove_group(&mcbsp->dev->kobj, &additional_attr_group); > - return ret; > + return omap_mcbsp_st_init(pdev); > } > > /* > @@ -1431,11 +1418,6 @@ static int asoc_mcbsp_remove(struct platform_device *pdev) > if (cpu_latency_qos_request_active(&mcbsp->pm_qos_req)) > cpu_latency_qos_remove_request(&mcbsp->pm_qos_req); > > - if (mcbsp->pdata->buffer_size) > - sysfs_remove_group(&mcbsp->dev->kobj, &additional_attr_group); > - > - omap_mcbsp_st_cleanup(pdev); > - > return 0; > } > > -- > 2.34.1 > > This email is intended solely for the use of the individual to whom it is addressed and may contain confidential and/or privileged material. Any views or opinions presented are solely those of the author and do not necessarily represent those of Precision Planting. If you are not the intended recipient, be advised that you have received this email in error and that any use, dissemination, forwarding, printing, or copying of this email is strictly prohibited. Neither AGCO nor the sender accepts any responsibility for viruses, and it is your responsibility to scan, and virus check the e-mail and its attachment(s) (if any). -- Péter

1 0

[PATCH] ASoC: SOF: Intel: IPC4: enable IMR boot
by Peter Ujfalusi 16 Jun '22

16 Jun '22

IPC4 based firmwares have unconditional support for IMR boot. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Reviewed-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/soc/sof/intel/hda-loader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/sof/intel/hda-loader.c b/sound/soc/sof/intel/hda-loader.c index 9e99f376f2b3..bca9dc5917f4 100644 --- a/sound/soc/sof/intel/hda-loader.c +++ b/sound/soc/sof/intel/hda-loader.c @@ -538,7 +538,8 @@ int hda_dsp_post_fw_run(struct snd_sof_dev *sdev) /* Check if IMR boot is usable */ if (!sof_debug_check_flag(SOF_DBG_IGNORE_D3_PERSISTENT) && - sdev->fw_ready.flags & SOF_IPC_INFO_D3_PERSISTENT) + (sdev->fw_ready.flags & SOF_IPC_INFO_D3_PERSISTENT || + sdev->pdata->ipc_type == SOF_INTEL_IPC4)) hdev->imrboot_supported = true; } -- 2.36.1

2 1