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

Commit 0599eead authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

s390/ipl: rename diagnose enums 



Rename DIAG308_IPL and DIAG308_DUMP to DIAG308_LOAD_CLEAR and
DIAG308_LOAD_NORMAL_DUMP to better reflect the associated IPL
functions.

Suggested-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Suggested-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Acked-by: default avatarMichael Holzheu <holzheu@linux.vnet.ibm.com>
Reviewed-by: default avatarPeter Oberparleiter <oberpar@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 0f7451ff

arch/s390/include/asm/ipl.h

+5 −5
Original line number Diff line number Diff line
@@ -142,8 +142,8 @@ extern void setup_ipl(void); 
 */

enum diag308_subcode  {

	DIAG308_REL_HSA = 2,

	DIAG308_IPL	= 3,

	DIAG308_DUMP	= 4,

	DIAG308_LOAD_CLEAR = 3,

	DIAG308_LOAD_NORMAL_DUMP = 4,

	DIAG308_SET = 5,

	DIAG308_STORE = 6,

};

arch/s390/kernel/ipl.c

+8 −8
Original line number Diff line number Diff line
@@ -563,7 +563,7 @@ static struct kset *ipl_kset; 


static void __ipl_run(void *unused)

{

	diag308(DIAG308_IPL, NULL);

	diag308(DIAG308_LOAD_CLEAR, NULL);

	if (MACHINE_IS_VM)

		__cpcmd("IPL", NULL, 0, NULL);

	else if (ipl_info.type == IPL_TYPE_CCW)
@@ -1086,23 +1086,23 @@ static void __reipl_run(void *unused) 
	case REIPL_METHOD_CCW_DIAG:

		diag308(DIAG308_SET, reipl_block_ccw);

		if (MACHINE_IS_LPAR)

			diag308(DIAG308_DUMP, NULL);

			diag308(DIAG308_LOAD_NORMAL_DUMP, NULL);

		else

			diag308(DIAG308_IPL, NULL);

			diag308(DIAG308_LOAD_CLEAR, NULL);

		break;

	case REIPL_METHOD_FCP_RW_DIAG:

		diag308(DIAG308_SET, reipl_block_fcp);

		diag308(DIAG308_IPL, NULL);

		diag308(DIAG308_LOAD_CLEAR, NULL);

		break;

	case REIPL_METHOD_FCP_RO_DIAG:

		diag308(DIAG308_IPL, NULL);

		diag308(DIAG308_LOAD_CLEAR, NULL);

		break;

	case REIPL_METHOD_FCP_RO_VM:

		__cpcmd("IPL", NULL, 0, NULL);

		break;

	case REIPL_METHOD_NSS_DIAG:

		diag308(DIAG308_SET, reipl_block_nss);

		diag308(DIAG308_IPL, NULL);

		diag308(DIAG308_LOAD_CLEAR, NULL);

		break;

	case REIPL_METHOD_NSS:

		get_ipl_string(buf, reipl_block_nss, REIPL_METHOD_NSS);
@@ -1111,7 +1111,7 @@ static void __reipl_run(void *unused) 
	case REIPL_METHOD_DEFAULT:

		if (MACHINE_IS_VM)

			__cpcmd("IPL", NULL, 0, NULL);

		diag308(DIAG308_IPL, NULL);

		diag308(DIAG308_LOAD_CLEAR, NULL);

		break;

	case REIPL_METHOD_FCP_DUMP:

		break;
@@ -1426,7 +1426,7 @@ static void diag308_dump(void *dump_block) 
{

	diag308(DIAG308_SET, dump_block);

	while (1) {

		if (diag308(DIAG308_DUMP, NULL) != 0x302)

		if (diag308(DIAG308_LOAD_NORMAL_DUMP, NULL) != 0x302)

			break;

		udelay_simple(USEC_PER_SEC);

	}

drivers/s390/char/zcore.c

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ static ssize_t zcore_reipl_write(struct file *filp, const char __user *buf, 
{

	if (ipl_block) {

		diag308(DIAG308_SET, ipl_block);

		diag308(DIAG308_IPL, NULL);

		diag308(DIAG308_LOAD_CLEAR, NULL);

	}

	return count;

}