Merge tag 'nvme-6.15-2025-05-08' of git://git.infradead.org/nvme into block-6.15

axboe · axboe · commit dd90905d5a8a · 2025-05-08T09:08:23.000-06:00
Pull NVMe fix from Christoph:

"nvme fixes for linux 6.15

 - unblock ctrl state transition for firmware update (Daniel Wagner)"

* tag 'nvme-6.15-2025-05-08' of git://git.infradead.org/nvme:
  nvme: unblock ctrl state transition for firmware update
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
@@ -4493,7 +4493,8 @@ static void nvme_fw_act_work(struct work_struct *work)
 		msleep(100);
 	}
 
-	if (!nvme_change_ctrl_state(ctrl, NVME_CTRL_LIVE))
+	if (!nvme_change_ctrl_state(ctrl, NVME_CTRL_CONNECTING) ||
+	    !nvme_change_ctrl_state(ctrl, NVME_CTRL_LIVE))
 		return;
 
 	nvme_unquiesce_io_queues(ctrl);

Original file line number	Diff line number	Diff line change
`@@ -4493,7 +4493,8 @@ static void nvme_fw_act_work(struct work_struct *work)`
`4493`	`4493`	`msleep(100);`
`4494`	`4494`	`}`
`4495`	`4495`
`4496`		`- if (!nvme_change_ctrl_state(ctrl, NVME_CTRL_LIVE))`
	`4496`	`+ if (!nvme_change_ctrl_state(ctrl, NVME_CTRL_CONNECTING) \|\|`
	`4497`	`+ !nvme_change_ctrl_state(ctrl, NVME_CTRL_LIVE))`
`4497`	`4498`	`return;`
`4498`	`4499`
`4499`	`4500`	`nvme_unquiesce_io_queues(ctrl);`