freebsd/freebsd-src
1
0 Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2026-11-07 04:36:52 -10:00
Code Issues Packages Projects Releases Wiki Activity

nvme: derive CC.CSS from CAP.CSS instead of hardcoding the NVM set

Browse Source 
CC.CSS was always writting zero, which is a reserved encoding on a
controller that does not support the NVM command set.
Select 111b on admin-only controllers and 110b when the
I/O command set mechanism is available.

Reviewed by:	ngie, imp, adrian
Differential Revision:	https://reviews.freebsd.org/D59628
This commit is contained in:
Abdelkader Boudih committed 2026-09-24 15:20:13 +01:00
1 parent 2c41f7d8a0
commit b99595c9c7
2 files changed
+20 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

sys/dev/nvme/nvme.h
+9
View File
@@ -103,6 +103,11 @@ struct sbuf;
#define NVME_CAP_HI_REG_CSS_MASK (0xff)
#define NVME_CAP_HI_REG_CSS_NVM_SHIFT (5)
#define NVME_CAP_HI_REG_CSS_NVM_MASK (0x1)
/* CAP.CSS command set support flags */
#define NVME_CAP_CSS_NVM (0x01)
#define NVME_CAP_CSS_IOCSS (0x40)
#define NVME_CAP_CSS_NOIOCSS (0x80)
#define NVME_CAP_HI_REG_BPS_SHIFT (13)
#define NVME_CAP_HI_REG_BPS_MASK (0x1)
#define NVME_CAP_HI_REG_CPS_SHIFT (14)
@@ -152,6 +157,10 @@ struct sbuf;
#define NVME_CC_REG_EN_MASK (0x1)
#define NVME_CC_REG_CSS_SHIFT (4)
#define NVME_CC_REG_CSS_MASK (0x7)
/* CC.CSS values */
#define NVME_CC_CSS_NVM (0x0)
#define NVME_CC_CSS_IOCSS (0x6)
#define NVME_CC_CSS_ADMIN (0x7)
#define NVME_CC_REG_MPS_SHIFT (7)
#define NVME_CC_REG_MPS_MASK (0xF)
#define NVME_CC_REG_AMS_SHIFT (11)
sys/dev/nvme/nvme_ctrlr.c
+11 -2
View File
@@ -363,7 +363,7 @@ nvme_ctrlr_enable(struct nvme_controller *ctrlr)
uint32_t csts;
uint32_t aqa;
uint32_t qsize;
uint8_t en, rdy;
uint8_t css, en, rdy;
int err;
cc = nvme_mmio_read_4(ctrlr, cc);
@@ -400,7 +400,16 @@ nvme_ctrlr_enable(struct nvme_controller *ctrlr)
/* Initialization values for CC */
cc = 0;
cc |= NVMEF(NVME_CC_REG_EN, 1);
cc |= NVMEF(NVME_CC_REG_CSS, 0);
/* No CSI support; prefer the NVM command set when present. */
css = NVME_CAP_HI_CSS(ctrlr->cap_hi);
if ((css & NVME_CAP_CSS_NVM) != 0)
cc |= NVMEF(NVME_CC_REG_CSS, NVME_CC_CSS_NVM);
else if ((css & NVME_CAP_CSS_NOIOCSS) != 0)
cc |= NVMEF(NVME_CC_REG_CSS, NVME_CC_CSS_ADMIN);
else if ((css & NVME_CAP_CSS_IOCSS) != 0)
cc |= NVMEF(NVME_CC_REG_CSS, NVME_CC_CSS_IOCSS);
else
cc |= NVMEF(NVME_CC_REG_CSS, NVME_CC_CSS_NVM);
cc |= NVMEF(NVME_CC_REG_AMS, 0);
cc |= NVMEF(NVME_CC_REG_SHN, 0);
cc |= NVMEF(NVME_CC_REG_IOSQES, ctrlr->io_sqes);