[GIT PULL 07/37] lightnvm: remove multiple groups in 1.2 data structure

From: Matias BjÃrling
Date: Thu Mar 29 2018 - 18:15:37 EST


Only one id group from the 1.2 specification is supported. Make
sure that only the first group is accessible.

Signed-off-by: Matias BjÃrling <mb@xxxxxxxxxxx>
---
drivers/nvme/host/lightnvm.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/nvme/host/lightnvm.c b/drivers/nvme/host/lightnvm.c
index 940c9b9a2a09..dc0b1335c7c6 100644
--- a/drivers/nvme/host/lightnvm.c
+++ b/drivers/nvme/host/lightnvm.c
@@ -166,7 +166,8 @@ struct nvme_nvm_id {
__le32 dom;
struct nvme_nvm_addr_format ppaf;
__u8 resv[228];
- struct nvme_nvm_id_group groups[4];
+ struct nvme_nvm_id_group group;
+ __u8 resv2[2880];
} __packed;

struct nvme_nvm_bb_tbl {
@@ -208,7 +209,7 @@ static int init_grps(struct nvm_id *nvm_id, struct nvme_nvm_id *nvme_nvm_id)
if (nvme_nvm_id->cgrps != 1)
return -EINVAL;

- src = &nvme_nvm_id->groups[0];
+ src = &nvme_nvm_id->group;
grp = &nvm_id->grp;

grp->mtype = src->mtype;
--
2.11.0