* FAILED: patch "[PATCH] mmc: cqhci: Fix checking of CQHCI_HALT state" failed to apply to 5.10-stable tree
@ 2024-09-08 11:28 gregkh
2024-09-09 5:15 ` Adrian Hunter
0 siblings, 1 reply; 3+ messages in thread
From: gregkh @ 2024-09-08 11:28 UTC (permalink / raw)
To: sh8267.baek, adrian.hunter, ritesh.list, ulf.hansson; +Cc: stable
The patch below does not apply to the 5.10-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 <stable@vger.kernel.org>.
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-5.10.y
git checkout FETCH_HEAD
git cherry-pick -x aea62c744a9ae2a8247c54ec42138405216414da
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2024090852-importer-unadorned-f55b@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^..
Possible dependencies:
aea62c744a9a ("mmc: cqhci: Fix checking of CQHCI_HALT state")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From aea62c744a9ae2a8247c54ec42138405216414da Mon Sep 17 00:00:00 2001
From: Seunghwan Baek <sh8267.baek@samsung.com>
Date: Thu, 29 Aug 2024 15:18:22 +0900
Subject: [PATCH] mmc: cqhci: Fix checking of CQHCI_HALT state
To check if mmc cqe is in halt state, need to check set/clear of CQHCI_HALT
bit. At this time, we need to check with &, not &&.
Fixes: a4080225f51d ("mmc: cqhci: support for command queue enabled host")
Cc: stable@vger.kernel.org
Signed-off-by: Seunghwan Baek <sh8267.baek@samsung.com>
Reviewed-by: Ritesh Harjani <ritesh.list@gmail.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Link: https://lore.kernel.org/r/20240829061823.3718-2-sh8267.baek@samsung.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
diff --git a/drivers/mmc/host/cqhci-core.c b/drivers/mmc/host/cqhci-core.c
index c14d7251d0bb..a02da26a1efd 100644
--- a/drivers/mmc/host/cqhci-core.c
+++ b/drivers/mmc/host/cqhci-core.c
@@ -617,7 +617,7 @@ static int cqhci_request(struct mmc_host *mmc, struct mmc_request *mrq)
cqhci_writel(cq_host, 0, CQHCI_CTL);
mmc->cqe_on = true;
pr_debug("%s: cqhci: CQE on\n", mmc_hostname(mmc));
- if (cqhci_readl(cq_host, CQHCI_CTL) && CQHCI_HALT) {
+ if (cqhci_readl(cq_host, CQHCI_CTL) & CQHCI_HALT) {
pr_err("%s: cqhci: CQE failed to exit halt state\n",
mmc_hostname(mmc));
}
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: FAILED: patch "[PATCH] mmc: cqhci: Fix checking of CQHCI_HALT state" failed to apply to 5.10-stable tree
2024-09-08 11:28 FAILED: patch "[PATCH] mmc: cqhci: Fix checking of CQHCI_HALT state" failed to apply to 5.10-stable tree gregkh
@ 2024-09-09 5:15 ` Adrian Hunter
2024-09-10 7:33 ` Greg KH
0 siblings, 1 reply; 3+ messages in thread
From: Adrian Hunter @ 2024-09-09 5:15 UTC (permalink / raw)
To: gregkh, sh8267.baek, ritesh.list, ulf.hansson; +Cc: stable
On 8/09/24 14:28, gregkh@linuxfoundation.org wrote:
>
> The patch below does not apply to the 5.10-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 <stable@vger.kernel.org>.
>
> 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-5.10.y
> git checkout FETCH_HEAD
> git cherry-pick -x aea62c744a9ae2a8247c54ec42138405216414da
The file name changed from cqhci.c to cqhci-core.c but git 2.43.0
seems to handle it:
$ git version
git version 2.43.0
$ git log --oneline | head -1
b57d01c66f40 Linux 5.10.225
$ git cherry-pick -x aea62c744a9ae2a8247c54ec42138405216414da
Auto-merging drivers/mmc/host/cqhci.c
[detached HEAD dd4085252f0d] mmc: cqhci: Fix checking of CQHCI_HALT state
Author: Seunghwan Baek <sh8267.baek@samsung.com>
Date: Thu Aug 29 15:18:22 2024 +0900
1 file changed, 1 insertion(+), 1 deletion(-)
> # <resolve conflicts, build, test, etc.>
> git commit -s
> git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2024090852-importer-unadorned-f55b@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^..
>
> Possible dependencies:
>
> aea62c744a9a ("mmc: cqhci: Fix checking of CQHCI_HALT state")
>
> thanks,
>
> greg k-h
>
> ------------------ original commit in Linus's tree ------------------
>
> From aea62c744a9ae2a8247c54ec42138405216414da Mon Sep 17 00:00:00 2001
> From: Seunghwan Baek <sh8267.baek@samsung.com>
> Date: Thu, 29 Aug 2024 15:18:22 +0900
> Subject: [PATCH] mmc: cqhci: Fix checking of CQHCI_HALT state
>
> To check if mmc cqe is in halt state, need to check set/clear of CQHCI_HALT
> bit. At this time, we need to check with &, not &&.
>
> Fixes: a4080225f51d ("mmc: cqhci: support for command queue enabled host")
> Cc: stable@vger.kernel.org
> Signed-off-by: Seunghwan Baek <sh8267.baek@samsung.com>
> Reviewed-by: Ritesh Harjani <ritesh.list@gmail.com>
> Acked-by: Adrian Hunter <adrian.hunter@intel.com>
> Link: https://lore.kernel.org/r/20240829061823.3718-2-sh8267.baek@samsung.com
> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
>
> diff --git a/drivers/mmc/host/cqhci-core.c b/drivers/mmc/host/cqhci-core.c
> index c14d7251d0bb..a02da26a1efd 100644
> --- a/drivers/mmc/host/cqhci-core.c
> +++ b/drivers/mmc/host/cqhci-core.c
> @@ -617,7 +617,7 @@ static int cqhci_request(struct mmc_host *mmc, struct mmc_request *mrq)
> cqhci_writel(cq_host, 0, CQHCI_CTL);
> mmc->cqe_on = true;
> pr_debug("%s: cqhci: CQE on\n", mmc_hostname(mmc));
> - if (cqhci_readl(cq_host, CQHCI_CTL) && CQHCI_HALT) {
> + if (cqhci_readl(cq_host, CQHCI_CTL) & CQHCI_HALT) {
> pr_err("%s: cqhci: CQE failed to exit halt state\n",
> mmc_hostname(mmc));
> }
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: FAILED: patch "[PATCH] mmc: cqhci: Fix checking of CQHCI_HALT state" failed to apply to 5.10-stable tree
2024-09-09 5:15 ` Adrian Hunter
@ 2024-09-10 7:33 ` Greg KH
0 siblings, 0 replies; 3+ messages in thread
From: Greg KH @ 2024-09-10 7:33 UTC (permalink / raw)
To: Adrian Hunter; +Cc: sh8267.baek, ritesh.list, ulf.hansson, stable
On Mon, Sep 09, 2024 at 08:15:41AM +0300, Adrian Hunter wrote:
> On 8/09/24 14:28, gregkh@linuxfoundation.org wrote:
> >
> > The patch below does not apply to the 5.10-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 <stable@vger.kernel.org>.
> >
> > 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-5.10.y
> > git checkout FETCH_HEAD
> > git cherry-pick -x aea62c744a9ae2a8247c54ec42138405216414da
>
> The file name changed from cqhci.c to cqhci-core.c but git 2.43.0
> seems to handle it:
>
> $ git version
> git version 2.43.0
> $ git log --oneline | head -1
> b57d01c66f40 Linux 5.10.225
> $ git cherry-pick -x aea62c744a9ae2a8247c54ec42138405216414da
> Auto-merging drivers/mmc/host/cqhci.c
> [detached HEAD dd4085252f0d] mmc: cqhci: Fix checking of CQHCI_HALT state
> Author: Seunghwan Baek <sh8267.baek@samsung.com>
> Date: Thu Aug 29 15:18:22 2024 +0900
> 1 file changed, 1 insertion(+), 1 deletion(-)
Note, we don't use git to apply backports like this, but I used it to
create the "raw" diff now, thanks!
greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-09-10 7:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-08 11:28 FAILED: patch "[PATCH] mmc: cqhci: Fix checking of CQHCI_HALT state" failed to apply to 5.10-stable tree gregkh
2024-09-09 5:15 ` Adrian Hunter
2024-09-10 7:33 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox