On Fri, Apr 05, 2019 at 02:15:21PM +0000, Sasha Levin wrote:
> Hi,
>
> [This is an automated email]
>
> This commit has been processed because it contains a -stable tag.
> The stable tag indicates that it's relevant for the following trees: 4.14.+
>
> The bot has tested the following trees: v5.0.6, v4.19.33, v4.14.110.
>
> v4.19.33: Failed to apply! Possible dependencies:
> Unable to calculate
>
> v4.14.110: Build OK!
>
> How should we proceed with this patch?
I did separate backports for the various stable trees, and annotated them
all accordingly in the subject and the @stable line. I think Greg has
already taken care of them.
Will
From: Tingwei Zhang <tingwei(a)codeaurora.org>
Number of free masters is not set correctly in stm
free path. Fix this by properly adding the number
of output channels before setting them to 0 in
stm_output_disclaim().
Currently it is equivalent to doing nothing since
master->nr_free is incremented by 0.
Fixes: 7bd1d4093c2f ("stm class: Introduce an abstraction for System Trace Module devices")
Signed-off-by: Tingwei Zhang <tingwei(a)codeaurora.org>
Signed-off-by: Sai Prakash Ranjan <saiprakash.ranjan(a)codeaurora.org>
Cc: stable(a)vger.kernel.org
---
drivers/hwtracing/stm/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/hwtracing/stm/core.c b/drivers/hwtracing/stm/core.c
index c7ba8acfd4d5..5b5807cbcf7c 100644
--- a/drivers/hwtracing/stm/core.c
+++ b/drivers/hwtracing/stm/core.c
@@ -218,8 +218,8 @@ stm_output_disclaim(struct stm_device *stm, struct stm_output *output)
bitmap_release_region(&master->chan_map[0], output->channel,
ilog2(output->nr_chans));
- output->nr_chans = 0;
master->nr_free += output->nr_chans;
+ output->nr_chans = 0;
}
/*
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
Now that the nand drivers are responsible for selecting the target
prior to hardware access, a call to marvell_nfc_select_target() is
necessary from marvell_nfc_setup_data_interface().
This is a regression introduced by commit b25251414f6e ("mtd:
rawnand: marvell: Stop implementing ->select_chip()").
Fixes: b25251414f6e ("mtd: rawnand: marvell: Stop implementing ->select_chip()")
Cc: Boris Brezillon <boris.brezillon(a)collabora.com>
Cc: <stable(a)vger.kernel.org>
Signed-off-by: Daniel Mack <daniel(a)zonque.org>
---
drivers/mtd/nand/raw/marvell_nand.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/mtd/nand/raw/marvell_nand.c b/drivers/mtd/nand/raw/marvell_nand.c
index 84283c6bb0ff..93abe5be8995 100644
--- a/drivers/mtd/nand/raw/marvell_nand.c
+++ b/drivers/mtd/nand/raw/marvell_nand.c
@@ -2325,6 +2325,8 @@ static int marvell_nfc_setup_data_interface(struct nand_chip *chip, int chipnr,
struct marvell_nfc_timings nfc_tmg;
int read_delay;
+ marvell_nfc_select_target(chip, chip->cur_cs);
+
sdr = nand_get_sdr_timings(conf);
if (IS_ERR(sdr))
return PTR_ERR(sdr);
--
2.20.1