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

[Sound-open-firmware] [PATCH 1/4] [RFC]DMIC: Add PDM microphones (DMIC) support to DAI
by Seppo Ingalsuo 07 May '18

07 May '18

This patch adds the DMIC audio capture driver for SOF DAI component use. The DMIC feature allows to directly attach one to (typically) four PDM digital microphones into Intel SoC without a separate codec IC. This is supported by APL and most successor platforms. Corresponding patches are needed for kernel driver and topology to enable this feature. Tested in APL UP squared board without connected microphones SOF git master 3ad69eb715a09de9a0b91c56c9cca8a79ead00a9 Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo(a)linux.intel.com> --- configure.ac | 6 + src/audio/dai.c | 5 + src/drivers/Makefile.am | 6 +- src/drivers/dmic.c | 1331 +++++++++++++++++++++++++++++++++++++++++++++++ src/include/sof/dmic.h | 318 +++++++++++ src/include/sof/io.h | 8 + src/include/sof/trace.h | 3 +- src/include/uapi/ipc.h | 61 ++- 8 files changed, 1734 insertions(+), 4 deletions(-) create mode 100644 src/drivers/dmic.c create mode 100644 src/include/sof/dmic.h diff --git a/configure.ac b/configure.ac index d67c154..49e58a5 100644 --- a/configure.ac +++ b/configure.ac @@ -44,6 +44,12 @@ if test "$have_rimage" = "yes"; then fi AM_CONDITIONAL(BUILD_RIMAGE, test "$have_rimage" = "yes") +# Disable DMIC driver if requested, by default build for supported platforms +AC_ARG_ENABLE([dmic], AS_HELP_STRING([--disable-dmic], [Disable DMIC driver])) +AS_IF([test "x$enable_dmic" != "xno"], [ + AC_DEFINE([CONFIG_DMIC], [1], [Configure to build DMIC driver]) +]) + # Architecture support AC_ARG_WITH([arch], AS_HELP_STRING([--with-arch], [Specify DSP architecture]), diff --git a/src/audio/dai.c b/src/audio/dai.c index 7905665..1eeecd2 100644 --- a/src/audio/dai.c +++ b/src/audio/dai.c @@ -639,6 +639,11 @@ static int dai_config(struct comp_dev *dev, struct sof_ipc_dai_config *config) break; } break; + case SOF_DAI_INTEL_DMIC: + /* TODO: No hardwired values here. */ + dd->config.burst_elems = 2; + dev->frame_bytes = 8; + break; default: /* other types of DAIs not handled for now */ trace_dai_error("de2"); diff --git a/src/drivers/Makefile.am b/src/drivers/Makefile.am index 99232a3..5d0c5b3 100644 --- a/src/drivers/Makefile.am +++ b/src/drivers/Makefile.am @@ -13,12 +13,14 @@ endif if BUILD_APOLLOLAKE libdrivers_a_SOURCES += \ - hda-dma.c + hda-dma.c \ + dmic.c endif if BUILD_CANNONLAKE libdrivers_a_SOURCES += \ - hda-dma.c + hda-dma.c \ + dmic.c endif libdrivers_a_CFLAGS = \ diff --git a/src/drivers/dmic.c b/src/drivers/dmic.c new file mode 100644 index 0000000..d6b623b --- /dev/null +++ b/src/drivers/dmic.c @@ -0,0 +1,1331 @@ +/* + * Copyright (c) 2017, 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: Seppo Ingalsuo <seppo.ingalsuo(a)linux.intel.com> + */ + +#include <sof/stream.h> +#include <sof/dmic.h> +#include <sof/interrupt.h> +#include <sof/math/numbers.h> +#include <sof/audio/format.h> + +#if defined DMIC_HW_VERSION + +#include <sof/audio/coefficients/pdm_decim/pdm_decim_table.h> + +#if defined MODULE_TEST +#include <stdio.h> +#endif + +#define DMIC_MAX_MODES 45 + +/* HW FIR pipeline needs 5 additional cycles per channel for internal + * operations. This is used in MAX filter length check. + */ +#define DMIC_FIR_PIPELINE_OVERHEAD 5 + +/* Force a 48 kHz config while kernel driver IPC is under construction. Remove + * or undefine when it's available. + */ +#define DMIC_FORCE_CONFIG + +struct decim_modes { + int clkdiv[DMIC_MAX_MODES]; + int mcic[DMIC_MAX_MODES]; + int mfir[DMIC_MAX_MODES]; + int num_of_modes; +}; + +struct matched_modes { + int clkdiv[DMIC_MAX_MODES]; + int mcic[DMIC_MAX_MODES]; + int mfir_a[DMIC_MAX_MODES]; + int mfir_b[DMIC_MAX_MODES]; + int num_of_modes; +}; + +struct dmic_configuration { + struct pdm_decim *fir_a; + struct pdm_decim *fir_b; + int clkdiv; + int mcic; + int mfir_a; + int mfir_b; + int cic_shift; + int fir_a_shift; + int fir_b_shift; + int fir_a_length; + int fir_b_length; + int32_t fir_a_scale; + int32_t fir_b_scale; +}; + +struct pdm_controllers_configuration { + uint32_t cic_control; + uint32_t cic_config; + uint32_t mic_control; + uint32_t fir_control_a; + uint32_t fir_config_a; + uint32_t dc_offset_left_a; + uint32_t dc_offset_right_a; + uint32_t out_gain_left_a; + uint32_t out_gain_right_a; + uint32_t fir_control_b; + uint32_t fir_config_b; + uint32_t dc_offset_left_b; + uint32_t dc_offset_right_b; + uint32_t out_gain_left_b; + uint32_t out_gain_right_b; +}; + +/* Configuration ABI version, increment if not compatible with previous + * version. + */ +#define DMIC_IPC_VERSION 1 + +/* Minimum OSR is always applied for 48 kHz and less sample rates */ +#define DMIC_MIN_OSR 50 + +/* These are used as guideline for configuring > 48 kHz sample rates. The + * minimum OSR can be relaxed down to 40 (use 3.84 MHz clock for 96 kHz). + */ +#define DMIC_HIGH_RATE_MIN_FS 64000 +#define DMIC_HIGH_RATE_OSR_MIN 40 + +/* Used if scaling FIR coeffcients for HW */ +#define DMIC_HW_FIR_COEF_MAX ((1 << (DMIC_HW_BITS_FIR_COEF - 1)) - 1) +#define DMIC_HW_FIR_COEF_Q (DMIC_HW_BITS_FIR_COEF - 1) + +/* tracing */ +#define trace_dmic(__e) trace_event(TRACE_CLASS_DMIC, __e) +#define trace_dmic_error(__e) trace_error(TRACE_CLASS_DMIC, __e) +#define tracev_dmic(__e) tracev_event(TRACE_CLASS_DMIC, __e) + +/* Base addresses (in PDM scope) of 2ch PDM controllers and coefficient RAM. */ +static const uint32_t base[4] = {PDM0, PDM1, PDM2, PDM3}; +static const uint32_t coef_base_a[4] = {PDM0_COEFFICIENT_A, PDM1_COEFFICIENT_A, + PDM2_COEFFICIENT_A, PDM3_COEFFICIENT_A}; +static const uint32_t coef_base_b[4] = {PDM0_COEFFICIENT_B, PDM1_COEFFICIENT_B, + PDM2_COEFFICIENT_B, PDM3_COEFFICIENT_B}; + +#if defined MODULE_TEST +#define IO_BYTES_GLOBAL (PDM0 - OUTCONTROL0) +#define IO_BYTES_MIDDLE (PDM1 - PDM0) +#define IO_BYTES_LAST (PDM0_COEFFICIENT_B + PDM_COEF_RAM_B_LENGTH - PDM0) +#define IO_BYTES (((DMIC_HW_CONTROLLERS) - 1) * (IO_BYTES_MIDDLE) \ + + (IO_BYTES_LAST) + (IO_BYTES_GLOBAL)) +#define IO_LENGTH ((IO_BYTES) >> 2) + +static uint32_t dmic_io[IO_LENGTH]; + +static void dmic_write(struct dai *dai, uint32_t reg, uint32_t value) +{ + printf("W %04x %08x\n", reg, value); + dmic_io[reg >> 2] = value; +} + +static uint32_t dmic_read(struct dai *dai, uint32_t reg) +{ + uint32_t value = dmic_io[reg >> 2]; + + printf("R %04x %08x\n", reg, value); + return value; +} + +static void dmic_update_bits(struct dai *dai, uint32_t reg, uint32_t mask, + uint32_t value) +{ + uint32_t new_value; + uint32_t old_value = dmic_io[reg >> 2]; + + new_value = (old_value & (~mask)) | value; + dmic_io[reg >> 2] = new_value; + printf("W %04x %08x\n", reg, new_value); +} +#else + +static void dmic_write(struct dai *dai, uint32_t reg, uint32_t value) +{ + io_reg_write(dai_base(dai) + reg, value); +} + +static uint32_t dmic_read(struct dai *dai, uint32_t reg) +{ + return io_reg_read(dai_base(dai) + reg); +} + +static void dmic_update_bits(struct dai *dai, uint32_t reg, uint32_t mask, + uint32_t value) +{ + io_reg_update_bits(dai_base(dai) + reg, mask, value); +} +#endif + +/* This function returns a raw list of potential microphone clock and decimation + * modes for achieving requested sample rates. The search is constrained by + * decimation HW capabililies and setup parameters. The parameters such as + * microphone clock min/max and duty cycle requirements need be checked from + * used microphone component datasheet. + */ +static void find_modes(struct decim_modes *modes, + struct sof_ipc_dai_dmic_params *prm, uint32_t fs) +{ + int clkdiv_min; + int clkdiv_max; + int clkdiv; + int c1; + int c2; + int du_min; + int du_max; + int pdmclk; + int osr; + int mfir; + int mcic; + int ioclk_test; + int osr_min = DMIC_MIN_OSR; + int i = 0; + + /* Defaults, empty result */ + modes->num_of_modes = 0; + + /* The FIFO is not requested if sample rate is set to zero. Just + * return in such case with num_of_modes as zero. + */ + if (fs == 0) + return; + + /* Override DMIC_MIN_OSR for very high sample rates, use as minimum + * the nominal clock for the high rates. + */ + if (fs >= DMIC_HIGH_RATE_MIN_FS) + osr_min = DMIC_HIGH_RATE_OSR_MIN; + + /* Check for sane pdm clock, min 100 kHz, max ioclk/2 */ + if (prm->pdmclk_max < DMIC_HW_PDM_CLK_MIN || + prm->pdmclk_max > DMIC_HW_IOCLK / 2) { + trace_dmic_error("pmx"); + return; + } + if (prm->pdmclk_min < DMIC_HW_PDM_CLK_MIN || + prm->pdmclk_min > prm->pdmclk_max) { + trace_dmic_error("pmn"); + return; + } + + /* Check for sane duty cycle */ + if (prm->duty_min > prm->duty_max) { + trace_dmic_error("pdu"); + return; + } + if (prm->duty_min < DMIC_HW_DUTY_MIN || + prm->duty_min > DMIC_HW_DUTY_MAX) { + trace_dmic_error("pdn"); + return; + } + if (prm->duty_max < DMIC_HW_DUTY_MIN || + prm->duty_max > DMIC_HW_DUTY_MAX) { + trace_dmic_error("pdx"); + return; + } + + /* Min and max clock dividers */ + clkdiv_min = ceil_divide(DMIC_HW_IOCLK, prm->pdmclk_max); + clkdiv_min = MAX(clkdiv_min, DMIC_HW_CIC_DECIM_MIN); + clkdiv_max = DMIC_HW_IOCLK / prm->pdmclk_min; + + /* Loop possible clock dividers and check based on resulting + * oversampling ratio that CIC and FIR decimation ratios are + * feasible. The ratios need to be integers. Also the mic clock + * duty cycle need to be within limits. + */ + for (clkdiv = clkdiv_min; clkdiv <= clkdiv_max; clkdiv++) { + c1 = clkdiv >> 1; + c2 = clkdiv - c1; + du_min = 100 * c1 / clkdiv; + du_max = 100 * c2 / clkdiv; + pdmclk = DMIC_HW_IOCLK / clkdiv; + osr = pdmclk / fs; + + /* Check that OSR constraints is met and clock duty cycle does + * not exceed microphone specification. If exceed proceed to + * next clkdiv. + */ + if (osr < osr_min || du_min < prm->duty_min || + du_max > prm->duty_max) + continue; + + /* Loop FIR decimation factors candidates. If the + * integer divided decimation factors and clock dividers + * as multiplied with sample rate match the IO clock + * rate the division was exact and such decimation mode + * is possible. Then check that CIC decimation constraints + * are met. The passed decimation modes are added to array. + */ + for (mfir = DMIC_HW_FIR_DECIM_MIN; + mfir <= DMIC_HW_FIR_DECIM_MAX; mfir++) { + mcic = osr / mfir; + ioclk_test = fs * mfir * mcic * clkdiv; + + if (ioclk_test == DMIC_HW_IOCLK && + mcic >= DMIC_HW_CIC_DECIM_MIN && + mcic <= DMIC_HW_CIC_DECIM_MAX && + i < DMIC_MAX_MODES) { + modes->clkdiv[i] = clkdiv; + modes->mcic[i] = mcic; + modes->mfir[i] = mfir; + i++; + modes->num_of_modes = i; + } + } + } +} + +/* The previous raw modes list contains sane configuration possibilities. When + * there is request for both FIFOs A and B operation this function returns + * list of compatible settings. + */ +static void match_modes(struct matched_modes *c, struct decim_modes *a, + struct decim_modes *b) +{ + int idx[DMIC_MAX_MODES]; + int idx_length; + int i; + int n; + int m; + + /* Check if previous search got results. */ + c->num_of_modes = 0; + if (a->num_of_modes == 0 && b->num_of_modes == 0) { + /* Nothing to do */ + return; + } + + /* Check for request only for FIFO A or B. In such case pass list for + * A or B as such. + */ + if (b->num_of_modes == 0) { + c->num_of_modes = a->num_of_modes; + for (i = 0; i < a->num_of_modes; i++) { + c->clkdiv[i] = a->clkdiv[i]; + c->mcic[i] = a->mcic[i]; + c->mfir_a[i] = a->mfir[i]; + c->mfir_b[i] = 0; + } + return; + } + + if (a->num_of_modes == 0) { + c->num_of_modes = b->num_of_modes; + for (i = 0; i < b->num_of_modes; i++) { + c->clkdiv[i] = b->clkdiv[i]; + c->mcic[i] = b->mcic[i]; + c->mfir_b[i] = b->mfir[i]; + c->mfir_a[i] = 0; + } + return; + } + + /* Merge a list of compatible modes */ + i = 0; + for (n = 0; n < a->num_of_modes; n++) { + /* Find all indices of values a->clkdiv[n] in b->clkdiv[] */ + idx_length = find_equal(idx, b->clkdiv, a->clkdiv[n], + b->num_of_modes, 0); + for (m = 0; m < idx_length; m++) { + if (b->mcic[idx[m]] == a->mcic[n]) { + c->clkdiv[i] = a->clkdiv[n]; + c->mcic[i] = a->mcic[n]; + c->mfir_a[i] = a->mfir[n]; + c->mfir_b[i] = b->mfir[idx[m]]; + i++; + } + } + c->num_of_modes = i; + } +} + +/* Finds a suitable FIR decimation filter from the included set */ +static struct pdm_decim *get_fir(struct dmic_configuration *cfg, int mfir) +{ + int i; + int fs; + int cic_fs; + int fir_max_length; + struct pdm_decim *fir = NULL; + + if (mfir <= 0) + return fir; + + cic_fs = DMIC_HW_IOCLK / cfg->clkdiv / cfg->mcic; + fs = cic_fs / mfir; + /* FIR max. length depends on available cycles and coef RAM + * length. Exceeding this length sets HW overrun status and + * overwrite of other register. + */ + fir_max_length = MIN(DMIC_HW_FIR_LENGTH_MAX, + DMIC_HW_IOCLK / fs / 2 - DMIC_FIR_PIPELINE_OVERHEAD); + + for (i = 0; i < DMIC_FIR_LIST_LENGTH; i++) { + if (fir_list[i]->decim_factor == mfir && + fir_list[i]->length <= fir_max_length) { + /* Store pointer, break from loop to avoid a + * Possible other mode with lower FIR length. + */ + fir = fir_list[i]; + break; + } + } + + return fir; +} + +/* Calculate scale and shift to use for FIR coefficients. Scale is applied + * before write to HW coef RAM. Shift will be programmed to HW register. + */ +static int fir_coef_scale(int32_t *fir_scale, int *fir_shift, int add_shift, + const int32_t coef[], int coef_length, int32_t gain) +{ + int32_t amax; + int32_t new_amax; + int32_t new_scale; + int32_t fir_gain; + int shift; + const int32_t coef_max_val = Q_CONVERT_FLOAT(0.9999, 20); /* Q1.20 */ + + /* Multiply gain passed from CIC with output full scale, result Q4.20 */ + fir_gain = Q_MULTSR_32X32((int64_t)gain, DMIC_HW_SENS_Q23, 20, 23, 20); + + /* Find the largest FIR coefficient value */ + amax = find_max_abs_int32((int32_t *)coef, coef_length); + + /* Scale with FIR gain */ + new_amax = Q_MULTSR_32X32((int64_t)amax, fir_gain, 31, 20, 20); + if (new_amax <= 0) + return -EINVAL; + + /* Needed scale for FIR taps, target is 0.9999 max */ + new_scale = (int32_t)((((int64_t)coef_max_val << 20)) / new_amax); + + /* Find shift value */ + if (new_scale == 0) + return -EINVAL; + + shift = 0; + while ((new_scale << shift) < (1 << 20)) + shift++; + + /* Add to shift in storate Q31 format and store to configuration */ + *fir_shift = shift + add_shift; + + /* Compensate shift value to scale and store to configuration + * as Q1.31. Also apply raw 32 bit to actual HW FIR coef + * precision. + */ + *fir_scale = (fir_gain >> shift); + return 0; +} + +/* This function selects with a simple criteria one mode to set up the + * decimator. For the settings chosen for FIFOs A and B output a lookup + * is done for FIR coefficients from the included coefficients tables. + * For some decimation factors there may be several length coefficient sets. + * It is due to possible restruction of decimation engine cycles per given + * sample rate. If the coefficients length is exceeded the lookup continues. + * Therefore the list of coefficient set must present the filters for a + * decimation factor in decreasing length order. + * + * Note: If there is no filter available an error is returned. The parameters + * should be reviewed for such case. If still a filter is missing it should be + * added into the included set. FIR decimation with a high factor usually + * needs compromizes into specifications and is not desirable. + */ +static int select_mode(struct dmic_configuration *cfg, + struct matched_modes *modes) +{ + int32_t g_cic; + int32_t g_tmp; + int32_t fir_in_max; + int32_t cic_out_max; + int32_t gain_to_fir; + int idx[DMIC_MAX_MODES]; + int n = 1; + int mmin; + int count; + int *mfir; + int mcic; + int bits_cic; + int ret; + + /* If there are more than one possibilities select a mode with lowest + * FIR decimation factor. If there are several select mode with highest + * ioclk divider to minimize microphone power consumption. The highest + * clock divisors are in the end of list so select the last of list. + * The minimum OSR criteria used in previous ensures that quality in + * the candidates should be sufficient. + */ + if (modes->num_of_modes == 0) { + trace_dmic_error("nom"); + return -EINVAL; + } + + if (modes->mfir_a[0] > 0) + mfir = modes->mfir_a; + else + mfir = modes->mfir_b; + + mmin = find_min(mfir, modes->num_of_modes); + count = find_equal(idx, mfir, mmin, modes->num_of_modes, 0); + n = idx[count - 1]; + + /* Get microphone clock and decimation parameters for used mode from + * the list. + */ + cfg->clkdiv = modes->clkdiv[n]; + cfg->mfir_a = modes->mfir_a[n]; + cfg->mfir_b = modes->mfir_b[n]; + cfg->mcic = modes->mcic[n]; + cfg->fir_a = NULL; + cfg->fir_b = NULL; + + /* Find raw FIR coefficients to match the decimation foctors of FIR + * A and B. + */ + if (cfg->mfir_a > 0) { + cfg->fir_a = get_fir(cfg, cfg->mfir_a); + if (!cfg->fir_a) { + trace_dmic_error("fam"); + trace_value(cfg->mfir_a); + return -EINVAL; + } + } + + if (cfg->mfir_b > 0) { + cfg->fir_b = get_fir(cfg, cfg->mfir_b); + if (!cfg->fir_b) { + trace_dmic_error("fbm"); + trace_value(cfg->mfir_b); + return -EINVAL; + } + } + + /* Calculate CIC shift from the decimation factor specific gain. + */ + mcic = cfg->mcic; + g_cic = mcic * mcic * mcic * mcic * mcic; + g_tmp = g_cic; + bits_cic = 1; + if (g_tmp < 0) { + /* Erroneus decimation factor and CIC gain */ + trace_dmic_error("gci"); + return -EINVAL; + } + while (g_tmp > 0) { + g_tmp = g_tmp >> 1; + bits_cic++; + } + cfg->cic_shift = bits_cic - DMIC_HW_BITS_FIR_INPUT; + + /* Calculate remaining gain to FIR as Q4.20. */ + fir_in_max = (1 << (DMIC_HW_BITS_FIR_INPUT - 1)); + if (cfg->cic_shift >= 0) + cic_out_max = g_cic >> cfg->cic_shift; + else + cic_out_max = g_cic << -cfg->cic_shift; + + gain_to_fir = (int32_t)((((int64_t) fir_in_max) << 20) / cic_out_max); + + /* Calculate FIR scale and shift */ + if (cfg->mfir_a > 0) { + cfg->fir_a_length = cfg->fir_a->length; + ret = fir_coef_scale(&cfg->fir_a_scale, &cfg->fir_a_shift, + cfg->fir_a->shift, cfg->fir_a->coef, cfg->fir_a->length, + gain_to_fir); + if (ret < 0) { + /* Invalid coefficient set found, should not happen. */ + trace_dmic_error("ina"); + return -EINVAL; + } + } else { + cfg->fir_a_scale = 0; + cfg->fir_a_shift = 0; + cfg->fir_a_length = 0; + } + + if (cfg->mfir_b > 0) { + cfg->fir_b_length = cfg->fir_b->length; + ret = fir_coef_scale(&cfg->fir_b_scale, &cfg->fir_b_shift, + cfg->fir_b->shift, cfg->fir_b->coef, cfg->fir_b->length, + gain_to_fir); + if (ret < 0) { + /* Invalid coefficient set found, should not happen. */ + trace_dmic_error("inb"); + return -EINVAL; + } + } else { + cfg->fir_b_scale = 0; + cfg->fir_b_shift = 0; + cfg->fir_b_length = 0; + } + + return 0; +} + +/* The FIFO input packer mode (IPM) settings are somewhat different in + * HW versions. This helper function returns a suitable IPM bit field + * value to use. + */ +#if DMIC_HW_VERSION == 1 + +static inline void ipm_helper(int *ipm, int stereo[], int swap[], + struct sof_ipc_dai_dmic_params *dmic) +{ + int pdm[DMIC_HW_CONTROLLERS]; + int i; + + /* Loop number of PDM controllers in the configuration. If mic A + * or B is enabled then a pdm controller is marked as active. Also it + * is checked whether the controller should operate as stereo or mono + * left (A) or mono right (B) mode. Mono right mode is setup as channel + * swapped mono left. + */ + for (i = 0; i < dmic->number_of_pdm_controllers; i++) { + if (dmic->pdm[i].enable_mic_a > 0 || + dmic->pdm[i].enable_mic_b > 0) + pdm[i] = 1; + else + pdm[i] = 0; + + if (dmic->pdm[i].enable_mic_a > 0 && + dmic->pdm[i].enable_mic_b > 0) { + stereo[i] = 1; + swap[i] = 0; + } else { + stereo[i] = 0; + if (dmic->pdm[i].enable_mic_a == 0) + swap[i] = 1; + else + swap[i] = 0; + } + } + + /* IPM indicates active pdm controllers. */ + *ipm = 0; + + if (pdm[0] == 0 && pdm[1] > 0) + *ipm = 1; + + if (pdm[0] > 0 && pdm[1] > 0) + *ipm = 2; +} +#endif + +#if DMIC_HW_VERSION == 2 + +static inline void source_ipm_helper(int source[], int *ipm, int stereo[], + int swap[], struct sof_ipc_dai_dmic_params *dmic) +{ + int pdm[DMIC_HW_CONTROLLERS]; + int i; + int n = 0; + + /* Loop number of PDM controllers in the configuration. If mic A + * or B is enabled then a pdm controller is marked as active. Also it + * is checked whether the controller should operate as stereo or mono + * left (A) or mono right (B) mode. Mono right mode is setup as channel + * swapped mono left. The function returns also in array source[] the + * indice of enabled pdm controllers to be used for IPM configuration. + */ + for (i = 0; i < dmic->number_of_pdm_controllers; i++) { + if (dmic->pdm[i].enable_mic_a > 0 || + dmic->pdm[i].enable_mic_b > 0) { + pdm[i] = 1; + source[n] = i; + n++; + } else { + pdm[i] = 0; + swap[i] = 0; + } + + if (dmic->pdm[i].enable_mic_a > 0 && + dmic->pdm[i].enable_mic_b > 0) { + stereo[i] = 1; + swap[i] = 0; + } else { + stereo[i] = 0; + if (dmic->pdm[i].enable_mic_a == 0) + swap[i] = 1; + else + swap[i] = 0; + } + } + + /* IPM bit field is set to count of active pdm controllers. */ + *ipm = pdm[0]; + for (i = 0; i < dmic->number_of_pdm_controllers; i++) + *ipm += pdm[i]; +} +#endif + +static int configure_registers(struct dai *dai, struct dmic_configuration *cfg, + struct sof_ipc_dai_dmic_params *dmic) +{ + int stereo[DMIC_HW_CONTROLLERS]; + int swap[DMIC_HW_CONTROLLERS]; + uint32_t val; + int32_t ci; + uint32_t cu; + int ipm; + int of0; + int of1; + int fir_decim; + int fir_length; + int length; + int edge; + int dccomp; + int cic_start_a; + int cic_start_b; + int fir_start_a; + int fir_start_b; + int soft_reset; + int i; + int j; + + struct dmic_pdata *pdata = dai_get_drvdata(dai); + int array_a = 0; + int array_b = 0; + int cic_mute = 0; + int fir_mute = 0; + int bfth = 1; /* Should be 3 for 8 entries, 1 is 2 entries */ + int th = 0; /* Used with TIE=1 */ + + /* Normal start sequence */ + dccomp = 1; + soft_reset = 1; + cic_start_a = 0; + cic_start_b = 0; + fir_start_a = 0; + fir_start_b = 0; + +#if DMIC_HW_VERSION == 2 + int source[4] = {0, 0, 0, 0}; +#endif + + /* pdata is set by dmic_probe(), error if it has not been set */ + if (!pdata) { + trace_dmic_error("cfr"); + return -EINVAL; + } + + /* Sanity checks */ + if (dmic->number_of_pdm_controllers > DMIC_HW_CONTROLLERS) { + trace_dmic_error("num"); + return -EINVAL; + } + + /* OUTCONTROL0 and OUTCONTROL1 */ + trace_dmic("reg"); + of0 = (dmic->fifo_bits_a == 32) ? 2 : 0; + of1 = (dmic->fifo_bits_b == 32) ? 2 : 0; + +#if DMIC_HW_VERSION == 1 + ipm_helper(&ipm, stereo, swap, dmic); + val = OUTCONTROL0_TIE(0) | + OUTCONTROL0_SIP(0) | + OUTCONTROL0_FINIT(1) | + OUTCONTROL0_FCI(0) | + OUTCONTROL0_BFTH(bfth) | + OUTCONTROL0_OF(of0) | + OUTCONTROL0_IPM(ipm) | + OUTCONTROL0_TH(th); + dmic_write(dai, OUTCONTROL0, val); + trace_value(val); + + val = OUTCONTROL1_TIE(0) | + OUTCONTROL1_SIP(0) | + OUTCONTROL1_FINIT(1) | + OUTCONTROL1_FCI(0) | + OUTCONTROL1_BFTH(bfth) | + OUTCONTROL1_OF(of1) | + OUTCONTROL1_IPM(ipm) | + OUTCONTROL1_TH(th); + dmic_write(dai, OUTCONTROL1, val); + trace_value(val); +#endif + +#if DMIC_HW_VERSION == 2 + source_ipm_helper(source, &ipm, stereo, swap, dmic); + val = OUTCONTROL0_TIE(0) | + OUTCONTROL0_SIP(0) | + OUTCONTROL0_FINIT(1) | + OUTCONTROL0_FCI(0) | + OUTCONTROL0_BFTH(3) | + OUTCONTROL0_OF(of0) | + OUTCONTROL0_NUMBER_OF_DECIMATORS(ipm) | + OUTCONTROL0_IPM_SOURCE_1(source[0]) | + OUTCONTROL0_IPM_SOURCE_2(source[1]) | + OUTCONTROL0_IPM_SOURCE_3(source[2]) | + OUTCONTROL0_IPM_SOURCE_4(source[3]) | + OUTCONTROL0_TH(3); + dmic_write(dai, OUTCONTROL0, val); + trace_value(val); + + val = OUTCONTROL1_TIE(0) | + OUTCONTROL1_SIP(0) | + OUTCONTROL1_FINIT(1) | + OUTCONTROL1_FCI(0) | + OUTCONTROL1_BFTH(3) | + OUTCONTROL1_OF(of1) | + OUTCONTROL1_NUMBER_OF_DECIMATORS(ipm) | + OUTCONTROL1_IPM_SOURCE_1(source[0]) | + OUTCONTROL1_IPM_SOURCE_2(source[1]) | + OUTCONTROL1_IPM_SOURCE_3(source[2]) | + OUTCONTROL1_IPM_SOURCE_4(source[3]) | + OUTCONTROL1_TH(3); + dmic_write(dai, OUTCONTROL1, val); + trace_value(val); +#endif + + /* Mark enabled microphones into private data to be later used + * for starting correct parts of the HW. + */ + for (i = 0; i < DMIC_HW_CONTROLLERS; i++) { + pdata->enable[i] = (dmic->pdm[i].enable_mic_b << 1) | + dmic->pdm[i].enable_mic_a; + } + + for (i = 0; i < DMIC_HW_CONTROLLERS; i++) { + /* CIC */ + val = CIC_CONTROL_SOFT_RESET(soft_reset) | + CIC_CONTROL_CIC_START_B(cic_start_b) | + CIC_CONTROL_CIC_START_A(cic_start_a) | + CIC_CONTROL_MIC_B_POLARITY(dmic->pdm[i].polarity_mic_a) | + CIC_CONTROL_MIC_A_POLARITY(dmic->pdm[i].polarity_mic_b) | + CIC_CONTROL_MIC_MUTE(cic_mute) | + CIC_CONTROL_STEREO_MODE(stereo[i]); + dmic_write(dai, base[i] + CIC_CONTROL, val); + trace_value(val); + + val = CIC_CONFIG_CIC_SHIFT(cfg->cic_shift + 8) | + CIC_CONFIG_COMB_COUNT(cfg->mcic - 1); + dmic_write(dai, base[i] + CIC_CONFIG, val); + trace_value(val); + + /* Mono right channel mic usage requires swap of PDM channels + * since the mono decimation is done with only left channel + * processing active. + */ + edge = dmic->pdm[i].clk_edge; + if (swap[i]) + edge = edge ^ 1; + + val = MIC_CONTROL_PDM_CLKDIV(cfg->clkdiv - 2) | + MIC_CONTROL_PDM_SKEW(dmic->pdm[i].skew) | + MIC_CONTROL_CLK_EDGE(edge) | + MIC_CONTROL_PDM_EN_B(cic_start_b) | + MIC_CONTROL_PDM_EN_A(cic_start_a); + dmic_write(dai, base[i] + MIC_CONTROL, val); + trace_value(val); + + /* FIR A */ + fir_decim = MAX(cfg->mfir_a - 1, 0); + fir_length = MAX(cfg->fir_a_length - 1, 0); + val = FIR_CONTROL_A_START(fir_start_a) | + FIR_CONTROL_A_ARRAY_START_EN(array_a) | + FIR_CONTROL_A_DCCOMP(dccomp) | + FIR_CONTROL_A_MUTE(fir_mute) | + FIR_CONTROL_A_STEREO(stereo[i]); + dmic_write(dai, base[i] + FIR_CONTROL_A, val); + trace_value(val); + + val = FIR_CONFIG_A_FIR_DECIMATION(fir_decim) | + FIR_CONFIG_A_FIR_SHIFT(cfg->fir_a_shift) | + FIR_CONFIG_A_FIR_LENGTH(fir_length); + dmic_write(dai, base[i] + FIR_CONFIG_A, val); + trace_value(val); + + val = DC_OFFSET_LEFT_A_DC_OFFS(DCCOMP_TC0); + dmic_write(dai, base[i] + DC_OFFSET_LEFT_A, val); + trace_value(val); + + val = DC_OFFSET_RIGHT_A_DC_OFFS(DCCOMP_TC0); + dmic_write(dai, base[i] + DC_OFFSET_RIGHT_A, val); + trace_value(val); + + val = OUT_GAIN_LEFT_A_GAIN(0); + dmic_write(dai, base[i] + OUT_GAIN_LEFT_A, val); + trace_value(val); + + val = OUT_GAIN_RIGHT_A_GAIN(0); + dmic_write(dai, base[i] + OUT_GAIN_RIGHT_A, val); + trace_value(val); + + /* FIR B */ + fir_decim = MAX(cfg->mfir_b - 1, 0); + fir_length = MAX(cfg->fir_b_length - 1, 0); + val = FIR_CONTROL_B_START(fir_start_b) | + FIR_CONTROL_B_ARRAY_START_EN(array_b) | + FIR_CONTROL_B_DCCOMP(dccomp) | + FIR_CONTROL_B_MUTE(fir_mute) | + FIR_CONTROL_B_STEREO(stereo[i]); + dmic_write(dai, base[i] + FIR_CONTROL_B, val); + trace_value(val); + + val = FIR_CONFIG_B_FIR_DECIMATION(fir_decim) | + FIR_CONFIG_B_FIR_SHIFT(cfg->fir_b_shift) | + FIR_CONFIG_B_FIR_LENGTH(fir_length); + dmic_write(dai, base[i] + FIR_CONFIG_B, val); + trace_value(val); + + val = DC_OFFSET_LEFT_B_DC_OFFS(DCCOMP_TC0); + dmic_write(dai, base[i] + DC_OFFSET_LEFT_B, val); + trace_value(val); + trace_value(val); + + val = DC_OFFSET_RIGHT_B_DC_OFFS(DCCOMP_TC0); + dmic_write(dai, base[i] + DC_OFFSET_RIGHT_B, val); + trace_value(val); + + val = OUT_GAIN_LEFT_B_GAIN(0); + dmic_write(dai, base[i] + OUT_GAIN_LEFT_B, val); + trace_value(val); + + val = OUT_GAIN_RIGHT_B_GAIN(0); + dmic_write(dai, base[i] + OUT_GAIN_RIGHT_B, val); + trace_value(val); + + /* Write coef RAM A with scaled coefficient in reverse order */ + length = cfg->fir_a_length; + for (j = 0; j < length; j++) { + ci = (int32_t)Q_MULTSR_32X32( + (int64_t)cfg->fir_a->coef[j], + cfg->fir_a_scale, 31, 20, DMIC_HW_FIR_COEF_Q); + cu = FIR_COEF_A(ci); + dmic_write(dai, coef_base_a[i] + + ((length - j - 1) << 2), cu); + } + + /* Write coef RAM B with scaled coefficient in reverse order */ + length = cfg->fir_b_length; + for (j = 0; j < length; j++) { + ci = (int32_t)Q_MULTSR_32X32( + (int64_t)cfg->fir_b->coef[j], + cfg->fir_b_scale, 31, 20, DMIC_HW_FIR_COEF_Q); + cu = FIR_COEF_B(ci); + dmic_write(dai, coef_base_b[i] + + ((length - j - 1) << 2), cu); + } + } + + /* Function dmic_start() uses these to start the used FIFOs */ + if (cfg->mfir_a > 0) + pdata->fifo_a = 1; + else + pdata->fifo_a = 0; + + if (cfg->mfir_b > 0) + pdata->fifo_b = 1; + else + pdata->fifo_b = 0; + + return 0; +} + +static int dmic_set_config(struct dai *dai, struct sof_ipc_dai_config *config) +{ + struct decim_modes modes_a; + struct decim_modes modes_b; + struct matched_modes modes_ab; + struct dmic_configuration cfg; + int ret; + struct sof_ipc_dai_dmic_params *prm = &config->dmic; + struct dmic_pdata *dmic = dai_get_drvdata(dai); + + trace_dmic("dsc"); + +#if defined DMIC_FORCE_CONFIG + /* This is a temporary workaound to set parameters while + * there is no driver and topology scripts support to + * set these. Also the PCM sample format(s) and sample rate(s) + * setting would be better to be common with other DAI types. + */ + prm->driver_ipc_version = 1; + prm->pdmclk_min = 768000; /* Min 768 kHz */ + prm->pdmclk_max = 4800000; /* Max 4.80 MHz */ + prm->fifo_fs_a = 48000; + prm->fifo_fs_b = 0; + prm->fifo_bits_a = 32; + prm->fifo_bits_b = 0; + prm->duty_min = 40; /* Min. 40% */ + prm->duty_max = 60; /* Max. 60% */ + prm->number_of_pdm_controllers = 2; + prm->pdm[0].clk_edge = 0; + prm->pdm[0].enable_mic_a = 1; /* Left */ + prm->pdm[0].enable_mic_b = 1; /* Right */ + prm->pdm[0].polarity_mic_a = 0; + prm->pdm[0].polarity_mic_b = 0; + prm->pdm[0].skew = 0; + prm->pdm[1].clk_edge = 0; + prm->pdm[1].enable_mic_a = 0; /* Left */ + prm->pdm[1].enable_mic_b = 0; /* Right */ + prm->pdm[1].polarity_mic_a = 0; + prm->pdm[1].polarity_mic_b = 0; + prm->pdm[1].skew = 0; +#endif + + trace_value(prm->driver_ipc_version); + trace_value(prm->pdmclk_min); + trace_value(prm->pdmclk_max); + trace_value(prm->fifo_fs_a); + trace_value(prm->fifo_fs_b); + trace_value(prm->fifo_bits_a); + trace_value(prm->fifo_bits_b); + trace_value(prm->duty_min); + trace_value(prm->duty_max); + trace_value(prm->number_of_pdm_controllers); + + if (prm->driver_ipc_version != DMIC_IPC_VERSION) { + trace_dmic_error("ver"); + return -EINVAL; + } + + /* Match and select optimal decimators configuration for FIFOs A and B + * paths. This setup phase is still abstract. Successful completion + * points struct cfg to FIR coefficients and contains the scale value + * to use for FIR coefficient RAM write as well as the CIC and FIR + * shift values. + */ + find_modes(&modes_a, prm, prm->fifo_fs_a); + if (modes_a.num_of_modes == 0 && prm->fifo_fs_a > 0) { + trace_dmic_error("amo"); + return -EINVAL; + } + + find_modes(&modes_b, prm, prm->fifo_fs_b); + if (modes_b.num_of_modes == 0 && prm->fifo_fs_b > 0) { + trace_dmic_error("bmo"); + return -EINVAL; + } + + match_modes(&modes_ab, &modes_a, &modes_b); + ret = select_mode(&cfg, &modes_ab); + if (ret < 0) { + trace_dmic_error("smo"); + return -EINVAL; + } + + trace_dmic("cfg"); + trace_value(cfg.clkdiv); + trace_value(cfg.mcic); + trace_value(cfg.mfir_a); + trace_value(cfg.mfir_b); + trace_value(cfg.fir_a_length); + trace_value(cfg.fir_b_length); + trace_value(cfg.cic_shift); + trace_value(cfg.fir_a_shift); + trace_value(cfg.fir_b_shift); + + /* Struct reg contains a mirror of actual HW registers. Determine + * register bits configuration from decimator configuration and the + * requested parameters. + */ + ret = configure_registers(dai, &cfg, prm); + if (ret < 0) { + trace_dmic_error("cor"); + return -EINVAL; + } + + dmic->state = COMP_STATE_PREPARE; + + return 0; +} + +/* start the DMIC for capture */ +static void dmic_start(struct dai *dai, int direction) +{ + struct dmic_pdata *dmic = dai_get_drvdata(dai); + int i; + int mic_a; + int mic_b; + int fir_a; + int fir_b; + + if (direction != DAI_DIR_CAPTURE) + return; + + /* enable port */ + spin_lock(&dmic->lock); + trace_dmic("sta"); + dmic->state = COMP_STATE_ACTIVE; + + if (dmic->fifo_a) { + trace_dmic("ffa"); + /* Clear FIFO A initialize, Enable interrupts to DSP, + * Start FIFO A packer. + */ + dmic_update_bits(dai, OUTCONTROL0, + OUTCONTROL0_FINIT_BIT | OUTCONTROL0_SIP_BIT, + OUTCONTROL0_SIP_BIT); + } + if (dmic->fifo_b) { + trace_dmic("ffb"); + /* Clear FIFO B initialize, Enable interrupts to DSP, + * Start FIFO B packer. + */ + dmic_update_bits(dai, OUTCONTROL1, + OUTCONTROL1_FINIT_BIT | OUTCONTROL1_SIP_BIT, + OUTCONTROL1_SIP_BIT); + } + + for (i = 0; i < DMIC_HW_CONTROLLERS; i++) { + mic_a = dmic->enable[i] & 1; + mic_b = (dmic->enable[i] & 2) >> 1; + if (dmic->fifo_a) + fir_a = (dmic->enable[i] > 0) ? 1 : 0; + else + fir_a = 0; + if (dmic->fifo_b) + fir_b = (dmic->enable[i] > 0) ? 1 : 0; + else + fir_b = 0; + + trace_dmic("mfn"); + trace_value(mic_a); + trace_value(mic_b); + trace_value(fir_a); + trace_value(fir_b); + + dmic_update_bits(dai, base[i] + CIC_CONTROL, + CIC_CONTROL_CIC_START_A_BIT | + CIC_CONTROL_CIC_START_B_BIT, + CIC_CONTROL_CIC_START_A(mic_a) | + CIC_CONTROL_CIC_START_B(mic_b)); + dmic_update_bits(dai, base[i] + MIC_CONTROL, + MIC_CONTROL_PDM_EN_A_BIT | + MIC_CONTROL_PDM_EN_B_BIT, + MIC_CONTROL_PDM_EN_A(mic_a) | + MIC_CONTROL_PDM_EN_B(mic_b)); + + dmic_update_bits(dai, base[i] + FIR_CONTROL_A, + FIR_CONTROL_A_START_BIT, FIR_CONTROL_A_START(fir_a)); + dmic_update_bits(dai, base[i] + FIR_CONTROL_B, + FIR_CONTROL_B_START_BIT, FIR_CONTROL_B_START(fir_b)); + } + + /* Clear soft reset for all/used PDM controllers. This should + * start capture in sync. + */ + trace_dmic("unr"); + for (i = 0; i < DMIC_HW_CONTROLLERS; i++) { + dmic_update_bits(dai, base[i] + CIC_CONTROL, + CIC_CONTROL_SOFT_RESET_BIT, 0); + } + + spin_unlock(&dmic->lock); + + /* Currently there's no DMIC HW internal mutings and wait times + * applied into this start sequence. It can be implemented here if + * start of audio capture would contain clicks and/or noise and it + * is not suppressed by gain ramp somewhere in the capture pipe. + */ + trace_dmic("run"); +} + +/* stop the DMIC for capture */ +static void dmic_stop(struct dai *dai) +{ + struct dmic_pdata *dmic = dai_get_drvdata(dai); + int i; + + trace_dmic("sto") + + spin_lock(&dmic->lock); + + /* stop Rx if we are not capturing */ + if (dmic->state != COMP_STATE_ACTIVE) { + /* Set every PDM controller to soft reset */ + trace_dmic("sre"); + for (i = 0; i < DMIC_HW_CONTROLLERS; i++) { + dmic_update_bits(dai, base[i] + CIC_CONTROL, + CIC_CONTROL_SOFT_RESET_BIT, 0); + } + + /* Stop FIFO packers and set FIFO initialize bits */ + dmic_update_bits(dai, OUTCONTROL0, + OUTCONTROL0_SIP_BIT | OUTCONTROL0_FINIT_BIT, + OUTCONTROL0_FINIT_BIT); + dmic_update_bits(dai, OUTCONTROL1, + OUTCONTROL1_SIP_BIT | OUTCONTROL1_FINIT_BIT, + OUTCONTROL1_FINIT_BIT); + + dmic->state = COMP_STATE_PREPARE; + } + + /* Set soft reset for all PDM controllers. + */ + trace_dmic("sre"); + for (i = 0; i < DMIC_HW_CONTROLLERS; i++) { + dmic_update_bits(dai, base[i] + CIC_CONTROL, + CIC_CONTROL_SOFT_RESET_BIT, CIC_CONTROL_SOFT_RESET_BIT); + } + + spin_unlock(&dmic->lock); +} + +/* save DMIC context prior to entering D3 */ +static int dmic_context_store(struct dai *dai) +{ + /* TODO: Nothing stored at the moment. Could read the registers into + * persisten memory if needed but the large coef RAM is not desirable + * to copy. It would be better to store selected mode parametesr from + * previous configuration request and re-program registers from + * scratch. + */ + return 0; +} + +/* restore DMIC context after leaving D3 */ +static int dmic_context_restore(struct dai *dai) +{ + /* Nothing restored at the moment. */ + return 0; +} + +static int dmic_trigger(struct dai *dai, int cmd, int direction) +{ + struct dmic_pdata *dmic = dai_get_drvdata(dai); + + trace_dmic("tri"); + + /* dai private is set in dmic_probe(), error if not set */ + if (!dmic) { + trace_dmic_error("trn"); + return -EINVAL; + } + + if (direction != DAI_DIR_CAPTURE) { + trace_dmic_error("cap"); + return -EINVAL; + } + + switch (cmd) { + case COMP_TRIGGER_START: + if (dmic->state == COMP_STATE_PREPARE || + dmic->state == COMP_STATE_PAUSED) { + dmic_start(dai, direction); + } else { + trace_dmic_error("cst"); + trace_value(dmic->state); + } + break; + case COMP_TRIGGER_RELEASE: + if (dmic->state == COMP_STATE_PREPARE) { + dmic_start(dai, direction); + } else { + trace_dmic_error("crl"); + trace_value(dmic->state); + } + break; + case COMP_TRIGGER_STOP: + case COMP_TRIGGER_PAUSE: + dmic->state = COMP_STATE_PAUSED; + dmic_stop(dai); + break; + case COMP_TRIGGER_RESUME: + dmic_context_restore(dai); + break; + case COMP_TRIGGER_SUSPEND: + dmic_context_store(dai); + break; + default: + break; + } + + return 0; +} + +/* TODO: No idea what should be done here. Currently only trace the + * status register that contains a few status and error bit fields. + */ +static void dmic_irq_handler(void *data) +{ + struct dai *dai = data; + uint32_t val; + + /* Trace OUTSTAT0 register */ + val = dmic_read(dai, OUTSTAT0); + trace_dmic("irq"); + + if (val & OUTSTAT0_ROR_BIT) + trace_dmic_error("eor"); /* Full fifo or PDM overrrun */ + + trace_value(dmic_read(dai, OUTSTAT0)); + + /* clear IRQ */ + platform_interrupt_clear(dmic_irq(dai), 1); +} + +static int dmic_probe(struct dai *dai) +{ + struct dmic_pdata *dmic; + + trace_dmic("pro"); + + /* allocate private data */ + dmic = rzalloc(RZONE_SYS, SOF_MEM_CAPS_RAM, sizeof(*dmic)); + dai_set_drvdata(dai, dmic); + + spinlock_init(&dmic->lock); + + /* Set state, note there is no playback direction support */ + dmic->state = COMP_STATE_READY; + + /* register our IRQ handler */ + interrupt_register(dmic_irq(dai), dmic_irq_handler, dai); + + platform_interrupt_unmask(dmic_irq(dai), 1); + interrupt_enable(dmic_irq(dai)); + + return 0; +} + +/* DMIC has no loopback support */ +static inline int dmic_set_loopback_mode(struct dai *dai, uint32_t lbm) +{ + return -EINVAL; +} + +const struct dai_ops dmic_ops = { + .trigger = dmic_trigger, + .set_config = dmic_set_config, + .pm_context_store = dmic_context_store, + .pm_context_restore = dmic_context_restore, + .probe = dmic_probe, + .set_loopback_mode = dmic_set_loopback_mode, +}; + +#endif diff --git a/src/include/sof/dmic.h b/src/include/sof/dmic.h new file mode 100644 index 0000000..d86c0a7 --- /dev/null +++ b/src/include/sof/dmic.h @@ -0,0 +1,318 @@ +/* + * Copyright (c) 2017, 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: Seppo Ingalsuo <seppo.ingalsuo(a)linux.intel.com> + */ + +#ifndef __INCLUDE_DMIC__ +#define __INCLUDE_DMIC__ + +#include <sof/dai.h> +#include <sof/io.h> + +#if defined CONFIG_DMIC + +#if defined CONFIG_APOLLOLAKE +#define DMIC_HW_VERSION 1 +#define DMIC_HW_CONTROLLERS 2 +#define DMIC_HW_IOCLK 19200000 +#endif + +#if defined CONFIG_CANNONLAKE +#define DMIC_HW_VERSION 1 +#define DMIC_HW_CONTROLLERS 2 +#define DMIC_HW_IOCLK 24000000 +#endif + +#endif + +#if defined DMIC_HW_VERSION + +/* Parameters used in modes computation */ +#define DMIC_HW_BITS_CIC 26 +#define DMIC_HW_BITS_FIR_COEF 20 +#define DMIC_HW_BITS_FIR_GAIN 20 +#define DMIC_HW_BITS_FIR_INPUT 22 +#define DMIC_HW_BITS_FIR_OUTPUT 24 +#define DMIC_HW_BITS_FIR_INTERNAL 26 +#define DMIC_HW_BITS_GAIN_OUTPUT 22 +#define DMIC_HW_FIR_LENGTH_MAX 250 +#define DMIC_HW_CIC_SHIFT_MIN -8 +#define DMIC_HW_CIC_SHIFT_MAX 4 +#define DMIC_HW_FIR_SHIFT_MIN 0 +#define DMIC_HW_FIR_SHIFT_MAX 8 +#define DMIC_HW_CIC_DECIM_MIN 5 +#define DMIC_HW_CIC_DECIM_MAX 31 /* Note: Limited by BITS_CIC */ +#define DMIC_HW_FIR_DECIM_MIN 2 +#define DMIC_HW_FIR_DECIM_MAX 20 /* Note: Practical upper limit */ +#define DMIC_HW_SENS_Q23 Q_CONVERT_FLOAT(0.95, 23) /* Q1.23 */ +#define DMIC_HW_PDM_CLK_MIN 100000 /* Note: Practical min value */ +#define DMIC_HW_DUTY_MIN 20 /* Note: Practical min value */ +#define DMIC_HW_DUTY_MAX 80 /* Note: Practical max value */ + +/* DMIC register offsets */ + +/* Global registers */ +#define OUTCONTROL0 0x0000 +#define OUTSTAT0 0x0004 +#define OUTDATA0 0x0008 +#define OUTCONTROL1 0x0100 +#define OUTSTAT1 0x0104 +#define OUTDATA1 0x0108 +#define PDM0 0x1000 +#define PDM0_COEFFICIENT_A 0x1400 +#define PDM0_COEFFICIENT_B 0x1800 +#define PDM1 0x2000 +#define PDM1_COEFFICIENT_A 0x2400 +#define PDM1_COEFFICIENT_B 0x2800 +#define PDM2 0x3000 +#define PDM2_COEFFICIENT_A 0x3400 +#define PDM2_COEFFICIENT_B 0x3800 +#define PDM3 0x4000 +#define PDM3_COEFFICIENT_A 0x4400 +#define PDM3_COEFFICIENT_B 0x4800 +#define PDM_COEF_RAM_A_LENGTH 0x0400 +#define PDM_COEF_RAM_B_LENGTH 0x0400 + +/* Local registers in each PDMx */ +#define CIC_CONTROL 0x000 +#define CIC_CONFIG 0x004 +#define MIC_CONTROL 0x00c +#define FIR_CONTROL_A 0x020 +#define FIR_CONFIG_A 0x024 +#define DC_OFFSET_LEFT_A 0x028 +#define DC_OFFSET_RIGHT_A 0x02c +#define OUT_GAIN_LEFT_A 0x030 +#define OUT_GAIN_RIGHT_A 0x034 +#define FIR_CONTROL_B 0x040 +#define FIR_CONFIG_B 0x044 +#define DC_OFFSET_LEFT_B 0x048 +#define DC_OFFSET_RIGHT_B 0x04c +#define OUT_GAIN_LEFT_B 0x050 +#define OUT_GAIN_RIGHT_B 0x054 + +/* Register bits */ + +#if DMIC_HW_VERSION == 1 +/* OUTCONTROL0 bits */ +#define OUTCONTROL0_TIE_BIT BIT(27) +#define OUTCONTROL0_SIP_BIT BIT(26) +#define OUTCONTROL0_FINIT_BIT BIT(25) +#define OUTCONTROL0_FCI_BIT BIT(24) +#define OUTCONTROL0_TIE(x) SET_BIT(27, x) +#define OUTCONTROL0_SIP(x) SET_BIT(26, x) +#define OUTCONTROL0_FINIT(x) SET_BIT(25, x) +#define OUTCONTROL0_FCI(x) SET_BIT(24, x) +#define OUTCONTROL0_BFTH(x) SET_BITS(23, 20, x) +#define OUTCONTROL0_OF(x) SET_BITS(19, 18, x) +#define OUTCONTROL0_IPM(x) SET_BITS(17, 16, x) +#define OUTCONTROL0_TH(x) SET_BITS(5, 0, x) + +/* OUTCONTROL1 bits */ +#define OUTCONTROL1_TIE_BIT BIT(27) +#define OUTCONTROL1_SIP_BIT BIT(26) +#define OUTCONTROL1_FINIT_BIT BIT(25) +#define OUTCONTROL1_FCI_BIT BIT(24) +#define OUTCONTROL1_TIE(x) SET_BIT(27, x) +#define OUTCONTROL1_SIP(x) SET_BIT(26, x) +#define OUTCONTROL1_FINIT(x) SET_BIT(25, x) +#define OUTCONTROL1_FCI(x) SET_BIT(24, x) +#define OUTCONTROL1_BFTH(x) SET_BITS(23, 20, x) +#define OUTCONTROL1_OF(x) SET_BITS(19, 18, x) +#define OUTCONTROL1_IPM(x) SET_BITS(17, 16, x) +#define OUTCONTROL1_TH(x) SET_BITS(5, 0, x) +#endif + +#if DMIC_HW_VERSION == 2 +/* OUTCONTROL0 bits */ +#define OUTCONTROL0_TIE_BIT BIT(27) +#define OUTCONTROL0_SIP_BIT BIT(26) +#define OUTCONTROL0_FINIT_BIT BIT(25) +#define OUTCONTROL0_FCI_BIT BIT(24) +#define OUTCONTROL0_TIE(x) SET_BIT(27, x) +#define OUTCONTROL0_SIP(x) SET_BIT(26, x) +#define OUTCONTROL0_FINIT(x) SET_BIT(25, x) +#define OUTCONTROL0_FCI(x) SET_BIT(24, x) +#define OUTCONTROL0_BFTH(x) SET_BITS(23, 20, x) +#define OUTCONTROL0_OF(x) SET_BITS(19, 18, x) +#define OUTCONTROL0_NUMBER_OF_DECIMATORS(x) SET_BITS(17, 15, x) +#define OUTCONTROL0_IPM_SOURCE_1(x) SET_BITS(14, 13, x) +#define OUTCONTROL0_IPM_SOURCE_2(x) SET_BITS(12, 11, x) +#define OUTCONTROL0_IPM_SOURCE_3(x) SET_BITS(10, 9, x) +#define OUTCONTROL0_IPM_SOURCE_4(x) SET_BITS(8, 7, x) +#define OUTCONTROL0_TH(x) SET_BITS(5, 0, x) + +/* OUTCONTROL1 bits */ +#define OUTCONTROL1_TIE_BIT BIT(27) +#define OUTCONTROL1_SIP_BIT BIT(26) +#define OUTCONTROL1_FINIT_BIT BIT(25) +#define OUTCONTROL1_FCI_BIT BIT(24) +#define OUTCONTROL1_TIE(x) SET_BIT(27, x) +#define OUTCONTROL1_SIP(x) SET_BIT(26, x) +#define OUTCONTROL1_FINIT(x) SET_BIT(25, x) +#define OUTCONTROL1_FCI(x) SET_BIT(24, x) +#define OUTCONTROL1_BFTH(x) SET_BITS(23, 20, x) +#define OUTCONTROL1_OF(x) SET_BITS(19, 18, x) +#define OUTCONTROL1_NUMBER_OF_DECIMATORS(x) SET_BITS(17, 15, x) +#define OUTCONTROL1_IPM_SOURCE_1(x) SET_BITS(14, 13, x) +#define OUTCONTROL1_IPM_SOURCE_2(x) SET_BITS(12, 11, x) +#define OUTCONTROL1_IPM_SOURCE_3(x) SET_BITS(10, 9, x) +#define OUTCONTROL1_IPM_SOURCE_4(x) SET_BITS(8, 7, x) +#define OUTCONTROL1_TH(x) SET_BITS(5, 0, x) +#endif + +/* OUTSTAT0 bits */ +#define OUTSTAT0_AFE_BIT BIT(31) +#define OUTSTAT0_ASNE_BIT BIT(29) +#define OUTSTAT0_RFS_BIT BIT(28) +#define OUTSTAT0_ROR_BIT BIT(27) +#define OUTSTAT0_FL_MASK MASK(6, 0) + +/* OUTSTAT1 bits */ +#define OUTSTAT1_AFE_BIT BIT(31) +#define OUTSTAT1_ASNE_BIT BIT(29) +#define OUTSTAT1_RFS_BIT BIT(28) +#define OUTSTAT1_ROR_BIT BIT(27) +#define OUTSTAT1_FL_MASK MASK(6, 0) + +/* CIC_CONTROL bits */ +#define CIC_CONTROL_SOFT_RESET_BIT BIT(16) +#define CIC_CONTROL_CIC_START_B_BIT BIT(15) +#define CIC_CONTROL_CIC_START_A_BIT BIT(14) +#define CIC_CONTROL_MIC_B_POLARITY_BIT BIT(3) +#define CIC_CONTROL_MIC_A_POLARITY_BIT BIT(2) +#define CIC_CONTROL_MIC_MUTE_BIT BIT(1) +#define CIC_CONTROL_STEREO_MODE_BIT BIT(0) + +#define CIC_CONTROL_SOFT_RESET(x) SET_BIT(16, x) +#define CIC_CONTROL_CIC_START_B(x) SET_BIT(15, x) +#define CIC_CONTROL_CIC_START_A(x) SET_BIT(14, x) +#define CIC_CONTROL_MIC_B_POLARITY(x) SET_BIT(3, x) +#define CIC_CONTROL_MIC_A_POLARITY(x) SET_BIT(2, x) +#define CIC_CONTROL_MIC_MUTE(x) SET_BIT(1, x) +#define CIC_CONTROL_STEREO_MODE(x) SET_BIT(0, x) + +/* CIC_CONFIG bits */ +#define CIC_CONFIG_CIC_SHIFT(x) SET_BITS(27, 24, x) +#define CIC_CONFIG_COMB_COUNT(x) SET_BITS(15, 8, x) + +/* MIC_CONTROL bits */ +#define MIC_CONTROL_PDM_EN_B_BIT BIT(1) +#define MIC_CONTROL_PDM_EN_A_BIT BIT(0) +#define MIC_CONTROL_PDM_CLKDIV(x) SET_BITS(15, 8, x) +#define MIC_CONTROL_PDM_SKEW(x) SET_BITS(7, 4, x) +#define MIC_CONTROL_CLK_EDGE(x) SET_BIT(3, x) +#define MIC_CONTROL_PDM_EN_B(x) SET_BIT(1, x) +#define MIC_CONTROL_PDM_EN_A(x) SET_BIT(0, x) + +/* FIR_CONTROL_A bits */ +#define FIR_CONTROL_A_START_BIT BIT(7) +#define FIR_CONTROL_A_ARRAY_START_EN_BIT BIT(6) +#define FIR_CONTROL_A_MUTE_BIT BIT(1) +#define FIR_CONTROL_A_START(x) SET_BIT(7, x) +#define FIR_CONTROL_A_ARRAY_START_EN(x) SET_BIT(6, x) +#define FIR_CONTROL_A_DCCOMP(x) SET_BIT(4, x) +#define FIR_CONTROL_A_MUTE(x) SET_BIT(1, x) +#define FIR_CONTROL_A_STEREO(x) SET_BIT(0, x) + +/* FIR_CONFIG_A bits */ +#define FIR_CONFIG_A_FIR_DECIMATION(x) SET_BITS(20, 16, x) +#define FIR_CONFIG_A_FIR_SHIFT(x) SET_BITS(11, 8, x) +#define FIR_CONFIG_A_FIR_LENGTH(x) SET_BITS(7, 0, x) + +/* DC offset compensation time constants */ +#define DCCOMP_TC0 0 +#define DCCOMP_TC1 1 +#define DCCOMP_TC2 2 +#define DCCOMP_TC3 3 +#define DCCOMP_TC4 4 +#define DCCOMP_TC5 5 +#define DCCOMP_TC6 6 +#define DCCOMP_TC7 7 + +/* DC_OFFSET_LEFT_A bits */ +#define DC_OFFSET_LEFT_A_DC_OFFS(x) SET_BITS(21, 0, x) + +/* DC_OFFSET_RIGHT_A bits */ +#define DC_OFFSET_RIGHT_A_DC_OFFS(x) SET_BITS(21, 0, x) + +/* OUT_GAIN_LEFT_A bits */ +#define OUT_GAIN_LEFT_A_GAIN(x) SET_BITS(19, 0, x) + +/* OUT_GAIN_RIGHT_A bits */ +#define OUT_GAIN_RIGHT_A_GAIN(x) SET_BITS(19, 0, x) + +/* FIR_CONTROL_B bits */ +#define FIR_CONTROL_B_START_BIT BIT(7) +#define FIR_CONTROL_B_ARRAY_START_EN_BIT BIT(6) +#define FIR_CONTROL_B_MUTE_BIT BIT(1) +#define FIR_CONTROL_B_START(x) SET_BIT(7, x) +#define FIR_CONTROL_B_ARRAY_START_EN(x) SET_BIT(6, x) +#define FIR_CONTROL_B_DCCOMP(x) SET_BIT(4, x) +#define FIR_CONTROL_B_MUTE(x) SET_BIT(1, x) +#define FIR_CONTROL_B_STEREO(x) SET_BIT(0, x) + +/* FIR_CONFIG_B bits */ +#define FIR_CONFIG_B_FIR_DECIMATION(x) SET_BITS(20, 16, x) +#define FIR_CONFIG_B_FIR_SHIFT(x) SET_BITS(11, 8, x) +#define FIR_CONFIG_B_FIR_LENGTH(x) SET_BITS(7, 0, x) + +/* DC_OFFSET_LEFT_B bits */ +#define DC_OFFSET_LEFT_B_DC_OFFS(x) SET_BITS(21, 0, x) + +/* DC_OFFSET_RIGHT_B bits */ +#define DC_OFFSET_RIGHT_B_DC_OFFS(x) SET_BITS(21, 0, x) + +/* OUT_GAIN_LEFT_B bits */ +#define OUT_GAIN_LEFT_B_GAIN(x) SET_BITS(19, 0, x) + +/* OUT_GAIN_RIGHT_B bits */ +#define OUT_GAIN_RIGHT_B_GAIN(x) SET_BITS(19, 0, x) + +/* FIR coefficients */ +#define FIR_COEF_A(x) SET_BITS(19, 0, x) +#define FIR_COEF_B(x) SET_BITS(19, 0, x) + +#define dmic_irq(dmic) \ + dmic->plat_data.irq + +/* DMIC private data */ +struct dmic_pdata { + spinlock_t lock; /* Spinlock that's used in registers IO */ + uint16_t fifo_a; + uint16_t fifo_b; + uint16_t enable[DMIC_HW_CONTROLLERS]; + uint32_t state; + completion_t drain_complete; + struct sof_ipc_dai_config config; + struct sof_ipc_dai_dmic_params params; +}; + +extern const struct dai_ops dmic_ops; + +#endif /* DMIC_HW_VERSION */ +#endif /* __INCLUDE_DMIC__ */ diff --git a/src/include/sof/io.h b/src/include/sof/io.h index 3181d41..11f870a 100644 --- a/src/include/sof/io.h +++ b/src/include/sof/io.h @@ -33,6 +33,14 @@ #include <stdint.h> +/* Macros for register bits access */ +#define BIT(b) (1 << (b)) +#define MASK(b_hi, b_lo) ((1 << ((b_hi)-(b_lo)+1)) - 1) +#define SET_BIT(b, x) (((x) & 1) << (b)) +#define SET_BITS(b_hi, b_lo, x) \ + (((x) & ((1 << ((b_hi)-(b_lo)+1)) - 1)) << (b_lo)) + + static inline uint32_t io_reg_read(uint32_t reg) { return *((volatile uint32_t*)reg); diff --git a/src/include/sof/trace.h b/src/include/sof/trace.h index 5409a1f..2fd77fe 100644 --- a/src/include/sof/trace.h +++ b/src/include/sof/trace.h @@ -71,7 +71,7 @@ #define TRACE_BOOT_PLATFORM_IPC (TRACE_BOOT_PLATFORM + 0x170) #define TRACE_BOOT_PLATFORM_DMA (TRACE_BOOT_PLATFORM + 0x180) #define TRACE_BOOT_PLATFORM_SSP (TRACE_BOOT_PLATFORM + 0x190) - +#define TRACE_BOOT_PLATFORM_DMIC (TRACE_BOOT_PLATFORM + 0x1a0) /* trace event classes - high 8 bits*/ #define TRACE_CLASS_IRQ (1 << 24) @@ -95,6 +95,7 @@ #define TRACE_CLASS_EQ_FIR (19 << 24) #define TRACE_CLASS_EQ_IIR (20 << 24) #define TRACE_CLASS_SA (21 << 24) +#define TRACE_CLASS_DMIC (22 << 24) /* move to config.h */ #define TRACE 1 diff --git a/src/include/uapi/ipc.h b/src/include/uapi/ipc.h index 7d0a9a4..b32376d 100644 --- a/src/include/uapi/ipc.h +++ b/src/include/uapi/ipc.h @@ -273,9 +273,68 @@ struct sof_ipc_dai_hda_params { } __attribute__((packed)); /* DMIC Configuration Request - SOF_IPC_DAI_DMIC_CONFIG */ + +/* This struct is defined per 2ch PDM controller available in the platform. + * Normally it is sufficient to set the used microphone specific enables to 1 + * and keep other parameters as zero. The customizations are: + * + * 1. If a device mixes different microphones types with different polarity + * and/or the absolute polarity matters the PCM signal from a microphone + * can be inverted with the controls. + * + * 2. If the microphones in a stereo pair do not appear in captured stream + * in desired order due to board schematics choises they can be swapped with + * the clk_edge parameter. + * + * 3. If PDM bit errors are seen in capture (poor quality) the skew parameter + * that delays the sampling time of data by half cycles of DMIC source clock + * can be tried for improvement. However there is no guarantee for this to fix + * data integrity problems. + */ +struct sof_ipc_dai_dmic_pdm_ctrl { + uint16_t enable_mic_a; /* Use A (left) channel mic (0 or 1)*/ + uint16_t enable_mic_b; /* Use B (right) channel mic (0 or 1)*/ + uint16_t polarity_mic_a; /* Optionally invert mic A signal (0 or 1) */ + uint16_t polarity_mic_b; /* Optionally invert mic B signal (0 or 1) */ + uint16_t clk_edge; /* Optionally swap data clock edge (0 or 1) */ + uint16_t skew; /* Adjust PDM data sampling vs. clock (0..15) */ +} __attribute__((packed)); + +/* This struct contains the global settings for all 2ch PDM controllers. The + * version number used in configuration data is checked vs. version used by + * device driver src/drivers/dmic.c need to match. It is incremented from + * initial value 1 if updates done for the to driver would alter the operation + * of the microhone. + * + * Note: The microphone clock (pdmclk_min, pdmclk_max, duty_min, duty_max) + * parameters need to be set as defined in microphone data sheet. E.g. clock + * range 1.0 - 3.2 MHz is usually supported microphones. Some microphones are + * multi-mode capable and there may be denied mic clock frequencies between + * the modes. In such case set the clock range limits of the desired mode to + * avoid the driver to set clock to an illegal rate. + * + * The duty cycle could be set to 48-52% if not known. Generally these + * parameters can be altered within data sheet specified limits to match + * required audio application performance power. + * + * The microphone clock needs to be usually about 50-80 times the used audio + * sample rate. With highest sample rates above 48 kHz this can relaxed + * somewhat. + */ struct sof_ipc_dai_dmic_params { struct sof_ipc_hdr hdr; - /* TODO */ + uint32_t driver_ipc_version; /* Version (1..N) */ + uint32_t pdmclk_min; /* Minimum microphone clock in Hz (100000..N) */ + uint32_t pdmclk_max; /* Maximum microphone clock in Hz (min...N) */ + uint32_t fifo_fs_a; /* FIFO A sample rate in Hz (8000..96000) */ + uint32_t fifo_fs_b; /* FIFO B sample rate in Hz (8000..96000) */ + /* TODO: FIFO word lengths can be retrieved from SOF_DAI_FMT */ + uint16_t fifo_bits_a; /* FIFO A word length (16 or 24) */ + uint16_t fifo_bits_b; /* FIFO B word length (16 or 24) */ + uint16_t duty_min; /* Min. mic clock duty cycle in % (20..80) */ + uint16_t duty_max; /* Max. mic clock duty cycle in % (min..80) */ + uint32_t number_of_pdm_controllers; /* Number 2ch controllers (2) */ + struct sof_ipc_dai_dmic_pdm_ctrl pdm[]; } __attribute__((packed)); /* general purpose DAI configuration */ -- 2.14.1

