[PATCH v2 07/15] coresight: Make ETM4x TRCEVENTCTL1R register accesses consistent with sysreg.h

[Mathieu Poirier]

On Thu, Feb 03, 2022 at 12:05:55PM +0000, James Clark wrote:
> This is a no-op change for style and consistency and has no effect on the
> binary produced by gcc-11.
> 
> Signed-off-by: James Clark <james.clark at arm.com>
> ---
>  .../coresight/coresight-etm4x-sysfs.c         | 25 +++++++++++--------
>  drivers/hwtracing/coresight/coresight-etm4x.h |  9 +++++++
>  2 files changed, 24 insertions(+), 10 deletions(-)
>

I like what this patchset is doing.  I have reviewed up to here today and will
finish tomorrow.

Thanks,
Mathieu

> diff --git a/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c b/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c
> index 4c29ab4464a0..cfa6f72a1e39 100644
> --- a/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c
> +++ b/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c
> @@ -384,16 +384,16 @@ static ssize_t mode_store(struct device *dev,
>  	/* bit[11], AMBA Trace Bus (ATB) trigger enable bit */
>  	if ((config->mode & ETM_MODE_ATB_TRIGGER) &&
>  	    (drvdata->atbtrig == true))
> -		config->eventctrl1 |= BIT(11);
> +		config->eventctrl1 |= TRCEVENTCTL1R_ATB;
>  	else
> -		config->eventctrl1 &= ~BIT(11);
> +		config->eventctrl1 &= ~TRCEVENTCTL1R_ATB;
>  
>  	/* bit[12], Low-power state behavior override bit */
>  	if ((config->mode & ETM_MODE_LPOVERRIDE) &&
>  	    (drvdata->lpoverride == true))
> -		config->eventctrl1 |= BIT(12);
> +		config->eventctrl1 |= TRCEVENTCTL1R_LPOVERRIDE;
>  	else
> -		config->eventctrl1 &= ~BIT(12);
> +		config->eventctrl1 &= ~TRCEVENTCTL1R_LPOVERRIDE;
>  
>  	/* bit[8], Instruction stall bit */
>  	if ((config->mode & ETM_MODE_ISTALL_EN) && (drvdata->stallctl == true))
> @@ -534,7 +534,7 @@ static ssize_t event_instren_show(struct device *dev,
>  	struct etmv4_drvdata *drvdata = dev_get_drvdata(dev->parent);
>  	struct etmv4_config *config = &drvdata->config;
>  
> -	val = BMVAL(config->eventctrl1, 0, 3);
> +	val = REG_VAL(config->eventctrl1, TRCEVENTCTL1R_INSTEN);
>  	return scnprintf(buf, PAGE_SIZE, "%#lx\n", val);
>  }
>  
> @@ -551,23 +551,28 @@ static ssize_t event_instren_store(struct device *dev,
>  
>  	spin_lock(&drvdata->spinlock);
>  	/* start by clearing all instruction event enable bits */
> -	config->eventctrl1 &= ~(BIT(0) | BIT(1) | BIT(2) | BIT(3));
> +	config->eventctrl1 &= ~(TRCEVENTCTL1R_INSTEN_MASK << TRCEVENTCTL1R_INSTEN_SHIFT);
>  	switch (drvdata->nr_event) {
>  	case 0x0:
>  		/* generate Event element for event 1 */
> -		config->eventctrl1 |= val & BIT(1);
> +		config->eventctrl1 |= val & TRCEVENTCTL1R_INSTEN_1;
>  		break;
>  	case 0x1:
>  		/* generate Event element for event 1 and 2 */
> -		config->eventctrl1 |= val & (BIT(0) | BIT(1));
> +		config->eventctrl1 |= val & (TRCEVENTCTL1R_INSTEN_0 | TRCEVENTCTL1R_INSTEN_1);
>  		break;
>  	case 0x2:
>  		/* generate Event element for event 1, 2 and 3 */
> -		config->eventctrl1 |= val & (BIT(0) | BIT(1) | BIT(2));
> +		config->eventctrl1 |= val & (TRCEVENTCTL1R_INSTEN_0 |
> +					     TRCEVENTCTL1R_INSTEN_1 |
> +					     TRCEVENTCTL1R_INSTEN_2);
>  		break;
>  	case 0x3:
>  		/* generate Event element for all 4 events */
> -		config->eventctrl1 |= val & 0xF;
> +		config->eventctrl1 |= val & (TRCEVENTCTL1R_INSTEN_0 |
> +					     TRCEVENTCTL1R_INSTEN_1 |
> +					     TRCEVENTCTL1R_INSTEN_2 |
> +					     TRCEVENTCTL1R_INSTEN_3);
>  		break;
>  	default:
>  		break;
> diff --git a/drivers/hwtracing/coresight/coresight-etm4x.h b/drivers/hwtracing/coresight/coresight-etm4x.h
> index 55e756020a94..eb72b81bbf85 100644
> --- a/drivers/hwtracing/coresight/coresight-etm4x.h
> +++ b/drivers/hwtracing/coresight/coresight-etm4x.h
> @@ -211,6 +211,15 @@
>  #define TRCCONFIGR_DA				BIT(16)
>  #define TRCCONFIGR_DV				BIT(17)
>  
> +#define TRCEVENTCTL1R_INSTEN_SHIFT		0
> +#define TRCEVENTCTL1R_INSTEN_MASK		GENMASK(3, 0)
> +#define TRCEVENTCTL1R_INSTEN_0			BIT(0)
> +#define TRCEVENTCTL1R_INSTEN_1			BIT(1)
> +#define TRCEVENTCTL1R_INSTEN_2			BIT(2)
> +#define TRCEVENTCTL1R_INSTEN_3			BIT(3)
> +#define TRCEVENTCTL1R_ATB			BIT(11)
> +#define TRCEVENTCTL1R_LPOVERRIDE		BIT(12)
> +
>  /*
>   * System instructions to access ETM registers.
>   * See ETMv4.4 spec ARM IHI0064F section 4.3.6 System instructions
> -- 
> 2.28.0
>