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

Commit 40fe78a2 authored by Leo Yan's avatar Leo Yan Committed by Greg Kroah-Hartman
Browse files

coresight: Remove %px for printing pcsr value 



The driver prints pcsr twice: the first time it uses specifier %px to
print hexadecimal pcsr value and the second time uses specifier %pS for
output kernel symbols.

As suggested by Kees, using %pS should be sufficient and %px isn't
necessary; the reason is if the pcsr is a kernel space address, we can
easily get to know the code line from %pS format, on the other hand, if
the pcsr value doesn't fall into kernel space range (e.g. if the CPU is
stuck in firmware), %pS also gives out pcsr hexadecimal value.

So this commit removes useless %px and update section "Output format"
in the document for alignment between the code and document.

Suggested-by: default avatarKees Cook <keescook@chromium.org>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: default avatarLeo Yan <leo.yan@linaro.org>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bd11441b

Documentation/trace/coresight-cpu-debug.txt

+2 −2
Original line number Diff line number Diff line
@@ -177,11 +177,11 @@ Here is an example of the debugging output format: 
ARM external debug module:

coresight-cpu-debug 850000.debug: CPU[0]:

coresight-cpu-debug 850000.debug:  EDPRSR:  00000001 (Power:On DLK:Unlock)

coresight-cpu-debug 850000.debug:  EDPCSR:  [<ffff00000808e9bc>] handle_IPI+0x174/0x1d8

coresight-cpu-debug 850000.debug:  EDPCSR:  handle_IPI+0x174/0x1d8

coresight-cpu-debug 850000.debug:  EDCIDSR: 00000000

coresight-cpu-debug 850000.debug:  EDVIDSR: 90000000 (State:Non-secure Mode:EL1/0 Width:64bits VMID:0)

coresight-cpu-debug 852000.debug: CPU[1]:

coresight-cpu-debug 852000.debug:  EDPRSR:  00000001 (Power:On DLK:Unlock)

coresight-cpu-debug 852000.debug:  EDPCSR:  [<ffff0000087fab34>] debug_notifier_call+0x23c/0x358

coresight-cpu-debug 852000.debug:  EDPCSR:  debug_notifier_call+0x23c/0x358

coresight-cpu-debug 852000.debug:  EDCIDSR: 00000000

coresight-cpu-debug 852000.debug:  EDVIDSR: 90000000 (State:Non-secure Mode:EL1/0 Width:64bits VMID:0)

drivers/hwtracing/coresight/coresight-cpu-debug.c

+1 −1
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ static void debug_dump_regs(struct debug_drvdata *drvdata) 
	}



	pc = debug_adjust_pc(drvdata);

	dev_emerg(dev, " EDPCSR:  [<%px>] %pS\n", (void *)pc, (void *)pc);

	dev_emerg(dev, " EDPCSR:  %pS\n", (void *)pc);



	if (drvdata->edcidsr_present)

		dev_emerg(dev, " EDCIDSR: %08x\n", drvdata->edcidsr);