Skip to content

DMIC: Support capture from different microphones for DAI 0 and 1 #1432

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jajanusz merged 2 commits into from
May 16, 2019
Merged

DMIC: Support capture from different microphones for DAI 0 and 1 #1432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
002627b
DMIC: Support capture from different microphones for DAI 0 and 1
singalsu May 16, 2019
89f947f
DMIC: Add topologies for DMIC configuration variants testing
singalsu May 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
163 changes: 103 additions & 60 deletions src/drivers/intel/cavs/dmic.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -744,38 +744,24 @@ static int select_mode(struct dmic_configuration *cfg,
* value to use.
*/

static inline void ipm_helper1(int *ipm, int stereo[], int swap[], int di)
static inline void ipm_helper1(int *ipm, int di)
{
int pdm[DMIC_HW_CONTROLLERS] = {0};
int cnt;
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.
* or B is enabled then a pdm controller is marked as active for
* this DAI.
*/
for (i = 0; i < DMIC_HW_CONTROLLERS; i++) {
cnt = 0;
if (dmic_prm[di]->pdm[i].enable_mic_a > 0)
cnt++;

if (dmic_prm[di]->pdm[i].enable_mic_b > 0)
cnt++;

/* A PDM controller is used if at least one mic was enabled. */
pdm[i] = !!cnt;

/* Set stereo mode if both mic A anc B are enabled. */
cnt >>= 1;
stereo[i] = cnt;

/* Swap channels if only mic B is used for mono processing. */
swap[i] = dmic_prm[di]->pdm[i].enable_mic_b & !cnt;
if (dmic_prm[di]->pdm[i].enable_mic_a ||
dmic_prm[di]->pdm[i].enable_mic_b)
pdm[i] = 1;
else
pdm[i] = 0;
}

/* IPM indicates active pdm controllers. */
/* Set IPM to match active pdm controllers. */
*ipm = 0;

if (pdm[0] == 0 && pdm[1] > 0)
Expand All @@ -787,41 +773,28 @@ static inline void ipm_helper1(int *ipm, int stereo[], int swap[], int di)

#if DMIC_HW_VERSION == 2

static inline void ipm_helper2(int source[], int *ipm, int stereo[],
int swap[], int di)
static inline void ipm_helper2(int source[], int *ipm, int di)
{
int pdm[DMIC_HW_CONTROLLERS];
int i;
int n = 0;

for (i = 0; i < OUTCONTROLX_IPM_NUMSOURCES; i++)
source[i] = 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.
* or B is enabled then a pdm controller is marked as active.
* The function returns in array source[] the indice of enabled
* pdm controllers to be used for IPM configuration.
*/
for (i = 0; i < DMIC_HW_CONTROLLERS; i++) {
if (dmic_prm[di]->pdm[i].enable_mic_a > 0 ||
dmic_prm[di]->pdm[i].enable_mic_b > 0) {
if (dmic_prm[di]->pdm[i].enable_mic_a ||
dmic_prm[di]->pdm[i].enable_mic_b) {
pdm[i] = 1;
source[n] = i;
n++;
} else {
pdm[i] = 0;
swap[i] = 0;
}

if (dmic_prm[di]->pdm[i].enable_mic_a > 0 &&
dmic_prm[di]->pdm[i].enable_mic_b > 0) {
stereo[i] = 1;
swap[i] = 0;
} else {
stereo[i] = 0;
if (dmic_prm[di]->pdm[i].enable_mic_a == 0)
swap[i] = 1;
else
swap[i] = 0;
}
}

Expand All @@ -832,6 +805,46 @@ static inline void ipm_helper2(int source[], int *ipm, int stereo[],
}
#endif

/* Loop number of PDM controllers in the configuration. The function
* checks if 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.
*/
static int stereo_helper(int stereo[], int swap[])
{
int cnt;
int i;
int swap_check;
int ret = 0;

for (i = 0; i < DMIC_HW_CONTROLLERS; i++) {
cnt = 0;
if (dmic_prm[0]->pdm[i].enable_mic_a ||
dmic_prm[1]->pdm[i].enable_mic_a)
cnt++;

if (dmic_prm[0]->pdm[i].enable_mic_b ||
dmic_prm[1]->pdm[i].enable_mic_b)
cnt++;

/* Set stereo mode if both mic A anc B are enabled. */
cnt >>= 1;
stereo[i] = cnt;

/* Swap channels if only mic B is used for mono processing. */
swap[i] = (dmic_prm[0]->pdm[i].enable_mic_b ||
dmic_prm[1]->pdm[i].enable_mic_b) && !cnt;

/* Check that swap does not conflict with other DAI request */
swap_check = dmic_prm[1]->pdm[i].enable_mic_a ||
dmic_prm[0]->pdm[i].enable_mic_a;

if (swap_check && swap[i])

@tlauda tlauda May 16, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Break the loop?

@singalsu singalsu May 16, 2019

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would leave the stereo and swap arrays processing incomplete and add complexity & code size. I'd keep it as is since it's in most platforms just two iterations.

ret = -EINVAL;
}
return ret;
}

static int configure_registers(struct dai *dai,
struct dmic_configuration *cfg)
{
Expand All @@ -855,6 +868,7 @@ static int configure_registers(struct dai *dai,
int soft_reset;
int i;
int j;
int ret;
int di = dai->index;
struct dmic_pdata *pdata = dai_get_drvdata(dai);
int array_a = 0;
Expand All @@ -872,8 +886,8 @@ static int configure_registers(struct dai *dai,
fir_start_a = 0;
fir_start_b = 0;

#if DMIC_HW_VERSION == 2
int source[4] = {0, 0, 0, 0};
#if DMIC_HW_VERSION == 2 && DMIC_HW_CONTROLLERS > 2
int source[OUTCONTROLX_IPM_NUMSOURCES];
#endif

#if defined MODULE_TEST
Expand All @@ -899,7 +913,7 @@ static int configure_registers(struct dai *dai,
#endif

#if DMIC_HW_VERSION == 1 || (DMIC_HW_VERSION == 2 && DMIC_HW_CONTROLLERS <= 2)
ipm_helper1(&ipm, stereo, swap, di);
ipm_helper1(&ipm, 0);
val = OUTCONTROL0_TIE(0) |
OUTCONTROL0_SIP(0) |
OUTCONTROL0_FINIT(1) |
Expand All @@ -911,6 +925,7 @@ static int configure_registers(struct dai *dai,
dmic_write(dai, OUTCONTROL0, val);
trace_dmic("configure_registers(), OUTCONTROL0 = %u", val);

ipm_helper1(&ipm, 1);
val = OUTCONTROL1_TIE(0) |
OUTCONTROL1_SIP(0) |
OUTCONTROL1_FINIT(1) |
Expand All @@ -924,7 +939,7 @@ static int configure_registers(struct dai *dai,
#endif

#if DMIC_HW_VERSION == 2 && DMIC_HW_CONTROLLERS > 2
ipm_helper2(source, &ipm, stereo, swap, di);
ipm_helper2(source, &ipm, 0);
val = OUTCONTROL0_TIE(0) |
OUTCONTROL0_SIP(0) |
OUTCONTROL0_FINIT(1) |
Expand All @@ -940,6 +955,7 @@ static int configure_registers(struct dai *dai,
dmic_write(dai, OUTCONTROL0, val);
trace_dmic("configure_registers(), OUTCONTROL0 = %u", val);

ipm_helper2(source, &ipm, 1);
val = OUTCONTROL1_TIE(0) |
OUTCONTROL1_SIP(0) |
OUTCONTROL1_FINIT(1) |
Expand All @@ -964,6 +980,12 @@ static int configure_registers(struct dai *dai,
dmic_prm[di]->pdm[i].enable_mic_a;
}

ret = stereo_helper(stereo, swap);
if (ret < 0) {
trace_dmic_error("configure_registers(): Mic enable conflict");
return ret;
}

for (i = 0; i < DMIC_HW_CONTROLLERS; i++) {
/* CIC */
val = CIC_CONTROL_SOFT_RESET(soft_reset) |
Expand Down Expand Up @@ -1322,16 +1344,37 @@ static void dmic_start(struct dai *dai)
"mic_a = %u, mic_b = %u, fir_a = %u, fir_b = %u",
mic_a, mic_b, fir_a, 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));
/* If both microphones are needed start them simultaneously
* to start them in sync. The reset may be cleared for another
* FIFO already. If only one mic, start them independently.
* This makes sure we do not clear start/en for another DAI.
*/
if (mic_a && mic_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(1) |
CIC_CONTROL_CIC_START_B(1));
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(1) |
MIC_CONTROL_PDM_EN_B(1));
} else if (mic_a) {
dmic_update_bits(dai, base[i] + CIC_CONTROL,
CIC_CONTROL_CIC_START_A_BIT,
CIC_CONTROL_CIC_START_A(1));
dmic_update_bits(dai, base[i] + MIC_CONTROL,
MIC_CONTROL_PDM_EN_A_BIT,
MIC_CONTROL_PDM_EN_A(1));
} else if (mic_b) {
dmic_update_bits(dai, base[i] + CIC_CONTROL,
CIC_CONTROL_CIC_START_B_BIT,
CIC_CONTROL_CIC_START_B(1));
dmic_update_bits(dai, base[i] + MIC_CONTROL,
MIC_CONTROL_PDM_EN_B_BIT,
MIC_CONTROL_PDM_EN_B(1));
}

switch (dai->index) {
case 0:
Expand Down
3 changes: 3 additions & 0 deletions src/include/sof/dmic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,9 @@
#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)

#define OUTCONTROLX_IPM_NUMSOURCES 4

#endif

/* OUTSTAT0 bits */
Expand Down
5 changes: 5 additions & 0 deletions tools/topology/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@ set(TPLGS
"sof-icl-nocodec\;sof-icl-nocodec"
"sof-apl-eq-pcm512x\;sof-apl-eq-pcm512x"
"sof-apl-eq-dmic\;sof-apl-eq-dmic"
"sof-apl-dmic-a2ch\;sof-apl-dmic-a2ch"
"sof-apl-dmic-b2ch\;sof-apl-dmic-b2ch"
"sof-apl-dmic-a2ch-b2ch\;sof-apl-dmic-a2ch-b2ch"
"sof-apl-dmic-a4ch-b2ch\;sof-apl-dmic-a4ch-b2ch"
"sof-apl-dmic-a2ch-b4ch\;sof-apl-dmic-a2ch-b4ch"
"sof-apl-dmic\;sof-apl-dmic-4ch\;-DCHANNELS=4"
"sof-apl-dmic\;sof-apl-dmic-2ch\;-DCHANNELS=2"
"sof-icl-dmic-4ch\;sof-icl-dmic-4ch"
Expand Down
102 changes: 102 additions & 0 deletions tools/topology/sof-apl-dmic-a2ch-b2ch.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
#
# Topology for Apollo Lake with direct attach digital microphones array
#

# Capture configuration
# DAI0 2ch 32b mic1-2
# DAI1 2ch 32b mic3-4

# 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 Apollolake DSP configuration
include(`platform/intel/bxt.m4')
include(`platform/intel/dmic.m4')

#
# Define the pipelines
#
# PCM6 <----- DMIC6 (DMIC01)
# PCM7 <----- DMIC7 (DMIC16k)
#

dnl PIPELINE_PCM_ADD(pipeline,
dnl pipe id, pcm, max channels, format,
dnl frames, deadline, priority, core)

# Passthrough capture pipeline 6 on PCM 6 using max channels 2.
# Schedule 48 frames per 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4,
6, 6, 2, s32le,
48, 1000, 0, 0)

# Passthrough capture pipeline 7 on PCM 7 using max channels 2.
# Schedule 48 frames per 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-volume-capture-16khz.m4,
7, 7, 2, s32le,
48, 1000, 0, 0)

#
# DAIs configuration
#

dnl DAI_ADD(pipeline,
dnl pipe id, dai type, dai_index, dai_be,
dnl buffer, periods, format,
dnl frames, deadline, priority, core)

# capture DAI is DMIC 0 using 2 periods
# Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0
DAI_ADD(sof/pipe-dai-capture.m4,
6, DMIC, 0, NoCodec-6,
PIPELINE_SINK_6, 2, s32le,
48, 1000, 0, 0)

# capture DAI is DMIC 1 using 2 periods
# Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0
DAI_ADD(sof/pipe-dai-capture.m4,
7, DMIC, 1, NoCodec-7,
PIPELINE_SINK_7, 2, s32le,
48, 1000, 0, 0)


dnl PCM_DUPLEX_ADD(name, pcm_id, playback, capture)
dnl PCM_CAPTURE_ADD(name, pipeline, capture)
PCM_CAPTURE_ADD(DMIC01, 6, PIPELINE_PCM_6)
PCM_CAPTURE_ADD(DMIC16k, 7, PIPELINE_PCM_7)

#
# BE configurations - overrides config in ACPI if present
#

dnl DAI_CONFIG(type, dai_index, link_id, name, ssp_config/dmic_config)

DAI_CONFIG(DMIC, 0, 6, NoCodec-6,
dnl DMIC_CONFIG(driver_version, clk_min, clk_mac, duty_min, duty_max,
dnl sample_rate, fifo word length, type, dai_index,
dnl pdm controller config)
DMIC_CONFIG(1, 500000, 4800000, 40, 60, 48000,
dnl DMIC_WORD_LENGTH(frame_format)
DMIC_WORD_LENGTH(s32le), DMIC, 0,
dnl PDM_CONFIG(type, dai_index, num pdm active, pdm tuples list)
dnl STEREO_PDM0 is a pre-defined pdm config for stereo capture
PDM_CONFIG(DMIC, 0, STEREO_PDM0)))

DAI_CONFIG(DMIC, 1, 7, NoCodec-7,
dnl DMIC_CONFIG(driver_version, clk_min, clk_mac, duty_min, duty_max,
dnl sample_rate, fifo word length, type, dai_index,
dnl pdm controller config)
DMIC_CONFIG(1, 500000, 4800000, 40, 60, 16000,
dnl DMIC_WORD_LENGTH(frame_format)
DMIC_WORD_LENGTH(s32le), DMIC, 1,
dnl PDM_CONFIG(type, dai_index, num pdm active, pdm tuples list)
dnl STEREO_PDM0 is a pre-defined pdm config for stereo capture
PDM_CONFIG(DMIC, 1, STEREO_PDM1)))
Loading