coresight: Reduce duplicated sysfs accessors
cover coresight: Reduce duplicated sysfs accessors
The intent of this change is to reduce the large number identical of functions created by macros for sysfs accessors. It's possible to re-use the same function but pass in the register to access as an argument. This reduces the size of the coresight modules folder by 244KB.
The first two patches are refactors to simplify and remove some dead code, and the second two are the changes to use a shared function.
Testing
=======
No changes in any of the outputs:
cat /sys/bus/coresight/devices/*/mgmt/* > before.txt cat /sys/bus/coresight/devices/*/mgmt/* > after.txt diff before.txt after.txt
With the following modules loaded:
ls /sys/bus/coresight/devices/
etm0 etm2 funnel0 funnel2 replicator0 tmc_etf0 tmc_etf2 tpiu0 etm1 etm3 funnel1 funnel3 stm0 tmc_etf1 tmc_etr0
James Clark (4):
coresight: Remove unused function parameter
coresight: Simplify sysfs accessors by using csdev_access abstraction
coresight: Re-use same function for similar sysfs register accessors
coresight: cti-sysfs: Re-use same functions for similar sysfs register
accessors
drivers/hwtracing/coresight/coresight-catu.c | 27 +-- drivers/hwtracing/coresight/coresight-core.c | 14 ++ .../hwtracing/coresight/coresight-cti-sysfs.c | 213 +++++++----------- drivers/hwtracing/coresight/coresight-etb10.c | 28 +-- .../coresight/coresight-etm3x-sysfs.c | 34 +-- drivers/hwtracing/coresight/coresight-priv.h | 48 ++-- .../coresight/coresight-replicator.c | 10 +- drivers/hwtracing/coresight/coresight-stm.c | 40 +--- .../hwtracing/coresight/coresight-tmc-core.c | 48 ++-- include/linux/coresight.h | 18 ++ 10 files changed, 196 insertions(+), 284 deletions(-)
Signature · 1 line
2.28.0
PATCH 1/4 coresight: Remove unused function parameter
The ability to use a custom function in this sysfs show function isn't used so remove it.
No functional changes.
--- drivers/hwtracing/coresight/coresight-priv.h | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-)
drivers/hwtracing/coresight/coresight-priv.h +4 -12
@@ -40,31 +40,23 @@#define ETM_MODE_EXCL_KERN BIT(30)#define ETM_MODE_EXCL_USER BIT(31) -typedef u32 (*coresight_read_fn )(const struct device *,u32 offset); -#define __coresight_simple_func (type, func, name, lo_off, hi_off) \ +#define __coresight_simple_show (type, name, lo_off, hi_off) \ static ssize_t name##_show(struct device *_dev, \ struct device_attribute *attr, char *buf) \ { \ type *drvdata = dev_get_drvdata(_dev->parent); \ - coresight_read_fn fn = func; \ u64 val; \ pm_runtime_get_sync(_dev->parent); \ - if (fn) \ - val = (u64)fn(_dev->parent, lo_off); \ - else \ - val = coresight_read_reg_pair(drvdata->base, \ - lo_off, hi_off); \ + val = coresight_read_reg_pair(drvdata->base, lo_off, hi_off); \ pm_runtime_put_sync(_dev->parent); \ return scnprintf(buf, PAGE_SIZE, "0x%llx\n", val); \ } \ static DEVICE_ATTR_RO(name) -#define coresight_simple_func (type, func, name, offset) \ - __coresight_simple_func(type, func, name, offset, -1)#define coresight_simple_reg32 (type, name, offset) \ - __coresight_simple_func(type, NULL, name, offset, -1) + __coresight_simple_show(type, name, offset, -1)#define coresight_simple_reg64 (type, name, lo_off, hi_off) \ - __coresight_simple_func(type, NULL, name, lo_off, hi_off) + __coresight_simple_show(type, name, lo_off, hi_off)extern const u32 coresight_barrier_pkt[4 ];#define CORESIGHT_BARRIER_PKT_SIZE (sizeof(coresight_barrier_pkt))
Signature · 1 line
2.28.0
Re: [PATCH v1 1/4] coresight: Remove unused function parameter
Quoted 26 lines · James Clark
The ability to use a custom function in this sysfs show function isn't used so remove it.
No functional changes.
Signed-off-by James Clark <[email protected]>--- drivers/hwtracing/coresight/coresight-priv.h | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-)drivers/hwtracing/coresight/coresight-priv.h +1
-3@@ -40,31 +40,23 @@#define ETM_MODE_EXCL_KERN BIT(30)#define ETM_MODE_EXCL_USER BIT(31) -typedef u32 (*coresight_read_fn )(const struct device *,u32 offset); -#define __coresight_simple_func (type, func, name, lo_off, hi_off) \ +#define __coresight_simple_show (type, name, lo_off, hi_off) \ static ssize_t name##_show(struct device *_dev, \ struct device_attribute *attr, char *buf) \ { \ type *drvdata = dev_get_drvdata(_dev->parent); \ - coresight_read_fn fn = func; \
drivers/hwtracing/coresight/coresight-priv.h line 52
Quoted 10 lines
drivers/hwtracing/coresight/coresight-priv.h +1
-5u64 val; \pm_runtime_get_sync (_dev->parent); \ -if (fn) \ - val = (u64 )fn (_dev->parent, lo_off); \ -else \ - val =coresight_read_reg_pair (drvdata->base, \ - lo_off, hi_off); \ + val =coresight_read_reg_pair (drvdata->base, lo_off, hi_off); \pm_runtime_put_sync (_dev->parent); \return scnprintf (buf,PAGE_SIZE ,"0x%llx\n" , val); \
Sorry for the slightly out-of-scope reply, but I think you could also take the opportunity to replace scnprintf() calls with sysfs_emit() calls, if you think it is worth it.
Thanks,
German
Quoted 14 lines
drivers/hwtracing/coresight/coresight-priv.h +2
-4} \static DEVICE_ATTR_RO (name) -#define coresight_simple_func (type, func, name, offset) \ - __coresight_simple_func(type, func, name, offset, -1) #define coresight_simple_reg32(type, name, offset) \ - __coresight_simple_func(type, NULL, name, offset, -1) +__coresight_simple_show (type, name, offset,-1 ) #define coresight_simple_reg64(type, name, lo_off, hi_off) \ - __coresight_simple_func(type, NULL, name, lo_off, hi_off) +__coresight_simple_show (type, name, lo_off, hi_off) extern const u32 coresight_barrier_pkt[4 ];#define CORESIGHT_BARRIER_PKT_SIZE (sizeof(coresight_barrier_pkt))
PATCH 2/4 coresight: Simplify sysfs accessors by using csdev_access abstraction
In reply to James ClarkThe coresight_device struct is available in the sysfs accessor, and this contains a csdev_access struct which can be used to access registers. Use this instead of passing in the type of each drvdata so that a common function can be shared between all the cs drivers.
No functional changes.
--- drivers/hwtracing/coresight/coresight-catu.c | 18 +++++----- drivers/hwtracing/coresight/coresight-etb10.c | 19 +++++------ .../coresight/coresight-etm3x-sysfs.c | 23 ++++++------- drivers/hwtracing/coresight/coresight-priv.h | 14 ++++---- .../coresight/coresight-replicator.c | 7 ++-- drivers/hwtracing/coresight/coresight-stm.c | 27 +++++++-------- .../hwtracing/coresight/coresight-tmc-core.c | 33 ++++++++----------- include/linux/coresight.h | 18 ++++++++++ 8 files changed, 79 insertions(+), 80 deletions(-)
drivers/hwtracing/coresight/coresight-catu.c +8 -10
@@ -365,16 +365,14 @@ static const struct etr_buf_operations etr_catu_buf_ops = { .get_data = catu_get_data_etr_buf, }; -coresight_simple_reg32(struct catu_drvdata, devid, CORESIGHT_DEVID); -coresight_simple_reg32(struct catu_drvdata, control, CATU_CONTROL); -coresight_simple_reg32(struct catu_drvdata, status, CATU_STATUS); -coresight_simple_reg32(struct catu_drvdata, mode, CATU_MODE); -coresight_simple_reg32(struct catu_drvdata, axictrl, CATU_AXICTRL); -coresight_simple_reg32(struct catu_drvdata, irqen, CATU_IRQEN); -coresight_simple_reg64(struct catu_drvdata, sladdr, - CATU_SLADDRLO, CATU_SLADDRHI); -coresight_simple_reg64(struct catu_drvdata, inaddr, - CATU_INADDRLO, CATU_INADDRHI); +coresight_simple_reg32 (devid,CORESIGHT_DEVID ); +coresight_simple_reg32 (control,CATU_CONTROL ); +coresight_simple_reg32 (status,CATU_STATUS ); +coresight_simple_reg32 (mode,CATU_MODE ); +coresight_simple_reg32 (axictrl,CATU_AXICTRL ); +coresight_simple_reg32 (irqen,CATU_IRQEN ); +coresight_simple_reg64 (sladdr,CATU_SLADDRLO ,CATU_SLADDRHI ); +coresight_simple_reg64 (inaddr,CATU_INADDRLO ,CATU_INADDRHI );static struct attribute *catu_mgmt_attrs[] = { &dev_attr_devid.attr,
drivers/hwtracing/coresight/coresight-etb10.c +8 -11
@@ -655,17 +655,14 @@ static const struct file_operations etb_fops = { .llseek = no_llseek, }; -#define coresight_etb10_reg (name, offset) \ - coresight_simple_reg32(struct etb_drvdata, name, offset) - -coresight_etb10_reg (rdp,ETB_RAM_DEPTH_REG ); -coresight_etb10_reg (sts,ETB_STATUS_REG ); -coresight_etb10_reg (rrp,ETB_RAM_READ_POINTER ); -coresight_etb10_reg (rwp,ETB_RAM_WRITE_POINTER ); -coresight_etb10_reg (trg,ETB_TRG ); -coresight_etb10_reg (ctl,ETB_CTL_REG ); -coresight_etb10_reg (ffsr,ETB_FFSR ); -coresight_etb10_reg (ffcr,ETB_FFCR ); +coresight_simple_reg32 (rdp,ETB_RAM_DEPTH_REG ); +coresight_simple_reg32 (sts,ETB_STATUS_REG ); +coresight_simple_reg32 (rrp,ETB_RAM_READ_POINTER ); +coresight_simple_reg32 (rwp,ETB_RAM_WRITE_POINTER ); +coresight_simple_reg32 (trg,ETB_TRG ); +coresight_simple_reg32 (ctl,ETB_CTL_REG ); +coresight_simple_reg32 (ffsr,ETB_FFSR ); +coresight_simple_reg32 (ffcr,ETB_FFCR );static struct attribute *coresight_etb_mgmt_attrs[] = { &dev_attr_rdp.attr,
drivers/hwtracing/coresight/coresight-etm3x-sysfs.c +10 -13
@@ -1252,19 +1252,16 @@ static struct attribute *coresight_etm_attrs[] = {NULL , }; -#define coresight_etm3x_reg (name, offset) \ - coresight_simple_reg32(struct etm_drvdata, name, offset) - -coresight_etm3x_reg (etmccr,ETMCCR ); -coresight_etm3x_reg (etmccer,ETMCCER ); -coresight_etm3x_reg (etmscr,ETMSCR ); -coresight_etm3x_reg (etmidr,ETMIDR ); -coresight_etm3x_reg (etmcr,ETMCR ); -coresight_etm3x_reg (etmtraceidr,ETMTRACEIDR ); -coresight_etm3x_reg (etmteevr,ETMTEEVR ); -coresight_etm3x_reg (etmtssvr,ETMTSSCR ); -coresight_etm3x_reg (etmtecr1,ETMTECR1 ); -coresight_etm3x_reg (etmtecr2,ETMTECR2 ); +coresight_simple_reg32 (etmccr,ETMCCR ); +coresight_simple_reg32 (etmccer,ETMCCER ); +coresight_simple_reg32 (etmscr,ETMSCR ); +coresight_simple_reg32 (etmidr,ETMIDR ); +coresight_simple_reg32 (etmcr,ETMCR ); +coresight_simple_reg32 (etmtraceidr,ETMTRACEIDR ); +coresight_simple_reg32 (etmteevr,ETMTEEVR ); +coresight_simple_reg32 (etmtssvr,ETMTSSCR ); +coresight_simple_reg32 (etmtecr1,ETMTECR1 ); +coresight_simple_reg32 (etmtecr2,ETMTECR2 );static struct attribute *coresight_etm_mgmt_attrs[] = { &dev_attr_etmccr.attr,
drivers/hwtracing/coresight/coresight-priv.h +7 -7
@@ -40,23 +40,23 @@#define ETM_MODE_EXCL_KERN BIT(30)#define ETM_MODE_EXCL_USER BIT(31) -#define __coresight_simple_show (type, name, lo_off, hi_off) \ +#define __coresight_simple_show (name, lo_off, hi_off) \ static ssize_t name##_show(struct device *_dev, \ struct device_attribute *attr, char *buf) \ { \ - type *drvdata = dev_get_drvdata(_dev->parent); \ + struct coresight_device *csdev = container_of(_dev, struct coresight_device, dev); \ u64 val; \ pm_runtime_get_sync(_dev->parent); \ - val = coresight_read_reg_pair(drvdata->base, lo_off, hi_off); \ + val = csdev_access_relaxed_read_pair(&csdev->access, lo_off, hi_off); \ pm_runtime_put_sync(_dev->parent); \ return scnprintf(buf, PAGE_SIZE, "0x%llx\n", val); \ } \ static DEVICE_ATTR_RO(name) -#define coresight_simple_reg32 (type, name, offset) \ - __coresight_simple_show(type, name, offset, -1) -#define coresight_simple_reg64 (type, name, lo_off, hi_off) \ - __coresight_simple_show(type, name, lo_off, hi_off) +#define coresight_simple_reg32 (name, offset) \ + __coresight_simple_show(name, offset, -1) +#define coresight_simple_reg64 (name, lo_off, hi_off) \ + __coresight_simple_show(name, lo_off, hi_off)extern const u32 coresight_barrier_pkt[4 ];#define CORESIGHT_BARRIER_PKT_SIZE (sizeof(coresight_barrier_pkt))
drivers/hwtracing/coresight/coresight-replicator.c +2 -5
@@ -196,11 +196,8 @@ static const struct coresight_ops replicator_cs_ops = { .link_ops = &replicator_link_ops, }; -#define coresight_replicator_reg (name, offset) \ - coresight_simple_reg32(struct replicator_drvdata, name, offset) - -coresight_replicator_reg (idfilter0,REPLICATOR_IDFILTER0 ); -coresight_replicator_reg (idfilter1,REPLICATOR_IDFILTER1 ); +coresight_simple_reg32 (idfilter0,REPLICATOR_IDFILTER0 ); +coresight_simple_reg32 (idfilter1,REPLICATOR_IDFILTER1 );static struct attribute *replicator_mgmt_attrs[] = { &dev_attr_idfilter0.attr,
drivers/hwtracing/coresight/coresight-stm.c +12 -15
@@ -634,21 +634,18 @@ static ssize_t traceid_store(struct device *dev, }static DEVICE_ATTR_RW (traceid); -#define coresight_stm_reg (name, offset) \ - coresight_simple_reg32(struct stm_drvdata, name, offset) - -coresight_stm_reg (tcsr,STMTCSR ); -coresight_stm_reg (tsfreqr,STMTSFREQR ); -coresight_stm_reg (syncr,STMSYNCR ); -coresight_stm_reg (sper,STMSPER ); -coresight_stm_reg (spter,STMSPTER ); -coresight_stm_reg (privmaskr,STMPRIVMASKR ); -coresight_stm_reg (spscr,STMSPSCR ); -coresight_stm_reg (spmscr,STMSPMSCR ); -coresight_stm_reg (spfeat1r,STMSPFEAT1R ); -coresight_stm_reg (spfeat2r,STMSPFEAT2R ); -coresight_stm_reg (spfeat3r,STMSPFEAT3R ); -coresight_stm_reg (devid,CORESIGHT_DEVID ); +coresight_simple_reg32 (tcsr,STMTCSR ); +coresight_simple_reg32 (tsfreqr,STMTSFREQR ); +coresight_simple_reg32 (syncr,STMSYNCR ); +coresight_simple_reg32 (sper,STMSPER ); +coresight_simple_reg32 (spter,STMSPTER ); +coresight_simple_reg32 (privmaskr,STMPRIVMASKR ); +coresight_simple_reg32 (spscr,STMSPSCR ); +coresight_simple_reg32 (spmscr,STMSPMSCR ); +coresight_simple_reg32 (spfeat1r,STMSPFEAT1R ); +coresight_simple_reg32 (spfeat2r,STMSPFEAT2R ); +coresight_simple_reg32 (spfeat3r,STMSPFEAT3R ); +coresight_simple_reg32 (devid,CORESIGHT_DEVID );static struct attribute *coresight_stm_attrs[] = { &dev_attr_hwevent_enable.attr,
drivers/hwtracing/coresight/coresight-tmc-core.c +14 -19
@@ -251,25 +251,20 @@ static enum tmc_mem_intf_width tmc_get_memwidth(u32 devid)return memwidth; } -#define coresight_tmc_reg (name, offset) \ - coresight_simple_reg32(struct tmc_drvdata, name, offset) -#define coresight_tmc_reg64 (name, lo_off, hi_off) \ - coresight_simple_reg64(struct tmc_drvdata, name, lo_off, hi_off) - -coresight_tmc_reg (rsz,TMC_RSZ ); -coresight_tmc_reg (sts,TMC_STS ); -coresight_tmc_reg (trg,TMC_TRG ); -coresight_tmc_reg (ctl,TMC_CTL ); -coresight_tmc_reg (ffsr,TMC_FFSR ); -coresight_tmc_reg (ffcr,TMC_FFCR ); -coresight_tmc_reg (mode,TMC_MODE ); -coresight_tmc_reg (pscr,TMC_PSCR ); -coresight_tmc_reg (axictl,TMC_AXICTL ); -coresight_tmc_reg (authstatus,TMC_AUTHSTATUS ); -coresight_tmc_reg (devid,CORESIGHT_DEVID ); -coresight_tmc_reg64 (rrp,TMC_RRP ,TMC_RRPHI ); -coresight_tmc_reg64 (rwp,TMC_RWP ,TMC_RWPHI ); -coresight_tmc_reg64 (dba,TMC_DBALO ,TMC_DBAHI ); +coresight_simple_reg32 (rsz,TMC_RSZ ); +coresight_simple_reg32 (sts,TMC_STS ); +coresight_simple_reg32 (trg,TMC_TRG ); +coresight_simple_reg32 (ctl,TMC_CTL ); +coresight_simple_reg32 (ffsr,TMC_FFSR ); +coresight_simple_reg32 (ffcr,TMC_FFCR ); +coresight_simple_reg32 (mode,TMC_MODE ); +coresight_simple_reg32 (pscr,TMC_PSCR ); +coresight_simple_reg32 (axictl,TMC_AXICTL ); +coresight_simple_reg32 (authstatus,TMC_AUTHSTATUS ); +coresight_simple_reg32 (devid,CORESIGHT_DEVID ); +coresight_simple_reg64 (rrp,TMC_RRP ,TMC_RRPHI ); +coresight_simple_reg64 (rwp,TMC_RWP ,TMC_RWPHI ); +coresight_simple_reg64 (dba,TMC_DBALO ,TMC_DBAHI );static struct attribute *coresight_tmc_mgmt_attrs[] = { &dev_attr_rsz.attr,
include/linux/coresight.h +18 -0
@@ -372,6 +372,24 @@ static inline u32 csdev_access_relaxed_read32(struct csdev_access *csa,return csa->read (offset, true, false); } +static inline u64 csdev_access_relaxed_read_pair (struct csdev_access *csa, +u32 lo_offset,u32 hi_offset) +{ +u64 val; + +if (likely (csa->io_mem)) { + val =readl_relaxed (csa->base + lo_offset); + val |= (hi_offset ==-1 ) ?0 : + (u64 )readl_relaxed (csa->base + hi_offset) <<32 ; +return val; + } + + val = csa->read (lo_offset, true, false); + val |= (hi_offset ==-1 ) ?0 : + (u64 )csa->read (hi_offset, true, false) <<32 ; +return val; +} +static inline u32 csdev_access_read32 (struct csdev_access *csa,u32 offset) {if (likely (csa->io_mem))
Signature · 1 line
2.28.0
Re: [PATCH v1 2/4] coresight: Simplify sysfs accessors by using csdev_access abstraction
Hi James,
Quoted 252 lines · James Clark
The
coresight_devicestruct is available in the sysfs accessor, and this contains acsdev_accessstruct which can be used to access registers. Use this instead of passing in the type of each drvdata so that a common function can be shared between all the cs drivers.No functional changes.
Signed-off-by James Clark <[email protected]>--- drivers/hwtracing/coresight/coresight-catu.c | 18 +++++----- drivers/hwtracing/coresight/coresight-etb10.c | 19 +++++------ .../coresight/coresight-etm3x-sysfs.c | 23 ++++++------- drivers/hwtracing/coresight/coresight-priv.h | 14 ++++---- .../coresight/coresight-replicator.c | 7 ++-- drivers/hwtracing/coresight/coresight-stm.c | 27 +++++++-------- .../hwtracing/coresight/coresight-tmc-core.c | 33 ++++++++----------- include/linux/coresight.h | 18 ++++++++++ 8 files changed, 79 insertions(+), 80 deletions(-)drivers/hwtracing/coresight/coresight-catu.c +8
-10@@ -365,16 +365,14 @@ static const struct etr_buf_operations etr_catu_buf_ops = { .get_data = catu_get_data_etr_buf, }; -coresight_simple_reg32(struct catu_drvdata, devid, CORESIGHT_DEVID); -coresight_simple_reg32(struct catu_drvdata, control, CATU_CONTROL); -coresight_simple_reg32(struct catu_drvdata, status, CATU_STATUS); -coresight_simple_reg32(struct catu_drvdata, mode, CATU_MODE); -coresight_simple_reg32(struct catu_drvdata, axictrl, CATU_AXICTRL); -coresight_simple_reg32(struct catu_drvdata, irqen, CATU_IRQEN); -coresight_simple_reg64(struct catu_drvdata, sladdr, - CATU_SLADDRLO, CATU_SLADDRHI); -coresight_simple_reg64(struct catu_drvdata, inaddr, - CATU_INADDRLO, CATU_INADDRHI); +coresight_simple_reg32 (devid,CORESIGHT_DEVID ); +coresight_simple_reg32 (control,CATU_CONTROL ); +coresight_simple_reg32 (status,CATU_STATUS ); +coresight_simple_reg32 (mode,CATU_MODE ); +coresight_simple_reg32 (axictrl,CATU_AXICTRL ); +coresight_simple_reg32 (irqen,CATU_IRQEN ); +coresight_simple_reg64 (sladdr,CATU_SLADDRLO ,CATU_SLADDRHI ); +coresight_simple_reg64 (inaddr,CATU_INADDRLO ,CATU_INADDRHI );static struct attribute *catu_mgmt_attrs[] = { &dev_attr_devid.attr,drivers/hwtracing/coresight/coresight-etb10.c +8
-11@@ -655,17 +655,14 @@ static const struct file_operations etb_fops = { .llseek = no_llseek, }; -#define coresight_etb10_reg (name, offset) \ - coresight_simple_reg32(struct etb_drvdata, name, offset) - -coresight_etb10_reg (rdp,ETB_RAM_DEPTH_REG ); -coresight_etb10_reg (sts,ETB_STATUS_REG ); -coresight_etb10_reg (rrp,ETB_RAM_READ_POINTER ); -coresight_etb10_reg (rwp,ETB_RAM_WRITE_POINTER ); -coresight_etb10_reg (trg,ETB_TRG ); -coresight_etb10_reg (ctl,ETB_CTL_REG ); -coresight_etb10_reg (ffsr,ETB_FFSR ); -coresight_etb10_reg (ffcr,ETB_FFCR ); +coresight_simple_reg32 (rdp,ETB_RAM_DEPTH_REG ); +coresight_simple_reg32 (sts,ETB_STATUS_REG ); +coresight_simple_reg32 (rrp,ETB_RAM_READ_POINTER ); +coresight_simple_reg32 (rwp,ETB_RAM_WRITE_POINTER ); +coresight_simple_reg32 (trg,ETB_TRG ); +coresight_simple_reg32 (ctl,ETB_CTL_REG ); +coresight_simple_reg32 (ffsr,ETB_FFSR ); +coresight_simple_reg32 (ffcr,ETB_FFCR );static struct attribute *coresight_etb_mgmt_attrs[] = { &dev_attr_rdp.attr,drivers/hwtracing/coresight/coresight-etm3x-sysfs.c +10
-13@@ -1252,19 +1252,16 @@ static struct attribute *coresight_etm_attrs[] = {NULL , }; -#define coresight_etm3x_reg (name, offset) \ - coresight_simple_reg32(struct etm_drvdata, name, offset) - -coresight_etm3x_reg (etmccr,ETMCCR ); -coresight_etm3x_reg (etmccer,ETMCCER ); -coresight_etm3x_reg (etmscr,ETMSCR ); -coresight_etm3x_reg (etmidr,ETMIDR ); -coresight_etm3x_reg (etmcr,ETMCR ); -coresight_etm3x_reg (etmtraceidr,ETMTRACEIDR ); -coresight_etm3x_reg (etmteevr,ETMTEEVR ); -coresight_etm3x_reg (etmtssvr,ETMTSSCR ); -coresight_etm3x_reg (etmtecr1,ETMTECR1 ); -coresight_etm3x_reg (etmtecr2,ETMTECR2 ); +coresight_simple_reg32 (etmccr,ETMCCR ); +coresight_simple_reg32 (etmccer,ETMCCER ); +coresight_simple_reg32 (etmscr,ETMSCR ); +coresight_simple_reg32 (etmidr,ETMIDR ); +coresight_simple_reg32 (etmcr,ETMCR ); +coresight_simple_reg32 (etmtraceidr,ETMTRACEIDR ); +coresight_simple_reg32 (etmteevr,ETMTEEVR ); +coresight_simple_reg32 (etmtssvr,ETMTSSCR ); +coresight_simple_reg32 (etmtecr1,ETMTECR1 ); +coresight_simple_reg32 (etmtecr2,ETMTECR2 );static struct attribute *coresight_etm_mgmt_attrs[] = { &dev_attr_etmccr.attr,drivers/hwtracing/coresight/coresight-priv.h +7
-7@@ -40,23 +40,23 @@#define ETM_MODE_EXCL_KERN BIT(30)#define ETM_MODE_EXCL_USER BIT(31) -#define __coresight_simple_show (type, name, lo_off, hi_off) \ +#define __coresight_simple_show (name, lo_off, hi_off) \ static ssize_t name##_show(struct device *_dev, \ struct device_attribute *attr, char *buf) \ { \ - type *drvdata = dev_get_drvdata(_dev->parent); \ + struct coresight_device *csdev = container_of(_dev, struct coresight_device, dev); \ u64 val; \ pm_runtime_get_sync(_dev->parent); \ - val = coresight_read_reg_pair(drvdata->base, lo_off, hi_off); \ + val = csdev_access_relaxed_read_pair(&csdev->access, lo_off, hi_off); \ pm_runtime_put_sync(_dev->parent); \ return scnprintf(buf, PAGE_SIZE, "0x%llx\n", val); \ } \ static DEVICE_ATTR_RO(name) -#define coresight_simple_reg32 (type, name, offset) \ - __coresight_simple_show(type, name, offset, -1) -#define coresight_simple_reg64 (type, name, lo_off, hi_off) \ - __coresight_simple_show(type, name, lo_off, hi_off) +#define coresight_simple_reg32 (name, offset) \ + __coresight_simple_show(name, offset, -1) +#define coresight_simple_reg64 (name, lo_off, hi_off) \ + __coresight_simple_show(name, lo_off, hi_off)extern const u32 coresight_barrier_pkt[4 ];#define CORESIGHT_BARRIER_PKT_SIZE (sizeof(coresight_barrier_pkt))drivers/hwtracing/coresight/coresight-replicator.c +2
-5@@ -196,11 +196,8 @@ static const struct coresight_ops replicator_cs_ops = { .link_ops = &replicator_link_ops, }; -#define coresight_replicator_reg (name, offset) \ - coresight_simple_reg32(struct replicator_drvdata, name, offset) - -coresight_replicator_reg (idfilter0,REPLICATOR_IDFILTER0 ); -coresight_replicator_reg (idfilter1,REPLICATOR_IDFILTER1 ); +coresight_simple_reg32 (idfilter0,REPLICATOR_IDFILTER0 ); +coresight_simple_reg32 (idfilter1,REPLICATOR_IDFILTER1 );static struct attribute *replicator_mgmt_attrs[] = { &dev_attr_idfilter0.attr,drivers/hwtracing/coresight/coresight-stm.c +12
-15@@ -634,21 +634,18 @@ static ssize_t traceid_store(struct device *dev, }static DEVICE_ATTR_RW (traceid); -#define coresight_stm_reg (name, offset) \ - coresight_simple_reg32(struct stm_drvdata, name, offset) - -coresight_stm_reg (tcsr,STMTCSR ); -coresight_stm_reg (tsfreqr,STMTSFREQR ); -coresight_stm_reg (syncr,STMSYNCR ); -coresight_stm_reg (sper,STMSPER ); -coresight_stm_reg (spter,STMSPTER ); -coresight_stm_reg (privmaskr,STMPRIVMASKR ); -coresight_stm_reg (spscr,STMSPSCR ); -coresight_stm_reg (spmscr,STMSPMSCR ); -coresight_stm_reg (spfeat1r,STMSPFEAT1R ); -coresight_stm_reg (spfeat2r,STMSPFEAT2R ); -coresight_stm_reg (spfeat3r,STMSPFEAT3R ); -coresight_stm_reg (devid,CORESIGHT_DEVID ); +coresight_simple_reg32 (tcsr,STMTCSR ); +coresight_simple_reg32 (tsfreqr,STMTSFREQR ); +coresight_simple_reg32 (syncr,STMSYNCR ); +coresight_simple_reg32 (sper,STMSPER ); +coresight_simple_reg32 (spter,STMSPTER ); +coresight_simple_reg32 (privmaskr,STMPRIVMASKR ); +coresight_simple_reg32 (spscr,STMSPSCR ); +coresight_simple_reg32 (spmscr,STMSPMSCR ); +coresight_simple_reg32 (spfeat1r,STMSPFEAT1R ); +coresight_simple_reg32 (spfeat2r,STMSPFEAT2R ); +coresight_simple_reg32 (spfeat3r,STMSPFEAT3R ); +coresight_simple_reg32 (devid,CORESIGHT_DEVID );static struct attribute *coresight_stm_attrs[] = { &dev_attr_hwevent_enable.attr,drivers/hwtracing/coresight/coresight-tmc-core.c +14
-19@@ -251,25 +251,20 @@ static enum tmc_mem_intf_width tmc_get_memwidth(u32 devid)return memwidth; } -#define coresight_tmc_reg (name, offset) \ - coresight_simple_reg32(struct tmc_drvdata, name, offset) -#define coresight_tmc_reg64 (name, lo_off, hi_off) \ - coresight_simple_reg64(struct tmc_drvdata, name, lo_off, hi_off) - -coresight_tmc_reg (rsz,TMC_RSZ ); -coresight_tmc_reg (sts,TMC_STS ); -coresight_tmc_reg (trg,TMC_TRG ); -coresight_tmc_reg (ctl,TMC_CTL ); -coresight_tmc_reg (ffsr,TMC_FFSR ); -coresight_tmc_reg (ffcr,TMC_FFCR ); -coresight_tmc_reg (mode,TMC_MODE ); -coresight_tmc_reg (pscr,TMC_PSCR ); -coresight_tmc_reg (axictl,TMC_AXICTL ); -coresight_tmc_reg (authstatus,TMC_AUTHSTATUS ); -coresight_tmc_reg (devid,CORESIGHT_DEVID ); -coresight_tmc_reg64 (rrp,TMC_RRP ,TMC_RRPHI ); -coresight_tmc_reg64 (rwp,TMC_RWP ,TMC_RWPHI ); -coresight_tmc_reg64 (dba,TMC_DBALO ,TMC_DBAHI ); +coresight_simple_reg32 (rsz,TMC_RSZ ); +coresight_simple_reg32 (sts,TMC_STS ); +coresight_simple_reg32 (trg,TMC_TRG ); +coresight_simple_reg32 (ctl,TMC_CTL ); +coresight_simple_reg32 (ffsr,TMC_FFSR ); +coresight_simple_reg32 (ffcr,TMC_FFCR ); +coresight_simple_reg32 (mode,TMC_MODE ); +coresight_simple_reg32 (pscr,TMC_PSCR ); +coresight_simple_reg32 (axictl,TMC_AXICTL ); +coresight_simple_reg32 (authstatus,TMC_AUTHSTATUS ); +coresight_simple_reg32 (devid,CORESIGHT_DEVID ); +coresight_simple_reg64 (rrp,TMC_RRP ,TMC_RRPHI ); +coresight_simple_reg64 (rwp,TMC_RWP ,TMC_RWPHI ); +coresight_simple_reg64 (dba,TMC_DBALO ,TMC_DBAHI );static struct attribute *coresight_tmc_mgmt_attrs[] = { &dev_attr_rsz.attr,include/linux/coresight.h +0
-0
include/linux/coresight.h static inline u32 csdev_access_relaxed_read32(struct csdev_access *csa, · line 376
Quoted 5 lines
include/linux/coresight.h +2
-0@@ -372,6 +372,24 @@ static inline u32 csdev_access_relaxed_read32(struct csdev_access *csa,return csa->read (offset, true, false); } +static inline u64 csdev_access_relaxed_read_pair (struct csdev_access *csa, +u32 lo_offset,u32 hi_offset)
Parameters lo_offset and hi_offset are s32 in coresight_read_reg_pair()...
include/linux/coresight.h static inline u32 csdev_access_relaxed_read32(struct csdev_access *csa, · line 388
Quoted 12 lines
include/linux/coresight.h +12
-0+{ +u64 val; + +if (likely (csa->io_mem)) { + val =readl_relaxed (csa->base + lo_offset); + val |= (hi_offset ==-1 ) ?0 : + (u64 )readl_relaxed (csa->base + hi_offset) <<32 ; +return val; + } + + val = csa->read (lo_offset, true, false); + val |= (hi_offset == -1) ? 0 :
... and hi_offset can't take on a negative value.
Quoted 10 lines
include/linux/coresight.h +4
-0+ (u64 )csa->read (hi_offset, true, false) <<32 ; +return val; +} +static inline u32 csdev_access_read32 (struct csdev_access *csa,u32 offset) {if (likely (csa->io_mem))Signature · 1 line
2.28.0
Re: [PATCH v1 2/4] coresight: Simplify sysfs accessors by using csdev_access abstraction
Quoted 258 lines · Mathieu Poirier
Hi James,
Quoted 255 lines · James Clark
The
coresight_devicestruct is available in the sysfs accessor, and this contains acsdev_accessstruct which can be used to access registers. Use this instead of passing in the type of each drvdata so that a common function can be shared between all the cs drivers.No functional changes.
Signed-off-by James Clark <[email protected]>--- drivers/hwtracing/coresight/coresight-catu.c | 18 +++++----- drivers/hwtracing/coresight/coresight-etb10.c | 19 +++++------ .../coresight/coresight-etm3x-sysfs.c | 23 ++++++------- drivers/hwtracing/coresight/coresight-priv.h | 14 ++++---- .../coresight/coresight-replicator.c | 7 ++-- drivers/hwtracing/coresight/coresight-stm.c | 27 +++++++-------- .../hwtracing/coresight/coresight-tmc-core.c | 33 ++++++++----------- include/linux/coresight.h | 18 ++++++++++ 8 files changed, 79 insertions(+), 80 deletions(-)drivers/hwtracing/coresight/coresight-catu.c +8
-10@@ -365,16 +365,14 @@ static const struct etr_buf_operations etr_catu_buf_ops = { .get_data = catu_get_data_etr_buf, }; -coresight_simple_reg32(struct catu_drvdata, devid, CORESIGHT_DEVID); -coresight_simple_reg32(struct catu_drvdata, control, CATU_CONTROL); -coresight_simple_reg32(struct catu_drvdata, status, CATU_STATUS); -coresight_simple_reg32(struct catu_drvdata, mode, CATU_MODE); -coresight_simple_reg32(struct catu_drvdata, axictrl, CATU_AXICTRL); -coresight_simple_reg32(struct catu_drvdata, irqen, CATU_IRQEN); -coresight_simple_reg64(struct catu_drvdata, sladdr, - CATU_SLADDRLO, CATU_SLADDRHI); -coresight_simple_reg64(struct catu_drvdata, inaddr, - CATU_INADDRLO, CATU_INADDRHI); +coresight_simple_reg32 (devid,CORESIGHT_DEVID ); +coresight_simple_reg32 (control,CATU_CONTROL ); +coresight_simple_reg32 (status,CATU_STATUS ); +coresight_simple_reg32 (mode,CATU_MODE ); +coresight_simple_reg32 (axictrl,CATU_AXICTRL ); +coresight_simple_reg32 (irqen,CATU_IRQEN ); +coresight_simple_reg64 (sladdr,CATU_SLADDRLO ,CATU_SLADDRHI ); +coresight_simple_reg64 (inaddr,CATU_INADDRLO ,CATU_INADDRHI );static struct attribute *catu_mgmt_attrs[] = { &dev_attr_devid.attr,drivers/hwtracing/coresight/coresight-etb10.c +8
-11@@ -655,17 +655,14 @@ static const struct file_operations etb_fops = { .llseek = no_llseek, }; -#define coresight_etb10_reg (name, offset) \ - coresight_simple_reg32(struct etb_drvdata, name, offset) - -coresight_etb10_reg (rdp,ETB_RAM_DEPTH_REG ); -coresight_etb10_reg (sts,ETB_STATUS_REG ); -coresight_etb10_reg (rrp,ETB_RAM_READ_POINTER ); -coresight_etb10_reg (rwp,ETB_RAM_WRITE_POINTER ); -coresight_etb10_reg (trg,ETB_TRG ); -coresight_etb10_reg (ctl,ETB_CTL_REG ); -coresight_etb10_reg (ffsr,ETB_FFSR ); -coresight_etb10_reg (ffcr,ETB_FFCR ); +coresight_simple_reg32 (rdp,ETB_RAM_DEPTH_REG ); +coresight_simple_reg32 (sts,ETB_STATUS_REG ); +coresight_simple_reg32 (rrp,ETB_RAM_READ_POINTER ); +coresight_simple_reg32 (rwp,ETB_RAM_WRITE_POINTER ); +coresight_simple_reg32 (trg,ETB_TRG ); +coresight_simple_reg32 (ctl,ETB_CTL_REG ); +coresight_simple_reg32 (ffsr,ETB_FFSR ); +coresight_simple_reg32 (ffcr,ETB_FFCR );static struct attribute *coresight_etb_mgmt_attrs[] = { &dev_attr_rdp.attr,drivers/hwtracing/coresight/coresight-etm3x-sysfs.c +10
-13@@ -1252,19 +1252,16 @@ static struct attribute *coresight_etm_attrs[] = {NULL , }; -#define coresight_etm3x_reg (name, offset) \ - coresight_simple_reg32(struct etm_drvdata, name, offset) - -coresight_etm3x_reg (etmccr,ETMCCR ); -coresight_etm3x_reg (etmccer,ETMCCER ); -coresight_etm3x_reg (etmscr,ETMSCR ); -coresight_etm3x_reg (etmidr,ETMIDR ); -coresight_etm3x_reg (etmcr,ETMCR ); -coresight_etm3x_reg (etmtraceidr,ETMTRACEIDR ); -coresight_etm3x_reg (etmteevr,ETMTEEVR ); -coresight_etm3x_reg (etmtssvr,ETMTSSCR ); -coresight_etm3x_reg (etmtecr1,ETMTECR1 ); -coresight_etm3x_reg (etmtecr2,ETMTECR2 ); +coresight_simple_reg32 (etmccr,ETMCCR ); +coresight_simple_reg32 (etmccer,ETMCCER ); +coresight_simple_reg32 (etmscr,ETMSCR ); +coresight_simple_reg32 (etmidr,ETMIDR ); +coresight_simple_reg32 (etmcr,ETMCR ); +coresight_simple_reg32 (etmtraceidr,ETMTRACEIDR ); +coresight_simple_reg32 (etmteevr,ETMTEEVR ); +coresight_simple_reg32 (etmtssvr,ETMTSSCR ); +coresight_simple_reg32 (etmtecr1,ETMTECR1 ); +coresight_simple_reg32 (etmtecr2,ETMTECR2 );static struct attribute *coresight_etm_mgmt_attrs[] = { &dev_attr_etmccr.attr,drivers/hwtracing/coresight/coresight-priv.h +7
-7@@ -40,23 +40,23 @@#define ETM_MODE_EXCL_KERN BIT(30)#define ETM_MODE_EXCL_USER BIT(31) -#define __coresight_simple_show (type, name, lo_off, hi_off) \ +#define __coresight_simple_show (name, lo_off, hi_off) \ static ssize_t name##_show(struct device *_dev, \ struct device_attribute *attr, char *buf) \ { \ - type *drvdata = dev_get_drvdata(_dev->parent); \ + struct coresight_device *csdev = container_of(_dev, struct coresight_device, dev); \ u64 val; \ pm_runtime_get_sync(_dev->parent); \ - val = coresight_read_reg_pair(drvdata->base, lo_off, hi_off); \ + val = csdev_access_relaxed_read_pair(&csdev->access, lo_off, hi_off); \ pm_runtime_put_sync(_dev->parent); \ return scnprintf(buf, PAGE_SIZE, "0x%llx\n", val); \ } \ static DEVICE_ATTR_RO(name) -#define coresight_simple_reg32 (type, name, offset) \ - __coresight_simple_show(type, name, offset, -1) -#define coresight_simple_reg64 (type, name, lo_off, hi_off) \ - __coresight_simple_show(type, name, lo_off, hi_off) +#define coresight_simple_reg32 (name, offset) \ + __coresight_simple_show(name, offset, -1) +#define coresight_simple_reg64 (name, lo_off, hi_off) \ + __coresight_simple_show(name, lo_off, hi_off)extern const u32 coresight_barrier_pkt[4 ];#define CORESIGHT_BARRIER_PKT_SIZE (sizeof(coresight_barrier_pkt))drivers/hwtracing/coresight/coresight-replicator.c +2
-5@@ -196,11 +196,8 @@ static const struct coresight_ops replicator_cs_ops = { .link_ops = &replicator_link_ops, }; -#define coresight_replicator_reg (name, offset) \ - coresight_simple_reg32(struct replicator_drvdata, name, offset) - -coresight_replicator_reg (idfilter0,REPLICATOR_IDFILTER0 ); -coresight_replicator_reg (idfilter1,REPLICATOR_IDFILTER1 ); +coresight_simple_reg32 (idfilter0,REPLICATOR_IDFILTER0 ); +coresight_simple_reg32 (idfilter1,REPLICATOR_IDFILTER1 );static struct attribute *replicator_mgmt_attrs[] = { &dev_attr_idfilter0.attr,drivers/hwtracing/coresight/coresight-stm.c +12
-15@@ -634,21 +634,18 @@ static ssize_t traceid_store(struct device *dev, }static DEVICE_ATTR_RW (traceid); -#define coresight_stm_reg (name, offset) \ - coresight_simple_reg32(struct stm_drvdata, name, offset) - -coresight_stm_reg (tcsr,STMTCSR ); -coresight_stm_reg (tsfreqr,STMTSFREQR ); -coresight_stm_reg (syncr,STMSYNCR ); -coresight_stm_reg (sper,STMSPER ); -coresight_stm_reg (spter,STMSPTER ); -coresight_stm_reg (privmaskr,STMPRIVMASKR ); -coresight_stm_reg (spscr,STMSPSCR ); -coresight_stm_reg (spmscr,STMSPMSCR ); -coresight_stm_reg (spfeat1r,STMSPFEAT1R ); -coresight_stm_reg (spfeat2r,STMSPFEAT2R ); -coresight_stm_reg (spfeat3r,STMSPFEAT3R ); -coresight_stm_reg (devid,CORESIGHT_DEVID ); +coresight_simple_reg32 (tcsr,STMTCSR ); +coresight_simple_reg32 (tsfreqr,STMTSFREQR ); +coresight_simple_reg32 (syncr,STMSYNCR ); +coresight_simple_reg32 (sper,STMSPER ); +coresight_simple_reg32 (spter,STMSPTER ); +coresight_simple_reg32 (privmaskr,STMPRIVMASKR ); +coresight_simple_reg32 (spscr,STMSPSCR ); +coresight_simple_reg32 (spmscr,STMSPMSCR ); +coresight_simple_reg32 (spfeat1r,STMSPFEAT1R ); +coresight_simple_reg32 (spfeat2r,STMSPFEAT2R ); +coresight_simple_reg32 (spfeat3r,STMSPFEAT3R ); +coresight_simple_reg32 (devid,CORESIGHT_DEVID );static struct attribute *coresight_stm_attrs[] = { &dev_attr_hwevent_enable.attr,drivers/hwtracing/coresight/coresight-tmc-core.c +14
-19@@ -251,25 +251,20 @@ static enum tmc_mem_intf_width tmc_get_memwidth(u32 devid)return memwidth; } -#define coresight_tmc_reg (name, offset) \ - coresight_simple_reg32(struct tmc_drvdata, name, offset) -#define coresight_tmc_reg64 (name, lo_off, hi_off) \ - coresight_simple_reg64(struct tmc_drvdata, name, lo_off, hi_off) - -coresight_tmc_reg (rsz,TMC_RSZ ); -coresight_tmc_reg (sts,TMC_STS ); -coresight_tmc_reg (trg,TMC_TRG ); -coresight_tmc_reg (ctl,TMC_CTL ); -coresight_tmc_reg (ffsr,TMC_FFSR ); -coresight_tmc_reg (ffcr,TMC_FFCR ); -coresight_tmc_reg (mode,TMC_MODE ); -coresight_tmc_reg (pscr,TMC_PSCR ); -coresight_tmc_reg (axictl,TMC_AXICTL ); -coresight_tmc_reg (authstatus,TMC_AUTHSTATUS ); -coresight_tmc_reg (devid,CORESIGHT_DEVID ); -coresight_tmc_reg64 (rrp,TMC_RRP ,TMC_RRPHI ); -coresight_tmc_reg64 (rwp,TMC_RWP ,TMC_RWPHI ); -coresight_tmc_reg64 (dba,TMC_DBALO ,TMC_DBAHI ); +coresight_simple_reg32 (rsz,TMC_RSZ ); +coresight_simple_reg32 (sts,TMC_STS ); +coresight_simple_reg32 (trg,TMC_TRG ); +coresight_simple_reg32 (ctl,TMC_CTL ); +coresight_simple_reg32 (ffsr,TMC_FFSR ); +coresight_simple_reg32 (ffcr,TMC_FFCR ); +coresight_simple_reg32 (mode,TMC_MODE ); +coresight_simple_reg32 (pscr,TMC_PSCR ); +coresight_simple_reg32 (axictl,TMC_AXICTL ); +coresight_simple_reg32 (authstatus,TMC_AUTHSTATUS ); +coresight_simple_reg32 (devid,CORESIGHT_DEVID ); +coresight_simple_reg64 (rrp,TMC_RRP ,TMC_RRPHI ); +coresight_simple_reg64 (rwp,TMC_RWP ,TMC_RWPHI ); +coresight_simple_reg64 (dba,TMC_DBALO ,TMC_DBAHI );static struct attribute *coresight_tmc_mgmt_attrs[] = { &dev_attr_rsz.attr,include/linux/coresight.h +0
-0@@ -372,6 +372,24 @@ static inline u32 csdev_access_relaxed_read32(struct csdev_access *csa,return csa->read (offset, true, false); }
Quoted 4 lines
include/linux/coresight.h static inline u32 csdev_access_relaxed_read32(struct csdev_access *csa, · line 376
Quoted 2 lines
include/linux/coresight.h +2
-0+static inline u64 csdev_access_relaxed_read_pair (struct csdev_access *csa, +u32 lo_offset,u32 hi_offset)Parameters
lo_offsetandhi_offsetare s32 incoresight_read_reg_pair()...
Hi Mathieu,
I probably should have mentioned this in the commit message. You're right that the previous version used signed values, but the csdev accessors in include/linux/coresight.h all use u32 and I had to add a new one in there for 'csdev_access_relaxed_read_pair()' which would have looked very out of place if it was the only one to used signed values.
Because of this I also changed the 'not set' test for hi_offset from '< -1' to '== -1' which would also work with unsigned values. So although it looks different, it is still working the same way as before.
I can think of some possible options to make it better:
* Have csdev_access_relaxed_read_pair() be the only csdev_access_ function to take signed values
* Keep the unsigned type but change the unset value of -1 to be UINT_MAX
* Split the accessors into ones that are 64 bit pairs, and ones that are a single read. It's always known when it's defined whether it's a 'pair' or not, so technically this if statement with the 'not set' value isn't actually needed, you just use a different accessor type
I was tempted to do the 3rd one during the refactor, but I wanted to keep it more like the original than not. I'm not a fan of the first option, I think that would be confusing to read the code and would look like a mistake. So I'm more in favour of 2 or 3. What are your thoughts?
Quoted 15 lines
include/linux/coresight.h static inline u32 csdev_access_relaxed_read32(struct csdev_access *csa, · line 388
Quoted 13 lines
include/linux/coresight.h +12
-0+{ +u64 val; + +if (likely (csa->io_mem)) { + val =readl_relaxed (csa->base + lo_offset); + val |= (hi_offset ==-1 ) ?0 : + (u64 )readl_relaxed (csa->base + hi_offset) <<32 ; +return val; + } + + val = csa->read (lo_offset, true, false); + val |= (hi_offset == -1) ? 0 :... and
hi_offsetcan't take on a negative value.
This is just shorthand for UINT_MAX. I could change it to be more explicit (option 2 above)?
Quoted 11 lines
Quoted 11 lines
include/linux/coresight.h +4
-0+ (u64 )csa->read (hi_offset, true, false) <<32 ; +return val; +} +static inline u32 csdev_access_read32 (struct csdev_access *csa,u32 offset) {if (likely (csa->io_mem))Signature · 1 line
2.28.0
Re: [PATCH v1 2/4] coresight: Simplify sysfs accessors by using csdev_access abstraction
[...]
Quoted 24 lines
Quoted 11 lines
Quoted 11 lines
static struct attribute *coresight_tmc_mgmt_attrs[] = {
drivers/hwtracing/coresight/coresight-tmc-core.c +0
-0&dev_attr_rsz.attr,include/linux/coresight.h +0
-0@@ -372,6 +372,24 @@ static inline u32 csdev_access_relaxed_read32(struct csdev_access *csa,return csa->read (offset, true, false); }Quoted 4 lines
include/linux/coresight.h static inline u32 csdev_access_relaxed_read32(struct csdev_access *csa, · line 376
Quoted 2 lines
include/linux/coresight.h +2
-0+static inline u64 csdev_access_relaxed_read_pair (struct csdev_access *csa, +u32 lo_offset,u32 hi_offset)Parameters
lo_offsetandhi_offsetare s32 incoresight_read_reg_pair()...Hi Mathieu,
I probably should have mentioned this in the commit message. You're right that the previous version used signed values, but the csdev accessors in
include/linux/coresight.hall use u32 and I had to add a new one in there for 'csdev_access_relaxed_read_pair()' which would have looked very out of place if it was the only one to used signed values.
Quoted 8 lines
Because of this I also changed the 'not set' test for
hi_offsetfrom '< -1' to '== -1' which would also work with unsigned values. So although it looks different, it is still working the same way as before.I can think of some possible options to make it better:
* Have
csdev_access_relaxed_read_pair()be the onlycsdev_access_function to take signed values
That part is not a big deal for me.
Quoted 3 lines
* Keep the unsigned type but change the unset value of -1 to be
UINT_MAX
I find this counterintuitive and error prone. And sparse will likely yell at you profusely.
Quoted 6 lines
* Split the accessors into ones that are 64 bit pairs, and ones that are a single read. It's always known when it's defined whether it's a 'pair' or not, so technically this if statement with the 'not set' value isn't actually needed, you just use a different accessor type
That would work.
Quoted 4 lines
I was tempted to do the 3rd one during the refactor, but I wanted to keep it more like the original than not. I'm not a fan of the first option, I think that would be confusing to read the code and would look like a mistake. So I'm more in favour of 2 or 3. What are your thoughts?
Let's meet in the middle and go with option 3.
Thanks,
Mathieu
Quoted 31 lines
Quoted 16 lines
Quoted 4 lines
include/linux/coresight.h +2
-0+{ +u64 val;include/linux/coresight.h static inline u32 csdev_access_relaxed_read32(struct csdev_access *csa, · line 388
Quoted 10 lines
include/linux/coresight.h +10
-0+ +if (likely (csa->io_mem)) { + val =readl_relaxed (csa->base + lo_offset); + val |= (hi_offset ==-1 ) ?0 : + (u64 )readl_relaxed (csa->base + hi_offset) <<32 ; +return val; + } + + val = csa->read (lo_offset, true, false); + val |= (hi_offset == -1) ? 0 :... and
hi_offsetcan't take on a negative value.This is just shorthand for
UINT_MAX. I could change it to be more explicit (option 2 above)?Quoted 11 lines
Quoted 11 lines
include/linux/coresight.h +4
-0+ (u64 )csa->read (hi_offset, true, false) <<32 ; +return val; +} +static inline u32 csdev_access_read32 (struct csdev_access *csa,u32 offset) {if (likely (csa->io_mem))Signature · 1 line
2.28.0
PATCH 3/4 coresight: Re-use same function for similar sysfs register accessors
In reply to James ClarkCurrently each accessor macro creates an identical function which wastes space in the text area and pollutes the ftrace function names. Change it so that the same function is used, but the register to access is passed in as parameter rather than baked into each function.
--- drivers/hwtracing/coresight/coresight-catu.c | 25 ++++------- drivers/hwtracing/coresight/coresight-core.c | 14 ++++++ drivers/hwtracing/coresight/coresight-etb10.c | 25 ++++------- .../coresight/coresight-etm3x-sysfs.c | 31 +++++-------- drivers/hwtracing/coresight/coresight-priv.h | 40 +++++++++-------- .../coresight/coresight-replicator.c | 7 +-- drivers/hwtracing/coresight/coresight-stm.c | 37 ++++++---------- .../hwtracing/coresight/coresight-tmc-core.c | 43 ++++++------------- 8 files changed, 92 insertions(+), 130 deletions(-)
drivers/hwtracing/coresight/coresight-catu.c +8 -17
@@ -365,24 +365,15 @@ static const struct etr_buf_operations etr_catu_buf_ops = { .get_data = catu_get_data_etr_buf, }; -coresight_simple_reg32 (devid,CORESIGHT_DEVID ); -coresight_simple_reg32 (control,CATU_CONTROL ); -coresight_simple_reg32 (status,CATU_STATUS ); -coresight_simple_reg32 (mode,CATU_MODE ); -coresight_simple_reg32 (axictrl,CATU_AXICTRL ); -coresight_simple_reg32 (irqen,CATU_IRQEN ); -coresight_simple_reg64 (sladdr,CATU_SLADDRLO ,CATU_SLADDRHI ); -coresight_simple_reg64 (inaddr,CATU_INADDRLO ,CATU_INADDRHI ); -static struct attribute *catu_mgmt_attrs[] = { - &dev_attr_devid.attr, - &dev_attr_control.attr, - &dev_attr_status.attr, - &dev_attr_mode.attr, - &dev_attr_axictrl.attr, - &dev_attr_irqen.attr, - &dev_attr_sladdr.attr, - &dev_attr_inaddr.attr, +coresight_simple_reg32 (devid,CORESIGHT_DEVID ), +coresight_simple_reg32 (control,CATU_CONTROL ), +coresight_simple_reg32 (status,CATU_STATUS ), +coresight_simple_reg32 (mode,CATU_MODE ), +coresight_simple_reg32 (axictrl,CATU_AXICTRL ), +coresight_simple_reg32 (irqen,CATU_IRQEN ), +coresight_simple_reg64 (sladdr,CATU_SLADDRLO ,CATU_SLADDRHI ), +coresight_simple_reg64 (inaddr,CATU_INADDRLO ,CATU_INADDRHI ),NULL , };
drivers/hwtracing/coresight/coresight-core.c +14 -0
@@ -60,6 +60,20 @@ EXPORT_SYMBOL_GPL(coresight_barrier_pkt);static const struct cti_assoc_op *cti_assoc_ops; +ssize_t coresight_simple_show (struct device *_dev, +struct device_attribute *attr,char *buf) +{ + struct coresight_device *csdev = container_of(_dev, struct coresight_device, dev); + struct cs_ext_attribute *cs_attr = container_of(attr, struct cs_ext_attribute, attr); +u64 val; + +pm_runtime_get_sync (_dev->parent); + val =csdev_access_relaxed_read_pair (&csdev->access, cs_attr->lo_off, cs_attr->hi_off); +pm_runtime_put_sync (_dev->parent); +return scnprintf (buf,PAGE_SIZE ,"0x%llx\n" , val); +} +EXPORT_SYMBOL_GPL (coresight_simple_show); +void coresight_set_cti_ops (const struct cti_assoc_op *cti_op) { cti_assoc_ops = cti_op;
drivers/hwtracing/coresight/coresight-etb10.c +8 -17
@@ -655,24 +655,15 @@ static const struct file_operations etb_fops = { .llseek = no_llseek, }; -coresight_simple_reg32 (rdp,ETB_RAM_DEPTH_REG ); -coresight_simple_reg32 (sts,ETB_STATUS_REG ); -coresight_simple_reg32 (rrp,ETB_RAM_READ_POINTER ); -coresight_simple_reg32 (rwp,ETB_RAM_WRITE_POINTER ); -coresight_simple_reg32 (trg,ETB_TRG ); -coresight_simple_reg32 (ctl,ETB_CTL_REG ); -coresight_simple_reg32 (ffsr,ETB_FFSR ); -coresight_simple_reg32 (ffcr,ETB_FFCR ); -static struct attribute *coresight_etb_mgmt_attrs[] = { - &dev_attr_rdp.attr, - &dev_attr_sts.attr, - &dev_attr_rrp.attr, - &dev_attr_rwp.attr, - &dev_attr_trg.attr, - &dev_attr_ctl.attr, - &dev_attr_ffsr.attr, - &dev_attr_ffcr.attr, +coresight_simple_reg32 (rdp,ETB_RAM_DEPTH_REG ), +coresight_simple_reg32 (sts,ETB_STATUS_REG ), +coresight_simple_reg32 (rrp,ETB_RAM_READ_POINTER ), +coresight_simple_reg32 (rwp,ETB_RAM_WRITE_POINTER ), +coresight_simple_reg32 (trg,ETB_TRG ), +coresight_simple_reg32 (ctl,ETB_CTL_REG ), +coresight_simple_reg32 (ffsr,ETB_FFSR ), +coresight_simple_reg32 (ffcr,ETB_FFCR ),NULL , };
drivers/hwtracing/coresight/coresight-etm3x-sysfs.c +11 -20
@@ -1252,28 +1252,19 @@ static struct attribute *coresight_etm_attrs[] = { NULL, }; -coresight_simple_reg32 (etmccr,ETMCCR ); -coresight_simple_reg32 (etmccer,ETMCCER ); -coresight_simple_reg32 (etmscr,ETMSCR ); -coresight_simple_reg32 (etmidr,ETMIDR ); -coresight_simple_reg32 (etmcr,ETMCR ); -coresight_simple_reg32 (etmtraceidr,ETMTRACEIDR ); -coresight_simple_reg32 (etmteevr,ETMTEEVR ); -coresight_simple_reg32 (etmtssvr,ETMTSSCR ); -coresight_simple_reg32 (etmtecr1,ETMTECR1 ); -coresight_simple_reg32 (etmtecr2,ETMTECR2 ); +static struct attribute *coresight_etm_mgmt_attrs[] = { - &dev_attr_etmccr.attr, - &dev_attr_etmccer.attr, - &dev_attr_etmscr.attr, - &dev_attr_etmidr.attr, - &dev_attr_etmcr.attr, - &dev_attr_etmtraceidr.attr, - &dev_attr_etmteevr.attr, - &dev_attr_etmtssvr.attr, - &dev_attr_etmtecr1.attr, - &dev_attr_etmtecr2.attr, +coresight_simple_reg32 (etmccr,ETMCCR ), +coresight_simple_reg32 (etmccer,ETMCCER ), +coresight_simple_reg32 (etmscr,ETMSCR ), +coresight_simple_reg32 (etmidr,ETMIDR ), +coresight_simple_reg32 (etmcr,ETMCR ), +coresight_simple_reg32 (etmtraceidr,ETMTRACEIDR ), +coresight_simple_reg32 (etmteevr,ETMTEEVR ), +coresight_simple_reg32 (etmtssvr,ETMTSSCR ), +coresight_simple_reg32 (etmtecr1,ETMTECR1 ), +coresight_simple_reg32 (etmtecr2,ETMTECR2 ),NULL , };
drivers/hwtracing/coresight/coresight-priv.h +23 -17
@@ -39,24 +39,30 @@#define ETM_MODE_EXCL_KERN BIT(30)#define ETM_MODE_EXCL_USER BIT(31) +struct cs_ext_attribute { +struct device_attribute attr; +u32 lo_off; +u32 hi_off; +}; -#define __coresight_simple_show (name, lo_off, hi_off) \ -static ssize_t name##_show(struct device *_dev, \ - struct device_attribute *attr, char *buf) \ -{ \ - struct coresight_device *csdev = container_of(_dev, struct coresight_device, dev); \ - u64 val; \ - pm_runtime_get_sync(_dev->parent); \ - val = csdev_access_relaxed_read_pair(&csdev->access, lo_off, hi_off); \ - pm_runtime_put_sync(_dev->parent); \ - return scnprintf(buf, PAGE_SIZE, "0x%llx\n", val); \ -} \ -static DEVICE_ATTR_RO(name) - -#define coresight_simple_reg32 (name, offset) \ - __coresight_simple_show(name, offset, -1) -#define coresight_simple_reg64 (name, lo_off, hi_off) \ - __coresight_simple_show(name, lo_off, hi_off) +extern ssize_t coresight_simple_show (struct device *_dev, +struct device_attribute *attr,char *buf); + +#define coresight_simple_reg32 (name, offset) \ + (&((struct cs_ext_attribute[]) { \ + { \ + __ATTR(name, 0444, coresight_simple_show, NULL), \ + offset, -1 \ + } \ + })[0].attr.attr) + +#define coresight_simple_reg64 (name, lo_off, hi_off) \ + (&((struct cs_ext_attribute[]) { \ + { \ + __ATTR(name, 0444, coresight_simple_show, NULL), \ + lo_off, hi_off \ + } \ + })[0].attr.attr)extern const u32 coresight_barrier_pkt[4 ];#define CORESIGHT_BARRIER_PKT_SIZE (sizeof(coresight_barrier_pkt))
drivers/hwtracing/coresight/coresight-replicator.c +2 -5
@@ -196,12 +196,9 @@ static const struct coresight_ops replicator_cs_ops = { .link_ops = &replicator_link_ops, }; -coresight_simple_reg32 (idfilter0,REPLICATOR_IDFILTER0 ); -coresight_simple_reg32 (idfilter1,REPLICATOR_IDFILTER1 ); -static struct attribute *replicator_mgmt_attrs[] = { - &dev_attr_idfilter0.attr, - &dev_attr_idfilter1.attr, +coresight_simple_reg32 (idfilter0,REPLICATOR_IDFILTER0 ), +coresight_simple_reg32 (idfilter1,REPLICATOR_IDFILTER1 ),NULL , };
drivers/hwtracing/coresight/coresight-stm.c +12 -25
@@ -634,19 +634,6 @@ static ssize_t traceid_store(struct device *dev, }static DEVICE_ATTR_RW (traceid); -coresight_simple_reg32 (tcsr,STMTCSR ); -coresight_simple_reg32 (tsfreqr,STMTSFREQR ); -coresight_simple_reg32 (syncr,STMSYNCR ); -coresight_simple_reg32 (sper,STMSPER ); -coresight_simple_reg32 (spter,STMSPTER ); -coresight_simple_reg32 (privmaskr,STMPRIVMASKR ); -coresight_simple_reg32 (spscr,STMSPSCR ); -coresight_simple_reg32 (spmscr,STMSPMSCR ); -coresight_simple_reg32 (spfeat1r,STMSPFEAT1R ); -coresight_simple_reg32 (spfeat2r,STMSPFEAT2R ); -coresight_simple_reg32 (spfeat3r,STMSPFEAT3R ); -coresight_simple_reg32 (devid,CORESIGHT_DEVID ); -static struct attribute *coresight_stm_attrs[] = { &dev_attr_hwevent_enable.attr, &dev_attr_hwevent_select.attr,
@@ -657,18 +644,18 @@ static struct attribute *coresight_stm_attrs[] = { };static struct attribute *coresight_stm_mgmt_attrs[] = { - &dev_attr_tcsr.attr, - &dev_attr_tsfreqr.attr, - &dev_attr_syncr.attr, - &dev_attr_sper.attr, - &dev_attr_spter.attr, - &dev_attr_privmaskr.attr, - &dev_attr_spscr.attr, - &dev_attr_spmscr.attr, - &dev_attr_spfeat1r.attr, - &dev_attr_spfeat2r.attr, - &dev_attr_spfeat3r.attr, - &dev_attr_devid.attr, +coresight_simple_reg32 (tcsr,STMTCSR ), +coresight_simple_reg32 (tsfreqr,STMTSFREQR ), +coresight_simple_reg32 (syncr,STMSYNCR ), +coresight_simple_reg32 (sper,STMSPER ), +coresight_simple_reg32 (spter,STMSPTER ), +coresight_simple_reg32 (privmaskr,STMPRIVMASKR ), +coresight_simple_reg32 (spscr,STMSPSCR ), +coresight_simple_reg32 (spmscr,STMSPMSCR ), +coresight_simple_reg32 (spfeat1r,STMSPFEAT1R ), +coresight_simple_reg32 (spfeat2r,STMSPFEAT2R ), +coresight_simple_reg32 (spfeat3r,STMSPFEAT3R ), +coresight_simple_reg32 (devid,CORESIGHT_DEVID ),NULL , };
drivers/hwtracing/coresight/coresight-tmc-core.c +14 -29
50 lines not on this page · raw message
Signature · 1 line
2.28.0
Re: [PATCH v1 3/4] coresight: Re-use same function for similar sysfs register accessors
Quoted 125 lines · James Clark
Currently each accessor macro creates an identical function which wastes space in the text area and pollutes the ftrace function names. Change it so that the same function is used, but the register to access is passed in as parameter rather than baked into each function.
Signed-off-by James Clark <[email protected]>--- drivers/hwtracing/coresight/coresight-catu.c | 25 ++++------- drivers/hwtracing/coresight/coresight-core.c | 14 ++++++ drivers/hwtracing/coresight/coresight-etb10.c | 25 ++++------- .../coresight/coresight-etm3x-sysfs.c | 31 +++++-------- drivers/hwtracing/coresight/coresight-priv.h | 40 +++++++++-------- .../coresight/coresight-replicator.c | 7 +-- drivers/hwtracing/coresight/coresight-stm.c | 37 ++++++---------- .../hwtracing/coresight/coresight-tmc-core.c | 43 ++++++------------- 8 files changed, 92 insertions(+), 130 deletions(-)drivers/hwtracing/coresight/coresight-catu.c +8
-17@@ -365,24 +365,15 @@ static const struct etr_buf_operations etr_catu_buf_ops = { .get_data = catu_get_data_etr_buf, }; -coresight_simple_reg32 (devid,CORESIGHT_DEVID ); -coresight_simple_reg32 (control,CATU_CONTROL ); -coresight_simple_reg32 (status,CATU_STATUS ); -coresight_simple_reg32 (mode,CATU_MODE ); -coresight_simple_reg32 (axictrl,CATU_AXICTRL ); -coresight_simple_reg32 (irqen,CATU_IRQEN ); -coresight_simple_reg64 (sladdr,CATU_SLADDRLO ,CATU_SLADDRHI ); -coresight_simple_reg64 (inaddr,CATU_INADDRLO ,CATU_INADDRHI ); -static struct attribute *catu_mgmt_attrs[] = { - &dev_attr_devid.attr, - &dev_attr_control.attr, - &dev_attr_status.attr, - &dev_attr_mode.attr, - &dev_attr_axictrl.attr, - &dev_attr_irqen.attr, - &dev_attr_sladdr.attr, - &dev_attr_inaddr.attr, +coresight_simple_reg32 (devid,CORESIGHT_DEVID ), +coresight_simple_reg32 (control,CATU_CONTROL ), +coresight_simple_reg32 (status,CATU_STATUS ), +coresight_simple_reg32 (mode,CATU_MODE ), +coresight_simple_reg32 (axictrl,CATU_AXICTRL ), +coresight_simple_reg32 (irqen,CATU_IRQEN ), +coresight_simple_reg64 (sladdr,CATU_SLADDRLO ,CATU_SLADDRHI ), +coresight_simple_reg64 (inaddr,CATU_INADDRLO ,CATU_INADDRHI ),NULL , };drivers/hwtracing/coresight/coresight-core.c +14
-0@@ -60,6 +60,20 @@ EXPORT_SYMBOL_GPL(coresight_barrier_pkt);static const struct cti_assoc_op *cti_assoc_ops; +ssize_t coresight_simple_show (struct device *_dev, +struct device_attribute *attr,char *buf) +{ + struct coresight_device *csdev = container_of(_dev, struct coresight_device, dev); + struct cs_ext_attribute *cs_attr = container_of(attr, struct cs_ext_attribute, attr); +u64 val; + +pm_runtime_get_sync (_dev->parent); + val =csdev_access_relaxed_read_pair (&csdev->access, cs_attr->lo_off, cs_attr->hi_off); +pm_runtime_put_sync (_dev->parent); +return scnprintf (buf,PAGE_SIZE ,"0x%llx\n" , val); +} +EXPORT_SYMBOL_GPL (coresight_simple_show); +void coresight_set_cti_ops (const struct cti_assoc_op *cti_op) { cti_assoc_ops = cti_op;drivers/hwtracing/coresight/coresight-etb10.c +8
-17@@ -655,24 +655,15 @@ static const struct file_operations etb_fops = { .llseek = no_llseek, }; -coresight_simple_reg32 (rdp,ETB_RAM_DEPTH_REG ); -coresight_simple_reg32 (sts,ETB_STATUS_REG ); -coresight_simple_reg32 (rrp,ETB_RAM_READ_POINTER ); -coresight_simple_reg32 (rwp,ETB_RAM_WRITE_POINTER ); -coresight_simple_reg32 (trg,ETB_TRG ); -coresight_simple_reg32 (ctl,ETB_CTL_REG ); -coresight_simple_reg32 (ffsr,ETB_FFSR ); -coresight_simple_reg32 (ffcr,ETB_FFCR ); -static struct attribute *coresight_etb_mgmt_attrs[] = { - &dev_attr_rdp.attr, - &dev_attr_sts.attr, - &dev_attr_rrp.attr, - &dev_attr_rwp.attr, - &dev_attr_trg.attr, - &dev_attr_ctl.attr, - &dev_attr_ffsr.attr, - &dev_attr_ffcr.attr, +coresight_simple_reg32 (rdp,ETB_RAM_DEPTH_REG ), +coresight_simple_reg32 (sts,ETB_STATUS_REG ), +coresight_simple_reg32 (rrp,ETB_RAM_READ_POINTER ), +coresight_simple_reg32 (rwp,ETB_RAM_WRITE_POINTER ), +coresight_simple_reg32 (trg,ETB_TRG ), +coresight_simple_reg32 (ctl,ETB_CTL_REG ), +coresight_simple_reg32 (ffsr,ETB_FFSR ), +coresight_simple_reg32 (ffcr,ETB_FFCR ),NULL , };drivers/hwtracing/coresight/coresight-etm3x-sysfs.c +0
-1@@ -1252,28 +1252,19 @@ static struct attribute *coresight_etm_attrs[] = { NULL, }; -coresight_simple_reg32 (etmccr,ETMCCR );
drivers/hwtracing/coresight/coresight-etm3x-sysfs.c static struct attribute *coresight_etm_attrs[] = { · line 1255
Quoted 10 lines
drivers/hwtracing/coresight/coresight-etm3x-sysfs.c +1
-9-coresight_simple_reg32 (etmccer,ETMCCER ); -coresight_simple_reg32 (etmscr,ETMSCR ); -coresight_simple_reg32 (etmidr,ETMIDR ); -coresight_simple_reg32 (etmcr,ETMCR ); -coresight_simple_reg32 (etmtraceidr,ETMTRACEIDR ); -coresight_simple_reg32 (etmteevr,ETMTEEVR ); -coresight_simple_reg32 (etmtssvr,ETMTSSCR ); -coresight_simple_reg32 (etmtecr1,ETMTECR1 ); -coresight_simple_reg32 (etmtecr2,ETMTECR2 ); +
Extra newline, and if I am correct removing the above and adding what follows will result in 2 extra newline.
Quoted 30 lines
drivers/hwtracing/coresight/coresight-etm3x-sysfs.c +10
-10static struct attribute *coresight_etm_mgmt_attrs[] = { - &dev_attr_etmccr.attr, - &dev_attr_etmccer.attr, - &dev_attr_etmscr.attr, - &dev_attr_etmidr.attr, - &dev_attr_etmcr.attr, - &dev_attr_etmtraceidr.attr, - &dev_attr_etmteevr.attr, - &dev_attr_etmtssvr.attr, - &dev_attr_etmtecr1.attr, - &dev_attr_etmtecr2.attr, +coresight_simple_reg32 (etmccr,ETMCCR ), +coresight_simple_reg32 (etmccer,ETMCCER ), +coresight_simple_reg32 (etmscr,ETMSCR ), +coresight_simple_reg32 (etmidr,ETMIDR ), +coresight_simple_reg32 (etmcr,ETMCR ), +coresight_simple_reg32 (etmtraceidr,ETMTRACEIDR ), +coresight_simple_reg32 (etmteevr,ETMTEEVR ), +coresight_simple_reg32 (etmtssvr,ETMTSSCR ), +coresight_simple_reg32 (etmtecr1,ETMTECR1 ), +coresight_simple_reg32 (etmtecr2,ETMTECR2 ),NULL , };drivers/hwtracing/coresight/coresight-priv.h +0
-0
drivers/hwtracing/coresight/coresight-priv.h line 45
Quoted 7 lines
drivers/hwtracing/coresight/coresight-priv.h +4
-0@@ -39,24 +39,30 @@#define ETM_MODE_EXCL_KERN BIT(30)#define ETM_MODE_EXCL_USER BIT(31) +struct cs_ext_attribute { +struct device_attribute attr; +u32 lo_off; +u32 hi_off;
I touched based on those in my previous comment, i.e it should be s32 rather than u32.
Quoted 172 lines
drivers/hwtracing/coresight/coresight-priv.h +19
-17+}; -#define __coresight_simple_show (name, lo_off, hi_off) \ -static ssize_t name##_show(struct device *_dev, \ - struct device_attribute *attr, char *buf) \ -{ \ - struct coresight_device *csdev = container_of(_dev, struct coresight_device, dev); \ - u64 val; \ - pm_runtime_get_sync(_dev->parent); \ - val = csdev_access_relaxed_read_pair(&csdev->access, lo_off, hi_off); \ - pm_runtime_put_sync(_dev->parent); \ - return scnprintf(buf, PAGE_SIZE, "0x%llx\n", val); \ -} \ -static DEVICE_ATTR_RO(name) - -#define coresight_simple_reg32 (name, offset) \ - __coresight_simple_show(name, offset, -1) -#define coresight_simple_reg64 (name, lo_off, hi_off) \ - __coresight_simple_show(name, lo_off, hi_off) +extern ssize_t coresight_simple_show (struct device *_dev, +struct device_attribute *attr,char *buf); + +#define coresight_simple_reg32 (name, offset) \ + (&((struct cs_ext_attribute[]) { \ + { \ + __ATTR(name, 0444, coresight_simple_show, NULL), \ + offset, -1 \ + } \ + })[0].attr.attr) + +#define coresight_simple_reg64 (name, lo_off, hi_off) \ + (&((struct cs_ext_attribute[]) { \ + { \ + __ATTR(name, 0444, coresight_simple_show, NULL), \ + lo_off, hi_off \ + } \ + })[0].attr.attr)extern const u32 coresight_barrier_pkt[4 ];#define CORESIGHT_BARRIER_PKT_SIZE (sizeof(coresight_barrier_pkt))drivers/hwtracing/coresight/coresight-replicator.c +2
-5@@ -196,12 +196,9 @@ static const struct coresight_ops replicator_cs_ops = { .link_ops = &replicator_link_ops, }; -coresight_simple_reg32 (idfilter0,REPLICATOR_IDFILTER0 ); -coresight_simple_reg32 (idfilter1,REPLICATOR_IDFILTER1 ); -static struct attribute *replicator_mgmt_attrs[] = { - &dev_attr_idfilter0.attr, - &dev_attr_idfilter1.attr, +coresight_simple_reg32 (idfilter0,REPLICATOR_IDFILTER0 ), +coresight_simple_reg32 (idfilter1,REPLICATOR_IDFILTER1 ),NULL , };drivers/hwtracing/coresight/coresight-stm.c +12
-25@@ -634,19 +634,6 @@ static ssize_t traceid_store(struct device *dev, }static DEVICE_ATTR_RW (traceid); -coresight_simple_reg32 (tcsr,STMTCSR ); -coresight_simple_reg32 (tsfreqr,STMTSFREQR ); -coresight_simple_reg32 (syncr,STMSYNCR ); -coresight_simple_reg32 (sper,STMSPER ); -coresight_simple_reg32 (spter,STMSPTER ); -coresight_simple_reg32 (privmaskr,STMPRIVMASKR ); -coresight_simple_reg32 (spscr,STMSPSCR ); -coresight_simple_reg32 (spmscr,STMSPMSCR ); -coresight_simple_reg32 (spfeat1r,STMSPFEAT1R ); -coresight_simple_reg32 (spfeat2r,STMSPFEAT2R ); -coresight_simple_reg32 (spfeat3r,STMSPFEAT3R ); -coresight_simple_reg32 (devid,CORESIGHT_DEVID ); -static struct attribute *coresight_stm_attrs[] = { &dev_attr_hwevent_enable.attr, &dev_attr_hwevent_select.attr,@@ -657,18 +644,18 @@ static struct attribute *coresight_stm_attrs[] = { };static struct attribute *coresight_stm_mgmt_attrs[] = { - &dev_attr_tcsr.attr, - &dev_attr_tsfreqr.attr, - &dev_attr_syncr.attr, - &dev_attr_sper.attr, - &dev_attr_spter.attr, - &dev_attr_privmaskr.attr, - &dev_attr_spscr.attr, - &dev_attr_spmscr.attr, - &dev_attr_spfeat1r.attr, - &dev_attr_spfeat2r.attr, - &dev_attr_spfeat3r.attr, - &dev_attr_devid.attr, +coresight_simple_reg32 (tcsr,STMTCSR ), +coresight_simple_reg32 (tsfreqr,STMTSFREQR ), +coresight_simple_reg32 (syncr,STMSYNCR ), +coresight_simple_reg32 (sper,STMSPER ), +coresight_simple_reg32 (spter,STMSPTER ), +coresight_simple_reg32 (privmaskr,STMPRIVMASKR ), +coresight_simple_reg32 (spscr,STMSPSCR ), +coresight_simple_reg32 (spmscr,STMSPMSCR ), +coresight_simple_reg32 (spfeat1r,STMSPFEAT1R ), +coresight_simple_reg32 (spfeat2r,STMSPFEAT2R ), +coresight_simple_reg32 (spfeat3r,STMSPFEAT3R ), +coresight_simple_reg32 (devid,CORESIGHT_DEVID ),NULL , };drivers/hwtracing/coresight/coresight-tmc-core.c +14
-29@@ -251,36 +251,21 @@ static enum tmc_mem_intf_width tmc_get_memwidth(u32 devid)return memwidth; } -coresight_simple_reg32 (rsz,TMC_RSZ ); -coresight_simple_reg32 (sts,TMC_STS ); -coresight_simple_reg32 (trg,TMC_TRG ); -coresight_simple_reg32 (ctl,TMC_CTL ); -coresight_simple_reg32 (ffsr,TMC_FFSR ); -coresight_simple_reg32 (ffcr,TMC_FFCR ); -coresight_simple_reg32 (mode,TMC_MODE ); -coresight_simple_reg32 (pscr,TMC_PSCR ); -coresight_simple_reg32 (axictl,TMC_AXICTL ); -coresight_simple_reg32 (authstatus,TMC_AUTHSTATUS ); -coresight_simple_reg32 (devid,CORESIGHT_DEVID ); -coresight_simple_reg64 (rrp,TMC_RRP ,TMC_RRPHI ); -coresight_simple_reg64 (rwp,TMC_RWP ,TMC_RWPHI ); -coresight_simple_reg64 (dba,TMC_DBALO ,TMC_DBAHI ); -static struct attribute *coresight_tmc_mgmt_attrs[] = { - &dev_attr_rsz.attr, - &dev_attr_sts.attr, - &dev_attr_rrp.attr, - &dev_attr_rwp.attr, - &dev_attr_trg.attr, - &dev_attr_ctl.attr, - &dev_attr_ffsr.attr, - &dev_attr_ffcr.attr, - &dev_attr_mode.attr, - &dev_attr_pscr.attr, - &dev_attr_devid.attr, - &dev_attr_dba.attr, - &dev_attr_axictl.attr, - &dev_attr_authstatus.attr, +coresight_simple_reg32 (rsz,TMC_RSZ ), +coresight_simple_reg32 (sts,TMC_STS ), +coresight_simple_reg64 (rrp,TMC_RRP ,TMC_RRPHI ), +coresight_simple_reg64 (rwp,TMC_RWP ,TMC_RWPHI ), +coresight_simple_reg32 (trg,TMC_TRG ), +coresight_simple_reg32 (ctl,TMC_CTL ), +coresight_simple_reg32 (ffsr,TMC_FFSR ), +coresight_simple_reg32 (ffcr,TMC_FFCR ), +coresight_simple_reg32 (mode,TMC_MODE ), +coresight_simple_reg32 (pscr,TMC_PSCR ), +coresight_simple_reg32 (devid,CORESIGHT_DEVID ), +coresight_simple_reg64 (dba,TMC_DBALO ,TMC_DBAHI ), +coresight_simple_reg32 (axictl,TMC_AXICTL ), +coresight_simple_reg32 (authstatus,TMC_AUTHSTATUS ),NULL , };Signature · 1 line
2.28.0
PATCH 4/4 coresight: cti-sysfs: Re-use same functions for similar sysfs register accessors
In reply to James ClarkCurrently each accessor macro creates an identical function which wastes space in the text area and pollutes the ftrace function name list. Change it so that the same function is used, but the register to access is passed in as parameter rather than baked into each function.
--- .../hwtracing/coresight/coresight-cti-sysfs.c | 213 +++++++----------- 1 file changed, 86 insertions(+), 127 deletions(-)
drivers/hwtracing/coresight/coresight-cti-sysfs.c +86 -127
@@ -163,48 +163,82 @@ static struct attribute *coresight_cti_attrs[] = {/* register based attributes */ -/* macro to access RO registers with power check only (no enable check). */ -#define coresight_cti_reg (name, offset) \ -static ssize_t name##_show(struct device *dev, \ - struct device_attribute *attr, char *buf) \ -{ \ - struct cti_drvdata *drvdata = dev_get_drvdata(dev->parent); \ - u32 val = 0; \ - pm_runtime_get_sync(dev->parent); \ - spin_lock(&drvdata->spinlock); \ - if (drvdata->config.hw_powered) \ - val = readl_relaxed(drvdata->base + offset); \ - spin_unlock(&drvdata->spinlock); \ - pm_runtime_put_sync(dev->parent); \ - return sprintf(buf, "0x%x\n", val); \ -} \ -static DEVICE_ATTR_RO(name) +/* Read registers with power check only (no enable check). */ +static ssize_t coresight_cti_reg_show (struct device *dev, +struct device_attribute *attr,char *buf) +{ +struct cti_drvdata *drvdata =dev_get_drvdata (dev->parent); + struct cs_ext_attribute *cti_attr = container_of(attr, struct cs_ext_attribute, attr); +u32 val =0 ; -/* coresight management registers */ -coresight_cti_reg (devaff0,CTIDEVAFF0 ); -coresight_cti_reg (devaff1,CTIDEVAFF1 ); -coresight_cti_reg (authstatus,CORESIGHT_AUTHSTATUS ); -coresight_cti_reg (devarch,CORESIGHT_DEVARCH ); -coresight_cti_reg (devid,CORESIGHT_DEVID ); -coresight_cti_reg (devtype,CORESIGHT_DEVTYPE ); -coresight_cti_reg (pidr0,CORESIGHT_PERIPHIDR0 ); -coresight_cti_reg (pidr1,CORESIGHT_PERIPHIDR1 ); -coresight_cti_reg (pidr2,CORESIGHT_PERIPHIDR2 ); -coresight_cti_reg (pidr3,CORESIGHT_PERIPHIDR3 ); -coresight_cti_reg (pidr4,CORESIGHT_PERIPHIDR4 ); +pm_runtime_get_sync (dev->parent); +spin_lock (&drvdata->spinlock); +if (drvdata->config.hw_powered) + val =readl_relaxed (drvdata->base + cti_attr->lo_off); +spin_unlock (&drvdata->spinlock); +pm_runtime_put_sync (dev->parent); +return sprintf (buf,"0x%x\n" , val); +} + +/* Write registers with power check only (no enable check). */ +static ssize_t coresight_cti_reg_store (struct device *dev, +struct device_attribute *attr, +const char *buf,size_t size) +{ +struct cti_drvdata *drvdata =dev_get_drvdata (dev->parent); + struct cs_ext_attribute *cti_attr = container_of(attr, struct cs_ext_attribute, attr); +unsigned long val =0 ; + +if (kstrtoul (buf,0 , &val)) +return -EINVAL ; +pm_runtime_get_sync (dev->parent); +spin_lock (&drvdata->spinlock); +if (drvdata->config.hw_powered) +cti_write_single_reg (drvdata, cti_attr->lo_off, val); +spin_unlock (&drvdata->spinlock); +pm_runtime_put_sync (dev->parent); +return size; +} + +#define coresight_cti_reg (name, offset) \ + (&((struct cs_ext_attribute[]) { \ + { \ + __ATTR(name, 0444, coresight_cti_reg_show, NULL), \ + offset, -1 \ + } \ + })[0].attr.attr) + +#define coresight_cti_reg_rw (name, offset) \ + (&((struct cs_ext_attribute[]) { \ + { \ + __ATTR(name, 0644, coresight_cti_reg_show, \ + coresight_cti_reg_store), \ + offset, -1 \ + } \ + })[0].attr.attr) + +#define coresight_cti_reg_wo (name, offset) \ + (&((struct cs_ext_attribute[]) { \ + { \ + __ATTR(name, 0200, NULL, coresight_cti_reg_store), \ + offset, -1 \ + } \ + })[0].attr.attr) + +/* coresight management registers */ static struct attribute *coresight_cti_mgmt_attrs[] = { - &dev_attr_devaff0.attr, - &dev_attr_devaff1.attr, - &dev_attr_authstatus.attr, - &dev_attr_devarch.attr, - &dev_attr_devid.attr, - &dev_attr_devtype.attr, - &dev_attr_pidr0.attr, - &dev_attr_pidr1.attr, - &dev_attr_pidr2.attr, - &dev_attr_pidr3.attr, - &dev_attr_pidr4.attr, +coresight_cti_reg (devaff0,CTIDEVAFF0 ), +coresight_cti_reg (devaff1,CTIDEVAFF1 ), +coresight_cti_reg (authstatus,CORESIGHT_AUTHSTATUS ), +coresight_cti_reg (devarch,CORESIGHT_DEVARCH ), +coresight_cti_reg (devid,CORESIGHT_DEVID ), +coresight_cti_reg (devtype,CORESIGHT_DEVTYPE ), +coresight_cti_reg (pidr0,CORESIGHT_PERIPHIDR0 ), +coresight_cti_reg (pidr1,CORESIGHT_PERIPHIDR1 ), +coresight_cti_reg (pidr2,CORESIGHT_PERIPHIDR2 ), +coresight_cti_reg (pidr3,CORESIGHT_PERIPHIDR3 ), +coresight_cti_reg (pidr4,CORESIGHT_PERIPHIDR4 ),NULL , };
@@ -454,86 +488,11 @@ static ssize_t apppulse_store(struct device *dev, }static DEVICE_ATTR_WO (apppulse); -coresight_cti_reg (triginstatus,CTITRIGINSTATUS ); -coresight_cti_reg (trigoutstatus,CTITRIGOUTSTATUS ); -coresight_cti_reg (chinstatus,CTICHINSTATUS ); -coresight_cti_reg (choutstatus,CTICHOUTSTATUS ); -/* * Define CONFIG_CORESIGHT_CTI_INTEGRATION_REGS to enable the access to the * integration control registers. Normally only used to investigate connection * data. */ -#ifdef CONFIG_CORESIGHT_CTI_INTEGRATION_REGS - -/* macro to access RW registers with power check only (no enable check). */ -#define coresight_cti_reg_rw (name, offset) \ -static ssize_t name##_show(struct device *dev, \ - struct device_attribute *attr, char *buf) \ -{ \ - struct cti_drvdata *drvdata = dev_get_drvdata(dev->parent); \ - u32 val = 0; \ - pm_runtime_get_sync(dev->parent); \ - spin_lock(&drvdata->spinlock); \ - if (drvdata->config.hw_powered) \ - val = readl_relaxed(drvdata->base + offset); \ - spin_unlock(&drvdata->spinlock); \ - pm_runtime_put_sync(dev->parent); \ - return sprintf(buf, "0x%x\n", val); \ -} \ - \ -static ssize_t name##_store(struct device *dev, \ - struct device_attribute *attr, \ - const char *buf, size_t size) \ -{ \ - struct cti_drvdata *drvdata = dev_get_drvdata(dev->parent); \ - unsigned long val = 0; \ - if (kstrtoul(buf, 0, &val)) \ - return -EINVAL; \ - \ - pm_runtime_get_sync(dev->parent); \ - spin_lock(&drvdata->spinlock); \ - if (drvdata->config.hw_powered) \ - cti_write_single_reg(drvdata, offset, val); \ - spin_unlock(&drvdata->spinlock); \ - pm_runtime_put_sync(dev->parent); \ - return size; \ -} \ -static DEVICE_ATTR_RW(name) - -/* macro to access WO registers with power check only (no enable check). */ -#define coresight_cti_reg_wo (name, offset) \ -static ssize_t name##_store(struct device *dev, \ - struct device_attribute *attr, \ - const char *buf, size_t size) \ -{ \ - struct cti_drvdata *drvdata = dev_get_drvdata(dev->parent); \ - unsigned long val = 0; \ - if (kstrtoul(buf, 0, &val)) \ - return -EINVAL; \ - \ - pm_runtime_get_sync(dev->parent); \ - spin_lock(&drvdata->spinlock); \ - if (drvdata->config.hw_powered) \ - cti_write_single_reg(drvdata, offset, val); \ - spin_unlock(&drvdata->spinlock); \ - pm_runtime_put_sync(dev->parent); \ - return size; \ -} \ -static DEVICE_ATTR_WO(name) - -coresight_cti_reg_rw (itchout,ITCHOUT ); -coresight_cti_reg_rw (ittrigout,ITTRIGOUT ); -coresight_cti_reg_rw (itctrl,CORESIGHT_ITCTRL ); -coresight_cti_reg_wo (itchinack,ITCHINACK ); -coresight_cti_reg_wo (ittriginack,ITTRIGINACK ); -coresight_cti_reg (ittrigin,ITTRIGIN ); -coresight_cti_reg (itchin,ITCHIN ); -coresight_cti_reg (itchoutack,ITCHOUTACK ); -coresight_cti_reg (ittrigoutack,ITTRIGOUTACK ); - -#endif /* CORESIGHT_CTI_INTEGRATION_REGS */ -static struct attribute *coresight_cti_regs_attrs[] = { &dev_attr_inout_sel.attr, &dev_attr_inen.attr,
@@ -544,20 +503,20 @@ static struct attribute *coresight_cti_regs_attrs[] = { &dev_attr_appset.attr, &dev_attr_appclear.attr, &dev_attr_apppulse.attr, - &dev_attr_triginstatus.attr, - &dev_attr_trigoutstatus.attr, - &dev_attr_chinstatus.attr, - &dev_attr_choutstatus.attr, +coresight_cti_reg (triginstatus,CTITRIGINSTATUS ), +coresight_cti_reg (trigoutstatus,CTITRIGOUTSTATUS ), +coresight_cti_reg (chinstatus,CTICHINSTATUS ), +coresight_cti_reg (choutstatus,CTICHOUTSTATUS ), #ifdef CONFIG_CORESIGHT_CTI_INTEGRATION_REGS - &dev_attr_itctrl.attr, - &dev_attr_ittrigin.attr, - &dev_attr_itchin.attr, - &dev_attr_ittrigout.attr, - &dev_attr_itchout.attr, - &dev_attr_itchoutack.attr, - &dev_attr_ittrigoutack.attr, - &dev_attr_ittriginack.attr, - &dev_attr_itchinack.attr, +coresight_cti_reg_rw (itctrl,CORESIGHT_ITCTRL ), +coresight_cti_reg (ittrigin,ITTRIGIN ), +coresight_cti_reg (itchin,ITCHIN ), +coresight_cti_reg_rw (ittrigout,ITTRIGOUT ), +coresight_cti_reg_rw (itchout,ITCHOUT ), +coresight_cti_reg (itchoutack,ITCHOUTACK ), +coresight_cti_reg (ittrigoutack,ITTRIGOUTACK ), +coresight_cti_reg_wo (ittriginack,ITTRIGINACK ), +coresight_cti_reg_wo (itchinack,ITCHINACK ), #endif NULL, };
Signature · 1 line
2.28.0
Quoted 30 lines · James Clark
The intent of this change is to reduce the large number identical of functions created by macros for sysfs accessors. It's possible to re-use the same function but pass in the register to access as an argument. This reduces the size of the coresight modules folder by 244KB.
The first two patches are refactors to simplify and remove some dead code, and the second two are the changes to use a shared function.
Testing
=======No changes in any of the outputs:
cat
/sys/bus/coresight/devices/*/mgmt/*> before.txt cat/sys/bus/coresight/devices/*/mgmt/*> after.txt diff before.txt after.txtWith the following modules loaded:
ls
/sys/bus/coresight/devices/etm0 etm2 funnel0 funnel2 replicator0 tmc_etf0 tmc_etf2 tpiu0 etm1 etm3 funnel1 funnel3 stm0 tmc_etf1 tmc_etr0James Clark (4):
coresight: Remove unused function parameter
coresight: Simplify sysfs accessors by usingcsdev_accessabstraction
coresight: Re-use same function for similar sysfs register accessors
coresight: cti-sysfs: Re-use same functions for similar sysfs register
accessors
Quoted 11 lines
drivers/hwtracing/coresight/coresight-catu.c | 27 +-- drivers/hwtracing/coresight/coresight-core.c | 14 ++ .../hwtracing/coresight/coresight-cti-sysfs.c | 213 +++++++----------- drivers/hwtracing/coresight/coresight-etb10.c | 28 +-- .../coresight/coresight-etm3x-sysfs.c | 34 +-- drivers/hwtracing/coresight/coresight-priv.h | 48 ++-- .../coresight/coresight-replicator.c | 10 +- drivers/hwtracing/coresight/coresight-stm.c | 40 +--- .../hwtracing/coresight/coresight-tmc-core.c | 48 ++-- include/linux/coresight.h | 18 ++ 10 files changed, 196 insertions(+), 284 deletions(-)
I am done reviewing this set. It would be nice if you could respin this as quickly as possible so that I could apply it to next early in the cycle.
Thanks,
Mathieu
Quoted 4 lines
Signature · 2 lines
-- 2.28.0