Commit 0d308717 authored by Mete Durlu's avatar Mete Durlu Committed by Alexander Gordeev
Browse files

s390/diag: Add memory topology information via diag310 



Introduce diag310 and memory topology related subcodes.
Provide memory topology information obtanied from diag310 to userspace
via diag ioctl.

Signed-off-by: default avatarMete Durlu <meted@linux.ibm.com>
Reviewed-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
parent b2bc1b1a

arch/s390/include/asm/diag.h

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ enum diag_stat_enum { 
	DIAG_STAT_X2FC,

	DIAG_STAT_X304,

	DIAG_STAT_X308,

	DIAG_STAT_X310,

	DIAG_STAT_X318,

	DIAG_STAT_X320,

	DIAG_STAT_X324,

arch/s390/include/asm/sclp.h

+1 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ struct sclp_info { 
	unsigned char has_kss : 1;

	unsigned char has_diag204_bif : 1;

	unsigned char has_gisaf : 1;

	unsigned char has_diag310 : 1;

	unsigned char has_diag318 : 1;

	unsigned char has_diag320 : 1;

	unsigned char has_diag324 : 1;

arch/s390/include/uapi/asm/diag.h

+8 −0
Original line number Diff line number Diff line
@@ -17,8 +17,16 @@ struct diag324_pib { 
	__u64 sequence;

};



struct diag310_memtop {

	__u64 address;

	__u64 nesting_lvl;

};



/* Diag ioctl definitions */

#define DIAG324_GET_PIBBUF	_IOWR(DIAG_MAGIC_STR, 0x77, struct diag324_pib)

#define DIAG324_GET_PIBLEN	_IOR(DIAG_MAGIC_STR, 0x78, size_t)

#define DIAG310_GET_STRIDE	_IOR(DIAG_MAGIC_STR, 0x79, size_t)

#define DIAG310_GET_MEMTOPLEN	_IOWR(DIAG_MAGIC_STR, 0x7a, size_t)

#define DIAG310_GET_MEMTOPBUF	_IOWR(DIAG_MAGIC_STR, 0x7b, struct diag310_memtop)



#endif /* __S390_UAPI_ASM_DIAG_H */

arch/s390/kernel/diag/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-y	:= diag_misc.o diag324.o diag.o
 
obj-y	:= diag_misc.o diag324.o diag.o diag310.o

arch/s390/kernel/diag/diag.c

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ static const struct diag_desc diag_map[NR_DIAG_STAT] = { 
	[DIAG_STAT_X2FC] = { .code = 0x2fc, .name = "Guest Performance Data" },

	[DIAG_STAT_X304] = { .code = 0x304, .name = "Partition-Resource Service" },

	[DIAG_STAT_X308] = { .code = 0x308, .name = "List-Directed IPL" },

	[DIAG_STAT_X310] = { .code = 0x310, .name = "Memory Topology Information" },

	[DIAG_STAT_X318] = { .code = 0x318, .name = "CP Name and Version Codes" },

	[DIAG_STAT_X320] = { .code = 0x320, .name = "Certificate Store" },

	[DIAG_STAT_X324] = { .code = 0x324, .name = "Power Information Block" },