May 2018 - Sound-open-firmware - mailman.alsa-project.org

[Sound-open-firmware] [PATCH] topology: test: add some passthrough topologies for CNL
by Zhang Keqiao 04 May '18

04 May '18

Signed-off-by: Zhang Keqiao <keqiao.zhang(a)linux.intel.com> --- topology/test/tplg-build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/topology/test/tplg-build.sh b/topology/test/tplg-build.sh index 7c55fba..831512f 100755 --- a/topology/test/tplg-build.sh +++ b/topology/test/tplg-build.sh @@ -157,6 +157,8 @@ do done # for CNL +simple_test nocodec passthrough "NoCodec" s16le 2 s16le 25 16 2400000 24000000 I2S +simple_test nocodec passthrough "NoCodec" s24le 2 s24le 25 24 2400000 24000000 I2S simple_test nocodec volume "NoCodec" s16le 2 s16le 25 16 2400000 24000000 I2S simple_test nocodec volume "NoCodec" s16le 2 s24le 25 24 2400000 24000000 I2S simple_test nocodec volume "NoCodec" s24le 2 s24le 25 24 2400000 24000000 I2S -- 2.14.1

1 0

[Sound-open-firmware] [PATCH v2] topology: utility for visualizing topology
by Ranjani Sridharan 04 May '18

04 May '18

Add a simple utility that parses topology bin files and creates a graph using the linux dot tool. Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- Notes: v2: amended the license topology/Makefile.am | 5 ++ topology/parse_topology.c | 147 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 152 insertions(+) create mode 100644 topology/parse_topology.c diff --git a/topology/Makefile.am b/topology/Makefile.am index 73e10e9..b69dfb4 100644 --- a/topology/Makefile.am +++ b/topology/Makefile.am @@ -59,3 +59,8 @@ EXTRA_DIST = \ sof-cnl-rt274.m4 \ sof-hsw-rt5640.m4 \ sof-apl-tdf8532.m4 + +bin_PROGRAMS = tplg_graph + +tplg_graph_SOURCES = \ + parse_topology.c diff --git a/topology/parse_topology.c b/topology/parse_topology.c new file mode 100644 index 0000000..69bd559 --- /dev/null +++ b/topology/parse_topology.c @@ -0,0 +1,147 @@ +/* + * Copyright (c) 2018, Intel Corporation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the Intel Corporation nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include <stdio.h> +#include <sound/asoc.h> +#include <string.h> +#include <stdlib.h> + +/* + * The output graph is saved as "tplg.png" + * Usage: ./tplg_graph <tplg file> + */ + +int main(int argc, char **argv) +{ + struct snd_soc_tplg_hdr *hdr; + struct snd_soc_tplg_dapm_graph_elem *graph_elem; + char *filename; + char *dotfilename = "tplg.dot"; + FILE *file, *dotfile; + char *start = "digraph topology {\n"; + char *node_color = "node [color=Red,fontname=Courier]\n"; + char *edge_color = "edge [color=Blue, style=dashed]\n"; + char *end = "}\n"; + char edge[256]; + int i, status, ret; + size_t size, file_size; + + /* command line arguments */ + if (argc < 2) { + printf("usage: tplg_graph <tplg file>\n"); + exit(EXIT_FAILURE); + } + + filename = malloc(strlen(argv[1])); + strcpy(filename, argv[1]); + + /* open files */ + file = fopen(filename, "rb"); + if (!file) { + fprintf(stderr, "Unable to open file %s", filename); + return -1; + } + + dotfile = fopen(dotfilename, "w"); + if (!dotfile) { + fprintf(stderr, "Unable to open file %s", dotfilename); + return -1; + } + + fwrite(start, strlen(start), 1, dotfile); + fwrite(node_color, strlen(node_color), 1, dotfile); + fwrite(edge_color, strlen(edge_color), 1, dotfile); + + + /* file size */ + fseek(file, 0, SEEK_END); + file_size = ftell(file); + fseek(file, 0, SEEK_SET); + + /* Allocate memory */ + size = sizeof(struct snd_soc_tplg_hdr); + hdr = (struct snd_soc_tplg_hdr *)malloc(size); + if (!hdr) { + printf("error: mem alloc\n"); + return -1; + } + + size = sizeof(struct snd_soc_tplg_dapm_graph_elem); + graph_elem = (struct snd_soc_tplg_dapm_graph_elem *)malloc(size); + if (!graph_elem) { + printf("error: mem alloc\n"); + return -1; + } + + while (1) { + ret = fread(hdr, sizeof(struct snd_soc_tplg_hdr), 1, file); + if (ret != 1) + printf("error: reading header\n"); + + switch (hdr->type) { + case SND_SOC_TPLG_TYPE_DAPM_GRAPH: + size = sizeof(struct snd_soc_tplg_dapm_graph_elem); + /* parse pipeline graph */ + for (i = 0; i < hdr->count; i++) { + ret = fread(graph_elem, size, 1, file); + if (ret != 1) + printf("error: reading graph elem\n"); + + /* write route to output dot file */ + sprintf(edge, "\"%s\"->\"%s\"\n", + graph_elem->source, graph_elem->sink); + fwrite(edge, strlen(edge), 1, dotfile); + fwrite("\n", 1, 1, dotfile); + } + + if (ftell(file) == file_size) + goto finish; + break; + + default: + fseek(file, hdr->payload_size, SEEK_CUR); + if (ftell(file) == file_size) + goto finish; + break; + } + } + +finish: + fwrite(end, strlen(end), 1, dotfile); + fclose(dotfile); + fclose(file); + free(hdr); + free(graph_elem); + + /* create topology graph */ + status = system("dot tplg.dot -Tpng -o tplg.png"); + if (status < 0) { + printf("error: creating tplg graph\n"); + exit(EXIT_FAILURE); + } +} -- 2.14.1

