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

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
...@@ -141,11 +141,11 @@ extern void setup_ipl(void); ...@@ -141,11 +141,11 @@ extern void setup_ipl(void);
* DIAG 308 support * DIAG 308 support
*/ */
enum diag308_subcode { enum diag308_subcode {
DIAG308_REL_HSA = 2, DIAG308_REL_HSA = 2,
DIAG308_IPL = 3, DIAG308_LOAD_CLEAR = 3,
DIAG308_DUMP = 4, DIAG308_LOAD_NORMAL_DUMP = 4,
DIAG308_SET = 5, DIAG308_SET = 5,
DIAG308_STORE = 6, DIAG308_STORE = 6,
}; };
enum diag308_ipl_type { enum diag308_ipl_type {
......
...@@ -563,7 +563,7 @@ static struct kset *ipl_kset; ...@@ -563,7 +563,7 @@ static struct kset *ipl_kset;
static void __ipl_run(void *unused) static void __ipl_run(void *unused)
{ {
diag308(DIAG308_IPL, NULL); diag308(DIAG308_LOAD_CLEAR, NULL);
if (MACHINE_IS_VM) if (MACHINE_IS_VM)
__cpcmd("IPL", NULL, 0, NULL); __cpcmd("IPL", NULL, 0, NULL);
else if (ipl_info.type == IPL_TYPE_CCW) else if (ipl_info.type == IPL_TYPE_CCW)
...@@ -1086,23 +1086,23 @@ static void __reipl_run(void *unused) ...@@ -1086,23 +1086,23 @@ static void __reipl_run(void *unused)
case REIPL_METHOD_CCW_DIAG: case REIPL_METHOD_CCW_DIAG:
diag308(DIAG308_SET, reipl_block_ccw); diag308(DIAG308_SET, reipl_block_ccw);
if (MACHINE_IS_LPAR) if (MACHINE_IS_LPAR)
diag308(DIAG308_DUMP, NULL); diag308(DIAG308_LOAD_NORMAL_DUMP, NULL);
else else
diag308(DIAG308_IPL, NULL); diag308(DIAG308_LOAD_CLEAR, NULL);
break; break;
case REIPL_METHOD_FCP_RW_DIAG: case REIPL_METHOD_FCP_RW_DIAG:
diag308(DIAG308_SET, reipl_block_fcp); diag308(DIAG308_SET, reipl_block_fcp);
diag308(DIAG308_IPL, NULL); diag308(DIAG308_LOAD_CLEAR, NULL);
break; break;
case REIPL_METHOD_FCP_RO_DIAG: case REIPL_METHOD_FCP_RO_DIAG:
diag308(DIAG308_IPL, NULL); diag308(DIAG308_LOAD_CLEAR, NULL);
break; break;
case REIPL_METHOD_FCP_RO_VM: case REIPL_METHOD_FCP_RO_VM:
__cpcmd("IPL", NULL, 0, NULL); __cpcmd("IPL", NULL, 0, NULL);
break; break;
case REIPL_METHOD_NSS_DIAG: case REIPL_METHOD_NSS_DIAG:
diag308(DIAG308_SET, reipl_block_nss); diag308(DIAG308_SET, reipl_block_nss);
diag308(DIAG308_IPL, NULL); diag308(DIAG308_LOAD_CLEAR, NULL);
break; break;
case REIPL_METHOD_NSS: case REIPL_METHOD_NSS:
get_ipl_string(buf, reipl_block_nss, REIPL_METHOD_NSS); get_ipl_string(buf, reipl_block_nss, REIPL_METHOD_NSS);
...@@ -1111,7 +1111,7 @@ static void __reipl_run(void *unused) ...@@ -1111,7 +1111,7 @@ static void __reipl_run(void *unused)
case REIPL_METHOD_DEFAULT: case REIPL_METHOD_DEFAULT:
if (MACHINE_IS_VM) if (MACHINE_IS_VM)
__cpcmd("IPL", NULL, 0, NULL); __cpcmd("IPL", NULL, 0, NULL);
diag308(DIAG308_IPL, NULL); diag308(DIAG308_LOAD_CLEAR, NULL);
break; break;
case REIPL_METHOD_FCP_DUMP: case REIPL_METHOD_FCP_DUMP:
break; break;
...@@ -1426,7 +1426,7 @@ static void diag308_dump(void *dump_block) ...@@ -1426,7 +1426,7 @@ static void diag308_dump(void *dump_block)
{ {
diag308(DIAG308_SET, dump_block); diag308(DIAG308_SET, dump_block);
while (1) { while (1) {
if (diag308(DIAG308_DUMP, NULL) != 0x302) if (diag308(DIAG308_LOAD_NORMAL_DUMP, NULL) != 0x302)
break; break;
udelay_simple(USEC_PER_SEC); udelay_simple(USEC_PER_SEC);
} }
......
...@@ -185,7 +185,7 @@ static ssize_t zcore_reipl_write(struct file *filp, const char __user *buf, ...@@ -185,7 +185,7 @@ static ssize_t zcore_reipl_write(struct file *filp, const char __user *buf,
{ {
if (ipl_block) { if (ipl_block) {
diag308(DIAG308_SET, ipl_block); diag308(DIAG308_SET, ipl_block);
diag308(DIAG308_IPL, NULL); diag308(DIAG308_LOAD_CLEAR, NULL);
} }
return count; return count;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment