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

Re: [Sound-open-firmware] [PATCH V2 2/2] scripts: docker: Simplify docker build
by Liam Girdwood 08 Jun '18

08 Jun '18

On Wed, 2018-06-06 at 12:06 +0800, Pan, Xiuli wrote: > > > -RUN useradd --create-home -d /home/sof -u $UID -G sudo sof > > > -RUN echo "sof:test0000" | chpasswd > > > -RUN adduser sof sudo > > > +# Set up sof user > > > +RUN useradd --create-home -d /home/sof -u $UID -G sudo sof && \ > > > +echo "sof:test0000" | chpasswd && adduser sof sudo && echo '%sudo > > > ALL=(ALL) > > > NOPASSWD:ALL' >> /etc/sudoers > > > > Does this mean rimage is installed on the Docker FS overlay with no password > > now > > ? > > The rimage is installed every time when we run scripts/xtensa-build-all.sh. > And the docker-run recommend to use scripts to build the sof. This > change just make sudo need no password in docker. > The rimage install need sudo with password, either we change the scripts > or make sudo need no password. > I just choose to use no password to make docker easier to use. We can't compromise security. Maybe the easiest thing is to make xtensa-build.sh take a -l flag to install rimage to ~/bin and use this version. Liam

2 6

[Sound-open-firmware] [RFC PATCH 0/6] Introducing a new API for dma_get()
by Ranjani Sridharan 08 Jun '18

08 Jun '18

This set of patches proposes a new API for dma_get() that procures a DMAC based on the requested user type, copy direction and flags indicating shared/exclusive access. It also updates the existing user of dma_get() to use the new API based on the specific usage. The platform DMAC definitions have also been updated to include information about usage and copy direction to support the new API. This has only been tested on the BYT platform with a Minnowboard Turbot board and a RT5651 codec. Further testing is required on other platforms to ensure there are no regressions. Looking for feedback on initial implementation. The corresponding DMAC/DMAC channel definitions from topology/kernel driver need to be removed. This is still work in progress. Ranjani Sridharan (6): platform: dma: consolidate dmac initialization dma: ops: introduce channel_status() op to retrieve number of channels in use dma: introduce new API for requesting DMAC dma: use newly defined API for request DMAC dma: remove dmac id argument from dma_copy_context() trace: remove trace dmac id definition src/audio/dai.c | 7 ++- src/audio/host.c | 28 +++++++-- src/drivers/dw-dma.c | 19 ++++++ src/drivers/hda-dma.c | 20 ++++++ src/host/common_test.c | 2 +- src/include/sof/dma.h | 38 +++++++++++- src/ipc/apl-ipc.c | 3 +- src/ipc/byt-ipc.c | 4 +- src/ipc/cnl-ipc.c | 4 +- src/ipc/dma-copy.c | 9 ++- src/ipc/hsw-ipc.c | 4 +- src/lib/dma-trace.c | 2 +- src/platform/apollolake/dma.c | 62 +++++++++++++++++-- .../apollolake/include/platform/platform.h | 3 - src/platform/apollolake/platform.c | 21 +------ src/platform/baytrail/dma.c | 50 +++++++++++++-- .../baytrail/include/platform/platform.h | 3 - src/platform/baytrail/platform.c | 22 +------ src/platform/cannonlake/dma.c | 62 +++++++++++++++++-- .../cannonlake/include/platform/platform.h | 3 - src/platform/cannonlake/platform.c | 21 +------ src/platform/haswell/dma.c | 58 ++++++++++++++--- .../haswell/include/platform/platform.h | 3 - src/platform/haswell/platform.c | 16 +---- 24 files changed, 337 insertions(+), 127 deletions(-) -- 2.17.0

6 41

[Sound-open-firmware] [PATCH] README: Fix a typo in the example SOF configure command
by Seppo Ingalsuo 07 Jun '18

07 Jun '18

