4.9-stable patches

added patches:
	mtd-cfi_cmdset_0002-move-and-rename-chip_check-chip_ready-chip_good_for_write.patch
	mtd-cfi_cmdset_0002-use-chip_ready-for-write-on-s29gl064n.patch
	pci-qcom-fix-unbalanced-phy-init-on-probe-errors.patch

diff --git a/queue-4.9/mtd-cfi_cmdset_0002-move-and-rename-chip_check-chip_ready-chip_good_for_write.patch b/queue-4.9/mtd-cfi_cmdset_0002-move-and-rename-chip_check-chip_ready-chip_good_for_write.patch
new file mode 100644 (file)
index 0000000..7a85e21
--- /dev/null
+++ b/queue-4.9/mtd-cfi_cmdset_0002-move-and-rename-chip_check-chip_ready-chip_good_for_write.patch
@@ -0,0 +1,234 @@
+From 083084df578a8bdb18334f69e7b32d690aaa3247 Mon Sep 17 00:00:00 2001
+From: Tokunori Ikegami <ikegami.t@gmail.com>
+Date: Thu, 24 Mar 2022 02:04:55 +0900
+Subject: mtd: cfi_cmdset_0002: Move and rename chip_check/chip_ready/chip_good_for_write
+
+From: Tokunori Ikegami <ikegami.t@gmail.com>
+
+commit 083084df578a8bdb18334f69e7b32d690aaa3247 upstream.
+
+This is a preparation patch for the S29GL064N buffer writes fix. There
+is no functional change.
+
+Link: https://lore.kernel.org/r/b687c259-6413-26c9-d4c9-b3afa69ea124@pengutronix.de/
+Fixes: dfeae1073583("mtd: cfi_cmdset_0002: Change write buffer to check correct value")
+Signed-off-by: Tokunori Ikegami <ikegami.t@gmail.com>
+Cc: stable@vger.kernel.org
+Acked-by: Vignesh Raghavendra <vigneshr@ti.com>
+Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
+Link: https://lore.kernel.org/linux-mtd/20220323170458.5608-2-ikegami.t@gmail.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/mtd/chips/cfi_cmdset_0002.c |   77 ++++++++++++++----------------------
+ 1 file changed, 32 insertions(+), 45 deletions(-)
+
+--- a/drivers/mtd/chips/cfi_cmdset_0002.c
++++ b/drivers/mtd/chips/cfi_cmdset_0002.c
+@@ -726,50 +726,34 @@ static struct mtd_info *cfi_amdstd_setup
+ }
+ 
+ /*
+- * Return true if the chip is ready.
++ * Return true if the chip is ready and has the correct value.
+  *
+  * Ready is one of: read mode, query mode, erase-suspend-read mode (in any
+  * non-suspended sector) and is indicated by no toggle bits toggling.
+  *
++ * Error are indicated by toggling bits or bits held with the wrong value,
++ * or with bits toggling.
++ *
+  * Note that anything more complicated than checking if no bits are toggling
+  * (including checking DQ5 for an error status) is tricky to get working
+  * correctly and is therefore not done        (particularly with interleaved chips
+  * as each chip must be checked independently of the others).
+  */
+-static int __xipram chip_ready(struct map_info *map, unsigned long addr)
++static int __xipram chip_ready(struct map_info *map, unsigned long addr,
++                             map_word *expected)
+ {
+       map_word d, t;
++      int ret;
+ 
+       d = map_read(map, addr);
+       t = map_read(map, addr);
+ 
+-      return map_word_equal(map, d, t);
+-}
++      ret = map_word_equal(map, d, t);
+ 
+-/*
+- * Return true if the chip is ready and has the correct value.
+- *
+- * Ready is one of: read mode, query mode, erase-suspend-read mode (in any
+- * non-suspended sector) and it is indicated by no bits toggling.
+- *
+- * Error are indicated by toggling bits or bits held with the wrong value,
+- * or with bits toggling.
+- *
+- * Note that anything more complicated than checking if no bits are toggling
+- * (including checking DQ5 for an error status) is tricky to get working
+- * correctly and is therefore not done        (particularly with interleaved chips
+- * as each chip must be checked independently of the others).
+- *
+- */
+-static int __xipram chip_good(struct map_info *map, unsigned long addr, map_word expected)
+-{
+-      map_word oldd, curd;
+-
+-      oldd = map_read(map, addr);
+-      curd = map_read(map, addr);
++      if (!ret || !expected)
++              return ret;
+ 
+-      return  map_word_equal(map, oldd, curd) &&
+-              map_word_equal(map, curd, expected);
++      return map_word_equal(map, t, *expected);
+ }
+ 
+ static int get_chip(struct map_info *map, struct flchip *chip, unsigned long adr, int mode)
+@@ -786,7 +770,7 @@ static int get_chip(struct map_info *map
+ 
+       case FL_STATUS:
+               for (;;) {
+-                      if (chip_ready(map, adr))
++                      if (chip_ready(map, adr, NULL))
+                               break;
+ 
+                       if (time_after(jiffies, timeo)) {
+@@ -824,7 +808,7 @@ static int get_chip(struct map_info *map
+               chip->state = FL_ERASE_SUSPENDING;
+               chip->erase_suspended = 1;
+               for (;;) {
+-                      if (chip_ready(map, adr))
++                      if (chip_ready(map, adr, NULL))
+                               break;
+ 
+                       if (time_after(jiffies, timeo)) {
+@@ -1357,7 +1341,7 @@ static int do_otp_lock(struct map_info *
+       /* wait for chip to become ready */
+       timeo = jiffies + msecs_to_jiffies(2);
+       for (;;) {
+-              if (chip_ready(map, adr))
++              if (chip_ready(map, adr, NULL))
+                       break;
+ 
+               if (time_after(jiffies, timeo)) {
+@@ -1624,10 +1608,11 @@ static int __xipram do_write_oneword(str
+               }
+ 
+               /*
+-               * We check "time_after" and "!chip_good" before checking
+-               * "chip_good" to avoid the failure due to scheduling.
++               * We check "time_after" and "!chip_ready" before checking
++               * "chip_ready" to avoid the failure due to scheduling.
+                */
+-              if (time_after(jiffies, timeo) && !chip_good(map, adr, datum)) {
++              if (time_after(jiffies, timeo) &&
++                  !chip_ready(map, adr, &datum)) {
+                       xip_enable(map, chip, adr);
+                       printk(KERN_WARNING "MTD %s(): software timeout\n", __func__);
+                       xip_disable(map, chip, adr);
+@@ -1635,7 +1620,7 @@ static int __xipram do_write_oneword(str
+                       break;
+               }
+ 
+-              if (chip_good(map, adr, datum))
++              if (chip_ready(map, adr, &datum))
+                       break;
+ 
+               /* Latency issues. Drop the lock, wait a while and retry */
+@@ -1879,13 +1864,13 @@ static int __xipram do_write_buffer(stru
+               }
+ 
+               /*
+-               * We check "time_after" and "!chip_good" before checking "chip_good" to avoid
+-               * the failure due to scheduling.
++               * We check "time_after" and "!chip_ready" before checking
++               * "chip_ready" to avoid the failure due to scheduling.
+                */
+-              if (time_after(jiffies, timeo) && !chip_good(map, adr, datum))
++              if (time_after(jiffies, timeo) && !chip_ready(map, adr, &datum))
+                       break;
+ 
+-              if (chip_good(map, adr, datum)) {
++              if (chip_ready(map, adr, &datum)) {
+                       xip_enable(map, chip, adr);
+                       goto op_done;
+               }
+@@ -2019,7 +2004,7 @@ static int cfi_amdstd_panic_wait(struct
+        * If the driver thinks the chip is idle, and no toggle bits
+        * are changing, then the chip is actually idle for sure.
+        */
+-      if (chip->state == FL_READY && chip_ready(map, adr))
++      if (chip->state == FL_READY && chip_ready(map, adr, NULL))
+               return 0;
+ 
+       /*
+@@ -2036,7 +2021,7 @@ static int cfi_amdstd_panic_wait(struct
+ 
+               /* wait for the chip to become ready */
+               for (i = 0; i < jiffies_to_usecs(timeo); i++) {
+-                      if (chip_ready(map, adr))
++                      if (chip_ready(map, adr, NULL))
+                               return 0;
+ 
+                       udelay(1);
+@@ -2100,13 +2085,13 @@ retry:
+       map_write(map, datum, adr);
+ 
+       for (i = 0; i < jiffies_to_usecs(uWriteTimeout); i++) {
+-              if (chip_ready(map, adr))
++              if (chip_ready(map, adr, NULL))
+                       break;
+ 
+               udelay(1);
+       }
+ 
+-      if (!chip_good(map, adr, datum)) {
++      if (!chip_ready(map, adr, &datum)) {
+               /* reset on all failures. */
+               map_write(map, CMD(0xF0), chip->start);
+               /* FIXME - should have reset delay before continuing */
+@@ -2247,6 +2232,7 @@ static int __xipram do_erase_chip(struct
+       DECLARE_WAITQUEUE(wait, current);
+       int ret = 0;
+       int retry_cnt = 0;
++      map_word datum = map_word_ff(map);
+ 
+       adr = cfi->addr_unlock1;
+ 
+@@ -2301,7 +2287,7 @@ static int __xipram do_erase_chip(struct
+                       chip->erase_suspended = 0;
+               }
+ 
+-              if (chip_good(map, adr, map_word_ff(map)))
++              if (chip_ready(map, adr, &datum))
+                       break;
+ 
+               if (time_after(jiffies, timeo)) {
+@@ -2343,6 +2329,7 @@ static int __xipram do_erase_oneblock(st
+       DECLARE_WAITQUEUE(wait, current);
+       int ret = 0;
+       int retry_cnt = 0;
++      map_word datum = map_word_ff(map);
+ 
+       adr += chip->start;
+ 
+@@ -2397,7 +2384,7 @@ static int __xipram do_erase_oneblock(st
+                       chip->erase_suspended = 0;
+               }
+ 
+-              if (chip_good(map, adr, map_word_ff(map))) {
++              if (chip_ready(map, adr, &datum)) {
+                       xip_enable(map, chip, adr);
+                       break;
+               }
+@@ -2612,7 +2599,7 @@ static int __maybe_unused do_ppb_xxlock(
+        */
+       timeo = jiffies + msecs_to_jiffies(2000);       /* 2s max (un)locking */
+       for (;;) {
+-              if (chip_ready(map, adr))
++              if (chip_ready(map, adr, NULL))
+                       break;
+ 
+               if (time_after(jiffies, timeo)) {

diff --git a/queue-4.9/mtd-cfi_cmdset_0002-use-chip_ready-for-write-on-s29gl064n.patch b/queue-4.9/mtd-cfi_cmdset_0002-use-chip_ready-for-write-on-s29gl064n.patch
new file mode 100644 (file)
index 0000000..eeafdcf
--- /dev/null
+++ b/queue-4.9/mtd-cfi_cmdset_0002-use-chip_ready-for-write-on-s29gl064n.patch
@@ -0,0 +1,138 @@
+From 0a8e98305f63deaf0a799d5cf5532cc83af035d1 Mon Sep 17 00:00:00 2001
+From: Tokunori Ikegami <ikegami.t@gmail.com>
+Date: Thu, 24 Mar 2022 02:04:56 +0900
+Subject: mtd: cfi_cmdset_0002: Use chip_ready() for write on S29GL064N
+
+From: Tokunori Ikegami <ikegami.t@gmail.com>
+
+commit 0a8e98305f63deaf0a799d5cf5532cc83af035d1 upstream.
+
+Since commit dfeae1073583("mtd: cfi_cmdset_0002: Change write buffer to
+check correct value") buffered writes fail on S29GL064N. This is
+because, on S29GL064N, reads return 0xFF at the end of DQ polling for
+write completion, where as, chip_good() check expects actual data
+written to the last location to be returned post DQ polling completion.
+Fix is to revert to using chip_good() for S29GL064N which only checks
+for DQ lines to settle down to determine write completion.
+
+Link: https://lore.kernel.org/r/b687c259-6413-26c9-d4c9-b3afa69ea124@pengutronix.de/
+Fixes: dfeae1073583("mtd: cfi_cmdset_0002: Change write buffer to check correct value")
+Cc: stable@vger.kernel.org
+Signed-off-by: Tokunori Ikegami <ikegami.t@gmail.com>
+Acked-by: Vignesh Raghavendra <vigneshr@ti.com>
+Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
+Link: https://lore.kernel.org/linux-mtd/20220323170458.5608-3-ikegami.t@gmail.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/mtd/chips/cfi_cmdset_0002.c |   42 +++++++++++++++++++++++++++++-------
+ include/linux/mtd/cfi.h             |    1 
+ 2 files changed, 35 insertions(+), 8 deletions(-)
+
+--- a/drivers/mtd/chips/cfi_cmdset_0002.c
++++ b/drivers/mtd/chips/cfi_cmdset_0002.c
+@@ -49,6 +49,10 @@
+ #define SST49LF008A           0x005a
+ #define AT49BV6416            0x00d6
+ 
++enum cfi_quirks {
++      CFI_QUIRK_DQ_TRUE_DATA = BIT(0),
++};
++
+ static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
+ static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
+ static int cfi_amdstd_write_buffers(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
+@@ -361,6 +365,15 @@ static void fixup_s29ns512p_sectors(stru
+       pr_warning("%s: Bad S29NS512P CFI data; adjust to 512 sectors\n", mtd->name);
+ }
+ 
++static void fixup_quirks(struct mtd_info *mtd)
++{
++      struct map_info *map = mtd->priv;
++      struct cfi_private *cfi = map->fldrv_priv;
++
++      if (cfi->mfr == CFI_MFR_AMD && cfi->id == 0x0c01)
++              cfi->quirks |= CFI_QUIRK_DQ_TRUE_DATA;
++}
++
+ /* Used to fix CFI-Tables of chips without Extended Query Tables */
+ static struct cfi_fixup cfi_nopri_fixup_table[] = {
+       { CFI_MFR_SST, 0x234a, fixup_sst39vf }, /* SST39VF1602 */
+@@ -399,6 +412,7 @@ static struct cfi_fixup cfi_fixup_table[
+ #if !FORCE_WORD_WRITE
+       { CFI_MFR_ANY, CFI_ID_ANY, fixup_use_write_buffers },
+ #endif
++      { CFI_MFR_ANY, CFI_ID_ANY, fixup_quirks },
+       { 0, 0, NULL }
+ };
+ static struct cfi_fixup jedec_fixup_table[] = {
+@@ -756,6 +770,18 @@ static int __xipram chip_ready(struct ma
+       return map_word_equal(map, t, *expected);
+ }
+ 
++static int __xipram chip_good(struct map_info *map, unsigned long addr,
++                            map_word *expected)
++{
++      struct cfi_private *cfi = map->fldrv_priv;
++      map_word *datum = expected;
++
++      if (cfi->quirks & CFI_QUIRK_DQ_TRUE_DATA)
++              datum = NULL;
++
++      return chip_ready(map, addr, datum);
++}
++
+ static int get_chip(struct map_info *map, struct flchip *chip, unsigned long adr, int mode)
+ {
+       DECLARE_WAITQUEUE(wait, current);
+@@ -1608,11 +1634,11 @@ static int __xipram do_write_oneword(str
+               }
+ 
+               /*
+-               * We check "time_after" and "!chip_ready" before checking
+-               * "chip_ready" to avoid the failure due to scheduling.
++               * We check "time_after" and "!chip_good" before checking
++               * "chip_good" to avoid the failure due to scheduling.
+                */
+               if (time_after(jiffies, timeo) &&
+-                  !chip_ready(map, adr, &datum)) {
++                  !chip_good(map, adr, &datum)) {
+                       xip_enable(map, chip, adr);
+                       printk(KERN_WARNING "MTD %s(): software timeout\n", __func__);
+                       xip_disable(map, chip, adr);
+@@ -1620,7 +1646,7 @@ static int __xipram do_write_oneword(str
+                       break;
+               }
+ 
+-              if (chip_ready(map, adr, &datum))
++              if (chip_good(map, adr, &datum))
+                       break;
+ 
+               /* Latency issues. Drop the lock, wait a while and retry */
+@@ -1864,13 +1890,13 @@ static int __xipram do_write_buffer(stru
+               }
+ 
+               /*
+-               * We check "time_after" and "!chip_ready" before checking
+-               * "chip_ready" to avoid the failure due to scheduling.
++               * We check "time_after" and "!chip_good" before checking
++               * "chip_good" to avoid the failure due to scheduling.
+                */
+-              if (time_after(jiffies, timeo) && !chip_ready(map, adr, &datum))
++              if (time_after(jiffies, timeo) && !chip_good(map, adr, &datum))
+                       break;
+ 
+-              if (chip_ready(map, adr, &datum)) {
++              if (chip_good(map, adr, &datum)) {
+                       xip_enable(map, chip, adr);
+                       goto op_done;
+               }
+--- a/include/linux/mtd/cfi.h
++++ b/include/linux/mtd/cfi.h
+@@ -293,6 +293,7 @@ struct cfi_private {
+       map_word sector_erase_cmd;
+       unsigned long chipshift; /* Because they're of the same type */
+       const char *im_name;     /* inter_module name for cmdset_setup */
++      unsigned long quirks;
+       struct flchip chips[0];  /* per-chip data structure for each chip */
+ };
+ 

diff --git a/queue-4.9/pci-qcom-fix-unbalanced-phy-init-on-probe-errors.patch b/queue-4.9/pci-qcom-fix-unbalanced-phy-init-on-probe-errors.patch
new file mode 100644 (file)
index 0000000..ce4961f
--- /dev/null
+++ b/queue-4.9/pci-qcom-fix-unbalanced-phy-init-on-probe-errors.patch
@@ -0,0 +1,44 @@
+From 83013631f0f9961416abd812e228c8efbc2f6069 Mon Sep 17 00:00:00 2001
+From: Johan Hovold <johan+linaro@kernel.org>
+Date: Fri, 1 Apr 2022 15:38:54 +0200
+Subject: PCI: qcom: Fix unbalanced PHY init on probe errors
+
+From: Johan Hovold <johan+linaro@kernel.org>
+
+commit 83013631f0f9961416abd812e228c8efbc2f6069 upstream.
+
+Undo the PHY initialisation (e.g. balance runtime PM) if host
+initialisation fails during probe.
+
+Link: https://lore.kernel.org/r/20220401133854.10421-3-johan+linaro@kernel.org
+Fixes: 82a823833f4e ("PCI: qcom: Add Qualcomm PCIe controller driver")
+Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
+Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
+Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
+Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+Acked-by: Stanimir Varbanov <svarbanov@mm-sol.com>
+Cc: stable@vger.kernel.org      # 4.5
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/pci/host/pcie-qcom.c |    7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+--- a/drivers/pci/host/pcie-qcom.c
++++ b/drivers/pci/host/pcie-qcom.c
+@@ -562,10 +562,15 @@ static int qcom_pcie_probe(struct platfo
+       ret = dw_pcie_host_init(pp);
+       if (ret) {
+               dev_err(dev, "cannot initialize host\n");
+-              return ret;
++              goto err_phy_exit;
+       }
+ 
+       return 0;
++
++err_phy_exit:
++      phy_exit(pcie->phy);
++
++      return ret;
+ }
+ 
+ static const struct of_device_id qcom_pcie_match[] = {

diff --git a/queue-4.9/series b/queue-4.9/series
index f2de838fb27c1703d1bde920fa48323b1e7b0d7f..b55e69a807ed09de8d18d1e717977bc00c3cb149 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -163,3 +163,6 @@ nfc-st21nfca-fix-incorrect-validating-logic-in-evt_transaction.patch
 nfc-st21nfca-fix-memory-leaks-in-evt_transaction-handling.patch
 input-bcm5974-set-missing-urb_no_transfer_dma_map-urb-flag.patch
 powerpc-32-fix-overread-overwrite-of-thread_struct-via-ptrace.patch
+mtd-cfi_cmdset_0002-move-and-rename-chip_check-chip_ready-chip_good_for_write.patch
+mtd-cfi_cmdset_0002-use-chip_ready-for-write-on-s29gl064n.patch
+pci-qcom-fix-unbalanced-phy-init-on-probe-errors.patch