Commit 92fc7d81 authored by Tingwei Zhang's avatar Tingwei Zhang Committed by Greg Kroah-Hartman
Browse files

coresight: Add coresight prefix to barrier_pkt 



Add coresight prefix to make it specific. It will be a export symbol.

Reviewed-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: default avatarMian Yousaf Kaukab <ykaukab@suse.de>
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/20200928163513.70169-5-mathieu.poirier@linaro.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b8127113

drivers/hwtracing/coresight/coresight-etb10.c

+1 −1
Original line number Diff line number Diff line
@@ -525,7 +525,7 @@ static unsigned long etb_update_buffer(struct coresight_device *csdev, 


	cur = buf->cur;

	offset = buf->offset;

	barrier = barrier_pkt;

	barrier = coresight_barrier_pkt;



	for (i = 0; i < to_read; i += 4) {

		buf_ptr = buf->data_pages[cur] + offset;

drivers/hwtracing/coresight/coresight-priv.h

+3 −4
Original line number Diff line number Diff line
@@ -66,8 +66,8 @@ static DEVICE_ATTR_RO(name) 
#define coresight_simple_reg64(type, name, lo_off, hi_off)		\

	__coresight_simple_func(type, NULL, name, lo_off, hi_off)



extern const u32 barrier_pkt[4];

#define CORESIGHT_BARRIER_PKT_SIZE (sizeof(barrier_pkt))

extern const u32 coresight_barrier_pkt[4];

#define CORESIGHT_BARRIER_PKT_SIZE (sizeof(coresight_barrier_pkt))



enum etm_addr_type {

	ETM_ADDR_TYPE_NONE,
@@ -104,10 +104,9 @@ struct cs_buffers { 
static inline void coresight_insert_barrier_packet(void *buf)

{

	if (buf)

		memcpy(buf, barrier_pkt, CORESIGHT_BARRIER_PKT_SIZE);

		memcpy(buf, coresight_barrier_pkt, CORESIGHT_BARRIER_PKT_SIZE);

}





static inline void CS_LOCK(void __iomem *addr)

{

	do {

drivers/hwtracing/coresight/coresight-tmc-etf.c

+1 −1
Original line number Diff line number Diff line
@@ -519,7 +519,7 @@ static unsigned long tmc_update_etf_buffer(struct coresight_device *csdev, 


	cur = buf->cur;

	offset = buf->offset;

	barrier = barrier_pkt;

	barrier = coresight_barrier_pkt;



	/* for every byte to read */

	for (i = 0; i < to_read; i += 4) {

drivers/hwtracing/coresight/coresight.c

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ static struct list_head *stm_path; 
 * beginning of the data collected in a buffer.  That way the decoder knows that

 * it needs to look for another sync sequence.

 */

const u32 barrier_pkt[4] = {0x7fffffff, 0x7fffffff, 0x7fffffff, 0x7fffffff};

const u32 coresight_barrier_pkt[4] = {0x7fffffff, 0x7fffffff, 0x7fffffff, 0x7fffffff};



static int coresight_id_match(struct device *dev, void *data)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE