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

Commit 20ba46da authored by Hendrik Brueckner's avatar Hendrik Brueckner Committed by Martin Schwidefsky
Browse files

s390/cpum_cf: update counter numbers to ecctr limits 



Use the highest counter number that can be specified for the
ecctr (extract CPU counter) instruction for perf.

Signed-off-by: default avatarHendrik Brueckner <brueckner@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 4d6e51c7

arch/s390/include/asm/perf_event.h

+2 −2
Original line number Diff line number Diff line 
/*

 * Performance event support - s390 specific definitions.

 *

 * Copyright IBM Corp. 2009, 2013

 * Copyright IBM Corp. 2009, 2017

 * Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com>

 *	      Hendrik Brueckner <brueckner@linux.vnet.ibm.com>

 */
@@ -47,7 +47,7 @@ struct perf_sf_sde_regs { 
};



/* Perf PMU definitions for the counter facility */

#define PERF_CPUM_CF_MAX_CTR		256

#define PERF_CPUM_CF_MAX_CTR		0xffffUL  /* Max ctr for ECCTR */



/* Perf PMU definitions for the sampling facility */

#define PERF_CPUM_SF_MAX_CTR		2

arch/s390/kernel/perf_cpum_cf.c

+1 −1
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ static int __hw_perf_event_init(struct perf_event *event) 
	if (ev == -1)

		return -ENOENT;



	if (ev >= PERF_CPUM_CF_MAX_CTR)

	if (ev > PERF_CPUM_CF_MAX_CTR)

		return -EINVAL;



	/* Use the hardware perf event structure to store the counter number