coresight: stm: support marked packet
PATCH v2 1/1 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 Tingwei Zhang <[email protected]>
--- drivers/hwtracing/coresight/coresight-stm.c | 11 +++++++---- include/uapi/linux/coresight-stm.h | 1 + 2 files changed, 8 insertions(+), 4 deletions(-)
drivers/hwtracing/coresight/coresight-stm.c +7 -4
@@ -412,6 +412,7 @@ static ssize_t notrace stm_generic_packet(struct stm_data *stm_data,void __iomem *ch_addr;struct stm_drvdata *drvdata =container_of (stm_data, struct stm_drvdata, stm); +unsigned int stm_flags;if (!(drvdata &&local_read (&drvdata->mode)))return -EACCES ;
@@ -421,8 +422,9 @@ static ssize_t notrace stm_generic_packet(struct stm_data *stm_data, ch_addr =stm_channel_addr (drvdata, channel); - flags = (flags ==STP_PACKET_TIMESTAMPED ) ?STM_FLAG_TIMESTAMPED :0 ; - flags |=test_bit (channel, drvdata->chs.guaranteed) ? + stm_flags = (flags &STP_PACKET_TIMESTAMPED ) ? +STM_FLAG_TIMESTAMPED :0 ; + stm_flags |=test_bit (channel, drvdata->chs.guaranteed) ?STM_FLAG_GUARANTEED :0 ;if (size > drvdata->write_bytes)
@@ -432,7 +434,7 @@ static ssize_t notrace stm_generic_packet(struct stm_data *stm_data,switch (packet) {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.
@@ -444,7 +446,8 @@ static ssize_t notrace stm_generic_packet(struct stm_data *stm_data,break ;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, drvdata->write_bytes);break ;
include/uapi/linux/coresight-stm.h +1 -0
@@ -5,6 +5,7 @@#include <linux/const.h> #define STM_FLAG_TIMESTAMPED _BITUL(3) +#define STM_FLAG_MARKED _BITUL(4)#define STM_FLAG_GUARANTEED _BITUL(7)/*
Signature · 8 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 43 lines · Tingwei Zhang
STP_PACKET_MARKEDis not supported by STM currently. AddSTM_FLAG_MARKEDto support marked packet in STM.Signed-off-by Tingwei Zhang <[email protected]>--- drivers/hwtracing/coresight/coresight-stm.c | 11 +++++++---- include/uapi/linux/coresight-stm.h | 1 + 2 files changed, 8 insertions(+), 4 deletions(-)drivers/hwtracing/coresight/coresight-stm.c +5
-3@@ -412,6 +412,7 @@ static ssize_t notrace stm_generic_packet(struct stm_data *stm_data,void __iomem *ch_addr;struct stm_drvdata *drvdata =container_of (stm_data, struct stm_drvdata, stm); +unsigned int stm_flags;if (!(drvdata &&local_read (&drvdata->mode)))return -EACCES ;@@ -421,8 +422,9 @@ static ssize_t notrace stm_generic_packet(struct stm_data *stm_data, ch_addr =stm_channel_addr (drvdata, channel); - flags = (flags ==STP_PACKET_TIMESTAMPED ) ?STM_FLAG_TIMESTAMPED :0 ; - flags |=test_bit (channel, drvdata->chs.guaranteed) ? + stm_flags = (flags &STP_PACKET_TIMESTAMPED ) ? +STM_FLAG_TIMESTAMPED :0 ; + stm_flags |=test_bit (channel, drvdata->chs.guaranteed) ?STM_FLAG_GUARANTEED :0 ;if (size > drvdata->write_bytes)@@ -432,7 +434,7 @@ static ssize_t notrace stm_generic_packet(struct stm_data *stm_data,switch (packet) {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.
drivers/hwtracing/coresight/coresight-stm.c static ssize_t notrace stm_generic_packet(struct stm_data *stm_data, · line 450
Quoted 6 lines
drivers/hwtracing/coresight/coresight-stm.c +2
-1@@ -444,7 +446,8 @@ static ssize_t notrace stm_generic_packet(struct stm_data *stm_data,break ;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);
Much better - I have applied this patch to my local tree. It will be published next week when 5.9-rc1 is released.
Thanks,
Mathieu
Quoted 19 lines
drivers/hwtracing/coresight/coresight-stm.c +0
-0stm_send (ch_addr, payload, size, drvdata->write_bytes);break ;include/uapi/linux/coresight-stm.h +1
-0@@ -5,6 +5,7 @@#include <linux/const.h> #define STM_FLAG_TIMESTAMPED _BITUL(3) +#define STM_FLAG_MARKED _BITUL(4)#define STM_FLAG_GUARANTEED _BITUL(7)/* Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel