[PATCH] nvme: submit nvme_admin_activate_fw to admin queue

[PATCH] nvme: submit nvme_admin_activate_fw to admin queue

[David Milburn]

The nvme_admin_activate_fw command should be submitted to
the admin queue; otherwise, mode 0x0F (ACTIVATE_DEFERRED_MICROCODE)
and mode 0x05 (DOWNLOAD_SAVE_ACTIVATE) will fail.

Fixes: b90c48d0c11ef("nvme: split nvme_trans_send_fw_cmd")
Reported-by: Joseph Szczypek <joseph.szczypek at hpe.com>
Tested-by: Micah Parrish <micah.parrish at hpe.com>
Signed-off-by: David Milburn <dmilburn at redhat.com>
---
 drivers/nvme/host/scsi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/nvme/host/scsi.c b/drivers/nvme/host/scsi.c
index 1f7671e..f4395e6 100644
--- a/drivers/nvme/host/scsi.c
+++ b/drivers/nvme/host/scsi.c
@@ -1231,7 +1231,7 @@ static int nvme_trans_send_activate_fw_cmd(struct nvme_ns *ns, struct sg_io_hdr
 	c.common.opcode = nvme_admin_activate_fw;
 	c.common.cdw10[0] = cpu_to_le32(buffer_id | NVME_FWACT_REPL_ACTV);
 
-	nvme_sc = nvme_submit_sync_cmd(ns->queue, &c, NULL, 0);
+	nvme_sc = nvme_submit_sync_cmd(ns->ctrl->admin_q, &c, NULL, 0);
 	return nvme_trans_status_code(hdr, nvme_sc);
 }
 
-- 
1.8.3.1

[PATCH] nvme: submit nvme_admin_activate_fw to admin queue

[Christoph Hellwig]

On Tue, Jun 13, 2017@04:36:50PM -0500, David Milburn wrote:
> The nvme_admin_activate_fw command should be submitted to
> the admin queue; otherwise, mode 0x0F (ACTIVATE_DEFERRED_MICROCODE)
> and mode 0x05 (DOWNLOAD_SAVE_ACTIVATE) will fail.
> 
> Fixes: b90c48d0c11ef("nvme: split nvme_trans_send_fw_cmd")
> Reported-by: Joseph Szczypek <joseph.szczypek at hpe.com>
> Tested-by: Micah Parrish <micah.parrish at hpe.com>
> Signed-off-by: David Milburn <dmilburn at redhat.com>

If this command has been broken all the time we should just remove it.

[PATCH] nvme: submit nvme_admin_activate_fw to admin queue

[Sagi Grimberg]

On 14/06/17 09:27, Christoph Hellwig wrote:
> On Tue, Jun 13, 2017@04:36:50PM -0500, David Milburn wrote:
>> The nvme_admin_activate_fw command should be submitted to
>> the admin queue; otherwise, mode 0x0F (ACTIVATE_DEFERRED_MICROCODE)
>> and mode 0x05 (DOWNLOAD_SAVE_ACTIVATE) will fail.
>>
>> Fixes: b90c48d0c11ef("nvme: split nvme_trans_send_fw_cmd")
>> Reported-by: Joseph Szczypek <joseph.szczypek at hpe.com>
>> Tested-by: Micah Parrish <micah.parrish at hpe.com>
>> Signed-off-by: David Milburn <dmilburn at redhat.com>
> 
> If this command has been broken all the time we should just remove it.

Agreed.