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

Commit 60b43f62 authored by Max Gurtovoy's avatar Max Gurtovoy Committed by Sagi Grimberg
Browse files

nvme: rename AMS symbolic constants to fit specification 



Signed-off-by: default avatarMax Gurtovoy <maxg@mellanox.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent ad4e05b2

drivers/nvme/host/core.c

+1 −1
Original line number Diff line number Diff line
@@ -1445,7 +1445,7 @@ int nvme_enable_ctrl(struct nvme_ctrl *ctrl, u64 cap) 


	ctrl->ctrl_config = NVME_CC_CSS_NVM;

	ctrl->ctrl_config |= (page_shift - 12) << NVME_CC_MPS_SHIFT;

	ctrl->ctrl_config |= NVME_CC_ARB_RR | NVME_CC_SHN_NONE;

	ctrl->ctrl_config |= NVME_CC_AMS_RR | NVME_CC_SHN_NONE;

	ctrl->ctrl_config |= NVME_CC_IOSQES | NVME_CC_IOCQES;

	ctrl->ctrl_config |= NVME_CC_ENABLE;

include/linux/nvme.h

+3 −3
Original line number Diff line number Diff line
@@ -142,9 +142,9 @@ enum { 
	NVME_CC_SHN_SHIFT	= 14,

	NVME_CC_IOSQES_SHIFT	= 16,

	NVME_CC_IOCQES_SHIFT	= 20,

	NVME_CC_ARB_RR		= 0 << NVME_CC_AMS_SHIFT,

	NVME_CC_ARB_WRRU	= 1 << NVME_CC_AMS_SHIFT,

	NVME_CC_ARB_VS		= 7 << NVME_CC_AMS_SHIFT,

	NVME_CC_AMS_RR		= 0 << NVME_CC_AMS_SHIFT,

	NVME_CC_AMS_WRRU	= 1 << NVME_CC_AMS_SHIFT,

	NVME_CC_AMS_VS		= 7 << NVME_CC_AMS_SHIFT,

	NVME_CC_SHN_NONE	= 0 << NVME_CC_SHN_SHIFT,

	NVME_CC_SHN_NORMAL	= 1 << NVME_CC_SHN_SHIFT,

	NVME_CC_SHN_ABRUPT	= 2 << NVME_CC_SHN_SHIFT,