D58948.id184311.diff
No OneTemporary
Actions

Size

854 B

Referenced Files

None

Subscribers

None

D58948.id184311.diff
View Options

	diff --git a/sys/dev/ufshci/ufshci_req_queue.c b/sys/dev/ufshci/ufshci_req_queue.c
	--- a/sys/dev/ufshci/ufshci_req_queue.c
	+++ b/sys/dev/ufshci/ufshci_req_queue.c
	@@ -270,8 +270,8 @@
	error = ufshci_req_queue_response_is_error(req_queue, ocs,
	&cpl.response_upiu);

	- /* Retry for admin commands */
	- retriable = req->is_admin;
	+ /* Retry for admin commands. A failed controller must not retry. */
	+ retriable = req->is_admin && !req_queue->ctrlr->is_failed;
	retry = error && retriable &&
	req->retries < req_queue->ctrlr->retry_count;
	if (retry)
	@@ -765,6 +765,9 @@

	mtx_assert(&req_queue->qops.get_hw_queue(req_queue)->qlock, MA_OWNED);

	+ if (req_queue->ctrlr->is_failed)
	+ return (ENXIO);
	+
	error = req_queue->qops.reserve_slot(req_queue, &tr);
	if (error != 0) {
	ufshci_printf(req_queue->ctrlr, "Failed to get tracker");