Alsa-devel February 2021

alsa-devel@alsa-project.org

114 participants
283 discussions

[alsa-devel] [PATCH 0/6] ASoC: mediatek: mt8183: support DP audio
by Tzung-Bi Shih 24 Nov '22

24 Nov '22

(This series depends on https://lore.kernel.org/patchwork/patch/1126819/ which has not applied to the maintainer's tree yet.) This series makes mt8183-mt6358-ts3a227-max98357 support DP (display port) audio output. ASoC: hdmi-codec: add PCM trigger operator - add a PCM trigger callback if codec driver is interested in PCM events. drm: bridge: it6505: bridge to hdmi-codec - add audio feature support of it6505. - bridge to hdmi-codec so that ASoC can use the audio feature. - defer the "enabling" after receiving PCM START or RESUME event. ASoC: dt-bindings: mt8183: add a property "mediatek,hdmi-codec" ASoC: mediatek: mt8183: use hdmi-codec - bind to hdmi-codec in mt8183-mt6358-ts3a227-max98357. drm: bridge: it6505: report connector status ASoC: mediatek: mt8183: support HDMI jack reporting - use the mechanism from the following patch https://mailman.alsa-project.org/pipermail/alsa-devel/2019-September/155302… to report jack status (from DRM to ASoC). Allen Chen (1): drm: bridge: it6505: bridge to hdmi-codec Tzung-Bi Shih (5): ASoC: hdmi-codec: add PCM trigger operator ASoC: dt-bindings: mt8183: add a property "mediatek,hdmi-codec" ASoC: mediatek: mt8183: use hdmi-codec drm: bridge: it6505: report connector status ASoC: mediatek: mt8183: support HDMI jack reporting .../sound/mt8183-mt6358-ts3a227-max98357.txt | 2 + drivers/gpu/drm/bridge/ite-it6505.c | 191 +++++++++++++++++- include/sound/hdmi-codec.h | 13 ++ sound/soc/codecs/hdmi-codec.c | 31 +++ sound/soc/mediatek/Kconfig | 3 +- .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 36 +++- 6 files changed, 266 insertions(+), 10 deletions(-) -- 2.23.0.866.gb869b98d4c-goog

3 9

[PATCH] ALSA: usb-audio: Always apply the hw constraints for implicit fb sync
by Takashi Iwai 22 Apr '22

22 Apr '22

Since the commit 5a6c3e11c9c9 ("ALSA: usb-audio: Add hw constraint for implicit fb sync"), we apply the hw constraints for the implicit feedback sync to make the secondary open aligned with the already opened stream setup. This change assumed that the secondary open is performed after the first stream has been already set up, and adds the hw constraints to sync with the first stream's parameters only when the EP setup for the first stream was confirmed at the open time. However, most of applications handling the full-duplex operations do open both playback and capture streams at first, then set up both streams. This results in skipping the additional hw constraints since the counter-part stream hasn't been set up yet at the open of the second stream, and it eventually leads to "incompatible EP" error in the end. This patch corrects the behavior by always applying the hw constraints for the implicit fb sync. The hw constraint rules are defined so that they check the sync EP dynamically at each invocation, instead. This covers the concurrent stream setups better and lets the hw refine calls resolving to the right configuration. Also this patch corrects a minor error that has existed in the debug print that isn't built as default. Fixes: 5a6c3e11c9c9 ("ALSA: usb-audio: Add hw constraint for implicit fb sync") Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- This patched was developed primarily as an attemp for the regression of Pioneer devices. Although Pioneer devices have still some issues after this patch, this one itself should be good for all devices in general. Keith, Dylan, could you verify that this doesn't break things for your devices? sound/usb/pcm.c | 171 ++++++++++++++++++++++++++++++------------------ 1 file changed, 108 insertions(+), 63 deletions(-) diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c index 56079901769f..f71965bf815f 100644 --- a/sound/usb/pcm.c +++ b/sound/usb/pcm.c @@ -663,7 +663,7 @@ static int hw_check_valid_format(struct snd_usb_substream *subs, check_fmts.bits[1] = (u32)(fp->formats >> 32); snd_mask_intersect(&check_fmts, fmts); if (snd_mask_empty(&check_fmts)) { - hwc_debug(" > check: no supported format %d\n", fp->format); + hwc_debug(" > check: no supported format 0x%llx\n", fp->formats); return 0; } /* check the channels */ @@ -775,24 +775,11 @@ static int hw_rule_channels(struct snd_pcm_hw_params *params, return apply_hw_params_minmax(it, rmin, rmax); } -static int hw_rule_format(struct snd_pcm_hw_params *params, - struct snd_pcm_hw_rule *rule) +static int apply_hw_params_format_bits(struct snd_mask *fmt, u64 fbits) { - struct snd_usb_substream *subs = rule->private; - const struct audioformat *fp; - struct snd_mask *fmt = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT); - u64 fbits; u32 oldbits[2]; int changed; - hwc_debug("hw_rule_format: %x:%x\n", fmt->bits[0], fmt->bits[1]); - fbits = 0; - list_for_each_entry(fp, &subs->fmt_list, list) { - if (!hw_check_valid_format(subs, params, fp)) - continue; - fbits |= fp->formats; - } - oldbits[0] = fmt->bits[0]; oldbits[1] = fmt->bits[1]; fmt->bits[0] &= (u32)fbits; @@ -806,6 +793,24 @@ static int hw_rule_format(struct snd_pcm_hw_params *params, return changed; } +static int hw_rule_format(struct snd_pcm_hw_params *params, + struct snd_pcm_hw_rule *rule) +{ + struct snd_usb_substream *subs = rule->private; + const struct audioformat *fp; + struct snd_mask *fmt = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT); + u64 fbits; + + hwc_debug("hw_rule_format: %x:%x\n", fmt->bits[0], fmt->bits[1]); + fbits = 0; + list_for_each_entry(fp, &subs->fmt_list, list) { + if (!hw_check_valid_format(subs, params, fp)) + continue; + fbits |= fp->formats; + } + return apply_hw_params_format_bits(fmt, fbits); +} + static int hw_rule_period_time(struct snd_pcm_hw_params *params, struct snd_pcm_hw_rule *rule) { @@ -833,64 +838,92 @@ static int hw_rule_period_time(struct snd_pcm_hw_params *params, return apply_hw_params_minmax(it, pmin, UINT_MAX); } -/* apply PCM hw constraints from the concurrent sync EP */ -static int apply_hw_constraint_from_sync(struct snd_pcm_runtime *runtime, - struct snd_usb_substream *subs) +/* get the EP or the sync EP for implicit fb when it's already set up */ +static const struct snd_usb_endpoint * +get_sync_ep_from_substream(struct snd_usb_substream *subs) { struct snd_usb_audio *chip = subs->stream->chip; - struct snd_usb_endpoint *ep; const struct audioformat *fp; - int err; + const struct snd_usb_endpoint *ep; list_for_each_entry(fp, &subs->fmt_list, list) { ep = snd_usb_get_endpoint(chip, fp->endpoint); if (ep && ep->cur_rate) - goto found; + return ep; if (!fp->implicit_fb) continue; /* for the implicit fb, check the sync ep as well */ ep = snd_usb_get_endpoint(chip, fp->sync_ep); if (ep && ep->cur_rate) - goto found; + return ep; } - return 0; + return NULL; +} + +/* additional hw constraints for implicit feedback mode */ +static int hw_rule_format_implicit_fb(struct snd_pcm_hw_params *params, + struct snd_pcm_hw_rule *rule) +{ + struct snd_usb_substream *subs = rule->private; + const struct snd_usb_endpoint *ep; + struct snd_mask *fmt = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT); - found: - if (!find_format(&subs->fmt_list, ep->cur_format, ep->cur_rate, - ep->cur_channels, false, NULL)) { - usb_audio_dbg(chip, "EP 0x%x being used, but not applicable\n", - ep->ep_num); + ep = get_sync_ep_from_substream(subs); + if (!ep) return 0; - } - usb_audio_dbg(chip, "EP 0x%x being used, using fixed params:\n", - ep->ep_num); - usb_audio_dbg(chip, "rate=%d, period_size=%d, periods=%d\n", - ep->cur_rate, ep->cur_period_frames, - ep->cur_buffer_periods); + hwc_debug("applying %s\n", __func__); + return apply_hw_params_format_bits(fmt, pcm_format_to_bits(ep->cur_format)); +} - runtime->hw.formats = subs->formats; - runtime->hw.rate_min = runtime->hw.rate_max = ep->cur_rate; - runtime->hw.rates = SNDRV_PCM_RATE_KNOT; - runtime->hw.periods_min = runtime->hw.periods_max = - ep->cur_buffer_periods; +static int hw_rule_rate_implicit_fb(struct snd_pcm_hw_params *params, + struct snd_pcm_hw_rule *rule) +{ + struct snd_usb_substream *subs = rule->private; + const struct snd_usb_endpoint *ep; + struct snd_interval *it; - err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS, - hw_rule_channels, subs, - SNDRV_PCM_HW_PARAM_FORMAT, - SNDRV_PCM_HW_PARAM_RATE, - -1); - if (err < 0) - return err; + ep = get_sync_ep_from_substream(subs); + if (!ep) + return 0; - err = snd_pcm_hw_constraint_minmax(runtime, - SNDRV_PCM_HW_PARAM_PERIOD_SIZE, - ep->cur_period_frames, - ep->cur_period_frames); - if (err < 0) - return err; + hwc_debug("applying %s\n", __func__); + it = hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE); + return apply_hw_params_minmax(it, ep->cur_rate, ep->cur_rate); +} + +static int hw_rule_period_size_implicit_fb(struct snd_pcm_hw_params *params, + struct snd_pcm_hw_rule *rule) +{ + struct snd_usb_substream *subs = rule->private; + const struct snd_usb_endpoint *ep; + struct snd_interval *it; - return 1; /* notify the finding */ + ep = get_sync_ep_from_substream(subs); + if (!ep) + return 0; + + hwc_debug("applying %s\n", __func__); + it = hw_param_interval(params, SNDRV_PCM_HW_PARAM_PERIOD_SIZE); + return apply_hw_params_minmax(it, ep->cur_period_frames, + ep->cur_period_frames); +} + +static int hw_rule_periods_implicit_fb(struct snd_pcm_hw_params *params, + struct snd_pcm_hw_rule *rule) +{ + struct snd_usb_substream *subs = rule->private; + const struct snd_usb_endpoint *ep; + struct snd_interval *it; + + ep = get_sync_ep_from_substream(subs); + if (!ep) + return 0; + + hwc_debug("applying %s\n", __func__); + it = hw_param_interval(params, SNDRV_PCM_HW_PARAM_PERIODS); + return apply_hw_params_minmax(it, ep->cur_buffer_periods, + ep->cur_buffer_periods); } /* @@ -899,20 +932,11 @@ static int apply_hw_constraint_from_sync(struct snd_pcm_runtime *runtime, static int setup_hw_info(struct snd_pcm_runtime *runtime, struct snd_usb_substream *subs) { - struct snd_usb_audio *chip = subs->stream->chip; const struct audioformat *fp; unsigned int pt, ptmin; int param_period_time_if_needed = -1; int err; - mutex_lock(&chip->mutex); - err = apply_hw_constraint_from_sync(runtime, subs); - mutex_unlock(&chip->mutex); - if (err < 0) - return err; - if (err > 0) /* found the matching? */ - goto add_extra_rules; - runtime->hw.formats = subs->formats; runtime->hw.rate_min = 0x7fffffff; @@ -964,7 +988,6 @@ static int setup_hw_info(struct snd_pcm_runtime *runtime, struct snd_usb_substre if (err < 0) return err; -add_extra_rules: err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS, hw_rule_channels, subs, SNDRV_PCM_HW_PARAM_FORMAT, @@ -993,6 +1016,28 @@ static int setup_hw_info(struct snd_pcm_runtime *runtime, struct snd_usb_substre return err; } + /* additional hw constraints for implicit fb */ + err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_FORMAT, + hw_rule_format_implicit_fb, subs, + SNDRV_PCM_HW_PARAM_FORMAT, -1); + if (err < 0) + return err; + err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_RATE, + hw_rule_rate_implicit_fb, subs, + SNDRV_PCM_HW_PARAM_RATE, -1); + if (err < 0) + return err; + err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_SIZE, + hw_rule_period_size_implicit_fb, subs, + SNDRV_PCM_HW_PARAM_PERIOD_SIZE, -1); + if (err < 0) + return err; + err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_PERIODS, + hw_rule_periods_implicit_fb, subs, + SNDRV_PCM_HW_PARAM_PERIODS, -1); + if (err < 0) + return err; + return 0; } -- 2.26.2

2 1

[alsa-devel] [PATCH 00/46] ARM: pxa: towards multiplatform support
by Arnd Bergmann 19 Apr '22

19 Apr '22

Hi PXA maintainers, I'm in the process of getting the old ARM platforms to all build in a single kernel. The largest part of that work is changing all the device drivers to no longer require mach/*.h header files. This series does it for arch/pxa/. As with the omap1 and s3c24xx series I sent before, I don't expect this all to be correct in the first version, though a lot of the patches are fairly simple and I did exhaustive compile-time testing on them. Please test if you have the hardware, or review! Arnd Bcc: Alexandre Belloni <alexandre.belloni(a)bootlin.com> Bcc: alsa-devel(a)alsa-project.org Bcc: Bartlomiej Zolnierkiewicz <b.zolnierkie(a)samsung.com> Bcc: Brian Norris <computersforpeace(a)gmail.com> Bcc: Daniel Thompson <daniel.thompson(a)linaro.org> Bcc: David Woodhouse <dwmw2(a)infradead.org> Bcc: Dmitry Torokhov <dmitry.torokhov(a)gmail.com> Bcc: Dominik Brodowski <linux(a)dominikbrodowski.net> Bcc: dri-devel(a)lists.freedesktop.org Bcc: Felipe Balbi <balbi(a)kernel.org> Bcc: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Bcc: Guenter Roeck <linux(a)roeck-us.net> Bcc: Jacek Anaszewski <jacek.anaszewski(a)gmail.com> Bcc: Jens Axboe <axboe(a)kernel.dk> Bcc: Jingoo Han <jingoohan1(a)gmail.com> Bcc: Jonathan Cameron <jic23(a)cam.ac.uk> Bcc: Lee Jones <lee.jones(a)linaro.org> Bcc: Lubomir Rintel <lkundrak(a)v3.sk> Bcc: Marek Vasut <marek.vasut(a)gmail.com> Bcc: Mark Brown <broonie(a)kernel.org> Bcc: Michael Turquette <mturquette(a)baylibre.com> Bcc: Miquel Raynal <miquel.raynal(a)bootlin.com> Bcc: Paul Parsons <lost.distance(a)yahoo.com> Bcc: Pavel Machek <pavel(a)ucw.cz> Bcc: Philipp Zabel <philipp.zabel(a)gmail.com> Bcc: "Rafael J. Wysocki" <rjw(a)rjwysocki.net> Bcc: Richard Weinberger <richard(a)nod.at> Bcc: Russell King <linux(a)armlinux.org.uk> Bcc: Sebastian Reichel <sre(a)kernel.org> Bcc: Sergey Lapin <slapin(a)ossfans.org> Bcc: Stephen Boyd <sboyd(a)kernel.org> Bcc: Tomas Cech <sleep_walker(a)suse.com> Bcc: Ulf Hansson <ulf.hansson(a)linaro.org> Bcc: Vignesh Raghavendra <vigneshr(a)ti.com> Bcc: Viresh Kumar <viresh.kumar(a)linaro.org> Bcc: Wim Van Sebroeck <wim(a)linux-watchdog.org> Cc: linux-clk(a)vger.kernel.org Cc: linux-fbdev(a)vger.kernel.org Cc: linux-ide(a)vger.kernel.org Cc: linux-input(a)vger.kernel.org Cc: linux-leds(a)vger.kernel.org Cc: linux-mmc(a)vger.kernel.org Cc: linux-mtd(a)lists.infradead.org Cc: linux-pm(a)vger.kernel.org Cc: linux-rtc(a)vger.kernel.org Cc: linux-usb(a)vger.kernel.org Cc: linux-watchdog(a)vger.kernel.org Arnd Bergmann (46): ARM: pxa: split mach/generic.h ARM: pxa: make mainstone.h private ARM: pxa: make mach/regs-uart.h private ARM: pxa: remove mach/dma.h ARM: pxa: split up mach/hardware.h ARM: pxa: stop using mach/bitfield.h ARM: pxa: move mach/sound.h to linux/platform_data/ ARM: pxa: move regs-lcd.h into driver watchdog: sa1100: use platform device registration ARM: pxa: pxa2xx-ac97-lib: use IRQ resource ARM: pxa: cmx270: use platform device for nand ARM: pxa: make addr-map.h header local ARM: pxa: move pcmcia board data into mach-pxa ARM: pxa: use pdev resource for palmld mmio ARM: pxa: maybe fix gpio lookup tables ARM: pxa: tosa: use gpio descriptor for audio ARM: pxa: poodle: use platform data for poodle asoc driver ARM: pxa: corgi: use gpio descriptors for audio ARM: pxa: hx4700: use gpio descriptors for audio ARM: pxa: lubbock: pass udc irqs as resource ARM: pxa: spitz: use gpio descriptors for audio ARM: pxa: eseries: use gpio lookup for audio ARM: pxa: z2: use gpio lookup for audio device ARM: pxa: magician: use platform driver for audio ARM: pxa: mainstone-wm97xx: use gpio lookup table ARM: pxa: zylonite: use gpio lookup instead mfp header input: touchscreen: mainstone: fix pxa2xx+pxa3xx configuration input: touchscreen: mainstone: sync with zylonite driver Input: touchscreen: use wrapper for pxa2xx ac97 registers SoC: pxa: use pdev resource for FIFO regs ASoC: pxa: ac97: use normal MMIO accessors ASoC: pxa: i2s: use normal MMIO accessors ARM: pxa: pcmcia: move smemc configuration back to arch ARM: pxa: remove get_clk_frequency_khz() cpufreq: pxa3: move clk register access to clk driver ARM: pxa: move smemc register access from clk to platform ARM: pxa: move clk register definitions to driver video: backlight: tosa: use gpio lookup table power: tosa: simplify probe function ARM: pxa: tosa: use gpio lookup for battery ARM: pxa: move it8152 PCI support into machine ARM: pxa: remove unused mach/bitfield.h ARM: pxa: pci-it8152: add platform checks ARM: mmp: remove tavorevb board support ARM: mmp: rename pxa_register_device ARM: pxa: move plat-pxa to drivers/soc/ arch/arm/Kconfig | 9 - arch/arm/Makefile | 1 - arch/arm/common/Makefile | 1 - arch/arm/common/locomo.c | 1 - arch/arm/common/sa1111.c | 5 +- arch/arm/include/asm/hardware/sa1111.h | 2 - arch/arm/mach-mmp/Kconfig | 10 +- arch/arm/mach-mmp/Makefile | 1 - arch/arm/mach-mmp/devices.c | 2 +- arch/arm/mach-mmp/devices.h | 10 +- arch/arm/mach-mmp/mfp.h | 2 +- arch/arm/mach-mmp/mmp2.h | 48 ++--- arch/arm/mach-mmp/pxa168.h | 60 +++--- arch/arm/mach-mmp/pxa910.h | 38 ++-- arch/arm/mach-mmp/tavorevb.c | 113 ----------- arch/arm/mach-mmp/ttc_dkb.c | 6 +- arch/arm/mach-pxa/Kconfig | 8 +- arch/arm/mach-pxa/Makefile | 22 +- .../mach-pxa/{include/mach => }/addr-map.h | 0 .../arm/mach-pxa/balloon3-pcmcia.c | 4 +- arch/arm/mach-pxa/balloon3.c | 4 +- .../mach-pxa/{include/mach => }/balloon3.h | 2 +- arch/arm/mach-pxa/cm-x270.c | 25 +++ arch/arm/mach-pxa/cm-x2xx-pci.c | 2 +- arch/arm/mach-pxa/cm-x2xx.c | 7 +- arch/arm/mach-pxa/cm-x300.c | 12 +- .../arm/mach-pxa/cm_x255-pcmcia.c | 2 +- .../arm/mach-pxa/cm_x270-pcmcia.c | 2 +- .../arm/mach-pxa/cm_x2xx-pcmcia.c | 2 +- arch/arm/mach-pxa/colibri-evalboard.c | 1 - .../arm/mach-pxa/colibri-pcmcia.c | 2 +- arch/arm/mach-pxa/colibri-pxa270-income.c | 1 - arch/arm/mach-pxa/colibri-pxa270.c | 2 +- arch/arm/mach-pxa/colibri-pxa300.c | 3 +- arch/arm/mach-pxa/colibri-pxa320.c | 2 +- arch/arm/mach-pxa/colibri-pxa3xx.c | 1 - arch/arm/mach-pxa/corgi.c | 23 ++- arch/arm/mach-pxa/{include/mach => }/corgi.h | 2 +- arch/arm/mach-pxa/corgi_pm.c | 3 +- arch/arm/mach-pxa/csb726.c | 3 +- arch/arm/mach-pxa/devices.c | 15 +- .../arm/mach-pxa/e740-pcmcia.c | 2 +- arch/arm/mach-pxa/em-x270.c | 2 +- arch/arm/mach-pxa/eseries.c | 34 +++- arch/arm/mach-pxa/ezx.c | 1 - arch/arm/mach-pxa/generic.c | 78 ++++++-- arch/arm/mach-pxa/generic.h | 9 - arch/arm/mach-pxa/gumstix.c | 1 - .../arm/mach-pxa/hx4700-pcmcia.c | 4 +- arch/arm/mach-pxa/hx4700.c | 18 +- arch/arm/mach-pxa/{include/mach => }/hx4700.h | 2 +- arch/arm/mach-pxa/idp.c | 2 - arch/arm/mach-pxa/include/mach/bitfield.h | 114 ----------- arch/arm/mach-pxa/include/mach/dma.h | 17 -- arch/arm/mach-pxa/include/mach/generic.h | 1 - arch/arm/mach-pxa/include/mach/mfp.h | 2 +- arch/arm/mach-pxa/include/mach/pxa-regs.h | 52 +++++ arch/arm/mach-pxa/include/mach/pxa2xx-regs.h | 47 +---- arch/arm/mach-pxa/include/mach/pxa3xx-regs.h | 71 +------ arch/arm/mach-pxa/include/mach/regs-ost.h | 4 +- arch/arm/mach-pxa/include/mach/reset.h | 2 +- arch/arm/mach-pxa/include/mach/tosa.h | 15 -- arch/arm/mach-pxa/irq.c | 3 +- arch/arm/mach-pxa/littleton.c | 1 - arch/arm/mach-pxa/lpd270.c | 4 +- arch/arm/mach-pxa/lubbock.c | 15 +- .../arm/mach-pxa/{include/mach => }/lubbock.h | 2 - arch/arm/mach-pxa/magician.c | 54 ++++- arch/arm/mach-pxa/mainstone.c | 15 +- .../mach-pxa/{include/mach => }/mainstone.h | 2 - arch/arm/mach-pxa/mfp-pxa2xx.c | 1 + arch/arm/mach-pxa/mfp-pxa2xx.h | 2 +- arch/arm/mach-pxa/mfp-pxa3xx.c | 1 - arch/arm/mach-pxa/mfp-pxa3xx.h | 2 +- arch/arm/mach-pxa/mioa701.c | 2 +- arch/arm/mach-pxa/mxm8x10.c | 8 +- arch/arm/mach-pxa/palm27x.c | 2 +- .../arm/mach-pxa/palmld-pcmcia.c | 5 +- arch/arm/mach-pxa/palmld.c | 23 ++- arch/arm/mach-pxa/{include/mach => }/palmld.h | 2 +- arch/arm/mach-pxa/palmt5.c | 11 +- .../arm/mach-pxa/palmtc-pcmcia.c | 4 +- arch/arm/mach-pxa/palmtc.c | 4 +- arch/arm/mach-pxa/{include/mach => }/palmtc.h | 2 +- arch/arm/mach-pxa/palmte2.c | 2 +- arch/arm/mach-pxa/palmtreo.c | 2 +- .../arm/mach-pxa/palmtx-pcmcia.c | 4 +- arch/arm/mach-pxa/palmtx.c | 13 +- arch/arm/mach-pxa/{include/mach => }/palmtx.h | 2 +- arch/arm/mach-pxa/palmz72.c | 2 +- .../it8152.c => mach-pxa/pci-it8152.c} | 25 ++- .../it8152.h => mach-pxa/pci-it8152.h} | 2 - arch/arm/mach-pxa/pcm990-baseboard.c | 2 +- arch/arm/mach-pxa/poodle.c | 31 ++- arch/arm/mach-pxa/{include/mach => }/poodle.h | 4 +- arch/arm/mach-pxa/pxa-regs.h | 1 + arch/arm/mach-pxa/pxa25x.c | 6 +- arch/arm/mach-pxa/pxa25x.h | 2 +- arch/arm/mach-pxa/pxa27x-udc.h | 2 + arch/arm/mach-pxa/pxa27x.c | 6 +- arch/arm/mach-pxa/pxa27x.h | 2 +- arch/arm/mach-pxa/pxa2xx.c | 1 - arch/arm/mach-pxa/pxa300.c | 1 + arch/arm/mach-pxa/pxa320.c | 1 + arch/arm/mach-pxa/pxa3xx-ulpi.c | 2 +- arch/arm/mach-pxa/pxa3xx.c | 11 +- arch/arm/mach-pxa/pxa3xx.h | 2 +- arch/arm/mach-pxa/pxa930.c | 1 + arch/arm/mach-pxa/regs-rtc.h | 2 +- arch/arm/mach-pxa/regs-u2d.h | 2 - .../mach-pxa/{include/mach => }/regs-uart.h | 2 + arch/arm/mach-pxa/reset.c | 3 - arch/arm/mach-pxa/sleep.S | 5 +- arch/arm/mach-pxa/smemc.c | 11 +- arch/arm/mach-pxa/spitz.c | 33 ++- arch/arm/mach-pxa/{include/mach => }/spitz.h | 2 +- arch/arm/mach-pxa/spitz_pm.c | 3 +- arch/arm/mach-pxa/standby.S | 1 - .../arm/mach-pxa/stargate2-pcmcia.c | 2 +- arch/arm/mach-pxa/tosa.c | 63 +++++- .../arm/mach-pxa/trizeps4-pcmcia.c | 4 +- arch/arm/mach-pxa/trizeps4.c | 4 +- .../mach-pxa/{include/mach => }/trizeps4.h | 3 +- .../arm/mach-pxa/viper-pcmcia.c | 6 +- .../arm/mach-pxa/viper-pcmcia.h | 0 arch/arm/mach-pxa/viper.c | 8 +- .../arm/mach-pxa/vpac270-pcmcia.c | 4 +- arch/arm/mach-pxa/vpac270.c | 4 +- .../arm/mach-pxa/{include/mach => }/vpac270.h | 0 arch/arm/mach-pxa/xcep.c | 2 +- arch/arm/mach-pxa/z2.c | 11 + arch/arm/mach-pxa/zeus.c | 6 +- arch/arm/mach-pxa/zylonite.c | 34 +++- arch/arm/mach-pxa/zylonite.h | 2 + arch/arm/mach-pxa/zylonite_pxa300.c | 1 + arch/arm/mach-pxa/zylonite_pxa320.c | 1 + arch/arm/mach-sa1100/generic.c | 6 +- arch/arm/mach-sa1100/include/mach/reset.h | 1 - drivers/ata/pata_palmld.c | 3 +- drivers/clk/pxa/clk-pxa.c | 8 +- drivers/clk/pxa/clk-pxa.h | 9 +- drivers/clk/pxa/clk-pxa25x.c | 46 ++--- drivers/clk/pxa/clk-pxa27x.c | 68 +++---- drivers/clk/pxa/clk-pxa3xx.c | 139 +++++++++++-- drivers/cpufreq/pxa2xx-cpufreq.c | 6 +- drivers/cpufreq/pxa3xx-cpufreq.c | 65 +++--- drivers/input/mouse/pxa930_trkball.c | 1 - drivers/input/touchscreen/Kconfig | 2 + drivers/input/touchscreen/mainstone-wm97xx.c | 123 ++++++------ drivers/input/touchscreen/zylonite-wm97xx.c | 34 ++-- drivers/leds/leds-locomo.c | 1 - drivers/mmc/host/pxamci.c | 2 +- drivers/mtd/maps/pxa2xx-flash.c | 2 - drivers/mtd/nand/raw/cmx270_nand.c | 89 +++------ drivers/pcmcia/Makefile | 16 -- drivers/pcmcia/pxa2xx_base.c | 48 ++--- drivers/pcmcia/pxa2xx_sharpsl.c | 3 +- drivers/pcmcia/sa1111_generic.c | 1 - drivers/pcmcia/sa1111_lubbock.c | 1 - drivers/pcmcia/soc_common.c | 2 - drivers/pcmcia/soc_common.h | 120 +---------- drivers/power/supply/tosa_battery.c | 189 ++++++++++-------- drivers/rtc/rtc-pxa.c | 2 - drivers/soc/Kconfig | 1 + drivers/soc/Makefile | 1 + .../arm/plat-pxa => drivers/soc/pxa}/Kconfig | 5 +- .../arm/plat-pxa => drivers/soc/pxa}/Makefile | 4 - {arch/arm/plat-pxa => drivers/soc/pxa}/mfp.c | 2 +- {arch/arm/plat-pxa => drivers/soc/pxa}/ssp.c | 0 drivers/usb/gadget/udc/pxa25x_udc.c | 37 ++-- drivers/usb/gadget/udc/pxa25x_udc.h | 7 +- drivers/usb/host/ohci-pxa27x.c | 3 +- drivers/video/backlight/tosa_bl.c | 10 +- drivers/video/backlight/tosa_bl.h | 8 + drivers/video/backlight/tosa_lcd.c | 28 ++- .../video/fbdev/pxa3xx-regs.h | 24 +-- drivers/video/fbdev/pxafb.c | 4 +- drivers/watchdog/sa1100_wdt.c | 88 +++++--- include/linux/clk/pxa.h | 16 ++ include/linux/platform_data/asoc-poodle.h | 16 ++ .../linux/platform_data/asoc-pxa.h | 4 +- include/linux/platform_data/video-pxafb.h | 22 +- .../hardware.h => include/linux/soc/pxa/cpu.h | 61 +----- .../plat => include/linux/soc/pxa}/mfp.h | 6 +- include/linux/soc/pxa/smemc.h | 13 ++ include/pcmcia/soc_common.h | 125 ++++++++++++ include/sound/pxa2xx-lib.h | 4 + sound/arm/pxa2xx-ac97-lib.c | 145 +++++++++----- .../arm/pxa2xx-ac97-regs.h | 42 ++-- sound/arm/pxa2xx-ac97.c | 3 +- sound/soc/pxa/corgi.c | 42 ++-- sound/soc/pxa/e740_wm9705.c | 37 ++-- sound/soc/pxa/e750_wm9705.c | 33 ++- sound/soc/pxa/e800_wm9712.c | 33 ++- sound/soc/pxa/em-x270.c | 2 +- sound/soc/pxa/hx4700.c | 34 ++-- sound/soc/pxa/magician.c | 141 ++++--------- sound/soc/pxa/mioa701_wm9713.c | 2 +- sound/soc/pxa/palm27x.c | 2 +- sound/soc/pxa/poodle.c | 51 ++--- sound/soc/pxa/pxa2xx-ac97.c | 24 ++- sound/soc/pxa/pxa2xx-i2s.c | 112 ++++++----- sound/soc/pxa/spitz.c | 58 +++--- sound/soc/pxa/tosa.c | 18 +- sound/soc/pxa/z2.c | 8 +- 205 files changed, 1916 insertions(+), 1795 deletions(-) delete mode 100644 arch/arm/mach-mmp/tavorevb.c rename arch/arm/mach-pxa/{include/mach => }/addr-map.h (100%) rename drivers/pcmcia/pxa2xx_balloon3.c => arch/arm/mach-pxa/balloon3-pcmcia.c (98%) rename arch/arm/mach-pxa/{include/mach => }/balloon3.h (99%) rename drivers/pcmcia/pxa2xx_cm_x255.c => arch/arm/mach-pxa/cm_x255-pcmcia.c (98%) rename drivers/pcmcia/pxa2xx_cm_x270.c => arch/arm/mach-pxa/cm_x270-pcmcia.c (98%) rename drivers/pcmcia/pxa2xx_cm_x2xx.c => arch/arm/mach-pxa/cm_x2xx-pcmcia.c (96%) rename drivers/pcmcia/pxa2xx_colibri.c => arch/arm/mach-pxa/colibri-pcmcia.c (99%) rename arch/arm/mach-pxa/{include/mach => }/corgi.h (98%) rename drivers/pcmcia/pxa2xx_e740.c => arch/arm/mach-pxa/e740-pcmcia.c (98%) rename drivers/pcmcia/pxa2xx_hx4700.c => arch/arm/mach-pxa/hx4700-pcmcia.c (98%) rename arch/arm/mach-pxa/{include/mach => }/hx4700.h (99%) delete mode 100644 arch/arm/mach-pxa/include/mach/bitfield.h delete mode 100644 arch/arm/mach-pxa/include/mach/dma.h delete mode 100644 arch/arm/mach-pxa/include/mach/generic.h create mode 100644 arch/arm/mach-pxa/include/mach/pxa-regs.h rename arch/arm/mach-pxa/{include/mach => }/lubbock.h (97%) rename arch/arm/mach-pxa/{include/mach => }/mainstone.h (99%) rename drivers/pcmcia/pxa2xx_palmld.c => arch/arm/mach-pxa/palmld-pcmcia.c (98%) rename arch/arm/mach-pxa/{include/mach => }/palmld.h (98%) rename drivers/pcmcia/pxa2xx_palmtc.c => arch/arm/mach-pxa/palmtc-pcmcia.c (98%) rename arch/arm/mach-pxa/{include/mach => }/palmtc.h (98%) rename drivers/pcmcia/pxa2xx_palmtx.c => arch/arm/mach-pxa/palmtx-pcmcia.c (98%) rename arch/arm/mach-pxa/{include/mach => }/palmtx.h (98%) rename arch/arm/{common/it8152.c => mach-pxa/pci-it8152.c} (95%) rename arch/arm/{include/asm/hardware/it8152.h => mach-pxa/pci-it8152.h} (98%) rename arch/arm/mach-pxa/{include/mach => }/poodle.h (97%) create mode 100644 arch/arm/mach-pxa/pxa-regs.h rename arch/arm/mach-pxa/{include/mach => }/regs-uart.h (99%) rename arch/arm/mach-pxa/{include/mach => }/spitz.h (99%) rename drivers/pcmcia/pxa2xx_stargate2.c => arch/arm/mach-pxa/stargate2-pcmcia.c (99%) rename drivers/pcmcia/pxa2xx_trizeps4.c => arch/arm/mach-pxa/trizeps4-pcmcia.c (98%) rename arch/arm/mach-pxa/{include/mach => }/trizeps4.h (98%) rename drivers/pcmcia/pxa2xx_viper.c => arch/arm/mach-pxa/viper-pcmcia.c (97%) rename include/linux/platform_data/pcmcia-pxa2xx_viper.h => arch/arm/mach-pxa/viper-pcmcia.h (100%) rename drivers/pcmcia/pxa2xx_vpac270.c => arch/arm/mach-pxa/vpac270-pcmcia.c (98%) rename arch/arm/mach-pxa/{include/mach => }/vpac270.h (100%) rename {arch/arm/plat-pxa => drivers/soc/pxa}/Kconfig (83%) rename {arch/arm/plat-pxa => drivers/soc/pxa}/Makefile (51%) rename {arch/arm/plat-pxa => drivers/soc/pxa}/mfp.c (99%) rename {arch/arm/plat-pxa => drivers/soc/pxa}/ssp.c (100%) create mode 100644 drivers/video/backlight/tosa_bl.h rename arch/arm/mach-pxa/include/mach/regs-lcd.h => drivers/video/fbdev/pxa3xx-regs.h (90%) create mode 100644 include/linux/clk/pxa.h create mode 100644 include/linux/platform_data/asoc-poodle.h rename arch/arm/mach-pxa/include/mach/audio.h => include/linux/platform_data/asoc-pxa.h (93%) rename arch/arm/mach-pxa/include/mach/hardware.h => include/linux/soc/pxa/cpu.h (75%) rename {arch/arm/plat-pxa/include/plat => include/linux/soc/pxa}/mfp.h (98%) create mode 100644 include/linux/soc/pxa/smemc.h create mode 100644 include/pcmcia/soc_common.h rename arch/arm/mach-pxa/include/mach/regs-ac97.h => sound/arm/pxa2xx-ac97-regs.h (71%) -- 2.20.0

9 53

[alsa-devel] [PATCH v7 0/8] Fix year 2038 issue for sound subsystem
by Arnd Bergmann 19 Oct '21

19 Oct '21

This is a series I worked on with Baolin in 2017 and 2018, but we never quite managed to finish up the last pieces. During the ALSA developer meetup at ELC-E 2018 in Edinburgh, a decision was made to go with this approach for keeping best compatibility with existing source code, and then I failed to follow up by resending the patches. Now I have patches for all remaining time_t uses in the kernel, so it's absolutely time to revisit them. I have done more review of the patches myself and found a couple of minor issues that I have fixed up, otherwise the series is still the same as before. Conceptually, the idea of these patches is: - 64-bit applications should see no changes at all, neither compile-time nor run-time. - 32-bit code compiled with a 64-bit time_t currently does not work with ALSA, and requires kernel changes and/or sound/asound.h changes - Most 32-bit code using these interfaces will work correctly on a modified kernel, with or without the uapi header changes. - 32-bit code using SNDRV_TIMER_IOCTL_TREAD requires the updated header file for 64-bit time_t support - 32-bit i386 user space with 64-bit time_t is broken for SNDRV_PCM_IOCTL_STATUS, SNDRV_RAWMIDI_IOCTL_STATUS and SNDRV_PCM_IOCTL_SYNC_PTR because of i386 alignment. This is also addressed by the updated uapi header. - PCM mmap is currently supported on native x86 kernels (both 32-bit and 64-bit) but not for compat mode. This series breaks the 32-bit native mmap support for 32-bit time_t, but instead allows it for 64-bit time_t on both native and compat kernels. This seems to be the best trade-off, as mmap support is optional already, and most 32-bit code runs in compat mode anyway. - I've tried to avoid breaking compilation of 32-bit code as much as possible. Anything that does break however is likely code that is already broken on 64-bit time_t and needs source changes to fix them. I hope I addressed all review comments by now, so please pull this for linux-5.6. A git branch with the same contents is available for testing at [1]. Arnd [1] https://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git y2038-alsa-v7 [2] https://lore.kernel.org/lkml/CAK8P3a2Os66+iwQYf97qh05W2JP8rmWao8zmKoHiXqVHv… Changes since v6: (Arnd): - Add a patch to update the API versions - Hide a timespec reference in #ifndef __KERNEL__ to remove the last reference to time_t - Use a more readable way to do padding and describe it in the changelog - Rebase to linux-5.5-rc1, changing include/sound/soc-component.h and sound/drivers/aloop.c as needed. Changes since v5 (Arnd): - Rebased to linux-5.4-rc4 - Updated to completely remove timespec and time_t references from alsa - found and fixed a few bugs Changes since v4 (Baolin): - Add patch 5 to change trigger_tstamp member of struct snd_pcm_runtime. - Add patch 8 to change internal timespec. - Add more explanation in commit message. - Use ktime_get_real_ts64() in patch 6. - Split common code out into a separate function in patch 6. - Fix tu->tread bug in patch 6 and remove #if __BITS_PER_LONG == 64 macro. Changes since v3: - Move struct snd_pcm_status32 to pcm.h file. - Modify comments and commit message. - Add new patch2 ~ patch6. Changes since v2: - Renamed all structures to make clear. - Remove CONFIG_X86_X32 macro and introduced new compat_snd_pcm_status64_x86_32. Changes since v1: - Add one macro for struct snd_pcm_status_32 which only active in 32bits kernel. - Convert pcm_compat.c to use struct snd_pcm_status_64. - Convert pcm_native.c to use struct snd_pcm_status_64. --- Arnd Bergmann (3): ALSA: move snd_pcm_ioctl_sync_ptr_compat into pcm_native.c ALSA: add new 32-bit layout for snd_pcm_mmap_status/control ALSA: bump uapi version numbers Baolin Wang (6): ALSA: Replace timespec with timespec64 ALSA: Avoid using timespec for struct snd_timer_status ALSA: Avoid using timespec for struct snd_ctl_elem_value ALSA: Avoid using timespec for struct snd_pcm_status ALSA: Avoid using timespec for struct snd_rawmidi_status ALSA: Avoid using timespec for struct snd_timer_tread include/sound/pcm.h | 74 ++++++-- include/sound/soc-component.h | 4 +- include/sound/timer.h | 4 +- include/uapi/sound/asound.h | 145 +++++++++++++-- sound/core/pcm.c | 12 +- sound/core/pcm_compat.c | 282 ++++++++---------------------- sound/core/pcm_lib.c | 38 ++-- sound/core/pcm_native.c | 226 +++++++++++++++++++++--- sound/core/rawmidi.c | 132 +++++++++++--- sound/core/rawmidi_compat.c | 87 +++------ sound/core/timer.c | 229 ++++++++++++++++++------ sound/core/timer_compat.c | 62 +------ sound/drivers/aloop.c | 2 +- sound/pci/hda/hda_controller.c | 10 +- sound/soc/intel/skylake/skl-pcm.c | 4 +- 15 files changed, 817 insertions(+), 494 deletions(-) -- 2.20.0

5 25

[REGRESSION] "ALSA: HDA: Early Forbid of runtime PM" broke my laptop's internal audio
by Michael Catanzaro 17 Aug '21

17 Aug '21

Hi, On my System76 Gazelle Pro (gazp9) laptop, internal audio broke after upgrading to kernel 5.10. The laptop's speakers produce no sound. Audio from headphones still works fine. A quick test is to visit GNOME System Settings -> Sound -> Output, select Test, click Front Left or Front Right and notice there is no sound. I tested a mainline kernel revision from yesterday (5.11-rc5+) and the regression is not yet fixed. I bisected the regression to "ALSA: HDA: Early Forbid of runtime PM": https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… I created a downstream bug report here, including some bits from dmesg that may or may not be relevant in comment #2: https://bugzilla.redhat.com/show_bug.cgi?id=1918933 Audio devices: $ lspci | grep -i audio 00:03.0 Audio device: Intel Corporation Xeon E3-1200 v3/4th Gen Core Processor HD Audio Controller (rev 06) 00:1b.0 Audio device: Intel Corporation 8 Series/C220 Series Chipset High Definition Audio Controller (rev 05) OS: Fedora 33 I'm happy to provide any additional required info or test patches if you CC me, since I'm not a kernel developer and am not subscribed to these lists. Thanks.

6 16

[PATCH] ALSA: hda: Enable runtime PM when codec probe fails
by Kai-Heng Feng 02 Jul '21

02 Jul '21

When codec probe fails, it doesn't enable runtime suspend, and can prevent graphics card from getting powered down: [ 4.280991] snd_hda_intel 0000:01:00.1: no codecs initialized $ cat /sys/bus/pci/devices/0000:01:00.1/power/runtime_status active So enable runtime PM when codec probe fails, to let graphics card be able to runtime suspend again. Merge azx_probe_continue() into azx_probe() and just let probe fail for this case could be a better approach. However that's a much bigger task so let's settle with a quirk workaround. BugLink: https://bugs.launchpad.net/bugs/1907212 Signed-off-by: Kai-Heng Feng <kai.heng.feng(a)canonical.com> --- sound/pci/hda/hda_intel.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 6852668f1bcb..3fd920069268 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2328,7 +2328,7 @@ static int azx_probe_continue(struct azx *chip) if (bus->codec_mask) { err = azx_probe_codecs(chip, azx_max_codecs[chip->driver_type]); if (err < 0) - goto out_free; + goto out_enable_rpm; } #ifdef CONFIG_SND_HDA_PATCH_LOADER @@ -2360,6 +2360,7 @@ static int azx_probe_continue(struct azx *chip) set_default_power_save(chip); +out_enable_rpm: if (azx_has_pm_runtime(chip)) { pm_runtime_use_autosuspend(&pci->dev); pm_runtime_allow(&pci->dev); -- 2.29.2

