| Message ID | 20200629182642.1170387-6-its@irrelevant.dk |
|---|---|
| State | New |
| Headers | show |
| Series | hw/block/nvme: bump to v1.3 | expand |
Looks good, Reviewed-by: Dmitry Fomichev <dmitry.fomichev@wdc.com> On Mon, 2020-06-29 at 20:26 +0200, Klaus Jensen wrote: > From: Klaus Jensen <k.jensen@samsung.com> > > Mark firmware slot 1 as read-only and only support that slot. > > Signed-off-by: Klaus Jensen <k.jensen@samsung.com> > --- > hw/block/nvme.c | 3 ++- > include/block/nvme.h | 4 ++++ > 2 files changed, 6 insertions(+), 1 deletion(-) > > diff --git a/hw/block/nvme.c b/hw/block/nvme.c > index 5ca50646369e..f8e91a6965ed 100644 > --- a/hw/block/nvme.c > +++ b/hw/block/nvme.c > @@ -62,6 +62,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 { \ > @@ -1652,7 +1653,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 bb651d0cbf5a..003b15af9cd9 100644 > --- a/include/block/nvme.h > +++ b/include/block/nvme.h > @@ -842,6 +842,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)
diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 5ca50646369e..f8e91a6965ed 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -62,6 +62,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 { \ @@ -1652,7 +1653,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 bb651d0cbf5a..003b15af9cd9 100644 --- a/include/block/nvme.h +++ b/include/block/nvme.h @@ -842,6 +842,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)