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

Commit 69ecf071 authored by Pawel Moll's avatar Pawel Moll Committed by Sasha Levin
Browse files

bus: arm-ccn: Provide required event arguments 



[ Upstream commit 8f06c51fac1ca4104b8b64872f310e28186aea42 ]

Since 688d4dfcdd624192cbf03c08402e444d1d11f294 "perf tools: Support
parsing parameterized events" the perf userspace tools understands
"argument=?" syntax in the events file, making sure that required
arguments are provided by the user and not defaulting to 0, causing
confusion.

This patch adds the required arguments lists for CCN events.

Signed-off-by: default avatarPawel Moll <pawel.moll@arm.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
parent 41a83f74

Documentation/arm/CCN.txt

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ Example of perf tool use: 
/ # perf list | grep ccn

  ccn/cycles/                                        [Kernel PMU event]

<...>

  ccn/xp_valid_flit/                                 [Kernel PMU event]

  ccn/xp_valid_flit,xp=?,port=?,vc=?,dir=?/          [Kernel PMU event]

<...>



/ # perf stat -C 0 -e ccn/cycles/,ccn/xp_valid_flit,xp=1,port=0,vc=1,dir=1/ \

drivers/bus/arm-ccn.c

+17 −0
Original line number Diff line number Diff line
@@ -336,6 +336,23 @@ static ssize_t arm_ccn_pmu_event_show(struct device *dev, 
	if (event->mask)

		res += snprintf(buf + res, PAGE_SIZE - res, ",mask=0x%x",

				event->mask);



	/* Arguments required by an event */

	switch (event->type) {

	case CCN_TYPE_CYCLES:

		break;

	case CCN_TYPE_XP:

		res += snprintf(buf + res, PAGE_SIZE - res,

				",xp=?,port=?,vc=?,dir=?");

		if (event->event == CCN_EVENT_WATCHPOINT)

			res += snprintf(buf + res, PAGE_SIZE - res,

					",cmp_l=?,cmp_h=?,mask=?");

		break;

	default:

		res += snprintf(buf + res, PAGE_SIZE - res, ",node=?");

		break;

	}



	res += snprintf(buf + res, PAGE_SIZE - res, "\n");



	return res;