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

Commit f8d9ccde authored by Alexander Yarygin's avatar Alexander Yarygin Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Allow to use cpuinfo on s390 



This patch defines CPUINFO_PROC for s390 and implements get_cpuid().

Reviewed-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Reviewed-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarAlexander Yarygin <yarygin@linux.vnet.ibm.com>
Acked-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Cornelia Huck <cornelia.huck@de.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/87ioneo7qh.wl%yarygin@linux.vnet.ibm.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 65c647a6

tools/perf/arch/s390/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -2,3 +2,4 @@ ifndef NO_DWARF 
PERF_HAVE_DWARF_REGS := 1

LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/dwarf-regs.o

endif

LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/header.o

tools/perf/arch/s390/util/header.c

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

 * Implementation of get_cpuid().

 *

 * Copyright 2014 IBM Corp.

 * Author(s): Alexander Yarygin <yarygin@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.

 */



#include <sys/types.h>

#include <unistd.h>

#include <stdio.h>

#include <string.h>



#include "../../util/header.h"



int get_cpuid(char *buffer, size_t sz)

{

	const char *cpuid = "IBM/S390";



	if (strlen(cpuid) + 1 > sz)

		return -1;



	strcpy(buffer, cpuid);

	return 0;

}

tools/perf/perf-sys.h

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ 
#define mb()		asm volatile("bcr 15,0" ::: "memory")

#define wmb()		asm volatile("bcr 15,0" ::: "memory")

#define rmb()		asm volatile("bcr 15,0" ::: "memory")

#define CPUINFO_PROC	"vendor_id"

#endif



#ifdef __sh__