88ba41453d
Refresh patches. Remove upstreamed patches: - backport/080-v4.15-0001-arch-define-weak-abort.patch - backport/081-v4.15-0002-kernel-exit.c-export-abort-to-modules.patch Update patch that no longer applies: pending/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch Fixes CVE-2017-8824. Compile-tested: octeon, x86/64. Runtime-tested: octeon, x86/64. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
--- a/include/linux/mtd/rawnand.h
|
|
+++ b/include/linux/mtd/rawnand.h
|
|
@@ -885,6 +885,9 @@ struct nand_chip {
|
|
int(*waitfunc)(struct mtd_info *mtd, struct nand_chip *this);
|
|
int (*erase)(struct mtd_info *mtd, int page);
|
|
int (*scan_bbt)(struct mtd_info *mtd);
|
|
+ int (*write_page)(struct mtd_info *mtd, struct nand_chip *chip,
|
|
+ uint32_t offset, int data_len, const uint8_t *buf,
|
|
+ int oob_required, int page, int raw);
|
|
int (*onfi_set_features)(struct mtd_info *mtd, struct nand_chip *chip,
|
|
int feature_addr, uint8_t *subfeature_para);
|
|
int (*onfi_get_features)(struct mtd_info *mtd, struct nand_chip *chip,
|
|
--- a/drivers/mtd/nand/nand_base.c
|
|
+++ b/drivers/mtd/nand/nand_base.c
|
|
@@ -2756,9 +2756,14 @@ static int nand_do_write_ops(struct mtd_
|
|
memset(chip->oob_poi, 0xff, mtd->oobsize);
|
|
}
|
|
|
|
- ret = nand_write_page(mtd, chip, column, bytes, wbuf,
|
|
- oob_required, page,
|
|
- (ops->mode == MTD_OPS_RAW));
|
|
+// if (chip->write_page)
|
|
+ ret = chip->write_page(mtd, chip, column, bytes, wbuf,
|
|
+ oob_required, page,
|
|
+ (ops->mode == MTD_OPS_RAW));
|
|
+// else
|
|
+// ret = nand_write_page(mtd, chip, column, bytes, wbuf,
|
|
+// oob_required, page,
|
|
+// (ops->mode == MTD_OPS_RAW));
|
|
if (ret)
|
|
break;
|
|
|
|
@@ -4714,6 +4719,9 @@ int nand_scan_tail(struct mtd_info *mtd)
|
|
}
|
|
}
|
|
|
|
+// if (!chip->write_page)
|
|
+// chip->write_page = nand_write_page;
|
|
+
|
|
/*
|
|
* Check ECC mode, default to software if 3byte/512byte hardware ECC is
|
|
* selected and we have 256 byte pagesize fallback to software ECC
|