| Message ID | 20220331160419.333157-3-imbrenda@linux.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | lib: s390x: Refactor and rename vm.[ch] | expand |
On 3/31/22 18:04, Claudio Imbrenda wrote: > Remove the check for z/VM 6.x, since it is not needed anymore. > > Signed-off-by: Claudio Imbrenda <imbrenda@linux.ibm.com> Thanks for taking care of this. Reviewed-by: Janosch Frank <frankja@linux.ibm.com> > --- > s390x/skey.c | 37 ++++--------------------------------- > 1 file changed, 4 insertions(+), 33 deletions(-) > > diff --git a/s390x/skey.c b/s390x/skey.c > index 58a55436..edad53e9 100644 > --- a/s390x/skey.c > +++ b/s390x/skey.c > @@ -65,33 +65,9 @@ static void test_set(void) > "set key test"); > } > > -/* Returns true if we are running under z/VM 6.x */ > -static bool check_for_zvm6(void) > -{ > - int dcbt; /* Descriptor block count */ > - int nr; > - static const unsigned char zvm6[] = { > - /* This is "z/VM 6" in EBCDIC */ > - 0xa9, 0x61, 0xe5, 0xd4, 0x40, 0x40, 0x40, 0x40, 0xf6 > - }; > - > - if (stsi(pagebuf, 3, 2, 2)) > - return false; > - > - dcbt = pagebuf[31] & 0xf; > - > - for (nr = 0; nr < dcbt; nr++) { > - if (!memcmp(&pagebuf[32 + nr * 64 + 24], zvm6, sizeof(zvm6))) > - return true; > - } > - > - return false; > -} > - > static void test_priv(void) > { > union skey skey; > - bool is_zvm6 = check_for_zvm6(); > > memset(pagebuf, 0, PAGE_SIZE * 2); > report_prefix_push("privileged"); > @@ -106,15 +82,10 @@ static void test_priv(void) > report(skey.str.acc != 3, "skey did not change on exception"); > > report_prefix_push("iske"); > - if (is_zvm6) { > - /* There is a known bug with z/VM 6, so skip the test there */ > - report_skip("not working on z/VM 6"); > - } else { > - expect_pgm_int(); > - enter_pstate(); > - get_storage_key(pagebuf); > - check_pgm_int_code(PGM_INT_CODE_PRIVILEGED_OPERATION); > - } > + expect_pgm_int(); > + enter_pstate(); > + get_storage_key(pagebuf); > + check_pgm_int_code(PGM_INT_CODE_PRIVILEGED_OPERATION); > report_prefix_pop(); > > report_prefix_pop();
diff --git a/s390x/skey.c b/s390x/skey.c index 58a55436..edad53e9 100644 --- a/s390x/skey.c +++ b/s390x/skey.c @@ -65,33 +65,9 @@ static void test_set(void) "set key test"); } -/* Returns true if we are running under z/VM 6.x */ -static bool check_for_zvm6(void) -{ - int dcbt; /* Descriptor block count */ - int nr; - static const unsigned char zvm6[] = { - /* This is "z/VM 6" in EBCDIC */ - 0xa9, 0x61, 0xe5, 0xd4, 0x40, 0x40, 0x40, 0x40, 0xf6 - }; - - if (stsi(pagebuf, 3, 2, 2)) - return false; - - dcbt = pagebuf[31] & 0xf; - - for (nr = 0; nr < dcbt; nr++) { - if (!memcmp(&pagebuf[32 + nr * 64 + 24], zvm6, sizeof(zvm6))) - return true; - } - - return false; -} - static void test_priv(void) { union skey skey; - bool is_zvm6 = check_for_zvm6(); memset(pagebuf, 0, PAGE_SIZE * 2); report_prefix_push("privileged"); @@ -106,15 +82,10 @@ static void test_priv(void) report(skey.str.acc != 3, "skey did not change on exception"); report_prefix_push("iske"); - if (is_zvm6) { - /* There is a known bug with z/VM 6, so skip the test there */ - report_skip("not working on z/VM 6"); - } else { - expect_pgm_int(); - enter_pstate(); - get_storage_key(pagebuf); - check_pgm_int_code(PGM_INT_CODE_PRIVILEGED_OPERATION); - } + expect_pgm_int(); + enter_pstate(); + get_storage_key(pagebuf); + check_pgm_int_code(PGM_INT_CODE_PRIVILEGED_OPERATION); report_prefix_pop(); report_prefix_pop();
Remove the check for z/VM 6.x, since it is not needed anymore. Signed-off-by: Claudio Imbrenda <imbrenda@linux.ibm.com> --- s390x/skey.c | 37 ++++--------------------------------- 1 file changed, 4 insertions(+), 33 deletions(-)