3 16

[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 v2] scripts: Add build-soft.sh
by Dylan Reid 30 Apr '18

30 Apr '18

Make it easier to build the topology when working in sof.git. This script automates the change of directory to and from soft.git. It also makes building in a container easier because all scripts can execute from the same working directory. Signed-off-by: Dylan Reid <dgreid(a)chromium.org> --- scripts/build-soft.sh | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100755 scripts/build-soft.sh diff --git a/scripts/build-soft.sh b/scripts/build-soft.sh new file mode 100755 index 0000000..0756cc5 --- /dev/null +++ b/scripts/build-soft.sh @@ -0,0 +1,6 @@ +#!/bin/sh +cd ../soft.git +./autogen.sh +./configure +make -j$(nproc) +cd ../sof.git -- 2.17.0.441.gb46fe60e1d-goog

2 1

[Sound-open-firmware] [PATCH] topology: speed up topology build
by Ranjani Sridharan 30 Apr '18

30 Apr '18

Speed up topology with batch processing of m4 files Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- topology/test/tplg-build.sh | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/topology/test/tplg-build.sh b/topology/test/tplg-build.sh index 7c55fba..c85b5b5 100755 --- a/topology/test/tplg-build.sh +++ b/topology/test/tplg-build.sh @@ -8,14 +8,14 @@ set -e # M4 preprocessor flags -M4_FLAGS="-I ../ -I ../m4 -I ../common" +export M4PATH="../:../m4:../common" # Simple component test cases # can be used on components with 1 sink and 1 source. SIMPLE_TESTS=(test-ssp test-capture-ssp test-playback-ssp) TONE_TEST=test-tone-playback-ssp - - +TEST_STRINGS="" +M4_STRINGS="" # process m4 simple tests - # simple_test(name, pipe_name, be_name, format, dai_id, dai_format, dai_phy_bits, dai_data_bits dai_bclk) # 1) name - test filename suffix @@ -35,21 +35,11 @@ function simple_test { for i in ${SIMPLE_TESTS[@]} do TFILE="$i$5-${11}-$2-$4-$6-48k-$((${10} / 1000))k-$1" - echo "M4 pre-processing test $i -> ${TFILE}" - m4 ${M4_FLAGS} \ - -DTEST_PIPE_NAME="$2" \ - -DTEST_DAI_LINK_NAME="$3" \ - -DTEST_SSP_PORT=$5 \ - -DTEST_SSP_FORMAT=$6 \ - -DTEST_PIPE_FORMAT=$4 \ - -DTEST_SSP_BCLK=$9 \ - -DTEST_SSP_MCLK=${10} \ - -DTEST_SSP_PHY_BITS=$7 \ - -DTEST_SSP_DATA_BITS=$8 \ - -DTEST_SSP_MODE=${11} \ - $i.m4 > ${TFILE}.conf - echo "Compiling test $i -> ${TFILE}.tplg" - alsatplg -v 1 -c ${TFILE}.conf -o ${TFILE}.tplg + #create input string for batch m4 processing + M4_STRINGS+="-DTEST_PIPE_NAME=$2,-DTEST_DAI_LINK_NAME=$3,-DTEST_SSP_PORT=$5,-DTEST_SSP_FORMAT=$6,-DTEST_PIPE_FORMAT=$4,-DTEST_SSP_BCLK=$9,-DTEST_SSP_MCLK=${10},-DTEST_SSP_PHY_BITS=$7,-DTEST_SSP_DATA_BITS=$8,-DTEST_SSP_MODE=${11},$i.m4,${TFILE}," + #create input string for batch processing of conf files + TEST_STRINGS+=${TFILE}"," + done } @@ -69,7 +59,7 @@ function simple_test { function tone_test { TFILE="$TONE_TEST$5-$2-$4-$6-48k-$1" echo "M4 pre-processing test $TONE_TEST -> ${TFILE}" - m4 ${M4_FLAGS} \ + m4 \ -DTEST_PIPE_NAME="$2" \ -DTEST_DAI_LINK_NAME="$3" \ -DTEST_SSP_PORT=$5 \ @@ -84,6 +74,8 @@ function tone_test { alsatplg -v 1 -c ${TFILE}.conf -o ${TFILE}.tplg } +echo "Preparing topology build input..." + # Pre-process the simple tests simple_test nocodec passthrough "NoCodec" s16le 2 s16le 20 16 1920000 19200000 I2S simple_test nocodec passthrough "NoCodec" s24le 2 s24le 25 24 2400000 19200000 I2S @@ -166,4 +158,11 @@ simple_test nocodec src "NoCodec" s24le 4 s24le 25 24 2400000 24000000 I2S # Tone test: Tone component only supports s32le currently tone_test codec tone "SSP2-Codec" s32le 2 s16le 20 16 1920000 19200000 +echo "Batch processing m4 files..." +#m4 processing +echo $M4_STRINGS | tr '\n' '\0' | xargs -d ',' -n12 -P10 bash -c 'm4 "${@:1:${#}-1}" > ${12}.conf' m4 + +#execute alsatplg to create topology binary +TEST_STRINGS=${TEST_STRINGS%?} +echo $TEST_STRINGS | tr '\n' '\0' | xargs -d ',' -n1 -P10 -I string alsatplg -v 1 -c string".conf" -o string".tplg" -- 2.14.1

2 3

[Sound-open-firmware] [PATCH] topology: mirror alsa-lib definitions for mclk/bclk
by Pierre-Louis Bossart 30 Apr '18

30 Apr '18

ALSA-lib introduced new definitions to work around an logical inversion for master/slave definitions. see e.g. commit 3778a30bb00 ('ASoC: topology: Fix bclk and fsync inversion in set_link_hw_format()') Make sure clarifications are reflected in the topology files bclk/fsync slave -> codec_slave mclk slave -> codec_mclk_in This patch requires the use of the latest alsa-lib git master (v1.1.6 does not contain the relevant patches). This patch also requires an updated kernel. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- topology/sof-apl-nocodec.m4 | 6 +++--- topology/sof-apl-tdf8532.m4 | 12 ++++++------ topology/sof-bdw-rt286.m4 | 6 +++--- topology/sof-bdw-rt5640.m4 | 6 +++--- topology/sof-byt-da7213.m4 | 6 +++--- topology/sof-byt-nocodec.m4 | 6 +++--- topology/sof-byt-rt5640.m4 | 6 +++--- topology/sof-byt-rt5645.m4 | 6 +++--- topology/sof-byt-rt5651.m4 | 6 +++--- topology/sof-cht-max98090.m4 | 6 +++--- topology/sof-cht-nocodec.m4 | 6 +++--- topology/sof-cnl-rt274.m4 | 6 +++--- topology/sof-hsw-rt5640.m4 | 6 +++--- topology/test/test-capture-ssp.m4 | 6 +++--- topology/test/test-playback-ssp.m4 | 6 +++--- topology/test/test-ssp.m4 | 6 +++--- topology/test/test-tone-playback-ssp.m4 | 6 +++--- 17 files changed, 54 insertions(+), 54 deletions(-) diff --git a/topology/sof-apl-nocodec.m4 b/topology/sof-apl-nocodec.m4 index 78a1a4e..9c4286b 100644 --- a/topology/sof-apl-nocodec.m4 +++ b/topology/sof-apl-nocodec.m4 @@ -94,7 +94,7 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) # BE configurations - overrides config in ACPI if present # DAI_CONFIG(SSP, 2, NoCodec, I2S, 24, - DAI_CLOCK(mclk, 19200000, slave), - DAI_CLOCK(bclk, 2400000, slave), - DAI_CLOCK(fsync, 48000, slave), + DAI_CLOCK(mclk, 19200000, codec_mclk_in), + DAI_CLOCK(bclk, 2400000, codec_slave), + DAI_CLOCK(fsync, 48000, codec_slave), DAI_TDM(2, 25, 3, 3)) diff --git a/topology/sof-apl-tdf8532.m4 b/topology/sof-apl-tdf8532.m4 index 50023f0..1ff0a0d 100644 --- a/topology/sof-apl-tdf8532.m4 +++ b/topology/sof-apl-tdf8532.m4 @@ -77,13 +77,13 @@ PCM_DUPLEX_ADD(Port2, 4, 1, 1, PIPELINE_PCM_2, PIPELINE_PCM_3) # BE configurations - overrides config in ACPI if present # DAI_CONFIG(SSP, 4, SSP4-Codec, DSP_B, 32, - DAI_CLOCK(mclk, 24576000, slave), - DAI_CLOCK(bclk, 12288000, slave), - DAI_CLOCK(fsync, 48000, slave), + DAI_CLOCK(mclk, 24576000, codec_mclk_in), + DAI_CLOCK(bclk, 12288000, codec_slave), + DAI_CLOCK(fsync, 48000, codec_slave), DAI_TDM(8, 32, 15, 15)) DAI_CONFIG(SSP, 2, SSP2-Codec, I2S, 16, - DAI_CLOCK(mclk, 24576000, slave), - DAI_CLOCK(bclk, 1536000, slave), - DAI_CLOCK(fsync, 48000, slave), + DAI_CLOCK(mclk, 24576000, codec_mclk_in), + DAI_CLOCK(bclk, 1536000, codec_slave), + DAI_CLOCK(fsync, 48000, codec_slave), DAI_TDM(2, 16, 3, 3)) diff --git a/topology/sof-bdw-rt286.m4 b/topology/sof-bdw-rt286.m4 index c7dded6..a13a49c 100644 --- a/topology/sof-bdw-rt286.m4 +++ b/topology/sof-bdw-rt286.m4 @@ -94,7 +94,7 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) # BE configurations - overrides config in ACPI if present # DAI_CONFIG(SSP, 0, Codec, I2S, 24, - DAI_CLOCK(mclk, 24000000, slave), - DAI_CLOCK(bclk, 2400000, slave), - DAI_CLOCK(fsync, 48000, slave), + DAI_CLOCK(mclk, 24000000, codec_mclk_in), + DAI_CLOCK(bclk, 2400000, codec_slave), + DAI_CLOCK(fsync, 48000, codec_slave), DAI_TDM(2, 25, 3, 3)) diff --git a/topology/sof-bdw-rt5640.m4 b/topology/sof-bdw-rt5640.m4 index 0a083e4..007944a 100644 --- a/topology/sof-bdw-rt5640.m4 +++ b/topology/sof-bdw-rt5640.m4 @@ -94,7 +94,7 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) # BE configurations - overrides config in ACPI if present # DAI_CONFIG(SSP, 0, Codec, I2S, 24, - DAI_CLOCK(mclk, 24000000, slave), - DAI_CLOCK(bclk, 2400000, slave), - DAI_CLOCK(fsync, 48000, slave), + DAI_CLOCK(mclk, 24000000, codec_mclk_in), + DAI_CLOCK(bclk, 2400000, codec_slave), + DAI_CLOCK(fsync, 48000, codec_slave), DAI_TDM(2, 25, 3, 3)) diff --git a/topology/sof-byt-da7213.m4 b/topology/sof-byt-da7213.m4 index 1e77e7e..ecf90c6 100644 --- a/topology/sof-byt-da7213.m4 +++ b/topology/sof-byt-da7213.m4 @@ -94,7 +94,7 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) # BE configurations - overrides config in ACPI if present # DAI_CONFIG(SSP, 2, SSP2-Codec, I2S, 24, - DAI_CLOCK(mclk, 19200000, slave), - DAI_CLOCK(bclk, 2400000, slave), - DAI_CLOCK(fsync, 48000, slave), + DAI_CLOCK(mclk, 19200000, codec_mclk_in), + DAI_CLOCK(bclk, 2400000, codec_slave), + DAI_CLOCK(fsync, 48000, codec_slave), DAI_TDM(2, 25, 3, 3)) diff --git a/topology/sof-byt-nocodec.m4 b/topology/sof-byt-nocodec.m4 index 3be5d00..efa321b 100644 --- a/topology/sof-byt-nocodec.m4 +++ b/topology/sof-byt-nocodec.m4 @@ -94,7 +94,7 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) # BE configurations - overrides config in ACPI if present # DAI_CONFIG(SSP, 2, NoCodec, I2S, 24, - DAI_CLOCK(mclk, 19200000, slave), - DAI_CLOCK(bclk, 2400000, slave), - DAI_CLOCK(fsync, 48000, slave), + DAI_CLOCK(mclk, 19200000, codec_mclk_in), + DAI_CLOCK(bclk, 2400000, codec_slave), + DAI_CLOCK(fsync, 48000, codec_slave), DAI_TDM(2, 25, 3, 3)) diff --git a/topology/sof-byt-rt5640.m4 b/topology/sof-byt-rt5640.m4 index 14313db..ae54969 100644 --- a/topology/sof-byt-rt5640.m4 +++ b/topology/sof-byt-rt5640.m4 @@ -94,7 +94,7 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) # BE configurations - overrides config in ACPI if present # DAI_CONFIG(SSP, 2, SSP2-Codec, I2S, 24, - DAI_CLOCK(mclk, 19200000, slave), - DAI_CLOCK(bclk, 2400000, slave), - DAI_CLOCK(fsync, 48000, slave), + DAI_CLOCK(mclk, 19200000, codec_mclk_in), + DAI_CLOCK(bclk, 2400000, codec_slave), + DAI_CLOCK(fsync, 48000, codec_slave), DAI_TDM(2, 25, 3, 3)) diff --git a/topology/sof-byt-rt5645.m4 b/topology/sof-byt-rt5645.m4 index 15cac48..364121f 100644 --- a/topology/sof-byt-rt5645.m4 +++ b/topology/sof-byt-rt5645.m4 @@ -94,7 +94,7 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) # BE configurations - overrides config in ACPI if present # DAI_CONFIG(SSP, 2, SSP2-Codec, I2S, 24, - DAI_CLOCK(mclk, 19200000, slave), - DAI_CLOCK(bclk, 2400000, slave), - DAI_CLOCK(fsync, 48000, slave), + DAI_CLOCK(mclk, 19200000, codec_mclk_in), + DAI_CLOCK(bclk, 2400000, codec_slave), + DAI_CLOCK(fsync, 48000, codec_slave), DAI_TDM(2, 25, 3, 3)) diff --git a/topology/sof-byt-rt5651.m4 b/topology/sof-byt-rt5651.m4 index 0e76c56..be3d994 100644 --- a/topology/sof-byt-rt5651.m4 +++ b/topology/sof-byt-rt5651.m4 @@ -94,8 +94,8 @@ PCM_DUPLEX_ADD(Low Latency, 3, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) # BE configurations - overrides config in ACPI if present # DAI_CONFIG(SSP, 2, SSP2-Codec, I2S, 24, - DAI_CLOCK(mclk, 19200000, slave), - DAI_CLOCK(bclk, 2400000, slave), - DAI_CLOCK(fsync, 48000, slave), + DAI_CLOCK(mclk, 19200000, codec_mclk_in), + DAI_CLOCK(bclk, 2400000, codec_slave), + DAI_CLOCK(fsync, 48000, codec_slave), DAI_TDM(2, 25, 3, 3)) diff --git a/topology/sof-cht-max98090.m4 b/topology/sof-cht-max98090.m4 index ab1b639..7ba4df7 100644 --- a/topology/sof-cht-max98090.m4 +++ b/topology/sof-cht-max98090.m4 @@ -94,7 +94,7 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) # BE configurations - overrides config in ACPI if present # DAI_CONFIG(SSP, 2, SSP2-Codec, I2S, 16, - DAI_CLOCK(mclk, 19200000, slave), - DAI_CLOCK(bclk, 1920000, slave), - DAI_CLOCK(fsync, 48000, slave), + DAI_CLOCK(mclk, 19200000, codec_mclk_in), + DAI_CLOCK(bclk, 1920000, codec_slave), + DAI_CLOCK(fsync, 48000, codec_slave), DAI_TDM(2, 20, 3, 3)) diff --git a/topology/sof-cht-nocodec.m4 b/topology/sof-cht-nocodec.m4 index 3f61e44..a0eb9cd 100644 --- a/topology/sof-cht-nocodec.m4 +++ b/topology/sof-cht-nocodec.m4 @@ -94,7 +94,7 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) # BE configurations - overrides config in ACPI if present # DAI_CONFIG(SSP, 2, NoCodec, I2S, 24, - DAI_CLOCK(mclk, 19200000, slave), - DAI_CLOCK(bclk, 2400000, slave), - DAI_CLOCK(fsync, 48000, slave), + DAI_CLOCK(mclk, 19200000, codec_mclk_in), + DAI_CLOCK(bclk, 2400000, codec_slave), + DAI_CLOCK(fsync, 48000, codec_slave), DAI_TDM(2, 25, 3, 3)) diff --git a/topology/sof-cnl-rt274.m4 b/topology/sof-cnl-rt274.m4 index 495fab3..89d5a25 100644 --- a/topology/sof-cnl-rt274.m4 +++ b/topology/sof-cnl-rt274.m4 @@ -65,7 +65,7 @@ PCM_DUPLEX_ADD(Passthrough, 3, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) # BE configurations - overrides config in ACPI if present # DAI_CONFIG(SSP, 0, SSP0-Codec, DSP_B, 24, - DAI_CLOCK(mclk, 24000000, slave), - DAI_CLOCK(bclk, 4800000, slave), - DAI_CLOCK(fsync, 48000, slave), + DAI_CLOCK(mclk, 24000000, codec_mclk_in), + DAI_CLOCK(bclk, 4800000, codec_slave), + DAI_CLOCK(fsync, 48000, codec_slave), DAI_TDM(4, 25, 3, 3)) diff --git a/topology/sof-hsw-rt5640.m4 b/topology/sof-hsw-rt5640.m4 index 5516451..85b8209 100644 --- a/topology/sof-hsw-rt5640.m4 +++ b/topology/sof-hsw-rt5640.m4 @@ -94,7 +94,7 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) # BE configurations - overrides config in ACPI if present # DAI_CONFIG(SSP, 0, Codec, I2S, 24, - DAI_CLOCK(mclk, 24000000, slave), - DAI_CLOCK(bclk, 2400000, slave), - DAI_CLOCK(fsync, 48000, slave), + DAI_CLOCK(mclk, 24000000, codec_mclk_in), + DAI_CLOCK(bclk, 2400000, codec_slave), + DAI_CLOCK(fsync, 48000, codec_slave), DAI_TDM(2, 25, 3, 3)) diff --git a/topology/test/test-capture-ssp.m4 b/topology/test/test-capture-ssp.m4 index 78b6479..6d666dc 100644 --- a/topology/test/test-capture-ssp.m4 +++ b/topology/test/test-capture-ssp.m4 @@ -69,7 +69,7 @@ PCM_CAPTURE_ADD(Passthrough, 3, 0, 0, PIPELINE_PCM_2) # TEST_SSP_DATA_BITS bit I2S using TEST_SSP_PHY_BITS bit sample conatiner on SSP TEST_SSP_PORT # DAI_CONFIG(SSP, TEST_SSP_PORT, TEST_DAI_LINK_NAME, TEST_SSP_MODE, TEST_SSP_DATA_BITS, - DAI_CLOCK(mclk, TEST_SSP_MCLK, slave), - DAI_CLOCK(bclk, TEST_SSP_BCLK, slave), - DAI_CLOCK(fsync, 48000, slave), + DAI_CLOCK(mclk, TEST_SSP_MCLK, codec_mclk_in), + DAI_CLOCK(bclk, TEST_SSP_BCLK, codec_slave), + DAI_CLOCK(fsync, 48000, codec_slave), DAI_TDM(2, TEST_SSP_PHY_BITS, 3, 3)) diff --git a/topology/test/test-playback-ssp.m4 b/topology/test/test-playback-ssp.m4 index e4b09ec..5ee1b53 100644 --- a/topology/test/test-playback-ssp.m4 +++ b/topology/test/test-playback-ssp.m4 @@ -69,7 +69,7 @@ PCM_PLAYBACK_ADD(Passthrough, 3, 0, 0, PIPELINE_PCM_1) # TEST_SSP_DATA_BITS bit I2S using TEST_SSP_PHY_BITS bit sample conatiner on SSP TEST_SSP_PORT # DAI_CONFIG(SSP, TEST_SSP_PORT, TEST_DAI_LINK_NAME, TEST_SSP_MODE, TEST_SSP_DATA_BITS, - DAI_CLOCK(mclk, TEST_SSP_MCLK, slave), - DAI_CLOCK(bclk, TEST_SSP_BCLK, slave), - DAI_CLOCK(fsync, 48000, slave), + DAI_CLOCK(mclk, TEST_SSP_MCLK, codec_slave), + DAI_CLOCK(bclk, TEST_SSP_BCLK, codec_slave), + DAI_CLOCK(fsync, 48000, codec_slave), DAI_TDM(2, TEST_SSP_PHY_BITS, 3, 3)) diff --git a/topology/test/test-ssp.m4 b/topology/test/test-ssp.m4 index 676e19b..1bdce2f 100644 --- a/topology/test/test-ssp.m4 +++ b/topology/test/test-ssp.m4 @@ -87,7 +87,7 @@ PCM_DUPLEX_ADD(Passthrough, 3, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) # TEST_SSP_DATA_BITS bit I2S using TEST_SSP_PHY_BITS bit sample conatiner on SSP TEST_SSP_PORT # DAI_CONFIG(SSP, TEST_SSP_PORT, TEST_DAI_LINK_NAME, TEST_SSP_MODE, TEST_SSP_DATA_BITS, - DAI_CLOCK(mclk, TEST_SSP_MCLK, slave), - DAI_CLOCK(bclk, TEST_SSP_BCLK, slave), - DAI_CLOCK(fsync, 48000, slave), + DAI_CLOCK(mclk, TEST_SSP_MCLK, codec_mclk_in), + DAI_CLOCK(bclk, TEST_SSP_BCLK, codec_slave), + DAI_CLOCK(fsync, 48000, codec_slave), DAI_TDM(2, TEST_SSP_PHY_BITS, 3, 3)) diff --git a/topology/test/test-tone-playback-ssp.m4 b/topology/test/test-tone-playback-ssp.m4 index 7cf1ed5..069ad64 100644 --- a/topology/test/test-tone-playback-ssp.m4 +++ b/topology/test/test-tone-playback-ssp.m4 @@ -57,7 +57,7 @@ DAI_ADD(sof/pipe-dai-playback.m4, # TEST_SSP_DATA_BITS bit I2S using TEST_SSP_PHY_BITS bit sample conatiner on SSP TEST_SSP_PORT # DAI_CONFIG(SSP, TEST_SSP_PORT, TEST_DAI_LINK_NAME, I2S, TEST_SSP_DATA_BITS, - DAI_CLOCK(mclk, TEST_SSP_MCLK, slave), - DAI_CLOCK(bclk, TEST_SSP_BCLK, slave), - DAI_CLOCK(fsync, 48000, slave), + DAI_CLOCK(mclk, TEST_SSP_MCLK, codec_mclk_in), + DAI_CLOCK(bclk, TEST_SSP_BCLK, codec_slave), + DAI_CLOCK(fsync, 48000, codec_slave), DAI_TDM(2, TEST_SSP_PHY_BITS, 3, 3)) -- 2.14.1