The $PWD environment variable (the current directory) need to be in upper case. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo(a)linux.intel.com> --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index adc23e2..c2ac1ca 100644 --- a/README +++ b/README @@ -24,7 +24,7 @@ If building library for host platform, run the following configure. Please modif the --prefix option to choose the directory for installing the library files and headers -./configure --with-arch=host --enable-library=yes --host=x86_64-unknown-linux-gnu --prefix=$pwd/../host-root/ +./configure --with-arch=host --enable-library=yes --host=x86_64-unknown-linux-gnu --prefix=$PWD/../host-root/ 4) make -- 2.14.1

2 1

[Sound-open-firmware] [PATCH 1/2] uapi: ipc: Add lbm in sof_ipc_dai_config
by Xiuli Pan 06 Jun '18

06 Jun '18

From: Pan Xiuli <xiuli.pan(a)linux.intel.com> Add loopback mode filed lbm in sof_ipc_dai_config to condif BE dai loobback mode. Signed-off-by: Pan Xiuli <xiuli.pan(a)linux.intel.com> --- Work with patch set: SOF-Kernel: ASoC: SOF: upai: ipc: Add lbm in sof_ipc_dai_config ASoC: SOF: uapi: topology: Add SOF_TKN_DAI_LBM for ssp loopback mode ASoC: SOF: topology: Add topology handler for dai config loopback mode SOF: uapi: ipc: Add lbm in sof_ipc_dai_config IPC: Add IPC handler for dai config loopback mode SOF-Tools: topology: Add SOF_TKN_DAI_LBM for ssp loopback mode topology: m4: Add option for loopback mode in DAI config topology: test: Add loopback topology test & santity test with: Mininow max rt5651 and UP2 Hifiberry PRO and CNL nocodec SOF master: 65ddcddfcc9a20f5b622cf3ba93dc326387a9d5d SOF-Tool master: 07d290c8ac6026af28bada021ac2215e3453fa88 https://github.com/plbossart/sound/tree/topic/sof-v4.14: 3ffd39334cb53aced88b8aba17cae3df9ee2736f --- src/include/uapi/ipc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/include/uapi/ipc.h b/src/include/uapi/ipc.h index 9b1063f..06498fb 100644 --- a/src/include/uapi/ipc.h +++ b/src/include/uapi/ipc.h @@ -345,7 +345,7 @@ struct sof_ipc_dai_config { /* physical protocol and clocking */ uint16_t format; /* SOF_DAI_FMT_ */ - uint16_t reserved; /* alignment */ + uint16_t lbm; /* loopback mode*/ /* HW specific data */ union { -- 2.7.4

6 16

[Sound-open-firmware] [PATCH] ipc: remove duplicated sof_ipc_chmap from sof_ipc_pcm_params
by Liam Girdwood 05 Jun '18

05 Jun '18

From: Tomasz Lauda <tomasz.lauda(a)linux.intel.com> We don't need duplicated sof_ipc_chmap. This change also requires change in kernel. Signed-off-by: Tomasz Lauda <tomasz.lauda(a)linux.intel.com> --- src/include/uapi/ipc.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/include/uapi/ipc.h b/src/include/uapi/ipc.h index 9b1063f..8947a0a 100644 --- a/src/include/uapi/ipc.h +++ b/src/include/uapi/ipc.h @@ -473,7 +473,6 @@ struct sof_ipc_pcm_params { struct sof_ipc_hdr hdr; uint32_t comp_id; struct sof_ipc_stream_params params; - enum sof_ipc_chmap channel_map[]; } __attribute__((packed)); /* PCM params info reply - SOF_IPC_STREAM_PCM_PARAMS_REPLY */ -- 2.17.0

3 11

[Sound-open-firmware] [PATCH] SSP: refine ssp config function
by Rander Wang 05 Jun '18

05 Jun '18

(1)Remove unused code (2)Refine comments (3)Refine master & slave mode setting (4)Refine Frame polarity setting Signed-off-by: Rander Wang <rander.wang(a)linux.intel.com> --- test it on Broadwell, no need to test other platforms SOF: master 131a1887631621 kernel: v4.14 d09db67c5a9d6d SOF-tools: master 13b56fa6047c566a --- src/drivers/hsw-ssp.c | 45 +++++++++++++-------------------------------- 1 file changed, 13 insertions(+), 32 deletions(-) diff --git a/src/drivers/hsw-ssp.c b/src/drivers/hsw-ssp.c index a68898e..8e30900 100644 --- a/src/drivers/hsw-ssp.c +++ b/src/drivers/hsw-ssp.c @@ -111,26 +111,16 @@ static inline int ssp_set_config(struct dai *dai, /* reset SSP settings */ /* sscr0 dynamic settings are DSS, EDSS, SCR, FRDC, ECS */ - sscr0 = SSCR0_MOD | SSCR0_PSP; - /* - * FIXME: PINTE and RWOT are not set in sscr1 - * sscr1 = SSCR1_PINTE | SSCR1_RWOT; - */ - /* sscr1 dynamic settings are TFT, RFT, SFRMDIR, SCLKDIR, SCFR */ sscr1 = SSCR1_TTE | SSCR1_TTELP; -#ifdef ENABLE_TIE_RIE /* FIXME: not enabled, difference with SST driver */ - //sscr1 |= SSCR1_TIE | SSCR1_RIE; -#endif - - // FIXME COE does this ? + /* enable Transmit underrun mode 1 */ sscr2 = SSCR2_TURM1; /* sspsp dynamic settings are SCMODE, SFRMP, DMYSTRT, SFRMWDTH */ - sspsp = SSPSP_ETDS; /* make sure SDO line is tri-stated when inactive */ + sspsp = 0x0; /* sspsp2 no dynamic setting */ sspsp2 = 0x0; @@ -138,33 +128,24 @@ static inline int ssp_set_config(struct dai *dai, ssp->config = *config; ssp->params = config->ssp; - /* clock masters */ - /* - * On TNG/BYT/CHT, the SSP wrapper generates the fs even in master mode, - * the master/slave choice depends on the clock type - */ - sscr1 |= SSCR1_SFRMDIR; - switch (config->format & SOF_DAI_FMT_MASTER_MASK) { case SOF_DAI_FMT_CBM_CFM: - //sscr0 |= SSCR0_ECS; /* external clock used */ - sscr1 |= SSCR1_SCLKDIR; - - break; - case SOF_DAI_FMT_CBS_CFS: -#ifdef ENABLE_SSRCR1_SCFR /* FIXME: is this needed ? */ + sscr1 |= SSCR1_SCLKDIR | SSCR1_SFRMDIR; +#ifdef ENABLE_SSRCR1_SCFR sscr1 |= SSCR1_SCFR; #endif break; + case SOF_DAI_FMT_CBS_CFS: + break; case SOF_DAI_FMT_CBM_CFS: - sscr0 |= SSCR0_ECS; /* external clock used */ sscr1 |= SSCR1_SCLKDIR; - break; - case SOF_DAI_FMT_CBS_CFM: -#ifdef ENABLE_SSRCR1_SCFR /* FIXME: is this needed ? */ +#ifdef ENABLE_SSRCR1_SCFR sscr1 |= SSCR1_SCFR; #endif break; + case SOF_DAI_FMT_CBS_CFM: + sscr1 |= SSCR1_SFRMDIR; + break; default: trace_ssp_error("ec2"); ret = -EINVAL; @@ -346,7 +327,7 @@ static inline int ssp_set_config(struct dai *dai, frame_len = 1; /* handle frame polarity, DSP_A default is rising/active high */ - sspsp |= SSPSP_SFRMP(inverted_frame); + sspsp |= SSPSP_SFRMP(!inverted_frame); sspsp2 |= (frame_end_padding & SSPSP2_FEP_MASK); break; @@ -359,8 +340,8 @@ static inline int ssp_set_config(struct dai *dai, /* set asserted frame length */ frame_len = 1; - /* handle frame polarity, DSP_A default is rising/active high */ - sspsp |= SSPSP_SFRMP(inverted_frame); + /* handle frame polarity, DSP_B default is rising/active high */ + sspsp |= SSPSP_SFRMP(!inverted_frame); sspsp2 |= (frame_end_padding & SSPSP2_FEP_MASK); break; -- 2.14.1

3 4

[Sound-open-firmware] [PATCH V2 1/2] scripts: docker: Add proxy settings
by Xiuli Pan 05 Jun '18

05 Jun '18

From: Pan Xiuli <xiuli.pan(a)linux.intel.com> Modify Dockerfile to copy apt.conf from host and set host proxy to environment. Also modify some git url to http url in order to use the proxy. Also add a docker-build.sh to help docker build Signed-off-by: Pan Xiuli <xiuli.pan(a)linux.intel.com> --- V2: Add selection to use git url when no proxy is used --- scripts/README.docker | 3 ++- scripts/docker_build/Dockerfile | 23 ++++++++++++++++++----- scripts/docker_build/docker-build.sh | 7 +++++++ 3 files changed, 27 insertions(+), 6 deletions(-) create mode 100755 scripts/docker_build/docker-build.sh diff --git a/scripts/README.docker b/scripts/README.docker index 82558b1..e2f189f 100644 --- a/scripts/README.docker +++ b/scripts/README.docker @@ -16,7 +16,8 @@ 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 -docker build --build-arg UID=$(id -u) -t sof . + +./docker-build.sh 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 7ee0a45..8dede3c 100644 --- a/scripts/docker_build/Dockerfile +++ b/scripts/docker_build/Dockerfile @@ -17,6 +17,13 @@ FROM ubuntu:16.04 ARG UID=1000 +# Set up proxy from host +COPY apt.conf /etc/apt/ +ARG host_http_proxy +ARG host_https_proxy +ENV http_proxy $host_http_proxy +ENV https_proxy $host_https_proxy + RUN apt-get -y update && \ apt-get install -y \ autoconf \ @@ -49,11 +56,17 @@ RUN apt-get clean RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 70 --slave /usr/bin/g++ g++ /usr/bin/g++-7 # Use ToT alsa utils for the latest topology patches. -RUN mkdir -p /root/alsa-build -RUN cd /root/alsa-build && git clone git://git.alsa-project.org/alsa-lib.git -RUN cd /root/alsa-build && git clone git://git.alsa-project.org/alsa-utils.git -RUN cd /root/alsa-build/alsa-lib && ./gitcompile && make install -RUN cd /root/alsa-build/alsa-utils && ./gitcompile && make install +RUN mkdir -p /root/alsa-build && cd /root/alsa-build && \ + if [ "x$http_proxy" = "x" ]; then \ + git clone git://git.alsa-project.org/alsa-lib.git && \ + git clone git://git.alsa-project.org/alsa-utils.git ; \ + else \ + git clone http://git.alsa-project.org/http/alsa-lib.git && \ + git clone http://git.alsa-project.org/http/alsa-utils.git; \ + fi && \ +cd /root/alsa-build/alsa-lib && ./gitcompile && make install && \ +cd /root/alsa-build/alsa-utils && ./gitcompile && make install && \ +cd /root/ && rm -rf alsa-build RUN useradd --create-home -d /home/sof -u $UID -G sudo sof RUN echo "sof:test0000" | chpasswd diff --git a/scripts/docker_build/docker-build.sh b/scripts/docker_build/docker-build.sh new file mode 100755 index 0000000..1090f15 --- /dev/null +++ b/scripts/docker_build/docker-build.sh @@ -0,0 +1,7 @@ +#!/bin/bash +if [ -f "/etc/apt/apt.conf" ]; then + cp /etc/apt/apt.conf ./ +else + touch apt.conf +fi +docker build --build-arg UID=$(id -u) --build-arg host_http_proxy=$http_proxy --build-arg host_https_proxy=$https_proxy -t sof . -- 2.7.4

2 3

[Sound-open-firmware] [PATCH] SSP: refine ssp stop function
by Rander Wang 05 Jun '18

05 Jun '18

merge commit 72e63a467fb8f743 ("apl-ssp: change and wrap status transition into ssp_stop") Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> Signed-off-by: Rander Wang <rander.wang(a)linux.intel.com> --- test it on Broadwell, no need to test other platforms SOF: master 131a1887631621 kernel: v4.14 d09db67c5a9d6d SOF-tools: master 13b56fa6047c566a --- src/drivers/hsw-ssp.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/drivers/hsw-ssp.c b/src/drivers/hsw-ssp.c index 8e30900..0d74e7d 100644 --- a/src/drivers/hsw-ssp.c +++ b/src/drivers/hsw-ssp.c @@ -437,23 +437,27 @@ static void ssp_start(struct dai *dai, int direction) } /* stop the SSP for either playback or capture */ -static void ssp_stop(struct dai *dai) +static void ssp_stop(struct dai *dai, int direction) { struct ssp_pdata *ssp = dai_get_drvdata(dai); spin_lock(&ssp->lock); - /* stop Rx if we are not capturing */ - if (ssp->state[SOF_IPC_STREAM_CAPTURE] != COMP_STATE_ACTIVE) { + /* stop Rx if neeed */ + if (direction == DAI_DIR_CAPTURE && + ssp->state[SOF_IPC_STREAM_CAPTURE] == COMP_STATE_ACTIVE) { ssp_update_bits(dai, SSCR1, SSCR1_RSRE, 0); ssp_update_bits(dai, SSCR0, SSCR0_RIM, SSCR0_RIM); + ssp->state[SOF_IPC_STREAM_CAPTURE] = COMP_STATE_PAUSED; trace_ssp("Ss0"); } - /* stop Tx if we are not playing */ - if (ssp->state[SOF_IPC_STREAM_PLAYBACK] != COMP_STATE_ACTIVE) { + /* stop Tx if needed */ + if (direction == DAI_DIR_PLAYBACK && + ssp->state[SOF_IPC_STREAM_PLAYBACK] == COMP_STATE_ACTIVE) { ssp_update_bits(dai, SSCR1, SSCR1_TSRE, 0); ssp_update_bits(dai, SSCR0, SSCR0_TIM, SSCR0_TIM); + ssp->state[SOF_IPC_STREAM_PLAYBACK] = COMP_STATE_PAUSED; trace_ssp("Ss1"); } @@ -488,8 +492,7 @@ static int ssp_trigger(struct dai *dai, int cmd, int direction) break; case COMP_TRIGGER_STOP: case COMP_TRIGGER_PAUSE: - ssp->state[direction] = COMP_STATE_PAUSED; - ssp_stop(dai); + ssp_stop(dai, direction); break; case COMP_TRIGGER_RESUME: ssp_context_restore(dai); -- 2.14.1

1 0

[Sound-open-firmware] [PATCH] ipc: protect SOF_IPC_MESSAGE_ID macro parameters
by Pierre-Louis Bossart 04 Jun '18

04 Jun '18

detected with checkpatch.pl --strict: CHECK: Macro argument 'x' may be better as '(x)' to avoid precedence issues Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- src/include/uapi/ipc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/include/uapi/ipc.h b/src/include/uapi/ipc.h index 88de113..fc4ce46 100644 --- a/src/include/uapi/ipc.h +++ b/src/include/uapi/ipc.h @@ -126,7 +126,7 @@ #define SOF_IPC_TRACE_DMA_POSITION SOF_CMD_TYPE(0x002) /* Get message component id */ -#define SOF_IPC_MESSAGE_ID(x) (x & 0xffff) +#define SOF_IPC_MESSAGE_ID(x) ((x) & 0xffff) /* maximum message size for mailbox Tx/Rx */ #define SOF_IPC_MSG_MAX_SIZE 128 -- 2.14.1

1 0

[Sound-open-firmware] [PATCH] platform: separate common API duplicated in platform headers.
by Liam Girdwood 04 Jun '18

04 Jun '18

From: Marcin Maka <marcin.maka(a)linux.intel.com> Common platform API separated to avoid duplicated declarations and indicate public functions implemented by all platforms. Signed-off-by: Marcin Maka <marcin.maka(a)linux.intel.com> # Conflicts: # src/platform/apollolake/include/platform/platform.h # src/platform/baytrail/include/platform/platform.h # src/platform/cannonlake/include/platform/platform.h # src/platform/haswell/include/platform/platform.h --- src/include/sof/panic.h | 4 +- src/include/sof/platform.h | 60 +++++++++++++++++++ .../apollolake/include/platform/platform.h | 15 ++--- .../baytrail/include/platform/platform.h | 8 ++- .../cannonlake/include/platform/platform.h | 14 ++--- .../haswell/include/platform/platform.h | 6 +- 6 files changed, 82 insertions(+), 25 deletions(-) create mode 100644 src/include/sof/platform.h diff --git a/src/include/sof/panic.h b/src/include/sof/panic.h index 3efb659..7c19939 100644 --- a/src/include/sof/panic.h +++ b/src/include/sof/panic.h @@ -58,9 +58,7 @@ static inline void panic_rewind(uint32_t p, uint32_t stack_rewind_frames) p = dump_stack(p, ext_offset, stack_rewind_frames, count * sizeof(uint32_t)); - /* TODO: send IPC oops message to host */ - - /* panic */ + /* panic - send IPC oops message to host */ platform_panic(p); /* flush last trace messages */ diff --git a/src/include/sof/platform.h b/src/include/sof/platform.h new file mode 100644 index 0000000..8b228ee --- /dev/null +++ b/src/include/sof/platform.h @@ -0,0 +1,60 @@ +/* + * 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. + * + * Author: Marcin Maka <marcin.maka(a)linux.intel.com> + */ + +#ifndef __INCLUDE_SOF_PLATFORM_H__ +#define __INCLUDE_SOF_PLATFORM_H__ + +#include <sof/sof.h> + +/* + * APIs declared here are defined for every platform. + */ + +/** + * \brief Platform specific implementation of the On Boot Complete handler. + * \param[in] boot_message Boot status code. + * \return 0 if successful, error code otherwise. + */ +int platform_boot_complete(uint32_t boot_message); + +/** + * \brief Platform initialization entry, called during FW initialization. + * \param[in] sof Context. + * \return 0 if successful, error code otherwise. + */ +int platform_init(struct sof *sof); + +/** + * \brief Called by the panic handler. + * \param[in] p Panic cause, one of SOF_IPC_PANIC_... codes. + */ +static inline void platform_panic(uint32_t p); + +#endif diff --git a/src/platform/apollolake/include/platform/platform.h b/src/platform/apollolake/include/platform/platform.h index aefa9b2..24848ac 100644 --- a/src/platform/apollolake/include/platform/platform.h +++ b/src/platform/apollolake/include/platform/platform.h @@ -27,20 +27,18 @@ * * Author: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> * Keyon Jie <yang.jie(a)linux.intel.com> - * Xiuli Pan <xiuli.pan(a)linux.intel.com> */ #ifndef __PLATFORM_PLATFORM_H__ #define __PLATFORM_PLATFORM_H__ +#include <platform/platcfg.h> #include <platform/shim.h> #include <platform/interrupt.h> #include <uapi/ipc.h> struct sof; -#define MAX_CORE_COUNT 2 - /* Host page size */ #define HOST_PAGE_SIZE 4096 #define PLATFORM_PAGE_TABLE_SIZE 256 @@ -119,16 +117,15 @@ struct sof; #define PLATFORM_NUM_SSP 6 /* Platform defined panic code */ -#define platform_panic(__x) { \ - mailbox_sw_reg_write(SRAM_REG_FW_STATUS, \ - (0xdead000 | (__x)) & 0x3fffffff); \ - ipc_write(IPC_DIPCIE, MAILBOX_EXCEPTION_OFFSET + 2 * 0x20000); \ - ipc_write(IPC_DIPCI, 0x80000000 | ((0xdead000 | (__x)) & 0x3fffffff)); \ +static inline void platform_panic(uint32_t p) +{ + sw_reg_write(SRAM_REG_FW_STATUS, p & 0x3fffffff); + ipc_write(IPC_DIPCI, 0x80000000 | (p & 0x3fffffff)); } /* Platform defined trace code */ #define platform_trace_point(__x) \ - mailbox_sw_reg_write(SRAM_REG_FW_TRACEP, (__x)) + sw_reg_write(SRAM_REG_FW_TRACEP, __x) extern struct timer *platform_timer; diff --git a/src/platform/baytrail/include/platform/platform.h b/src/platform/baytrail/include/platform/platform.h index 6a7ebc9..d4d4710 100644 --- a/src/platform/baytrail/include/platform/platform.h +++ b/src/platform/baytrail/include/platform/platform.h @@ -33,6 +33,7 @@ #ifndef __PLATFORM_PLATFORM_H__ #define __PLATFORM_PLATFORM_H__ +#include <sof/platform.h> #include <platform/shim.h> #include <platform/interrupt.h> #include <uapi/ipc.h> @@ -102,9 +103,10 @@ struct sof; #define PLATFORM_IDLE_TIME 750000 /* Platform defined panic code */ -#define platform_panic(__x) { \ - shim_write(SHIM_IPCDL, (0xdead000 | (__x & 0xfff))); \ - shim_write(SHIM_IPCDH, (SHIM_IPCDH_BUSY | MAILBOX_EXCEPTION_OFFSET)); \ +static inline void platform_panic(uint32_t p) +{ + shim_write(SHIM_IPCDL, p); + shim_write(SHIM_IPCDH, SHIM_IPCDH_BUSY); } /* Platform defined trace code */ diff --git a/src/platform/cannonlake/include/platform/platform.h b/src/platform/cannonlake/include/platform/platform.h index 35219d7..9474103 100644 --- a/src/platform/cannonlake/include/platform/platform.h +++ b/src/platform/cannonlake/include/platform/platform.h @@ -34,6 +34,8 @@ #ifndef __PLATFORM_PLATFORM_H__ #define __PLATFORM_PLATFORM_H__ +#include <sof/platform.h> +#include <platform/platcfg.h> #include <platform/shim.h> #include <platform/interrupt.h> #include <uapi/ipc.h> @@ -116,17 +118,15 @@ struct sof; #define PLATFORM_IDLE_TIME 750000 /* Platform defined trace code */ -#define platform_panic(__x) { \ - mailbox_sw_reg_write(SRAM_REG_FW_STATUS, \ - (0xdead000 | (__x)) & 0x3fffffff); \ - ipc_write(IPC_DIPCIDD, MAILBOX_EXCEPTION_OFFSET + 2 * 0x20000); \ - ipc_write(IPC_DIPCIDR, 0x80000000 | \ - ((0xdead000 | (__x)) & 0x3fffffff)); \ +static inline void platform_panic(uint32_t p) +{ + sw_reg_write(SRAM_REG_FW_STATUS, p & 0x3fffffff); + ipc_write(IPC_DIPCIDR, 0x80000000 | (p & 0x3fffffff)); } /* Platform defined trace code */ #define platform_trace_point(__x) \ - mailbox_sw_reg_write(SRAM_REG_FW_TRACEP, (__x)) + sw_reg_write(SRAM_REG_FW_TRACEP, __x) extern struct timer *platform_timer; diff --git a/src/platform/haswell/include/platform/platform.h b/src/platform/haswell/include/platform/platform.h index d30f329..426f538 100644 --- a/src/platform/haswell/include/platform/platform.h +++ b/src/platform/haswell/include/platform/platform.h @@ -101,9 +101,9 @@ struct sof; #define PLATFORM_IDLE_TIME 750000 /* Platform defined panic code */ -#define platform_panic(__x) { \ - shim_write(SHIM_IPCX, MAILBOX_EXCEPTION_OFFSET & 0x3fffffff); \ - shim_write(SHIM_IPCD, (SHIM_IPCD_BUSY | 0xdead000 | __x)); \ +static inline void platform_panic(uint32_t p) +{ + shim_write(SHIM_IPCD, (SHIM_IPCD_BUSY | p)) } /* Platform defined trace code */ -- 2.17.0

1 1