Commit f1d4e812 authored by Javier González's avatar Javier González Committed by Jens Axboe
Browse files

lightnvm: add shorten OCSSD version in geo 



Create a shorten version to use in the generic geometry.

Signed-off-by: default avatarJavier González <javier@cnexlabs.com>
Signed-off-by: default avatarMatias Bjørling <mb@lightnvm.io>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 3cb98f84

drivers/nvme/host/lightnvm.c

+6 −0
Original line number Diff line number Diff line
@@ -299,6 +299,9 @@ static int nvme_nvm_setup_12(struct nvme_nvm_id12 *id, 
	geo->major_ver_id = id->ver_id;

	geo->minor_ver_id = 2;



	/* Set compacted version for upper layers */

	geo->version = NVM_OCSSD_SPEC_12;



	geo->nr_chnls = src->num_ch;

	geo->nr_luns = src->num_lun;

	geo->all_luns = geo->nr_chnls * geo->nr_luns;
@@ -384,6 +387,9 @@ static int nvme_nvm_setup_20(struct nvme_nvm_id20 *id, 
	geo->major_ver_id = id->mjr;

	geo->minor_ver_id = id->mnr;



	/* Set compacted version for upper layers */

	geo->version = NVM_OCSSD_SPEC_20;



	if (!(geo->major_ver_id == 2 && geo->minor_ver_id == 0)) {

		pr_err("nvm: OCSSD version not supported (v%d.%d)\n",

				geo->major_ver_id, geo->minor_ver_id);

include/linux/lightnvm.h

+8 −0
Original line number Diff line number Diff line
@@ -23,6 +23,11 @@ enum { 
#define NVM_LUN_BITS (8)

#define NVM_CH_BITS  (7)



enum {

	NVM_OCSSD_SPEC_12 = 12,

	NVM_OCSSD_SPEC_20 = 20,

};



struct ppa_addr {

	/* Generic structure for all addresses */

	union {
@@ -266,6 +271,9 @@ struct nvm_geo { 
	u8	major_ver_id;

	u8	minor_ver_id;



	/* kernel short version */

	u8	version;



	/* instance specific geometry */

	int nr_chnls;

	int nr_luns;		/* per channel */