diff options
| author | Matthew Wilcox <matthew.r.wilcox@intel.com> | 2013-05-06 16:22:18 +0400 |
|---|---|---|
| committer | Matthew Wilcox <matthew.r.wilcox@intel.com> | 2013-05-08 17:55:05 +0400 |
| commit | ab3ea5bf37e7189e843e19e500e7af50e802b5f6 (patch) | |
| tree | af71b6bc25b4e51221d9fea8d3cd74d46ed66e83 | |
| parent | 44af146a84fa4a8e136d824207dcd356958a112b (diff) | |
| download | linux-ab3ea5bf37e7189e843e19e500e7af50e802b5f6.tar.xz | |
NVMe: Simplify Firmware Activate code slightly
Add definitions for the three Firmware Activate actions, and change the
SCSI translation code to construct the command into a temporary variable
instead of translating the endianness back-and-forth.
Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
Reviewed-by: Vishal Verma <vishal.l.verma@linux.intel.com>
| -rw-r--r-- | drivers/block/nvme-scsi.c | 6 | ||||
| -rw-r--r-- | include/linux/nvme.h | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/drivers/block/nvme-scsi.c b/drivers/block/nvme-scsi.c index 1c0710ca55d6..fed54b039893 100644 --- a/drivers/block/nvme-scsi.c +++ b/drivers/block/nvme-scsi.c @@ -1577,10 +1577,8 @@ static int nvme_trans_send_fw_cmd(struct nvme_ns *ns, struct sg_io_hdr *hdr, c.dlfw.numd = cpu_to_le32((tot_len/BYTES_TO_DWORDS) - 1); c.dlfw.offset = cpu_to_le32(offset/BYTES_TO_DWORDS); } else if (opcode == nvme_admin_activate_fw) { - c.common.cdw10[0] = cpu_to_le32(buffer_id); - /* AA=01b Replace & activate at reset */ - c.common.cdw10[0] = cpu_to_le32(le32_to_cpu( - c.common.cdw10[0]) | 0x00000008); + u32 cdw10 = buffer_id | NVME_FWACT_REPL_ACTV; + c.common.cdw10[0] = cpu_to_le32(cdw10); } nvme_sc = nvme_submit_admin_cmd(dev, &c, NULL); diff --git a/include/linux/nvme.h b/include/linux/nvme.h index 971ef086ed63..f451c8d6e231 100644 --- a/include/linux/nvme.h +++ b/include/linux/nvme.h @@ -316,6 +316,9 @@ enum { NVME_FEAT_WRITE_ATOMIC = 0x0a, NVME_FEAT_ASYNC_EVENT = 0x0b, NVME_FEAT_SW_PROGRESS = 0x0c, + NVME_FWACT_REPL = (0 << 3), + NVME_FWACT_REPL_ACTV = (1 << 3), + NVME_FWACT_ACTV = (2 << 3), }; struct nvme_identify { |