August 2017 - Sound-open-firmware - mailman.alsa-project.org

[Sound-open-firmware] [PATCH] dai: config: Use a generic structure for DAI configuration
by Liam Girdwood 21 Aug '17

21 Aug '17

Use a generic structure containing common DAI settings for configuration. This structure also contains a tail of DAI specific data that can also be used by DAI drivers. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/audio/dai.c | 31 +++++++-------- src/drivers/ssp.c | 52 ++++++++++++------------- src/include/reef/audio/component.h | 7 ++-- src/include/reef/dai.h | 16 ++------ src/include/reef/ipc.h | 2 +- src/include/reef/ssp.h | 1 + src/include/uapi/ipc.h | 77 ++++++++++++++++++++++++-------------- src/ipc/intel-ipc.c | 31 ++++++--------- src/ipc/ipc.c | 2 +- 9 files changed, 110 insertions(+), 109 deletions(-) diff --git a/src/audio/dai.c b/src/audio/dai.c index 4464398..c89103d 100644 --- a/src/audio/dai.c +++ b/src/audio/dai.c @@ -544,26 +544,23 @@ static int dai_position(struct comp_dev *dev, struct sof_ipc_stream_posn *posn) return 0; } -static int dai_config(struct comp_dev *dev, struct dai_config *dai_config) +static int dai_config(struct comp_dev *dev, struct sof_ipc_dai_config *config) { - struct dai_data *dd = comp_get_drvdata(dev); - - switch (dai_config->type) { - case DAI_TYPE_INTEL_SSP: - switch (dai_config->ssp->frame_width) { - case 16: - dd->sample_width = 2; - break; - case 17 ... 32: - dd->sample_width = 4; - break; - default: - trace_dai_error("eft"); - return -EINVAL; - } + /* calc frame bytes */ + switch (config->sample_valid_bits) { + case 16: + dev->frame_bytes = 2 * config->num_slots; + break; + case 17 ... 32: + dev->frame_bytes = 4 * config->num_slots; break; default: - dd->sample_width = 2; + break; + } + + if (dev->frame_bytes == 0) { + trace_dai_error("de1"); + return -EINVAL; } return 0; diff --git a/src/drivers/ssp.c b/src/drivers/ssp.c index 2146f83..1a1000a 100644 --- a/src/drivers/ssp.c +++ b/src/drivers/ssp.c @@ -65,12 +65,12 @@ static int ssp_context_restore(struct dai *dai) } /* Digital Audio interface formatting */ -static inline int ssp_set_config(struct dai *dai, struct dai_config *dai_config) +static inline int ssp_set_config(struct dai *dai, + struct sof_ipc_dai_config *config) { struct ssp_pdata *ssp = dai_get_drvdata(dai); - struct sof_ipc_dai_ssp_params *params = &ssp->params; uint32_t sscr0, sscr1, sspsp, sfifott, mdiv, bdiv; - uint32_t stop_size, phy_frame_size, data_size; + uint32_t stop_size, data_size; int ret = 0; spin_lock(&ssp->lock); @@ -88,10 +88,15 @@ static inline int ssp_set_config(struct dai *dai, struct dai_config *dai_config) sscr0 = 0; sscr1 = 0; sspsp = 0; - ssp->params = *dai_config->ssp; + + ssp->config = *config; + ssp->params = config->ssp[0]; + + /* TODO: allow topology to define SSP clock type */ + config->ssp[0].clk_id = SSP_CLK_EXT; /* clock masters */ - switch (params->format & SOF_DAI_FMT_MASTER_MASK) { + switch (config->format & SOF_DAI_FMT_MASTER_MASK) { case SOF_DAI_FMT_CBM_CFM: sscr1 |= SSCR1_SCLKDIR | SSCR1_SFRMDIR; break; @@ -112,7 +117,7 @@ static inline int ssp_set_config(struct dai *dai, struct dai_config *dai_config) } /* clock signal polarity */ - switch (params->format & SOF_DAI_FMT_INV_MASK) { + switch (config->format & SOF_DAI_FMT_INV_MASK) { case SOF_DAI_FMT_NB_NF: break; case SOF_DAI_FMT_NB_IF: @@ -129,7 +134,7 @@ static inline int ssp_set_config(struct dai *dai, struct dai_config *dai_config) } /* clock source */ - switch (params->clk_id) { + switch (config->ssp[0].clk_id) { case SSP_CLK_AUDIO: sscr0 |= SSCR0_ACS; break; @@ -148,14 +153,14 @@ static inline int ssp_set_config(struct dai *dai, struct dai_config *dai_config) } /* BCLK is generated from MCLK - must be divisable */ - if (params->mclk % params->bclk) { + if (config->mclk % config->bclk) { trace_ssp_error("ec1"); ret = -EINVAL; goto out; } /* divisor must be within SCR range */ - mdiv = (params->mclk / params->bclk)- 1; + mdiv = (config->mclk / config->bclk)- 1; if (mdiv > (SSCR0_SCR_MASK >> 8)) { trace_ssp_error("ec2"); ret = -EINVAL; @@ -166,23 +171,22 @@ static inline int ssp_set_config(struct dai *dai, struct dai_config *dai_config) sscr0 |= SSCR0_SCR(mdiv); /* calc frame width based on BCLK and rate - must be divisable */ - if (params->bclk % params->fclk) { + if (config->bclk % config->fclk) { trace_ssp_error("ec3"); ret = -EINVAL; goto out; } /* must be enouch BCLKs for data */ - bdiv = params->bclk / params->fclk; - if (bdiv < params->frame_width * params->num_slots) { + bdiv = config->bclk / config->fclk; + if (bdiv < config->sample_container_bits * config->num_slots) { trace_ssp_error("ec4"); ret = -EINVAL; goto out; } - /* physical frame size must be <= 38 */ - phy_frame_size = bdiv / params->num_slots; - if (phy_frame_size > 38) { + /* sample_container_bits must be <= 38 for SSP */ + if (config->sample_container_bits > 38) { trace_ssp_error("ec5"); ret = -EINVAL; goto out; @@ -190,14 +194,14 @@ static inline int ssp_set_config(struct dai *dai, struct dai_config *dai_config) trace_value(mdiv); trace_value(bdiv); - trace_value(phy_frame_size); /* format */ - switch (params->format & SOF_DAI_FMT_FORMAT_MASK) { + switch (config->format & SOF_DAI_FMT_FORMAT_MASK) { case SOF_DAI_FMT_I2S: /* calculate dummy stop size and include dummy start */ - stop_size = phy_frame_size - params->frame_width - 1; + stop_size = config->sample_container_bits - + (config->sample_valid_bits) - 1; trace_value(stop_size); if (stop_size > 3) { trace_ssp_error("ec6"); @@ -207,9 +211,9 @@ static inline int ssp_set_config(struct dai *dai, struct dai_config *dai_config) sscr0 |= SSCR0_PSP; sscr1 |= SSCR1_TRAIL; - sspsp |= SSPSP_SFRMWDTH(phy_frame_size); + sspsp |= SSPSP_SFRMWDTH(config->sample_container_bits); /* subtract 1 for I2S start delay */ - sspsp |= SSPSP_SFRMDLY((phy_frame_size - 1) * 2); + sspsp |= SSPSP_SFRMDLY((config->sample_container_bits - 1) * 2); sspsp |= SSPSP_DMYSTRT(1); sspsp |= SSPSP_DMYSTOP(stop_size); break; @@ -225,16 +229,12 @@ static inline int ssp_set_config(struct dai *dai, struct dai_config *dai_config) } /* sample data size on SSP FIFO */ - switch (params->frame_width) { + switch (config->sample_valid_bits) { case 16: /* 2 * 16bit packed into 32bit FIFO */ - case 24: /* 1 * 24bit in 32bit FIFO (8 MSBs not used) */ - case 32: /* 1 * 32bit packed into 32bit FIFO */ data_size = 32; break; default: - trace_ssp_error("ec7"); - ret = -EINVAL; - goto out; + data_size = config->sample_valid_bits; } if (data_size > 16) diff --git a/src/include/reef/audio/component.h b/src/include/reef/audio/component.h index a74395c..260fbda 100644 --- a/src/include/reef/audio/component.h +++ b/src/include/reef/audio/component.h @@ -122,7 +122,8 @@ struct comp_ops { int (*preload)(struct comp_dev *dev); /* set component audio stream paramters */ - int (*dai_config)(struct comp_dev *dev, struct dai_config *dai_config); + int (*dai_config)(struct comp_dev *dev, + struct sof_ipc_dai_config *dai_config); /* used to pass standard and bespoke commands (with data) to component */ int (*cmd)(struct comp_dev *dev, int cmd, void *data); @@ -261,10 +262,10 @@ static inline int comp_reset(struct comp_dev *dev) /* DAI configuration - only mandatory for DAI components */ static inline int comp_dai_config(struct comp_dev *dev, - struct dai_config *dai_config) + struct sof_ipc_dai_config *config) { if (dev->drv->ops.dai_config) - return dev->drv->ops.dai_config(dev, dai_config); + return dev->drv->ops.dai_config(dev, config); return 0; } diff --git a/src/include/reef/dai.h b/src/include/reef/dai.h index 258b016..75eabce 100644 --- a/src/include/reef/dai.h +++ b/src/include/reef/dai.h @@ -58,7 +58,7 @@ struct dai; /* DAI operations - all optional */ struct dai_ops { - int (*set_config)(struct dai *dai, struct dai_config *dai_config); + int (*set_config)(struct dai *dai, struct sof_ipc_dai_config *config); int (*trigger)(struct dai *dai, int cmd, int direction); int (*pm_context_restore)(struct dai *dai); int (*pm_context_store)(struct dai *dai); @@ -78,15 +78,6 @@ enum dai_type { DAI_TYPE_INTEL_DMIC, }; -/* DAI runtime hardware configuration */ -struct dai_config { - enum dai_type type; - union { - struct sof_ipc_dai_ssp_params *ssp; - struct sof_ipc_dai_hda_params *hda; - struct sof_ipc_dai_dmic_params *dmic; - }; -}; struct dai_plat_fifo_data { uint32_t offset; @@ -126,9 +117,10 @@ struct dai *dai_get(uint32_t type, uint32_t index); dai->plat_data.fifo[direction].offset /* Digital Audio interface formatting */ -static inline int dai_set_config(struct dai *dai, struct dai_config *dai_config) +static inline int dai_set_config(struct dai *dai, + struct sof_ipc_dai_config *config) { - return dai->ops->set_config(dai, dai_config); + return dai->ops->set_config(dai, config); } /* Digital Audio interface formatting */ diff --git a/src/include/reef/ipc.h b/src/include/reef/ipc.h index 96f2924..253f4f4 100644 --- a/src/include/reef/ipc.h +++ b/src/include/reef/ipc.h @@ -157,6 +157,6 @@ struct ipc_comp_dev *ipc_get_comp(struct ipc *ipc, uint32_t id); /* * Configure all DAI components attached to DAI. */ -int ipc_comp_dai_config(struct ipc *ipc, struct dai_config *config); +int ipc_comp_dai_config(struct ipc *ipc, struct sof_ipc_dai_config *config); #endif diff --git a/src/include/reef/ssp.h b/src/include/reef/ssp.h index 77d7b2e..7e557ed 100644 --- a/src/include/reef/ssp.h +++ b/src/include/reef/ssp.h @@ -153,6 +153,7 @@ struct ssp_pdata { spinlock_t lock; uint32_t state[2]; /* SSP_STATE_ for each direction */ completion_t drain_complete; + struct sof_ipc_dai_config config; struct sof_ipc_dai_ssp_params params; }; diff --git a/src/include/uapi/ipc.h b/src/include/uapi/ipc.h index 19ee898..ddca551 100644 --- a/src/include/uapi/ipc.h +++ b/src/include/uapi/ipc.h @@ -99,10 +99,8 @@ #define SOF_IPC_COMP_GET_SRC SOF_CMD_TYPE(0x007) /* DAI messages */ -#define SOF_IPC_COMP_SSP_CONFIG SOF_CMD_TYPE(0x000) -#define SOF_IPC_COMP_HDA_CONFIG SOF_CMD_TYPE(0x001) -#define SOF_IPC_COMP_DMIC_CONFIG SOF_CMD_TYPE(0x002) -#define SOF_IPC_COMP_LOOPBACK SOF_CMD_TYPE(0x003) +#define SOF_IPC_DAI_CONFIG SOF_CMD_TYPE(0x001) +#define SOF_IPC_DAI_LOOPBACK SOF_CMD_TYPE(0x002) /* stream */ #define SOF_IPC_STREAM_PCM_PARAMS SOF_CMD_TYPE(0x001) @@ -193,37 +191,68 @@ struct sof_ipc_compound_hdr { #define SOF_DAI_FMT_INV_MASK 0x0f00 #define SOF_DAI_FMT_MASTER_MASK 0xf000 +/* 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, +}; + /* SSP Configuration Request - SOF_IPC_DAI_SSP_CONFIG */ struct sof_ipc_dai_ssp_params { struct sof_ipc_hdr hdr; - uint32_t mclk; - uint32_t bclk; - uint32_t fclk; - uint16_t ssp_id; uint16_t mode; - uint16_t num_slots; - uint16_t frame_width; uint16_t clk_id; - uint16_t format; /* SOF_DAI_FMT_ */ - uint16_t mclk_master; } __attribute__((packed)); /* HDA Configuration Request - SOF_IPC_DAI_HDA_CONFIG */ struct sof_ipc_dai_hda_params { struct sof_ipc_hdr hdr; - uint32_t hda_id; - uint32_t mclk; /* TODO */ } __attribute__((packed)); /* DMIC Configuration Request - SOF_IPC_DAI_DMIC_CONFIG */ struct sof_ipc_dai_dmic_params { struct sof_ipc_hdr hdr; - uint32_t dmic_id; - uint32_t mclk; /* TODO */ } __attribute__((packed)); + +/* general purpose DAI configuration */ +struct sof_ipc_dai_config { + struct sof_ipc_hdr hdr; + enum sof_ipc_dai_type type; + uint32_t id; /* physical number if more than 1 of this type */ + + /* physical protocol and clocking */ + uint16_t format; /* SOF_DAI_FMT_ */ + uint16_t reserved; /* alignment */ + uint32_t mclk; /* mclk frequency in Hz */ + uint32_t bclk; /* bclk frequency in Hz */ + uint32_t fclk; /* cclk frequency in Hz */ + + /* TDM */ + uint32_t num_slots; + uint32_t rx_slot_mask; + uint32_t tx_slot_mask; + + /* data */ + uint16_t sample_valid_bits; + uint16_t sample_container_bits; + + /* MCLK */ + uint16_t mclk_always_run; + uint16_t mclk_master; + + /* HW specific data */ + union { + struct sof_ipc_dai_ssp_params ssp[0]; + struct sof_ipc_dai_hda_params hda[0]; + struct sof_ipc_dai_dmic_params dmic[0]; + }; +}; + /* * Stream configuration. */ @@ -325,9 +354,11 @@ struct sof_ipc_stream_params { enum sof_ipc_buffer_format buffer_fmt; uint32_t rate; uint32_t channels; - uint32_t sample_size; + uint32_t sample_valid_bytes; + uint32_t sample_container_bytes; /* for notifying host period has completed - 0 means no period IRQ */ uint32_t host_period_bytes; + enum sof_ipc_chmap chmap[SOF_IPC_MAX_CHANNELS]; /* channel map */ } __attribute__((packed)); /* PCM params info - SOF_IPC_STREAM_PCM_PARAMS */ @@ -454,25 +485,13 @@ struct sof_ipc_buffer { uint32_t size; /* buffer size in bytes */ } __attribute__((packed)); -/* 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, -}; /* generic component config data */ struct sof_ipc_comp_config { - uint32_t format; /* data format */ - uint32_t frames; /* number of frames to process, 0 is variable */ - uint32_t channels; /* max number of channels */ - uint32_t frame_size; /* sample size in bytes */ uint32_t periods_sink; /* 0 means variable */ uint32_t periods_source; /* 0 means variable */ uint32_t preload_count; /* how many periods to preload */ enum sof_ipc_frame frame_fmt; - enum sof_ipc_chmap chmap[SOF_IPC_MAX_CHANNELS]; /* channel map */ } __attribute__((packed)); /* generic host component */ diff --git a/src/ipc/intel-ipc.c b/src/ipc/intel-ipc.c index 2d73fbb..81b30b5 100644 --- a/src/ipc/intel-ipc.c +++ b/src/ipc/intel-ipc.c @@ -400,39 +400,32 @@ static int ipc_glb_stream_message(uint32_t header) * DAI IPC Operations. */ -static int ipc_dai_ssp_config(uint32_t header) +static int ipc_dai_config(uint32_t header) { - struct sof_ipc_dai_ssp_params *ssp = _ipc->comp_data; - struct dai_config dai_config; + struct sof_ipc_dai_config *config = _ipc->comp_data; struct dai *dai; int ret; trace_ipc("DsF"); - /* TODO: set type in topology */ - dai_config.type = DAI_TYPE_INTEL_SSP; - dai_config.ssp = ssp; - - /* TODO: allow topology to define SSP clock type */ - dai_config.ssp->clk_id = SSP_CLK_EXT; - /* get DAI */ - dai = dai_get(SOF_DAI_INTEL_SSP, ssp->ssp_id); + dai = dai_get(config->type, config->id); if (dai == NULL) { trace_ipc_error("eDi"); - trace_value(ssp->ssp_id); + trace_value(config->type); + trace_value(config->id); return -ENODEV; } /* configure DAI */ - ret = dai_set_config(dai, &dai_config); + ret = dai_set_config(dai, config); if (ret < 0) { trace_ipc_error("eDC"); return ret; } - /* now send params to all components who use that DAI */ - return ipc_comp_dai_config(_ipc, &dai_config); + /* now send params to all DAI components who use that physical DAI */ + return ipc_comp_dai_config(_ipc, config); } static int ipc_glb_dai_message(uint32_t header) @@ -440,12 +433,10 @@ static int ipc_glb_dai_message(uint32_t header) uint32_t cmd = (header & SOF_CMD_TYPE_MASK) >> SOF_CMD_TYPE_SHIFT; switch (cmd) { - case iCS(SOF_IPC_COMP_SSP_CONFIG): - return ipc_dai_ssp_config(header); - case iCS(SOF_IPC_COMP_LOOPBACK): + case iCS(SOF_IPC_DAI_CONFIG): + return ipc_dai_config(header); + case iCS(SOF_IPC_DAI_LOOPBACK): //return ipc_comp_set_value(header, COMP_CMD_LOOPBACK); - case iCS(SOF_IPC_COMP_HDA_CONFIG): - case iCS(SOF_IPC_COMP_DMIC_CONFIG): default: trace_ipc_error("eDc"); trace_value(header); diff --git a/src/ipc/ipc.c b/src/ipc/ipc.c index 530fee9..323468b 100644 --- a/src/ipc/ipc.c +++ b/src/ipc/ipc.c @@ -307,7 +307,7 @@ void ipc_pipeline_complete(struct ipc *ipc, uint32_t comp_id) pipeline_complete(ipc_pipe->pipeline); } -int ipc_comp_dai_config(struct ipc *ipc, struct dai_config *config) +int ipc_comp_dai_config(struct ipc *ipc, struct sof_ipc_dai_config *config) { struct ipc_comp_dev *icd; struct list_item *clist; -- 2.11.0

1 5

[Sound-open-firmware] [PATCH] topology: Add sample bits to DAI_CONFIG
by Liam Girdwood 21 Aug '17

21 Aug '17

Add a token for number of bits in a sample for DAI configs Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- topology/m4/local.m4 | 29 +++++++++++++++++++++++++++-- topology/reef-apl-nocodec.m4 | 4 ++-- topology/reef-bdw-rt286.m4 | 4 ++-- topology/reef-bdw-rt5640.m4 | 4 ++-- topology/reef-bxt-nocodec.m4 | 4 ++-- topology/reef-byt-nocodec.m4 | 4 ++-- topology/reef-byt-rt5640.m4 | 4 ++-- topology/reef-byt-rt5651.m4 | 4 ++-- topology/reef-cht-nocodec.m4 | 4 ++-- topology/reef-hsw-rt5640.m4 | 4 ++-- topology/sof/tokens.m4 | 1 + 11 files changed, 46 insertions(+), 20 deletions(-) diff --git a/topology/m4/local.m4 b/topology/m4/local.m4 index a14f310..a559670 100644 --- a/topology/m4/local.m4 +++ b/topology/m4/local.m4 @@ -394,17 +394,38 @@ define(`DAI_TDM', ` rx_slots 'STR($4) ) -dnl DAI_CONFIG(type, idx, name, sname, format, mclk, bclk, fsync, tdm) +dnl Pipeline name) +define(`N_DAI_CONFIG', `DAICONFIG.'$1) + +dnl DAI_CONFIG(type, idx, name, sname, format, valid bits, mclk, bclk, fsync, tdm) define(`DAI_CONFIG', `SectionHWConfig."'$1$2`" {' `' ` id "'$2`"' ` format "'$5`"' `' -` '$6 ` '$7 ` '$8 ` '$9 +` '$10 +`}' +`SectionVendorTuples."'N_DAI_CONFIG($1$2)`_tuples_str" {' +` tokens "sof_dai_tokens"' +` tuples."string" {' +` SOF_TKN_DAI_TYPE' STR($1) +` }' +`}' +`SectionData."'N_DAI_CONFIG($1$2)`_data_str" {' +` tuples "'N_DAI_CONFIG($1$2)`_tuples_str"' +`}' +`SectionVendorTuples."'N_DAI_CONFIG($1$2)`_tuples" {' +` tokens "sof_dai_tokens"' +` tuples."word" {' +` SOF_TKN_DAI_SAMPLE_BITS' STR($6) +` }' +`}' +`SectionData."'N_DAI_CONFIG($1$2)`_data" {' +` tuples "'N_DAI_CONFIG($1$2)`_tuples"' `}' `' `SectionBE."'$3`" {' @@ -414,6 +435,10 @@ define(`DAI_CONFIG', ` hw_configs [' ` "'$1$2`"' ` ]' +` data [' +` "'N_DAI_CONFIG($1$2)`_data"' +` "'N_DAI_CONFIG($1$2)`_data_str"' +` ]' `}') dnl COMP_SAMPLE_SIZE(FMT) diff --git a/topology/reef-apl-nocodec.m4 b/topology/reef-apl-nocodec.m4 index 93febe0..93b57fe 100644 --- a/topology/reef-apl-nocodec.m4 +++ b/topology/reef-apl-nocodec.m4 @@ -82,8 +82,8 @@ DAI_ADD(sof/pipe-dai-capture.m4, SSP, 2, I2S, PIPELINE_SINK_2, 2) # # BE configurations - overrides config in ACPI if present # -DAI_CONFIG(SSP, 2, NoCodec, I2S, I2S, +DAI_CONFIG(SSP, 2, NoCodec, I2S, I2S, 24, DAI_CLOCK(mclk, 19200000, slave), DAI_CLOCK(bclk, 2400000, slave), DAI_CLOCK(fsync, 48000, slave), - DAI_TDM(2, 24, 3, 3)) + DAI_TDM(2, 25, 3, 3)) diff --git a/topology/reef-bdw-rt286.m4 b/topology/reef-bdw-rt286.m4 index 4135353..e4b600a 100644 --- a/topology/reef-bdw-rt286.m4 +++ b/topology/reef-bdw-rt286.m4 @@ -82,8 +82,8 @@ DAI_ADD(sof/pipe-dai-capture.m4, SSP, 0, I2S, PIPELINE_SINK_2, 2) # # BE configurations - overrides config in ACPI if present # -DAI_CONFIG(SSP, 0, Codec, I2S, I2S, +DAI_CONFIG(SSP, 0, Codec, I2S, I2S, 24, DAI_CLOCK(mclk, 24000000, slave), DAI_CLOCK(bclk, 2400000, slave), DAI_CLOCK(fsync, 48000, slave), - DAI_TDM(2, 24, 3, 3)) + DAI_TDM(2, 25, 3, 3)) diff --git a/topology/reef-bdw-rt5640.m4 b/topology/reef-bdw-rt5640.m4 index 540ac4c..5d96236 100644 --- a/topology/reef-bdw-rt5640.m4 +++ b/topology/reef-bdw-rt5640.m4 @@ -82,8 +82,8 @@ DAI_ADD(sof/pipe-dai-capture.m4, SSP, 0, I2S, PIPELINE_SINK_2, 2) # # BE configurations - overrides config in ACPI if present # -DAI_CONFIG(SSP, 0, Codec, I2S, I2S, +DAI_CONFIG(SSP, 0, Codec, I2S, I2S, 24, DAI_CLOCK(mclk, 24000000, slave), DAI_CLOCK(bclk, 2400000, slave), DAI_CLOCK(fsync, 48000, slave), - DAI_TDM(2, 24, 3, 3)) + DAI_TDM(2, 25, 3, 3)) diff --git a/topology/reef-bxt-nocodec.m4 b/topology/reef-bxt-nocodec.m4 index 564e78c..a8fd320 100644 --- a/topology/reef-bxt-nocodec.m4 +++ b/topology/reef-bxt-nocodec.m4 @@ -82,8 +82,8 @@ DAI_ADD(sof/pipe-dai-capture.m4, SSP, 2, I2S, PIPELINE_SINK_2, 2) # # BE configurations - overrides config in ACPI if present # -DAI_CONFIG(SSP, 2, NoCodec, I2S, I2S, +DAI_CONFIG(SSP, 2, NoCodec, I2S, I2S, 24, DAI_CLOCK(mclk, 19200000, slave), DAI_CLOCK(bclk, 2400000, slave), DAI_CLOCK(fsync, 48000, slave), - DAI_TDM(2, 24, 3, 3)) + DAI_TDM(2, 25, 3, 3)) diff --git a/topology/reef-byt-nocodec.m4 b/topology/reef-byt-nocodec.m4 index ab0cd8e..96e2e4b 100644 --- a/topology/reef-byt-nocodec.m4 +++ b/topology/reef-byt-nocodec.m4 @@ -82,8 +82,8 @@ DAI_ADD(sof/pipe-dai-capture.m4, SSP, 2, I2S, PIPELINE_SINK_2, 2) # # BE configurations - overrides config in ACPI if present # -DAI_CONFIG(SSP, 2, NoCodec, I2S, I2S, +DAI_CONFIG(SSP, 2, NoCodec, I2S, I2S, 24, DAI_CLOCK(mclk, 19200000, slave), DAI_CLOCK(bclk, 2400000, slave), DAI_CLOCK(fsync, 48000, slave), - DAI_TDM(2, 24, 3, 3)) + DAI_TDM(2, 25, 3, 3)) diff --git a/topology/reef-byt-rt5640.m4 b/topology/reef-byt-rt5640.m4 index 2cee093..c135fed 100644 --- a/topology/reef-byt-rt5640.m4 +++ b/topology/reef-byt-rt5640.m4 @@ -82,8 +82,8 @@ DAI_ADD(sof/pipe-dai-capture.m4, SSP, 2, I2S, PIPELINE_SINK_2, 2) # # BE configurations - overrides config in ACPI if present # -DAI_CONFIG(SSP, 2, Baytrail Audio, Audio, I2S, +DAI_CONFIG(SSP, 2, Baytrail Audio, Audio, I2S, 24, DAI_CLOCK(mclk, 19200000, slave), DAI_CLOCK(bclk, 2400000, slave), DAI_CLOCK(fsync, 48000, slave), - DAI_TDM(2, 24, 3, 3)) + DAI_TDM(2, 25, 3, 3)) diff --git a/topology/reef-byt-rt5651.m4 b/topology/reef-byt-rt5651.m4 index 4679343..877492a 100644 --- a/topology/reef-byt-rt5651.m4 +++ b/topology/reef-byt-rt5651.m4 @@ -82,8 +82,8 @@ DAI_ADD(sof/pipe-dai-capture.m4, SSP, 2, I2S, PIPELINE_SINK_2, 2) # # BE configurations - overrides config in ACPI if present # -DAI_CONFIG(SSP, 2, Baytrail Audio, Audio, I2S, +DAI_CONFIG(SSP, 2, Baytrail Audio, Audio, I2S, 24, DAI_CLOCK(mclk, 19200000, slave), DAI_CLOCK(bclk, 2400000, slave), DAI_CLOCK(fsync, 48000, slave), - DAI_TDM(2, 24, 3, 3)) + DAI_TDM(2, 25, 3, 3)) diff --git a/topology/reef-cht-nocodec.m4 b/topology/reef-cht-nocodec.m4 index f754551..381ff12 100644 --- a/topology/reef-cht-nocodec.m4 +++ b/topology/reef-cht-nocodec.m4 @@ -82,8 +82,8 @@ DAI_ADD(sof/pipe-dai-capture.m4, SSP, 2, I2S, PIPELINE_SINK_2, 2) # # BE configurations - overrides config in ACPI if present # -DAI_CONFIG(SSP, 2, NoCodec, I2S, I2S, +DAI_CONFIG(SSP, 2, NoCodec, I2S, I2S, 24, DAI_CLOCK(mclk, 19200000, slave), DAI_CLOCK(bclk, 2400000, slave), DAI_CLOCK(fsync, 48000, slave), - DAI_TDM(2, 24, 3, 3)) + DAI_TDM(2, 25, 3, 3)) diff --git a/topology/reef-hsw-rt5640.m4 b/topology/reef-hsw-rt5640.m4 index cbbbfbe..3a76223 100644 --- a/topology/reef-hsw-rt5640.m4 +++ b/topology/reef-hsw-rt5640.m4 @@ -82,8 +82,8 @@ DAI_ADD(sof/pipe-dai-capture.m4, SSP, 0, I2S, PIPELINE_SINK_2, 2) # # BE configurations - overrides config in ACPI if present # -DAI_CONFIG(SSP, 0, Codec, I2S, I2S, +DAI_CONFIG(SSP, 0, Codec, I2S, I2S, 24, DAI_CLOCK(mclk, 24000000, slave), DAI_CLOCK(bclk, 2400000, slave), DAI_CLOCK(fsync, 48000, slave), - DAI_TDM(2, 24, 3, 3)) + DAI_TDM(2, 25, 3, 3)) diff --git a/topology/sof/tokens.m4 b/topology/sof/tokens.m4 index 3902c36..530220a 100644 --- a/topology/sof/tokens.m4 +++ b/topology/sof/tokens.m4 @@ -19,6 +19,7 @@ SectionVendorTokens."sof_dai_tokens" { SOF_TKN_DAI_DMAC_CONFIG "153" SOF_TKN_DAI_TYPE "154" SOF_TKN_DAI_INDEX "155" + SOF_TKN_DAI_SAMPLE_BITS "156" } SectionVendorTokens."sof_sched_tokens" { -- 2.11.0

1 2

[Sound-open-firmware] [PATCH] topology: pipelines: give more headroom for buffer size refinement
by Liam Girdwood 16 Aug '17

16 Aug '17

Give the ALSA HW refinement code more headroom for buffer calculations to provide more buffering options. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- topology/sof/pipe-low-latency-capture.m4 | 2 +- topology/sof/pipe-low-latency-playback.m4 | 4 ++-- topology/sof/pipe-passthrough-playback.m4 | 4 ++-- topology/sof/pipe-pcm-media.m4 | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/topology/sof/pipe-low-latency-capture.m4 b/topology/sof/pipe-low-latency-capture.m4 index ca9fe9c..3b53d0a 100644 --- a/topology/sof/pipe-low-latency-capture.m4 +++ b/topology/sof/pipe-low-latency-capture.m4 @@ -98,7 +98,7 @@ SectionPCMCapabilities.STR(Low Latency Capture PCM_ID) { periods_max "4" period_size_min "192" period_size_max "16384" - buffer_size_min "384" + buffer_size_min "65536" buffer_size_max "65536" } diff --git a/topology/sof/pipe-low-latency-playback.m4 b/topology/sof/pipe-low-latency-playback.m4 index a8e3fa5..00f7447 100644 --- a/topology/sof/pipe-low-latency-playback.m4 +++ b/topology/sof/pipe-low-latency-playback.m4 @@ -161,10 +161,10 @@ SectionPCMCapabilities.STR(Low Latency Playback PCM_ID) { channels_min "2" channels_max "2" periods_min "2" - periods_max "4" + periods_max "16" period_size_min "192" period_size_max "16384" - buffer_size_min "384" + buffer_size_min "65536" buffer_size_max "65536" } diff --git a/topology/sof/pipe-passthrough-playback.m4 b/topology/sof/pipe-passthrough-playback.m4 index 1fc76c7..98b479f 100644 --- a/topology/sof/pipe-passthrough-playback.m4 +++ b/topology/sof/pipe-passthrough-playback.m4 @@ -58,10 +58,10 @@ SectionPCMCapabilities.STR(Passthrough Playback PCM_ID) { channels_min "2" channels_max "4" periods_min "2" - periods_max "4" + periods_max "16" period_size_min "192" period_size_max "16384" - buffer_size_min "384" + buffer_size_min "65536" buffer_size_max "65536" } diff --git a/topology/sof/pipe-pcm-media.m4 b/topology/sof/pipe-pcm-media.m4 index ac2aaa7..fd6db04 100644 --- a/topology/sof/pipe-pcm-media.m4 +++ b/topology/sof/pipe-pcm-media.m4 @@ -129,7 +129,7 @@ SectionPCMCapabilities.STR(Media Playback PCM_ID) { periods_max "32" period_size_min "4096" period_size_max "262144" - buffer_size_min "8192" + buffer_size_min "8388608" buffer_size_max "8388608" } -- 1.9.1

1 1

[Sound-open-firmware] [PATCH] trace: comp: Make high frequency trace output verbose level
by Liam Girdwood 15 Aug '17

15 Aug '17

make sure our high frequency component and pipeline trace uses verbose trace level. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/audio/dai.c | 2 +- src/audio/host.c | 4 ++-- src/audio/mixer.c | 2 +- src/audio/pipeline.c | 4 ++-- src/audio/volume.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/audio/dai.c b/src/audio/dai.c index 518836a..8f41026 100644 --- a/src/audio/dai.c +++ b/src/audio/dai.c @@ -80,7 +80,7 @@ static void dai_dma_cb(void *data, uint32_t type, struct dma_sg_elem *next) struct comp_buffer *dma_buffer; uint32_t copied_size; - trace_dai("irq"); + tracev_dai("irq"); if (dev->params.direction == SOF_IPC_STREAM_PLAYBACK) { dma_buffer = list_first_item(&dev->bsource_list, diff --git a/src/audio/host.c b/src/audio/host.c index 944edfe..5ac2cf4 100644 --- a/src/audio/host.c +++ b/src/audio/host.c @@ -120,7 +120,7 @@ static void host_dma_cb(void *data, uint32_t type, struct dma_sg_elem *next) local_elem = list_first_item(&hd->config.elem_list, struct dma_sg_elem, list); - trace_host("irq"); + tracev_host("irq"); /* update buffer positions */ dma_buffer = hd->dma_buffer; @@ -615,7 +615,7 @@ static int host_copy(struct comp_dev *dev) struct host_data *hd = comp_get_drvdata(dev); struct sof_ipc_comp_config *config = COMP_GET_CONFIG(dev); - trace_host("cpy"); + tracev_host("cpy"); if (dev->state != COMP_STATE_RUNNING) return 0; diff --git a/src/audio/mixer.c b/src/audio/mixer.c index cc4701f..74c0ffb 100644 --- a/src/audio/mixer.c +++ b/src/audio/mixer.c @@ -203,7 +203,7 @@ static int mixer_copy(struct comp_dev *dev) struct list_item *blist; int32_t i = 0, num_mix_sources = 0; - trace_mixer("cpy"); + tracev_mixer("cpy"); /* calculate the highest runtime component status between input streams */ list_for_item(blist, &dev->bsource_list) { diff --git a/src/audio/pipeline.c b/src/audio/pipeline.c index 5674877..185b4f3 100644 --- a/src/audio/pipeline.c +++ b/src/audio/pipeline.c @@ -716,13 +716,13 @@ static void pipeline_task(void *arg) struct task *task = &p->pipe_task; struct comp_dev *dev = task->sdata; - trace_pipe("PWs"); + tracev_pipe("PWs"); /* copy data from upstream source enpoints to downstream endpoints */ pipeline_copy_from_upstream(dev, dev); pipeline_copy_to_downstream(dev, dev); - trace_pipe("PWe"); + tracev_pipe("PWe"); } /* init pipeline */ diff --git a/src/audio/volume.c b/src/audio/volume.c index d0c3e4a..33ac07d 100644 --- a/src/audio/volume.c +++ b/src/audio/volume.c @@ -483,7 +483,7 @@ static int volume_copy(struct comp_dev *dev) struct sof_ipc_comp_config *config = COMP_GET_CONFIG(dev); uint32_t copy_bytes; - trace_volume("cpy"); + tracev_volume("cpy"); /* volume components will only ever have 1 source and 1 sink buffer */ source = list_first_item(&dev->bsource_list, struct comp_buffer, sink_list); -- 2.11.0

1 5

[Sound-open-firmware] [PATCH] pipeline: static: move static buffer sizes out of platform header
by Liam Girdwood 10 Aug '17

10 Aug '17

Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/audio/pipeline_static.c | 8 ++++++++ src/platform/baytrail/include/platform/platform.h | 7 ------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/audio/pipeline_static.c b/src/audio/pipeline_static.c index d52afda..d08bb98 100644 --- a/src/audio/pipeline_static.c +++ b/src/audio/pipeline_static.c @@ -45,6 +45,14 @@ #include <reef/audio/component.h> #include <reef/audio/pipeline.h> + +/* 2 * 32 bit*/ +#define PLATFORM_INT_FRAME_SIZE 8 +/* 2 * 16 bit*/ +#define PLATFORM_HOST_FRAME_SIZE 4 +/* 2 * 24 (32) bit*/ +#define PLATFORM_DAI_FRAME_SIZE 8 + /* * Static Buffer Convenience Constructors. */ diff --git a/src/platform/baytrail/include/platform/platform.h b/src/platform/baytrail/include/platform/platform.h index 8dac653..222ffd2 100644 --- a/src/platform/baytrail/include/platform/platform.h +++ b/src/platform/baytrail/include/platform/platform.h @@ -67,13 +67,6 @@ struct reef; #define PLATFORM_MAX_CHANNELS 4 #define PLATFORM_MAX_STREAMS 5 -/* TODO: get this from IPC - 2 * 32 bit*/ -#define PLATFORM_INT_FRAME_SIZE 8 -/* TODO: get this from IPC - 2 * 16 bit*/ -#define PLATFORM_HOST_FRAME_SIZE 4 -/* TODO: get this from IPC - 2 * 24 (32) bit*/ -#define PLATFORM_DAI_FRAME_SIZE 8 - /* Platform Host DMA buffer config - these should align with DMA engine */ #define PLAT_HOST_PERIOD_FRAMES 48 /* must be multiple of DMA burst size */ #define PLAT_HOST_PERIODS 2 /* give enough latency for DMA refill */ -- 2.11.0

1 4

[Sound-open-firmware] [PATCH] trace: provide locking around trace output.
by Liam Girdwood 09 Aug '17

09 Aug '17

Make sure trace mailbox writes are atomic and provide reef context. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/include/reef/trace.h | 2 ++ src/init/init.c | 2 ++ src/lib/trace.c | 41 +++++++++++++++++++++++++++++++---------- 3 files changed, 35 insertions(+), 10 deletions(-) diff --git a/src/include/reef/trace.h b/src/include/reef/trace.h index 00dbb5b..300e8d8 100644 --- a/src/include/reef/trace.h +++ b/src/include/reef/trace.h @@ -34,6 +34,7 @@ #include <stdint.h> #include <stdlib.h> +#include <reef/reef.h> #include <reef/mailbox.h> #include <reef/debug.h> #include <reef/timer.h> @@ -94,6 +95,7 @@ void _trace_event(uint32_t event); void trace_off(void); +void trace_init(struct reef * reef); #if TRACE diff --git a/src/init/init.c b/src/init/init.c index 1dc1237..491a6ad 100644 --- a/src/init/init.c +++ b/src/init/init.c @@ -65,6 +65,8 @@ int main(int argc, char *argv[]) trace_point(TRACE_BOOT_SYS_HEAP); init_heap(&reef); + trace_init(&reef); + trace_point(TRACE_BOOT_SYS_NOTE); init_system_notify(&reef); diff --git a/src/lib/trace.c b/src/lib/trace.c index 79d026e..5da7c95 100644 --- a/src/lib/trace.c +++ b/src/lib/trace.c @@ -29,34 +29,55 @@ */ #include <reef/trace.h> +#include <reef/reef.h> +#include <reef/alloc.h> #include <arch/cache.h> +#include <platform/timer.h> +#include <reef/lock.h> #include <stdint.h> -/* trace position */ -static uint32_t trace_pos = 0; -static uint32_t trace_enable = 1; +struct trace { + uint32_t pos ; /* trace position */ + uint32_t enable; + spinlock_t lock; +}; + +static struct trace trace; void _trace_event(uint32_t event) { - volatile uint32_t *t = - (volatile uint32_t*)(MAILBOX_TRACE_BASE + trace_pos); + unsigned long flags; + volatile uint32_t *t; - if (!trace_enable) + if (!trace.enable) return; + spin_lock_irq(&trace.lock, flags); + /* write timestamp and event to trace buffer */ + t =(volatile uint32_t*)(MAILBOX_TRACE_BASE + trace.pos); t[0] = platform_timer_get(0); t[1] = event; /* writeback trace data */ dcache_writeback_region((void*)t, sizeof(uint32_t) * 2); - trace_pos += (sizeof(uint32_t) << 1); - if (trace_pos >= MAILBOX_TRACE_SIZE) - trace_pos = 0; + trace.pos += (sizeof(uint32_t) << 1); + + if (trace.pos >= MAILBOX_TRACE_SIZE) + trace.pos = 0; + + spin_unlock_irq(&trace.lock, flags); } void trace_off(void) { - trace_enable = 0; + trace.enable = 0; }; + +void trace_init(struct reef *reef) +{ + trace.enable = 1; + trace.pos = 0; + spinlock_init(&trace.lock); +} -- 2.11.0

1 0

[Sound-open-firmware] [PATCH] Incorrect trace variable name
by Curtis Malainey 09 Aug '17

09 Aug '17

Minor debugging issue, when verbose trace is turned on it will not compile because these variables are incorrect. --- src/audio/eq_fir.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/audio/eq_fir.c b/src/audio/eq_fir.c index ae87f92..41c6d38 100644 --- a/src/audio/eq_fir.c +++ b/src/audio/eq_fir.c @@ -323,9 +323,9 @@ static int eq_fir_cmd(struct comp_dev *dev, int cmd, void *data) fir_update, PLATFORM_MAX_CHANNELS); /* Print trace information */ - tracev_value(iir_update->stream_max_channels); + tracev_value(fir_update->stream_max_channels); for (i = 0; i < fir_update->stream_max_channels; i++) - tracev_value(iir_update->assign_response[i]); + tracev_value(fir_update->assign_response[i]); break; case COMP_CMD_EQ_FIR_CONFIG: -- 2.14.0.rc1.383.gd1ce394fe2-goog

4 4

[Sound-open-firmware] [PATCH] arch: xtensa: generate a disassembly output fro debug.
by Liam Girdwood 09 Aug '17

09 Aug '17

Also generate a disassembly with no interleaved source for easier memory debugging. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/arch/xtensa/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/src/arch/xtensa/Makefile.am b/src/arch/xtensa/Makefile.am index 28d99bf..828db91 100644 --- a/src/arch/xtensa/Makefile.am +++ b/src/arch/xtensa/Makefile.am @@ -71,6 +71,7 @@ reef_LDFLAGS = \ bin-local: reef $(OBJCOPY) -O binary reef reef-$(FW_NAME).bin $(OBJDUMP) -S reef > reef-$(FW_NAME).lst + $(OBJDUMP) -D reef > reef-$(FW_NAME).dis rimage -i reef -o reef-$(FW_NAME).ri -m $(FW_NAME) vminstall-local: -- 2.11.0

1 0

[Sound-open-firmware] [PATCH] build: Generate separate .map and .lst files.
by Liam Girdwood 09 Aug '17

09 Aug '17

From: Rajavardhan Gundi <rajavardhan.gundi(a)intel.com> Signed-off-by: Rajavardhan Gundi <rajavardhan.gundi(a)intel.com> --- src/arch/xtensa/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/arch/xtensa/Makefile.am b/src/arch/xtensa/Makefile.am index e9f8f5d..28d99bf 100644 --- a/src/arch/xtensa/Makefile.am +++ b/src/arch/xtensa/Makefile.am @@ -65,12 +65,12 @@ reef_LDADD = \ -lgcc reef_LDFLAGS = \ - $(ARCH_LDFLAGS) \ + $(ARCH_LDFLAGS) -Wl,-Map=reef-$(FW_NAME).map \ -T ../../platform/$(PLATFORM)/$(PLATFORM_LDSCRIPT) bin-local: reef $(OBJCOPY) -O binary reef reef-$(FW_NAME).bin - $(OBJDUMP) -h -D reef > reef-$(FW_NAME).map + $(OBJDUMP) -S reef > reef-$(FW_NAME).lst rimage -i reef -o reef-$(FW_NAME).ri -m $(FW_NAME) vminstall-local: -- 2.9.4

1 0

[Sound-open-firmware] [PATCH 1/5] topology: Add token support for PCMs and components buffers.
by Liam Girdwood 09 Aug '17

09 Aug '17

Add topology tokens for PCM and buffer configuration. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- topology/sof/tokens.m4 | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/topology/sof/tokens.m4 b/topology/sof/tokens.m4 index 1ec48df..3902c36 100644 --- a/topology/sof/tokens.m4 +++ b/topology/sof/tokens.m4 @@ -11,13 +11,14 @@ SectionVendorTokens."sof_buffer_tokens" { SOF_TKN_BUF_SIZE "100" - SOF_TKN_BUF_PRELOAD "101" } SectionVendorTokens."sof_dai_tokens" { SOF_TKN_DAI_DMAC "151" SOF_TKN_DAI_DMAC_CHAN "152" SOF_TKN_DAI_DMAC_CONFIG "153" + SOF_TKN_DAI_TYPE "154" + SOF_TKN_DAI_INDEX "155" } SectionVendorTokens."sof_sched_tokens" { @@ -25,6 +26,7 @@ SectionVendorTokens."sof_sched_tokens" { SOF_TKN_SCHED_PRIORITY "201" SOF_TKN_SCHED_MIPS "202" SOF_TKN_SCHED_CORE "203" + SOF_TKN_SCHED_FRAMES "204" } SectionVendorTokens."sof_volume_tokens" { @@ -36,3 +38,16 @@ SectionVendorTokens."sof_src_tokens" { SOF_TKN_SRC_RATE_IN "300" SOF_TKN_SRC_RATE_OUT "301" } + +SectionVendorTokens."sof_pcm_tokens" { + SOF_TKN_PCM_DMAC "351" + SOF_TKN_PCM_DMAC_CHAN "352" + SOF_TKN_PCM_DMAC_CONFIG "353" +} + +SectionVendorTokens."sof_comp_tokens" { + SOF_TKN_COMP_PERIOD_SINK_COUNT "400" + SOF_TKN_COMP_PERIOD_SOURCE_COUNT "401" + SOF_TKN_COMP_FORMAT "402" + SOF_TKN_COMP_PRELOAD_COUNT "403" +} -- 2.11.0

1 4