nvme: indicate CMB support through controller capabilities register
PATCH 1/1 nvme: indicate CMB support through controller capabilities register
This patch sets CMBS bit in controller capabilities register when user configures NVMe driver with CMB support, so capabilites are correctly reported to guest OS.
Signed-off-by Andrzej Jakowski <[email protected]>
--- hw/block/nvme.c | 2 ++ include/block/nvme.h | 4 ++++ 2 files changed, 6 insertions(+)
hw/block/nvme.c +2 -0
@@ -1393,6 +1393,8 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp) n->bar.intmc = n->bar.intms =0 ;if (n->cmb_size_mb) { +/* Contoller capabilities */ +NVME_CAP_SET_CMBS (n->bar.cap,1 );NVME_CMBLOC_SET_BIR (n->bar.cmbloc,2 );NVME_CMBLOC_SET_OFST (n->bar.cmbloc,0 );
include/block/nvme.h +4 -0
@@ -27,6 +27,7 @@ enum NvmeCapShift {CAP_CSS_SHIFT =37 ,CAP_MPSMIN_SHIFT =48 ,CAP_MPSMAX_SHIFT =52 , + CAP_CMB_SHIFT = 57, }; enum NvmeCapMask {
@@ -39,6 +40,7 @@ enum NvmeCapMask {CAP_CSS_MASK =0xff ,CAP_MPSMIN_MASK =0xf ,CAP_MPSMAX_MASK =0xf , + CAP_CMB_MASK = 0x1, };#define NVME_CAP_MQES (cap) (((cap) >> CAP_MQES_SHIFT) & CAP_MQES_MASK)
@@ -69,6 +71,8 @@ enum NvmeCapMask { << CAP_MPSMIN_SHIFT)#define NVME_CAP_SET_MPSMAX (cap, val) (cap |= (uint64_t)(val & CAP_MPSMAX_MASK)\ << CAP_MPSMAX_SHIFT) +#define NVME_CAP_SET_CMBS (cap, val) (cap |= (uint64_t)(val & CAP_CMB_MASK)\ + << CAP_CMB_SHIFT)enum NvmeCcShift {CC_EN_SHIFT =0 ,
Signature · 1 line
2.21.1
Quoted 55 lines · Andrzej Jakowski
This patch sets CMBS bit in controller capabilities register when user configures NVMe driver with CMB support, so capabilites are correctly reported to guest OS.
Signed-off-by Andrzej Jakowski <[email protected]>--- hw/block/nvme.c | 2 ++ include/block/nvme.h | 4 ++++ 2 files changed, 6 insertions(+)hw/block/nvme.c +2
-0@@ -1393,6 +1393,8 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp) n->bar.intmc = n->bar.intms =0 ;if (n->cmb_size_mb) { +/* Contoller capabilities */ +NVME_CAP_SET_CMBS (n->bar.cap,1 );NVME_CMBLOC_SET_BIR (n->bar.cmbloc,2 );NVME_CMBLOC_SET_OFST (n->bar.cmbloc,0 );include/block/nvme.h +4
-0@@ -27,6 +27,7 @@ enum NvmeCapShift {CAP_CSS_SHIFT =37 ,CAP_MPSMIN_SHIFT =48 ,CAP_MPSMAX_SHIFT =52 , + CAP_CMB_SHIFT = 57, }; enum NvmeCapMask {@@ -39,6 +40,7 @@ enum NvmeCapMask {CAP_CSS_MASK =0xff ,CAP_MPSMIN_MASK =0xf ,CAP_MPSMAX_MASK =0xf , + CAP_CMB_MASK = 0x1, };#define NVME_CAP_MQES (cap) (((cap) >> CAP_MQES_SHIFT) & CAP_MQES_MASK)@@ -69,6 +71,8 @@ enum NvmeCapMask { << CAP_MPSMIN_SHIFT)#define NVME_CAP_SET_MPSMAX (cap, val) (cap |= (uint64_t)(val & CAP_MPSMAX_MASK)\ << CAP_MPSMAX_SHIFT) +#define NVME_CAP_SET_CMBS (cap, val) (cap |= (uint64_t)(val & CAP_CMB_MASK)\ + << CAP_CMB_SHIFT)enum NvmeCcShift {CC_EN_SHIFT =0 ,Signature · 1 line
2.21.1
Looks good.
Reviewed-by Klaus Jensen <[email protected]>