Commit 4e486cba authored by Pawel Moll's avatar Pawel Moll
Browse files

bus: arm-ccn: Fix PMU handling of MN 



The "Miscellaneous Node" fell through cracks of node initialisation,
as its ID is shared with HN-I.

This patch treats MN as a special case (which it is), adding separate
validation check for it and pre-defining the node ID in relevant events
descriptions. That way one can simply run:

	# perf stat -a -e ccn/mn_ecbarrier/ <workload>

Additionally, direction in the MN pseudo-events XP watchpoint
definitions is corrected to be "TX" (1) as they are defined from the
crosspoint point of view (thus barriers are transmitted from XP to MN).

Cc: stable@vger.kernel.org # 3.17+
Signed-off-by: default avatarPawel Moll <pawel.moll@arm.com>
parent 694d0d0b

drivers/bus/arm-ccn.c

+16 −3
Original line number Diff line number Diff line
@@ -187,6 +187,7 @@ struct arm_ccn { 
	struct arm_ccn_component *xp;



	struct arm_ccn_dt dt;

	int mn_id;

};



static DEFINE_MUTEX(arm_ccn_mutex);
@@ -328,6 +329,7 @@ struct arm_ccn_pmu_event { 
static ssize_t arm_ccn_pmu_event_show(struct device *dev,

		struct device_attribute *attr, char *buf)

{

	struct arm_ccn *ccn = pmu_to_arm_ccn(dev_get_drvdata(dev));

	struct arm_ccn_pmu_event *event = container_of(attr,

			struct arm_ccn_pmu_event, attr);

	ssize_t res;
@@ -354,6 +356,9 @@ static ssize_t arm_ccn_pmu_event_show(struct device *dev, 
			res += snprintf(buf + res, PAGE_SIZE - res,

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

		break;

	case CCN_TYPE_MN:

		res += snprintf(buf + res, PAGE_SIZE - res, ",node=%d", ccn->mn_id);

		break;

	default:

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

		break;
@@ -383,9 +388,9 @@ static umode_t arm_ccn_pmu_events_is_visible(struct kobject *kobj, 
}



static struct arm_ccn_pmu_event arm_ccn_pmu_events[] = {

	CCN_EVENT_MN(eobarrier, "dir=0,vc=0,cmp_h=0x1c00", CCN_IDX_MASK_OPCODE),

	CCN_EVENT_MN(ecbarrier, "dir=0,vc=0,cmp_h=0x1e00", CCN_IDX_MASK_OPCODE),

	CCN_EVENT_MN(dvmop, "dir=0,vc=0,cmp_h=0x2800", CCN_IDX_MASK_OPCODE),

	CCN_EVENT_MN(eobarrier, "dir=1,vc=0,cmp_h=0x1c00", CCN_IDX_MASK_OPCODE),

	CCN_EVENT_MN(ecbarrier, "dir=1,vc=0,cmp_h=0x1e00", CCN_IDX_MASK_OPCODE),

	CCN_EVENT_MN(dvmop, "dir=1,vc=0,cmp_h=0x2800", CCN_IDX_MASK_OPCODE),

	CCN_EVENT_HNI(txdatflits, "dir=1,vc=3", CCN_IDX_MASK_ANY),

	CCN_EVENT_HNI(rxdatflits, "dir=0,vc=3", CCN_IDX_MASK_ANY),

	CCN_EVENT_HNI(txreqflits, "dir=1,vc=0", CCN_IDX_MASK_ANY),
@@ -759,6 +764,12 @@ static int arm_ccn_pmu_event_init(struct perf_event *event) 


	/* Validate node/xp vs topology */

	switch (type) {

	case CCN_TYPE_MN:

		if (node_xp != ccn->mn_id) {

			dev_warn(ccn->dev, "Invalid MN ID %d!\n", node_xp);

			return -EINVAL;

		}

		break;

	case CCN_TYPE_XP:

		if (node_xp >= ccn->num_xps) {

			dev_warn(ccn->dev, "Invalid XP ID %d!\n", node_xp);
@@ -1361,6 +1372,8 @@ static int arm_ccn_init_nodes(struct arm_ccn *ccn, int region, 


	switch (type) {

	case CCN_TYPE_MN:

		ccn->mn_id = id;

		return 0;

	case CCN_TYPE_DT:

		return 0;

	case CCN_TYPE_XP:

CRA Git | Maintained and supported by SUSTech CRA and CCSE