[PATCH] coresight: etm4x: Fix accesses to TRCSEQRSTEVR and TRCSEQSTR

mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed

* [PATCH] coresight: etm4x: Fix accesses to TRCSEQRSTEVR and TRCSEQSTR
@ 2023-01-10 12:51 Junhao He
  2023-01-10 14:49 ` Mike Leach
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Junhao He @ 2023-01-10 12:51 UTC (permalink / raw)
  To: mathieu.poirier, suzuki.poulose, mike.leach, leo.yan
  Cc: coresight, linux-kernel, linux-arm-kernel, linuxarm, shenyang39,
	prime.zeng, hejunhao3

The TRCSEQRSTEVR and TRCSEQSTR register is not implemented if the
TRCIDR5.NUMSEQSTATE == 0. Skip accessing the register in such cases.

Signed-off-by: Junhao He <hejunhao3@huawei.com>
---
 .../hwtracing/coresight/coresight-etm4x-core.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c
index 80fefaba58ee..c7a65d1524fc 100644
--- a/drivers/hwtracing/coresight/coresight-etm4x-core.c
+++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c
@@ -424,8 +424,10 @@ static int etm4_enable_hw(struct etmv4_drvdata *drvdata)
 		etm4x_relaxed_write32(csa, config->vipcssctlr, TRCVIPCSSCTLR);
 	for (i = 0; i < drvdata->nrseqstate - 1; i++)
 		etm4x_relaxed_write32(csa, config->seq_ctrl[i], TRCSEQEVRn(i));
-	etm4x_relaxed_write32(csa, config->seq_rst, TRCSEQRSTEVR);
-	etm4x_relaxed_write32(csa, config->seq_state, TRCSEQSTR);
+	if (drvdata->nrseqstate) {
+		etm4x_relaxed_write32(csa, config->seq_rst, TRCSEQRSTEVR);
+		etm4x_relaxed_write32(csa, config->seq_state, TRCSEQSTR);
+	}
 	etm4x_relaxed_write32(csa, config->ext_inp, TRCEXTINSELR);
 	for (i = 0; i < drvdata->nr_cntr; i++) {
 		etm4x_relaxed_write32(csa, config->cntrldvr[i], TRCCNTRLDVRn(i));
@@ -1631,8 +1633,10 @@ static int __etm4_cpu_save(struct etmv4_drvdata *drvdata)
 	for (i = 0; i < drvdata->nrseqstate - 1; i++)
 		state->trcseqevr[i] = etm4x_read32(csa, TRCSEQEVRn(i));
 
-	state->trcseqrstevr = etm4x_read32(csa, TRCSEQRSTEVR);
-	state->trcseqstr = etm4x_read32(csa, TRCSEQSTR);
+	if (drvdata->nrseqstate) {
+		state->trcseqrstevr = etm4x_read32(csa, TRCSEQRSTEVR);
+		state->trcseqstr = etm4x_read32(csa, TRCSEQSTR);
+	}
 	state->trcextinselr = etm4x_read32(csa, TRCEXTINSELR);
 
 	for (i = 0; i < drvdata->nr_cntr; i++) {
@@ -1760,8 +1764,10 @@ static void __etm4_cpu_restore(struct etmv4_drvdata *drvdata)
 	for (i = 0; i < drvdata->nrseqstate - 1; i++)
 		etm4x_relaxed_write32(csa, state->trcseqevr[i], TRCSEQEVRn(i));
 
-	etm4x_relaxed_write32(csa, state->trcseqrstevr, TRCSEQRSTEVR);
-	etm4x_relaxed_write32(csa, state->trcseqstr, TRCSEQSTR);
+	if (drvdata->nrseqstate) {
+		etm4x_relaxed_write32(csa, state->trcseqrstevr, TRCSEQRSTEVR);
+		etm4x_relaxed_write32(csa, state->trcseqstr, TRCSEQSTR);
+	}
 	etm4x_relaxed_write32(csa, state->trcextinselr, TRCEXTINSELR);
 
 	for (i = 0; i < drvdata->nr_cntr; i++) {
-- 
2.33.0


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] coresight: etm4x: Fix accesses to TRCSEQRSTEVR and TRCSEQSTR
  2023-01-10 12:51 [PATCH] coresight: etm4x: Fix accesses to TRCSEQRSTEVR and TRCSEQSTR Junhao He
@ 2023-01-10 14:49 ` Mike Leach
  2023-01-10 16:15 ` Suzuki K Poulose
  2023-01-12  3:48 ` Anshuman Khandual
  2 siblings, 0 replies; 6+ messages in thread
From: Mike Leach @ 2023-01-10 14:49 UTC (permalink / raw)
  To: Junhao He
  Cc: mathieu.poirier, suzuki.poulose, leo.yan, coresight,
	linux-kernel, linux-arm-kernel, linuxarm, shenyang39, prime.zeng

On Tue, 10 Jan 2023 at 12:51, Junhao He <hejunhao3@huawei.com> wrote:
>
> The TRCSEQRSTEVR and TRCSEQSTR register is not implemented if the
> TRCIDR5.NUMSEQSTATE == 0. Skip accessing the register in such cases.
>
> Signed-off-by: Junhao He <hejunhao3@huawei.com>
> ---
>  .../hwtracing/coresight/coresight-etm4x-core.c | 18 ++++++++++++------
>  1 file changed, 12 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c
> index 80fefaba58ee..c7a65d1524fc 100644
> --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c
> +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c
> @@ -424,8 +424,10 @@ static int etm4_enable_hw(struct etmv4_drvdata *drvdata)
>                 etm4x_relaxed_write32(csa, config->vipcssctlr, TRCVIPCSSCTLR);
>         for (i = 0; i < drvdata->nrseqstate - 1; i++)
>                 etm4x_relaxed_write32(csa, config->seq_ctrl[i], TRCSEQEVRn(i));
> -       etm4x_relaxed_write32(csa, config->seq_rst, TRCSEQRSTEVR);
> -       etm4x_relaxed_write32(csa, config->seq_state, TRCSEQSTR);
> +       if (drvdata->nrseqstate) {
> +               etm4x_relaxed_write32(csa, config->seq_rst, TRCSEQRSTEVR);
> +               etm4x_relaxed_write32(csa, config->seq_state, TRCSEQSTR);
> +       }
>         etm4x_relaxed_write32(csa, config->ext_inp, TRCEXTINSELR);
>         for (i = 0; i < drvdata->nr_cntr; i++) {
>                 etm4x_relaxed_write32(csa, config->cntrldvr[i], TRCCNTRLDVRn(i));
> @@ -1631,8 +1633,10 @@ static int __etm4_cpu_save(struct etmv4_drvdata *drvdata)
>         for (i = 0; i < drvdata->nrseqstate - 1; i++)
>                 state->trcseqevr[i] = etm4x_read32(csa, TRCSEQEVRn(i));
>
> -       state->trcseqrstevr = etm4x_read32(csa, TRCSEQRSTEVR);
> -       state->trcseqstr = etm4x_read32(csa, TRCSEQSTR);
> +       if (drvdata->nrseqstate) {
> +               state->trcseqrstevr = etm4x_read32(csa, TRCSEQRSTEVR);
> +               state->trcseqstr = etm4x_read32(csa, TRCSEQSTR);
> +       }
>         state->trcextinselr = etm4x_read32(csa, TRCEXTINSELR);
>
>         for (i = 0; i < drvdata->nr_cntr; i++) {
> @@ -1760,8 +1764,10 @@ static void __etm4_cpu_restore(struct etmv4_drvdata *drvdata)
>         for (i = 0; i < drvdata->nrseqstate - 1; i++)
>                 etm4x_relaxed_write32(csa, state->trcseqevr[i], TRCSEQEVRn(i));
>
> -       etm4x_relaxed_write32(csa, state->trcseqrstevr, TRCSEQRSTEVR);
> -       etm4x_relaxed_write32(csa, state->trcseqstr, TRCSEQSTR);
> +       if (drvdata->nrseqstate) {
> +               etm4x_relaxed_write32(csa, state->trcseqrstevr, TRCSEQRSTEVR);
> +               etm4x_relaxed_write32(csa, state->trcseqstr, TRCSEQSTR);
> +       }
>         etm4x_relaxed_write32(csa, state->trcextinselr, TRCEXTINSELR);
>
>         for (i = 0; i < drvdata->nr_cntr; i++) {
> --
> 2.33.0
>
> _______________________________________________
> CoreSight mailing list -- coresight@lists.linaro.org
> To unsubscribe send an email to coresight-leave@lists.linaro.org

Reviewed-by: Mike Leach <mike.leach@linaro.org>

-- 
Mike Leach
Principal Engineer, ARM Ltd.
Manchester Design Centre. UK

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] coresight: etm4x: Fix accesses to TRCSEQRSTEVR and TRCSEQSTR
  2023-01-10 12:51 [PATCH] coresight: etm4x: Fix accesses to TRCSEQRSTEVR and TRCSEQSTR Junhao He
  2023-01-10 14:49 ` Mike Leach
@ 2023-01-10 16:15 ` Suzuki K Poulose
  2023-01-14  8:50   ` hejunhao
  2023-01-12  3:48 ` Anshuman Khandual
  2 siblings, 1 reply; 6+ messages in thread
From: Suzuki K Poulose @ 2023-01-10 16:15 UTC (permalink / raw)
  To: Junhao He, mathieu.poirier, mike.leach, leo.yan
  Cc: coresight, linux-kernel, linux-arm-kernel, linuxarm, shenyang39,
	prime.zeng


On 10/01/2023 12:51, Junhao He wrote:
> The TRCSEQRSTEVR and TRCSEQSTR register is not implemented if the
> TRCIDR5.NUMSEQSTATE == 0. Skip accessing the register in such cases.
> 
> Signed-off-by: Junhao He <hejunhao3@huawei.com>

This must have :

Fixes: 2e1cdfe184b5 ("coresight-etm4x: Adding CoreSight ETM4x driver")

The patch as such looks correct to me.

I will queue this.

Thanks
Suzuki

> ---
>   .../hwtracing/coresight/coresight-etm4x-core.c | 18 ++++++++++++------
>   1 file changed, 12 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c
> index 80fefaba58ee..c7a65d1524fc 100644
> --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c
> +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c
> @@ -424,8 +424,10 @@ static int etm4_enable_hw(struct etmv4_drvdata *drvdata)
>   		etm4x_relaxed_write32(csa, config->vipcssctlr, TRCVIPCSSCTLR);
>   	for (i = 0; i < drvdata->nrseqstate - 1; i++)
>   		etm4x_relaxed_write32(csa, config->seq_ctrl[i], TRCSEQEVRn(i));
> -	etm4x_relaxed_write32(csa, config->seq_rst, TRCSEQRSTEVR);
> -	etm4x_relaxed_write32(csa, config->seq_state, TRCSEQSTR);
> +	if (drvdata->nrseqstate) {
> +		etm4x_relaxed_write32(csa, config->seq_rst, TRCSEQRSTEVR);
> +		etm4x_relaxed_write32(csa, config->seq_state, TRCSEQSTR);
> +	}
>   	etm4x_relaxed_write32(csa, config->ext_inp, TRCEXTINSELR);
>   	for (i = 0; i < drvdata->nr_cntr; i++) {
>   		etm4x_relaxed_write32(csa, config->cntrldvr[i], TRCCNTRLDVRn(i));
> @@ -1631,8 +1633,10 @@ static int __etm4_cpu_save(struct etmv4_drvdata *drvdata)
>   	for (i = 0; i < drvdata->nrseqstate - 1; i++)
>   		state->trcseqevr[i] = etm4x_read32(csa, TRCSEQEVRn(i));
>   
> -	state->trcseqrstevr = etm4x_read32(csa, TRCSEQRSTEVR);
> -	state->trcseqstr = etm4x_read32(csa, TRCSEQSTR);
> +	if (drvdata->nrseqstate) {
> +		state->trcseqrstevr = etm4x_read32(csa, TRCSEQRSTEVR);
> +		state->trcseqstr = etm4x_read32(csa, TRCSEQSTR);
> +	}
>   	state->trcextinselr = etm4x_read32(csa, TRCEXTINSELR);
>   
>   	for (i = 0; i < drvdata->nr_cntr; i++) {
> @@ -1760,8 +1764,10 @@ static void __etm4_cpu_restore(struct etmv4_drvdata *drvdata)
>   	for (i = 0; i < drvdata->nrseqstate - 1; i++)
>   		etm4x_relaxed_write32(csa, state->trcseqevr[i], TRCSEQEVRn(i));
>   
> -	etm4x_relaxed_write32(csa, state->trcseqrstevr, TRCSEQRSTEVR);
> -	etm4x_relaxed_write32(csa, state->trcseqstr, TRCSEQSTR);
> +	if (drvdata->nrseqstate) {
> +		etm4x_relaxed_write32(csa, state->trcseqrstevr, TRCSEQRSTEVR);
> +		etm4x_relaxed_write32(csa, state->trcseqstr, TRCSEQSTR);
> +	}
>   	etm4x_relaxed_write32(csa, state->trcextinselr, TRCEXTINSELR);
>   
>   	for (i = 0; i < drvdata->nr_cntr; i++) {


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] coresight: etm4x: Fix accesses to TRCSEQRSTEVR and TRCSEQSTR
  2023-01-10 16:15 ` Suzuki K Poulose
@ 2023-01-14  8:50   ` hejunhao
  0 siblings, 0 replies; 6+ messages in thread
From: hejunhao @ 2023-01-14  8:50 UTC (permalink / raw)
  To: Suzuki K Poulose, mathieu.poirier, mike.leach, leo.yan
  Cc: coresight, linux-kernel, linux-arm-kernel, linuxarm, shenyang39,
	prime.zeng


On 2023/1/11 0:15, Suzuki K Poulose wrote:
>
> On 10/01/2023 12:51, Junhao He wrote:
>> The TRCSEQRSTEVR and TRCSEQSTR register is not implemented if the
>> TRCIDR5.NUMSEQSTATE == 0. Skip accessing the register in such cases.
>>
>> Signed-off-by: Junhao He <hejunhao3@huawei.com>
>
> This must have :
>
> Fixes: 2e1cdfe184b5 ("coresight-etm4x: Adding CoreSight ETM4x driver")
>
> The patch as such looks correct to me.
>
> I will queue this.
>
> Thanks
> Suzuki
Sure, Will fix in next version.

Best regards,
Junhao.
>
>> ---
>>   .../hwtracing/coresight/coresight-etm4x-core.c | 18 ++++++++++++------
>>   1 file changed, 12 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c 
>> b/drivers/hwtracing/coresight/coresight-etm4x-core.c
>> index 80fefaba58ee..c7a65d1524fc 100644
>> --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c
>> +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c
>> @@ -424,8 +424,10 @@ static int etm4_enable_hw(struct etmv4_drvdata 
>> *drvdata)
>>           etm4x_relaxed_write32(csa, config->vipcssctlr, TRCVIPCSSCTLR);
>>       for (i = 0; i < drvdata->nrseqstate - 1; i++)
>>           etm4x_relaxed_write32(csa, config->seq_ctrl[i], 
>> TRCSEQEVRn(i));
>> -    etm4x_relaxed_write32(csa, config->seq_rst, TRCSEQRSTEVR);
>> -    etm4x_relaxed_write32(csa, config->seq_state, TRCSEQSTR);
>> +    if (drvdata->nrseqstate) {
>> +        etm4x_relaxed_write32(csa, config->seq_rst, TRCSEQRSTEVR);
>> +        etm4x_relaxed_write32(csa, config->seq_state, TRCSEQSTR);
>> +    }
>>       etm4x_relaxed_write32(csa, config->ext_inp, TRCEXTINSELR);
>>       for (i = 0; i < drvdata->nr_cntr; i++) {
>>           etm4x_relaxed_write32(csa, config->cntrldvr[i], 
>> TRCCNTRLDVRn(i));
>> @@ -1631,8 +1633,10 @@ static int __etm4_cpu_save(struct 
>> etmv4_drvdata *drvdata)
>>       for (i = 0; i < drvdata->nrseqstate - 1; i++)
>>           state->trcseqevr[i] = etm4x_read32(csa, TRCSEQEVRn(i));
>>   -    state->trcseqrstevr = etm4x_read32(csa, TRCSEQRSTEVR);
>> -    state->trcseqstr = etm4x_read32(csa, TRCSEQSTR);
>> +    if (drvdata->nrseqstate) {
>> +        state->trcseqrstevr = etm4x_read32(csa, TRCSEQRSTEVR);
>> +        state->trcseqstr = etm4x_read32(csa, TRCSEQSTR);
>> +    }
>>       state->trcextinselr = etm4x_read32(csa, TRCEXTINSELR);
>>         for (i = 0; i < drvdata->nr_cntr; i++) {
>> @@ -1760,8 +1764,10 @@ static void __etm4_cpu_restore(struct 
>> etmv4_drvdata *drvdata)
>>       for (i = 0; i < drvdata->nrseqstate - 1; i++)
>>           etm4x_relaxed_write32(csa, state->trcseqevr[i], 
>> TRCSEQEVRn(i));
>>   -    etm4x_relaxed_write32(csa, state->trcseqrstevr, TRCSEQRSTEVR);
>> -    etm4x_relaxed_write32(csa, state->trcseqstr, TRCSEQSTR);
>> +    if (drvdata->nrseqstate) {
>> +        etm4x_relaxed_write32(csa, state->trcseqrstevr, TRCSEQRSTEVR);
>> +        etm4x_relaxed_write32(csa, state->trcseqstr, TRCSEQSTR);
>> +    }
>>       etm4x_relaxed_write32(csa, state->trcextinselr, TRCEXTINSELR);
>>         for (i = 0; i < drvdata->nr_cntr; i++) {
>
> _______________________________________________
> CoreSight mailing list -- coresight@lists.linaro.org
> To unsubscribe send an email to coresight-leave@lists.linaro.org
>
> .
>


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] coresight: etm4x: Fix accesses to TRCSEQRSTEVR and TRCSEQSTR
  2023-01-10 12:51 [PATCH] coresight: etm4x: Fix accesses to TRCSEQRSTEVR and TRCSEQSTR Junhao He
  2023-01-10 14:49 ` Mike Leach
  2023-01-10 16:15 ` Suzuki K Poulose
@ 2023-01-12  3:48 ` Anshuman Khandual
  2023-01-14  8:49   ` hejunhao
  2 siblings, 1 reply; 6+ messages in thread
From: Anshuman Khandual @ 2023-01-12  3:48 UTC (permalink / raw)
  To: Junhao He, mathieu.poirier, suzuki.poulose, mike.leach, leo.yan
  Cc: coresight, linux-kernel, linux-arm-kernel, linuxarm, shenyang39,
	prime.zeng



On 1/10/23 18:21, Junhao He wrote:
> The TRCSEQRSTEVR and TRCSEQSTR register is not implemented if the

s/register is/registers are/

> TRCIDR5.NUMSEQSTATE == 0. Skip accessing the register in such cases.

s/register/registers/

> 
> Signed-off-by: Junhao He <hejunhao3@huawei.com>

Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com>

> ---
>  .../hwtracing/coresight/coresight-etm4x-core.c | 18 ++++++++++++------
>  1 file changed, 12 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c
> index 80fefaba58ee..c7a65d1524fc 100644
> --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c
> +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c
> @@ -424,8 +424,10 @@ static int etm4_enable_hw(struct etmv4_drvdata *drvdata)
>  		etm4x_relaxed_write32(csa, config->vipcssctlr, TRCVIPCSSCTLR);
>  	for (i = 0; i < drvdata->nrseqstate - 1; i++)
>  		etm4x_relaxed_write32(csa, config->seq_ctrl[i], TRCSEQEVRn(i));
> -	etm4x_relaxed_write32(csa, config->seq_rst, TRCSEQRSTEVR);
> -	etm4x_relaxed_write32(csa, config->seq_state, TRCSEQSTR);
> +	if (drvdata->nrseqstate) {
> +		etm4x_relaxed_write32(csa, config->seq_rst, TRCSEQRSTEVR);
> +		etm4x_relaxed_write32(csa, config->seq_state, TRCSEQSTR);
> +	}
>  	etm4x_relaxed_write32(csa, config->ext_inp, TRCEXTINSELR);
>  	for (i = 0; i < drvdata->nr_cntr; i++) {
>  		etm4x_relaxed_write32(csa, config->cntrldvr[i], TRCCNTRLDVRn(i));
> @@ -1631,8 +1633,10 @@ static int __etm4_cpu_save(struct etmv4_drvdata *drvdata)
>  	for (i = 0; i < drvdata->nrseqstate - 1; i++)
>  		state->trcseqevr[i] = etm4x_read32(csa, TRCSEQEVRn(i));
>  
> -	state->trcseqrstevr = etm4x_read32(csa, TRCSEQRSTEVR);
> -	state->trcseqstr = etm4x_read32(csa, TRCSEQSTR);
> +	if (drvdata->nrseqstate) {
> +		state->trcseqrstevr = etm4x_read32(csa, TRCSEQRSTEVR);
> +		state->trcseqstr = etm4x_read32(csa, TRCSEQSTR);
> +	}
>  	state->trcextinselr = etm4x_read32(csa, TRCEXTINSELR);
>  
>  	for (i = 0; i < drvdata->nr_cntr; i++) {
> @@ -1760,8 +1764,10 @@ static void __etm4_cpu_restore(struct etmv4_drvdata *drvdata)
>  	for (i = 0; i < drvdata->nrseqstate - 1; i++)
>  		etm4x_relaxed_write32(csa, state->trcseqevr[i], TRCSEQEVRn(i));
>  
> -	etm4x_relaxed_write32(csa, state->trcseqrstevr, TRCSEQRSTEVR);
> -	etm4x_relaxed_write32(csa, state->trcseqstr, TRCSEQSTR);
> +	if (drvdata->nrseqstate) {
> +		etm4x_relaxed_write32(csa, state->trcseqrstevr, TRCSEQRSTEVR);
> +		etm4x_relaxed_write32(csa, state->trcseqstr, TRCSEQSTR);
> +	}
>  	etm4x_relaxed_write32(csa, state->trcextinselr, TRCEXTINSELR);
>  
>  	for (i = 0; i < drvdata->nr_cntr; i++) {

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] coresight: etm4x: Fix accesses to TRCSEQRSTEVR and TRCSEQSTR
  2023-01-12  3:48 ` Anshuman Khandual
@ 2023-01-14  8:49   ` hejunhao
  0 siblings, 0 replies; 6+ messages in thread
From: hejunhao @ 2023-01-14  8:49 UTC (permalink / raw)
  To: Anshuman Khandual, mathieu.poirier, suzuki.poulose, mike.leach, leo.yan
  Cc: coresight, linux-kernel, linux-arm-kernel, linuxarm, shenyang39,
	prime.zeng


On 2023/1/12 11:48, Anshuman Khandual wrote:
>
> On 1/10/23 18:21, Junhao He wrote:
>> The TRCSEQRSTEVR and TRCSEQSTR register is not implemented if the
> s/register is/registers are/
Ok, will fix it.
Thanks.
>> TRCIDR5.NUMSEQSTATE == 0. Skip accessing the register in such cases.
> s/register/registers/
Ok, will fix it.
Thanks.

>> Signed-off-by: Junhao He <hejunhao3@huawei.com>
> Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com>
>
>> ---
>>   .../hwtracing/coresight/coresight-etm4x-core.c | 18 ++++++++++++------
>>   1 file changed, 12 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c
>> index 80fefaba58ee..c7a65d1524fc 100644
>> --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c
>> +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c
>> @@ -424,8 +424,10 @@ static int etm4_enable_hw(struct etmv4_drvdata *drvdata)
>>   		etm4x_relaxed_write32(csa, config->vipcssctlr, TRCVIPCSSCTLR);
>>   	for (i = 0; i < drvdata->nrseqstate - 1; i++)
>>   		etm4x_relaxed_write32(csa, config->seq_ctrl[i], TRCSEQEVRn(i));
>> -	etm4x_relaxed_write32(csa, config->seq_rst, TRCSEQRSTEVR);
>> -	etm4x_relaxed_write32(csa, config->seq_state, TRCSEQSTR);
>> +	if (drvdata->nrseqstate) {
>> +		etm4x_relaxed_write32(csa, config->seq_rst, TRCSEQRSTEVR);
>> +		etm4x_relaxed_write32(csa, config->seq_state, TRCSEQSTR);
>> +	}
>>   	etm4x_relaxed_write32(csa, config->ext_inp, TRCEXTINSELR);
>>   	for (i = 0; i < drvdata->nr_cntr; i++) {
>>   		etm4x_relaxed_write32(csa, config->cntrldvr[i], TRCCNTRLDVRn(i));
>> @@ -1631,8 +1633,10 @@ static int __etm4_cpu_save(struct etmv4_drvdata *drvdata)
>>   	for (i = 0; i < drvdata->nrseqstate - 1; i++)
>>   		state->trcseqevr[i] = etm4x_read32(csa, TRCSEQEVRn(i));
>>   
>> -	state->trcseqrstevr = etm4x_read32(csa, TRCSEQRSTEVR);
>> -	state->trcseqstr = etm4x_read32(csa, TRCSEQSTR);
>> +	if (drvdata->nrseqstate) {
>> +		state->trcseqrstevr = etm4x_read32(csa, TRCSEQRSTEVR);
>> +		state->trcseqstr = etm4x_read32(csa, TRCSEQSTR);
>> +	}
>>   	state->trcextinselr = etm4x_read32(csa, TRCEXTINSELR);
>>   
>>   	for (i = 0; i < drvdata->nr_cntr; i++) {
>> @@ -1760,8 +1764,10 @@ static void __etm4_cpu_restore(struct etmv4_drvdata *drvdata)
>>   	for (i = 0; i < drvdata->nrseqstate - 1; i++)
>>   		etm4x_relaxed_write32(csa, state->trcseqevr[i], TRCSEQEVRn(i));
>>   
>> -	etm4x_relaxed_write32(csa, state->trcseqrstevr, TRCSEQRSTEVR);
>> -	etm4x_relaxed_write32(csa, state->trcseqstr, TRCSEQSTR);
>> +	if (drvdata->nrseqstate) {
>> +		etm4x_relaxed_write32(csa, state->trcseqrstevr, TRCSEQRSTEVR);
>> +		etm4x_relaxed_write32(csa, state->trcseqstr, TRCSEQSTR);
>> +	}
>>   	etm4x_relaxed_write32(csa, state->trcextinselr, TRCEXTINSELR);
>>   
>>   	for (i = 0; i < drvdata->nr_cntr; i++) {
> .
>


^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2023-01-14  8:51 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-10 12:51 [PATCH] coresight: etm4x: Fix accesses to TRCSEQRSTEVR and TRCSEQSTR Junhao He
2023-01-10 14:49 ` Mike Leach
2023-01-10 16:15 ` Suzuki K Poulose
2023-01-14  8:50   ` hejunhao
2023-01-12  3:48 ` Anshuman Khandual
2023-01-14  8:49   ` hejunhao

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®