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

[alsa-devel] [PATCH v2] ASoC: Drop invalid DMI fields when setting card long name from DMI info
by mengdong.lin＠linux.intel.com 30 Jun '17

30 Jun '17

From: Mengdong Lin <mengdong.lin(a)linux.intel.com> Sometimes DMI fields may be invalid and so can't give useful vendor, product or board info, such as "Type2 - Board Manufacturer" or "Type1 - TBD by OEM". Including such invalid DMI fileds may create silly card long name. So this patch creates a black list of invalid strings. And if a DMI field contains any string in this list, it will be excluded from the card long name. Signed-off-by: Mengdong Lin <mengdong.lin(a)linux.intel.com> diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index cfa9cf1476f2..7107bc3a8a45 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -69,6 +69,21 @@ static int pmdown_time = 5000; module_param(pmdown_time, int, 0); MODULE_PARM_DESC(pmdown_time, "DAPM stream powerdown time (msecs)"); +/* If a DMI filed contain strings in this blacklist (e.g. + * "Type2 - Board Manufacturer" or "Type1 - TBD by OEM"), it will be taken + * as invalid and dropped when setting the card long name from DMI info. + */ +static const char * const dmi_blacklist[] = { + "To be filled by OEM", + "TBD by OEM", + "Default String", + "Default string", + "Board Manufacturer", + "Board Vendor Name", + "Board Product Name", + NULL, /* terminator */ +}; + /* returns the minimum number of bytes needed to represent * a particular given value */ static int min_bytes_needed(unsigned long val) @@ -1934,6 +1949,22 @@ static void cleanup_dmi_name(char *name) name[j] = '\0'; } +/* Check if a DMI field is valid, i.e. not containing any string + * in the black list. + */ +static int is_dmi_valid(const char *field) +{ + int i = 0; + + while (dmi_blacklist[i]) { + if (strstr(field, dmi_blacklist[i])) + return 0; + i++; + }; + + return 1; +} + /** * snd_soc_set_dmi_name() - Register DMI names to card * @card: The card to register DMI names @@ -1976,17 +2007,18 @@ int snd_soc_set_dmi_name(struct snd_soc_card *card, const char *flavour) /* make up dmi long name as: vendor.product.version.board */ vendor = dmi_get_system_info(DMI_BOARD_VENDOR); - if (!vendor) { + if (!vendor || !is_dmi_valid(vendor)) { dev_warn(card->dev, "ASoC: no DMI vendor name!\n"); return 0; } + snprintf(card->dmi_longname, sizeof(card->snd_card->longname), "%s", vendor); cleanup_dmi_name(card->dmi_longname); product = dmi_get_system_info(DMI_PRODUCT_NAME); - if (product) { + if (product && is_dmi_valid(product)) { len = strlen(card->dmi_longname); snprintf(card->dmi_longname + len, longname_buf_size - len, @@ -2000,7 +2032,7 @@ int snd_soc_set_dmi_name(struct snd_soc_card *card, const char *flavour) * name in the product version field */ product_version = dmi_get_system_info(DMI_PRODUCT_VERSION); - if (product_version) { + if (product_version && is_dmi_valid(product_version)) { len = strlen(card->dmi_longname); snprintf(card->dmi_longname + len, longname_buf_size - len, @@ -2013,7 +2045,7 @@ int snd_soc_set_dmi_name(struct snd_soc_card *card, const char *flavour) } board = dmi_get_system_info(DMI_BOARD_NAME); - if (board) { + if (board && is_dmi_valid(board)) { len = strlen(card->dmi_longname); snprintf(card->dmi_longname + len, longname_buf_size - len, -- 2.11.0

2 1

[alsa-devel] [PATCH alsa-lib] pcm: hw: fix to initialize function local variable
by Takashi Sakamoto 30 Jun '17

30 Jun '17

