Decode rsp length in 'switchtec_device_manage' in bytes

Kelvin Cao · Kelvin Cao · commit 9f0f8fd16dda · 2018-09-28T01:17:13.000+08:00
diff --git a/switchtec-nvme-device.c b/switchtec-nvme-device.c
@@ -76,7 +76,7 @@ int pax_nvme_submit_admin_passthru(int fd, struct nvme_passthru_cmd *cmd)
 
 	memcpy(req.nvme_data, (void *)cmd->addr, data_len);
 
-	req.hdr.expected_rsp_len = (sizeof(rsp.nvme_cqe) + sizeof(rsp.nvme_data))/4;
+	req.hdr.expected_rsp_len = (sizeof(rsp.nvme_cqe) + sizeof(rsp.nvme_data));
 
 	ret = switchtec_device_manage(pax->dev,
 				     (struct switchtec_device_manage_req *)&req,
@@ -93,7 +93,7 @@ int pax_nvme_submit_admin_passthru(int fd, struct nvme_passthru_cmd *cmd)
 		if (!write) {
 			memcpy((uint64_t *)cmd->addr,
 				rsp.nvme_data,
-				(rsp.hdr.rsp_len - 4) * 4);
+				rsp.hdr.rsp_len - 4 * 4);
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ int pax_nvme_submit_admin_passthru(int fd, struct nvme_passthru_cmd *cmd)`
`76`	`76`
`77`	`77`	`memcpy(req.nvme_data, (void *)cmd->addr, data_len);`
`78`	`78`
`79`		`- req.hdr.expected_rsp_len = (sizeof(rsp.nvme_cqe) + sizeof(rsp.nvme_data))/4;`
	`79`	`+ req.hdr.expected_rsp_len = (sizeof(rsp.nvme_cqe) + sizeof(rsp.nvme_data));`
`80`	`80`
`81`	`81`	`ret = switchtec_device_manage(pax->dev,`
`82`	`82`	`(struct switchtec_device_manage_req *)&req,`
`@@ -93,7 +93,7 @@ int pax_nvme_submit_admin_passthru(int fd, struct nvme_passthru_cmd *cmd)`
`93`	`93`	`if (!write) {`
`94`	`94`	`memcpy((uint64_t *)cmd->addr,`
`95`	`95`	`rsp.nvme_data,`
`96`		`- (rsp.hdr.rsp_len - 4) * 4);`
	`96`	`+ rsp.hdr.rsp_len - 4 * 4);`
`97`	`97`	`}`
`98`	`98`	`}`
`99`	`99`