OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

spapr-vscsi: fix SOLNT bit in SRP_RSP

Browse Source 
The driver calculates SOLNT bit from UCSOLNT and  SCSOLNT bits from
the request. The iu pointer has a type of srp_iu* which points to a union,
so cmd and rsp overlap. As the vscsi_send_rsp function calls
memset(iu, 0, sizeof(rsp)), it clears first 36 bytes of both cmd and rsp
so cmd.sol_not is always zero at the moment of calculating rsp.sol_not.

This fixes the bug.

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Message-id: 1375073319-17488-1-git-send-email-aik@ozlabs.ru
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Alexey Kardashevskiy 2013-07-29 14:48:39 +10:00 committed by Anthony Liguori
parent c04d6cfa3f
commit dbd94f8e4a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/scsi/spapr_vscsi.c
View File

@ -216,6 +216,7 @@ static int vscsi_send_rsp(VSCSIState *s, vscsi_req *req,
union viosrp_iu *iu = &req->iu; union viosrp_iu *iu = &req->iu;
uint64_t tag = iu->srp.rsp.tag; uint64_t tag = iu->srp.rsp.tag;
int total_len = sizeof(iu->srp.rsp); int total_len = sizeof(iu->srp.rsp);
uint8_t sol_not = iu->srp.cmd.sol_not;
dprintf("VSCSI: Sending resp status: 0x%x, " dprintf("VSCSI: Sending resp status: 0x%x, "
"res_in: %d, res_out: %d\n", status, res_in, res_out); "res_in: %d, res_out: %d\n", status, res_in, res_out);
@ -248,7 +249,7 @@ static int vscsi_send_rsp(VSCSIState *s, vscsi_req *req,
/* Handle success vs. failure */ /* Handle success vs. failure */
iu->srp.rsp.status = status; iu->srp.rsp.status = status;
if (status) { if (status) {
iu->srp.rsp.sol_not = (iu->srp.cmd.sol_not & 0x04) >> 2; iu->srp.rsp.sol_not = (sol_not & 0x04) >> 2;
if (req->senselen) { if (req->senselen) {
req->iu.srp.rsp.flags |= SRP_RSP_FLAG_SNSVALID; req->iu.srp.rsp.flags |= SRP_RSP_FLAG_SNSVALID;
req->iu.srp.rsp.sense_data_len = cpu_to_be32(req->senselen); req->iu.srp.rsp.sense_data_len = cpu_to_be32(req->senselen);
@ -256,7 +257,7 @@ static int vscsi_send_rsp(VSCSIState *s, vscsi_req *req,
total_len += req->senselen; total_len += req->senselen;
} }
} else { } else {
iu->srp.rsp.sol_not = (iu->srp.cmd.sol_not & 0x02) >> 1; iu->srp.rsp.sol_not = (sol_not & 0x02) >> 1;
} }
vscsi_send_iu(s, req, total_len, VIOSRP_SRP_FORMAT); vscsi_send_iu(s, req, total_len, VIOSRP_SRP_FORMAT);