Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd4da3ab authored by Andy Lutomirski's avatar Andy Lutomirski Committed by Jens Axboe
Browse files

nvme: Add a quirk mechanism that uses identify_ctrl 



Currently, all NVMe quirks are based on PCI IDs.  Add a mechanism to
define quirks based on identify_ctrl's vendor id, model number,
and/or firmware revision.

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAndy Lutomirski <luto@kernel.org>
Signed-off-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent e5a39dd8

drivers/nvme/host/core.c

+64 −0
Original line number Diff line number Diff line
@@ -1252,6 +1252,50 @@ static void nvme_set_queue_limits(struct nvme_ctrl *ctrl, 
	blk_queue_write_cache(q, vwc, vwc);

}



struct nvme_core_quirk_entry {

	/*

	 * NVMe model and firmware strings are padded with spaces.  For

	 * simplicity, strings in the quirk table are padded with NULLs

	 * instead.

	 */

	u16 vid;

	const char *mn;

	const char *fr;

	unsigned long quirks;

};



static const struct nvme_core_quirk_entry core_quirks[] = {

};



/* match is null-terminated but idstr is space-padded. */

static bool string_matches(const char *idstr, const char *match, size_t len)

{

	size_t matchlen;



	if (!match)

		return true;



	matchlen = strlen(match);

	WARN_ON_ONCE(matchlen > len);



	if (memcmp(idstr, match, matchlen))

		return false;



	for (; matchlen < len; matchlen++)

		if (idstr[matchlen] != ' ')

			return false;



	return true;

}



static bool quirk_matches(const struct nvme_id_ctrl *id,

			  const struct nvme_core_quirk_entry *q)

{

	return q->vid == le16_to_cpu(id->vid) &&

		string_matches(id->mn, q->mn, sizeof(id->mn)) &&

		string_matches(id->fr, q->fr, sizeof(id->fr));

}



/*

 * Initialize the cached copies of the Identify data and various controller

 * register in our nvme_ctrl structure.  This should be called as soon as
@@ -1286,6 +1330,24 @@ int nvme_init_identify(struct nvme_ctrl *ctrl) 
		return -EIO;

	}



	if (!ctrl->identified) {

		/*

		 * Check for quirks.  Quirk can depend on firmware version,

		 * so, in principle, the set of quirks present can change

		 * across a reset.  As a possible future enhancement, we

		 * could re-scan for quirks every time we reinitialize

		 * the device, but we'd have to make sure that the driver

		 * behaves intelligently if the quirks change.

		 */



		int i;



		for (i = 0; i < ARRAY_SIZE(core_quirks); i++) {

			if (quirk_matches(id, &core_quirks[i]))

				ctrl->quirks |= core_quirks[i].quirks;

		}

	}



	ctrl->oacs = le16_to_cpu(id->oacs);

	ctrl->vid = le16_to_cpu(id->vid);

	ctrl->oncs = le16_to_cpup(&id->oncs);
@@ -1329,6 +1391,8 @@ int nvme_init_identify(struct nvme_ctrl *ctrl) 
	}



	kfree(id);



	ctrl->identified = true;

	return ret;

}

EXPORT_SYMBOL_GPL(nvme_init_identify);

drivers/nvme/host/nvme.h

+1 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ enum nvme_ctrl_state { 


struct nvme_ctrl {

	enum nvme_ctrl_state state;

	bool identified;

	spinlock_t lock;

	const struct nvme_ctrl_ops *ops;

	struct request_queue *admin_q;