mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 00:10:09 +00:00
nvme: rename AMS symbolic constants to fit specification
Signed-off-by: Max Gurtovoy <maxg@mellanox.com> Signed-off-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
parent
ad4e05b24c
commit
60b43f627a
2 changed files with 4 additions and 4 deletions
|
@ -1445,7 +1445,7 @@ int nvme_enable_ctrl(struct nvme_ctrl *ctrl, u64 cap)
|
||||||
|
|
||||||
ctrl->ctrl_config = NVME_CC_CSS_NVM;
|
ctrl->ctrl_config = NVME_CC_CSS_NVM;
|
||||||
ctrl->ctrl_config |= (page_shift - 12) << NVME_CC_MPS_SHIFT;
|
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_IOSQES | NVME_CC_IOCQES;
|
||||||
ctrl->ctrl_config |= NVME_CC_ENABLE;
|
ctrl->ctrl_config |= NVME_CC_ENABLE;
|
||||||
|
|
||||||
|
|
|
@ -142,9 +142,9 @@ enum {
|
||||||
NVME_CC_SHN_SHIFT = 14,
|
NVME_CC_SHN_SHIFT = 14,
|
||||||
NVME_CC_IOSQES_SHIFT = 16,
|
NVME_CC_IOSQES_SHIFT = 16,
|
||||||
NVME_CC_IOCQES_SHIFT = 20,
|
NVME_CC_IOCQES_SHIFT = 20,
|
||||||
NVME_CC_ARB_RR = 0 << NVME_CC_AMS_SHIFT,
|
NVME_CC_AMS_RR = 0 << NVME_CC_AMS_SHIFT,
|
||||||
NVME_CC_ARB_WRRU = 1 << NVME_CC_AMS_SHIFT,
|
NVME_CC_AMS_WRRU = 1 << NVME_CC_AMS_SHIFT,
|
||||||
NVME_CC_ARB_VS = 7 << 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_NONE = 0 << NVME_CC_SHN_SHIFT,
|
||||||
NVME_CC_SHN_NORMAL = 1 << NVME_CC_SHN_SHIFT,
|
NVME_CC_SHN_NORMAL = 1 << NVME_CC_SHN_SHIFT,
|
||||||
NVME_CC_SHN_ABRUPT = 2 << NVME_CC_SHN_SHIFT,
|
NVME_CC_SHN_ABRUPT = 2 << NVME_CC_SHN_SHIFT,
|
||||||
|
|
Loading…
Reference in a new issue