Commit 2395103b authored by Harald Freudenberger's avatar Harald Freudenberger Committed by Heiko Carstens

s390/zcrypt: fix ap_instructions_available() returncodes

During review of KVM patches it was complained that the
ap_instructions_available() function returns 0 if AP
instructions are available and -ENODEV if not. The function
acts like a boolean function to check for AP instructions
available and thus should return 0 on failure and != 0 on
success. Changed to the suggested behaviour and adapted
the one and only caller of this function which is the ap
bus core code.
Signed-off-by: default avatarHarald Freudenberger <freude@linux.ibm.com>
Acked-by: default avatarCornelia Huck <cohuck@redhat.com>
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
parent bc00b3ec
...@@ -49,20 +49,20 @@ struct ap_queue_status { ...@@ -49,20 +49,20 @@ struct ap_queue_status {
/** /**
* ap_intructions_available() - Test if AP instructions are available. * ap_intructions_available() - Test if AP instructions are available.
* *
* Returns 0 if the AP instructions are installed. * Returns 1 if the AP instructions are installed, otherwise 0.
*/ */
static inline int ap_instructions_available(void) static inline int ap_instructions_available(void)
{ {
register unsigned long reg0 asm ("0") = AP_MKQID(0, 0); register unsigned long reg0 asm ("0") = AP_MKQID(0, 0);
register unsigned long reg1 asm ("1") = -ENODEV; register unsigned long reg1 asm ("1") = 0;
register unsigned long reg2 asm ("2"); register unsigned long reg2 asm ("2") = 0;
asm volatile( asm volatile(
" .long 0xb2af0000\n" /* PQAP(TAPQ) */ " .long 0xb2af0000\n" /* PQAP(TAPQ) */
"0: la %0,0\n" "0: la %0,1\n"
"1:\n" "1:\n"
EX_TABLE(0b, 1b) EX_TABLE(0b, 1b)
: "+d" (reg1), "=d" (reg2) : "+d" (reg1), "+d" (reg2)
: "d" (reg0) : "d" (reg0)
: "cc"); : "cc");
return reg1; return reg1;
......
...@@ -1201,7 +1201,7 @@ static int __init ap_module_init(void) ...@@ -1201,7 +1201,7 @@ static int __init ap_module_init(void)
if (rc) if (rc)
return rc; return rc;
if (ap_instructions_available() != 0) { if (!ap_instructions_available()) {
pr_warn("The hardware system does not support AP instructions\n"); pr_warn("The hardware system does not support AP instructions\n");
return -ENODEV; return -ENODEV;
} }
......
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