FAILED: patch "[PATCH] spi: cadence-qspi: Fix exec_mem_op error handling" failed to apply to 6.1-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x 59e1be1278f064d7172b00473b7e0c453cb1ec52
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026040819-resend-amiss-2b5d@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 59e1be1278f064d7172b00473b7e0c453cb1ec52 Mon Sep 17 00:00:00 2001
From: Emanuele Ghidoli <[email protected]>
Date: Fri, 13 Mar 2026 14:52:31 +0100
Subject: [PATCH] spi: cadence-qspi: Fix exec_mem_op error handling
cqspi_exec_mem_op() increments the runtime PM usage counter before all refcount checks are performed. If one of these checks fails, the function returns without dropping the PM reference.
Move the pm_runtime_resume_and_get() call after the refcount checks so that runtime PM is only acquired when the operation can proceed and drop the inflight_ops refcount if the PM resume fails.
drivers/spi/spi-cadence-quadspi.c +9 -8
@@ -1483,14 +1483,6 @@ static int cqspi_exec_mem_op(struct spi_mem *mem, const struct spi_mem_op *op)if (refcount_read (&cqspi->inflight_ops) ==0 )return -ENODEV ; -if (!(ddata && (ddata->quirks &CQSPI_DISABLE_RUNTIME_PM ))) { - ret =pm_runtime_resume_and_get (dev); -if (ret) { -dev_err (&mem->spi->dev,"resume failed with %d\n" , ret); -return ret; - } - } -if (!refcount_read (&cqspi->refcount))return -EBUSY ;
@@ -1502,6 +1494,14 @@ static int cqspi_exec_mem_op(struct spi_mem *mem, const struct spi_mem_op *op)return -EBUSY ; } +if (!(ddata && (ddata->quirks &CQSPI_DISABLE_RUNTIME_PM ))) { + ret =pm_runtime_resume_and_get (dev); +if (ret) { +dev_err (&mem->spi->dev,"resume failed with %d\n" , ret); + goto dec_inflight_refcount; + } + } + ret =cqspi_mem_process (mem, op);if (!(ddata && (ddata->quirks &CQSPI_DISABLE_RUNTIME_PM )))
@@ -1510,6 +1510,7 @@ static int cqspi_exec_mem_op(struct spi_mem *mem, const struct spi_mem_op *op)if (ret)dev_err (&mem->spi->dev,"operation failed with %d\n" , ret); +dec_inflight_refcount:if (refcount_read (&cqspi->inflight_ops) >1 )refcount_dec (&cqspi->inflight_ops);