diff options
| author | Klaus Jensen | 2020-07-06 08:12:51 +0200 |
|---|---|---|
| committer | Klaus Jensen | 2020-09-02 08:48:50 +0200 |
| commit | 42a42e4610ab9e4ca0bcc976f4b19f9f612a085e (patch) | |
| tree | 5871168633ccf2b16545769b976be41d6ba3abda | |
| parent | hw/block/nvme: add temperature threshold feature (diff) | |
| download | qemu-42a42e4610ab9e4ca0bcc976f4b19f9f612a085e.tar.gz qemu-42a42e4610ab9e4ca0bcc976f4b19f9f612a085e.tar.xz qemu-42a42e4610ab9e4ca0bcc976f4b19f9f612a085e.zip | |
hw/block/nvme: mark fw slot 1 as read-only
Mark firmware slot 1 as read-only and only support that slot.
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Dmitry Fomichev <dmitry.fomichev@wdc.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Message-Id: <20200706061303.246057-7-its@irrelevant.dk>
| -rw-r--r-- | hw/block/nvme.c | 3 | ||||
| -rw-r--r-- | include/block/nvme.h | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 38c6461fd3..c970e41699 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -61,6 +61,7 @@ #define NVME_TEMPERATURE 0x143 #define NVME_TEMPERATURE_WARNING 0x157 #define NVME_TEMPERATURE_CRITICAL 0x175 +#define NVME_NUM_FW_SLOTS 1 #define NVME_GUEST_ERR(trace, fmt, ...) \ do { \ @@ -1664,7 +1665,7 @@ static void nvme_init_ctrl(NvmeCtrl *n, PCIDevice *pci_dev) * inconsequential. */ id->acl = 3; - id->frmw = 7 << 1; + id->frmw = (NVME_NUM_FW_SLOTS << 1) | NVME_FRMW_SLOT1_RO; id->lpa = 1 << 0; /* recommended default value (~70 C) */ diff --git a/include/block/nvme.h b/include/block/nvme.h index 273640c2b1..f3fdb5bf11 100644 --- a/include/block/nvme.h +++ b/include/block/nvme.h @@ -843,6 +843,10 @@ enum NvmeIdCtrlOncs { NVME_ONCS_TIMESTAMP = 1 << 6, }; +enum NvmeIdCtrlFrmw { + NVME_FRMW_SLOT1_RO = 1 << 0, +}; + #define NVME_CTRL_SQES_MIN(sqes) ((sqes) & 0xf) #define NVME_CTRL_SQES_MAX(sqes) (((sqes) >> 4) & 0xf) #define NVME_CTRL_CQES_MIN(cqes) ((cqes) & 0xf) |