FAILED: patch "[PATCH] mmc: sdhci-sprd: add get_ro hook function" failed to apply to 5.2-stable tree

FAILED: patch "[PATCH] mmc: sdhci-sprd: add get_ro hook function" failed to apply to 5.2-stable tree

[gregkh]

The patch below does not apply to the 5.2-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>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 4eae8cbdff942a423926486be4e781a77d619966 Mon Sep 17 00:00:00 2001
From: Chunyan Zhang <chunyan.zhang@unisoc.com>
Date: Wed, 28 Aug 2019 10:17:33 +0800
Subject: [PATCH] mmc: sdhci-sprd: add get_ro hook function

sprd's sd host controller doesn't support write protect to sd card.

Fixes: fb8bd90f83c4 ("mmc: sdhci-sprd: Add Spreadtrum's initial host controller")
Signed-off-by: Chunyan Zhang <chunyan.zhang@unisoc.com>
Signed-off-by: Chunyan Zhang <zhang.lyra@gmail.com>
Reviewed-by: Baolin Wang <baolin.wang@linaro.org>
Tested-by: Baolin Wang <baolin.wang@linaro.org>
Cc: stable@vger.kernel.org
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/sdhci-sprd.c b/drivers/mmc/host/sdhci-sprd.c
index 25f2fc4ce08f..ddc048e72385 100644
--- a/drivers/mmc/host/sdhci-sprd.c
+++ b/drivers/mmc/host/sdhci-sprd.c
@@ -374,6 +374,11 @@ static unsigned int sdhci_sprd_get_max_timeout_count(struct sdhci_host *host)
 	return 1 << 31;
 }
 
+static unsigned int sdhci_sprd_get_ro(struct sdhci_host *host)
+{
+	return 0;
+}
+
 static struct sdhci_ops sdhci_sprd_ops = {
 	.read_l = sdhci_sprd_readl,
 	.write_l = sdhci_sprd_writel,
@@ -386,6 +391,7 @@ static struct sdhci_ops sdhci_sprd_ops = {
 	.set_uhs_signaling = sdhci_sprd_set_uhs_signaling,
 	.hw_reset = sdhci_sprd_hw_reset,
 	.get_max_timeout_count = sdhci_sprd_get_max_timeout_count,
+	.get_ro = sdhci_sprd_get_ro,
 };
 
 static void sdhci_sprd_request(struct mmc_host *mmc, struct mmc_request *mrq)

Re: FAILED: patch "[PATCH] mmc: sdhci-sprd: add get_ro hook function" failed to apply to 5.2-stable tree

[Sasha Levin]

On Tue, Sep 03, 2019 at 08:53:50PM +0200, gregkh@linuxfoundation.org wrote:
>
>The patch below does not apply to the 5.2-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>.

I've fixed it up for 5.2, it's not needed on older kernels. Contextual
conflict due to missing 7486831d7d6ae (mmc: sdhci-sprd: Implement the
get_max_timeout_count() interface), I just took 7486831d7d6ae as well.

--
Thanks,
Sasha

Re: FAILED: patch "[PATCH] mmc: sdhci-sprd: add get_ro hook function" failed to apply to 5.2-stable tree

[Chunyan Zhang]

On Wed, 4 Sep 2019 at 04:44, Sasha Levin <sashal@kernel.org> wrote:
>
> On Tue, Sep 03, 2019 at 08:53:50PM +0200, gregkh@linuxfoundation.org wrote:
> >
> >The patch below does not apply to the 5.2-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>.
>
> I've fixed it up for 5.2, it's not needed on older kernels. Contextual
> conflict due to missing 7486831d7d6ae (mmc: sdhci-sprd: Implement the
> get_max_timeout_count() interface), I just took 7486831d7d6ae as well.

Many thanks!

Chunyan

>
> --
> Thanks,
> Sasha