[OpenWrt-Devel] mtd/cfi-flash - 18.06.1 does not work on WZR-HP_G300NH due to removed patch

[FabioB]

Hi,

I discovered the following problem on WZR-HP-G300NH router except A0D0 hw
version:
https://forum.openwrt.org/t/impossible-to-install-update-any-packages-on-wzr-hp-g300nh-18-06-1

I found problem is related to removed
ar71xx/patches-4.9/403-mtd_fix_cfi_cmdset_0002_status_check_new.patch
and applying again it works.

Anyway I had errors applying patch so I handcrafted new one:
"
From: Fabio Bettoni <fbettoni at gmail.com>
Subject: Revert chipgood()
---
 drivers/mtd/chips/cfi_cmdset_0002.c |    1 +
 1 file changed, 1 insertion(+)
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -1635,8 +1635,8 @@
  break;
  }

- if (chip_ready(map, adr))
- break;
+ if (chip_good(map, adr, datum))
+ goto enable_xip;

  /* Latency issues. Drop the lock, wait a while and retry */
  UDELAY(map, chip, adr, 1);
@@ -1652,6 +1652,8 @@

  ret = -EIO;
  }
+
+ enable_xip:
  xip_enable(map, chip, adr);
  op_done:
  if (mode == FL_OTP_WRITE)
@@ -2299,7 +2301,7 @@
  }

  if (chip_good(map, adr, map_word_ff(map)))
- break;
+ goto op_done;

  if (time_after(jiffies, timeo)) {
  printk(KERN_WARNING "MTD %s(): software timeout\n",
@@ -2323,6 +2325,7 @@
  }
  }

+  op_done:
  chip->state = FL_READY;
  xip_enable(map, chip, adr);
  DISABLE_VPP(map);
@@ -2396,7 +2399,7 @@

  if (chip_good(map, adr, map_word_ff(map))) {
  xip_enable(map, chip, adr);
- break;
+ goto op_done;
  }

  if (time_after(jiffies, timeo)) {
@@ -2422,6 +2425,7 @@
  }
  }

+  op_done:
  chip->state = FL_READY;
  DISABLE_VPP(map);
  put_chip(map, chip, adr);
"

Could you help me to give me more information on this issue ? Me and other
router owner would like to have it working for 18.06.1 and newer releases,
because this model will be good also for ath79 builds.

Fabio
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.infradead.org/pipermail/openwrt-devel/attachments/20181017/1c6936be/attachment.htm>
-------------- next part --------------
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel