adafruit-mirror/zephyr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

logging: add STP transport and raw data output support for syst

Browse source 
Add STP transport support for MIPI SyS-T with Kconfig MIPI_SYST_STP,
this is following SyS-T spec Section 7.
And with Kconfig MIPI_SYST_RAW_DATA, add raw data output support for
MIPI SyS-T protocol stack.

Signed-off-by: Wentong Wu <wentong.wu@intel.com>
This commit is contained in:
Wentong Wu 2020-10-30 11:33:13 +08:00 committed by Maureen Helm
parent 480a682220
commit c85d353ca4
3 changed files with 359 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
modules/Kconfig.syst
View file

@ -6,3 +6,18 @@ config MIPI_SYST_LIB
select REQUIRES_FULL_LIBC select REQUIRES_FULL_LIBC
help help
This option enables the MIPI SyS-T Library This option enables the MIPI SyS-T Library
if MIPI_SYST_LIB
config MIPI_SYST_STP
bool "STP Transport Layer for MIPI SyS-T"
help
This option enables support for the STP
Transport Layer for MIPI SyS-T
config MIPI_SYST_RAW_DATA
bool "output MIPI SyS-T raw data packet"
help
This option outputs MIPI SyS-T raw data packet
endif

314
subsys/logging/log_output_syst.c
View file

