| Message ID | 20200821034445.967-5-tingwei@codeaurora.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | coresight: allow to build coresight as modules | expand |
On Fri, Aug 21, 2020 at 11:44:25AM +0800, Tingwei Zhang wrote: > Add coresight prefix to make it specific. It will be a export symbol. > > Signed-off-by: Mian Yousaf Kaukab <ykaukab@suse.de> > Signed-off-by: Tingwei Zhang <tingwei@codeaurora.org> > Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com> > Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org> > --- > drivers/hwtracing/coresight/coresight-etb10.c | 2 +- > drivers/hwtracing/coresight/coresight-priv.h | 8 ++++---- > drivers/hwtracing/coresight/coresight-tmc-etf.c | 2 +- > drivers/hwtracing/coresight/coresight.c | 2 +- > 4 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/drivers/hwtracing/coresight/coresight-etb10.c b/drivers/hwtracing/coresight/coresight-etb10.c > index 03e3f2590191..04ee9cda988d 100644 > --- a/drivers/hwtracing/coresight/coresight-etb10.c > +++ b/drivers/hwtracing/coresight/coresight-etb10.c > @@ -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; > diff --git a/drivers/hwtracing/coresight/coresight-priv.h b/drivers/hwtracing/coresight/coresight-priv.h > index d801a2755432..dcb8aeb6af62 100644 > --- a/drivers/hwtracing/coresight/coresight-priv.h > +++ b/drivers/hwtracing/coresight/coresight-priv.h > @@ -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,10 @@ 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); Didn't I comment on this before? > } > > - > static inline void CS_LOCK(void __iomem *addr) > { > do { > diff --git a/drivers/hwtracing/coresight/coresight-tmc-etf.c b/drivers/hwtracing/coresight/coresight-tmc-etf.c > index 6375504ba8b0..44402d413ebb 100644 > --- a/drivers/hwtracing/coresight/coresight-tmc-etf.c > +++ b/drivers/hwtracing/coresight/coresight-tmc-etf.c > @@ -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) { > diff --git a/drivers/hwtracing/coresight/coresight.c b/drivers/hwtracing/coresight/coresight.c > index e9c90f2de34a..d515088cc47d 100644 > --- a/drivers/hwtracing/coresight/coresight.c > +++ b/drivers/hwtracing/coresight/coresight.c > @@ -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) > { > -- > The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, > a Linux Foundation Collaborative Project >
On Fri, Sep 11, 2020 at 06:19:18AM +0800, Mathieu Poirier wrote: > On Fri, Aug 21, 2020 at 11:44:25AM +0800, Tingwei Zhang wrote: > > Add coresight prefix to make it specific. It will be a export symbol. > > > > Signed-off-by: Mian Yousaf Kaukab <ykaukab@suse.de> > > Signed-off-by: Tingwei Zhang <tingwei@codeaurora.org> > > Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com> > > Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org> > > --- > > drivers/hwtracing/coresight/coresight-etb10.c | 2 +- > > drivers/hwtracing/coresight/coresight-priv.h | 8 ++++---- > > drivers/hwtracing/coresight/coresight-tmc-etf.c | 2 +- > > drivers/hwtracing/coresight/coresight.c | 2 +- > > 4 files changed, 7 insertions(+), 7 deletions(-) > > > > diff --git a/drivers/hwtracing/coresight/coresight-etb10.c > b/drivers/hwtracing/coresight/coresight-etb10.c > > index 03e3f2590191..04ee9cda988d 100644 > > --- a/drivers/hwtracing/coresight/coresight-etb10.c > > +++ b/drivers/hwtracing/coresight/coresight-etb10.c > > @@ -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; > > diff --git a/drivers/hwtracing/coresight/coresight-priv.h > b/drivers/hwtracing/coresight/coresight-priv.h > > index d801a2755432..dcb8aeb6af62 100644 > > --- a/drivers/hwtracing/coresight/coresight-priv.h > > +++ b/drivers/hwtracing/coresight/coresight-priv.h > > @@ -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,10 @@ 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); > > Didn't I comment on this before? > Sorry for missing below comment from you, Mathieu. Indentation problem. I'll fix it in v11. Thanks, Tingwei > > } > > > > - > > static inline void CS_LOCK(void __iomem *addr) > > { > > do { > > diff --git a/drivers/hwtracing/coresight/coresight-tmc-etf.c > b/drivers/hwtracing/coresight/coresight-tmc-etf.c > > index 6375504ba8b0..44402d413ebb 100644 > > --- a/drivers/hwtracing/coresight/coresight-tmc-etf.c > > +++ b/drivers/hwtracing/coresight/coresight-tmc-etf.c > > @@ -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) { > > diff --git a/drivers/hwtracing/coresight/coresight.c > b/drivers/hwtracing/coresight/coresight.c > > index e9c90f2de34a..d515088cc47d 100644 > > --- a/drivers/hwtracing/coresight/coresight.c > > +++ b/drivers/hwtracing/coresight/coresight.c > > @@ -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) > > { > > -- > > The Qualcomm Innovation Center, Inc. is a member of the Code Aurora > Forum, > > a Linux Foundation Collaborative Project > > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
diff --git a/drivers/hwtracing/coresight/coresight-etb10.c b/drivers/hwtracing/coresight/coresight-etb10.c index 03e3f2590191..04ee9cda988d 100644 --- a/drivers/hwtracing/coresight/coresight-etb10.c +++ b/drivers/hwtracing/coresight/coresight-etb10.c @@ -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; diff --git a/drivers/hwtracing/coresight/coresight-priv.h b/drivers/hwtracing/coresight/coresight-priv.h index d801a2755432..dcb8aeb6af62 100644 --- a/drivers/hwtracing/coresight/coresight-priv.h +++ b/drivers/hwtracing/coresight/coresight-priv.h @@ -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,10 @@ 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 { diff --git a/drivers/hwtracing/coresight/coresight-tmc-etf.c b/drivers/hwtracing/coresight/coresight-tmc-etf.c index 6375504ba8b0..44402d413ebb 100644 --- a/drivers/hwtracing/coresight/coresight-tmc-etf.c +++ b/drivers/hwtracing/coresight/coresight-tmc-etf.c @@ -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) { diff --git a/drivers/hwtracing/coresight/coresight.c b/drivers/hwtracing/coresight/coresight.c index e9c90f2de34a..d515088cc47d 100644 --- a/drivers/hwtracing/coresight/coresight.c +++ b/drivers/hwtracing/coresight/coresight.c @@ -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) {