Commit 15e9d264 authored Jan 04, 2025 by Damien Le Moal Committed by Keith Busch Jan 10, 2025

nvmet: Export nvmet_update_cc() and nvmet_cc_xxx() helpers



Make the function nvmet_update_cc() available to target drivers by
exporting it. To also facilitate the manipulation of the cc register
bits, move the inline helper functions nvmet_cc_en(), nvmet_cc_css(),
nvmet_cc_mps(), nvmet_cc_ams(), nvmet_cc_shn(), nvmet_cc_iosqes(), and
nvmet_cc_iocqes() from core.c to nvmet.h so that these functions can be
reused in target controller drivers.

Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Tested-by: Rick Wertenbroek <rick.wertenbroek@gmail.com>
Tested-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: Keith Busch <kbusch@kernel.org>

parent 5d4f4ea8

drivers/nvme/target/core.c

+1 −35

Original line number	Diff line number	Diff line
		@@ -1166,41 +1166,6 @@ void nvmet_req_free_sgls(struct nvmet_req *req)
		}
		EXPORT_SYMBOL_GPL(nvmet_req_free_sgls);

		static inline bool nvmet_cc_en(u32 cc)
		{
		return (cc >> NVME_CC_EN_SHIFT) & 0x1;
		}

		static inline u8 nvmet_cc_css(u32 cc)
		{
		return (cc >> NVME_CC_CSS_SHIFT) & 0x7;
		}

		static inline u8 nvmet_cc_mps(u32 cc)
		{
		return (cc >> NVME_CC_MPS_SHIFT) & 0xf;
		}

		static inline u8 nvmet_cc_ams(u32 cc)
		{
		return (cc >> NVME_CC_AMS_SHIFT) & 0x7;
		}

		static inline u8 nvmet_cc_shn(u32 cc)
		{
		return (cc >> NVME_CC_SHN_SHIFT) & 0x3;
		}

		static inline u8 nvmet_cc_iosqes(u32 cc)
		{
		return (cc >> NVME_CC_IOSQES_SHIFT) & 0xf;
		}

		static inline u8 nvmet_cc_iocqes(u32 cc)
		{
		return (cc >> NVME_CC_IOCQES_SHIFT) & 0xf;
		}

		static inline bool nvmet_css_supported(u8 cc_css)
		{
		switch (cc_css << NVME_CC_CSS_SHIFT) {
		@@ -1277,6 +1242,7 @@ void nvmet_update_cc(struct nvmet_ctrl *ctrl, u32 new)
		ctrl->csts &= ~NVME_CSTS_SHST_CMPLT;
		mutex_unlock(&ctrl->lock);
		}
		EXPORT_SYMBOL_GPL(nvmet_update_cc);

		static void nvmet_init_cap(struct nvmet_ctrl *ctrl)
		{

drivers/nvme/target/nvmet.h

+35 −0

Original line number	Diff line number	Diff line
		@@ -732,6 +732,41 @@ void nvmet_passthrough_override_cap(struct nvmet_ctrl *ctrl);
		u16 errno_to_nvme_status(struct nvmet_req *req, int errno);
		u16 nvmet_report_invalid_opcode(struct nvmet_req *req);

		static inline bool nvmet_cc_en(u32 cc)
		{
		return (cc >> NVME_CC_EN_SHIFT) & 0x1;
		}

		static inline u8 nvmet_cc_css(u32 cc)
		{
		return (cc >> NVME_CC_CSS_SHIFT) & 0x7;
		}

		static inline u8 nvmet_cc_mps(u32 cc)
		{
		return (cc >> NVME_CC_MPS_SHIFT) & 0xf;
		}

		static inline u8 nvmet_cc_ams(u32 cc)
		{
		return (cc >> NVME_CC_AMS_SHIFT) & 0x7;
		}

		static inline u8 nvmet_cc_shn(u32 cc)
		{
		return (cc >> NVME_CC_SHN_SHIFT) & 0x3;
		}

		static inline u8 nvmet_cc_iosqes(u32 cc)
		{
		return (cc >> NVME_CC_IOSQES_SHIFT) & 0xf;
		}

		static inline u8 nvmet_cc_iocqes(u32 cc)
		{
		return (cc >> NVME_CC_IOCQES_SHIFT) & 0xf;
		}

		/* Convert a 32-bit number to a 16-bit 0's based number */
		static inline __le16 to0based(u32 a)
		{