This commit is to fix below warning. pcm_hw.c: In function ‘snd1_pcm_hw_open_fd’: pcm_hw.c:955:33: warning: ‘mmap_control’ may be used uninitialized in this function [-Wmaybe-uninitialized] if (mmap_control == MAP_FAILED || mmap_control == NULL) { ^ pcm_hw.c:946:31: note: ‘mmap_control’ was declared here struct snd_pcm_mmap_control *mmap_control; ^~~~~~~~~~~~ Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- src/pcm/pcm_hw.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pcm/pcm_hw.c b/src/pcm/pcm_hw.c index 64188b22..e0931577 100644 --- a/src/pcm/pcm_hw.c +++ b/src/pcm/pcm_hw.c @@ -904,6 +904,7 @@ static bool map_control_data(snd_pcm_hw_t *hw, struct snd_pcm_mmap_control *mmap_control; bool fallbacked; + mmap_control = MAP_FAILED; if (!force_fallback) { mmap_control = mmap(NULL, page_align(sizeof(*mmap_control)), PROT_READ|PROT_WRITE, MAP_FILE|MAP_SHARED, -- 2.11.0

2 1

[alsa-devel] [PATCH 0/8] Add ASoC support for AMD Stoney APUs
by Alex Deucher 30 Jun '17

30 Jun '17

This patch set updates the AMD GPU and Audio CoProcessor (ACP) audio drivers and the designware i2s driver for Stoney (ST). ST is an APU similar to Carrizo (CZ) which already has ACP audio support. The i2s controller and ACP audio DMA engine are part of the GPU and both need updating so I would like to upstream the whole patch set via one tree if possible. The current code is based on drm-next, but I'm happy to rebase on whatever tree this ends up going through if there are any problems applying. The entire patch set can be viewed here: https://cgit.freedesktop.org/~agd5f/linux/log/?h=drm-next-4.13-acp Thanks! Alex Akshu Agrawal (1): ASoC: AMD: Add machine driver for cz rt5650 Vijendar Mukunda (7): drm/amd/amdgpu: Added asic_type as ACP DMA driver platform data ASoC: dwc: Added a quirk DW_I2S_QUIRK_16BIT_IDX_OVERRIDE to dwc driver drm/amd/amdgpu: Added a dwc quirk for Stoney platform ASoC: AMD: added condition checks for CZ specific code ASoC: AMD: DMA driver changes for Stoney Platform ASoC: AMD: Buffer related changes for Stoney drm/amd/amdgpu: Disable ACP Power Gating for Stoney platform drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 54 +++++--- include/sound/designware_i2s.h | 1 + sound/soc/amd/Kconfig | 7 ++ sound/soc/amd/Makefile | 2 + sound/soc/amd/acp-pcm-dma.c | 215 ++++++++++++++++++++++++-------- sound/soc/amd/acp-rt5645.c | 210 +++++++++++++++++++++++++++++++ sound/soc/amd/acp.h | 9 ++ sound/soc/dwc/dwc-i2s.c | 6 + 8 files changed, 432 insertions(+), 72 deletions(-) create mode 100644 sound/soc/amd/acp-rt5645.c -- 2.5.5

5 18

Re: [alsa-devel] Add codecs support for ALC215/ALC285/ALC289
by Takashi Iwai 30 Jun '17

30 Jun '17

On Fri, 30 Jun 2017 10:08:00 +0200, Kailang wrote: > > Hi Takashi, > > Attach patch was support our new codecs for ALC215 ALC285 ALC289. > Old 0x0285(ALC285) device ID was relpace by this. Applied, thanks. Takashi

1 0

Re: [alsa-devel] Remove device ID of ALC285
by Takashi Iwai 30 Jun '17

30 Jun '17

On Fri, 30 Jun 2017 09:39:15 +0200, Kailang wrote: > > Hi Takashi, > > 0x0285 Device ID was not used. > It just assigned for alias of ALC293 as backup. > So, remove it first. > Because our new codec will use this device ID. Applied, thanks. Takashi

1 0

[alsa-devel] [PATCH alsa-lib 00/12] pcm: hw: optimization for v2.0.14 of PCM protocol/interface
by Takashi Sakamoto 30 Jun '17

30 Jun '17

Hi, This patchset is an optimization for version 2.0.14 of ALSA PCM protocol/interface. In this version, for some devices/drivers, applications are disallowed to map control data of runtime of PCM substream. On the other hand, mapping status data is still available. In current implementation of alsa-lib, execution of ioctl(2) with SNDRV_PCM_IOCTL_SYNC_PTR is still done without enough care of the change. For example, even if status data is successfully mapped, the ioctl is executed to query the status data. This is inefficient. This patchset is to arrange the execution. Takashi Sakamoto (12): pcm: hw: fix to initialize function local variable pcm: hw: add a helper function just to query status/control data of PCM substream pcm: hw: use heler function to query status/control data after reading/writing PCM frames pcm: hw: use helper function to query status/control data after HW_PARAMS call pcm: hw: use helper function to query status/control data after PREPARE/RESET call pcm: hw: use helper function to query status/control data after REWIND/FORWARD call pcm: hw: use helper function to query status/control data for calculation of available space on PCM buffer pcm: hw: add a helper function to request hwsync without side-effects pcm: hw: add a helper function to issue appl_ptr without sub-effects pcm: hw: add a helper function to issue avail_min without sub-effects pcm: hw: remove superfluous code to call of SNDRV_PCM_IOCTL_SYNC_PTR in snd_pcm_hw_forward() pcm: hw: minor refactoring for initialization of control data src/pcm/pcm_hw.c | 109 ++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 75 insertions(+), 34 deletions(-) -- 2.11.0

1 13

[alsa-devel] [asoc:topic/drm 1/1] drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c:88:21: error: storage size of 'of_ep' isn't known
by kbuild test robot 30 Jun '17

30 Jun '17

tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git topic/drm head: e3839bd6f56a291f00a4c3737eb15ca0344a82a9 commit: e3839bd6f56a291f00a4c3737eb15ca0344a82a9 [1/1] drm: dw-hdmi-i2s: add .get_dai_id callback for ALSA SoC config: i386-allmodconfig (attached as .config) compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901 reproduce: git checkout e3839bd6f56a291f00a4c3737eb15ca0344a82a9 # save the attached .config to linux build tree make ARCH=i386 All errors (new ones prefixed by >>): drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c:85:42: warning: 'struct snd_soc_component' declared inside parameter list will not be visible outside of this definition or declaration static int dw_hdmi_i2s_get_dai_id(struct snd_soc_component *component, ^~~~~~~~~~~~~~~~~ drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c: In function 'dw_hdmi_i2s_get_dai_id': >> drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c:88:21: error: storage size of 'of_ep' isn't known struct of_endpoint of_ep; ^~~~~ >> drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c:91:8: error: implicit declaration of function 'of_graph_parse_endpoint' [-Werror=implicit-function-declaration] ret = of_graph_parse_endpoint(endpoint, &of_ep); ^~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c:88:21: warning: unused variable 'of_ep' [-Wunused-variable] struct of_endpoint of_ep; ^~~~~ drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c: At top level: >> drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c:108:2: error: unknown field 'get_dai_id' specified in initializer .get_dai_id = dw_hdmi_i2s_get_dai_id, ^ >> drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c:108:16: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types] .get_dai_id = dw_hdmi_i2s_get_dai_id, ^~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c:108:16: note: (near initialization for 'dw_hdmi_i2s_ops.digital_mute') cc1: some warnings being treated as errors vim +88 drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c 79 80 dw_hdmi_audio_disable(hdmi); 81 82 hdmi_write(audio, HDMI_AUD_CONF0_SW_RESET, HDMI_AUD_CONF0); 83 } 84 > 85 static int dw_hdmi_i2s_get_dai_id(struct snd_soc_component *component, 86 struct device_node *endpoint) 87 { > 88 struct of_endpoint of_ep; 89 int ret; 90 > 91 ret = of_graph_parse_endpoint(endpoint, &of_ep); 92 if (ret < 0) 93 return ret; 94 95 /* 96 * HDMI sound should be located as reg = <2> 97 * Then, it is sound port 0 98 */ 99 if (of_ep.port == 2) 100 return 0; 101 102 return -EINVAL; 103 } 104 105 static struct hdmi_codec_ops dw_hdmi_i2s_ops = { 106 .hw_params = dw_hdmi_i2s_hw_params, 107 .audio_shutdown = dw_hdmi_i2s_audio_shutdown, > 108 .get_dai_id = dw_hdmi_i2s_get_dai_id, 109 }; 110 111 static int snd_dw_hdmi_probe(struct platform_device *pdev) --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

2 1

[alsa-devel] [asoc:topic/drm 1/1] drivers/gpu//drm/bridge/synopsys/dw-hdmi-i2s-audio.c:88:21: warning: unused variable 'of_ep'
by kbuild test robot 30 Jun '17

30 Jun '17

tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git topic/drm head: e3839bd6f56a291f00a4c3737eb15ca0344a82a9 commit: e3839bd6f56a291f00a4c3737eb15ca0344a82a9 [1/1] drm: dw-hdmi-i2s: add .get_dai_id callback for ALSA SoC config: tile-allmodconfig (attached as .config) compiler: tilegx-linux-gcc (GCC) 4.6.2 reproduce: wget https://raw.githubusercontent.com/01org/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross git checkout e3839bd6f56a291f00a4c3737eb15ca0344a82a9 # save the attached .config to linux build tree make.cross ARCH=tile All warnings (new ones prefixed by >>): drivers/gpu//drm/bridge/synopsys/dw-hdmi-i2s-audio.c:86:14: warning: 'struct snd_soc_component' declared inside parameter list [enabled by default] drivers/gpu//drm/bridge/synopsys/dw-hdmi-i2s-audio.c:86:14: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default] drivers/gpu//drm/bridge/synopsys/dw-hdmi-i2s-audio.c: In function 'dw_hdmi_i2s_get_dai_id': drivers/gpu//drm/bridge/synopsys/dw-hdmi-i2s-audio.c:88:21: error: storage size of 'of_ep' isn't known drivers/gpu//drm/bridge/synopsys/dw-hdmi-i2s-audio.c:91:2: error: implicit declaration of function 'of_graph_parse_endpoint' >> drivers/gpu//drm/bridge/synopsys/dw-hdmi-i2s-audio.c:88:21: warning: unused variable 'of_ep' drivers/gpu//drm/bridge/synopsys/dw-hdmi-i2s-audio.c: At top level: drivers/gpu//drm/bridge/synopsys/dw-hdmi-i2s-audio.c:108:2: error: unknown field 'get_dai_id' specified in initializer drivers/gpu//drm/bridge/synopsys/dw-hdmi-i2s-audio.c:108:2: warning: initialization from incompatible pointer type [enabled by default] drivers/gpu//drm/bridge/synopsys/dw-hdmi-i2s-audio.c:108:2: warning: (near initialization for 'dw_hdmi_i2s_ops.digital_mute') [enabled by default] cc1: some warnings being treated as errors vim +/of_ep +88 drivers/gpu//drm/bridge/synopsys/dw-hdmi-i2s-audio.c 80 dw_hdmi_audio_disable(hdmi); 81 82 hdmi_write(audio, HDMI_AUD_CONF0_SW_RESET, HDMI_AUD_CONF0); 83 } 84 85 static int dw_hdmi_i2s_get_dai_id(struct snd_soc_component *component, > 86 struct device_node *endpoint) 87 { > 88 struct of_endpoint of_ep; 89 int ret; 90 91 ret = of_graph_parse_endpoint(endpoint, &of_ep); --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[alsa-devel] [PATCH] ALSA: hda: constify attribute_group structures.
by Arvind Yadav 29 Jun '17

29 Jun '17

attribute_groups are not supposed to change at runtime. All functions working with attribute_groups provided by <linux/device.h> work with const attribute_group. So mark the non-const structs as const. File size before: text data bss dec hex filename 995 608 0 1603 643 sound/pci/hda/hda_sysfs.o File size After adding 'const': text data bss dec hex filename 1035 544 0 1579 62b sound/pci/hda/hda_sysfs.o Signed-off-by: Arvind Yadav <arvind.yadav.cs(a)gmail.com> --- sound/pci/hda/hda_sysfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/pci/hda/hda_sysfs.c b/sound/pci/hda/hda_sysfs.c index 9739fce..9b7efec 100644 --- a/sound/pci/hda/hda_sysfs.c +++ b/sound/pci/hda/hda_sysfs.c @@ -761,7 +761,7 @@ int snd_hda_load_patch(struct hda_bus *bus, size_t fw_size, const void *fw_buf) NULL }; -static struct attribute_group hda_dev_attr_group = { +static const struct attribute_group hda_dev_attr_group = { .attrs = hda_dev_attrs, }; -- 1.9.1

2 1

[alsa-devel] [PATCH] ALSA: pcm: constify attribute_group structures.
by Arvind Yadav 29 Jun '17

29 Jun '17

attribute_groups are not supposed to change at runtime. All functions working with attribute_groups provided by <linux/device.h> work with const attribute_group. So mark the non-const structs as const. File size before: text data bss dec hex filename 9781 240 8 10029 272d sound/core/pcm.o File size After adding 'const': text data bss dec hex filename 9813 176 8 9997 270d sound/core/pcm.o Signed-off-by: Arvind Yadav <arvind.yadav.cs(a)gmail.com> --- sound/core/pcm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/core/pcm.c b/sound/core/pcm.c index 8e980aa..ee3e8db0 100644 --- a/sound/core/pcm.c +++ b/sound/core/pcm.c @@ -1056,7 +1056,7 @@ static ssize_t show_pcm_class(struct device *dev, NULL }; -static struct attribute_group pcm_dev_attr_group = { +static const struct attribute_group pcm_dev_attr_group = { .attrs = pcm_dev_attrs, }; -- 1.9.1

2 1