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

Commit 6658a699 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull s390 patches part 2 from Martin Schwidefsky:
 "Some minor improvements and one additional feature for the 3.4 merge
  window: Hendrik added perf support for the s390 CPU counters."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  [S390] register cpu devices for SMP=n
  [S390] perf: add support for s390x CPU counters
  [S390] oprofile: Allow multiple users of the measurement alert interrupt
  [S390] qdio: log all adapter characteristics
  [S390] Remove unncessary export of arch_pick_mmap_layout
parents fa453a62 5d3b56f9

arch/s390/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ config ARCH_SUPPORTS_DEBUG_PAGEALLOC 
config S390

	def_bool y

	select USE_GENERIC_SMP_HELPERS if SMP

	select GENERIC_CPU_DEVICES if !SMP

	select HAVE_SYSCALL_WRAPPERS

	select HAVE_FUNCTION_TRACER

	select HAVE_FUNCTION_TRACE_MCOUNT_TEST

arch/s390/include/asm/cpu_mf.h

0 → 100644
+95 −0
Original line number Diff line number Diff line 
/*

 * CPU-measurement facilities

 *

 *  Copyright IBM Corp. 2012

 *  Author(s): Hendrik Brueckner <brueckner@linux.vnet.ibm.com>

 *	       Jan Glauber <jang@linux.vnet.ibm.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License (version 2 only)

 * as published by the Free Software Foundation.

 */

#ifndef _ASM_S390_CPU_MF_H

#define _ASM_S390_CPU_MF_H



#define CPU_MF_INT_SF_IAE	(1 << 31)	/* invalid entry address */

#define CPU_MF_INT_SF_ISE	(1 << 30)	/* incorrect SDBT entry */

#define CPU_MF_INT_SF_PRA	(1 << 29)	/* program request alert */

#define CPU_MF_INT_SF_SACA	(1 << 23)	/* sampler auth. change alert */

#define CPU_MF_INT_SF_LSDA	(1 << 22)	/* loss of sample data alert */

#define CPU_MF_INT_CF_CACA	(1 <<  7)	/* counter auth. change alert */

#define CPU_MF_INT_CF_LCDA	(1 <<  6)	/* loss of counter data alert */



#define CPU_MF_INT_CF_MASK	(CPU_MF_INT_CF_CACA|CPU_MF_INT_CF_LCDA)

#define CPU_MF_INT_SF_MASK	(CPU_MF_INT_SF_IAE|CPU_MF_INT_SF_ISE|	\

				 CPU_MF_INT_SF_PRA|CPU_MF_INT_SF_SACA|	\

				 CPU_MF_INT_SF_LSDA)



/* CPU measurement facility support */

static inline int cpum_cf_avail(void)

{

	return MACHINE_HAS_SPP && test_facility(67);

}



static inline int cpum_sf_avail(void)

{

	return MACHINE_HAS_SPP && test_facility(68);

}





struct cpumf_ctr_info {

	u16   cfvn;

	u16   auth_ctl;

	u16   enable_ctl;

	u16   act_ctl;

	u16   max_cpu;

	u16   csvn;

	u16   max_cg;

	u16   reserved1;

	u32   reserved2[12];

} __packed;



/* Query counter information */

static inline int qctri(struct cpumf_ctr_info *info)

{

	int rc = -EINVAL;



	asm volatile (

		"0:	.insn	s,0xb28e0000,%1\n"

		"1:	lhi	%0,0\n"

		"2:\n"

		EX_TABLE(1b, 2b)

		: "+d" (rc), "=Q" (*info));

	return rc;

}



/* Load CPU-counter-set controls */

static inline int lcctl(u64 ctl)

{

	int cc;



	asm volatile (

		"	.insn	s,0xb2840000,%1\n"

		"	ipm	%0\n"

		"	srl	%0,28\n"

		: "=d" (cc) : "m" (ctl) : "cc");

	return cc;

}



/* Extract CPU counter */

static inline int ecctr(u64 ctr, u64 *val)

{

	register u64 content asm("4") = 0;

	int cc;



	asm volatile (

		"	.insn	rre,0xb2e40000,%0,%2\n"

		"	ipm	%1\n"

		"	srl	%1,28\n"

		: "=d" (content), "=d" (cc) : "d" (ctr) : "cc");

	if (!cc)

		*val = content;

	return cc;

}



#endif /* _ASM_S390_CPU_MF_H */

arch/s390/include/asm/irq.h

+2 −0
Original line number Diff line number Diff line
@@ -45,5 +45,7 @@ int register_external_interrupt(u16 code, ext_int_handler_t handler); 
int unregister_external_interrupt(u16 code, ext_int_handler_t handler);

void service_subclass_irq_register(void);

void service_subclass_irq_unregister(void);

void measurement_alert_subclass_register(void);

void measurement_alert_subclass_unregister(void);



#endif /* _ASM_IRQ_H */

arch/s390/include/asm/perf_event.h

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

 * Performance event support - s390 specific definitions.

 *

 * Copyright 2009 Martin Schwidefsky, IBM Corporation.

 * Copyright IBM Corp. 2009, 2012

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

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

 */



/* Empty, just to avoid compiling error */

#include <asm/cpu_mf.h>



/* CPU-measurement counter facility */

#define PERF_CPUM_CF_MAX_CTR		160



/* Per-CPU flags for PMU states */

#define PMU_F_RESERVED			0x1000

#define PMU_F_ENABLED			0x2000

arch/s390/kernel/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o 
obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o

obj-$(CONFIG_FTRACE_SYSCALLS)  += ftrace.o

obj-$(CONFIG_CRASH_DUMP)	+= crash_dump.o

obj-$(CONFIG_PERF_EVENTS)	+= perf_event.o perf_cpum_cf.o



# Kexec part

S390_KEXEC_OBJS := machine_kexec.o crash.o