Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24873317 authored by Shashank Mittal's avatar Shashank Mittal
Browse files

coresight-etm3x: Change the name of the ctxid_val to ctxid_pid 



'ctxid_val' array was used to store the value of ETM context ID comparator
which actually stores the process ID to be traced, so using 'ctxid_pid' as
its name instead make it easier to understand.

This patch also changes the ABI, it is normally not allowed, but
fortunately it is a testing ABI and very new for now. Nevertheless,
if you don't think it should be changed, we could always add an alias
for userspace.

Change-Id: I9540d467a069f6ab456178cfcbff1751928eaa0f
Signed-off-by: default avatarChunyan Zhang <zhang.chunyan@linaro.org>
Reviewed-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Git-commit: 414a1417d7b35e0e72edb16e45840e242cb6b52e
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git


Signed-off-by: default avatarShashank Mittal <mittals@codeaurora.org>
parent 0ef817df

drivers/hwtracing/coresight/coresight-etm.h

+2 −2
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ 
 * @seq_13_event: event causing the transition from 1 to 3.

 * @seq_curr_state: current value of the sequencer register.

 * @ctxid_idx: index for the context ID registers.

 * @ctxid_val: value for the context ID to trigger on.

 * @ctxid_pid: value for the context ID to trigger on.

 * @ctxid_mask: mask applicable to all the context IDs.

 * @sync_freq:	Synchronisation frequency.

 * @timestamp_event: Defines an event that requests the insertion
@@ -235,7 +235,7 @@ struct etm_drvdata { 
	u32				seq_13_event;

	u32				seq_curr_state;

	u8				ctxid_idx;

	u32				ctxid_val[ETM_MAX_CTXID_CMP];

	u32				ctxid_pid[ETM_MAX_CTXID_CMP];

	u32				ctxid_mask;

	u32				sync_freq;

	u32				timestamp_event;

drivers/hwtracing/coresight/coresight-etm3x.c

+8 −8
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ static void etm_set_default(struct etm_drvdata *drvdata) 
	drvdata->seq_curr_state = 0x0;

	drvdata->ctxid_idx = 0x0;

	for (i = 0; i < drvdata->nr_ctxid_cmp; i++)

		drvdata->ctxid_val[i] = 0x0;

		drvdata->ctxid_pid[i] = 0x0;

	drvdata->ctxid_mask = 0x0;

}
@@ -289,7 +289,7 @@ static void etm_enable_hw(void *info) 
	for (i = 0; i < drvdata->nr_ext_out; i++)

		etm_writel(drvdata, ETM_DEFAULT_EVENT_VAL, ETMEXTOUTEVRn(i));

	for (i = 0; i < drvdata->nr_ctxid_cmp; i++)

		etm_writel(drvdata, drvdata->ctxid_val[i], ETMCIDCVRn(i));

		etm_writel(drvdata, drvdata->ctxid_pid[i], ETMCIDCVRn(i));

	etm_writel(drvdata, drvdata->ctxid_mask, ETMCIDCMR);

	etm_writel(drvdata, drvdata->sync_freq, ETMSYNCFR);

	/* No external input selected */
@@ -1386,20 +1386,20 @@ static ssize_t ctxid_idx_store(struct device *dev, 
}

static DEVICE_ATTR_RW(ctxid_idx);



static ssize_t ctxid_val_show(struct device *dev,

static ssize_t ctxid_pid_show(struct device *dev,

			      struct device_attribute *attr, char *buf)

{

	unsigned long val;

	struct etm_drvdata *drvdata = dev_get_drvdata(dev->parent);



	spin_lock(&drvdata->spinlock);

	val = drvdata->ctxid_val[drvdata->ctxid_idx];

	val = drvdata->ctxid_pid[drvdata->ctxid_idx];

	spin_unlock(&drvdata->spinlock);



	return sprintf(buf, "%#lx\n", val);

}



static ssize_t ctxid_val_store(struct device *dev,

static ssize_t ctxid_pid_store(struct device *dev,

			       struct device_attribute *attr,

			       const char *buf, size_t size)

{
@@ -1412,12 +1412,12 @@ static ssize_t ctxid_val_store(struct device *dev, 
		return ret;



	spin_lock(&drvdata->spinlock);

	drvdata->ctxid_val[drvdata->ctxid_idx] = val;

	drvdata->ctxid_pid[drvdata->ctxid_idx] = val;

	spin_unlock(&drvdata->spinlock);



	return size;

}

static DEVICE_ATTR_RW(ctxid_val);

static DEVICE_ATTR_RW(ctxid_pid);



static ssize_t ctxid_mask_show(struct device *dev,

			       struct device_attribute *attr, char *buf)
@@ -1609,7 +1609,7 @@ static struct attribute *coresight_etm_attrs[] = { 
	&dev_attr_seq_13_event.attr,

	&dev_attr_seq_curr_state.attr,

	&dev_attr_ctxid_idx.attr,

	&dev_attr_ctxid_val.attr,

	&dev_attr_ctxid_pid.attr,

	&dev_attr_ctxid_mask.attr,

	&dev_attr_sync_freq.attr,

	&dev_attr_timestamp_event.attr,