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

[alsa-devel] [PATCH] ALSA: hda: Fix race between creating and refreshing sysfs entries
by Amadeusz Sławiński 10 May '19

10 May '19

hda_widget_sysfs_reinit() can free underlying codec->widgets structure on which widget_tree_create() operates. Add locking to prevent such issues from happening. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=110382 Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski(a)linux.intel.com> --- include/sound/hdaudio.h | 1 + sound/hda/hdac_sysfs.c | 22 +++++++++++++++++++--- sound/pci/hda/hda_codec.c | 2 ++ 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/include/sound/hdaudio.h b/include/sound/hdaudio.h index 45f944d57982..85835d0c33cc 100644 --- a/include/sound/hdaudio.h +++ b/include/sound/hdaudio.h @@ -81,6 +81,7 @@ struct hdac_device { atomic_t in_pm; /* suspend/resume being performed */ /* sysfs */ + struct mutex widget_lock; struct hdac_widget_tree *widgets; /* regmap */ diff --git a/sound/hda/hdac_sysfs.c b/sound/hda/hdac_sysfs.c index fb2aa344981e..5352e5db814c 100644 --- a/sound/hda/hdac_sysfs.c +++ b/sound/hda/hdac_sysfs.c @@ -399,21 +399,28 @@ int hda_widget_sysfs_init(struct hdac_device *codec) { int err; - if (codec->widgets) + mutex_lock(&codec->widget_lock); + if (codec->widgets) { + mutex_unlock(&codec->widget_lock); return 0; /* already created */ + } err = widget_tree_create(codec); if (err < 0) { widget_tree_free(codec); + mutex_unlock(&codec->widget_lock); return err; } + mutex_unlock(&codec->widget_lock); return 0; } void hda_widget_sysfs_exit(struct hdac_device *codec) { + mutex_lock(&codec->widget_lock); widget_tree_free(codec); + mutex_unlock(&codec->widget_lock); } int hda_widget_sysfs_reinit(struct hdac_device *codec, @@ -424,16 +431,23 @@ int hda_widget_sysfs_reinit(struct hdac_device *codec, hda_nid_t nid; int i; - if (!codec->widgets) + mutex_lock(&codec->widget_lock); + + if (!codec->widgets) { + mutex_unlock(&codec->widget_lock); return hda_widget_sysfs_init(codec); + } tree = kmemdup(codec->widgets, sizeof(*tree), GFP_KERNEL); - if (!tree) + if (!tree) { + mutex_unlock(&codec->widget_lock); return -ENOMEM; + } tree->nodes = kcalloc(num_nodes + 1, sizeof(*tree->nodes), GFP_KERNEL); if (!tree->nodes) { kfree(tree); + mutex_unlock(&codec->widget_lock); return -ENOMEM; } @@ -460,5 +474,7 @@ int hda_widget_sysfs_reinit(struct hdac_device *codec, codec->widgets = tree; kobject_uevent(tree->root, KOBJ_CHANGE); + + mutex_unlock(&codec->widget_lock); return 0; } diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 701a69d856f5..a5746df5c94b 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -870,6 +870,8 @@ static int snd_hda_codec_device_init(struct hda_bus *bus, struct snd_card *card, if (!codec) return -ENOMEM; + mutex_init(&codec->widget_lock); + sprintf(name, "hdaudioC%dD%d", card->number, codec_addr); err = snd_hdac_device_init(&codec->core, &bus->core, name, codec_addr); if (err < 0) { -- 2.17.1

2 1

Re: [alsa-devel] [PATCH 09/16] mmc: sdhci-xenon: use new match_string() helper/macro
by Ardelean, Alexandru 10 May '19

10 May '19

On Wed, 2019-05-08 at 16:26 +0300, Alexandru Ardelean wrote: > On Wed, 2019-05-08 at 15:20 +0300, Dan Carpenter wrote: > > > > > > On Wed, May 08, 2019 at 02:28:35PM +0300, Alexandru Ardelean wrote: > > > -static const char * const phy_types[] = { > > > - "emmc 5.0 phy", > > > - "emmc 5.1 phy" > > > -}; > > > - > > > enum xenon_phy_type_enum { > > > EMMC_5_0_PHY, > > > EMMC_5_1_PHY, > > > NR_PHY_TYPES > > > > There is no need for NR_PHY_TYPES now so you could remove that as well. > > > > I thought the same. > The only reason to keep NR_PHY_TYPES, is for potential future patches, > where it would be just 1 addition > > enum xenon_phy_type_enum { > EMMC_5_0_PHY, > EMMC_5_1_PHY, > + EMMC_5_2_PHY, > NR_PHY_TYPES > } > > Depending on style/preference of how to do enums (allow comma on last > enum > or not allow comma on last enum value), adding new enum values woudl be 2 > additions + 1 deletion lines. > > enum xenon_phy_type_enum { > EMMC_5_0_PHY, > - EMMC_5_1_PHY > + EMM > C_5_1_PHY, > + EMMC_5_2_PHY > } > > Either way (leave NR_PHY_TYPES or remove NR_PHY_TYPES) is fine from my > side. > Preference on this ? If no objection [nobody insists] I would keep. I don't feel strongly about it [dropping NR_PHY_TYPES or not]. Thanks Alex > Thanks > Alex > > > regards, > > dan carpenter > >

2 2

[alsa-devel] [PATCH v2 1/2] dt-bindings: sound: Convert Allwinner SPDIF binding to YAML
by Maxime Ripard 10 May '19

10 May '19

The Allwinner SoCs feature an SPDIF controller across multiple SoC generations. However, earlier generations were a bit simpler than the subsequent ones, and for example would always have RX and TX capabilities, and no reset lines. In order to express this, let's create two YAML schemas instead of the free form text we had before. Signed-off-by: Maxime Ripard <maxime.ripard(a)bootlin.com> --- Changes from v1: - Merged the two schemas together and used the draft-7 conditionals --- Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-spdif.yaml | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- Documentation/devicetree/bindings/sound/sunxi,sun4i-spdif.txt | 42 +------------------------------- 2 files changed, 98 insertions(+), 42 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-spdif.yaml delete mode 100644 Documentation/devicetree/bindings/sound/sunxi,sun4i-spdif.txt diff --git a/Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-spdif.yaml b/Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-spdif.yaml new file mode 100644 index 000000000000..5698e5de5e31 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-spdif.yaml @@ -0,0 +1,98 @@ +# SPDX-License-Identifier: GPL-2.0 +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/allwinner,sun4i-a10-spdif.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Allwinner A10 S/PDIF Controller Device Tree Bindings + +maintainers: + - Chen-Yu Tsai <wens(a)csie.org> + - Liam Girdwood <lgirdwood(a)gmail.com> + - Mark Brown <broonie(a)kernel.org> + - Maxime Ripard <maxime.ripard(a)bootlin.com> + +properties: + "#sound-dai-cells": + const: 0 + + compatible: + oneOf: + - const: allwinner,sun4i-a10-spdif + - const: allwinner,sun6i-a31-spdif + - const: allwinner,sun8i-h3-spdif + - items: + - const: allwinner,sun8i-a83t-spdif + - const: allwinner,sun8i-h3-spdif + - items: + - const: allwinner,sun50i-a64-spdif + - const: allwinner,sun8i-h3-spdif + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + clocks: + items: + - description: Bus Clock + - description: Module Clock + + clock-names: + items: + - const: apb + - const: spdif + + dmas: + items: + - description: RX DMA Channel + - description: TX DMA Channel + + dma-names: + items: + - const: rx + - const: tx + + resets: + maxItems: 1 + +allOf: + - if: + properties: + compatible: + contains: + enum: + - allwinner,sun6i-a31-spdif + - allwinner,sun8i-h3-spdif + + then: + required: + - resets + +required: + - "#sound-dai-cells" + - compatible + - reg + - interrupts + - clocks + - clock-names + - dmas + - dma-names + +additionalProperties: false + +examples: + - | + spdif: spdif@1c21000 { + #sound-dai-cells = <0>; + compatible = "allwinner,sun4i-a10-spdif"; + reg = <0x01c21000 0x40>; + interrupts = <13>; + clocks = <&apb0_gates 1>, <&spdif_clk>; + clock-names = "apb", "spdif"; + dmas = <&dma 0 2>, <&dma 0 2>; + dma-names = "rx", "tx"; + }; + +... diff --git a/Documentation/devicetree/bindings/sound/sunxi,sun4i-spdif.txt b/Documentation/devicetree/bindings/sound/sunxi,sun4i-spdif.txt deleted file mode 100644 index 0c64a209c2e9..000000000000 --- a/Documentation/devicetree/bindings/sound/sunxi,sun4i-spdif.txt +++ /dev/null @@ -1,42 +0,0 @@ -Allwinner Sony/Philips Digital Interface Format (S/PDIF) Controller - -The Allwinner S/PDIF audio block is a transceiver that allows the -processor to receive and transmit digital audio via an coaxial cable or -a fibre cable. -For now only playback is supported. - -Required properties: - - - compatible : should be one of the following: - - "allwinner,sun4i-a10-spdif": for the Allwinner A10 SoC - - "allwinner,sun6i-a31-spdif": for the Allwinner A31 SoC - - "allwinner,sun8i-h3-spdif": for the Allwinner H3 SoC - - - reg : Offset and length of the register set for the device. - - - interrupts : Contains the spdif interrupt. - - - dmas : Generic dma devicetree binding as described in - Documentation/devicetree/bindings/dma/dma.txt. - - - dma-names : Two dmas have to be defined, "tx" and "rx". - - - clocks : Contains an entry for each entry in clock-names. - - - clock-names : Includes the following entries: - "apb" clock for the spdif bus. - "spdif" clock for spdif controller. - - - resets : reset specifier for the ahb reset (A31 and newer only) - -Example: - -spdif: spdif@1c21000 { - compatible = "allwinner,sun4i-a10-spdif"; - reg = <0x01c21000 0x40>; - interrupts = <13>; - clocks = <&apb0_gates 1>, <&spdif_clk>; - clock-names = "apb", "spdif"; - dmas = <&dma 0 2>, <&dma 0 2>; - dma-names = "rx", "tx"; -}; base-commit: 00c3bc00f0cadbb48f2414370733892676511e79 -- git-series 0.9.1

2 3

[alsa-devel] FW: move eapd coef function before ACT_PRE_PROBE state
by Kailang 10 May '19

10 May '19

Hi Takashi, This one. -----Original Message----- From: Kailang Sent: Monday, May 6, 2019 2:46 PM To: Takashi Iwai (tiwai(a)suse.de) <tiwai(a)suse.de> Cc: (alsa-devel(a)alsa-project.org) <alsa-devel(a)alsa-project.org> Subject: RE: move eapd coef function before ACT_PRE_PROBE state Hi Takashi, Are you available for apply this ? Thanks. BR, Kailang > -----Original Message----- > From: Kailang > Sent: Tuesday, April 30, 2019 3:41 PM > To: Takashi Iwai (tiwai(a)suse.de) <tiwai(a)suse.de> > Cc: (alsa-devel(a)alsa-project.org) <alsa-devel(a)alsa-project.org> > Subject: move eapd coef function before ACT_PRE_PROBE state > > Hi Takashi, > > alc_fill_eapd_coef(),this function was change EAPD control to default. > Default was set EAPD by verb control. > This function was run in ACT_INIT state. > Move it to ACT_PRE_PROBE above. It will have a chance to change EAPD > control on ACT_PRE_PROBE state. It could change control by 0x20 coef bit. > > BR, > Kailang

2 8

[alsa-devel] ALC298 headphone noise
by Kailang 10 May '19

10 May '19

Hi Takashi, Dell platform with ALC298. system enter to runtime suspend. Headphone had noise. Let Headset Mic not shutup will solve this issue. BR, Kailang

2 1

[alsa-devel] Alsa-loopback
by Mats Lindestam 10 May '19

10 May '19

Hi, I am new to Alsa and I have been told that there is some kind of buffer/queue, in Alsa-loopback, that regulates when 'sound-buffers' is dropped. What I would like to achieve is make the buffer/queue larger (500 ms). >From what I have heard is that it should be possible to configure the buffer/queue, in Alsa-loopback, via the /etc/asound.conf configuration file. It seems that the parameters period_time, period_size, buffer_time, buffer_size & rate are important to achieve what I want. I haven't found any information on what these parameters do and how or if they are used in conjunction with each other. Here is my asound.conf file: # cat /etc/asound.conf pcm_slave.aloopcommon { pcm "hw:Loopback,0,0" ... rate 16000 period_time 64000 buffer_time 512000 } pcm.!audiosource0 { type dsnoop ... slave aloopcommon ... } Is there somewhere where these parameters are explained and how they interact? BR /Mats ?

1 0

[alsa-devel] [RFC PATCH 0/7] soundwire: add sysfs and debugfs support
by Pierre-Louis Bossart 09 May '19

09 May '19

This patchset is not fully-tested and is not a candidate for any merge. Since I am not very comfortable with sysfs and debugfs support, and I am not the initial author for this code, I could use feedback from smarter people than me. This series is intented to be applied on top of the 'soundwire: corrections to ACPI and DisCo properties' series Parts of this code was initially written by my Intel colleagues Vinod Koul, Sanyog Kale, Shreyas Nc and Hardik Shah, who are either no longer with Intel or no longer involved in SoundWire development. When relevant, I explictly added a note in commit messages to give them credit for their hard work, but I removed their signed-off-by tags to avoid email bounces and avoid spamming them forever with SoundWire patches. The sysfs parts essentially expose the values of MIPI DisCo properties. My contribution here was mainly to align with the specification, a number of properties from the Intel internal code were missing. I also split the code to make sure the same attribute names can be used at different levels, as described in the spec. One of the main questions I have is whether there is really a need to add new devices, or if the attributes can be added to the *existing* ones. For example, the sysfs hierarchy for the SoundWire 0 master shows as: /sys/bus/acpi/devices/PRP00001:00/int-sdw.0# ls sdw* 'sdw:0:25d:700:0:0': bank_delay_support hda_reg paging_support source_ports ch_prep_timeout high_PHY_capable power src-dp2 clk_stop_mode1 index_reg reset_behave src-dp4 clk_stop_timeout master_count simple_clk_stop_capable subsystem dp0 mipi_revision sink-dp1 test_mode_capable driver modalias sink-dp3 uevent firmware_node p15_behave sink_ports wake_capable 'sdw:0:25d:701:0:0': bank_delay_support high_PHY_capable paging_support source_ports ch_prep_timeout master_count power subsystem clk_stop_mode1 mipi_revision reset_behave test_mode_capable clk_stop_timeout modalias simple_clk_stop_capable uevent firmware_node p15_behave sink_ports wake_capable 'sdw-master:0': clk_stop_modes default_col dynamic_frame power uevent clock_frequencies default_frame_rate err_threshold revision clock_gears default_row max_clk_freq subsystem For the first two Slaves, this results in pretend-devices being added below each master, the actual Slave devices are children of the PRP00001 devices, so here we add a bit of complexity. Likewise, the 'sdw-master:0' is a pretend-device whose purpose is only to expose property values. Is this the recommended direction? Or should all the sysfs properties be added to the devices exposed by ACPI? The debugfs part is mainly to dump the Master and Slave registers, as well as the Intel-specific parts. One of the main changes from the previous code was to harden the code with scnprintf Feedback welcome. ~Pierre Pierre-Louis Bossart (7): soundwire: Add sysfs support for master(s) soundwire: add Slave sysfs support ABI: testing: Add description of soundwire master sysfs files ABI: testing: Add description of soundwire slave sysfs files soundwire: add debugfs support soundwire: cadence_master: add debugfs register dump soundwire: intel: add debugfs register dump .../ABI/testing/sysfs-bus-soundwire-master | 21 + .../ABI/testing/sysfs-bus-soundwire-slave | 85 ++++ drivers/soundwire/Makefile | 4 +- drivers/soundwire/bus.c | 13 + drivers/soundwire/bus.h | 30 ++ drivers/soundwire/bus_type.c | 8 + drivers/soundwire/cadence_master.c | 98 +++++ drivers/soundwire/cadence_master.h | 5 + drivers/soundwire/debugfs.c | 214 ++++++++++ drivers/soundwire/intel.c | 115 ++++++ drivers/soundwire/slave.c | 2 + drivers/soundwire/sysfs.c | 376 ++++++++++++++++++ drivers/soundwire/sysfs_local.h | 42 ++ drivers/soundwire/sysfs_slave_dp0.c | 112 ++++++ drivers/soundwire/sysfs_slave_dpn.c | 168 ++++++++ include/linux/soundwire/sdw.h | 24 ++ 16 files changed, 1316 insertions(+), 1 deletion(-) create mode 100644 Documentation/ABI/testing/sysfs-bus-soundwire-master create mode 100644 Documentation/ABI/testing/sysfs-bus-soundwire-slave create mode 100644 drivers/soundwire/debugfs.c create mode 100644 drivers/soundwire/sysfs.c create mode 100644 drivers/soundwire/sysfs_local.h create mode 100644 drivers/soundwire/sysfs_slave_dp0.c create mode 100644 drivers/soundwire/sysfs_slave_dpn.c -- 2.17.1

3 43

[alsa-devel] [PATCH v2 00/30] Update cros_ec_commands.h
by Gwendal Grignou 09 May '19

09 May '19

The interface between CrosEC embedded controller and the host, described by cros_ec_commands.h, as diverged from what the embedded controller really support. The source of thruth is at https://chromium.googlesource.com/chromiumos/platform/ec/+/master/include/e… That include file is converted to remove ACPI and Embedded only code. >From now on, cros_ec_commands.h will be automatically generated from the file above, do not modify directly. Fell free to squash the commits below. Changes in v2: - Move I2S changes at the end of the patchset, squashed with change in sound/soc/codecs/cros_ec_codec.c to match new interface. - Add Acked-by: Enric Balletbo i Serra <enric.balletbo(a)collabora.com> Gwendal Grignou (30): mfd: cros_ec: Update license term mfd: cros_ec: Zero BUILD_ macro mfd: cros_ec: set comments properly mfd: cros_ec: add ec_align macros mfd: cros_ec: Define commands as 4-digit UPPER CASE hex values mfd: cros_ec: use BIT macro mfd: cros_ec: Update ACPI interface definition mfd: cros_ec: move HDMI CEC API definition mfd: cros_ec: Remove zero-size structs mfd: cros_ec: Add Flash V2 commands API mfd: cros_ec: Add PWM_SET_DUTY API mfd: cros_ec: Add lightbar v2 API mfd: cros_ec: Expand hash API mfd: cros_ec: Add EC transport protocol v4 mfd: cros_ec: Complete MEMS sensor API mfd: cros_ec: Fix event processing API mfd: cros_ec: Add fingerprint API mfd: cros_ec: Fix temperature API mfd: cros_ec: Complete Power and USB PD API mfd: cros_ec: Add API for keyboard testing mfd: cros_ec: Add Hibernate API mfd: cros_ec: Add Smart Battery Firmware update API mfd: cros_ec: Add I2C passthru protection API mfd: cros_ec: Add API for EC-EC communication mfd: cros_ec: Add API for Touchpad support mfd: cros_ec: Add API for Fingerprint support mfd: cros_ec: Add API for rwsig mfd: cros_ec: Add SKU ID and Secure storage API mfd: cros_ec: Add Management API entry points mfd: cros_ec: Update I2S API include/linux/mfd/cros_ec_commands.h | 3735 +++++++++++++++++++++----- sound/soc/codecs/cros_ec_codec.c | 8 +- 2 files changed, 2997 insertions(+), 746 deletions(-) -- 2.21.0.1020.gf2820cf01a-goog

5 36

[alsa-devel] [GIT PULL] ASoC fix for v5.2
by Mark Brown 09 May '19

09 May '19

The following changes since commit ce38a75089f70f6380fc63a5478a7659b4eb3f47: ASoC: SOF: core: fix undefined nocodec reference (2019-05-08 15:42:00 +0900) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v5.2-4 for you to fetch changes up to 2a79e3d342e4b8883ff7fe2cf1b3e9192c26f61a: ASoC: SOF: Fix unused variable warnings (2019-05-08 18:33:34 +0900) ---------------------------------------------------------------- ASoC: ...and one more This didn't get applied as quickly as expected due to a missing list CC and I didn't notice my scripts delaying it. ---------------------------------------------------------------- Emil Renner Berthing (1): spi: rockchip: turn down tx dma bursts Libin Yang (1): ASoC: codec: hdac_hdmi: no checking monitor in hw_params Olivier Moysan (1): ASoC: stm32: i2s: update pcm hardware constraints Takashi Iwai (1): ASoC: SOF: Fix unused variable warnings Tzung-Bi Shih (3): ASoC: mediatek: mt6358: initialize setting when ramping volume ASoC: mediatek: mt6358: save output volume for mixer controls ASoC: mediatek: mt6358: save PGA for mixer control drivers/spi/spi-rockchip.c | 4 +- sound/soc/codecs/hdac_hdmi.c | 13 ----- sound/soc/codecs/mt6358.c | 131 +++++++++++++++++++++++++++---------------- sound/soc/sof/core.c | 2 + sound/soc/stm/stm32_i2s.c | 3 +- 5 files changed, 89 insertions(+), 64 deletions(-)

2 7

[alsa-devel] [PATCH] ASoC: max98357a: request GPIO when device get probed
by Tzung-Bi Shih 09 May '19

09 May '19

devm_gpiod_get_optional() returns EBUSY after component rebound. Request GPIO in max98357a_platform_probe() to support component rebinding. Signed-off-by: Tzung-Bi Shih <tzungbi(a)google.com> --- v1: ASoC: max98357a: manage GPIO for component rebinding => don't move from devm to non-devm v2: ASoC: max98357a: release GPIO when component removing => only put things that really need the card in component's probe() => don't use devm_gpiod_put() if possible sound/soc/codecs/max98357a.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/sound/soc/codecs/max98357a.c b/sound/soc/codecs/max98357a.c index d037a3e4d323..0a14f9dacbee 100644 --- a/sound/soc/codecs/max98357a.c +++ b/sound/soc/codecs/max98357a.c @@ -61,14 +61,6 @@ static const struct snd_soc_dapm_route max98357a_dapm_routes[] = { static int max98357a_component_probe(struct snd_soc_component *component) { - struct gpio_desc *sdmode; - - sdmode = devm_gpiod_get_optional(component->dev, "sdmode", GPIOD_OUT_LOW); - if (IS_ERR(sdmode)) - return PTR_ERR(sdmode); - - snd_soc_component_set_drvdata(component, sdmode); - return 0; } @@ -112,6 +104,15 @@ static struct snd_soc_dai_driver max98357a_dai_driver = { static int max98357a_platform_probe(struct platform_device *pdev) { + struct gpio_desc *sdmode; + + sdmode = devm_gpiod_get_optional(&pdev->dev, + "sdmode", GPIOD_OUT_LOW); + if (IS_ERR(sdmode)) + return PTR_ERR(sdmode); + + dev_set_drvdata(&pdev->dev, sdmode); + return devm_snd_soc_register_component(&pdev->dev, &max98357a_component_driver, &max98357a_dai_driver, 1); -- 2.21.0.1020.gf2820cf01a-goog

2 1