2 2

Re: [Sound-open-firmware] [PATCH 2/3] scripts: Add build-soft.sh
by Dylan Reid 25 Apr '18

25 Apr '18

On Wed, Apr 25, 2018 at 9:59 AM Pierre-Louis Bossart < pierre-louis.bossart(a)linux.intel.com> wrote: > On 4/25/18 11:48 AM, Dylan Reid wrote: > > Make it easier to build the topology when working in sof.git. This > > script automates the change of directory to and from soft.git. > > It also makes building in a container easier because all scripts can > > execute from the same working directory. > > > > Signed-off-by: Dylan Reid <dgreid(a)chromium.org> > > --- > > scripts/build-soft.sh | 7 +++++++ > > 1 file changed, 7 insertions(+) > > create mode 100755 scripts/build-soft.sh > > > > diff --git a/scripts/build-soft.sh b/scripts/build-soft.sh > > new file mode 100755 > > index 0000000..ee89352 > > --- /dev/null > > +++ b/scripts/build-soft.sh > > @@ -0,0 +1,7 @@ > > +#!/bin/sh > > +cd ../soft.git > > +./autogen.sh > > +./configure --prefix=/home/sof/bin > is this prefix necessary, or can be replaced by ~/bin ? Thanks, that can be ~/bin, I'll fix it. Or I could skip the install step in this script. That avoids needing to specify the path and still avoids a sudo. For my workflow that's find since I just want the topologies generated, would that be sufficient for others too? > > +make -j$(nproc) > > +make install > > +cd ../sof.git > >

1 0

[Sound-open-firmware] upstream SOF binary to firmware repo
by Li, Jocelyn 25 Apr '18

25 Apr '18

Hi, Should we upstream SOF binary to upstream firmware repo, so as to make firmware binary integration easier for Linux distributions? What is our insight here? Thanks, Jocelyn

3 2

[Sound-open-firmware] [PATCH] dist: fix make dist compiling issue
by Zhang Keqiao 24 Apr '18

24 Apr '18

Signed-off-by: Zhang Keqiao <keqiao.zhang(a)linux.intel.com> --- doc/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index 200c55b..dec56ef 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,4 +1,4 @@ -EXTRA_DIST=sof_uapi.doxygen +EXTRA_DIST=sof_uapi.doxygen.in AM_CPPFLAGS=-I$(top_srcdir)/include -- 2.14.1

2 1

[Sound-open-firmware] [PATCH] FIX: Remove unused variable.
by yan.wang＠linux.intel.com 24 Apr '18

24 Apr '18

From: Yan Wang <yan.wang(a)linux.intel.com> The variable "i" shouldn't be used. Signed-off-by: Yan Wang <yan.wang(a)linux.intel.com> --- Test with: Mininow max rt5651 and APL UP^2 nocodec and CNL nocodec SOF master: 29d4e8b1260e44004baad937d661bcc45fe05e81 SOF-Tool master: 8e8cd884c36e297f5996a7bb4f1e830a0f1ee84c https://github.com/plbossart/sound/tree/topic/sof-v4.14: 2cd03d26b66f8fee25b8b21ea3f60db11def5b13 --- rimage/file_simple.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rimage/file_simple.c b/rimage/file_simple.c index a9f22d0..4068734 100644 --- a/rimage/file_simple.c +++ b/rimage/file_simple.c @@ -259,7 +259,7 @@ static int simple_write_module_reloc(struct image *image, struct module *module) { struct snd_sof_mod_hdr hdr; size_t count; - int i, err; + int err; hdr.num_blocks = 1; hdr.size = module->text_size + module->data_size; @@ -288,7 +288,7 @@ static int simple_write_module_reloc(struct image *image, struct module *module) err = write_block_reloc(image, module); if (err < 0) { - fprintf(stderr, "error: failed to write section #%d\n", i); + fprintf(stderr, "error: failed to write section #%d\n", err); return err; } -- 2.14.3

5 4

[Sound-open-firmware] [PATCH] klockwork: fix one uninitialized issue
by Zhang Keqiao 20 Apr '18

20 Apr '18

From: Zhang Keqiao <keqiao.zhang(a)intel.com> Signed-off-by: Zhang Keqiao <keqiao.zhang(a)intel.com> --- rimage/file_simple.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rimage/file_simple.c b/rimage/file_simple.c index a9f22d0..6402b2e 100644 --- a/rimage/file_simple.c +++ b/rimage/file_simple.c @@ -259,7 +259,7 @@ static int simple_write_module_reloc(struct image *image, struct module *module) { struct snd_sof_mod_hdr hdr; size_t count; - int i, err; + int err; hdr.num_blocks = 1; hdr.size = module->text_size + module->data_size; @@ -288,7 +288,7 @@ static int simple_write_module_reloc(struct image *image, struct module *module) err = write_block_reloc(image, module); if (err < 0) { - fprintf(stderr, "error: failed to write section #%d\n", i); + fprintf(stderr, "error: failed to write section\n"); return err; } -- 2.14.1

2 1

[Sound-open-firmware] [PATCH] kmod_scripts: handle nocodec machine driver
by Pierre-Louis Bossart 14 Apr '18

14 Apr '18

make sure it's removed Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- kmod_scripts/sof_remove.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/kmod_scripts/sof_remove.sh b/kmod_scripts/sof_remove.sh index 1ea0598..74b94d5 100755 --- a/kmod_scripts/sof_remove.sh +++ b/kmod_scripts/sof_remove.sh @@ -16,6 +16,7 @@ rmmod snd_soc_sst_bytcr_rt5651 rmmod snd_soc_sst_cht_bsw_rt5645 rmmod snd_soc_sst_cht_bsw_rt5670 rmmod snd_soc_sst_byt_cht_da7213 +rmmod snd_sof_nocodec rmmod snd_soc_rt5670 rmmod snd_soc_rt5645 -- 2.14.1

2 1

[Sound-open-firmware] [PATCH] topology: test: fix APL test loops
by Pierre-Louis Bossart 13 Apr '18

13 Apr '18

Copy/paste mistake, fix. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- topology/test/tplg-build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/topology/test/tplg-build.sh b/topology/test/tplg-build.sh index 4a4348f..7c55fba 100755 --- a/topology/test/tplg-build.sh +++ b/topology/test/tplg-build.sh @@ -144,8 +144,8 @@ do simple_test nocodec $mode "NoCodec" $format $ssp s16le 20 16 1920000 19200000 $protocol simple_test nocodec $mode "NoCodec" $format $ssp s24le 25 24 2400000 19200000 $protocol - simple_test nocodec $mode "SSP${ssp}-Codec" $format $ssp s16le 20 16 1920000 19200000 $protocol - simple_test nocodec $mode "SSP${ssp}-Codec" $format $ssp s24le 25 24 2400000 19200000 $protocol + simple_test codec $mode "SSP${ssp}-Codec" $format $ssp s16le 20 16 1920000 19200000 $protocol + simple_test codec $mode "SSP${ssp}-Codec" $format $ssp s24le 25 24 2400000 19200000 $protocol done done simple_test nocodec passthrough "NoCodec" s16le $ssp s16le 20 16 1920000 19200000 $protocol -- 2.14.1

2 1

[Sound-open-firmware] [PATCH] apl-ssp: use macros instead of hard-coded shifts/masks
by Pierre-Louis Bossart 13 Apr '18

13 Apr '18

Missed those definitions in previous patch, fix. Suggested-by: Keyon Jie <yang.jie(a)linux.intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- src/drivers/apl-ssp.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/drivers/apl-ssp.c b/src/drivers/apl-ssp.c index 8f9bc14..6e33656 100644 --- a/src/drivers/apl-ssp.c +++ b/src/drivers/apl-ssp.c @@ -359,8 +359,9 @@ static inline int ssp_set_config(struct dai *dai, goto out; } - sspsp |= SSPSP_EDMYSTOP((slot_end_padding >> 2) & 0x3); - sspsp |= SSPSP_DMYSTOP(slot_end_padding & 0x3); + sspsp |= SSPSP_DMYSTOP(slot_end_padding & SSPSP_DMYSTOP_MASK); + slot_end_padding >>= SSPSP_DMYSTOP_BITS; + sspsp |= SSPSP_EDMYSTOP(slot_end_padding & SSPSP_EDMYSTOP_MASK); break; @@ -409,8 +410,9 @@ static inline int ssp_set_config(struct dai *dai, goto out; } - sspsp |= SSPSP_EDMYSTOP((slot_end_padding >> 2) & 0x3); - sspsp |= SSPSP_DMYSTOP(slot_end_padding & 0x3); + sspsp |= SSPSP_DMYSTOP(slot_end_padding & SSPSP_DMYSTOP_MASK); + slot_end_padding >>= SSPSP_DMYSTOP_BITS; + sspsp |= SSPSP_EDMYSTOP(slot_end_padding & SSPSP_EDMYSTOP_MASK); break; case SOF_DAI_FMT_DSP_A: -- 2.14.1

2 1

[Sound-open-firmware] [PATCH] scripts: checkpatch: don't complain about volatile
by Xiuli Pan 13 Apr '18

13 Apr '18

From: Pan Xiuli <xiuli.pan(a)linux.intel.com> Signed-off-by: Pan Xiuli <xiuli.pan(a)linux.intel.com> --- scripts/checkpatch.pl | 7 ------- 1 file changed, 7 deletions(-) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 16d035e..6afecfe 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -5189,13 +5189,6 @@ sub process { } } -# no volatiles please - my $asm_volatile = qr{\b(__asm__|asm)\s+(__volatile__|volatile)\b}; - if ($line =~ /\bvolatile\b/ && $line !~ /$asm_volatile/) { - WARN("VOLATILE", - "Use of volatile is usually wrong: see Documentation/process/volatile-considered-harmful.rst\n" . $herecurr); - } - # Check for user-visible strings broken across lines, which breaks the ability # to grep for the string. Make exceptions when the previous string ends in a # newline (multiple lines in one string constant) or '\t', '\r', ';', or '{' -- 2.7.4

5 5

[Sound-open-firmware] [PATCH] topology: test: generate more configurations for ApolloLake
by Pierre-Louis Bossart 13 Apr '18

13 Apr '18

Disk space is cheap, life is short, let's just brute-force generate all the combinations supported on SSP. Testers should just pick from the generated configurations instead of adding their own changes to the tplg-build.sh file. Passthrough is special-cased since pipeline and DAI format need to match. The frequencies and DAI formats remain in clear-text and duplicated, we could optimize further but then it'd become unmaintainable. Next step is to add slave mode and make the frame rate vary. If this is deemed to heavy, we can define a 'make test' target to avoid generating all these files by default. Alternatively people can select the modes needed by just changing the APL_ arrays. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- topology/test/tplg-build.sh | 71 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 55 insertions(+), 16 deletions(-) diff --git a/topology/test/tplg-build.sh b/topology/test/tplg-build.sh index ff2d144..4a4348f 100755 --- a/topology/test/tplg-build.sh +++ b/topology/test/tplg-build.sh @@ -34,7 +34,7 @@ TONE_TEST=test-tone-playback-ssp function simple_test { for i in ${SIMPLE_TESTS[@]} do - TFILE="$i$5-${11}-$2-$4-$6-48k-$1" + TFILE="$i$5-${11}-$2-$4-$6-48k-$((${10} / 1000))k-$1" echo "M4 pre-processing test $i -> ${TFILE}" m4 ${M4_FLAGS} \ -DTEST_PIPE_NAME="$2" \ @@ -101,21 +101,60 @@ simple_test codec volume "SSP2-Codec" s16le 2 s24le 25 24 2400000 19200000 I2S simple_test codec src "SSP2-Codec" s24le 2 s24le 25 24 2400000 19200000 I2S # for APL -simple_test nocodec volume "NoCodec" s16le 4 s16le 16 16 1536000 24576000 I2S -simple_test nocodec volume "NoCodec" s16le 4 s16le 16 16 1536000 24576000 DSP_A -simple_test nocodec volume "NoCodec" s24le 4 s16le 16 16 1536000 24576000 I2S -simple_test nocodec volume "NoCodec" s32le 4 s16le 16 16 1536000 24576000 I2S -simple_test nocodec volume "NoCodec" s16le 4 s24le 32 24 3072000 24576000 I2S -simple_test nocodec volume "NoCodec" s24le 4 s24le 32 24 3072000 24576000 I2S -simple_test nocodec volume "NoCodec" s24le 4 s24le 32 24 3072000 24576000 DSP_B -simple_test nocodec volume "NoCodec" s32le 4 s24le 32 24 3072000 24576000 I2S -simple_test nocodec volume "NoCodec" s16le 4 s32le 32 32 3072000 24576000 I2S -simple_test nocodec volume "NoCodec" s24le 4 s32le 32 32 3072000 24576000 I2S -simple_test nocodec volume "NoCodec" s32le 4 s32le 32 32 3072000 24576000 I2S -simple_test nocodec volume "NoCodec" s32le 4 s32le 32 32 3072000 24576000 LEFT_J -simple_test codec volume "SSP4-Codec" s16le 4 s16le 16 16 1536000 24576000 I2S -simple_test nocodec volume "NoCodec" s16le 5 s16le 16 16 1536000 24576000 I2S -simple_test nocodec src "NoCodec" s24le 4 s24le 32 24 3072000 24576000 I2S +APL_PROTOCOL_TESTS=(I2S LEFT_J DSP_A DSP_B) +APL_SSP_TESTS=(0 1 2 3 4 5) +APL_MODE_TESTS=(volume src) +APL_FORMAT_TESTS=(s16le s24le s32le) + +for protocol in ${APL_PROTOCOL_TESTS[@]} +do + for ssp in ${APL_SSP_TESTS[@]} + do + for mode in ${APL_MODE_TESTS[@]} + do + for format in ${APL_FORMAT_TESTS[@]} + do + simple_test nocodec $mode "NoCodec" $format $ssp s16le 16 16 1536000 24576000 $protocol + simple_test nocodec $mode "NoCodec" $format $ssp s24le 32 24 3072000 24576000 $protocol + simple_test nocodec $mode "NoCodec" $format $ssp s32le 32 32 3072000 24576000 $protocol + + simple_test codec $mode "SSP${ssp}-Codec" $format $ssp s16le 16 16 1536000 24576000 $protocol + simple_test codec $mode "SSP${ssp}-Codec" $format $ssp s24le 32 24 3072000 24576000 $protocol + simple_test codec $mode "SSP${ssp}-Codec" $format $ssp s32le 32 32 3072000 24576000 $protocol + done + done + simple_test nocodec passthrough "NoCodec" s16le $ssp s16le 16 16 1536000 24576000 $protocol + simple_test nocodec passthrough "NoCodec" s24le $ssp s24le 32 24 3072000 24576000 $protocol + simple_test nocodec passthrough "NoCodec" s32le $ssp s32le 32 32 3072000 24576000 $protocol + + simple_test codec passthrough "SSP${ssp}-Codec" s16le $ssp s16le 16 16 1536000 24576000 $protocol + simple_test codec passthrough "SSP${ssp}-Codec" s24le $ssp s24le 32 24 3072000 24576000 $protocol + simple_test codec passthrough "SSP${ssp}-Codec" s32le $ssp s32le 32 32 3072000 24576000 $protocol + done +done + +for protocol in ${APL_PROTOCOL_TESTS[@]} +do + for ssp in ${APL_SSP_TESTS[@]} + do + for mode in ${APL_MODE_TESTS[@]} + do + for format in ${APL_FORMAT_TESTS[@]} + do + simple_test nocodec $mode "NoCodec" $format $ssp s16le 20 16 1920000 19200000 $protocol + simple_test nocodec $mode "NoCodec" $format $ssp s24le 25 24 2400000 19200000 $protocol + + simple_test nocodec $mode "SSP${ssp}-Codec" $format $ssp s16le 20 16 1920000 19200000 $protocol + simple_test nocodec $mode "SSP${ssp}-Codec" $format $ssp s24le 25 24 2400000 19200000 $protocol + done + done + simple_test nocodec passthrough "NoCodec" s16le $ssp s16le 20 16 1920000 19200000 $protocol + simple_test nocodec passthrough "NoCodec" s24le $ssp s24le 25 24 2400000 19200000 $protocol + + simple_test codec passthrough "SSP${ssp}-Codec" s16le $ssp s16le 20 16 1920000 19200000 $protocol + simple_test codec passthrough "SSP${ssp}-Codec" s24le $ssp s24le 25 24 2400000 19200000 $protocol + done +done # for CNL simple_test nocodec volume "NoCodec" s16le 2 s16le 25 16 2400000 24000000 I2S -- 2.14.1

2 1

[Sound-open-firmware] [PATCH] topology: rename topologies to use sof prefix
by Liam Girdwood 13 Apr '18

13 Apr '18

Use sof- prefix instead of reef- Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- topology/Makefile.am | 54 ++++++----- topology/reef-bxt-nocodec.m4 | 100 --------------------- .../{reef-apl-nocodec.m4 => sof-apl-nocodec.m4} | 0 .../{reef-apl-tdf8532.m4 => sof-apl-tdf8532.m4} | 0 topology/{reef-bdw-rt286.m4 => sof-bdw-rt286.m4} | 0 topology/{reef-bdw-rt5640.m4 => sof-bdw-rt5640.m4} | 0 topology/{reef-byt-da7213.m4 => sof-byt-da7213.m4} | 0 .../{reef-byt-nocodec.m4 => sof-byt-nocodec.m4} | 0 topology/{reef-byt-rt5640.m4 => sof-byt-rt5640.m4} | 0 topology/{reef-byt-rt5645.m4 => sof-byt-rt5645.m4} | 0 topology/{reef-byt-rt5651.m4 => sof-byt-rt5651.m4} | 0 .../{reef-cht-max98090.m4 => sof-cht-max98090.m4} | 0 .../{reef-cht-nocodec.m4 => sof-cht-nocodec.m4} | 0 topology/{reef-cnl-rt274.m4 => sof-cnl-rt274.m4} | 0 topology/{reef-hsw-rt5640.m4 => sof-hsw-rt5640.m4} | 0 15 files changed, 26 insertions(+), 128 deletions(-) delete mode 100644 topology/reef-bxt-nocodec.m4 rename topology/{reef-apl-nocodec.m4 => sof-apl-nocodec.m4} (100%) rename topology/{reef-apl-tdf8532.m4 => sof-apl-tdf8532.m4} (100%) rename topology/{reef-bdw-rt286.m4 => sof-bdw-rt286.m4} (100%) rename topology/{reef-bdw-rt5640.m4 => sof-bdw-rt5640.m4} (100%) rename topology/{reef-byt-da7213.m4 => sof-byt-da7213.m4} (100%) rename topology/{reef-byt-nocodec.m4 => sof-byt-nocodec.m4} (100%) rename topology/{reef-byt-rt5640.m4 => sof-byt-rt5640.m4} (100%) rename topology/{reef-byt-rt5645.m4 => sof-byt-rt5645.m4} (100%) rename topology/{reef-byt-rt5651.m4 => sof-byt-rt5651.m4} (100%) rename topology/{reef-cht-max98090.m4 => sof-cht-max98090.m4} (100%) rename topology/{reef-cht-nocodec.m4 => sof-cht-nocodec.m4} (100%) rename topology/{reef-cnl-rt274.m4 => sof-cnl-rt274.m4} (100%) rename topology/{reef-hsw-rt5640.m4 => sof-hsw-rt5640.m4} (100%) diff --git a/topology/Makefile.am b/topology/Makefile.am index 31d266e..73e10e9 100644 --- a/topology/Makefile.am +++ b/topology/Makefile.am @@ -16,20 +16,19 @@ DEPS = \ # MACHINES = \ - reef-cht-nocodec.tplg \ - reef-cht-max98090.tplg \ - reef-apl-nocodec.tplg \ - reef-bxt-nocodec.tplg \ - reef-byt-nocodec.tplg \ - reef-bdw-rt286.tplg \ - reef-bdw-rt5640.tplg \ - reef-byt-rt5640.tplg \ - reef-byt-rt5645.tplg \ - reef-byt-rt5651.tplg \ - reef-byt-da7213.tplg \ - reef-cnl-rt274.tplg \ - reef-hsw-rt5640.tplg \ - reef-apl-tdf8532.tplg + sof-cht-nocodec.tplg \ + sof-cht-max98090.tplg \ + sof-apl-nocodec.tplg \ + sof-byt-nocodec.tplg \ + sof-bdw-rt286.tplg \ + sof-bdw-rt5640.tplg \ + sof-byt-rt5640.tplg \ + sof-byt-rt5645.tplg \ + sof-byt-rt5651.tplg \ + sof-byt-da7213.tplg \ + sof-cnl-rt274.tplg \ + sof-hsw-rt5640.tplg \ + sof-apl-tdf8532.tplg # Uncomment the following line if you want to debug conf files .PRECIOUS: %.conf @@ -47,17 +46,16 @@ clean-local: rm -f *.tplg EXTRA_DIST = \ - reef-cht-nocodec.m4 \ - reef-cht-max98090.m4 \ - reef-apl-nocodec.m4 \ - reef-bxt-nocodec.m4 \ - reef-byt-nocodec.m4 \ - reef-bdw-rt286.m4 \ - reef-bdw-rt5640.m4 \ - reef-byt-rt5640.m4 \ - reef-byt-rt5645.m4 \ - reef-byt-rt5651.m4 \ - reef-byt-da7213.m4 \ - reef-cnl-rt274.m4 \ - reef-hsw-rt5640.m4 \ - reef-apl-tdf8532.m4 + sof-cht-nocodec.m4 \ + sof-cht-max98090.m4 \ + sof-apl-nocodec.m4 \ + sof-byt-nocodec.m4 \ + sof-bdw-rt286.m4 \ + sof-bdw-rt5640.m4 \ + sof-byt-rt5640.m4 \ + sof-byt-rt5645.m4 \ + sof-byt-rt5651.m4 \ + sof-byt-da7213.m4 \ + sof-cnl-rt274.m4 \ + sof-hsw-rt5640.m4 \ + sof-apl-tdf8532.m4 diff --git a/topology/reef-bxt-nocodec.m4 b/topology/reef-bxt-nocodec.m4 deleted file mode 100644 index 7e2b624..0000000 --- a/topology/reef-bxt-nocodec.m4 +++ /dev/null @@ -1,100 +0,0 @@ -# -# Topology for generic Broxton board with no codec. -# - -# Include topology builder -include(`utils.m4') -include(`dai.m4') -include(`pipeline.m4') - -# Include TLV library -include(`common/tlv.m4') - -# Include Token library -include(`sof/tokens.m4') - -# Include Broxton DSP configuration -include(`dsps/bxt.m4') - -# -# Define the pipelines -# -# PCM0 ----> volume ---------------+ -# |--low latency mixer ----> volume ----> SSP2 -# PCM2 ----> SRC -----> volume ----+ -# | -# Tone -----> volume ----+ -# -# PCM1 <---- Volume <---- SSP2 -# - -# Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline on core 0 with priority 0 -# Use DMAC 0 channel 1 for PCM audio playback data -PIPELINE_PCM_ADD(sof/pipe-low-latency-playback.m4, - 1, 0, 2, s32le, - 48, 1000, 0, 0, 0, 1) - -# Low Latency capture pipeline 2 on PCM 0 using max 2 channels of s32le. -# Schedule 48 frames per 1000us deadline on core 0 with priority 0 -# Use DMAC 0 channel 2 for PCM audio capture data -PIPELINE_PCM_ADD(sof/pipe-low-latency-capture.m4, - 2, 0, 2, s32le, - 48, 1000, 0, 0, 0, 2) - -# PCM Media Playback pipeline 3 on PCM 1 using max 2 channels of s32le. -# Schedule 192 frames per 4000us deadline on core 0 with priority 1 -# Use DMAC 0 channel 3 for PCM audio playback data -PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4, - 3, 1, 2, s32le, - 192, 4000, 1, 0, 0, 3) - -# Tone Playback pipeline 5 using max 2 channels of s32le. -# Schedule 192 frames per 4000us deadline on core 0 with priority 2 -PIPELINE_ADD(sof/pipe-tone.m4, - 5, 2, s32le, - 192, 4000, 2, 0) - -# Connect pipelines together -SectionGraph."pipe-bxt-nocodec" { - index "0" - - lines [ - # media 0 - dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_3) - #tone - dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_5) - ] -} - -# -# DAI configuration -# -# SSP port 2 is our only pipeline DAI -# - -# playback DAI is SSP2 using 2 periods -# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 -DAI_ADD(sof/pipe-dai-playback.m4, - 1, SSP, 2, NoCodec, - PIPELINE_SOURCE_1, 2, s24le, - 48, 1000, 0, 0) - -# capture DAI is SSP2 using 2 periods -# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 -DAI_ADD(sof/pipe-dai-capture.m4, - 2, SSP, 2, NoCodec, - PIPELINE_SINK_2, 2, s24le, - 48, 1000, 0, 0) - -# PCM Low Latency -PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) - -# -# BE configurations - overrides config in ACPI if present -# -DAI_CONFIG(SSP, 2, NoCodec, I2S, 24, - DAI_CLOCK(mclk, 19200000, slave), - DAI_CLOCK(bclk, 2400000, slave), - DAI_CLOCK(fsync, 48000, slave), - DAI_TDM(2, 25, 3, 3)) diff --git a/topology/reef-apl-nocodec.m4 b/topology/sof-apl-nocodec.m4 similarity index 100% rename from topology/reef-apl-nocodec.m4 rename to topology/sof-apl-nocodec.m4 diff --git a/topology/reef-apl-tdf8532.m4 b/topology/sof-apl-tdf8532.m4 similarity index 100% rename from topology/reef-apl-tdf8532.m4 rename to topology/sof-apl-tdf8532.m4 diff --git a/topology/reef-bdw-rt286.m4 b/topology/sof-bdw-rt286.m4 similarity index 100% rename from topology/reef-bdw-rt286.m4 rename to topology/sof-bdw-rt286.m4 diff --git a/topology/reef-bdw-rt5640.m4 b/topology/sof-bdw-rt5640.m4 similarity index 100% rename from topology/reef-bdw-rt5640.m4 rename to topology/sof-bdw-rt5640.m4 diff --git a/topology/reef-byt-da7213.m4 b/topology/sof-byt-da7213.m4 similarity index 100% rename from topology/reef-byt-da7213.m4 rename to topology/sof-byt-da7213.m4 diff --git a/topology/reef-byt-nocodec.m4 b/topology/sof-byt-nocodec.m4 similarity index 100% rename from topology/reef-byt-nocodec.m4 rename to topology/sof-byt-nocodec.m4 diff --git a/topology/reef-byt-rt5640.m4 b/topology/sof-byt-rt5640.m4 similarity index 100% rename from topology/reef-byt-rt5640.m4 rename to topology/sof-byt-rt5640.m4 diff --git a/topology/reef-byt-rt5645.m4 b/topology/sof-byt-rt5645.m4 similarity index 100% rename from topology/reef-byt-rt5645.m4 rename to topology/sof-byt-rt5645.m4 diff --git a/topology/reef-byt-rt5651.m4 b/topology/sof-byt-rt5651.m4 similarity index 100% rename from topology/reef-byt-rt5651.m4 rename to topology/sof-byt-rt5651.m4 diff --git a/topology/reef-cht-max98090.m4 b/topology/sof-cht-max98090.m4 similarity index 100% rename from topology/reef-cht-max98090.m4 rename to topology/sof-cht-max98090.m4 diff --git a/topology/reef-cht-nocodec.m4 b/topology/sof-cht-nocodec.m4 similarity index 100% rename from topology/reef-cht-nocodec.m4 rename to topology/sof-cht-nocodec.m4 diff --git a/topology/reef-cnl-rt274.m4 b/topology/sof-cnl-rt274.m4 similarity index 100% rename from topology/reef-cnl-rt274.m4 rename to topology/sof-cnl-rt274.m4 diff --git a/topology/reef-hsw-rt5640.m4 b/topology/sof-hsw-rt5640.m4 similarity index 100% rename from topology/reef-hsw-rt5640.m4 rename to topology/sof-hsw-rt5640.m4 -- 2.14.1

2 2

[Sound-open-firmware] [PATCH] apl-ssp: fix padding bit issues in I2S/LEFT_J mode
by Pierre-Louis Bossart 13 Apr '18

13 Apr '18

The current code doesn't work for I2S/LEFT_J when the slot width and number of valid bits don't match (e.g. 24 bit data in 32-bit slot). In I2S/LEFT_J mode, the padding is not at the end of the frame but at the end of each slot, and is evenly distributed between the two left and right phases. Fix by using DMYSTOP for I2S/LEFT_J, and only program SSPSP2 for DSP_A and DSP_B modes Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- src/drivers/apl-ssp.c | 79 ++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 63 insertions(+), 16 deletions(-) diff --git a/src/drivers/apl-ssp.c b/src/drivers/apl-ssp.c index a02d934..3a97cb8 100644 --- a/src/drivers/apl-ssp.c +++ b/src/drivers/apl-ssp.c @@ -107,6 +107,7 @@ static inline int ssp_set_config(struct dai *dai, uint32_t data_size; uint32_t start_delay; uint32_t frame_end_padding; + uint32_t slot_end_padding; uint32_t frame_len = 0; uint32_t bdiv_min; uint32_t tft; @@ -299,6 +300,20 @@ static inline int ssp_set_config(struct dai *dai, goto out; } + bdiv_min = config->ssp.tdm_slots * config->ssp.sample_valid_bits; + if (bdiv < bdiv_min) { + trace_ssp_error("ecc"); + ret = -EINVAL; + goto out; + } + + frame_end_padding = bdiv - bdiv_min; + if (frame_end_padding > SSPSP2_FEP_MASK) { + trace_ssp_error("ecd"); + ret = -EINVAL; + goto out; + } + /* format */ switch (config->format & SOF_DAI_FMT_FORMAT_MASK) { case SOF_DAI_FMT_I2S: @@ -325,6 +340,28 @@ static inline int ssp_set_config(struct dai *dai, sspsp |= SSPSP_SFRMP(inverted_frame); sspsp |= SSPSP_FSRT; + /* + * for I2S/LEFT_J, the padding has to happen at the end + * of each slot + */ + if (frame_end_padding % 2) { + trace_ssp_error("ece"); + ret = -EINVAL; + goto out; + } + + slot_end_padding = frame_end_padding / 2; + + if (slot_end_padding > 15) { + /* can't handle padding over 15 bits */ + trace_ssp_error("ecf"); + ret = -EINVAL; + goto out; + } + + sspsp |= SSPSP_EDMYSTOP((slot_end_padding >> 2) & 0x3); + sspsp |= SSPSP_DMYSTOP(slot_end_padding & 0x3); + break; case SOF_DAI_FMT_LEFT_J: @@ -353,6 +390,28 @@ static inline int ssp_set_config(struct dai *dai, */ sspsp |= SSPSP_SFRMP(!inverted_frame); + /* + * for I2S/LEFT_J, the padding has to happen at the end + * of each slot + */ + if (frame_end_padding % 2) { + trace_ssp_error("ecg"); + ret = -EINVAL; + goto out; + } + + slot_end_padding = frame_end_padding / 2; + + if (slot_end_padding > 15) { + /* can't handle padding over 15 bits */ + trace_ssp_error("ech"); + ret = -EINVAL; + goto out; + } + + sspsp |= SSPSP_EDMYSTOP((slot_end_padding >> 2) & 0x3); + sspsp |= SSPSP_DMYSTOP(slot_end_padding & 0x3); + break; case SOF_DAI_FMT_DSP_A: @@ -375,6 +434,8 @@ static inline int ssp_set_config(struct dai *dai, active_tx_slots = hweight_32(config->ssp.tx_slots); active_rx_slots = hweight_32(config->ssp.rx_slots); + sspsp2 |= (frame_end_padding & SSPSP2_FEP_MASK); + break; case SOF_DAI_FMT_DSP_B: @@ -396,6 +457,8 @@ static inline int ssp_set_config(struct dai *dai, active_tx_slots = hweight_32(config->ssp.tx_slots); active_rx_slots = hweight_32(config->ssp.rx_slots); + sspsp2 |= (frame_end_padding & SSPSP2_FEP_MASK); + break; default: trace_ssp_error("eca"); @@ -406,22 +469,6 @@ static inline int ssp_set_config(struct dai *dai, sspsp |= SSPSP_STRTDLY(start_delay); sspsp |= SSPSP_SFRMWDTH(frame_len); - bdiv_min = config->ssp.tdm_slots * config->ssp.sample_valid_bits; - if (bdiv < bdiv_min) { - trace_ssp_error("ecc"); - ret = -EINVAL; - goto out; - } - - frame_end_padding = bdiv - bdiv_min; - if (frame_end_padding > SSPSP2_FEP_MASK) { - trace_ssp_error("ecd"); - ret = -EINVAL; - goto out; - } - - sspsp2 |= (frame_end_padding & SSPSP2_FEP_MASK); - data_size = config->ssp.sample_valid_bits; if (data_size > 16) -- 2.14.1

3 4

[Sound-open-firmware] [PATCH] configure: check for doxygen and graphviz to build docs
by Liam Girdwood 13 Apr '18

13 Apr '18

Documentation needs doxygen and graphviz so warn if they are not installed. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- configure.ac | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/configure.ac b/configure.ac index 2765f0e4..d67c1546 100644 --- a/configure.ac +++ b/configure.ac @@ -327,6 +327,16 @@ PEM_KEY_PREFIX="/usr/local/share/rimage" AC_DEFINE_UNQUOTED([PEM_KEY_PREFIX], ["$PEM_KEY_PREFIX"], ["Path for PEM keys"]) AC_SUBST(PEM_KEY_PREFIX) +# Check for doxygen and graphviz - used by make doc +AC_CHECK_PROG(have_doxygen, doxygen, true, false) +if test "$have_doxygen" = "false"; then + AC_MSG_WARN([Need doxygen to build documentation]) +fi +AC_CHECK_PROG(have_graphviz, dot, true, false) +if test "$have_graphviz" = "false"; then + AC_MSG_WARN([Need graphviz to build documentation]) +fi + AM_EXTRA_RECURSIVE_TARGETS([bin]) AM_EXTRA_RECURSIVE_TARGETS([vminstall]) -- 2.14.1

1 0

[Sound-open-firmware] [PATCH] apl-ssp: allow for 19.2 MHz SSP reference
by Pierre-Louis Bossart 13 Apr '18

13 Apr '18

Don't hard-code MCLK source on ApolloLake, use settings provided over IPC to select 24.576 MHz PLL or 19.2 MHz XTAL oscillator. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- src/drivers/apl-ssp.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/drivers/apl-ssp.c b/src/drivers/apl-ssp.c index 3a97cb8..8f9bc14 100644 --- a/src/drivers/apl-ssp.c +++ b/src/drivers/apl-ssp.c @@ -479,7 +479,17 @@ static inline int ssp_set_config(struct dai *dai, #ifdef CONFIG_CANNONLAKE mdivc = 0x1; #else - mdivc = 0x00100001; + if (config->ssp.mclk_rate == 24576000) { + /* enable PLL, bypass M/N dividers */ + mdivc = 0x00100001; + } else if (config->ssp.mclk_rate == 19200000) { + /* no PLL, use XTAl oscillator as source */ + mdivc = 0; + } else { + trace_ssp_error("eci"); + ret = -EINVAL; + goto out; + } #endif /* bypass divider for MCLK */ mdivr = 0x00000fff; -- 2.14.1

2 2

[Sound-open-firmware] [PATCH] Makefile support for doc target.
by Liam Girdwood 13 Apr '18

13 Apr '18

From: Marcin Maka <marcin.maka(a)linux.intel.com> Builds uapi documentation in html format using doxygen. See doc/sof_uapi/html/index.html First dox samples in the source code provided by the patch. Signed-off-by: Marcin Maka <marcin.maka(a)linux.intel.com> --- .gitignore | 2 ++ Makefile.am | 7 ++++++- configure.ac | 1 + doc/Makefile.am | 10 ++++++++++ doc/sof_uapi.doxygen.in | 33 +++++++++++++++++++++++++++++++++ src/include/uapi/abi.h | 30 ++++++++++++++++++++---------- src/include/uapi/ipc.h | 17 ++++++++++++----- src/include/uapi/manifest.h | 15 ++++++++++++++- 8 files changed, 98 insertions(+), 17 deletions(-) create mode 100644 doc/Makefile.am create mode 100644 doc/sof_uapi.doxygen.in diff --git a/.gitignore b/.gitignore index 4c5b67bc..c03c83ef 100644 --- a/.gitignore +++ b/.gitignore @@ -37,6 +37,8 @@ m4/lt* m4/libtool.m4 libtool src/include/version.h +doc/sof_uapi +*.doxygen autom4te* config.* diff --git a/Makefile.am b/Makefile.am index 1e4de766..ee8df72b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ if BUILD_RIMAGE SUBDIRS = rimage else -SUBDIRS = src +SUBDIRS = doc src endif ACLOCAL_AMFLAGS = -I m4 @@ -39,5 +39,10 @@ dist-hook: cat .version > $(distdir)/.tarball-version cat .version > $(distdir)/.version +doc-dummy: + +doc: doc-dummy + $(MAKE) -C doc doc + all-local: rm -f $(top_srcdir)/src/include/version.h diff --git a/configure.ac b/configure.ac index 6bd1323c..2765f0e4 100644 --- a/configure.ac +++ b/configure.ac @@ -335,6 +335,7 @@ AC_CONFIG_FILES([ Makefile rimage/Makefile rimage/keys/Makefile + doc/Makefile src/Makefile src/tasks/Makefile src/init/Makefile diff --git a/doc/Makefile.am b/doc/Makefile.am new file mode 100644 index 00000000..200c55bc --- /dev/null +++ b/doc/Makefile.am @@ -0,0 +1,10 @@ +EXTRA_DIST=sof_uapi.doxygen + +AM_CPPFLAGS=-I$(top_srcdir)/include + +doc: + test -e sof_uapi.doxygen || sed s:[@]top_srcdir[@]:..:g sof_uapi.doxygen.in > sof_uapi.doxygen + doxygen sof_uapi.doxygen + +doc-clean: + rm -rf $(top_srcdir)/doc/sof_uapi/* diff --git a/doc/sof_uapi.doxygen.in b/doc/sof_uapi.doxygen.in new file mode 100644 index 00000000..74052f1a --- /dev/null +++ b/doc/sof_uapi.doxygen.in @@ -0,0 +1,33 @@ +PROJECT_NAME = "Sound Open Firmware" +OUTPUT_DIRECTORY = sof_uapi +GENERATE_LATEX = NO +GENERATE_RTF = NO +GENERATE_MAN = NO +GENERATE_XML = YES + +CASE_SENSE_NAMES = NO +INPUT = @top_srcdir@/src/include/uapi +EXCLUDE = +RECURSIVE = YES +FILE_PATTERNS = *.c *.h +EXAMPLE_PATH = ../test +IMAGE_PATH = +QUIET = YES + +EXTRACT_ALL = NO +EXTRACT_STATIC = NO +SHOW_INCLUDE_FILES = NO +JAVADOC_AUTOBRIEF = NO +INHERIT_DOCS = YES +ENABLED_SECTIONS = "" +MACRO_EXPANSION = YES +EXPAND_ONLY_PREDEF = YES +PREDEFINED = + +OPTIMIZE_OUTPUT_FOR_C = YES +TYPEDEF_HIDES_STRUCT = YES + +#INPUT_FILTER = inputfilter +#FILTER_SOURCE_FILES = YES + +HTML_TIMESTAMP = NO diff --git a/src/include/uapi/abi.h b/src/include/uapi/abi.h index 8b700a89..cb28aea4 100644 --- a/src/include/uapi/abi.h +++ b/src/include/uapi/abi.h @@ -28,24 +28,34 @@ * Author: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> */ +/** + * \file include/uapi/abi.h + * \brief ABI definitions + * \author Liam Girdwood <liam.r.girdwood(a)linux.intel.com> + */ + #ifndef __INCLUDE_UAPI_ABI_H__ #define __INCLUDE_UAPI_ABI_H__ +/** \brief SOF ABI version number. */ #define SOF_ABI_VERSION 1 -#define SOF_ABI_MAGIC 0x00464F53 /* "SOF\0" */ -/* - * Header for all non IPC ABI data. Identifies data type, size and ABI. +/** \brief SOF ABI magic number "SOF\0". */ +#define SOF_ABI_MAGIC 0x00464F53 + +/** + * \brief Header for all non IPC ABI data. + * + * Identifies data type, size and ABI. * Used by any bespoke component data structures or binary blobs. */ - struct sof_abi_hdr { - uint32_t magic; /* 'S', 'O', 'F', '\0' */ - uint32_t type; /* component specific type */ - uint32_t size; /* size in bytes of data excluding this struct */ - uint32_t abi; /* SOF ABI version */ - uint32_t comp_abi; /* component specific ABI version */ - char data[0]; + uint32_t magic; /**< 'S', 'O', 'F', '\0' */ + uint32_t type; /**< component specific type */ + uint32_t size; /**< size in bytes of data excl. this struct */ + uint32_t abi; /**< SOF ABI version */ + uint32_t comp_abi; /**< component specific ABI version */ + char data[0]; /**< data */ } __attribute__((packed)); #endif diff --git a/src/include/uapi/ipc.h b/src/include/uapi/ipc.h index 396a3c49..7d0a9a44 100644 --- a/src/include/uapi/ipc.h +++ b/src/include/uapi/ipc.h @@ -29,6 +29,13 @@ * Keyon Jie <yang.jie(a)linux.intel.com> */ +/** + * \file include/uapi/ipc.h + * \brief IPC definitions + * \author Liam Girdwood <liam.r.girdwood(a)linux.intel.com> + * \author Keyon Jie <yang.jie(a)linux.intel.com> + */ + #ifndef __INCLUDE_UAPI_IPC_H__ #define __INCLUDE_UAPI_IPC_H__ @@ -219,12 +226,12 @@ struct sof_ipc_compound_hdr { #define SOF_DAI_FMT_INV_MASK 0x0f00 #define SOF_DAI_FMT_MASTER_MASK 0xf000 -/* types of DAI */ +/** \brief Types of DAI */ enum sof_ipc_dai_type { - SOF_DAI_INTEL_NONE = 0, - SOF_DAI_INTEL_SSP, - SOF_DAI_INTEL_DMIC, - SOF_DAI_INTEL_HDA, + SOF_DAI_INTEL_NONE = 0, /**< None */ + SOF_DAI_INTEL_SSP, /**< Intel SSP */ + SOF_DAI_INTEL_DMIC, /**< Intel DMIC */ + SOF_DAI_INTEL_HDA, /**< Intel HD/A */ }; /* SSP Configuration Request - SOF_IPC_DAI_SSP_CONFIG */ diff --git a/src/include/uapi/manifest.h b/src/include/uapi/manifest.h index f53a6628..c1dce92f 100644 --- a/src/include/uapi/manifest.h +++ b/src/include/uapi/manifest.h @@ -28,6 +28,12 @@ * Author: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> */ +/** + * \file include/uapi/ipc.h + * \brief FW Image Manifest definitions. + * \author Liam Girdwood <liam.r.girdwood(a)linux.intel.com> + */ + #ifndef SOF_UAPI_MANIFEST_H #define SOF_UAPI_MANIFEST_H @@ -211,7 +217,14 @@ struct sof_man_module_manifest { uint32_t text_size; }; -/* utility to get module pointer from position */ +/** + * \brief Utility to get module pointer from position. + * \param [in,out] desc FW descriptor in manifest. + * \param [in] index Index of the module. + * \return Pointer to module descriptor. + * + * Note that index is not verified against OOB. + */ static inline struct sof_man_module *sof_man_get_module( struct sof_man_fw_desc *desc, int index) { -- 2.14.1

1 0

[Sound-open-firmware] [PATCH] library: fix errors with host library build
by Ranjani Sridharan 13 Apr '18

13 Apr '18

This patch fixes compilation errors in host libary build due to missing header file and changes in mailbox defs. Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- src/arch/host/include/arch/sof.h | 3 --- src/arch/host/include/arch/string.h | 40 ++++++++++++++++++++++++++++++++++ src/library/include/platform/mailbox.h | 22 +++++++++---------- src/library/include/platform/memory.h | 3 ++- 4 files changed, 53 insertions(+), 15 deletions(-) create mode 100644 src/arch/host/include/arch/string.h diff --git a/src/arch/host/include/arch/sof.h b/src/arch/host/include/arch/sof.h index 75d0b25..ce2bd69 100644 --- a/src/arch/host/include/arch/sof.h +++ b/src/arch/host/include/arch/sof.h @@ -42,9 +42,6 @@ /* architecture specific stack frames to dump */ #define ARCH_STACK_DUMP_FRAMES 32 -#define arch_memcpy(dest, src, size) \ - memcpy(dest, src, size) - static inline void *arch_get_stack_ptr(void) { void *frames[ARCH_STACK_DUMP_FRAMES]; diff --git a/src/arch/host/include/arch/string.h b/src/arch/host/include/arch/string.h new file mode 100644 index 0000000..56258b3 --- /dev/null +++ b/src/arch/host/include/arch/string.h @@ -0,0 +1,40 @@ +/* + * 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: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> + * + */ + +#ifndef __INCLUDE_ARCH_STRING_SOF__ +#define __INCLUDE_ARCH_STRING_SOF__ + +void *xthal_memcpy(void *dst, const void *src, size_t len); + +#define arch_memcpy(dest, src, size) \ + xthal_memcpy(dest, src, size) + +#endif diff --git a/src/library/include/platform/mailbox.h b/src/library/include/platform/mailbox.h index 650ab47..b03887e 100644 --- a/src/library/include/platform/mailbox.h +++ b/src/library/include/platform/mailbox.h @@ -28,25 +28,25 @@ * Author: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> */ -#ifndef __INCLUDE_PLATFORM_HOST_MAILBOX__ -#define __INCLUDE_PLATFORM_HOST_MAILBOX__ +#ifndef __INCLUDE_PLATFORM_MAILBOX__ +#define __INCLUDE_PLATFORM_MAILBOX__ #include <platform/memory.h> #define MAILBOX_HOST_OFFSET 0x144000 -#define MAILBOX_OUTBOX_OFFSET 0x0 -#define MAILBOX_OUTBOX_SIZE 0x400 -#define MAILBOX_OUTBOX_BASE \ - (MAILBOX_BASE + MAILBOX_OUTBOX_OFFSET) +#define MAILBOX_DSPBOX_OFFSET 0x0 +#define MAILBOX_DSPBOX_SIZE 0x400 +#define MAILBOX_DSPBOX_BASE \ + (MAILBOX_BASE + MAILBOX_DSPBOX_OFFSET) -#define MAILBOX_INBOX_OFFSET MAILBOX_OUTBOX_SIZE -#define MAILBOX_INBOX_SIZE 0x400 -#define MAILBOX_INBOX_BASE \ - (MAILBOX_BASE + MAILBOX_INBOX_OFFSET) +#define MAILBOX_HOSTBOX_OFFSET MAILBOX_DSPBOX_SIZE +#define MAILBOX_HOSTBOX_SIZE 0x400 +#define MAILBOX_HOSTBOX_BASE \ + (MAILBOX_BASE + MAILBOX_HOSTBOX_OFFSET) #define MAILBOX_EXCEPTION_OFFSET \ - (MAILBOX_INBOX_SIZE + MAILBOX_OUTBOX_SIZE) + (MAILBOX_HOSTBOX_SIZE + MAILBOX_DSPBOX_SIZE) #define MAILBOX_EXCEPTION_SIZE 0x100 #define MAILBOX_EXCEPTION_BASE \ (MAILBOX_BASE + MAILBOX_EXCEPTION_OFFSET) diff --git a/src/library/include/platform/memory.h b/src/library/include/platform/memory.h index ed7de10..00a9ad2 100644 --- a/src/library/include/platform/memory.h +++ b/src/library/include/platform/memory.h @@ -41,6 +41,8 @@ #define PLATFORM_HEAP_RUNTIME 1 #define PLATFORM_HEAP_BUFFER 3 +#define MAILBOX_BASE 0xFF344000 + #if 0 /* physical DSP addresses */ @@ -51,7 +53,6 @@ #define DRAM0_SIZE 0x00028000 #define DRAM0_VBASE 0xC0000000 -#define MAILBOX_BASE (DRAM0_BASE + DRAM0_SIZE - 0x2000) /* HEAP Constants - WARNING this MUST be aligned with the linker script */ -- 2.14.1

1 1