patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

logging: adsp hda backend refinements and additional test

Browse source 
Additional testing showed that when using printk the logger would start
sticking and spitting out nulls which is wrong. This made it appear as if
the firmware had locked up. The issue seems to have been caused by the
initial ipc message to read all the dma buffers on the host.

Removing that, the issue seems to have been solved.

This also improves the test case to ensure printk with LOG_PRINTK=y
works as expected. It also adds a last log message between some
timeouts of the flush timer length to ensure the padding and timer
flush are working properly.

Signed-off-by: Tom Burdick <thomas.burdick@intel.com>
This commit is contained in:
Tom Burdick 2022-09-07 09:26:36 -05:00 committed by Anas Nashif
parent 1d7ff08c82
commit 54474510b3
4 changed files with 48 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
subsys/logging/log_backend_adsp_hda.c
View file

@ -327,7 +327,6 @@ void adsp_hda_log_init(adsp_hda_log_hook_t fn, uint32_t channel)
#include <cavstool.h>
#define CHANNEL 6
#define HOST_BUF_SIZE 8192
#define IPC_TIMEOUT K_MSEC(1500)
static inline void hda_ipc_msg(const struct device *dev, uint32_t data,
@ -365,11 +364,9 @@ int adsp_hda_log_cavstool_init(const struct device *dev)
hda_ipc_msg(INTEL_ADSP_IPC_HOST_DEV, IPCCMD_HDA_RESET, CHANNEL, IPC_TIMEOUT);
hda_ipc_msg(INTEL_ADSP_IPC_HOST_DEV, IPCCMD_HDA_CONFIG,
CHANNEL | (HOST_BUF_SIZE << 8), IPC_TIMEOUT);
CHANNEL | (CONFIG_LOG_BACKEND_ADSP_HDA_SIZE << 8), IPC_TIMEOUT);
adsp_hda_log_init(adsp_hda_log_cavstool_hook, CHANNEL);
hda_ipc_msg(INTEL_ADSP_IPC_HOST_DEV, IPCCMD_HDA_START, CHANNEL, IPC_TIMEOUT);
hda_ipc_msg(INTEL_ADSP_IPC_HOST_DEV, IPCCMD_HDA_PRINT,
((HOST_BUF_SIZE*2) << 8) | CHANNEL, IPC_TIMEOUT);
return 0;
}

2
tests/boards/intel_adsp/hda_log/prj.conf
View file

@ -6,7 +6,7 @@ CONFIG_LOG=y
CONFIG_LOG_MODE_IMMEDIATE=y
CONFIG_LOG_BACKEND_ADSP=n
CONFIG_LOG_BACKEND_ADSP_HDA=y
CONFIG_LOG_BACKEND_ADSP_HDA_SIZE=8192
CONFIG_LOG_BACKEND_ADSP_HDA_SIZE=2048
CONFIG_LOG_BACKEND_ADSP_HDA_PADDING=y
CONFIG_LOG_BACKEND_ADSP_HDA_CAVSTOOL=y
CONFIG_LOG_BACKEND_ADSP_HDA_FLUSH_TIME=100

42
tests/boards/intel_adsp/hda_log/src/logger.c
View file

@ -14,20 +14,48 @@
#include <zephyr/logging/log.h>
LOG_MODULE_REGISTER(hda_test, LOG_LEVEL_DBG);
/* Define a prime length message string (13 bytes long when including the \0 terminator)
*
* This helps ensure most if not all messages are not going to land on a 128 byte boundary
* which is important to test the padding and wrapping feature
*/
#ifdef CONFIG_LOG_PRINTK
#define FMT_STR "TEST:%06d\n"
#else
#define FMT_STR "TEST:%07d"
#endif
#define FMT_STR_LEN 13
/* Now define the number of iterations such that we ensure a large number of wraps
* on the HDA ring.
*/
#define TEST_ITERATIONS ((CONFIG_LOG_BACKEND_ADSP_HDA_SIZE/FMT_STR_LEN)*200)
ZTEST(intel_adsp_hda_log, test_hda_logger)
{
TC_PRINT("Testing hda log backend\n");
TC_PRINT("Testing hda log backend, log buffer size %u, iterations %u\n",
CONFIG_LOG_BACKEND_ADSP_HDA_SIZE, TEST_ITERATIONS);
/* Wait a moment so the output isn't mangled */
/* Wait a moment so the output isn't mangled with the above printk */
k_msleep(100);
/* Ensure multiple wraps and many many logs are written */
for (int i = 0; i < 4096; i++) {
LOG_DBG("test hda log message %d", i);
for (int i = 0; i < TEST_ITERATIONS; i++) {
if (IS_ENABLED(CONFIG_LOG_PRINTK)) {
printk(FMT_STR, i);
} else {
LOG_INF(FMT_STR, i);
}
}
/* Wait another moment so dma may flush */
k_sleep(K_MSEC(100));
/* Wait for the flush to happen */
k_msleep(CONFIG_LOG_BACKEND_ADSP_HDA_FLUSH_TIME + 10);
/* Test the flush timer works by writing a short string */
LOG_INF("Timeout flush working if shown");
/* Wait again for the flush to happen */
k_msleep(CONFIG_LOG_BACKEND_ADSP_HDA_FLUSH_TIME + 10);
}
ZTEST_SUITE(intel_adsp_hda_log, NULL, NULL, NULL, NULL, NULL);

11
tests/boards/intel_adsp/hda_log/testcase.yaml
View file

@ -1,6 +1,17 @@
common:
harness: console
harness_config:
type: multi_line
regex:
- "TEST:([0-9]){6,7}"
- "Timeout flush working if shown"
tests:
boards.intel_adsp.hda_log:
platform_allow: intel_adsp_cavs15 intel_adsp_cavs18 intel_adsp_cavs20 intel_adsp_cavs25
boards.intel_adsp.hda_log.printk:
platform_allow: intel_adsp_cavs15 intel_adsp_cavs18 intel_adsp_cavs20 intel_adsp_cavs25
extra_configs:
- CONFIG_LOG_PRINTK=y
boards.intel_adsp.hda_log.1cpu:
platform_allow: intel_adsp_cavs15 intel_adsp_cavs18 intel_adsp_cavs20 intel_adsp_cavs25
extra_configs: