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

Commit d7ae65ae authored by Christian Borntraeger's avatar Christian Borntraeger Committed by Martin Schwidefsky
Browse files

s390/setup: cleanup machine flags 



Over time some machine flags got unused (e.g. MACHINE_FLAG_MVPG)
or are available on all 64bit systems (MACHINE_FLAG_CSP,
MACHINE_FLAG_IEEE) - let's remove them.
Reorder the other ones to match the order of the MACHINE_HAS_*
macros and renumber all bits to avoid holes.
Also fix the comment about where the flags are detected.

Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 3dbc78d3

arch/s390/include/asm/setup.h

+14 −17
Original line number Diff line number Diff line
@@ -12,27 +12,24 @@ 
#define PARMAREA		0x10400



/*

 * Machine features detected in head.S

 * Machine features detected in early.c

 */



#define MACHINE_FLAG_VM		_BITUL(0)

#define MACHINE_FLAG_IEEE	_BITUL(1)

#define MACHINE_FLAG_CSP	_BITUL(2)

#define MACHINE_FLAG_MVPG	_BITUL(3)

#define MACHINE_FLAG_DIAG44	_BITUL(4)

#define MACHINE_FLAG_KVM	_BITUL(1)

#define MACHINE_FLAG_LPAR	_BITUL(2)

#define MACHINE_FLAG_DIAG9C	_BITUL(3)

#define MACHINE_FLAG_ESOP	_BITUL(4)

#define MACHINE_FLAG_IDTE	_BITUL(5)

#define MACHINE_FLAG_DIAG9C	_BITUL(6)

#define MACHINE_FLAG_KVM	_BITUL(8)

#define MACHINE_FLAG_ESOP	_BITUL(9)

#define MACHINE_FLAG_EDAT1	_BITUL(10)

#define MACHINE_FLAG_EDAT2	_BITUL(11)

#define MACHINE_FLAG_LPAR	_BITUL(12)

#define MACHINE_FLAG_LPP	_BITUL(13)

#define MACHINE_FLAG_TOPOLOGY	_BITUL(14)

#define MACHINE_FLAG_TE		_BITUL(15)

#define MACHINE_FLAG_TLB_LC	_BITUL(17)

#define MACHINE_FLAG_VX		_BITUL(18)

#define MACHINE_FLAG_CAD	_BITUL(19)

#define MACHINE_FLAG_DIAG44	_BITUL(6)

#define MACHINE_FLAG_EDAT1	_BITUL(7)

#define MACHINE_FLAG_EDAT2	_BITUL(8)

#define MACHINE_FLAG_LPP	_BITUL(9)

#define MACHINE_FLAG_TOPOLOGY	_BITUL(10)

#define MACHINE_FLAG_TE		_BITUL(11)

#define MACHINE_FLAG_TLB_LC	_BITUL(12)

#define MACHINE_FLAG_VX		_BITUL(13)

#define MACHINE_FLAG_CAD	_BITUL(14)



#define LPP_MAGIC		_BITUL(31)

#define LPP_PFAULT_PID_MASK	_AC(0xffffffff, UL)