> -----Original Message-----
> From: Keith Busch <[email protected]>
> Sent: Wednesday, September 30, 2020 6:04 PM
> To: [email protected]; [email protected]; Klaus Jensen
> <[email protected]>
> Cc: Niklas Cassel <[email protected]>; Dmitry Fomichev
> <[email protected]>; Kevin Wolf <[email protected]>; Philippe
> Mathieu-Daudé <[email protected]>; Keith Busch <[email protected]>
> Subject: [PATCH 5/9] hw/block/nvme: support for admin-only command set
>
> Signed-off-by: Keith Busch <[email protected]>
> ---
> hw/block/nvme.c | 1 +
> include/block/nvme.h | 3 ++-
> 2 files changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/hw/block/nvme.c b/hw/block/nvme.c
> index 6c582e6874..ec7363ea40 100644
> --- a/hw/block/nvme.c
> +++ b/hw/block/nvme.c
> @@ -2755,6 +2755,7 @@ static void nvme_init_ctrl(NvmeCtrl *n, PCIDevice
> *pci_dev)
> NVME_CAP_SET_CQR(n->bar.cap, 1);
> NVME_CAP_SET_TO(n->bar.cap, 0xf);
> NVME_CAP_SET_CSS(n->bar.cap, NVME_CAP_CSS_NVM);
> + NVME_CAP_SET_CSS(n->bar.cap, NVME_CAP_CSS_ADMIN_ONLY);
This could be
- NVME_CAP_SET_CSS(n->bar.cap, NVME_CAP_CSS_NVM);
+ NVME_CAP_SET_CSS(n->bar.cap, (NVME_CAP_CSS_NVM |
NVME_CAP_CSS_ADMIN_ONLY));
Unfortunately, parentheses are needed above because NVME_CAP_SET_CSS macro and
other similar macros use "val" instead of (val). A possible cleanup topic...
> NVME_CAP_SET_MPSMAX(n->bar.cap, 4);
>
> n->bar.vs = NVME_SPEC_VER;
> diff --git a/include/block/nvme.h b/include/block/nvme.h
> index bc20a2ba5e..521533fd2a 100644
> --- a/include/block/nvme.h
> +++ b/include/block/nvme.h
> @@ -83,7 +83,8 @@ enum NvmeCapMask {
> << CAP_PMR_SHIFT)
>
> enum NvmeCapCss {
> - NVME_CAP_CSS_NVM = 1 << 0,
> + NVME_CAP_CSS_NVM = 1 << 0,
> + NVME_CAP_CSS_ADMIN_ONLY = 1 << 7,
> };
>
> enum NvmeCcShift {
> --
> 2.24.1
