OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #367 from xiulipan/merge12 

Merge stable-1.2 into master without scheduler and task part
This commit is contained in:
Liam Girdwood 2018-09-13 16:04:16 +02:00 committed by GitHub
parent 84e15e721a 1ff4a9df32
commit 98652478e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 55 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/arch/xtensa/include/arch/wait.h
View File

@ -29,6 +29,9 @@
*/
#include <xtensa/xtruntime.h>
#include <arch/interrupt.h>
#include <sof/panic.h>
#if defined(PLATFORM_WAITI_DELAY)
@ -36,6 +39,10 @@ static inline void arch_wait_for_interrupt(int level)
{
int i;
/* can only eneter WFI when at runlevel 0 i.e. not IRQ level */
if (arch_interrupt_get_level() > 0)
panic(SOF_IPC_PANIC_WFI);
/* this sequnce must be atomic on LX6 */
XTOS_SET_INTLEVEL(5);
@ -55,7 +62,11 @@ static inline void arch_wait_for_interrupt(int level)
static inline void arch_wait_for_interrupt(int level)
{
asm volatile("waiti 0");
/* can only eneter WFI when at runlevel 0 i.e. not IRQ level */
if (arch_interrupt_get_level() > 0)
panic(SOF_IPC_PANIC_WFI);
asm volatile("waiti 0");
}
#endif

2
src/drivers/intel/dw-dma.c
View File

@ -508,8 +508,8 @@ static int dw_dma_stop(struct dma *dma, int channel)
dw_write(dma, DW_DMA_CHAN_EN, CHAN_DISABLE(channel));
#if DW_USE_HW_LLI
lli = p->chan[channel].lli;
for (i = 0; i < p->chan[channel].desc_count; i++) {
lli = p->chan[channel].lli;
lli->ctrl_hi &= ~DW_CTLH_DONE(1);
lli++;
}

1
src/include/sof/list.h
View File

@ -79,6 +79,7 @@ static inline void list_item_del(struct list_item *item)
{
item->next->prev = item->prev;
item->prev->next = item->next;
list_init(item);
}
/* delete item from the list list iteam will be reinitialised

21
src/include/uapi/ipc.h
View File

@ -144,16 +144,17 @@
#define SOF_IPC_PANIC_MAGIC 0x0dead000
#define SOF_IPC_PANIC_MAGIC_MASK 0x0ffff000
#define SOF_IPC_PANIC_CODE_MASK 0x00000fff
#define SOF_IPC_PANIC_MEM (SOF_IPC_PANIC_MAGIC | 0)
#define SOF_IPC_PANIC_WORK (SOF_IPC_PANIC_MAGIC | 1)
#define SOF_IPC_PANIC_IPC (SOF_IPC_PANIC_MAGIC | 2)
#define SOF_IPC_PANIC_ARCH (SOF_IPC_PANIC_MAGIC | 3)
#define SOF_IPC_PANIC_PLATFORM (SOF_IPC_PANIC_MAGIC | 4)
#define SOF_IPC_PANIC_TASK (SOF_IPC_PANIC_MAGIC | 5)
#define SOF_IPC_PANIC_EXCEPTION (SOF_IPC_PANIC_MAGIC | 6)
#define SOF_IPC_PANIC_DEADLOCK (SOF_IPC_PANIC_MAGIC | 7)
#define SOF_IPC_PANIC_STACK (SOF_IPC_PANIC_MAGIC | 8)
#define SOF_IPC_PANIC_IDLE (SOF_IPC_PANIC_MAGIC | 9)
#define SOF_IPC_PANIC_MEM (SOF_IPC_PANIC_MAGIC | 0x0)
#define SOF_IPC_PANIC_WORK (SOF_IPC_PANIC_MAGIC | 0x1)
#define SOF_IPC_PANIC_IPC (SOF_IPC_PANIC_MAGIC | 0x2)
#define SOF_IPC_PANIC_ARCH (SOF_IPC_PANIC_MAGIC | 0x3)
#define SOF_IPC_PANIC_PLATFORM (SOF_IPC_PANIC_MAGIC | 0x4)
#define SOF_IPC_PANIC_TASK (SOF_IPC_PANIC_MAGIC | 0x5)
#define SOF_IPC_PANIC_EXCEPTION (SOF_IPC_PANIC_MAGIC | 0x6)
#define SOF_IPC_PANIC_DEADLOCK (SOF_IPC_PANIC_MAGIC | 0x7)
#define SOF_IPC_PANIC_STACK (SOF_IPC_PANIC_MAGIC | 0x8)
#define SOF_IPC_PANIC_IDLE (SOF_IPC_PANIC_MAGIC | 0x9)
#define SOF_IPC_PANIC_WFI (SOF_IPC_PANIC_MAGIC | 0xa)
/*
* SOF memory capabilities, add new ones at the end

23
src/ipc/handler.c
View File

@ -167,7 +167,8 @@ static int ipc_stream_pcm_params(uint32_t stream)
struct sof_ipc_comp_host *host = NULL;
struct list_item elem_list;
struct dma_sg_elem *elem;
struct list_item *plist;
struct list_item *clist;
struct list_item *tlist;
uint32_t ring_size;
#endif
struct sof_ipc_pcm_params *pcm_params = _ipc->comp_data;
@ -233,8 +234,8 @@ static int ipc_stream_pcm_params(uint32_t stream)
goto error;
}
list_for_item(plist, &elem_list) {
elem = container_of(plist, struct dma_sg_elem, list);
list_for_item_safe(clist, tlist, &elem_list) {
elem = container_of(clist, struct dma_sg_elem, list);
err = comp_host_buffer(cd, elem, ring_size);
if (err < 0) {
@ -279,8 +280,8 @@ pipe_params:
error:
#ifdef CONFIG_HOST_PTABLE
list_for_item(plist, &elem_list) {
elem = container_of(plist, struct dma_sg_elem, list);
list_for_item_safe(clist, tlist, &elem_list) {
elem = container_of(clist, struct dma_sg_elem, list);
list_item_del(&elem->list);
rfree(elem);
}
@ -635,14 +636,14 @@ static int ipc_glb_pm_message(uint32_t header)
/*
* Debug IPC Operations.
*/
static int ipc_dma_trace_config(uint32_t header)
{
#ifdef CONFIG_HOST_PTABLE
struct intel_ipc_data *iipc = ipc_get_drvdata(_ipc);
struct list_item elem_list;
struct dma_sg_elem *elem;
struct list_item *plist;
struct list_item *clist;
struct list_item *tlist;
uint32_t ring_size;
#endif
struct sof_ipc_dma_trace_params *params = _ipc->comp_data;
@ -681,8 +682,8 @@ static int ipc_dma_trace_config(uint32_t header)
goto error;
}
list_for_item(plist, &elem_list) {
elem = container_of(plist, struct dma_sg_elem, list);
list_for_item_safe(clist, tlist, &elem_list) {
elem = container_of(clist, struct dma_sg_elem, list);
err = dma_trace_host_buffer(_ipc->dmat, elem, ring_size);
if (err < 0) {
@ -715,8 +716,8 @@ static int ipc_dma_trace_config(uint32_t header)
error:
#ifdef CONFIG_HOST_PTABLE
list_for_item(plist, &elem_list) {
elem = container_of(plist, struct dma_sg_elem, list);
list_for_item_safe(clist, tlist, &elem_list) {
elem = container_of(clist, struct dma_sg_elem, list);
list_item_del(&elem->list);
rfree(elem);
}

21
src/ipc/pmc-ipc.c
View File

@ -126,7 +126,7 @@ static void irq_handler(void *arg)
int ipc_pmc_send_msg(uint32_t message)
{
uint32_t ipclpesch;
uint32_t irq_mask;
int try = 0;
trace_ipc("SMs");
@ -138,22 +138,23 @@ int ipc_pmc_send_msg(uint32_t message)
return -EAGAIN;
}
/* disable all interrupts except for SCU */
irq_mask = arch_interrupt_disable_mask(~(1 << IRQ_NUM_EXT_PMC));
/* send the new message */
shim_write(SHIM_IPCLPESCL, 0);
shim_write(SHIM_IPCLPESCH, SHIM_IPCLPESCH_BUSY | message);
/* now wait for clock change */
wait_for_interrupt(0);
/* enable other IRQs */
arch_interrupt_enable_mask(irq_mask);
/* check status */
ipclpesch = shim_read(SHIM_IPCLPESCH);
while (ipclpesch & SHIM_IPCLPESCH_BUSY) {
/* now wait for clock change */
idelay(PLATFORM_LPE_DELAY);
ipclpesch = shim_read(SHIM_IPCLPESCH);
try++;
if (try > 10)
break;
}
/* did command succeed */
if (ipclpesch & SHIM_IPCLPESCH_BUSY) {
trace_ipc_error("ePf");

2
src/platform/apollolake/include/platform/platform.h
View File

@ -107,7 +107,7 @@ struct sof;
* the interval of reschedule DMA trace copying in special case like half
* fullness of local DMA trace buffer
*/
#define DMA_TRACE_RESCHEDULE_TIME 5
#define DMA_TRACE_RESCHEDULE_TIME 100
/* DSP should be idle in this time frame */
#define PLATFORM_IDLE_TIME 750000

5
src/platform/baytrail/include/platform/platform.h
View File

@ -94,7 +94,7 @@ struct sof;
* the interval of reschedule DMA trace copying in special case like half
* fullness of local DMA trace buffer
*/
#define DMA_TRACE_RESCHEDULE_TIME 5
#define DMA_TRACE_RESCHEDULE_TIME 100
/* DSP should be idle in this time frame */
#define PLATFORM_IDLE_TIME 750000
@ -102,6 +102,9 @@ struct sof;
/* DSP default delay in cycles */
#define PLATFORM_DEFAULT_DELAY 12
/* DSP LPE delay in cycles */
#define PLATFORM_LPE_DELAY 2000
/* Platform defined panic code */
static inline void platform_panic(uint32_t p)
{

2
src/platform/cannonlake/include/platform/platform.h
View File

@ -113,7 +113,7 @@ struct sof;
* the interval of reschedule DMA trace copying in special case like half
* fullness of local DMA trace buffer
*/
#define DMA_TRACE_RESCHEDULE_TIME 5
#define DMA_TRACE_RESCHEDULE_TIME 100
/* DSP should be idle in this time frame */
#define PLATFORM_IDLE_TIME 750000

2
src/platform/haswell/include/platform/platform.h
View File

@ -93,7 +93,7 @@ struct sof;
* the interval of reschedule DMA trace copying in special case like half
* fullness of local DMA trace buffer
*/
#define DMA_TRACE_RESCHEDULE_TIME 5
#define DMA_TRACE_RESCHEDULE_TIME 100
/* DSP should be idle in this time frame */
#define PLATFORM_IDLE_TIME 750000