1 0

[Sound-open-firmware] [PATCH 1/3] DAI: Check DAI type in dai_get() in APL platform
by Seppo Ingalsuo 03 May '18

03 May '18

Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo(a)linux.intel.com> --- src/platform/apollolake/dai.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/platform/apollolake/dai.c b/src/platform/apollolake/dai.c index 7e5da44..42d7393 100644 --- a/src/platform/apollolake/dai.c +++ b/src/platform/apollolake/dai.c @@ -150,9 +150,13 @@ struct dai *dai_get(uint32_t type, uint32_t index) { int i; - for (i = 0; i < ARRAY_SIZE(ssp); i++) { - if (ssp[i].type == type && ssp[i].index == index) - return &ssp[i]; + if (type == SOF_DAI_INTEL_SSP) { + for (i = 0; i < ARRAY_SIZE(ssp); i++) { + if (ssp[i].type == type && ssp[i].index == index) + return &ssp[i]; + } + } + } return NULL; -- 2.14.1

1 2

[Sound-open-firmware] Introduce a module parameter to configure SOF driver debug output?
by Lin, Mengdong 03 May '18

03 May '18

Hi, Sorry for the long mail. The kernel debug message from SOF driver can help us to debug issues and CI to provide hints for failed test cases. But it will be too much to output all of debug message by default. So maybe we can try to manage SOF debug messages as drm does? DRM is kernel gfx subsystem and Intel i915 driver is based on it. drm defines a module parameter 'debug' for user to specify a debug mask when booting the kernel. The debug mask is a bit mask of different message categories. By setting a suitable mask, user or CI can make DRM driver output message of specified categories. Usually we use drm.debug=0x0e to get most important debug messages. Maybe SOF driver can use this method to configure its messages? If this is doable, we can do some RFC patch. Here is how drm defines its debug mode in drivers/gpu/drm/drm_drv.c: MODULE_PARM_DESC(debug, "Enable debug output, where each bit enables a debug category.\n" "\t\tBit 0 (0x01) will enable CORE messages (drm core code)\n" "\t\tBit 1 (0x02) will enable DRIVER messages (drm controller code)\n" "\t\tBit 2 (0x04) will enable KMS messages (modesetting code)\n" "\t\tBit 3 (0x08) will enable PRIME messages (prime code)\n" "\t\tBit 4 (0x10) will enable ATOMIC messages (atomic code)\n" "\t\tBit 5 (0x20) will enable VBL messages (vblank code)\n" "\t\tBit 7 (0x80) will enable LEASE messages (leasing code)"); module_param_named(debug, drm_debug, int, 0600); void drm_dev_printk(const struct device *dev, const char *level, unsigned int category, const char *function_name, const char *prefix, const char *format, ...) { struct va_format vaf; va_list args; if (category != DRM_UT_NONE && !(drm_debug & category)) return; va_start(args, format); vaf.fmt = format; vaf.va = &args; if (dev) dev_printk(level, dev, DRM_PRINTK_FMT, function_name, prefix, &vaf); ... } Then base on this, it defines macros for outputting of different categories: #define DRM_DEV_DEBUG(dev, fmt, args...) \ drm_dev_printk(dev, KERN_DEBUG, DRM_UT_CORE, __func__, "", fmt, \ ##args) #define DRM_DEBUG(fmt, ...) \ drm_printk(KERN_DEBUG, DRM_UT_CORE, fmt, ##__VA_ARGS__) #define DRM_DEV_DEBUG_DRIVER(dev, fmt, args...) \ drm_dev_printk(dev, KERN_DEBUG, DRM_UT_DRIVER, __func__, "", \ fmt, ##args) #define DRM_DEBUG_DRIVER(fmt, ...) \ drm_printk(KERN_DEBUG, DRM_UT_DRIVER, fmt, ##__VA_ARGS__) #define DRM_DEV_DEBUG_KMS(dev, fmt, args...) \ drm_dev_printk(dev, KERN_DEBUG, DRM_UT_KMS, __func__, "", fmt, \ ##args) Thanks Mengdong

3 5

[Sound-open-firmware] [PATCH 0/2] SOF: panic hanlder refine
by Xiuli Pan 03 May '18

03 May '18

From: Pan Xiuli <xiuli.pan(a)linux.intel.com> Send exception offset via IPC in case of DPS is not ready with memory window. Used with SOF kernel patches: ASoC: SOF: Add panic handler ops header ASoC: SOF: Add panic handler ops function ASoC: SOF: BYT: Refnie panic handler ASoC: SOF: HSW: Refnie panic handler ASoC: SOF: BDW: Refnie panic handler ASoC: SOF: APL: Refnie panic handler Pan Xiuli (2): mailbox: use mailbox function for SW_REG platform: panice: Send exception memory offset via IPC src/include/sof/mailbox.h | 14 ++++++++++++++ src/platform/apollolake/include/platform/platform.h | 7 +++++-- src/platform/baytrail/include/platform/platform.h | 3 ++- src/platform/cannonlake/include/platform/platform.h | 7 +++++-- 4 files changed, 26 insertions(+), 5 deletions(-) -- 2.7.4

4 7

[Sound-open-firmware] [PATCH 1/3] scripts: Add #! headers to shell scripts
by Dylan Reid 02 May '18

02 May '18

Use /bin/sh by default. The lists used in xtensa-build-all.sh are a bash feature, use bash for that script. Signed-off-by: Dylan Reid <dgreid(a)chromium.org> --- scripts/host-build-all.sh | 2 ++ scripts/rimage-build.sh | 2 ++ scripts/xtensa-build-all.sh | 2 ++ 3 files changed, 6 insertions(+) diff --git a/scripts/host-build-all.sh b/scripts/host-build-all.sh index fd3c847..87933b3 100755 --- a/scripts/host-build-all.sh +++ b/scripts/host-build-all.sh @@ -1,3 +1,5 @@ +#!/bin/sh + # fail on any errors set -e diff --git a/scripts/rimage-build.sh b/scripts/rimage-build.sh index a2a2e86..af7997d 100755 --- a/scripts/rimage-build.sh +++ b/scripts/rimage-build.sh @@ -1,3 +1,5 @@ +#!/bin/sh + ./autogen.sh ./configure --enable-rimage make diff --git a/scripts/xtensa-build-all.sh b/scripts/xtensa-build-all.sh index 35ff9d9..99db2b0 100755 --- a/scripts/xtensa-build-all.sh +++ b/scripts/xtensa-build-all.sh @@ -1,3 +1,5 @@ +#!/bin/bash + # fail on any errors set -e -- 2.17.0.484.g0c8726318c-goog

4 7

Re: [Sound-open-firmware] Introduce a module parameter to configure SOF driver debug output?
by Lin, Mengdong 02 May '18

02 May '18

cc the public mailing list. > -----Original Message----- > From: Kumar, Abhijeet > Sent: Friday, April 27, 2018 6:46 PM > To: Lin, Mengdong <mengdong.lin(a)intel.com>; sof-intel(a)eclists.intel.com > Cc: Lu, Yang A <yang.a.lu(a)intel.com> > Subject: RE: Introduce a module parameter to configure SOF driver debug > output? > > Sorry for the +1 noise. :) > But I really think the idea of supporting different debug levels is nice. And if > others think that it is doable, then maybe I would love to contribute RFC > patches. Hi Pierre/Liam, Would you like to share some advice? And if this is doable, how can we define the categories: IPC, PCM, TOPOLOGY, VIRTIO, DEV, DRIVER? Then we may define some macro like: SND_SOF_DEBUG_IPC(dev, fmt, args...) SND_SOF_DEBUG_PCM(dev, fmt, args...) SND_SOF_DEBUG_TPLG(dev, fmt, args...) ... for topology ... And we can also define category for different levels: SND_SOF_INFO_IPC SND_SOF_WARN_IPC SND_SOF_ERR_IPC ... > > >drm defines a module parameter 'debug' for user to specify the DRM > >debug mode when booting the kernel > And adding my two cents to it. > DRM provides a sysfs as well to change the value of debug parameters at > runtime. So it's not the always case of providing the debug level in kernel > cmdline. > > cat /sys/module/drm/parameters/debug Yes. This is nice :-) Thanks Mengdong > > Warm Regards, > Abhijeet > > -----Original Message----- > From: sof-intel-request(a)eclists.intel.com [mailto:sof-intel- > request(a)eclists.intel.com] On Behalf Of Lin, Mengdong > Sent: Friday, April 27, 2018 3:22 PM > To: sof-intel(a)eclists.intel.com > Cc: Lu, Yang A <yang.a.lu(a)intel.com> > Subject: Introduce a module parameter to configure SOF driver debug output? > > Hi, > > Sorry for the long mail. > > The kernel debug message from SOF driver can help us to debug issues and > CI to provide hints for failed test cases. But it will be too much to output all > of debug message by default. > > So maybe we can try to manage SOF debug messages as drm does? > > DRM is kernel gfx subsystem and Intel i915 driver is based on it. drm defines > a module parameter 'debug' for user to specify the DRM debug mode when > booting the kernel. The debug mode is actually a bit mask of different > message categories. By setting a suitable debug mode, user or CI can make > DRM driver output message of specified categories. Usually we use > drm.debug=0x0e to get most important debug messages. > > Maybe SOF driver can also define its categories for debug messages? If this is > doable, we can do some RFC patch. > > Here is how drm defines its debug mode in drivers/gpu/drm/drm_drv.c: > > MODULE_PARM_DESC(debug, "Enable debug output, where each bit enables > a debug category.\n" > "\t\tBit 0 (0x01) will enable CORE messages (drm core code)\n" > "\t\tBit 1 (0x02) will enable DRIVER messages (drm controller code)\n" > "\t\tBit 2 (0x04) will enable KMS messages (modesetting code)\n" > "\t\tBit 3 (0x08) will enable PRIME messages (prime code)\n" > "\t\tBit 4 (0x10) will enable ATOMIC messages (atomic code)\n" > "\t\tBit 5 (0x20) will enable VBL messages (vblank code)\n" > "\t\tBit 7 (0x80) will enable LEASE messages (leasing code)"); > module_param_named(debug, drm_debug, int, 0600); > > > void drm_dev_printk(const struct device *dev, const char *level, > unsigned int category, const char *function_name, > const char *prefix, const char *format, ...) { > struct va_format vaf; > va_list args; > > if (category != DRM_UT_NONE && !(drm_debug & category)) > return; > > va_start(args, format); > vaf.fmt = format; > vaf.va = &args; > > if (dev) > dev_printk(level, dev, DRM_PRINTK_FMT, function_name, > prefix, > &vaf); > ... > > } > > Then base on this, it defines macros for outputting of different categories: > > #define DRM_DEV_DEBUG(dev, fmt, args...) \ > drm_dev_printk(dev, KERN_DEBUG, DRM_UT_CORE, __func__, "", > fmt, \ > ##args) > > #define DRM_DEBUG(fmt, ...) \ > drm_printk(KERN_DEBUG, DRM_UT_CORE, fmt, ##__VA_ARGS__) > > > #define DRM_DEV_DEBUG_DRIVER(dev, fmt, args...) > \ > drm_dev_printk(dev, KERN_DEBUG, DRM_UT_DRIVER, __func__, "", > \ > fmt, ##args) > > #define DRM_DEBUG_DRIVER(fmt, ...) \ > drm_printk(KERN_DEBUG, DRM_UT_DRIVER, fmt, ##__VA_ARGS__) > > > #define DRM_DEV_DEBUG_KMS(dev, fmt, args...) > \ > drm_dev_printk(dev, KERN_DEBUG, DRM_UT_KMS, __func__, "", fmt, > \ > ##args) > > > > Thanks > Mengdong

4 4

[Sound-open-firmware] [PATCH 0/2] DMA trace level
by yan.wang＠linux.intel.com 02 May '18

02 May '18

From: Yan Wang <yan.wang(a)linux.intel.com> Implement DMA trace level based on modules. User can switch on/off for DMA trace of one module. Yan Wang (2): Implement DMA trace level control. Update trace level status based on received IPC message. src/include/sof/dma-trace.h | 57 +++++++++++++++++++++++ src/include/uapi/ipc.h | 8 ++++ src/ipc/handler.c | 25 ++++++++++ src/lib/dma-trace.c | 109 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 199 insertions(+) -- 2.14.3

7 18

[Sound-open-firmware] [PATCH] scripts: docker: Add apt proxy setting
by Xiuli Pan 01 May '18

01 May '18

From: Pan Xiuli <xiuli.pan(a)linux.intel.com> apt will not use environment proxy in ubuntu, need to set proxy in apt.conf file Modify Dockerfile to get apt.conf from host and add an empty apt.conf for those host that need no proxy. You can either copy apt.conf from host or edit the apt.conf in scripts/docker_build Signed-off-by: Pan Xiuli <xiuli.pan(a)linux.intel.com> --- scripts/README.docker | 5 +++++ scripts/docker_build/Dockerfile | 2 ++ scripts/docker_build/apt.conf | 0 3 files changed, 7 insertions(+) create mode 100644 scripts/docker_build/apt.conf diff --git a/scripts/README.docker b/scripts/README.docker index fd390d6..c6273c5 100644 --- a/scripts/README.docker +++ b/scripts/README.docker @@ -10,6 +10,11 @@ First, build the docker container. This step needs to be done initially and when the toolchain or alsa dependencies are updated. cd scripts/docker_build + +Optional for user need proxy to access internet +cp /etc/apt/apt.conf ./ +or edit the apt.conf file + docker build --build-arg UID=$(id -u) -t sof . After the container is built, it can be used to run the scripts. diff --git a/scripts/docker_build/Dockerfile b/scripts/docker_build/Dockerfile index 6b587e2..9947c96 100644 --- a/scripts/docker_build/Dockerfile +++ b/scripts/docker_build/Dockerfile @@ -17,6 +17,8 @@ FROM ubuntu ARG UID=1000 +COPY apt.conf /etc/apt/ + RUN apt-get -y update && \ apt-get install -y \ autoconf \ diff --git a/scripts/docker_build/apt.conf b/scripts/docker_build/apt.conf new file mode 100644 index 0000000..e69de29 -- 2.7.4

1 0