Commit b6df1cbb authored by James Clark's avatar James Clark Committed by Mathieu Poirier
Browse files

coresight: Simplify sysfs accessors by using csdev_access abstraction 



The 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.

Signed-off-by: default avatarJames Clark <james.clark@arm.com>
Reviewed-by: default avatarMike Leach <mike.leach@linaro.org>
Link: https://lore.kernel.org/r/20220830172614.340962-3-james.clark@arm.com


Signed-off-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
parent 3727f03e

drivers/hwtracing/coresight/coresight-catu.c

+8 −10
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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,