@ -18,8 +18,15 @@ static struct mipi_syst_header log_syst_header;
static struct mipi_syst_handle log_syst_handle; static struct mipi_syst_handle log_syst_handle;
#if defined(MIPI_SYST_PCFG_ENABLE_PLATFORM_STATE_DATA) #if defined(MIPI_SYST_PCFG_ENABLE_PLATFORM_STATE_DATA)
#if defined(CONFIG_MIPI_SYST_STP)
static mipi_syst_u16 master = 128;
static mipi_syst_u16 channel = 1;
static struct stp_writer_data writer_state;
#elif !defined(CONFIG_MIPI_SYST_RAW_DATA)
static const char pattern[] = "SYS-T RAW DATA: "; static const char pattern[] = "SYS-T RAW DATA: ";
static const char valToHex[] = "0123456789ABCDEF"; static const char valToHex[] = "0123456789ABCDEF";
#endif
static int out_func(int c, void *ctx) static int out_func(int c, void *ctx)
{ {
@ -37,6 +44,201 @@ static int out_func(int c, void *ctx)
return 0; return 0;
} }
#if defined(CONFIG_MIPI_SYST_STP)
static void stp_write_putNibble(struct mipi_syst_handle *systh,
struct stp_writer_data *p, mipi_syst_u8 n)
{
p->current |= (n << 4);
p->byteDone = !p->byteDone;
if (p->byteDone) {
out_func(p->current, systh->systh_platform.log_output);
p->current = 0;
} else {
p->current >>= 4;
}
}
static void stp_write_flush(struct mipi_syst_handle *systh,
struct stp_writer_data *p)
{
if (!p->byteDone) {
stp_write_putNibble(systh, p, 0);
}
}
static void stp_write_d4(struct mipi_syst_handle *systh,
struct stp_writer_data *p, mipi_syst_u8 v)
{
stp_write_putNibble(systh, p, v);
}
static void stp_write_payload8(struct mipi_syst_handle *systh,
struct stp_writer_data *p, mipi_syst_u8 v)
{
stp_write_d4(systh, p, v);
stp_write_d4(systh, p, v>>4);
}
static void stp_write_payload16(struct mipi_syst_handle *systh,
struct stp_writer_data *p, mipi_syst_u16 v)
{
stp_write_payload8(systh, p, (mipi_syst_u8)v);
stp_write_payload8(systh, p, (mipi_syst_u8)(v>>8));
}
static void stp_write_payload32(struct mipi_syst_handle *systh,
struct stp_writer_data *p, mipi_syst_u32 v)
{
stp_write_payload16(systh, p, (mipi_syst_u16)v);
stp_write_payload16(systh, p, (mipi_syst_u16)(v>>16));
}
static void stp_write_payload64(struct mipi_syst_handle *systh,
struct stp_writer_data *p, mipi_syst_u64 v)
{
stp_write_payload32(systh, p, (mipi_syst_u32)v);
stp_write_payload32(systh, p, (mipi_syst_u32)(v>>32));
}
static mipi_syst_u64 deltaTime(struct stp_writer_data *p)
{
mipi_syst_u64 delta;
delta = mipi_syst_get_epoch() - p->timestamp;
return delta * 60;
}
static void stp_write_d32mts(struct mipi_syst_handle *systh,
struct stp_writer_data *p, mipi_syst_u32 v)
{
stp_write_d4(systh, p, 0xA);
stp_write_payload32(systh, p, v);
stp_write_d4(systh, p, 0xE);
stp_write_payload64(systh, p, deltaTime(p));
}
static void stp_write_d64mts(struct mipi_syst_handle *systh,
struct stp_writer_data *p, mipi_syst_u64 v)
{
stp_write_d4(systh, p, 0xB);
stp_write_payload64(systh, p, v);
stp_write_d4(systh, p, 0xE);
stp_write_payload64(systh, p, deltaTime(p));
}
static void stp_write_d32ts(struct mipi_syst_handle *systh,
struct stp_writer_data *p, mipi_syst_u32 v)
{
stp_write_d4(systh, p, 0xF);
stp_write_d4(systh, p, 0x6);
stp_write_payload32(systh, p, v);
stp_write_d4(systh, p, 0xE);
stp_write_payload64(systh, p, deltaTime(p));
}
static void stp_write_d8(struct mipi_syst_handle *systh,
struct stp_writer_data *p, mipi_syst_u8 v)
{
stp_write_d4(systh, p, 0x4);
stp_write_payload8(systh, p, v);
}
static void stp_write_d16(struct mipi_syst_handle *systh,
struct stp_writer_data *p, mipi_syst_u16 v)
{
stp_write_d4(systh, p, 0x5);
stp_write_payload16(systh, p, v);
}
static void stp_write_d32(struct mipi_syst_handle *systh,
struct stp_writer_data *p, mipi_syst_u32 v)
{
stp_write_d4(systh, p, 0x6);
stp_write_payload32(systh, p, v);
}
#if defined(MIPI_SYST_PCFG_ENABLE_64BIT_IO)
static void stp_write_d64(struct mipi_syst_handle *systh,
struct stp_writer_data *p, mipi_syst_u64 v)
{
stp_write_d4(systh, p, 0x7);
stp_write_payload64(systh, p, v);
}
#endif
static void stp_write_flag(struct mipi_syst_handle *systh,
struct stp_writer_data *p)
{
stp_write_d4(systh, p, 0xF);
stp_write_d4(systh, p, 0xE);
}
static void stp_write_async(struct mipi_syst_handle *systh,
struct stp_writer_data *p)
{
for (int i = 0; i < 21; ++i) {
stp_write_d4(systh, p, 0xF);
}
stp_write_d4(systh, p, 0x0);
}
static void stp_write_version(struct mipi_syst_handle *systh,
struct stp_writer_data *p)
{
stp_write_d4(systh, p, 0xF);
stp_write_d4(systh, p, 0x0);
stp_write_d4(systh, p, 0x0);
stp_write_d4(systh, p, 0x3);
p->master = 0;
p->channel = 0;
}
static void stp_write_freq(struct mipi_syst_handle *systh,
struct stp_writer_data *p)
{
stp_write_d4(systh, p, 0xF);
stp_write_d4(systh, p, 0x0);
stp_write_d4(systh, p, 0x8);
stp_write_payload32(systh, p, 60 * 1000 * 1000);
}
static void stp_write_setMC(struct mipi_syst_handle *systh,
struct stp_writer_data *p,
mipi_syst_u16 master,
mipi_syst_u16 channel)
{
if (!(p->recordCount++ % 20)) {
stp_write_async(systh, p);
stp_write_version(systh, p);
stp_write_freq(systh, p);
}
if (p->master != master) {
stp_write_d4(systh, p, 0xF);
stp_write_d4(systh, p, 0x1);
stp_write_payload16(systh, p, master);
p->master = master;
p->channel = 0;
}
if (p->channel != channel) {
stp_write_d4(systh, p, 0xF);
stp_write_d4(systh, p, 0x3);
stp_write_payload16(systh, p, channel);
p->channel = channel;
}
}
#else
static void write_raw(struct mipi_syst_handle *systh, const void *p, int n) static void write_raw(struct mipi_syst_handle *systh, const void *p, int n)
{ {
int i; int i;
@ -48,44 +250,132 @@ static void write_raw(struct mipi_syst_handle *systh, const void *p, int n)
for (i = 0; i < n; ++i) { for (i = 0; i < n; ++i) {
#endif #endif
c = ((const uint8_t *)p)[i]; c = ((const uint8_t *)p)[i];
#if defined(CONFIG_MIPI_SYST_RAW_DATA)
out_func(c, systh->systh_platform.log_output);
#else
out_func(valToHex[c >> 0x4], systh->systh_platform.log_output); out_func(valToHex[c >> 0x4], systh->systh_platform.log_output);
out_func(valToHex[c & 0xF], systh->systh_platform.log_output); out_func(valToHex[c & 0xF], systh->systh_platform.log_output);
#endif
} }
} }
#endif
static void write_d8(struct mipi_syst_handle *systh, uint8_t v) static void write_d8(struct mipi_syst_handle *systh, uint8_t v)
{ {
#if defined(CONFIG_MIPI_SYST_STP)
struct stp_writer_data *writer =
systh->systh_header->systh_platform.stpWriter;
stp_write_d8(systh, writer, v);
#else
write_raw(systh, &v, sizeof(v)); write_raw(systh, &v, sizeof(v));
#endif
} }
static void write_d16(struct mipi_syst_handle *systh, uint16_t v) static void write_d16(struct mipi_syst_handle *systh, uint16_t v)
{ {
#if defined(CONFIG_MIPI_SYST_STP)
struct stp_writer_data *writer =
systh->systh_header->systh_platform.stpWriter;
stp_write_d16(systh, writer, v);
#else
write_raw(systh, &v, sizeof(v)); write_raw(systh, &v, sizeof(v));
#endif
} }
static void write_d32(struct mipi_syst_handle *systh, uint32_t v) static void write_d32(struct mipi_syst_handle *systh, uint32_t v)
{ {
#if defined(CONFIG_MIPI_SYST_STP)
struct stp_writer_data *writer =
systh->systh_header->systh_platform.stpWriter;
stp_write_d32(systh, writer, v);
#else
write_raw(systh, &v, sizeof(v)); write_raw(systh, &v, sizeof(v));
#endif
} }
#if defined(MIPI_SYST_PCFG_ENABLE_64BIT_IO) #if defined(MIPI_SYST_PCFG_ENABLE_64BIT_IO)
static void write_d64(struct mipi_syst_handle *systh, uint64_t v) static void write_d64(struct mipi_syst_handle *systh, uint64_t v)
{ {
#if defined(CONFIG_MIPI_SYST_STP)
struct stp_writer_data *writer =
systh->systh_header->systh_platform.stpWriter;
stp_write_d64(systh, writer, v);
#else
write_raw(systh, &v, sizeof(v)); write_raw(systh, &v, sizeof(v));
#endif
} }
#endif #endif
static void write_d32ts(struct mipi_syst_handle *systh, uint32_t v) static void write_d32ts(struct mipi_syst_handle *systh, uint32_t v)
{ {
#if defined(CONFIG_MIPI_SYST_STP)
struct stp_writer_data *writer =
systh->systh_header->systh_platform.stpWriter;
stp_write_setMC(systh, writer,
systh->systh_platform.master,
systh->systh_platform.channel);
stp_write_d32ts(systh, writer, v);
#elif defined(CONFIG_MIPI_SYST_RAW_DATA)
ARG_UNUSED(systh);
write_raw(systh, &v, sizeof(v));
#else
for (int i = 0; i < strlen(pattern); i++) { for (int i = 0; i < strlen(pattern); i++) {
out_func(pattern[i], systh->systh_platform.log_output); out_func(pattern[i], systh->systh_platform.log_output);
} }
write_raw(systh, &v, sizeof(v)); write_raw(systh, &v, sizeof(v));
#endif
}
static void write_d32mts(struct mipi_syst_handle *systh, mipi_syst_u32 v)
{
#if defined(CONFIG_MIPI_SYST_STP)
struct stp_writer_data *writer =
systh->systh_header->systh_platform.stpWriter;
stp_write_setMC(systh, writer,
systh->systh_platform.master,
systh->systh_platform.channel);
stp_write_d32mts(systh, writer, v);
#else
ARG_UNUSED(systh);
ARG_UNUSED(v);
#endif
}
static void write_d64mts(struct mipi_syst_handle *systh, mipi_syst_u64 v)
{
#if defined(CONFIG_MIPI_SYST_STP)
struct stp_writer_data *writer =
systh->systh_header->systh_platform.stpWriter;
stp_write_setMC(systh, writer,
systh->systh_platform.master,
systh->systh_platform.channel);
stp_write_d64mts(systh, writer, v);
#else
ARG_UNUSED(systh);
ARG_UNUSED(v);
#endif
} }
static void write_flag(struct mipi_syst_handle *systh) static void write_flag(struct mipi_syst_handle *systh)
{ {
#if defined(CONFIG_MIPI_SYST_STP)
struct stp_writer_data *writer =
systh->systh_header->systh_platform.stpWriter;
stp_write_flag(systh, writer);
stp_write_flush(systh, writer);
#elif defined(CONFIG_MIPI_SYST_RAW_DATA)
ARG_UNUSED(systh);
#else
uint32_t flag = systh->systh_platform.flag; uint32_t flag = systh->systh_platform.flag;
if ((flag & LOG_OUTPUT_FLAG_CRLF_NONE) != 0U) { if ((flag & LOG_OUTPUT_FLAG_CRLF_NONE) != 0U) {
@ -98,6 +388,7 @@ static void write_flag(struct mipi_syst_handle *systh)
out_func('\r', systh->systh_platform.log_output); out_func('\r', systh->systh_platform.log_output);
out_func('\n', systh->systh_platform.log_output); out_func('\n', systh->systh_platform.log_output);
} }
#endif
} }
#endif #endif
@ -126,6 +417,16 @@ static void update_systh_platform_data(struct mipi_syst_handle *handle,
*/ */
static void platform_handle_init(struct mipi_syst_handle *systh) static void platform_handle_init(struct mipi_syst_handle *systh)
{ {
#if defined(CONFIG_MIPI_SYST_STP)
if (channel > 127) {
++master;
channel = 1;
}
systh->systh_platform.channel = channel++;
systh->systh_platform.master = master;
#endif
#if defined(MIPI_SYST_PCFG_LENGTH_FIELD) #if defined(MIPI_SYST_PCFG_LENGTH_FIELD)
MIPI_SYST_ENABLE_HANDLE_LENGTH(systh, 1); MIPI_SYST_ENABLE_HANDLE_LENGTH(systh, 1);
#endif #endif
@ -151,6 +452,17 @@ static void platform_handle_release(struct mipi_syst_handle *systh)
static void mipi_syst_platform_init(struct mipi_syst_header *systh, static void mipi_syst_platform_init(struct mipi_syst_header *systh,
const void *platform_data) const void *platform_data)
{ {
#if defined(CONFIG_MIPI_SYST_STP)
writer_state.byteDone = 0;
writer_state.current = 0;
writer_state.master = 0;
writer_state.channel = 0;
writer_state.recordCount = 0;
writer_state.timestamp = mipi_syst_get_epoch();
systh->systh_platform.stpWriter = &writer_state;
#endif
#if defined(MIPI_SYST_PCFG_ENABLE_PLATFORM_HANDLE_DATA) #if defined(MIPI_SYST_PCFG_ENABLE_PLATFORM_HANDLE_DATA)
systh->systh_inith = platform_handle_init; systh->systh_inith = platform_handle_init;
systh->systh_releaseh = platform_handle_release; systh->systh_releaseh = platform_handle_release;
@ -163,6 +475,8 @@ static void mipi_syst_platform_init(struct mipi_syst_header *systh,
systh->systh_platform.write_d64 = write_d64; systh->systh_platform.write_d64 = write_d64;
#endif #endif
systh->systh_platform.write_d32ts = write_d32ts; systh->systh_platform.write_d32ts = write_d32ts;
systh->systh_platform.write_d32mts = write_d32mts;
systh->systh_platform.write_d64mts = write_d64mts;
systh->systh_platform.write_flag = write_flag; systh->systh_platform.write_flag = write_flag;
#endif #endif
} }

30
subsys/logging/mipi_syst/platform.h
View file

@ -13,11 +13,29 @@
extern "C" { extern "C" {
#endif #endif
#if defined(CONFIG_MIPI_SYST_STP)
/*
* Structure generating STP protocol data
*/
struct stp_writer_data {
mipi_syst_u8 byteDone;
mipi_syst_u8 current;
mipi_syst_u16 master;
mipi_syst_u16 channel;
mipi_syst_u64 recordCount;
mipi_syst_u64 timestamp;
};
#endif
#if defined(MIPI_SYST_PCFG_ENABLE_PLATFORM_STATE_DATA) #if defined(MIPI_SYST_PCFG_ENABLE_PLATFORM_STATE_DATA)
/* /*
* Platform specific SyS-T global state extension * Platform specific SyS-T global state extension
*/ */
struct mipi_syst_platform_state { struct mipi_syst_platform_state {
#if defined(CONFIG_MIPI_SYST_STP)
struct stp_writer_data *stpWriter;
#endif
void (*write_d8)(struct mipi_syst_handle *systh, mipi_syst_u8 v); void (*write_d8)(struct mipi_syst_handle *systh, mipi_syst_u8 v);
void (*write_d16)(struct mipi_syst_handle *systh, mipi_syst_u16 v); void (*write_d16)(struct mipi_syst_handle *systh, mipi_syst_u16 v);
void (*write_d32)(struct mipi_syst_handle *systh, mipi_syst_u32 v); void (*write_d32)(struct mipi_syst_handle *systh, mipi_syst_u32 v);
@ -25,6 +43,8 @@ struct mipi_syst_platform_state {
void (*write_d64)(struct mipi_syst_handle *systh, mipi_syst_u64 v); void (*write_d64)(struct mipi_syst_handle *systh, mipi_syst_u64 v);
#endif #endif
void (*write_d32ts)(struct mipi_syst_handle *systh, mipi_syst_u32 v); void (*write_d32ts)(struct mipi_syst_handle *systh, mipi_syst_u32 v);
void (*write_d32mts)(struct mipi_syst_handle *systh, mipi_syst_u32 v);
void (*write_d64mts)(struct mipi_syst_handle *systh, mipi_syst_u64 v);
void (*write_flag)(struct mipi_syst_handle *systh); void (*write_flag)(struct mipi_syst_handle *systh);
}; };
@ -33,6 +53,10 @@ struct mipi_syst_platform_state {
*/ */
struct mipi_syst_platform_handle { struct mipi_syst_platform_handle {
mipi_syst_u32 flag; mipi_syst_u32 flag;
#if defined(CONFIG_MIPI_SYST_STP)
mipi_syst_u32 master;
mipi_syst_u32 channel;
#endif
struct log_output *log_output; struct log_output *log_output;
}; };
@ -57,6 +81,12 @@ struct mipi_syst_platform_handle {
#define MIPI_SYST_OUTPUT_D32TS(syst_handle, data) \ #define MIPI_SYST_OUTPUT_D32TS(syst_handle, data) \
((syst_handle)->systh_header-> \ ((syst_handle)->systh_header-> \
systh_platform.write_d32ts((syst_handle), (data))) systh_platform.write_d32ts((syst_handle), (data)))
#define MIPI_SYST_OUTPUT_D32MTS(syst_handle, data) \
((syst_handle)->systh_header-> \
systh_platform.write_d32mts((syst_handle), (data)))
#define MIPI_SYST_OUTPUT_D64MTS(syst_handle, data) \
((syst_handle)->systh_header-> \
systh_platform.write_d64mts((syst_handle), (data)))
#define MIPI_SYST_OUTPUT_FLAG(syst_handle) \ #define MIPI_SYST_OUTPUT_FLAG(syst_handle) \
((syst_handle)->systh_header-> \ ((syst_handle)->systh_header-> \
systh_platform.write_flag((syst_handle))) systh_platform.write_flag((syst_handle)))