8 32

alsamixer: use background color instead of COLOR_BLACK
by GitHub pull_request - opened 08 Jun '21

08 Jun '21

alsa-project/alsa-utils pull request #77 was opened from r-burns: Hi! I have a cosmetic "improvement" I'd like to share. Scare quotes because this is possibly opinionated, but I'd still like to know what you think. I think on typical terminals, COLOR_BLACK is the same or quite similar to the background color, so this does not make much of a difference. But on "solarized" color schemes and similar, the COLOR_BLACK may be quite different from the background color, so in my opinion it looks odd to have the alsamixer panel stand out this way. For example, I'm using the "Nord" color scheme on a pitch black #000000 background, and here's how the mixer looks with/without this patch (blank terminal, htop, and ncmpcpp also provided for comparison): ![image](https://user-images.githubusercontent.com/52847440/107131140-dbf46500-6888-11eb-938a-9a3258bf7184.png) As you can see, the current alsamixer in the center looks a bit strange and sticks out against my chosen background color and the other TUIs I'm using. Htop and ncmpcpp agree on using the builtin `-1` background color for their own backgrounds, but alsamixer uses COLOR_BLACK which stands out from the actual background. The alsamixer on the bottom right is using this patch, and blends in seamlessly. Again, this is just my opinion! Feel free to close if this is wrong or superfluous. Nonetheless, I thought I'd share this patch, in case anyone else feels the same way. Request URL : https://github.com/alsa-project/alsa-utils/pull/77 Patch URL : https://github.com/alsa-project/alsa-utils/pull/77.patch Repository URL: https://github.com/alsa-project/alsa-utils

2 1

ALSA 1.2.4 release
by Jaroslav Kysela 31 May '21

31 May '21

Hello all, new ALSA userspace packages were released. You may download them from the ALSA website http://www.alsa-project.org or directly: FTP: ftp://ftp.alsa-project.org/pub HTTP: https://www.alsa-project.org/files/pub Full list of changes: https://www.alsa-project.org/wiki/Changes_v1.2.3.2_v1.2.4 All files on the primary ALSA site have also GPG signature now. The fingerprint of the public signing key is: F04D F507 37AC 1A88 4C4B 3D71 8380 596D A6E5 9C91 Have fun, Jaroslav -- Jaroslav Kysela <perex(a)perex.cz> Linux Sound Maintainer; ALSA Project; Red Hat, Inc.

1 1

[PATCH 00/14] ASoC: Intel/SOF: extend run-time driver selection to ACPI devices
by Pierre-Louis Bossart 26 Apr '21

26 Apr '21

The module snd-intel-dspcfg, suggested by Jaroslav last year, currently provide the means to select a PCI driver at run-time, based on quirks, recommendations or user selection via a kernel parameter. This capability removed a lot of confusions in distributions and removed the need for recompilations to select legacy HDaudio, SST or SOF drivers. This patchset extends the concept to ACPI devices. This was driven by the desire to at some point deprecate the Atom/SST driver for Baytrail and Cherrytrail, which is no longer maintained by Intel. By having the SOF driver enabled by distributions for Baytrail/Cherrytrail, we can enable more end-user tests and make the transition easier for distributions (likely in 2021 at this point). This patchset provides the same solution for Broadwell, mainly to have a single build for all Intel platforms. SOF on Broadwell remains an option not recommended for distributions, as long as the 'catpt' driver is maintained there is no burning desire to make SOF the default on the three Broadwell-based platforms with the DSP enabled. Pierre-Louis Bossart (14): ASoC: Intel: broadwell: add missing pm_ops ASoC: Intel: bdw-rt5677: add missing pm_ops ALSA: hda: intel-dsp-config: add helper for ACPI DSP driver selection ASoC: soc-acpi: add helper to identify parent driver. ASoC: Intel: boards: byt/cht: set card and driver name at run time ASoC: Intel: byt/cht: set pm ops dynamically ASoC: SOF: acpi: add dynamic selection of DSP driver ASoC: Intel: Atom: add dynamic selection of DSP driver ASoC: SOF: Intel: allow for coexistence between SOF and Atom/SST drivers ALSA: hda: intel-dsp-config: add Broadwell ACPI DSP driver selection ASoC: Intel: broadwell: set card and driver name dynamically ASoC: Intel: catpt: add dynamic selection of DSP driver ASoC: SOF: Intel: allow for coexistence between SOF and catpt drivers ALSA: hda: intel-dsp-config: ignore dsp_driver parameter for PCI legacy devices include/sound/intel-dsp-config.h | 7 ++ include/sound/soc-acpi.h | 6 + sound/hda/intel-dsp-config.c | 111 +++++++++++++++++++ sound/soc/intel/Kconfig | 2 + sound/soc/intel/atom/sst/sst_acpi.c | 8 ++ sound/soc/intel/boards/bdw-rt5650.c | 17 ++- sound/soc/intel/boards/bdw-rt5677.c | 18 ++- sound/soc/intel/boards/broadwell.c | 20 ++-- sound/soc/intel/boards/bytcht_cx2072x.c | 27 +++-- sound/soc/intel/boards/bytcht_da7213.c | 27 +++-- sound/soc/intel/boards/bytcht_es8316.c | 29 +++-- sound/soc/intel/boards/bytcr_rt5640.c | 30 +++-- sound/soc/intel/boards/bytcr_rt5651.c | 27 +++-- sound/soc/intel/boards/cht_bsw_max98090_ti.c | 29 +++-- sound/soc/intel/boards/cht_bsw_nau8824.c | 29 +++-- sound/soc/intel/boards/cht_bsw_rt5645.c | 38 ++++--- sound/soc/intel/boards/cht_bsw_rt5672.c | 29 +++-- sound/soc/intel/catpt/device.c | 12 ++ sound/soc/sof/intel/Kconfig | 33 +++--- sound/soc/sof/sof-acpi-dev.c | 14 ++- 20 files changed, 392 insertions(+), 121 deletions(-) -- 2.25.1

6 54

[PATCH] ASoC: fsl: imx-pcm-dma: Don't request dma channel in probe
by Shengjiu Wang 22 Apr '21

22 Apr '21

There are two requirements that we need to move the request of dma channel from probe to open. - When dma device binds with power-domains, the power will be enabled when we request dma channel. If the request of dma channel happen on probe, then the power-domains will be always enabled after kernel boot up, which is not good for power saving, so we need to move the request of dma channel to .open(); - With FE-BE case, if the dma channel is requested in probe, then there will be below issue, which is caused by that the dma channel will be requested duplicately [ 638.906268] sysfs: cannot create duplicate filename '/devices/soc0/soc/2000000.bus/2000000.spba-bus/2024000.esai/dma:tx' [ 638.919061] CPU: 1 PID: 673 Comm: aplay Not tainted 5.7.0-rc1-12956-gfc64b2585593 #287 [ 638.927113] Hardware name: Freescale i.MX6 Quad/DualLite (Device Tree) [ 638.933690] [<c0110dd8>] (unwind_backtrace) from [<c010b8ec>] (show_stack+0x10/0x14) [ 638.941464] [<c010b8ec>] (show_stack) from [<c0557fc0>] (dump_stack+0xe4/0x118) [ 638.948808] [<c0557fc0>] (dump_stack) from [<c032aeb4>] (sysfs_warn_dup+0x50/0x64) [ 638.956406] [<c032aeb4>] (sysfs_warn_dup) from [<c032b1a8>] (sysfs_do_create_link_sd+0xc8/0xd4) [ 638.965134] [<c032b1a8>] (sysfs_do_create_link_sd) from [<c05dc668>] (dma_request_chan+0xb0/0x210) [ 638.974120] [<c05dc668>] (dma_request_chan) from [<c05dc7d0>] (dma_request_slave_channel+0x8/0x14) [ 638.983111] [<c05dc7d0>] (dma_request_slave_channel) from [<c09d5548>] (fsl_asrc_dma_hw_params+0x1e0/0x438) [ 638.992881] [<c09d5548>] (fsl_asrc_dma_hw_params) from [<c09c1654>] (soc_pcm_hw_params+0x4a0/0x6a8) [ 639.001952] [<c09c1654>] (soc_pcm_hw_params) from [<c09c39d4>] (dpcm_fe_dai_hw_params+0x70/0xe4) [ 639.010765] [<c09c39d4>] (dpcm_fe_dai_hw_params) from [<c099b274>] (snd_pcm_hw_params+0x158/0x418) [ 639.019750] [<c099b274>] (snd_pcm_hw_params) from [<c099c5a0>] (snd_pcm_ioctl+0x734/0x183c) [ 639.028129] [<c099c5a0>] (snd_pcm_ioctl) from [<c029ff94>] (ksys_ioctl+0x2ac/0xb98) [ 639.035812] [<c029ff94>] (ksys_ioctl) from [<c0100080>] (ret_fast_syscall+0x0/0x28) [ 639.043490] Exception stack(0xec529fa8 to 0xec529ff0) [ 639.048565] 9fa0: bee84650 01321870 00000004 c25c4111 bee84650 0002000f [ 639.056766] 9fc0: bee84650 01321870 01321820 00000036 00001f40 00000000 0002c2f8 00000003 [ 639.064964] 9fe0: b6f483fc bee8451c b6ee2655 b6e1dcf8 [ 639.070339] fsl-esai-dai 2024000.esai: Cannot create DMA dma:tx symlink Signed-off-by: Shengjiu Wang <shengjiu.wang(a)nxp.com> --- sound/soc/fsl/imx-pcm-dma.c | 173 +++++++++++++++++++++++++++++++++--- 1 file changed, 159 insertions(+), 14 deletions(-) diff --git a/sound/soc/fsl/imx-pcm-dma.c b/sound/soc/fsl/imx-pcm-dma.c index 04a9bc749016..dae53b384df4 100644 --- a/sound/soc/fsl/imx-pcm-dma.c +++ b/sound/soc/fsl/imx-pcm-dma.c @@ -11,6 +11,7 @@ #include <linux/dmaengine.h> #include <linux/types.h> #include <linux/module.h> +#include <linux/dma-mapping.h> #include <sound/core.h> #include <sound/pcm.h> @@ -29,24 +30,168 @@ static bool filter(struct dma_chan *chan, void *param) return true; } -static const struct snd_dmaengine_pcm_config imx_dmaengine_pcm_config = { - .prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config, - .compat_filter_fn = filter, -}; +static int imx_pcm_hw_params(struct snd_soc_component *component, + struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + struct snd_pcm_runtime *runtime = substream->runtime; + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_dmaengine_dai_dma_data *dma_data; + struct dma_slave_config config; + struct dma_chan *chan; + int ret = 0; -int imx_pcm_dma_init(struct platform_device *pdev, size_t size) + snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer); + runtime->dma_bytes = params_buffer_bytes(params); + + chan = snd_dmaengine_pcm_get_chan(substream); + if (!chan) + return -EINVAL; + + ret = snd_hwparams_to_dma_slave_config(substream, params, &config); + if (ret) + return ret; + + dma_data = snd_soc_dai_get_dma_data(cpu_dai, substream); + if (!dma_data) + return -EINVAL; + + snd_dmaengine_pcm_set_config_from_dai_data(substream, + dma_data, + &config); + return dmaengine_slave_config(chan, &config); +} + +static int imx_pcm_hw_free(struct snd_soc_component *component, + struct snd_pcm_substream *substream) { - struct snd_dmaengine_pcm_config *config; + snd_pcm_set_runtime_buffer(substream, NULL); + return 0; +} + +static snd_pcm_uframes_t imx_pcm_pointer(struct snd_soc_component *component, + struct snd_pcm_substream *substream) +{ + return snd_dmaengine_pcm_pointer(substream); +} + +static int imx_pcm_trigger(struct snd_soc_component *component, + struct snd_pcm_substream *substream, int cmd) +{ + return snd_dmaengine_pcm_trigger(substream, cmd); +} + +static int imx_pcm_open(struct snd_soc_component *component, + struct snd_pcm_substream *substream) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK; + struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_dmaengine_dai_dma_data *dma_data; + struct device *dev = component->dev; + struct snd_pcm_hardware hw; + struct dma_chan *chan; + int ret; + + ret = snd_pcm_hw_constraint_integer(substream->runtime, + SNDRV_PCM_HW_PARAM_PERIODS); + if (ret < 0) { + dev_err(dev, "failed to set pcm hw params periods\n"); + return ret; + } + + dma_data = snd_soc_dai_get_dma_data(cpu_dai, substream); + if (!dma_data) + return -EINVAL; + + chan = dma_request_slave_channel(cpu_dai->dev, tx ? "tx" : "rx"); + if (!chan) { + /* Try to request channel using compat_filter_fn */ + chan = snd_dmaengine_pcm_request_channel(filter, + dma_data->filter_data); + if (!chan) + return -ENXIO; + } - config = devm_kzalloc(&pdev->dev, - sizeof(struct snd_dmaengine_pcm_config), GFP_KERNEL); - if (!config) - return -ENOMEM; - *config = imx_dmaengine_pcm_config; + ret = snd_dmaengine_pcm_open(substream, chan); + if (ret) + goto pcm_open_fail; - return devm_snd_dmaengine_pcm_register(&pdev->dev, - config, - SND_DMAENGINE_PCM_FLAG_COMPAT); + memset(&hw, 0, sizeof(hw)); + hw.info = SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID | + SNDRV_PCM_INFO_INTERLEAVED; + hw.periods_min = 2; + hw.periods_max = UINT_MAX; + hw.period_bytes_min = 256; + hw.period_bytes_max = dma_get_max_seg_size(chan->device->dev); + hw.buffer_bytes_max = IMX_DEFAULT_DMABUF_SIZE; + hw.fifo_size = dma_data->fifo_size; + + /* Refine the hw according to caps of DMA. */ + ret = snd_dmaengine_pcm_refine_runtime_hwparams(substream, + dma_data, + &hw, + chan); + if (ret < 0) + goto refine_runtime_hwparams_fail; + + snd_soc_set_runtime_hwparams(substream, &hw); + + /* Support allocate memory from IRAM */ + ret = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV_IRAM, + chan->device->dev, + hw.buffer_bytes_max, + &substream->dma_buffer); + if (ret < 0) + goto alloc_pagas_fail; + + return 0; + +alloc_pagas_fail: +refine_runtime_hwparams_fail: + snd_dmaengine_pcm_close(substream); +pcm_open_fail: + dma_release_channel(chan); + + return ret; +} + +static int imx_pcm_close(struct snd_soc_component *component, + struct snd_pcm_substream *substream) +{ + if (substream) { + snd_dma_free_pages(&substream->dma_buffer); + substream->dma_buffer.area = NULL; + substream->dma_buffer.addr = 0; + } + + return snd_dmaengine_pcm_close_release_chan(substream); +} + +static int imx_pcm_new(struct snd_soc_component *component, + struct snd_soc_pcm_runtime *rtd) +{ + struct snd_card *card = rtd->card->snd_card; + + return dma_coerce_mask_and_coherent(card->dev, DMA_BIT_MASK(32)); +} + +static const struct snd_soc_component_driver imx_pcm_component = { + .name = "imx-pcm-dma", + .pcm_construct = imx_pcm_new, + .open = imx_pcm_open, + .close = imx_pcm_close, + .hw_params = imx_pcm_hw_params, + .hw_free = imx_pcm_hw_free, + .trigger = imx_pcm_trigger, + .pointer = imx_pcm_pointer, +}; + +int imx_pcm_dma_init(struct platform_device *pdev, size_t size) +{ + return devm_snd_soc_register_component(&pdev->dev, + &imx_pcm_component, NULL, 0); } EXPORT_SYMBOL_GPL(imx_pcm_dma_init); -- 2.21.0

5 17

Jump to page:

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

Alsa-devel February 2021