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

Commit 382b7366 authored by Sebastian Ott's avatar Sebastian Ott Committed by Martin Schwidefsky
Browse files

s390: add eadm facility bits 



Add the eadm facility bits to the css characteristics and move
them to a new header.

Signed-off-by: default avatarSebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 01c5e6dc

arch/s390/include/asm/chsc.h

+0 −28
Original line number Diff line number Diff line
@@ -125,32 +125,4 @@ struct chsc_cpd_info { 
#define CHSC_INFO_CPD _IOWR(CHSC_IOCTL_MAGIC, 0x87, struct chsc_cpd_info)

#define CHSC_INFO_DCAL _IOWR(CHSC_IOCTL_MAGIC, 0x88, struct chsc_dcal)



#ifdef __KERNEL__



struct css_general_char {

	u64 : 12;

	u32 dynio : 1;	 /* bit 12 */

	u32 : 28;

	u32 aif : 1;	 /* bit 41 */

	u32 : 3;

	u32 mcss : 1;	 /* bit 45 */

	u32 fcs : 1;	 /* bit 46 */

	u32 : 1;

	u32 ext_mb : 1;  /* bit 48 */

	u32 : 7;

	u32 aif_tdd : 1; /* bit 56 */

	u32 : 1;

	u32 qebsm : 1;	 /* bit 58 */

	u32 : 8;

	u32 aif_osa : 1; /* bit 67 */

	u32 : 14;

	u32 cib : 1;	 /* bit 82 */

	u32 : 5;

	u32 fcx : 1;	 /* bit 88 */

	u32 : 7;

}__attribute__((packed));



extern struct css_general_char css_general_characteristics;



#endif /* __KERNEL__ */

#endif

arch/s390/include/asm/css_chars.h

0 → 100644
+39 −0
Original line number Diff line number Diff line 
#ifndef _ASM_CSS_CHARS_H

#define _ASM_CSS_CHARS_H



#include <linux/types.h>



#ifdef __KERNEL__



struct css_general_char {

	u64 : 12;

	u32 dynio : 1;	 /* bit 12 */

	u32 : 4;

	u32 eadm : 1;	 /* bit 17 */

	u32 : 23;

	u32 aif : 1;	 /* bit 41 */

	u32 : 3;

	u32 mcss : 1;	 /* bit 45 */

	u32 fcs : 1;	 /* bit 46 */

	u32 : 1;

	u32 ext_mb : 1;  /* bit 48 */

	u32 : 7;

	u32 aif_tdd : 1; /* bit 56 */

	u32 : 1;

	u32 qebsm : 1;	 /* bit 58 */

	u32 : 8;

	u32 aif_osa : 1; /* bit 67 */

	u32 : 12;

	u32 eadm_rf : 1; /* bit 80 */

	u32 : 1;

	u32 cib : 1;	 /* bit 82 */

	u32 : 5;

	u32 fcx : 1;	 /* bit 88 */

	u32 : 19;

	u32 alt_ssi : 1; /* bit 108 */

} __packed;



extern struct css_general_char css_general_characteristics;



#endif /* __KERNEL__ */

#endif

arch/s390/include/asm/scsw.h

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#define _ASM_S390_SCSW_H_



#include <linux/types.h>

#include <asm/chsc.h>

#include <asm/css_chars.h>

#include <asm/cio.h>



/**

drivers/s390/block/dasd_eckd.c

+1 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/compat.h>

#include <linux/init.h>



#include <asm/css_chars.h>

#include <asm/debug.h>

#include <asm/idals.h>

#include <asm/ebcdic.h>
@@ -31,8 +32,6 @@ 


#include "dasd_int.h"

#include "dasd_eckd.h"

#include "../cio/chsc.h"





#ifdef PRINTK_HEADER

#undef PRINTK_HEADER

drivers/s390/cio/chsc.h

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 


#include <linux/types.h>

#include <linux/device.h>

#include <asm/css_chars.h>

#include <asm/chpid.h>

#include <asm/chsc.h>

#include <asm/schid.h>