mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 14:13:16 +00:00
7dd2d7289a
Refreshed all patches. Remove upstreamed: - 551-loop-Better-discard-support-for-block-devices.patch Fixed: - CVE-2020-11884 - CVE-2020-12114 - CVE-2019-3016 - CVE-2020-11669 Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
197 lines
5.8 KiB
Diff
197 lines
5.8 KiB
Diff
From c93c613214ac70c87beab5422a60077bf126b855 Mon Sep 17 00:00:00 2001
|
|
From: Chuanhong Guo <gch981213@gmail.com>
|
|
Date: Wed, 28 Nov 2018 21:07:25 +0800
|
|
Subject: [PATCH 3/8] mtd: spinand: add support for GigaDevice GD5FxGQ4xA
|
|
|
|
Add support for GigaDevice GD5F1G/2G/4GQ4xA SPI NAND.
|
|
|
|
Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
|
|
Reviewed-by: Frieder Schrempf <frieder.schrempf@kontron.de>
|
|
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
|
|
---
|
|
drivers/mtd/nand/spi/Makefile | 2 +-
|
|
drivers/mtd/nand/spi/core.c | 1 +
|
|
drivers/mtd/nand/spi/gigadevice.c | 148 ++++++++++++++++++++++++++++++
|
|
include/linux/mtd/spinand.h | 1 +
|
|
4 files changed, 151 insertions(+), 1 deletion(-)
|
|
create mode 100644 drivers/mtd/nand/spi/gigadevice.c
|
|
|
|
--- a/drivers/mtd/nand/spi/Makefile
|
|
+++ b/drivers/mtd/nand/spi/Makefile
|
|
@@ -1,3 +1,3 @@
|
|
# SPDX-License-Identifier: GPL-2.0
|
|
-spinand-objs := core.o macronix.o micron.o toshiba.o winbond.o
|
|
+spinand-objs := core.o gigadevice.o macronix.o micron.o toshiba.o winbond.o
|
|
obj-$(CONFIG_MTD_SPI_NAND) += spinand.o
|
|
--- a/drivers/mtd/nand/spi/core.c
|
|
+++ b/drivers/mtd/nand/spi/core.c
|
|
@@ -760,6 +760,7 @@ static const struct nand_ops spinand_ops
|
|
};
|
|
|
|
static const struct spinand_manufacturer *spinand_manufacturers[] = {
|
|
+ &gigadevice_spinand_manufacturer,
|
|
¯onix_spinand_manufacturer,
|
|
µn_spinand_manufacturer,
|
|
&toshiba_spinand_manufacturer,
|
|
--- /dev/null
|
|
+++ b/drivers/mtd/nand/spi/gigadevice.c
|
|
@@ -0,0 +1,148 @@
|
|
+// SPDX-License-Identifier: GPL-2.0
|
|
+/*
|
|
+ * Author:
|
|
+ * Chuanhong Guo <gch981213@gmail.com>
|
|
+ */
|
|
+
|
|
+#include <linux/device.h>
|
|
+#include <linux/kernel.h>
|
|
+#include <linux/mtd/spinand.h>
|
|
+
|
|
+#define SPINAND_MFR_GIGADEVICE 0xC8
|
|
+#define GD5FXGQ4XA_STATUS_ECC_1_7_BITFLIPS (1 << 4)
|
|
+#define GD5FXGQ4XA_STATUS_ECC_8_BITFLIPS (3 << 4)
|
|
+
|
|
+static SPINAND_OP_VARIANTS(read_cache_variants,
|
|
+ SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 2, NULL, 0),
|
|
+ SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
|
|
+ SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
|
|
+ SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
|
|
+ SPINAND_PAGE_READ_FROM_CACHE_OP(true, 0, 1, NULL, 0),
|
|
+ SPINAND_PAGE_READ_FROM_CACHE_OP(false, 0, 1, NULL, 0));
|
|
+
|
|
+static SPINAND_OP_VARIANTS(write_cache_variants,
|
|
+ SPINAND_PROG_LOAD_X4(true, 0, NULL, 0),
|
|
+ SPINAND_PROG_LOAD(true, 0, NULL, 0));
|
|
+
|
|
+static SPINAND_OP_VARIANTS(update_cache_variants,
|
|
+ SPINAND_PROG_LOAD_X4(false, 0, NULL, 0),
|
|
+ SPINAND_PROG_LOAD(false, 0, NULL, 0));
|
|
+
|
|
+static int gd5fxgq4xa_ooblayout_ecc(struct mtd_info *mtd, int section,
|
|
+ struct mtd_oob_region *region)
|
|
+{
|
|
+ if (section > 3)
|
|
+ return -ERANGE;
|
|
+
|
|
+ region->offset = (16 * section) + 8;
|
|
+ region->length = 8;
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static int gd5fxgq4xa_ooblayout_free(struct mtd_info *mtd, int section,
|
|
+ struct mtd_oob_region *region)
|
|
+{
|
|
+ if (section > 3)
|
|
+ return -ERANGE;
|
|
+
|
|
+ if (section) {
|
|
+ region->offset = 16 * section;
|
|
+ region->length = 8;
|
|
+ } else {
|
|
+ /* section 0 has one byte reserved for bad block mark */
|
|
+ region->offset = 1;
|
|
+ region->length = 7;
|
|
+ }
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static int gd5fxgq4xa_ecc_get_status(struct spinand_device *spinand,
|
|
+ u8 status)
|
|
+{
|
|
+ switch (status & STATUS_ECC_MASK) {
|
|
+ case STATUS_ECC_NO_BITFLIPS:
|
|
+ return 0;
|
|
+
|
|
+ case GD5FXGQ4XA_STATUS_ECC_1_7_BITFLIPS:
|
|
+ /* 1-7 bits are flipped. return the maximum. */
|
|
+ return 7;
|
|
+
|
|
+ case GD5FXGQ4XA_STATUS_ECC_8_BITFLIPS:
|
|
+ return 8;
|
|
+
|
|
+ case STATUS_ECC_UNCOR_ERROR:
|
|
+ return -EBADMSG;
|
|
+
|
|
+ default:
|
|
+ break;
|
|
+ }
|
|
+
|
|
+ return -EINVAL;
|
|
+}
|
|
+
|
|
+static const struct mtd_ooblayout_ops gd5fxgq4xa_ooblayout = {
|
|
+ .ecc = gd5fxgq4xa_ooblayout_ecc,
|
|
+ .free = gd5fxgq4xa_ooblayout_free,
|
|
+};
|
|
+
|
|
+static const struct spinand_info gigadevice_spinand_table[] = {
|
|
+ SPINAND_INFO("GD5F1GQ4xA", 0xF1,
|
|
+ NAND_MEMORG(1, 2048, 64, 64, 1024, 1, 1, 1),
|
|
+ NAND_ECCREQ(8, 512),
|
|
+ SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
|
|
+ &write_cache_variants,
|
|
+ &update_cache_variants),
|
|
+ 0,
|
|
+ SPINAND_ECCINFO(&gd5fxgq4xa_ooblayout,
|
|
+ gd5fxgq4xa_ecc_get_status)),
|
|
+ SPINAND_INFO("GD5F2GQ4xA", 0xF2,
|
|
+ NAND_MEMORG(1, 2048, 64, 64, 2048, 1, 1, 1),
|
|
+ NAND_ECCREQ(8, 512),
|
|
+ SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
|
|
+ &write_cache_variants,
|
|
+ &update_cache_variants),
|
|
+ 0,
|
|
+ SPINAND_ECCINFO(&gd5fxgq4xa_ooblayout,
|
|
+ gd5fxgq4xa_ecc_get_status)),
|
|
+ SPINAND_INFO("GD5F4GQ4xA", 0xF4,
|
|
+ NAND_MEMORG(1, 2048, 64, 64, 4096, 1, 1, 1),
|
|
+ NAND_ECCREQ(8, 512),
|
|
+ SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
|
|
+ &write_cache_variants,
|
|
+ &update_cache_variants),
|
|
+ 0,
|
|
+ SPINAND_ECCINFO(&gd5fxgq4xa_ooblayout,
|
|
+ gd5fxgq4xa_ecc_get_status)),
|
|
+};
|
|
+
|
|
+static int gigadevice_spinand_detect(struct spinand_device *spinand)
|
|
+{
|
|
+ u8 *id = spinand->id.data;
|
|
+ int ret;
|
|
+
|
|
+ /*
|
|
+ * For GD NANDs, There is an address byte needed to shift in before IDs
|
|
+ * are read out, so the first byte in raw_id is dummy.
|
|
+ */
|
|
+ if (id[1] != SPINAND_MFR_GIGADEVICE)
|
|
+ return 0;
|
|
+
|
|
+ ret = spinand_match_and_init(spinand, gigadevice_spinand_table,
|
|
+ ARRAY_SIZE(gigadevice_spinand_table),
|
|
+ id[2]);
|
|
+ if (ret)
|
|
+ return ret;
|
|
+
|
|
+ return 1;
|
|
+}
|
|
+
|
|
+static const struct spinand_manufacturer_ops gigadevice_spinand_manuf_ops = {
|
|
+ .detect = gigadevice_spinand_detect,
|
|
+};
|
|
+
|
|
+const struct spinand_manufacturer gigadevice_spinand_manufacturer = {
|
|
+ .id = SPINAND_MFR_GIGADEVICE,
|
|
+ .name = "GigaDevice",
|
|
+ .ops = &gigadevice_spinand_manuf_ops,
|
|
+};
|
|
--- a/include/linux/mtd/spinand.h
|
|
+++ b/include/linux/mtd/spinand.h
|
|
@@ -194,6 +194,7 @@ struct spinand_manufacturer {
|
|
};
|
|
|
|
/* SPI NAND manufacturers */
|
|
+extern const struct spinand_manufacturer gigadevice_spinand_manufacturer;
|
|
extern const struct spinand_manufacturer macronix_spinand_manufacturer;
|
|
extern const struct spinand_manufacturer micron_spinand_manufacturer;
|
|
extern const struct spinand_manufacturer toshiba_spinand_manufacturer;
|