diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-09-11 15:35:15 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-09-11 15:35:15 -0400 |
| commit | 76e3c42679812eb3ed7fe22b027050583a8cb7c0 (patch) | |
| tree | d2ed9377d48ba4e53535204a070dcbf23a2f6268 | |
| parent | 9e2e3313678785871e9c9b03810b63a89e6ebf22 (diff) | |
| download | longterm-queue-4.18-76e3c42679812eb3ed7fe22b027050583a8cb7c0.tar.gz | |
mtd: drop patch for 4.19+
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/mtd-spinand-macronix-Fix-ECC-Status-Read.patch | 43 | ||||
| -rw-r--r-- | queue/series | 1 |
2 files changed, 0 insertions, 44 deletions
diff --git a/queue/mtd-spinand-macronix-Fix-ECC-Status-Read.patch b/queue/mtd-spinand-macronix-Fix-ECC-Status-Read.patch deleted file mode 100644 index 9a394d0..0000000 --- a/queue/mtd-spinand-macronix-Fix-ECC-Status-Read.patch +++ /dev/null @@ -1,43 +0,0 @@ -From f4cb4d7b46f6409382fd981eec9556e1f3c1dc5d Mon Sep 17 00:00:00 2001 -From: Emil Lenngren <emil.lenngren@gmail.com> -Date: Thu, 20 Dec 2018 13:46:58 +0100 -Subject: [PATCH] mtd: spinand: macronix: Fix ECC Status Read - -commit f4cb4d7b46f6409382fd981eec9556e1f3c1dc5d upstream. - -The datasheet specifies the upper four bits are reserved. -Testing on real hardware shows that these bits can indeed be nonzero. - -Signed-off-by: Emil Lenngren <emil.lenngren@gmail.com> -Reviewed-by: Boris Brezillon <boris.brezillon@bootlin.com> -Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> - -diff --git a/drivers/mtd/nand/spi/macronix.c b/drivers/mtd/nand/spi/macronix.c -index 98f6b9c4b684..d16b57081c95 100644 ---- a/drivers/mtd/nand/spi/macronix.c -+++ b/drivers/mtd/nand/spi/macronix.c -@@ -10,6 +10,7 @@ - #include <linux/mtd/spinand.h> - - #define SPINAND_MFR_MACRONIX 0xC2 -+#define MACRONIX_ECCSR_MASK 0x0F - - static SPINAND_OP_VARIANTS(read_cache_variants, - SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0), -@@ -55,7 +56,12 @@ static int mx35lf1ge4ab_get_eccsr(struct spinand_device *spinand, u8 *eccsr) - SPI_MEM_OP_DUMMY(1, 1), - SPI_MEM_OP_DATA_IN(1, eccsr, 1)); - -- return spi_mem_exec_op(spinand->spimem, &op); -+ int ret = spi_mem_exec_op(spinand->spimem, &op); -+ if (ret) -+ return ret; -+ -+ *eccsr &= MACRONIX_ECCSR_MASK; -+ return 0; - } - - static int mx35lf1ge4ab_ecc_get_status(struct spinand_device *spinand, --- -2.9.5 - diff --git a/queue/series b/queue/series index 3b8cdef..5cebfaf 100644 --- a/queue/series +++ b/queue/series @@ -96,7 +96,6 @@ pktgen-do-not-sleep-with-the-thread-lock-held.patch Revert-fib_rules-return-0-directly-if-an-exactly-sam.patch ipv6-use-READ_ONCE-for-inet-hdrincl-as-in-ipv4.patch ipv6-fix-EFAULT-on-sendto-with-icmpv6-and-hdrincl.patch -mtd-spinand-macronix-Fix-ECC-Status-Read.patch rcu-locking-and-unlocking-need-to-always-be-at-least.patch parisc-Use-implicit-space-register-selection-for-loa.patch NFSv4.1-Again-fix-a-race-where-CB_NOTIFY_LOCK-fails-.patch |