anierin/msm-5.15
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

s390/ap: fix status returned by ap_aqic()

Browse Source 
[ Upstream commit 394740d7645ea767795074287769dd26dbd4d782 ]

There function ap_aqic() tries to grab the status from the
wrong part of the register. Thus we always end up with
zeros. Which is wrong, among others, because we detect
failures via status.response_code.

Signed-off-by: Halil Pasic <pasic@linux.ibm.com>
Reported-by: Janosch Frank <frankja@linux.ibm.com>
Fixes: 159491f3b5 ("s390/ap: rework assembler functions to use unions for in/out register variables")
Reviewed-by: Harald Freudenberger <freude@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Halil Pasic
2023-02-09 00:00:23 +01:00
committed by Greg Kroah-Hartman
parent 0e872b4da7
commit 900a0c25a6
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
arch/s390/include/asm/ap.h
View File

@@ -236,7 +236,10 @@ static inline struct ap_queue_status ap_aqic(ap_qid_t qid,
union { union {
unsigned long value; unsigned long value;
struct ap_qirq_ctrl qirqctrl; struct ap_qirq_ctrl qirqctrl;
struct ap_queue_status status; struct {
u32 _pad;
struct ap_queue_status status;
};
} reg1; } reg1;
void *reg2 = ind; void *reg2 = ind;
@@ -250,7 +253,7 @@ static inline struct ap_queue_status ap_aqic(ap_qid_t qid,
" lgr %[reg1],1\n" /* gr1 (status) into reg1 */ " lgr %[reg1],1\n" /* gr1 (status) into reg1 */
: [reg1] "+&d" (reg1) : [reg1] "+&d" (reg1)
: [reg0] "d" (reg0), [reg2] "d" (reg2) : [reg0] "d" (reg0), [reg2] "d" (reg2)
: "cc", "0", "1", "2"); : "cc", "memory", "0", "1", "2");
return reg1.status; return reg1.status;
} }