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

[Sound-open-firmware] [PATCH] dai: cache: Make sure we only writeback the amount copied
by Liam Girdwood 20 Sep '17

20 Sep '17

The DAI IRQ hanlder was always writing back full period size even when less data was copied. Only writeback the amount of data copied. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/audio/dai.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/audio/dai.c b/src/audio/dai.c index ebec519..cf8de72 100644 --- a/src/audio/dai.c +++ b/src/audio/dai.c @@ -103,7 +103,7 @@ static void dai_dma_cb(void *data, uint32_t type, struct dma_sg_elem *next) comp_update_buffer_consume(dma_buffer, copied_size); /* writeback buffer contents from cache */ - dcache_writeback_region(dma_buffer->r_ptr, dd->period_bytes); + dcache_writeback_region(dma_buffer->r_ptr, copied_size); /* update host position(in bytes offset) for drivers */ dev->position += copied_size; @@ -498,6 +498,7 @@ static int dai_position(struct comp_dev *dev, struct sof_ipc_stream_posn *posn) /* set stream start wallclock */ posn->wallclock = dd->wallclock; + return 0; } -- 2.11.0

1 0

[Sound-open-firmware] [PATCH] platform: byt: Add support for masking all DMACs and SSPs
by Liam Girdwood 20 Sep '17

20 Sep '17

Add the remaining DMACs and SSP to platform IRQ mask/unmask and clear. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/platform/baytrail/platform.c | 99 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 96 insertions(+), 3 deletions(-) diff --git a/src/platform/baytrail/platform.c b/src/platform/baytrail/platform.c index ce8a689..651c3ce 100644 --- a/src/platform/baytrail/platform.c +++ b/src/platform/baytrail/platform.c @@ -105,6 +105,18 @@ int platform_boot_complete(uint32_t boot_message) void platform_interrupt_clear(uint32_t irq, uint32_t mask) { switch (irq) { + case IRQ_NUM_EXT_SSP0: + shim_write(SHIM_PISR, mask << 3); + interrupt_clear(irq); + break; + case IRQ_NUM_EXT_SSP1: + shim_write(SHIM_PISR, mask << 4); + interrupt_clear(irq); + break; + case IRQ_NUM_EXT_SSP2: + shim_write(SHIM_PISR, mask << 5); + interrupt_clear(irq); + break; case IRQ_NUM_EXT_DMAC0: shim_write(SHIM_PISR, mask << 16); interrupt_clear(irq); @@ -118,6 +130,18 @@ void platform_interrupt_clear(uint32_t irq, uint32_t mask) shim_write(SHIM_PISRH, mask << 0); interrupt_clear(irq); break; + case IRQ_NUM_EXT_SSP3: + shim_write(SHIM_PISRH, mask << 8); + interrupt_clear(irq); + break; + case IRQ_NUM_EXT_SSP4: + shim_write(SHIM_PISRH, mask << 9); + interrupt_clear(irq); + break; + case IRQ_NUM_EXT_SSP5: + shim_write(SHIM_PISRH, mask << 10); + interrupt_clear(irq); + break; #endif default: break; @@ -132,12 +156,76 @@ uint32_t platform_interrupt_get_enabled(void) void platform_interrupt_mask(uint32_t irq, uint32_t mask) { - + switch (irq) { + case IRQ_NUM_EXT_SSP0: + shim_write(SHIM_PIMR, mask << 3); + break; + case IRQ_NUM_EXT_SSP1: + shim_write(SHIM_PIMR, mask << 4); + break; + case IRQ_NUM_EXT_SSP2: + shim_write(SHIM_PIMR, mask << 5); + break; + case IRQ_NUM_EXT_DMAC0: + shim_write(SHIM_PIMR, mask << 16); + break; + case IRQ_NUM_EXT_DMAC1: + shim_write(SHIM_PIMR, mask << 24); + break; +#if defined CONFIG_CHERRYTRAIL + case IRQ_NUM_EXT_DMAC2: + shim_write(SHIM_PISMH, mask << 8); + break; + case IRQ_NUM_EXT_SSP3: + shim_write(SHIM_PIMRH, mask << 0); + break; + case IRQ_NUM_EXT_SSP4: + shim_write(SHIM_PIMRH, mask << 1); + break; + case IRQ_NUM_EXT_SSP5: + shim_write(SHIM_PIMRH, mask << 2); + break; +#endif + default: + break; + } } void platform_interrupt_unmask(uint32_t irq, uint32_t mask) { - + switch (irq) { + case IRQ_NUM_EXT_SSP0: + shim_write(SHIM_PIMR, shim_read(SHIM_PIMR) & ~(mask << 3)); + break; + case IRQ_NUM_EXT_SSP1: + shim_write(SHIM_PIMR, shim_read(SHIM_PIMR) & ~(mask << 4)); + break; + case IRQ_NUM_EXT_SSP2: + shim_write(SHIM_PIMR, shim_read(SHIM_PIMR) & ~(mask << 5)); + break; + case IRQ_NUM_EXT_DMAC0: + shim_write(SHIM_PIMR, shim_read(SHIM_PIMR) & ~(mask << 16)); + break; + case IRQ_NUM_EXT_DMAC1: + shim_write(SHIM_PIMR, shim_read(SHIM_PIMR) & ~(mask << 24)); + break; +#if defined CONFIG_CHERRYTRAIL + case IRQ_NUM_EXT_DMAC2: + shim_write(SHIM_PIMRH, shim_read(SHIM_PIMRH) & ~(mask << 8)); + break; + case IRQ_NUM_EXT_SSP3: + shim_write(SHIM_PIMRH, shim_read(SHIM_PIMRH) & ~(mask << 0)); + break; + case IRQ_NUM_EXT_SSP4: + shim_write(SHIM_PIMRH, shim_read(SHIM_PIMRH) & ~(mask << 1)); + break; + case IRQ_NUM_EXT_SSP5: + shim_write(SHIM_PIMRH, shim_read(SHIM_PIMRH) & ~(mask << 2)); + break; +#endif + default: + break; + } } int platform_init(struct reef *reef) @@ -213,9 +301,14 @@ int platform_init(struct reef *reef) dma_probe(dmac2); #endif - /* mask SSP interrupts */ + /* mask SSP 0 - 2 interrupts */ shim_write(SHIM_PIMR, shim_read(SHIM_PIMR) | 0x00000038); +#if defined CONFIG_CHERRYTRAIL + /* mask SSP 3 - 5 interrupts */ + shim_write(SHIM_PIMRH, shim_read(SHIM_PIMRH) | 0x00000700); +#endif + /* init SSP ports */ trace_point(TRACE_BOOT_PLATFORM_SSP); ssp0 = dai_get(SOF_DAI_INTEL_SSP, 0); -- 2.11.0

2 15

[Sound-open-firmware] [PATCH v2 1/3] interrupt-map: add cpu param for REEF_IRQ generation
by Keyon Jie 20 Sep '17

20 Sep '17

This will be needed for multi-core, add it here. Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> --- src/include/reef/interrupt-map.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/include/reef/interrupt-map.h b/src/include/reef/interrupt-map.h index a292279..b968258 100644 --- a/src/include/reef/interrupt-map.h +++ b/src/include/reef/interrupt-map.h @@ -31,6 +31,8 @@ #ifndef __INCLUDE_INTERRUPT_MAP__ #define __INCLUDE_INTERRUPT_MAP__ +#include <config.h> + #define REEF_IRQ_BIT_SHIFT 24 #define REEF_IRQ_LEVEL_SHIFT 16 #define REEF_IRQ_CPU_SHIFT 8 @@ -43,6 +45,7 @@ #define REEF_IRQ(_bit, _level, _cpu, _number) \ ((_bit << REEF_IRQ_BIT_SHIFT) \ | (_level << REEF_IRQ_LEVEL_SHIFT)\ + | (_cpu << REEF_IRQ_CPU_SHIFT)\ | (_number << REEF_IRQ_NUM_SHIFT)) #ifdef CONFIG_IRQ_MAP -- 2.11.0

2 3

[Sound-open-firmware] [PATCH 1/4] Add DMA callback for dma_copy_to_host() and dma_copy_from_host().
by yan.wang＠linux.intel.com 20 Sep '17

20 Sep '17

From: Yan Wang <yan.wang(a)linux.intel.com> It is necessary to add dma callback to set completion_t variable to notify DMA copying is finished. Otherwise it will always enter into error handler. Signed-off-by: Yan Wang <yan.wang(a)linux.intel.com> --- src/ipc/dma-copy.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/ipc/dma-copy.c b/src/ipc/dma-copy.c index b8d27be..d295089 100644 --- a/src/ipc/dma-copy.c +++ b/src/ipc/dma-copy.c @@ -64,6 +64,14 @@ static struct dma_sg_elem *sg_get_elem_at(struct dma_sg_config *host_sg, return NULL; } +static void dma_complete(void *data, uint32_t type, struct dma_sg_elem *next) +{ + completion_t *comp = (completion_t *)data; + + if (type == DMA_IRQ_TYPE_LLIST) + wait_completed(comp); +} + int dma_copy_to_host(struct dma_sg_config *host_sg, int32_t host_offset, void *local_ptr, int32_t size) { @@ -102,6 +110,8 @@ int dma_copy_to_host(struct dma_sg_config *host_sg, int32_t host_offset, local_sg_elem.size = HOST_PAGE_SIZE - offset; list_item_prepend(&local_sg_elem.list, &config.elem_list); + dma_set_cb(dma, chan, DMA_IRQ_TYPE_LLIST, dma_complete, &complete); + /* transfer max PAGE size at a time to SG buffer */ while (size > 0) { @@ -179,6 +189,8 @@ int dma_copy_from_host(struct dma_sg_config *host_sg, int32_t host_offset, local_sg_elem.size = HOST_PAGE_SIZE - offset; list_item_prepend(&local_sg_elem.list, &config.elem_list); + dma_set_cb(dma, chan, DMA_IRQ_TYPE_LLIST, dma_complete, &complete); + /* transfer max PAGE size at a time to SG buffer */ while (size > 0) { -- 2.7.4

2 1

[Sound-open-firmware] [PATCH 1/5] SRC: Remove old coefficient set with bug
by Seppo Ingalsuo 20 Sep '17

20 Sep '17

This set prevented passtrough conversions to work, e.g. 48 kHz to 48 kHz due to a bug in table. This set is replaced with coefficients with a profile keyword to help selecting suitable set for a platform. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo(a)linux.intel.com> --- .../coefficients/src/src_int16_1_3_4375_5000.h | 251 ----- .../coefficients/src/src_int16_20_21_4020_5000.h | 1066 -------------------- .../coefficients/src/src_int16_21_20_4020_5000.h | 1056 ------------------- .../coefficients/src/src_int16_3_1_4375_5000.h | 252 ----- .../coefficients/src/src_int16_7_8_4375_5000.h | 657 ------------ .../coefficients/src/src_int16_8_7_4375_5000.h | 662 ------------ .../reef/audio/coefficients/src/src_int16_define.h | 11 - .../reef/audio/coefficients/src/src_int16_table.h | 32 - 8 files changed, 3987 deletions(-) delete mode 100644 src/include/reef/audio/coefficients/src/src_int16_1_3_4375_5000.h delete mode 100644 src/include/reef/audio/coefficients/src/src_int16_20_21_4020_5000.h delete mode 100644 src/include/reef/audio/coefficients/src/src_int16_21_20_4020_5000.h delete mode 100644 src/include/reef/audio/coefficients/src/src_int16_3_1_4375_5000.h delete mode 100644 src/include/reef/audio/coefficients/src/src_int16_7_8_4375_5000.h delete mode 100644 src/include/reef/audio/coefficients/src/src_int16_8_7_4375_5000.h delete mode 100644 src/include/reef/audio/coefficients/src/src_int16_define.h delete mode 100644 src/include/reef/audio/coefficients/src/src_int16_table.h diff --git a/src/include/reef/audio/coefficients/src/src_int16_1_3_4375_5000.h b/src/include/reef/audio/coefficients/src/src_int16_1_3_4375_5000.h deleted file mode 100644 index 34e177c..0000000 --- a/src/include/reef/audio/coefficients/src/src_int16_1_3_4375_5000.h +++ /dev/null @@ -1,251 +0,0 @@ -const int16_t src_int16_1_3_4375_5000_fir[245] = { - 0, - 0, - -1, - 0, - 1, - 1, - 1, - -1, - -2, - -1, - 1, - 3, - 2, - 0, - -4, - -4, - 0, - 4, - 6, - 2, - -5, - -8, - -4, - 5, - 11, - 7, - -4, - -13, - -12, - 1, - 16, - 17, - 2, - -17, - -23, - -8, - 17, - 30, - 16, - -15, - -37, - -26, - 10, - 42, - 39, - -2, - -46, - -52, - -10, - 47, - 67, - 26, - -44, - -82, - -47, - 36, - 95, - 72, - -21, - -104, - -100, - -1, - 109, - 129, - 31, - -106, - -159, - -69, - 94, - 187, - 115, - -71, - -210, - -167, - 35, - 225, - 225, - 16, - -228, - -284, - -82, - 216, - 342, - 163, - -184, - -395, - -259, - 130, - 437, - 368, - -49, - -463, - -489, - -62, - 467, - 616, - 208, - -439, - -748, - -393, - 372, - 880, - 624, - -252, - -1007, - -914, - 60, - 1125, - 1285, - 240, - -1228, - -1791, - -720, - 1313, - 2565, - 1582, - -1377, - -4078, - -3627, - 1416, - 9650, - 17303, - 20414, - 17303, - 9650, - 1416, - -3627, - -4078, - -1377, - 1582, - 2565, - 1313, - -720, - -1791, - -1228, - 240, - 1285, - 1125, - 60, - -914, - -1007, - -252, - 624, - 880, - 372, - -393, - -748, - -439, - 208, - 616, - 467, - -62, - -489, - -463, - -49, - 368, - 437, - 130, - -259, - -395, - -184, - 163, - 342, - 216, - -82, - -284, - -228, - 16, - 225, - 225, - 35, - -167, - -210, - -71, - 115, - 187, - 94, - -69, - -159, - -106, - 31, - 129, - 109, - -1, - -100, - -104, - -21, - 72, - 95, - 36, - -47, - -82, - -44, - 26, - 67, - 47, - -10, - -52, - -46, - -2, - 39, - 42, - 10, - -26, - -37, - -15, - 16, - 30, - 17, - -8, - -23, - -17, - 2, - 17, - 16, - 1, - -12, - -13, - -4, - 7, - 11, - 5, - -4, - -8, - -5, - 2, - 6, - 4, - 0, - -4, - -4, - 0, - 2, - 3, - 1, - -1, - -2, - -1, - 1, - 1, - 1, - 0, - -1, - 0, - 0 - -}; -struct src_stage src_int16_1_3_4375_5000 = { - 1, 0, 1, 245, 245, 3, 1, 0, 1, - src_int16_1_3_4375_5000_fir}; diff --git a/src/include/reef/audio/coefficients/src/src_int16_20_21_4020_5000.h b/src/include/reef/audio/coefficients/src/src_int16_20_21_4020_5000.h deleted file mode 100644 index 51aade7..0000000 --- a/src/include/reef/audio/coefficients/src/src_int16_20_21_4020_5000.h +++ /dev/null @@ -1,1066 +0,0 @@ -const int16_t src_int16_20_21_4020_5000_fir[1060] = { - 1, - -2, - 2, - 1, - -8, - 19, - -34, - 46, - -47, - 28, - 20, - -96, - 188, - -274, - 316, - -277, - 125, - 150, - -525, - 939, - -1288, - 1439, - -1233, - 472, - 1182, - -4843, - 21640, - 18847, - -5651, - 2095, - -277, - -717, - 1157, - -1205, - 997, - -663, - 311, - -18, - -175, - 261, - -260, - 203, - -125, - 51, - 3, - -31, - 38, - -32, - 21, - -10, - 3, - 0, - -1, - 1, - -2, - 2, - 0, - -6, - 18, - -34, - 49, - -54, - 40, - 3, - -78, - 175, - -273, - 336, - -323, - 197, - 61, - -439, - 882, - -1296, - 1547, - -1470, - 856, - 658, - -4253, - 22894, - 17336, - -5873, - 2472, - -629, - -447, - 989, - -1132, - 999, - -713, - 382, - -88, - -120, - 228, - -247, - 205, - -135, - 64, - -9, - -23, - 34, - -31, - 21, - -11, - 4, - 0, - -1, - 1, - -2, - 3, - -2, - -4, - 16, - -33, - 51, - -61, - 52, - -14, - -58, - 159, - -268, - 351, - -364, - 266, - -30, - -343, - 808, - -1280, - 1629, - -1687, - 1237, - 97, - -3539, - 24033, - 15769, - -5978, - 2790, - -960, - -177, - 807, - -1040, - 983, - -749, - 444, - -155, - -64, - 191, - -229, - 203, - -143, - 76, - -21, - -14, - 29, - -29, - 21, - -12, - 5, - -1, - -1, - 1, - -3, - 4, - -3, - -2, - 14, - -32, - 52, - -66, - 63, - -32, - -37, - 139, - -257, - 359, - -400, - 333, - -123, - -238, - 718, - -1241, - 1683, - -1879, - 1608, - -491, - -2701, - 25047, - 14163, - -5972, - 3046, - -1263, - 89, - 616, - -932, - 950, - -771, - 497, - -217, - -9, - 151, - -208, - 198, - -148, - 86, - -32, - -5, - 23, - -26, - 20, - -12, - 5, - -1, - 0, - 1, - -3, - 4, - -4, - 0, - 11, - -29, - 52, - -70, - 74, - -49, - -14, - 115, - -241, - 361, - -428, - 394, - -215, - -127, - 613, - -1178, - 1708, - -2042, - 1962, - -1097, - -1745, - 25925, - 12534, - -5861, - 3238, - -1534, - 347, - 417, - -810, - 900, - -778, - 540, - -274, - 46, - 109, - -183, - 189, - -151, - 95, - -41, - 3, - 18, - -23, - 19, - -12, - 6, - -2, - 0, - 1, - -3, - 5, - -6, - 2, - 8, - -27, - 51, - -74, - 83, - -66, - 10, - 90, - -221, - 356, - -450, - 450, - -306, - -11, - 494, - -1092, - 1703, - -2173, - 2293, - -1713, - -675, - 26656, - 10897, - -5655, - 3365, - -1770, - 591, - 216, - -676, - 836, - -771, - 573, - -326, - 98, - 67, - -156, - 177, - -150, - 101, - -50, - 11, - 12, - -20, - 18, - -12, - 6, - -2, - 0, - 1, - -3, - 5, - -7, - 4, - 5, - -23, - 49, - -76, - 92, - -82, - 33, - 62, - -196, - 344, - -464, - 498, - -393, - 108, - 364, - -984, - 1666, - -2267, - 2593, - -2327, - 502, - 27233, - 9269, - -5360, - 3428, - -1968, - 819, - 16, - -532, - 757, - -751, - 594, - -370, - 148, - 24, - -127, - 162, - -147, - 106, - -58, - 19, - 6, - -16, - 17, - -12, - 6, - -2, - 0, - 1, - -3, - 6, - -8, - 6, - 2, - -20, - 46, - -76, - 98, - -97, - 57, - 32, - -167, - 326, - -469, - 539, - -475, - 228, - 224, - -856, - 1597, - -2323, - 2856, - -2928, - 1779, - 27649, - 7665, - -4988, - 3428, - -2124, - 1027, - -180, - -383, - 667, - -718, - 604, - -406, - 194, - -18, - -96, - 145, - -142, - 108, - -64, - 26, - 0, - -13, - 15, - -12, - 7, - -3, - 1, - 1, - -3, - 6, - -9, - 9, - -2, - -15, - 42, - -75, - 104, - -111, - 81, - 0, - -134, - 302, - -466, - 570, - -550, - 345, - 76, - -709, - 1498, - -2337, - 3076, - -3506, - 3145, - 27901, - 6101, - -4547, - 3367, - -2238, - 1211, - -368, - -230, - 567, - -672, - 604, - -435, - 235, - -59, - -64, - 125, - -134, - 109, - -70, - 32, - -5, - -9, - 13, - -11, - 7, - -3, - 1, - 1, - -3, - 6, - -10, - 11, - -5, - -10, - 38, - -73, - 107, - -123, - 104, - -32, - -98, - 271, - -455, - 592, - -616, - 459, - -76, - -546, - 1368, - -2309, - 3248, - -4050, - 4589, - 27985, - 4589, - -4050, - 3248, - -2309, - 1368, - -546, - -76, - 459, - -616, - 592, - -455, - 271, - -98, - -32, - 104, - -123, - 107, - -73, - 38, - -10, - -5, - 11, - -10, - 6, - -3, - 1, - 1, - -3, - 7, - -11, - 13, - -9, - -5, - 32, - -70, - 109, - -134, - 125, - -64, - -59, - 235, - -435, - 604, - -672, - 567, - -230, - -368, - 1211, - -2238, - 3367, - -4547, - 6101, - 27901, - 3145, - -3506, - 3076, - -2337, - 1498, - -709, - 76, - 345, - -550, - 570, - -466, - 302, - -134, - 0, - 81, - -111, - 104, - -75, - 42, - -15, - -2, - 9, - -9, - 6, - -3, - 1, - 1, - -3, - 7, - -12, - 15, - -13, - 0, - 26, - -64, - 108, - -142, - 145, - -96, - -18, - 194, - -406, - 604, - -718, - 667, - -383, - -180, - 1027, - -2124, - 3428, - -4988, - 7665, - 27649, - 1779, - -2928, - 2856, - -2323, - 1597, - -856, - 224, - 228, - -475, - 539, - -469, - 326, - -167, - 32, - 57, - -97, - 98, - -76, - 46, - -20, - 2, - 6, - -8, - 6, - -3, - 1, - 0, - -2, - 6, - -12, - 17, - -16, - 6, - 19, - -58, - 106, - -147, - 162, - -127, - 24, - 148, - -370, - 594, - -751, - 757, - -532, - 16, - 819, - -1968, - 3428, - -5360, - 9269, - 27233, - 502, - -2327, - 2593, - -2267, - 1666, - -984, - 364, - 108, - -393, - 498, - -464, - 344, - -196, - 62, - 33, - -82, - 92, - -76, - 49, - -23, - 5, - 4, - -7, - 5, - -3, - 1, - 0, - -2, - 6, - -12, - 18, - -20, - 12, - 11, - -50, - 101, - -150, - 177, - -156, - 67, - 98, - -326, - 573, - -771, - 836, - -676, - 216, - 591, - -1770, - 3365, - -5655, - 10897, - 26656, - -675, - -1713, - 2293, - -2173, - 1703, - -1092, - 494, - -11, - -306, - 450, - -450, - 356, - -221, - 90, - 10, - -66, - 83, - -74, - 51, - -27, - 8, - 2, - -6, - 5, - -3, - 1, - 0, - -2, - 6, - -12, - 19, - -23, - 18, - 3, - -41, - 95, - -151, - 189, - -183, - 109, - 46, - -274, - 540, - -778, - 900, - -810, - 417, - 347, - -1534, - 3238, - -5861, - 12534, - 25925, - -1745, - -1097, - 1962, - -2042, - 1708, - -1178, - 613, - -127, - -215, - 394, - -428, - 361, - -241, - 115, - -14, - -49, - 74, - -70, - 52, - -29, - 11, - 0, - -4, - 4, - -3, - 1, - 0, - -1, - 5, - -12, - 20, - -26, - 23, - -5, - -32, - 86, - -148, - 198, - -208, - 151, - -9, - -217, - 497, - -771, - 950, - -932, - 616, - 89, - -1263, - 3046, - -5972, - 14163, - 25047, - -2701, - -491, - 1608, - -1879, - 1683, - -1241, - 718, - -238, - -123, - 333, - -400, - 359, - -257, - 139, - -37, - -32, - 63, - -66, - 52, - -32, - 14, - -2, - -3, - 4, - -3, - 1, - -1, - -1, - 5, - -12, - 21, - -29, - 29, - -14, - -21, - 76, - -143, - 203, - -229, - 191, - -64, - -155, - 444, - -749, - 983, - -1040, - 807, - -177, - -960, - 2790, - -5978, - 15769, - 24033, - -3539, - 97, - 1237, - -1687, - 1629, - -1280, - 808, - -343, - -30, - 266, - -364, - 351, - -268, - 159, - -58, - -14, - 52, - -61, - 51, - -33, - 16, - -4, - -2, - 3, - -2, - 1, - -1, - 0, - 4, - -11, - 21, - -31, - 34, - -23, - -9, - 64, - -135, - 205, - -247, - 228, - -120, - -88, - 382, - -713, - 999, - -1132, - 989, - -447, - -629, - 2472, - -5873, - 17336, - 22894, - -4253, - 658, - 856, - -1470, - 1547, - -1296, - 882, - -439, - 61, - 197, - -323, - 336, - -273, - 175, - -78, - 3, - 40, - -54, - 49, - -34, - 18, - -6, - 0, - 2, - -2, - 1, - -1, - 0, - 3, - -10, - 21, - -32, - 38, - -31, - 3, - 51, - -125, - 203, - -260, - 261, - -175, - -18, - 311, - -663, - 997, - -1205, - 1157, - -717, - -277, - 2095, - -5651, - 18847, - 21640, - -4843, - 1182, - 472, - -1233, - 1439, - -1288, - 939, - -525, - 150, - 125, - -277, - 316, - -274, - 188, - -96, - 20, - 28, - -47, - 46, - -34, - 19, - -8, - 1, - 2, - -2, - 1, - -1, - 1, - 2, - -9, - 20, - -33, - 43, - -39, - 15, - 36, - -111, - 198, - -269, - 291, - -228, - 53, - 233, - -600, - 977, - -1257, - 1308, - -980, - 93, - 1663, - -5309, - 20286, - 20286, - -5309, - 1663, - 93, - -980, - 1308, - -1257, - 977, - -600, - 233, - 53, - -228, - 291, - -269, - 198, - -111, - 36, - 15, - -39, - 43, - -33, - 20, - -9, - 2, - 1, - -1, - 0 - -}; -struct src_stage src_int16_20_21_4020_5000 = { - 1, 1, 20, 53, 1060, 21, 20, 0, 0, - src_int16_20_21_4020_5000_fir}; diff --git a/src/include/reef/audio/coefficients/src/src_int16_21_20_4020_5000.h b/src/include/reef/audio/coefficients/src/src_int16_21_20_4020_5000.h deleted file mode 100644 index 678ed4f..0000000 --- a/src/include/reef/audio/coefficients/src/src_int16_21_20_4020_5000.h +++ /dev/null @@ -1,1056 +0,0 @@ -const int16_t src_int16_21_20_4020_5000_fir[1050] = { - 1, - -3, - 5, - -9, - 11, - -9, - 0, - 19, - -51, - 96, - -151, - 208, - -253, - 270, - -235, - 130, - 64, - -357, - 750, - -1232, - 1783, - -2376, - 2996, - -3680, - 4818, - 29296, - 1867, - -2442, - 2405, - -2140, - 1762, - -1339, - 921, - -547, - 243, - -19, - -124, - 196, - -213, - 193, - -153, - 107, - -65, - 32, - -10, - -2, - 6, - -6, - 5, - -2, - 1, - -3, - 6, - -9, - 13, - -13, - 6, - 11, - -42, - 87, - -146, - 210, - -267, - 300, - -287, - 204, - -31, - -248, - 640, - -1142, - 1744, - -2434, - 3227, - -4251, - 6405, - 29032, - 527, - -1798, - 2058, - -1969, - 1705, - -1355, - 980, - -626, - 324, - -91, - -66, - 155, - -188, - 181, - -150, - 109, - -70, - 38, - -15, - 2, - 4, - -5, - 4, - -2, - 1, - -3, - 6, - -10, - 14, - -16, - 12, - 3, - -32, - 77, - -138, - 208, - -277, - 326, - -335, - 276, - -128, - -132, - 516, - -1030, - 1672, - -2450, - 3408, - -4773, - 8048, - 28594, - -709, - -1152, - 1686, - -1768, - 1619, - -1346, - 1020, - -691, - 397, - -160, - -9, - 113, - -160, - 166, - -144, - 110, - -73, - 42, - -19, - 5, - 2, - -4, - 3, - -2, - 1, - -3, - 6, - -11, - 16, - -20, - 17, - -5, - -21, - 65, - -127, - 202, - -281, - 347, - -377, - 345, - -224, - -11, - 380, - -895, - 1568, - -2421, - 3532, - -5235, - 9732, - 27989, - -1832, - -515, - 1297, - -1541, - 1506, - -1314, - 1041, - -743, - 462, - -225, - 47, - 69, - -130, - 148, - -136, - 108, - -76, - 46, - -23, - 8, - 0, - -3, - 3, - -2, - 1, - -3, - 6, - -11, - 18, - -23, - 23, - -14, - -9, - 51, - -113, - 193, - -281, - 362, - -414, - 409, - -318, - 113, - 233, - -742, - 1433, - -2346, - 3596, - -5626, - 11441, - 27221, - -2836, - 102, - 898, - -1292, - 1369, - -1259, - 1043, - -780, - 517, - -284, - 102, - 25, - -98, - 128, - -125, - 105, - -76, - 49, - -26, - 11, - -2, - -2, - 2, - -2, - 1, - -2, - 6, - -12, - 19, - -26, - 28, - -23, - 3, - 36, - -97, - 179, - -275, - 370, - -443, - 467, - -409, - 237, - 80, - -571, - 1268, - -2227, - 3596, - -5935, - 13160, - 26300, - -3715, - 690, - 495, - -1027, - 1211, - -1183, - 1026, - -802, - 561, - -337, - 153, - -18, - -66, - 106, - -113, - 99, - -76, - 51, - -29, - 13, - -4, - 0, - 2, - -1, - 0, - -2, - 6, - -12, - 20, - -28, - 34, - -31, - 15, - 20, - -79, - 162, - -264, - 372, - -466, - 517, - -494, - 360, - -79, - -385, - 1075, - -2063, - 3531, - -6153, - 14870, - 25235, - -4465, - 1240, - 97, - -751, - 1035, - -1087, - 991, - -810, - 595, - -383, - 200, - -60, - -32, - 83, - -99, - 93, - -74, - 51, - -31, - 16, - -6, - 1, - 1, - -1, - 0, - -2, - 5, - -12, - 20, - -30, - 38, - -39, - 28, - 3, - -59, - 142, - -248, - 367, - -480, - 559, - -572, - 479, - -240, - -189, - 858, - -1856, - 3397, - -6268, - 16557, - 24038, - -5085, - 1745, - -290, - -469, - 845, - -974, - 939, - -803, - 617, - -421, - 243, - -100, - 0, - 59, - -84, - 84, - -71, - 51, - -32, - 17, - -7, - 2, - 0, - -1, - 0, - -2, - 5, - -11, - 20, - -32, - 42, - -47, - 40, - -14, - -37, - 118, - -227, - 355, - -486, - 592, - -641, - 592, - -400, - 16, - 619, - -1609, - 3196, - -6275, - 18202, - 22722, - -5573, - 2198, - -660, - -186, - 644, - -846, - 872, - -782, - 628, - -450, - 280, - -138, - 32, - 34, - -67, - 75, - -66, - 50, - -33, - 19, - -9, - 3, - 0, - 0, - 0, - -1, - 4, - -11, - 20, - -33, - 46, - -54, - 52, - -32, - -14, - 92, - -201, - 337, - -483, - 615, - -700, - 696, - -556, - 226, - 363, - -1324, - 2927, - -6165, - 19788, - 21300, - -5932, - 2594, - -1006, - 93, - 437, - -706, - 790, - -747, - 627, - -471, - 312, - -172, - 63, - 10, - -50, - 64, - -61, - 48, - -33, - 20, - -10, - 4, - -1, - 0, - 0, - -1, - 4, - -10, - 20, - -33, - 48, - -61, - 64, - -50, - 10, - 63, - -172, - 312, - -471, - 627, - -747, - 790, - -706, - 437, - 93, - -1006, - 2594, - -5932, - 21300, - 19788, - -6165, - 2927, - -1324, - 363, - 226, - -556, - 696, - -700, - 615, - -483, - 337, - -201, - 92, - -14, - -32, - 52, - -54, - 46, - -33, - 20, - -11, - 4, - -1, - 0, - 0, - 0, - 3, - -9, - 19, - -33, - 50, - -66, - 75, - -67, - 34, - 32, - -138, - 280, - -450, - 628, - -782, - 872, - -846, - 644, - -186, - -660, - 2198, - -5573, - 22722, - 18202, - -6275, - 3196, - -1609, - 619, - 16, - -400, - 592, - -641, - 592, - -486, - 355, - -227, - 118, - -37, - -14, - 40, - -47, - 42, - -32, - 20, - -11, - 5, - -2, - 0, - -1, - 0, - 2, - -7, - 17, - -32, - 51, - -71, - 84, - -84, - 59, - 0, - -100, - 243, - -421, - 617, - -803, - 939, - -974, - 845, - -469, - -290, - 1745, - -5085, - 24038, - 16557, - -6268, - 3397, - -1856, - 858, - -189, - -240, - 479, - -572, - 559, - -480, - 367, - -248, - 142, - -59, - 3, - 28, - -39, - 38, - -30, - 20, - -12, - 5, - -2, - 0, - -1, - 1, - 1, - -6, - 16, - -31, - 51, - -74, - 93, - -99, - 83, - -32, - -60, - 200, - -383, - 595, - -810, - 991, - -1087, - 1035, - -751, - 97, - 1240, - -4465, - 25235, - 14870, - -6153, - 3531, - -2063, - 1075, - -385, - -79, - 360, - -494, - 517, - -466, - 372, - -264, - 162, - -79, - 20, - 15, - -31, - 34, - -28, - 20, - -12, - 6, - -2, - 0, - -1, - 2, - 0, - -4, - 13, - -29, - 51, - -76, - 99, - -113, - 106, - -66, - -18, - 153, - -337, - 561, - -802, - 1026, - -1183, - 1211, - -1027, - 495, - 690, - -3715, - 26300, - 13160, - -5935, - 3596, - -2227, - 1268, - -571, - 80, - 237, - -409, - 467, - -443, - 370, - -275, - 179, - -97, - 36, - 3, - -23, - 28, - -26, - 19, - -12, - 6, - -2, - 1, - -2, - 2, - -2, - -2, - 11, - -26, - 49, - -76, - 105, - -125, - 128, - -98, - 25, - 102, - -284, - 517, - -780, - 1043, - -1259, - 1369, - -1292, - 898, - 102, - -2836, - 27221, - 11441, - -5626, - 3596, - -2346, - 1433, - -742, - 233, - 113, - -318, - 409, - -414, - 362, - -281, - 193, - -113, - 51, - -9, - -14, - 23, - -23, - 18, - -11, - 6, - -3, - 1, - -2, - 3, - -3, - 0, - 8, - -23, - 46, - -76, - 108, - -136, - 148, - -130, - 69, - 47, - -225, - 462, - -743, - 1041, - -1314, - 1506, - -1541, - 1297, - -515, - -1832, - 27989, - 9732, - -5235, - 3532, - -2421, - 1568, - -895, - 380, - -11, - -224, - 345, - -377, - 347, - -281, - 202, - -127, - 65, - -21, - -5, - 17, - -20, - 16, - -11, - 6, - -3, - 1, - -2, - 3, - -4, - 2, - 5, - -19, - 42, - -73, - 110, - -144, - 166, - -160, - 113, - -9, - -160, - 397, - -691, - 1020, - -1346, - 1619, - -1768, - 1686, - -1152, - -709, - 28594, - 8048, - -4773, - 3408, - -2450, - 1672, - -1030, - 516, - -132, - -128, - 276, - -335, - 326, - -277, - 208, - -138, - 77, - -32, - 3, - 12, - -16, - 14, - -10, - 6, - -3, - 1, - -2, - 4, - -5, - 4, - 2, - -15, - 38, - -70, - 109, - -150, - 181, - -188, - 155, - -66, - -91, - 324, - -626, - 980, - -1355, - 1705, - -1969, - 2058, - -1798, - 527, - 29032, - 6405, - -4251, - 3227, - -2434, - 1744, - -1142, - 640, - -248, - -31, - 204, - -287, - 300, - -267, - 210, - -146, - 87, - -42, - 11, - 6, - -13, - 13, - -9, - 6, - -3, - 1, - -2, - 5, - -6, - 6, - -2, - -10, - 32, - -65, - 107, - -153, - 193, - -213, - 196, - -124, - -19, - 243, - -547, - 921, - -1339, - 1762, - -2140, - 2405, - -2442, - 1867, - 29296, - 4818, - -3680, - 2996, - -2376, - 1783, - -1232, - 750, - -357, - 64, - 130, - -235, - 270, - -253, - 208, - -151, - 96, - -51, - 19, - 0, - -9, - 11, - -9, - 5, - -3, - 1, - -3, - 5, - -8, - 8, - -5, - -5, - 26, - -58, - 102, - -153, - 202, - -235, - 235, - -181, - 55, - 156, - -457, - 844, - -1298, - 1788, - -2277, - 2720, - -3073, - 3302, - 29385, - 3302, - -3073, - 2720, - -2277, - 1788, - -1298, - 844, - -457, - 156, - 55, - -181, - 235, - -235, - 202, - -153, - 102, - -58, - 26, - -5, - -5, - 8, - -8, - 5, - -3, - 0 - -}; -struct src_stage src_int16_21_20_4020_5000 = { - 19, 20, 21, 50, 1050, 20, 21, 0, 0, - src_int16_21_20_4020_5000_fir}; diff --git a/src/include/reef/audio/coefficients/src/src_int16_3_1_4375_5000.h b/src/include/reef/audio/coefficients/src/src_int16_3_1_4375_5000.h deleted file mode 100644 index a8d5813..0000000 --- a/src/include/reef/audio/coefficients/src/src_int16_3_1_4375_5000.h +++ /dev/null @@ -1,252 +0,0 @@ -const int16_t src_int16_3_1_4375_5000_fir[246] = { - 0, - -1, - 2, - -3, - 4, - -7, - 9, - -11, - 13, - -15, - 14, - -12, - 7, - 2, - -15, - 33, - -55, - 82, - -112, - 143, - -175, - 204, - -226, - 239, - -237, - 218, - -176, - 108, - -11, - -118, - 281, - -478, - 711, - -979, - 1286, - -1636, - 2044, - -2544, - 3231, - -4424, - 8001, - 29412, - -2495, - 372, - 409, - -786, - 974, - -1051, - 1053, - -1004, - 919, - -810, - 688, - -560, - 434, - -316, - 209, - -117, - 41, - 18, - -61, - 90, - -106, - 111, - -107, - 98, - -85, - 70, - -55, - 41, - -28, - 18, - -10, - 4, - 0, - -2, - 3, - -3, - 3, - -2, - 2, - -1, - 0, - 0, - 0, - -1, - 2, - -4, - 7, - -11, - 16, - -22, - 29, - -35, - 41, - -44, - 45, - -40, - 30, - -13, - -12, - 46, - -89, - 140, - -198, - 260, - -323, - 384, - -436, - 473, - -489, - 477, - -428, - 333, - -183, - -36, - 339, - -755, - 1332, - -2180, - 3582, - -6592, - 20737, - 20737, - -6592, - 3582, - -2180, - 1332, - -755, - 339, - -36, - -183, - 333, - -428, - 477, - -489, - 473, - -436, - 384, - -323, - 260, - -198, - 140, - -89, - 46, - -12, - -13, - 30, - -40, - 45, - -44, - 41, - -35, - 29, - -22, - 16, - -11, - 7, - -4, - 2, - -1, - 0, - 0, - 0, - -1, - 2, - -2, - 3, - -3, - 3, - -2, - 0, - 4, - -10, - 18, - -28, - 41, - -55, - 70, - -85, - 98, - -107, - 111, - -106, - 90, - -61, - 18, - 41, - -117, - 209, - -316, - 434, - -560, - 688, - -810, - 919, - -1004, - 1053, - -1051, - 974, - -786, - 409, - 372, - -2495, - 29412, - 8001, - -4424, - 3231, - -2544, - 2044, - -1636, - 1286, - -979, - 711, - -478, - 281, - -118, - -11, - 108, - -176, - 218, - -237, - 239, - -226, - 204, - -175, - 143, - -112, - 82, - -55, - 33, - -15, - 2, - 7, - -12, - 14, - -15, - 13, - -11, - 9, - -7, - 4, - -3, - 2, - -1, - 0 - -}; -struct src_stage src_int16_3_1_4375_5000 = { - 0, 1, 3, 82, 246, 1, 3, 0, 0, - src_int16_3_1_4375_5000_fir}; diff --git a/src/include/reef/audio/coefficients/src/src_int16_7_8_4375_5000.h b/src/include/reef/audio/coefficients/src/src_int16_7_8_4375_5000.h deleted file mode 100644 index 4b0eb73..0000000 --- a/src/include/reef/audio/coefficients/src/src_int16_7_8_4375_5000.h +++ /dev/null @@ -1,657 +0,0 @@ -const int16_t src_int16_7_8_4375_5000_fir[651] = { - 0, - 0, - 0, - -2, - 4, - -5, - 4, - 0, - -7, - 14, - -19, - 16, - -5, - -14, - 36, - -50, - 49, - -25, - -17, - 68, - -108, - 117, - -81, - 0, - 106, - -200, - 242, - -199, - 66, - 130, - -329, - 452, - -431, - 235, - 106, - -502, - 816, - -902, - 656, - -61, - -786, - 1673, - -2295, - 2280, - -1124, - -2459, - 23097, - 16168, - -5503, - 1769, - 321, - -1397, - 1681, - -1391, - 780, - -103, - -434, - 711, - -708, - 489, - -168, - -135, - 332, - -384, - 307, - -151, - -18, - 144, - -198, - 178, - -108, - 20, - 52, - -91, - 91, - -63, - 23, - 13, - -35, - 39, - -30, - 15, - 0, - -10, - 13, - -11, - 6, - -1, - -2, - 3, - -2, - 1, - 0, - -1, - 1, - 0, - -1, - 3, - -5, - 6, - -3, - -3, - 12, - -19, - 22, - -15, - -2, - 26, - -48, - 59, - -48, - 13, - 41, - -96, - 130, - -121, - 61, - 43, - -160, - 247, - -260, - 174, - 4, - -229, - 425, - -508, - 414, - -132, - -282, - 706, - -980, - 952, - -531, - -271, - 1315, - -2341, - 2983, - -2730, - 328, - 25336, - 12012, - -5744, - 2742, - -665, - -691, - 1357, - -1419, - 1047, - -464, - -112, - 517, - -672, - 587, - -340, - 42, - 205, - -337, - 336, - -231, - 78, - 66, - -157, - 179, - -141, - 67, - 9, - -64, - 85, - -74, - 43, - -8, - -20, - 33, - -32, - 21, - -7, - -4, - 10, - -11, - 8, - -3, - 0, - 2, - -2, - 1, - -1, - -1, - 1, - -1, - 0, - 3, - -6, - 7, - -6, - 1, - 8, - -18, - 25, - -24, - 11, - 12, - -40, - 62, - -65, - 42, - 7, - -70, - 125, - -147, - 116, - -28, - -97, - 219, - -288, - 263, - -128, - -95, - 341, - -520, - 544, - -361, - -15, - 496, - -929, - 1132, - -951, - 308, - 756, - -2069, - 3342, - -4177, - 3814, - 26503, - 7795, - -5248, - 3273, - -1492, - 59, - 876, - -1263, - 1168, - -751, - 212, - 263, - -550, - 605, - -462, - 208, - 56, - -247, - 320, - -279, - 160, - -18, - -98, - 157, - -154, - 104, - -34, - -30, - 67, - -74, - 56, - -26, - -4, - 24, - -30, - 25, - -14, - 2, - 6, - -9, - 8, - -5, - 1, - 1, - -2, - 1, - -1, - -1, - 1, - -2, - 1, - 1, - -5, - 8, - -9, - 6, - 2, - -14, - 25, - -30, - 24, - -4, - -26, - 56, - -74, - 67, - -30, - -34, - 104, - -154, - 157, - -98, - -18, - 160, - -279, - 320, - -247, - 56, - 208, - -462, - 605, - -550, - 263, - 212, - -751, - 1168, - -1263, - 876, - 59, - -1492, - 3273, - -5248, - 7795, - 26503, - 3814, - -4177, - 3342, - -2069, - 756, - 308, - -951, - 1132, - -929, - 496, - -15, - -361, - 544, - -520, - 341, - -95, - -128, - 263, - -288, - 219, - -97, - -28, - 116, - -147, - 125, - -70, - 7, - 42, - -65, - 62, - -40, - 12, - 11, - -24, - 25, - -18, - 8, - 1, - -6, - 7, - -6, - 3, - 0, - -1, - 1, - -1, - -1, - 1, - -2, - 2, - 0, - -3, - 8, - -11, - 10, - -4, - -7, - 21, - -32, - 33, - -20, - -8, - 43, - -74, - 85, - -64, - 9, - 67, - -141, - 179, - -157, - 66, - 78, - -231, - 336, - -337, - 205, - 42, - -340, - 587, - -672, - 517, - -112, - -464, - 1047, - -1419, - 1357, - -691, - -665, - 2742, - -5744, - 12012, - 25336, - 328, - -2730, - 2983, - -2341, - 1315, - -271, - -531, - 952, - -980, - 706, - -282, - -132, - 414, - -508, - 425, - -229, - 4, - 174, - -260, - 247, - -160, - 43, - 61, - -121, - 130, - -96, - 41, - 13, - -48, - 59, - -48, - 26, - -2, - -15, - 22, - -19, - 12, - -3, - -3, - 6, - -5, - 3, - -1, - 0, - 1, - -1, - 0, - 1, - -2, - 3, - -2, - -1, - 6, - -11, - 13, - -10, - 0, - 15, - -30, - 39, - -35, - 13, - 23, - -63, - 91, - -91, - 52, - 20, - -108, - 178, - -198, - 144, - -18, - -151, - 307, - -384, - 332, - -135, - -168, - 489, - -708, - 711, - -434, - -103, - 780, - -1391, - 1681, - -1397, - 321, - 1769, - -5503, - 16168, - 23097, - -2459, - -1124, - 2280, - -2295, - 1673, - -786, - -61, - 656, - -902, - 816, - -502, - 106, - 235, - -431, - 452, - -329, - 130, - 66, - -199, - 242, - -200, - 106, - 0, - -81, - 117, - -108, - 68, - -17, - -25, - 49, - -50, - 36, - -14, - -5, - 16, - -19, - 14, - -7, - 0, - 4, - -5, - 4, - -2, - 0, - 0, - 0, - 0, - 1, - -2, - 4, - -3, - 1, - 4, - -10, - 15, - -15, - 9, - 6, - -24, - 40, - -45, - 32, - -1, - -44, - 86, - -106, - 90, - -31, - -59, - 153, - -213, - 206, - -114, - -48, - 236, - -382, - 418, - -300, - 32, - 322, - -650, - 816, - -710, - 288, - 395, - -1173, - 1796, - -1960, - 1348, - 436, - -4418, - 19959, - 19959, - -4418, - 436, - 1348, - -1960, - 1796, - -1173, - 395, - 288, - -710, - 816, - -650, - 322, - 32, - -300, - 418, - -382, - 236, - -48, - -114, - 206, - -213, - 153, - -59, - -31, - 90, - -106, - 86, - -44, - -1, - 32, - -45, - 40, - -24, - 6, - 9, - -15, - 15, - -10, - 4, - 1, - -3, - 4, - -2, - 1, - 0, - 0 - -}; -struct src_stage src_int16_7_8_4375_5000 = { - 1, 1, 7, 93, 651, 8, 7, 0, 0, - src_int16_7_8_4375_5000_fir}; diff --git a/src/include/reef/audio/coefficients/src/src_int16_8_7_4375_5000.h b/src/include/reef/audio/coefficients/src/src_int16_8_7_4375_5000.h deleted file mode 100644 index 1ad7797..0000000 --- a/src/include/reef/audio/coefficients/src/src_int16_8_7_4375_5000.h +++ /dev/null @@ -1,662 +0,0 @@ -const int16_t src_int16_8_7_4375_5000_fir[656] = { - 0, - 0, - 1, - -2, - 4, - -7, - 10, - -13, - 17, - -21, - 23, - -23, - 21, - -14, - 3, - 14, - -37, - 65, - -99, - 136, - -174, - 211, - -242, - 263, - -269, - 256, - -219, - 152, - -53, - -81, - 251, - -458, - 702, - -979, - 1290, - -1635, - 2021, - -2471, - 3050, - -3986, - 6580, - 29785, - -1328, - -372, - 958, - -1207, - 1295, - -1286, - 1212, - -1095, - 951, - -792, - 628, - -469, - 322, - -190, - 79, - 10, - -77, - 123, - -150, - 161, - -159, - 146, - -128, - 105, - -82, - 60, - -40, - 23, - -10, - 1, - 5, - -9, - 10, - -9, - 8, - -6, - 5, - -3, - 2, - -1, - 0, - 0, - 0, - -1, - 3, - -5, - 9, - -13, - 18, - -23, - 28, - -32, - 34, - -33, - 27, - -15, - -3, - 29, - -62, - 102, - -147, - 195, - -243, - 287, - -322, - 342, - -341, - 314, - -253, - 155, - -14, - -175, - 414, - -709, - 1065, - -1493, - 2018, - -2695, - 3672, - -5455, - 11305, - 27819, - -4054, - 1304, - -212, - -361, - 684, - -859, - 934, - -938, - 889, - -804, - 696, - -574, - 449, - -327, - 215, - -117, - 36, - 28, - -74, - 104, - -119, - 123, - -117, - 105, - -89, - 71, - -53, - 37, - -23, - 12, - -4, - -1, - 4, - -6, - 6, - -5, - 4, - -3, - 2, - -1, - -1, - 1, - -1, - 0, - 1, - -3, - 6, - -11, - 16, - -23, - 30, - -38, - 44, - -48, - 49, - -44, - 33, - -13, - -15, - 52, - -99, - 153, - -212, - 274, - -333, - 385, - -422, - 438, - -426, - 378, - -287, - 143, - 60, - -332, - 686, - -1143, - 1741, - -2566, - 3846, - -6377, - 16134, - 24716, - -5794, - 2637, - -1264, - 480, - 17, - -342, - 547, - -665, - 715, - -712, - 670, - -600, - 513, - -417, - 319, - -225, - 140, - -68, - 9, - 35, - -66, - 84, - -92, - 91, - -83, - 72, - -59, - 46, - -33, - 22, - -13, - 6, - -1, - -2, - 3, - -3, - 3, - -2, - 2, - -1, - -1, - 1, - -2, - 2, - -1, - 0, - 3, - -7, - 12, - -19, - 28, - -38, - 48, - -57, - 64, - -68, - 65, - -55, - 36, - -6, - -35, - 88, - -151, - 223, - -300, - 377, - -449, - 509, - -548, - 559, - -531, - 454, - -316, - 106, - 197, - -619, - 1209, - -2077, - 3504, - -6542, - 20718, - 20718, - -6542, - 3504, - -2077, - 1209, - -619, - 197, - 106, - -316, - 454, - -531, - 559, - -548, - 509, - -449, - 377, - -300, - 223, - -151, - 88, - -35, - -6, - 36, - -55, - 65, - -68, - 64, - -57, - 48, - -38, - 28, - -19, - 12, - -7, - 3, - 0, - -1, - 2, - -2, - 1, - -1, - -1, - 2, - -2, - 3, - -3, - 3, - -2, - -1, - 6, - -13, - 22, - -33, - 46, - -59, - 72, - -83, - 91, - -92, - 84, - -66, - 35, - 9, - -68, - 140, - -225, - 319, - -417, - 513, - -600, - 670, - -712, - 715, - -665, - 547, - -342, - 17, - 480, - -1264, - 2637, - -5794, - 24716, - 16134, - -6377, - 3846, - -2566, - 1741, - -1143, - 686, - -332, - 60, - 143, - -287, - 378, - -426, - 438, - -422, - 385, - -333, - 274, - -212, - 153, - -99, - 52, - -15, - -13, - 33, - -44, - 49, - -48, - 44, - -38, - 30, - -23, - 16, - -11, - 6, - -3, - 1, - 0, - -1, - 1, - -1, - -1, - 2, - -3, - 4, - -5, - 6, - -6, - 4, - -1, - -4, - 12, - -23, - 37, - -53, - 71, - -89, - 105, - -117, - 123, - -119, - 104, - -74, - 28, - 36, - -117, - 215, - -327, - 449, - -574, - 696, - -804, - 889, - -938, - 934, - -859, - 684, - -361, - -212, - 1304, - -4054, - 27819, - 11305, - -5455, - 3672, - -2695, - 2018, - -1493, - 1065, - -709, - 414, - -175, - -14, - 155, - -253, - 314, - -341, - 342, - -322, - 287, - -243, - 195, - -147, - 102, - -62, - 29, - -3, - -15, - 27, - -33, - 34, - -32, - 28, - -23, - 18, - -13, - 9, - -5, - 3, - -1, - 0, - 0, - 0, - -1, - 2, - -3, - 5, - -6, - 8, - -9, - 10, - -9, - 5, - 1, - -10, - 23, - -40, - 60, - -82, - 105, - -128, - 146, - -159, - 161, - -150, - 123, - -77, - 10, - 79, - -190, - 322, - -469, - 628, - -792, - 951, - -1095, - 1212, - -1286, - 1295, - -1207, - 958, - -372, - -1328, - 29785, - 6580, - -3986, - 3050, - -2471, - 2021, - -1635, - 1290, - -979, - 702, - -458, - 251, - -81, - -53, - 152, - -219, - 256, - -269, - 263, - -242, - 211, - -174, - 136, - -99, - 65, - -37, - 14, - 3, - -14, - 21, - -23, - 23, - -21, - 17, - -13, - 10, - -7, - 4, - -2, - 1, - 0, - 0, - -1, - 2, - -3, - 5, - -7, - 10, - -12, - 14, - -16, - 15, - -12, - 5, - 5, - -20, - 40, - -64, - 92, - -122, - 151, - -178, - 199, - -209, - 205, - -184, - 140, - -72, - -24, - 147, - -298, - 474, - -673, - 887, - -1112, - 1339, - -1559, - 1765, - -1947, - 2097, - -2210, - 2280, - 30458, - 2280, - -2210, - 2097, - -1947, - 1765, - -1559, - 1339, - -1112, - 887, - -673, - 474, - -298, - 147, - -24, - -72, - 140, - -184, - 205, - -209, - 199, - -178, - 151, - -122, - 92, - -64, - 40, - -20, - 5, - 5, - -12, - 15, - -16, - 14, - -12, - 10, - -7, - 5, - -3, - 2, - -1, - 0 - -}; -struct src_stage src_int16_8_7_4375_5000 = { - 6, 7, 8, 82, 656, 7, 8, 0, 0, - src_int16_8_7_4375_5000_fir}; diff --git a/src/include/reef/audio/coefficients/src/src_int16_define.h b/src/include/reef/audio/coefficients/src/src_int16_define.h deleted file mode 100644 index 65954b0..0000000 --- a/src/include/reef/audio/coefficients/src/src_int16_define.h +++ /dev/null @@ -1,11 +0,0 @@ -/* SRC constants */ -#define MAX_FIR_DELAY_SIZE 450 -#define MAX_OUT_DELAY_SIZE 401 -#define MAX_BLK_IN 21 -#define MAX_BLK_OUT 21 -#define NUM_IN_FS 3 -#define NUM_OUT_FS 3 -#define STAGE1_TIMES_MAX 21 -#define STAGE2_TIMES_MAX 21 -#define STAGE_BUF_SIZE 168 -#define NUM_ALL_COEFFICIENTS 3908 diff --git a/src/include/reef/audio/coefficients/src/src_int16_table.h b/src/include/reef/audio/coefficients/src/src_int16_table.h deleted file mode 100644 index e37dfae..0000000 --- a/src/include/reef/audio/coefficients/src/src_int16_table.h +++ /dev/null @@ -1,32 +0,0 @@ -/* SRC conversions */ -#include <reef/audio/coefficients/src/src_int16_1_3_4375_5000.h> -#include <reef/audio/coefficients/src/src_int16_3_1_4375_5000.h> -#include <reef/audio/coefficients/src/src_int16_7_8_4375_5000.h> -#include <reef/audio/coefficients/src/src_int16_8_7_4375_5000.h> -#include <reef/audio/coefficients/src/src_int16_20_21_4020_5000.h> -#include <reef/audio/coefficients/src/src_int16_21_20_4020_5000.h> - -/* SRC table */ -int16_t fir_one = 16384; -struct src_stage src_int16_1_1_0_0 = { 0, 0, 1, 1, 1, 1, 1, 0, -1, &fir_one }; -struct src_stage src_int16_0_0_0_0 = { 0, 0, 0, 0, 0, 0, 0, 0, 0, &fir_one }; -int src_in_fs[3] = { 16000, 44100, 48000}; -int src_out_fs[3] = { 16000, 44100, 48000}; -struct src_stage *src_table1[3][3] = { - { &src_int16_1_1_0_0, &src_int16_0_0_0_0, - &src_int16_1_3_4375_5000}, - { &src_int16_0_0_0_0, - &src_int16_1_1_0_0, &src_int16_21_20_4020_5000 - }, - { &src_int16_3_1_4375_5000, &src_int16_8_7_4375_5000, - &src_int16_1_1_0_0} -}; -struct src_stage *src_table2[3][3] = { - { &src_int16_1_1_0_0, &src_int16_0_0_0_0, - &src_int16_1_1_0_0}, - { &src_int16_0_0_0_0, - &src_int16_1_1_0_0, &src_int16_7_8_4375_5000 - }, - { &src_int16_1_1_0_0, &src_int16_20_21_4020_5000, - &src_int16_1_1_0_0} -}; -- 2.11.0

2 4

[Sound-open-firmware] [PATCH 1/4] interrupt-map: add cpu param for IRQ
by Keyon Jie 20 Sep '17

20 Sep '17

Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> --- src/include/reef/interrupt-map.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/include/reef/interrupt-map.h b/src/include/reef/interrupt-map.h index a292279..1856e95 100644 --- a/src/include/reef/interrupt-map.h +++ b/src/include/reef/interrupt-map.h @@ -43,6 +43,7 @@ #define REEF_IRQ(_bit, _level, _cpu, _number) \ ((_bit << REEF_IRQ_BIT_SHIFT) \ | (_level << REEF_IRQ_LEVEL_SHIFT)\ + | (_cpu << REEF_IRQ_CPU_SHIFT)\ | (_number << REEF_IRQ_NUM_SHIFT)) #ifdef CONFIG_IRQ_MAP -- 2.11.0

3 14

[Sound-open-firmware] [PATCH] timer: Add support for 64 bit timers.
by Liam Girdwood 19 Sep '17

19 Sep '17

This patch changes the time and timeouts used by timers from a uint32_t to a uint64_t. This means clocks can run for years before overflow. This patch also provides a virtual high 32 bits for HW that only has 32bit timer support. i.e. the high 32 is incremented at every HW timer overflow. Finally the patch updates all timer users to use uint64_t timeouts. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/arch/xtensa/include/arch/timer.h | 25 +++- src/arch/xtensa/timer.c | 163 ++++++++++++++++++++++++- src/include/reef/timer.h | 13 +- src/include/reef/work.h | 8 +- src/lib/work.c | 18 +-- src/platform/baytrail/include/platform/timer.h | 5 +- src/platform/baytrail/platform.c | 6 +- src/platform/baytrail/timer.c | 137 +++++++++++++++++++-- 8 files changed, 334 insertions(+), 41 deletions(-) diff --git a/src/arch/xtensa/include/arch/timer.h b/src/arch/xtensa/include/arch/timer.h index 3262ac0..e36df6b 100644 --- a/src/arch/xtensa/include/arch/timer.h +++ b/src/arch/xtensa/include/arch/timer.h @@ -39,12 +39,28 @@ struct timer { uint32_t id; uint32_t irq; + void *timer_data; /* used by core */ + uint32_t hitime; /* high end of 64bit timer */ + uint32_t hitimeout; + uint32_t lowtimeout; }; +/* internal API calls */ +int timer64_register(struct timer *timer, void(*handler)(void *arg), void *arg); +void timer_64_handler(void *arg); + static inline int arch_timer_register(struct timer *timer, void(*handler)(void *arg), void *arg) { - return arch_interrupt_register(timer->id, handler, arg); + uint32_t flags; + int ret; + + flags = arch_interrupt_global_disable(); + timer64_register(timer, handler, arg); + ret = arch_interrupt_register(timer->id, timer_64_handler, timer); + arch_interrupt_global_enable(flags); + + return ret; } static inline void arch_timer_unregister(struct timer *timer) @@ -62,12 +78,9 @@ static inline void arch_timer_disable(struct timer *timer) arch_interrupt_disable_mask(1 << timer->irq); } -static inline uint32_t arch_timer_get_system(struct timer *timer) -{ - return xthal_get_ccount(); -} +uint64_t arch_timer_get_system(struct timer *timer); -void arch_timer_set(struct timer *timer, unsigned int ticks); +int arch_timer_set(struct timer *timer, uint64_t ticks); static inline void arch_timer_clear(struct timer *timer) { diff --git a/src/arch/xtensa/timer.c b/src/arch/xtensa/timer.c index 9395ca9..82c2481 100644 --- a/src/arch/xtensa/timer.c +++ b/src/arch/xtensa/timer.c @@ -41,19 +41,174 @@ #include <stdint.h> #include <errno.h> -void arch_timer_set(struct timer *timer, unsigned int ticks) +struct timer_data { + void (*handler2)(void *arg); + void *arg2; +}; + +static struct timer_data xtimer[3] = {}; + +void timer_64_handler(void *arg) +{ + struct timer *timer = arg; + struct timer_data *tdata = timer->timer_data; + uint32_t ccompare; + + /* get comparator value - will tell us timeout reason */ + switch (timer->id) { + case TIMER0: + ccompare = xthal_get_ccompare(0); + break; + case TIMER1: + ccompare = xthal_get_ccompare(1); + break; + case TIMER2: + ccompare = xthal_get_ccompare(2); + break; + default: + return; + } + + /* is this a 32 bit rollover ? */ + if (ccompare == 1) { + /* roll over the timer */ + timer->hitime++; + arch_timer_clear(timer); + } else { + /* no roll over, run the handler */ + tdata->handler2(tdata->arg2); + } + + /* get next timeout value */ + if (timer->hitimeout > 0 && timer->hitimeout == timer->hitime) { + /* timeout is in this 32 bit period */ + ccompare = timer->lowtimeout; + } else { + /* timeout is in another 32 bit period */ + ccompare = 1; + } + + switch (timer->id) { + case TIMER0: + xthal_set_ccompare(0, ccompare); + break; + case TIMER1: + xthal_set_ccompare(1, ccompare); + break; + case TIMER2: + xthal_set_ccompare(2, ccompare); + break; + default: + return; + } +} + +int timer64_register(struct timer *timer, void(*handler)(void *arg), void *arg) +{ + struct timer_data *tdata; + + switch (timer->id) { + case TIMER0: + tdata = &xtimer[0]; + break; + case TIMER1: + tdata = &xtimer[1]; + break; + case TIMER2: + tdata = &xtimer[2]; + break; + default: + return -EINVAL; + } + + tdata->handler2 = handler; + tdata->arg2 = arg; + timer->timer_data = tdata; + timer->hitime = 0; + timer->hitimeout = 0; + return 0; +} + +uint64_t arch_timer_get_system(struct timer *timer) { + uint64_t time; + uint32_t flags, low, high, ccompare; + switch (timer->id) { case TIMER0: - xthal_set_ccompare(0, ticks); + ccompare = xthal_get_ccompare(0); break; case TIMER1: - xthal_set_ccompare(1, ticks); + ccompare = xthal_get_ccompare(1); break; case TIMER2: - xthal_set_ccompare(2, ticks); + ccompare = xthal_get_ccompare(2); break; default: + return 0; + } + + flags = arch_interrupt_global_disable(); + + /* read low 32 bits */ + low = xthal_get_ccount(); + + /* check and see whether 32bit IRQ is pending for timer */ + if (arch_interrupt_get_status() & (1 << timer->irq) && ccompare == 1) { + /* yes, overflow has occured but handler has not run */ + high = timer->hitime + 1; + } else { + /* no overflow */ + high = timer->hitime; + } + + time = ((uint64_t)high << 32) | low; + + arch_interrupt_global_enable(flags); + + return time; +} + +int arch_timer_set(struct timer *timer, uint64_t ticks) +{ + uint32_t time = 1, hitimeout = ticks >> 32, flags; + + /* value of 1 represents rollover */ + if ((ticks & 0xffffffff) == 0x1) + ticks++; + + flags = arch_interrupt_global_disable(); + + /* same hi 64 bit context as ticks ? */ + if (hitimeout == timer->hitime) { + /* yes, then set the value for next timeout */ + time = ticks; + timer->lowtimeout = 0; + timer->hitimeout = 0; + } else if (hitimeout < timer->hitime) { + /* cant be in the past */ + arch_interrupt_global_enable(flags); + return -EINVAL; + } else { + /* set for checking at next timeout */ + timer->hitimeout = hitimeout; + timer->lowtimeout = ticks; + } + + switch (timer->id) { + case TIMER0: + xthal_set_ccompare(0, time); + break; + case TIMER1: + xthal_set_ccompare(1, time); break; + case TIMER2: + xthal_set_ccompare(2, time); + break; + default: + return -EINVAL; } + + arch_interrupt_global_enable(flags); + return 0; } diff --git a/src/include/reef/timer.h b/src/include/reef/timer.h index d10d5e2..613cb8b 100644 --- a/src/include/reef/timer.h +++ b/src/include/reef/timer.h @@ -34,11 +34,8 @@ #include <arch/timer.h> #include <stdint.h> -static inline int timer_register(struct timer *timer, - void(*handler)(void *arg), void *arg) -{ - return arch_timer_register(timer, handler, arg); -} +int timer_register(struct timer *timer, + void(*handler)(void *arg), void *arg); static inline void timer_unregister(struct timer *timer) { @@ -55,9 +52,9 @@ static inline void timer_disable(struct timer *timer) arch_timer_disable(timer); } -static inline void timer_set(struct timer *timer, unsigned int ticks) +static inline int timer_set(struct timer *timer, uint64_t ticks) { - arch_timer_set(timer, ticks); + return arch_timer_set(timer, ticks); } void timer_set_ms(struct timer *timer, unsigned int ms); @@ -71,7 +68,7 @@ unsigned int timer_get_count(struct timer *timer); unsigned int timer_get_count_delta(struct timer *timer); -static inline uint32_t timer_get_system(struct timer *timer) +static inline uint64_t timer_get_system(struct timer *timer) { return arch_timer_get_system(timer); } diff --git a/src/include/reef/work.h b/src/include/reef/work.h index 6428301..199e46c 100644 --- a/src/include/reef/work.h +++ b/src/include/reef/work.h @@ -57,9 +57,9 @@ struct work_queue_timesource { struct timer timer; int clk; int notifier; - void (*timer_set)(struct timer *, uint32_t ticks); + int (*timer_set)(struct timer *, uint64_t ticks); void (*timer_clear)(struct timer *); - uint32_t (*timer_get)(struct timer *); + uint64_t (*timer_get)(struct timer *); }; /* initialise our work */ @@ -69,11 +69,11 @@ struct work_queue_timesource { (w)->flags = xflags; /* schedule/cancel work on work queue */ -void work_schedule(struct work_queue *queue, struct work *w, uint32_t timeout); +void work_schedule(struct work_queue *queue, struct work *w, uint64_t timeout); void work_cancel(struct work_queue *queue, struct work *work); /* schedule/cancel work on default system work queue */ -void work_schedule_default(struct work *work, uint32_t timeout); +void work_schedule_default(struct work *work, uint64_t timeout); void work_cancel_default(struct work *work); /* create new work queue */ diff --git a/src/lib/work.c b/src/lib/work.c index 3172710..cac3deb 100644 --- a/src/lib/work.c +++ b/src/lib/work.c @@ -60,22 +60,26 @@ struct work_queue { struct list_item work; /* list of work */ - uint32_t timeout; /* timeout for next queue run */ + uint64_t timeout; /* timeout for next queue run */ uint32_t window_size; /* window size for pending work */ spinlock_t lock; struct notifier notifier; /* notify CPU freq changes */ struct work_queue_timesource *ts; /* time source for work queue */ uint32_t ticks_per_usec; /* ticks per msec */ - uint32_t run_ticks; /* ticks when last run */ + uint64_t run_ticks; /* ticks when last run */ }; /* generic system work queue */ static struct work_queue *queue_; -static inline void work_set_timer(struct work_queue *queue, uint32_t ticks) +static inline int work_set_timer(struct work_queue *queue, uint64_t ticks) { - queue->ts->timer_set(&queue->ts->timer, ticks); + int ret; + + ret = queue->ts->timer_set(&queue->ts->timer, ticks); timer_enable(&queue->ts->timer); + + return ret; } static inline void work_clear_timer(struct work_queue *queue) @@ -84,7 +88,7 @@ static inline void work_clear_timer(struct work_queue *queue) timer_disable(&queue->ts->timer); } -static inline uint32_t work_get_timer(struct work_queue *queue) +static inline uint64_t work_get_timer(struct work_queue *queue) { return queue->ts->timer_get(&queue->ts->timer); } @@ -317,7 +321,7 @@ static void work_notify(int message, void *data, void *event_data) spin_unlock_irq(&queue->lock, flags); } -void work_schedule(struct work_queue *queue, struct work *w, uint32_t timeout) +void work_schedule(struct work_queue *queue, struct work *w, uint64_t timeout) { struct work *work; struct list_item *wlist; @@ -362,7 +366,7 @@ void work_cancel(struct work_queue *queue, struct work *w) spin_unlock_irq(&queue->lock, flags); } -void work_schedule_default(struct work *w, uint32_t timeout) +void work_schedule_default(struct work *w, uint64_t timeout) { struct work *work; struct list_item *wlist; diff --git a/src/platform/baytrail/include/platform/timer.h b/src/platform/baytrail/include/platform/timer.h index a7d2fc8..8f0aea4 100644 --- a/src/platform/baytrail/include/platform/timer.h +++ b/src/platform/baytrail/include/platform/timer.h @@ -50,9 +50,10 @@ struct comp_dev; struct sof_ipc_stream_posn; extern struct timer *platform_timer; -void platform_timer_set(struct timer *timer, uint32_t ticks); + +int platform_timer_set(struct timer *timer, uint64_t ticks); void platform_timer_clear(struct timer *timer); -uint32_t platform_timer_get(struct timer *timer); +uint64_t platform_timer_get(struct timer *timer); void platform_timer_start(struct timer *timer); void platform_timer_stop(struct timer *timer); diff --git a/src/platform/baytrail/platform.c b/src/platform/baytrail/platform.c index f97971a..ce8a689 100644 --- a/src/platform/baytrail/platform.c +++ b/src/platform/baytrail/platform.c @@ -172,15 +172,15 @@ int platform_init(struct reef *reef) platform_ipc_pmc_init(); /* init work queues and clocks */ + trace_point(TRACE_BOOT_SYS_WORK); + init_system_workq(&platform_generic_queue); + trace_point(TRACE_BOOT_PLATFORM_TIMER); platform_timer_start(platform_timer); trace_point(TRACE_BOOT_PLATFORM_CLOCK); init_platform_clocks(); - trace_point(TRACE_BOOT_SYS_WORK); - init_system_workq(&platform_generic_queue); - /* Set CPU to default frequency for booting */ trace_point(TRACE_BOOT_SYS_CPU_FREQ); clock_set_freq(CLK_CPU, CLK_MAX_CPU_HZ); diff --git a/src/platform/baytrail/timer.c b/src/platform/baytrail/timer.c index 3d08f6f..17c1f0b 100644 --- a/src/platform/baytrail/timer.c +++ b/src/platform/baytrail/timer.c @@ -32,15 +32,58 @@ #include <platform/timer.h> #include <platform/shim.h> +#include <platform/interrupt.h> #include <reef/debug.h> #include <reef/audio/component.h> #include <stdint.h> +struct timer_data { + void (*handler2)(void *arg); + void *arg2; +}; + +static struct timer_data xtimer[1] = {}; + +void platform_timer_64_handler(void *arg) +{ + struct timer *timer = arg; + struct timer_data *tdata = timer->timer_data; + uint32_t timeout; + + /* get timeout value - will tell us timeout reason */ + timeout = shim_read(SHIM_EXT_TIMER_CNTLL); + + /* we dont use the timer clear bit as we only need to clear the ISR */ + shim_write(SHIM_PISR, SHIM_PISR_EXT_TIMER); + + /* is this a 32 bit rollover ? */ + if (timeout == 1) { + /* roll over the timer */ + timer->hitime++; + } else { + /* no roll over, run the handler */ + tdata->handler2(tdata->arg2); + } + + /* get next timeout value */ + if (timer->hitimeout > 0 && timer->hitimeout == timer->hitime) { + /* timeout is in this 32 bit period */ + timeout = timer->lowtimeout; + } else { + /* timeout is in another 32 bit period */ + timeout = 1; + } + + /* set new value and run */ + shim_write(SHIM_EXT_TIMER_CNTLH, SHIM_EXT_TIMER_RUN); + shim_write(SHIM_EXT_TIMER_CNTLL, timeout); +} + void platform_timer_start(struct timer *timer) { /* run timer */ shim_write(SHIM_EXT_TIMER_CNTLH, SHIM_EXT_TIMER_RUN); - shim_write(SHIM_EXT_TIMER_CNTLL, 0); + shim_write(SHIM_EXT_TIMER_CNTLL, 1); } /* this seems to stop rebooting with RTD3 ???? */ @@ -51,15 +94,40 @@ void platform_timer_stop(struct timer *timer) shim_write(SHIM_EXT_TIMER_CNTLH, SHIM_EXT_TIMER_CLEAR); } -void platform_timer_set(struct timer *timer, uint32_t ticks) +int platform_timer_set(struct timer *timer, uint64_t ticks) { + uint32_t time = 1, hitimeout = ticks >> 32, flags; + /* a tick value of 0 will not generate an IRQ */ - if (ticks == 0) - ticks = 1; + /* value of 1 represents rollover */ + if ((ticks & 0xffffffff) < 0x2) + ticks += 2; + + flags = arch_interrupt_global_disable(); + + /* same hi 64 bit context as ticks ? */ + if (hitimeout == timer->hitime) { + /* yes, then set the value for next timeout */ + time = ticks; + timer->lowtimeout = 0; + timer->hitimeout = 0; + } else if (hitimeout < timer->hitime) { + /* cant be in the past */ + arch_interrupt_global_enable(flags); + return -EINVAL; + } else { + /* set for checking at next timeout */ + timer->hitimeout = hitimeout; + timer->lowtimeout = ticks; + } /* set new value and run */ shim_write(SHIM_EXT_TIMER_CNTLH, SHIM_EXT_TIMER_RUN); - shim_write(SHIM_EXT_TIMER_CNTLL, ticks); + shim_write(SHIM_EXT_TIMER_CNTLL, time); + + arch_interrupt_global_enable(flags); + + return 0; } void platform_timer_clear(struct timer *timer) @@ -68,9 +136,31 @@ void platform_timer_clear(struct timer *timer) shim_write(SHIM_PISR, SHIM_PISR_EXT_TIMER); } -uint32_t platform_timer_get(struct timer *timer) +uint64_t platform_timer_get(struct timer *timer) { - return shim_read(SHIM_EXT_TIMER_STAT); + uint64_t time; + uint32_t flags, low, high; + + flags = arch_interrupt_global_disable(); + + /* read low 32 bits */ + low = shim_read(SHIM_EXT_TIMER_STAT); + + /* check and see whether 32bit IRQ is pending for timer */ + if (arch_interrupt_get_status() & IRQ_MASK_EXT_TIMER && + shim_read(SHIM_EXT_TIMER_CNTLL) == 1) { + /* yes, overflow has occured but handler has not run */ + high = timer->hitime + 1; + } else { + /* no overflow */ + high = timer->hitime; + } + + time = ((uint64_t)high << 32) | low; + + arch_interrupt_global_enable(flags); + + return time; } /* get timestamp for host stream DMA position */ @@ -107,3 +197,36 @@ void platform_dai_wallclock(struct comp_dev *dai, uint64_t *wallclock) /* only 1 wallclock on BYT */ *wallclock = shim_read(SHIM_EXT_TIMER_STAT); } + +static int platform_timer_register(struct timer *timer, + void(*handler)(void *arg), void *arg) +{ + struct timer_data *tdata = &xtimer[0]; + uint32_t flags; + int ret; + + flags = arch_interrupt_global_disable(); + tdata->handler2 = handler; + tdata->arg2 = arg; + timer->timer_data = tdata; + timer->hitime = 0; + timer->hitimeout = 0; + ret = arch_interrupt_register(timer->id, platform_timer_64_handler, timer); + arch_interrupt_global_enable(flags); + + return ret; +} + +int timer_register(struct timer *timer, void(*handler)(void *arg), void *arg) +{ + switch (timer->id) { + case TIMER0: + case TIMER1: + case TIMER2: + return arch_timer_register(timer, handler, arg); + case TIMER3: + return platform_timer_register(timer, handler, arg); + default: + return -EINVAL; + } +} -- 2.11.0

1 0

[Sound-open-firmware] [PATCH] timer: pass platform timer structure in to all platform timer calls.
by Liam Girdwood 19 Sep '17

19 Sep '17

Make sure we pass in our timer structure. In preparation for 64bit timers. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/ipc/intel-ipc.c | 2 +- src/lib/schedule.c | 4 ++-- src/lib/trace.c | 2 +- src/platform/baytrail/clk.c | 3 +-- src/platform/baytrail/include/platform/timer.h | 1 + src/platform/baytrail/platform.c | 9 +++------ 6 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/ipc/intel-ipc.c b/src/ipc/intel-ipc.c index 01c83b6..0c1b10a 100644 --- a/src/ipc/intel-ipc.c +++ b/src/ipc/intel-ipc.c @@ -505,7 +505,7 @@ static int ipc_pm_context_save(uint32_t header) /* TODO: clear any outstanding platform IRQs - TODO refine */ /* TODO: stop ALL timers */ - platform_timer_stop(0); + platform_timer_stop(platform_timer); /* TODO: disable SSP and DMA HW */ diff --git a/src/lib/schedule.c b/src/lib/schedule.c index b10bb98..147bfff 100644 --- a/src/lib/schedule.c +++ b/src/lib/schedule.c @@ -84,7 +84,7 @@ static inline struct task *edf_get_next(void) return NULL; /* get the current time */ - current = platform_timer_get(NULL); + current = platform_timer_get(platform_timer); /* check every queued or running task in list */ list_for_item(clist, &sch->list) { @@ -174,7 +174,7 @@ void schedule_task(struct task *task, uint32_t deadline, uint16_t priority, } /* get the current time */ - current = platform_timer_get(NULL); + current = platform_timer_get(platform_timer); /* calculate deadline - TODO: include MIPS */ ticks = clock_us_to_ticks(sch->clock, deadline); diff --git a/src/lib/trace.c b/src/lib/trace.c index 5da7c95..33e1466 100644 --- a/src/lib/trace.c +++ b/src/lib/trace.c @@ -56,7 +56,7 @@ void _trace_event(uint32_t event) /* write timestamp and event to trace buffer */ t =(volatile uint32_t*)(MAILBOX_TRACE_BASE + trace.pos); - t[0] = platform_timer_get(0); + t[0] = platform_timer_get(platform_timer); t[1] = event; /* writeback trace data */ diff --git a/src/platform/baytrail/clk.c b/src/platform/baytrail/clk.c index 5d8a73a..fdffcd5 100644 --- a/src/platform/baytrail/clk.c +++ b/src/platform/baytrail/clk.c @@ -240,8 +240,7 @@ uint32_t clock_time_elapsed(int clock, uint32_t previous, uint32_t *current) _current = arch_timer_get_system(NULL); break; case CLK_SSP: - // TODO: fix timer ID - _current = platform_timer_get(NULL); + _current = platform_timer_get(platform_timer); break; default: return 0; diff --git a/src/platform/baytrail/include/platform/timer.h b/src/platform/baytrail/include/platform/timer.h index 309828c..a7d2fc8 100644 --- a/src/platform/baytrail/include/platform/timer.h +++ b/src/platform/baytrail/include/platform/timer.h @@ -49,6 +49,7 @@ struct comp_dev; struct sof_ipc_stream_posn; +extern struct timer *platform_timer; void platform_timer_set(struct timer *timer, uint32_t ticks); void platform_timer_clear(struct timer *timer); uint32_t platform_timer_get(struct timer *timer); diff --git a/src/platform/baytrail/platform.c b/src/platform/baytrail/platform.c index b8c3e49..f97971a 100644 --- a/src/platform/baytrail/platform.c +++ b/src/platform/baytrail/platform.c @@ -83,6 +83,8 @@ static struct work_queue_timesource platform_generic_queue = { .timer_get = platform_timer_get, }; +struct timer *platform_timer = &platform_generic_queue.timer; + int platform_boot_complete(uint32_t boot_message) { uint64_t outbox = MAILBOX_HOST_OFFSET >> 3; @@ -138,11 +140,6 @@ void platform_interrupt_unmask(uint32_t irq, uint32_t mask) } -static struct timer platform_ext_timer = { - .id = TIMER3, - .irq = IRQ_NUM_EXT_TIMER, -}; - int platform_init(struct reef *reef) { #if defined CONFIG_BAYTRAIL @@ -176,7 +173,7 @@ int platform_init(struct reef *reef) /* init work queues and clocks */ trace_point(TRACE_BOOT_PLATFORM_TIMER); - platform_timer_start(&platform_ext_timer); + platform_timer_start(platform_timer); trace_point(TRACE_BOOT_PLATFORM_CLOCK); init_platform_clocks(); -- 2.11.0

1 0

[Sound-open-firmware] [PATCH 4/4] Add IPC processing code for DMA tracing.
by yan.wang＠linux.intel.com 17 Sep '17

17 Sep '17

From: Yan Wang <yan.wang(a)linux.intel.com> 1. Add processing case branch of SOF_IPC_GLB_TRACE_MSG. 2. Add processing functions for SOF_IPC_TRACE_DMA_INIT and SOF_IPC_TRACE_DMA_PARAMS for initlizing DMA for Trace and reply host. 3. Modify page table parsing fucntion for using in both PCM streaming and DMA tracing case. Signed-off-by: Yan Wang <yan.wang(a)linux.intel.com> --- src/include/reef/ipc.h | 4 ++ src/ipc/intel-ipc.c | 115 ++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 114 insertions(+), 5 deletions(-) diff --git a/src/include/reef/ipc.h b/src/include/reef/ipc.h index 3eb94d8..84a1dc1 100644 --- a/src/include/reef/ipc.h +++ b/src/include/reef/ipc.h @@ -40,6 +40,7 @@ #include <uapi/ipc.h> #include <reef/audio/pipeline.h> #include <reef/audio/component.h> +#include <reef/audio/dma-trace.h> struct reef; struct dai_config; @@ -99,6 +100,9 @@ struct ipc { /* pipelines, components and buffers */ struct list_item comp_list; /* list of component devices */ + /* DMA for Trace*/ + struct dma_trace_data dmat; + void *private; }; diff --git a/src/ipc/intel-ipc.c b/src/ipc/intel-ipc.c index 01c83b6..dbd9ec7 100644 --- a/src/ipc/intel-ipc.c +++ b/src/ipc/intel-ipc.c @@ -155,14 +155,22 @@ out: * page table entry and adding each elem to a list in struct dma_sg_config. */ static int parse_page_descriptors(struct intel_ipc_data *iipc, - struct sof_ipc_host_buffer *ring, struct comp_dev *cd) + struct sof_ipc_host_buffer *ring, void *data, uint32_t is_trace) { - struct sof_ipc_comp_host *host = (struct sof_ipc_comp_host *)&cd->comp; + struct comp_dev* cd = NULL; + struct sof_ipc_comp_host *host = NULL; + struct dma_trace_data *d = NULL; struct dma_sg_elem elem; int i, err; uint32_t idx, phy_addr; elem.size = HOST_PAGE_SIZE; + if (is_trace) + d = (struct dma_trace_data *)data; + else { + cd = (struct comp_dev *)data; + host = (struct sof_ipc_comp_host *)&cd->comp; + } for (i = 0; i < ring->pages; i++) { @@ -176,12 +184,15 @@ static int parse_page_descriptors(struct intel_ipc_data *iipc, phy_addr <<= 12; phy_addr &= 0xfffff000; - if (host->direction == SOF_IPC_STREAM_PLAYBACK) + if (!is_trace && host->direction == SOF_IPC_STREAM_PLAYBACK) elem.src = phy_addr; else elem.dest = phy_addr; - err = comp_host_buffer(cd, &elem, ring->size); + if (is_trace) + err = dma_trace_host_buffer(d, &elem, ring->size); + else + err = comp_host_buffer(cd, &elem, ring->size); if (err < 0) { trace_ipc_error("ePb"); return err; @@ -235,7 +246,7 @@ static int ipc_stream_pcm_params(uint32_t stream) /* Parse host tables */ err = parse_page_descriptors(iipc, &pcm_params->params.buffer, - pcm_dev->cd); + pcm_dev->cd, 0); if (err < 0) { trace_ipc_error("eAP"); goto error; @@ -551,6 +562,98 @@ static int ipc_glb_pm_message(uint32_t header) } /* + * Debug IPC Operations. + */ + +static int ipc_dma_trace_init(uint32_t header) +{ + struct sof_ipc_reply reply; + int err; + + trace_ipc("Dti"); + + /* Initialize DMA for Trace*/ + err = dma_trace_init(&_ipc->dmat); + if (err < 0) { + trace_ipc_error("eIP"); + goto error; + } + + /* write component values to the outbox */ + reply.hdr.size = sizeof(reply); + reply.hdr.cmd = header; + reply.error = 0; + mailbox_hostbox_write(0, &reply, sizeof(reply)); + return 0; + +error: + if (err < 0) + trace_ipc_error("eA!"); + return -EINVAL; +} + +static int ipc_dma_trace_config(uint32_t header) +{ + struct intel_ipc_data *iipc = ipc_get_drvdata(_ipc); + struct sof_ipc_dma_trace_params *params = _ipc->comp_data; + struct sof_ipc_reply reply; + int err; + + trace_ipc("DAl"); + + /* use DMA to read in compressed page table ringbuffer from host */ + err = get_page_descriptors(iipc, &params->buffer); + if (err < 0) { + trace_ipc_error("eCp"); + goto error; + } + + trace_ipc("DAg"); + + /* Parse host tables */ + err = parse_page_descriptors(iipc, &params->buffer, + &_ipc->dmat, 1); + if (err < 0) { + trace_ipc_error("ePP"); + goto error; + } + + trace_ipc("DAp"); + + dma_trace_config_ready(&_ipc->dmat); + + /* write component values to the outbox */ + reply.hdr.size = sizeof(reply); + reply.hdr.cmd = header; + reply.error = 0; + mailbox_hostbox_write(0, &reply, sizeof(reply)); + return 0; + +error: + if (err < 0) + trace_ipc_error("eA!"); + return -EINVAL; +} + +static int ipc_glb_debug_message(uint32_t header) +{ + uint32_t cmd = (header & SOF_CMD_TYPE_MASK) >> SOF_CMD_TYPE_SHIFT; + + trace_ipc("Idn"); + + switch (cmd) { + case iCS(SOF_IPC_TRACE_DMA_INIT): + return ipc_dma_trace_init(header); + case iCS(SOF_IPC_TRACE_DMA_PARAMS): + return ipc_dma_trace_config(header); + default: + trace_ipc_error("eDc"); + trace_value(header); + return -EINVAL; + } +} + +/* * Topology IPC Operations. */ @@ -766,6 +869,8 @@ int ipc_cmd(void) return ipc_glb_stream_message(hdr->cmd); case iGS(SOF_IPC_GLB_DAI_MSG): return ipc_glb_dai_message(hdr->cmd); + case iGS(SOF_IPC_GLB_TRACE_MSG): + return ipc_glb_debug_message(hdr->cmd); default: trace_ipc_error("eGc"); trace_value(type); -- 2.7.4

1 0

[Sound-open-firmware] [PATCH 3/4] Add the implementation for DMA tracing.
by yan.wang＠linux.intel.com 17 Sep '17

17 Sep '17

From: Yan Wang <yan.wang(a)linux.intel.com> 1. Initialize the data structure. a) Create local DMA buffer for saving trace data. b) Initialize the tracing work handler for syatem work queue. 2. Implement local circle buffer. a) When the local buffer is full, empty it and reset reading/writing pointer. 3. Save the host buffer PHY addr which is parsed from IPC message. After this config, start trace work in work queue. 4. Provide dtrace_event() for recroding trace string into local buffer. 5. Add rstrlen() utility function for getting the trace string length because DSP side hasn't strlen(). 6. Enbale trace DMA copying once every 500ms or some special cases. a) Schedule the tracing sending work once every 500ms. b) If the local buffer is half full, call trace sending immediately. c) When the wrting pointer will arrive iat the end of local buffer, call trace sending immediately. 7. Use dma_copy_to_host() function to do trace sending. Signed-off-by: Yan Wang <yan.wang(a)linux.intel.com> --- src/audio/Makefile.am | 1 + src/audio/dma-trace.c | 194 ++++++++++++++++++++++ src/include/reef/alloc.h | 1 + src/include/reef/audio/dma-trace.h | 69 ++++++++ src/lib/lib.c | 9 + src/platform/baytrail/include/platform/platform.h | 6 + 6 files changed, 280 insertions(+) create mode 100644 src/audio/dma-trace.c create mode 100644 src/include/reef/audio/dma-trace.h diff --git a/src/audio/Makefile.am b/src/audio/Makefile.am index 285422e..7ffe01f 100644 --- a/src/audio/Makefile.am +++ b/src/audio/Makefile.am @@ -17,6 +17,7 @@ libaudio_a_SOURCES = \ pipeline.c \ pipeline_static.c \ component.c \ + dma-trace.c \ buffer.c libaudio_a_CFLAGS = \ diff --git a/src/audio/dma-trace.c b/src/audio/dma-trace.c new file mode 100644 index 0000000..8fc220e --- /dev/null +++ b/src/audio/dma-trace.c @@ -0,0 +1,194 @@ +/* + * Copyright (c) 2016, 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: Yan Wang <yan.wang(a)linux.intel.com> + */ + +#include <reef/trace.h> +#include <reef/audio/dma-trace.h> +#include <reef/ipc.h> +#include <reef/reef.h> +#include <reef/alloc.h> +#include <arch/cache.h> +#include <platform/timer.h> +#include <platform/dma.h> +#include <reef/lock.h> +#include <stdint.h> + +static struct dma_trace_data *trace_data = NULL; + +static int dma_trace_new_buffer(struct dma_trace_data *d, uint32_t buffer_size) +{ + struct dma_trace_buf *buffer = &d->dmatb; + + trace_buffer("nlb"); + + /* validate request */ + if (buffer_size == 0 || buffer_size > HEAP_BUFFER_SIZE) { + trace_buffer_error("ebg"); + trace_value(buffer_size); + return -ENOMEM; + } + + /* allocate new buffer */ + buffer->addr = rballoc(RZONE_RUNTIME, RFLAGS_NONE, buffer_size); + if (buffer->addr == NULL) { + trace_buffer_error("ebm"); + return -ENOMEM; + } + + bzero(buffer->addr, buffer_size); + + buffer->size = buffer_size; + buffer->w_ptr = buffer->r_ptr = buffer->addr; + buffer->end_addr = buffer->addr + buffer->size; + + return 0; +} + +static void trace_send(struct dma_trace_data *d) +{ + struct dma_trace_buf *buffer = &d->dmatb; + struct dma_sg_config *config = &d->config; + uint32_t size = 0; + int32_t offset = 0; + + if (buffer->w_ptr == buffer->r_ptr) + return; + + size = buffer->w_ptr - buffer->r_ptr; + if (d->host_offset + size > d->host_size) + d->host_offset = 0; + + offset = dma_copy_to_host(config, d->host_offset, + buffer->r_ptr, size); + if (offset < 0) { + trace_buffer_error("ebb"); + return; + } + + d->host_offset += size; + buffer->r_ptr += size; + + trace_buffer("dts"); +} + +static uint32_t trace_work(void *data, uint32_t delay) +{ + struct dma_trace_data *d = (struct dma_trace_data *)data; + + trace_send(d); + + /* reschedule the trace copying work */ + return DMA_TRACE_US; +} + +int dma_trace_init(struct dma_trace_data *d) +{ + int err; + + trace_buffer("dtn"); + + /* init buffer elems */ + list_init(&d->config.elem_list); + + /* allocate local DMA buffer */ + err = dma_trace_new_buffer(d, DMA_TRACE_LOCAL_SIZE); + if (err < 0) { + trace_buffer_error("ePb"); + return err; + } + + d->host_offset = 0; + trace_data = d; + + work_init(&d->dmat_work, trace_work, d, WORK_ASYNC); + return 0; +} + +int dma_trace_host_buffer(struct dma_trace_data *d, struct dma_sg_elem *elem, + uint32_t host_size) +{ + struct dma_sg_elem *e; + + /* allocate new host DMA elem and add it to our list */ + e = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, sizeof(*e)); + if (e == NULL) + return -ENOMEM; + + *e = *elem; + d->host_size = host_size; + + list_item_append(&e->list, &d->config.elem_list); + return 0; +} + +void dma_trace_config_ready(struct dma_trace_data *d) +{ + work_schedule_default(&d->dmat_work, DMA_TRACE_US); +} + +void dtrace_event(char *e) +{ + struct dma_trace_buf *buffer = NULL; + int length = rstrlen(e); + int margin = 0; + + if (trace_data == NULL || length < 1) { + trace_buffer_error("ele"); + return; + } + + buffer = &trace_data->dmatb; + if (buffer == NULL) { + trace_buffer_error("ele"); + return; + } + + margin = buffer->end_addr - buffer->w_ptr; + + if (margin > length) { + memcpy(buffer->w_ptr, e, length); + buffer->w_ptr += length; + } else { + memcpy(buffer->w_ptr, e, margin); + buffer->w_ptr += margin; + + trace_send(trace_data); + buffer->w_ptr = buffer->r_ptr = buffer->addr; + bzero(buffer->addr, buffer->size); + + memcpy(buffer->w_ptr, e + margin, length - margin); + buffer->w_ptr += length -margin; + + trace_buffer("ebs"); + } + + length = buffer->w_ptr - buffer->r_ptr; + if (length >= (DMA_TRACE_LOCAL_SIZE / 2)) + trace_send(trace_data); +} diff --git a/src/include/reef/alloc.h b/src/include/reef/alloc.h index d263052..a589959 100644 --- a/src/include/reef/alloc.h +++ b/src/include/reef/alloc.h @@ -82,6 +82,7 @@ void rbfree(void *ptr); /* utility */ void bzero(void *s, size_t n); void *memset(void *s, int c, size_t n); +int rstrlen(char *s); /* Heap save/restore contents and context for PM D0/D3 events */ uint32_t mm_pm_context_size(void); diff --git a/src/include/reef/audio/dma-trace.h b/src/include/reef/audio/dma-trace.h new file mode 100644 index 0000000..9ee88a0 --- /dev/null +++ b/src/include/reef/audio/dma-trace.h @@ -0,0 +1,69 @@ +/* + * Copyright (c) 2016, 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: Yan Wang <yan.wang(a)linux.intel.com> + */ + +#ifndef __INCLUDE_DMA_TRACE__ +#define __INCLUDE_DMA_TRACE__ + +#include <stdint.h> +#include <stdlib.h> +#include <reef/reef.h> +#include <reef/list.h> +#include <reef/mailbox.h> +#include <reef/debug.h> +#include <reef/timer.h> +#include <reef/dma.h> +#include <reef/work.h> +#include <platform/platform.h> +#include <platform/timer.h> + +struct dma_trace_buf { + void *w_ptr; /* buffer write pointer */ + void *r_ptr; /* buffer read position */ + void *addr; /* buffer base address */ + void *end_addr; /* buffer end address */ + uint32_t size; /* size of buffer in bytes */ +}; + +struct dma_trace_data { + struct dma_sg_config config; + struct dma_trace_buf dmatb; + int32_t host_offset; + uint32_t host_size; + struct work dmat_work; +}; + +int dma_trace_init(struct dma_trace_data *d); +int dma_trace_host_buffer(struct dma_trace_data *d, struct dma_sg_elem *elem, + uint32_t host_size); +void dma_trace_config_ready(struct dma_trace_data *d); + +void dtrace_event(char *e); + +#endif diff --git a/src/lib/lib.c b/src/lib/lib.c index d018f5e..764e53b 100644 --- a/src/lib/lib.c +++ b/src/lib/lib.c @@ -89,3 +89,12 @@ void *memset(void *s, int c, size_t n) return s; } + +/* generic strlen - TODO: can be optimsed for ARCH ? */ +int rstrlen(char *s) +{ + char *p = s; + + while(*p++ != 0); + return (p - s) - 1; +} diff --git a/src/platform/baytrail/include/platform/platform.h b/src/platform/baytrail/include/platform/platform.h index 1ad0a22..ff3a117 100644 --- a/src/platform/baytrail/include/platform/platform.h +++ b/src/platform/baytrail/include/platform/platform.h @@ -76,6 +76,12 @@ struct reef; /* WorkQ window size in microseconds */ #define PLATFORM_WORKQ_WINDOW 2000 +/* local buffer size of DMA tracing */ +#define DMA_TRACE_LOCAL_SIZE HOST_PAGE_SIZE + +/* the interval of DMA trace copying */ +#define DMA_TRACE_US 500000 + /* Platform defined panic code */ #define platform_panic(__x) \ shim_write(SHIM_IPCXL, ((shim_read(SHIM_IPCXL) & 0xc0000000) |\ -- 2.7.4

1 0