drop mtd-nand-pxa3xx-fix-readoob-implementation.patch from 4.4 and 4.9

diff --git a/queue-4.4/mtd-nand-pxa3xx-fix-readoob-implementation.patch b/queue-4.4/mtd-nand-pxa3xx-fix-readoob-implementation.patch
deleted file mode 100644 (file)
index 46c1efc..0000000
--- a/queue-4.4/mtd-nand-pxa3xx-fix-readoob-implementation.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From fee4380f368e84ed216b62ccd2fbc4126f2bf40b Mon Sep 17 00:00:00 2001
-From: Boris Brezillon <boris.brezillon@free-electrons.com>
-Date: Mon, 18 Dec 2017 11:32:45 +0100
-Subject: mtd: nand: pxa3xx: Fix READOOB implementation
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Boris Brezillon <boris.brezillon@free-electrons.com>
-
-commit fee4380f368e84ed216b62ccd2fbc4126f2bf40b upstream.
-
-In the current driver, OOB bytes are accessed in raw mode, and when a
-page access is done with NDCR_SPARE_EN set and NDCR_ECC_EN cleared, the
-driver must read the whole spare area (64 bytes in case of a 2k page,
-16 bytes for a 512 page). The driver was only reading the free OOB
-bytes, which was leaving some unread data in the FIFO and was somehow
-leading to a timeout.
-
-We could patch the driver to read ->spare_size + ->ecc_size instead of
-just ->spare_size when READOOB is requested, but we'd better make
-in-band and OOB accesses consistent.
-Since the driver is always accessing in-band data in non-raw mode (with
-the ECC engine enabled), we should also access OOB data in this mode.
-That's particularly useful when using the BCH engine because in this
-mode the free OOB bytes are also ECC protected.
-
-Fixes: 43bcfd2bb24a ("mtd: nand: pxa3xx: Add driver-specific ECC BCH support")
-Reported-by: Sean Nyekjær <sean.nyekjaer@prevas.dk>
-Tested-by: Willy Tarreau <w@1wt.eu>
-Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
-Acked-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
-Tested-by: Sean Nyekjaer <sean.nyekjaer@prevas.dk>
-Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
-Signed-off-by: Richard Weinberger <richard@nod.at>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/mtd/nand/pxa3xx_nand.c |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/mtd/nand/pxa3xx_nand.c
-+++ b/drivers/mtd/nand/pxa3xx_nand.c
-@@ -912,6 +912,7 @@ static void prepare_start_command(struct
- 
-       switch (command) {
-       case NAND_CMD_READ0:
-+      case NAND_CMD_READOOB:
-       case NAND_CMD_PAGEPROG:
-               info->use_ecc = 1;
-       case NAND_CMD_READOOB:

diff --git a/queue-4.4/series b/queue-4.4/series
index 333e819fcc03ed66b8146e1ec8ab0dc9fbac205c..28d7f0ca401ffe367488d1714b328a4561adf85e 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -13,7 +13,6 @@ arc-uaccess-dont-use-l-gcc-inline-asm-constraint-modifier.patch
 input-elantech-add-new-icbody-type-15.patch
 x86-microcode-amd-add-support-for-fam17h-microcode-loading.patch
 parisc-fix-alignment-of-pa_tlb_lock-in-assembly-on-32-bit-smp-kernel.patch
-mtd-nand-pxa3xx-fix-readoob-implementation.patch
 x86-tlb-drop-the-_gpl-from-the-cpu_tlbstate-export.patch
 genksyms-handle-string-literals-with-spaces-in-reference-files.patch
 module-keep-percpu-symbols-in-module-s-symtab.patch

diff --git a/queue-4.9/mtd-nand-pxa3xx-fix-readoob-implementation.patch b/queue-4.9/mtd-nand-pxa3xx-fix-readoob-implementation.patch
deleted file mode 100644 (file)
index 88783f8..0000000
--- a/queue-4.9/mtd-nand-pxa3xx-fix-readoob-implementation.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From fee4380f368e84ed216b62ccd2fbc4126f2bf40b Mon Sep 17 00:00:00 2001
-From: Boris Brezillon <boris.brezillon@free-electrons.com>
-Date: Mon, 18 Dec 2017 11:32:45 +0100
-Subject: mtd: nand: pxa3xx: Fix READOOB implementation
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Boris Brezillon <boris.brezillon@free-electrons.com>
-
-commit fee4380f368e84ed216b62ccd2fbc4126f2bf40b upstream.
-
-In the current driver, OOB bytes are accessed in raw mode, and when a
-page access is done with NDCR_SPARE_EN set and NDCR_ECC_EN cleared, the
-driver must read the whole spare area (64 bytes in case of a 2k page,
-16 bytes for a 512 page). The driver was only reading the free OOB
-bytes, which was leaving some unread data in the FIFO and was somehow
-leading to a timeout.
-
-We could patch the driver to read ->spare_size + ->ecc_size instead of
-just ->spare_size when READOOB is requested, but we'd better make
-in-band and OOB accesses consistent.
-Since the driver is always accessing in-band data in non-raw mode (with
-the ECC engine enabled), we should also access OOB data in this mode.
-That's particularly useful when using the BCH engine because in this
-mode the free OOB bytes are also ECC protected.
-
-Fixes: 43bcfd2bb24a ("mtd: nand: pxa3xx: Add driver-specific ECC BCH support")
-Reported-by: Sean Nyekjær <sean.nyekjaer@prevas.dk>
-Tested-by: Willy Tarreau <w@1wt.eu>
-Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
-Acked-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
-Tested-by: Sean Nyekjaer <sean.nyekjaer@prevas.dk>
-Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
-Signed-off-by: Richard Weinberger <richard@nod.at>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/mtd/nand/pxa3xx_nand.c |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/mtd/nand/pxa3xx_nand.c
-+++ b/drivers/mtd/nand/pxa3xx_nand.c
-@@ -950,6 +950,7 @@ static void prepare_start_command(struct
- 
-       switch (command) {
-       case NAND_CMD_READ0:
-+      case NAND_CMD_READOOB:
-       case NAND_CMD_PAGEPROG:
-               info->use_ecc = 1;
-               break;

diff --git a/queue-4.9/series b/queue-4.9/series
index a6219a5ba4d12d56c3947685e2034254261c5d54..f3dadf99330ad2175620bad56bd1ac35ea24fd91 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -16,6 +16,5 @@ input-elantech-add-new-icbody-type-15.patch
 x86-microcode-amd-add-support-for-fam17h-microcode-loading.patch
 parisc-fix-alignment-of-pa_tlb_lock-in-assembly-on-32-bit-smp-kernel.patch
 parisc-qemu-idle-sleep-support.patch
-mtd-nand-pxa3xx-fix-readoob-implementation.patch
 x86-tlb-drop-the-_gpl-from-the-cpu_tlbstate-export.patch
 map-the-vsyscall-page-with-_page_user.patch