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

[Sound-open-firmware] [PATCH] host build: include arch/string.h
by Ranjani Sridharan 11 May '18

11 May '18

Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- src/arch/host/include/arch/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/src/arch/host/include/arch/Makefile.am b/src/arch/host/include/arch/Makefile.am index bf2de6d..08d859b 100644 --- a/src/arch/host/include/arch/Makefile.am +++ b/src/arch/host/include/arch/Makefile.am @@ -6,4 +6,5 @@ include_HEADERS = \ sof.h \ spinlock.h \ timer.h \ + string.h \ wait.h -- 2.14.1

1 0

[Sound-open-firmware] [PATCH_V3 1/8] interrupt refinement
by Rander Wang 11 May '18

11 May '18

The issues for original data structure and algorithm are: (1)it only supports 2 level interrupt architecture. (2)it doesn't support different HW interrupt shares one IRQ value. (3)it doesn't support multi-core. The refinement is based on the prototype provided by Liam. refine irq data structure to make it support more than 2 level and issue(2). Add multi-core support in interrupt setting test on CNL & APL & BYT, pass SOF: master c1f2682c210201 kernel: v4.14 d09db67c5a9d6d SOF-tools: master 13b56fa6047c566a Rander Wang (7): interrupt: refine irq structure and algorithm interrupt: add irq id in IRQ cnl-interrupt: refine interrupt setting for change in irq_desc cnl-dma: remove special dma code for cnl apl-interrupt: refine interrupt code according to interrupt change byt-interrupt: port irq change to byt hsw-interrupt: port irq change to hsw src/drivers/dw-dma.c | 32 +-- src/include/sof/interrupt-map.h | 17 ++ src/include/sof/interrupt.h | 32 +-- src/lib/interrupt.c | 120 +++++------ .../apollolake/include/platform/interrupt.h | 2 +- src/platform/apollolake/include/platform/memory.h | 4 +- .../apollolake/include/platform/platform.h | 2 + src/platform/apollolake/interrupt.c | 210 ++++++++++++-------- src/platform/baytrail/include/platform/interrupt.h | 2 +- src/platform/cannonlake/dma.c | 2 +- .../cannonlake/include/platform/interrupt.h | 16 +- src/platform/cannonlake/include/platform/memory.h | 2 +- .../cannonlake/include/platform/platform.h | 2 + src/platform/cannonlake/interrupt.c | 220 +++++++++++++-------- src/platform/haswell/include/platform/interrupt.h | 2 +- 15 files changed, 382 insertions(+), 283 deletions(-) -- 2.14.1

4 14

[Sound-open-firmware] [PATCH] rimage: openssl: fix build for openssl 1.1.0
by Liam Girdwood 10 May '18

10 May '18

Openssl 1.1.0 is latest stable version with minor API differences. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- rimage/hash.c | 4 ++-- rimage/pkcs1_5.c | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/rimage/hash.c b/rimage/hash.c index d586e07f..2905d893 100644 --- a/rimage/hash.c +++ b/rimage/hash.c @@ -35,7 +35,7 @@ void module_sha256_create(struct image *image) { image->md = EVP_sha256(); - image->mdctx = EVP_MD_CTX_create(); + image->mdctx = EVP_MD_CTX_new(); EVP_DigestInit_ex(image->mdctx, image->md, NULL); } @@ -53,7 +53,7 @@ void module_sha256_complete(struct image *image, uint8_t *hash) int i; #endif EVP_DigestFinal_ex(image->mdctx, md_value, &md_len); - EVP_MD_CTX_destroy(image->mdctx); + EVP_MD_CTX_free(image->mdctx); memcpy(hash, md_value, md_len); #if DEBUG_HASH diff --git a/rimage/pkcs1_5.c b/rimage/pkcs1_5.c index 64a4b250..7df531bf 100644 --- a/rimage/pkcs1_5.c +++ b/rimage/pkcs1_5.c @@ -21,6 +21,7 @@ #include <openssl/bio.h> #include <openssl/sha.h> #include <openssl/objects.h> +#include <openssl/bn.h> #include <stdio.h> #include <errno.h> @@ -56,6 +57,7 @@ int pkcs_sign(struct image *image, struct fw_image_manifest *man, RSA *priv_rsa = NULL; EVP_PKEY *privkey; FILE *fp; + const BIGNUM *n, *e, *d; unsigned char digest[SHA256_DIGEST_LENGTH], mod[MAN_RSA_KEY_MODULUS_LEN]; unsigned int siglen = MAN_RSA_SIGNATURE_LEN; char path[256]; @@ -114,8 +116,9 @@ int pkcs_sign(struct image *image, struct fw_image_manifest *man, fprintf(stderr, "error: failed to sign manifest\n"); /* copy public key modulus and exponent to manifest */ - BN_bn2bin(priv_rsa->n, mod); - BN_bn2bin(priv_rsa->e, (unsigned char *)man->css.exponent); + RSA_get0_key(priv_rsa, &n, &e, &d); + BN_bn2bin(n, mod); + BN_bn2bin(e, (unsigned char *)man->css.exponent); /* modulus is reveresd */ for (i = 0; i < MAN_RSA_KEY_MODULUS_LEN; i++) -- 2.17.0

1 0

[Sound-open-firmware] [PATCH_V3 0/8] interrupt refinement
by Rander Wang 10 May '18

10 May '18

The issues for original data structure and algorithm are: (1)it only supports 2 level interrupt architecture. (2)it doesn't support different HW interrupt shares one IRQ value. (3)it doesn't support multi-core. The refinement is based on the prototype provided by Liam. refine irq data structure to make it support more than 2 level and issue(2). Add multi-core support in interrupt setting test on CNL & APL & BYT, pass SOF: master c1f2682c210201 kernel: v4.14 d09db67c5a9d6d SOF-tools: master 13b56fa6047c566a Rander Wang (7): interrupt: refine irq structure and algorithm interrupt: add irq id in IRQ cnl-interrupt: refine interrupt setting for change in irq_desc cnl-dma: remove special dma code for cnl apl-interrupt: refine interrupt code according to interrupt change byt-interrupt: port irq change to byt hsw-interrupt: port irq change to hsw src/drivers/dw-dma.c | 32 +-- src/include/sof/interrupt-map.h | 17 ++ src/include/sof/interrupt.h | 32 +-- src/lib/interrupt.c | 120 +++++------ .../apollolake/include/platform/interrupt.h | 2 +- src/platform/apollolake/include/platform/memory.h | 4 +- .../apollolake/include/platform/platform.h | 2 + src/platform/apollolake/interrupt.c | 210 ++++++++++++-------- src/platform/baytrail/include/platform/interrupt.h | 2 +- src/platform/cannonlake/dma.c | 2 +- .../cannonlake/include/platform/interrupt.h | 16 +- src/platform/cannonlake/include/platform/memory.h | 2 +- .../cannonlake/include/platform/platform.h | 2 + src/platform/cannonlake/interrupt.c | 220 +++++++++++++-------- src/platform/haswell/include/platform/interrupt.h | 2 +- 15 files changed, 382 insertions(+), 283 deletions(-) -- 2.14.1

1 0

[Sound-open-firmware] Question about comp_register
by Ranjani Sridharan 09 May '18

09 May '18

Hello, Is the intention for comp_register() to be called only once per type of component? For example, if I have 2 volume components in my pipeline, does it suffice to call sys_comp_volume_init() only once? Thanks, Ranjani

2 1

[Sound-open-firmware] [PATCH] FIX: Add dma_stop when receive trigger stop cmd in host
by Wu Zhigang 09 May '18

09 May '18

when ALSA lib detect xrun issue, it will send stop and start command to DSP without reset. it will hit error in hds_dma_start, if we did not add the dma_stop in the host_trigger function. Signed-off-by: Wu Zhigang <zhigang.wu(a)linux.intel.com> --- Test with: Apl-gpmrb with codec Linux sof-v4.14: 735b995d7b66 SOF master: 85ae8e74181f SOF-tools master: b327539e98f1 --- --- src/audio/host.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/audio/host.c b/src/audio/host.c index bee50ce..998c5ca 100644 --- a/src/audio/host.c +++ b/src/audio/host.c @@ -466,6 +466,7 @@ static int host_trigger(struct comp_dev *dev, int cmd) switch (cmd) { case COMP_TRIGGER_STOP: + ret = dma_stop(hd->dma, hd->chan); ret = host_stop(dev); break; case COMP_TRIGGER_START: -- 2.14.1

7 9

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

09 May '18

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

2 3

[Sound-open-firmware] [PATCH] byt-ssp: fix status transition for ssp_stop
by Keyon Jie 09 May '18

09 May '18

This fix the regression(line missed when copying) introduced by commit 0d6e17ed99ea 'byt-ssp: change and wrap status transition into ssp_stop'. Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> Tested-by: Zhang Keqiao <keqiao.zhang(a)linux.intel.com> --- Tested with: Mininow max + rt5651 SOF master: 6be7b1d26ac3b5b5edd6324809f6fb59592e65fa SOF-Tool master: 13b56fa6047c566a8ba3edd0882ea786e595ee2a Driver: https://github.com/plbossart/sound/tree/topic/sof-v4.14: d09db67c5a9d6dfc85f700669fa2e43c678c8d51 --- src/drivers/byt-ssp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/drivers/byt-ssp.c b/src/drivers/byt-ssp.c index fcde98f..ca3385d 100644 --- a/src/drivers/byt-ssp.c +++ b/src/drivers/byt-ssp.c @@ -514,6 +514,7 @@ static void ssp_stop(struct dai *dai, int direction) if (direction == DAI_DIR_CAPTURE && ssp->state[SOF_IPC_STREAM_CAPTURE] == COMP_STATE_ACTIVE) { ssp_update_bits(dai, SSCR1, SSCR1_RSRE, 0); + ssp->state[SOF_IPC_STREAM_CAPTURE] = COMP_STATE_PAUSED; trace_ssp("Ss0"); } @@ -521,6 +522,7 @@ static void ssp_stop(struct dai *dai, int direction) if (direction == DAI_DIR_PLAYBACK && ssp->state[SOF_IPC_STREAM_PLAYBACK] == COMP_STATE_ACTIVE) { ssp_update_bits(dai, SSCR1, SSCR1_TSRE, 0); + ssp->state[SOF_IPC_STREAM_PLAYBACK] = COMP_STATE_PAUSED; trace_ssp("Ss1"); } -- 2.14.1

2 1

[Sound-open-firmware] [PATCH] apl-ssp: change and wrap status transition into ssp_stop
by Keyon Jie 09 May '18

09 May '18

This will remove manual status change, wrap them into ssp_stop(), where the status transition is protect by spin_lock. Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> --- Tested with: APL GPMRB with TDF8532 SOF master: 8b664cee3fa34b38079ff37c624fe58b3d63362d SOF-Tool master: 13b56fa6047c566a8ba3edd0882ea786e595ee2a https://github.com/plbossart/sound/tree/topic/sof-v4.14: d09db67c5a9d6dfc85f700669fa2e43c678c8d51 --- src/drivers/apl-ssp.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/drivers/apl-ssp.c b/src/drivers/apl-ssp.c index 6e33656..a51f91c 100644 --- a/src/drivers/apl-ssp.c +++ b/src/drivers/apl-ssp.c @@ -596,23 +596,27 @@ static void ssp_start(struct dai *dai, int direction) } /* stop the SSP for either playback or capture */ -static void ssp_stop(struct dai *dai) +static void ssp_stop(struct dai *dai, int direction) { struct ssp_pdata *ssp = dai_get_drvdata(dai); spin_lock(&ssp->lock); - /* stop Rx if we are not capturing */ - if (ssp->state[SOF_IPC_STREAM_CAPTURE] != COMP_STATE_ACTIVE) { + /* stop Rx if neeed */ + if (direction == DAI_DIR_CAPTURE && + ssp->state[SOF_IPC_STREAM_CAPTURE] == COMP_STATE_ACTIVE) { ssp_update_bits(dai, SSCR1, SSCR1_RSRE, 0); ssp_update_bits(dai, SSRSA, 0x1 << 8, 0x0 << 8); + ssp->state[SOF_IPC_STREAM_CAPTURE] = COMP_STATE_PAUSED; trace_ssp("Ss0"); } - /* stop Tx if we are not playing */ - if (ssp->state[SOF_IPC_STREAM_PLAYBACK] != COMP_STATE_ACTIVE) { + /* stop Tx if needed */ + if (direction == DAI_DIR_PLAYBACK && + ssp->state[SOF_IPC_STREAM_PLAYBACK] == COMP_STATE_ACTIVE) { ssp_update_bits(dai, SSCR1, SSCR1_TSRE, 0); ssp_update_bits(dai, SSTSA, 0x1 << 8, 0x0 << 8); + ssp->state[SOF_IPC_STREAM_PLAYBACK] = COMP_STATE_PAUSED; trace_ssp("Ss1"); } @@ -647,8 +651,7 @@ static int ssp_trigger(struct dai *dai, int cmd, int direction) break; case COMP_TRIGGER_STOP: case COMP_TRIGGER_PAUSE: - ssp->state[direction] = COMP_STATE_PAUSED; - ssp_stop(dai); + ssp_stop(dai, direction); break; case COMP_TRIGGER_RESUME: ssp_context_restore(dai); -- 2.14.1

3 3

[Sound-open-firmware] [PATCH] byt-ssp: change and wrap status transition into ssp_stop
by Keyon Jie 08 May '18

08 May '18

This will remove manual status change, wrap them into ssp_stop(), where the status transition is protect by spin_lock. Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> --- src/drivers/byt-ssp.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/drivers/byt-ssp.c b/src/drivers/byt-ssp.c index 758f211..fcde98f 100644 --- a/src/drivers/byt-ssp.c +++ b/src/drivers/byt-ssp.c @@ -504,20 +504,22 @@ static void ssp_start(struct dai *dai, int direction) } /* stop the SSP for either playback or capture */ -static void ssp_stop(struct dai *dai) +static void ssp_stop(struct dai *dai, int direction) { struct ssp_pdata *ssp = dai_get_drvdata(dai); spin_lock(&ssp->lock); - /* stop Rx if we are not capturing */ - if (ssp->state[SOF_IPC_STREAM_CAPTURE] != COMP_STATE_ACTIVE) { + /* stop Rx if neeed */ + if (direction == DAI_DIR_CAPTURE && + ssp->state[SOF_IPC_STREAM_CAPTURE] == COMP_STATE_ACTIVE) { ssp_update_bits(dai, SSCR1, SSCR1_RSRE, 0); trace_ssp("Ss0"); } - /* stop Tx if we are not playing */ - if (ssp->state[SOF_IPC_STREAM_PLAYBACK] != COMP_STATE_ACTIVE) { + /* stop Tx if needed */ + if (direction == DAI_DIR_PLAYBACK && + ssp->state[SOF_IPC_STREAM_PLAYBACK] == COMP_STATE_ACTIVE) { ssp_update_bits(dai, SSCR1, SSCR1_TSRE, 0); trace_ssp("Ss1"); } @@ -553,8 +555,7 @@ static int ssp_trigger(struct dai *dai, int cmd, int direction) break; case COMP_TRIGGER_STOP: case COMP_TRIGGER_PAUSE: - ssp->state[direction] = COMP_STATE_PAUSED; - ssp_stop(dai); + ssp_stop(dai, direction); break; case COMP_TRIGGER_RESUME: ssp_context_restore(dai); -- 2.14.1

2 1