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

Commit ffcb39cc authored by Leo Yan's avatar Leo Yan Committed by Yabin Cui
Browse files

UPSTREAM: coresight: tmc: Fix byte-address alignment for RRP 



(Upstream commit e7753f3937610633a540f2be81be87531f96ff04).

>From the comment in the code, it claims the requirement for byte-address
alignment for RRP register: 'for 32-bit, 64-bit and 128-bit wide trace
memory, the four LSBs must be 0s. For 256-bit wide trace memory, the
five LSBs must be 0s'.  This isn't consistent with the program, the
program sets five LSBs as zeros for 32/64/128-bit wide trace memory and
set six LSBs zeros for 256-bit wide trace memory.

After checking with the CoreSight Trace Memory Controller technical
reference manual (ARM DDI 0461B, section 3.3.4 RAM Read Pointer
Register), it proves the comment is right and the program does wrong
setting.

This patch fixes byte-address alignment for RRP by following correct
definition in the technical reference manual.

Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Mike Leach <mike.leach@linaro.org>
Signed-off-by: default avatarLeo Yan <leo.yan@linaro.org>
Signed-off-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>

Bug: 140266694
Change-Id: I57465984b4558721df1e3eed0268698f518e1938
Signed-off-by: default avatarYabin Cui <yabinc@google.com>
parent e62d98db

drivers/hwtracing/coresight/coresight-tmc-etf.c

+2 −2
Original line number Diff line number Diff line
@@ -420,10 +420,10 @@ static unsigned long tmc_update_etf_buffer(struct coresight_device *csdev, 
		case TMC_MEM_INTF_WIDTH_32BITS:

		case TMC_MEM_INTF_WIDTH_64BITS:

		case TMC_MEM_INTF_WIDTH_128BITS:

			mask = GENMASK(31, 5);

			mask = GENMASK(31, 4);

			break;

		case TMC_MEM_INTF_WIDTH_256BITS:

			mask = GENMASK(31, 6);

			mask = GENMASK(31, 5);

			break;

		}