d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

For IDENTIFY passthrough commands to Chatham prototype controllers, copy

Browse Source 
the spoofed identify data into the user buffer rather than issuing the
command to the controller, since Chatham IDENTIFY data is always spoofed.

While here, fix a bug in the spoofed data for Chatham submission and
completion queue entry sizes.

Sponsored by:	Intel
MFC after:	3 days
This commit is contained in:
Jim Harris 2014-01-06 23:51:26 +00:00
parent efa2980530
commit 448cffc859
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sys/dev/nvme/nvme_ctrlr.c
View File

@ -181,8 +181,8 @@ nvme_chatham_populate_cdata(struct nvme_controller *ctrlr)
cdata->lpa.ns_smart = 1;
cdata->sqes.min = 6;
cdata->sqes.max = 6;
cdata->sqes.min = 4;
cdata->sqes.max = 4;
cdata->cqes.min = 4;
cdata->cqes.max = 4;
cdata->nn = 1;
/* Chatham2 doesn't support DSM command */
@ -1041,6 +1041,27 @@ nvme_ctrlr_ioctl(struct cdev *cdev, u_long cmd, caddr_t arg, int flag,
break;
case NVME_PASSTHROUGH_CMD:
pt = (struct nvme_pt_command *)arg;
#ifdef CHATHAM2
/*
* Chatham IDENTIFY data is spoofed, so copy the spoofed data
* rather than issuing the command to the Chatham controller.
*/
if (pci_get_devid(ctrlr->dev) == CHATHAM_PCI_ID &&
pt->cmd.opc == NVME_OPC_IDENTIFY) {
if (pt->cmd.cdw10 == 1) {
if (pt->len != sizeof(ctrlr->cdata))
return (EINVAL);
return (copyout(&ctrlr->cdata, pt->buf,
pt->len));
} else {
if (pt->len != sizeof(ctrlr->ns[0].data) ||
pt->cmd.nsid != 1)
return (EINVAL);
return (copyout(&ctrlr->ns[0].data, pt->buf,
pt->len));
}
}
#endif
return (nvme_ctrlr_passthrough_cmd(ctrlr, pt, pt->cmd.nsid,
1 /* is_user_buffer */, 1 /* is_admin_cmd */));
default: