Commit 4af8b3d3 authored by Tingwei Zhang's avatar Tingwei Zhang Committed by Greg Kroah-Hartman

coresight: stm: Support marked packet

STP_PACKET_MARKED is not supported by STM currently.
Add STM_FLAG_MARKED to support marked packet in STM.
Signed-off-by: default avatarTingwei Zhang <tingwei@codeaurora.org>
Signed-off-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
Link: https://lore.kernel.org/r/20200916191737.4001561-3-mathieu.poirier@linaro.orgSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2d1a8bfb
...@@ -412,6 +412,7 @@ static ssize_t notrace stm_generic_packet(struct stm_data *stm_data, ...@@ -412,6 +412,7 @@ static ssize_t notrace stm_generic_packet(struct stm_data *stm_data,
void __iomem *ch_addr; void __iomem *ch_addr;
struct stm_drvdata *drvdata = container_of(stm_data, struct stm_drvdata *drvdata = container_of(stm_data,
struct stm_drvdata, stm); struct stm_drvdata, stm);
unsigned int stm_flags;
if (!(drvdata && local_read(&drvdata->mode))) if (!(drvdata && local_read(&drvdata->mode)))
return -EACCES; return -EACCES;
...@@ -421,8 +422,9 @@ static ssize_t notrace stm_generic_packet(struct stm_data *stm_data, ...@@ -421,8 +422,9 @@ static ssize_t notrace stm_generic_packet(struct stm_data *stm_data,
ch_addr = stm_channel_addr(drvdata, channel); ch_addr = stm_channel_addr(drvdata, channel);
flags = (flags == STP_PACKET_TIMESTAMPED) ? STM_FLAG_TIMESTAMPED : 0; stm_flags = (flags & STP_PACKET_TIMESTAMPED) ?
flags |= test_bit(channel, drvdata->chs.guaranteed) ? STM_FLAG_TIMESTAMPED : 0;
stm_flags |= test_bit(channel, drvdata->chs.guaranteed) ?
STM_FLAG_GUARANTEED : 0; STM_FLAG_GUARANTEED : 0;
if (size > drvdata->write_bytes) if (size > drvdata->write_bytes)
...@@ -432,7 +434,7 @@ static ssize_t notrace stm_generic_packet(struct stm_data *stm_data, ...@@ -432,7 +434,7 @@ static ssize_t notrace stm_generic_packet(struct stm_data *stm_data,
switch (packet) { switch (packet) {
case STP_PACKET_FLAG: case STP_PACKET_FLAG:
ch_addr += stm_channel_off(STM_PKT_TYPE_FLAG, flags); ch_addr += stm_channel_off(STM_PKT_TYPE_FLAG, stm_flags);
/* /*
* The generic STM core sets a size of '0' on flag packets. * The generic STM core sets a size of '0' on flag packets.
...@@ -444,7 +446,8 @@ static ssize_t notrace stm_generic_packet(struct stm_data *stm_data, ...@@ -444,7 +446,8 @@ static ssize_t notrace stm_generic_packet(struct stm_data *stm_data,
break; break;
case STP_PACKET_DATA: case STP_PACKET_DATA:
ch_addr += stm_channel_off(STM_PKT_TYPE_DATA, flags); stm_flags |= (flags & STP_PACKET_MARKED) ? STM_FLAG_MARKED : 0;
ch_addr += stm_channel_off(STM_PKT_TYPE_DATA, stm_flags);
stm_send(ch_addr, payload, size, stm_send(ch_addr, payload, size,
drvdata->write_bytes); drvdata->write_bytes);
break; break;
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#include <linux/const.h> #include <linux/const.h>
#define STM_FLAG_TIMESTAMPED _BITUL(3) #define STM_FLAG_TIMESTAMPED _BITUL(3)
#define STM_FLAG_MARKED _BITUL(4)
#define STM_FLAG_GUARANTEED _BITUL(7) #define STM_FLAG_GUARANTEED _BITUL(7)
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment