openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

NVMe: Read the model, serial & firmware rev from the controller 

Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
This commit is contained in:
Matthew Wilcox 2011-02-01 16:18:08 -05:00
parent a53295b699
commit 51814232ec
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/block/nvme.c
View File

@ -58,6 +58,9 @@ struct nvme_dev {
struct msix_entry *entry; struct msix_entry *entry;
struct nvme_bar __iomem *bar; struct nvme_bar __iomem *bar;
struct list_head namespaces; struct list_head namespaces;
char serial[20];
char model[40];
char firmware_rev[8];
}; };
/* /*
@ -979,6 +982,7 @@ static int __devinit nvme_dev_add(struct nvme_dev *dev)
{ {
int res, nn, i; int res, nn, i;
struct nvme_ns *ns, *next; struct nvme_ns *ns, *next;
struct nvme_id_ctrl *ctrl;
void *id; void *id;
dma_addr_t dma_addr; dma_addr_t dma_addr;
struct nvme_command cid, crt; struct nvme_command cid, crt;
@ -1003,7 +1007,11 @@ static int __devinit nvme_dev_add(struct nvme_dev *dev)
goto out_free; goto out_free;
} }
nn = le32_to_cpup(&((struct nvme_id_ctrl *)id)->nn); ctrl = id;
nn = le32_to_cpup(&ctrl->nn);
memcpy(dev->serial, ctrl->sn, sizeof(ctrl->sn));
memcpy(dev->model, ctrl->mn, sizeof(ctrl->mn));
memcpy(dev->firmware_rev, ctrl->fr, sizeof(ctrl->fr));
cid.identify.cns = 0; cid.identify.cns = 0;
memset(&crt, 0, sizeof(crt)); memset(&crt, 0, sizeof(crt));