summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMatias Bjørling <m@bjorling.me>2015-11-16 15:34:38 +0100
committerJens Axboe <axboe@fb.com>2015-11-16 23:20:26 +0100
commit36d5dbc694e0d1b1909506666d7c27b53f7f9674 (patch)
tree7ae677bbb9103f5f769df8ad5d531ab9dfe69612 /drivers
parentlightnvm: update bad block table format (diff)
downloadlinux-36d5dbc694e0d1b1909506666d7c27b53f7f9674.tar.xz
linux-36d5dbc694e0d1b1909506666d7c27b53f7f9674.zip
lightnvm: update alignments for identify command
A single 8 bit and 16 bit reserve field were inserted in the specification to align fields appropriately. Reflect this in the identify group structure. Signed-off-by: Matias Bjørling <m@bjorling.me> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/nvme/host/lightnvm.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/nvme/host/lightnvm.c b/drivers/nvme/host/lightnvm.c
index 2c3546516300..60687ed68b5d 100644
--- a/drivers/nvme/host/lightnvm.c
+++ b/drivers/nvme/host/lightnvm.c
@@ -155,11 +155,13 @@ struct nvme_nvm_id_group {
__u8 num_ch;
__u8 num_lun;
__u8 num_pln;
+ __u8 rsvd1;
__le16 num_blk;
__le16 num_pg;
__le16 fpg_sz;
__le16 csecs;
__le16 sos;
+ __le16 rsvd2;
__le32 trdt;
__le32 trdm;
__le32 tprt;
@@ -168,7 +170,7 @@ struct nvme_nvm_id_group {
__le32 tbem;
__le32 mpos;
__le16 cpar;
- __u8 reserved[913];
+ __u8 reserved[910];
} __packed;
struct nvme_nvm_addr_format {