mirror of
https://github.com/FUjr/gl-infra-builder.git
synced 2025-12-16 09:10:02 +00:00
79 lines
2.5 KiB
Diff
79 lines
2.5 KiB
Diff
From 5109400c48d138f7c90c034e05ecfda78046031f Mon Sep 17 00:00:00 2001
|
|
From: Jianhui Zhao <jianhui.zhao@gl-inet.com>
|
|
Date: Mon, 19 Sep 2022 14:44:38 +0800
|
|
Subject: [PATCH] kernel: nand: fix crash log for gl
|
|
|
|
Signed-off-by: Jianhui Zhao <jianhui.zhao@gl-inet.com>
|
|
---
|
|
.../hack-5.4/950-nand-crash-log-gl.patch | 58 +++++++++++++++++++
|
|
1 file changed, 58 insertions(+)
|
|
create mode 100644 target/linux/generic/hack-5.4/950-nand-crash-log-gl.patch
|
|
|
|
diff --git a/target/linux/generic/hack-5.4/950-nand-crash-log-gl.patch b/target/linux/generic/hack-5.4/950-nand-crash-log-gl.patch
|
|
new file mode 100644
|
|
index 0000000000..0883501e2c
|
|
--- /dev/null
|
|
+++ b/target/linux/generic/hack-5.4/950-nand-crash-log-gl.patch
|
|
@@ -0,0 +1,58 @@
|
|
+Index: linux-5.4.211/drivers/mtd/mtdoops.c
|
|
+===================================================================
|
|
+--- linux-5.4.211.orig/drivers/mtd/mtdoops.c
|
|
++++ linux-5.4.211/drivers/mtd/mtdoops.c
|
|
+@@ -186,8 +186,25 @@ static void mtdoops_write(struct mtdoops
|
|
+ hdr[1] = MTDOOPS_KERNMSG_MAGIC;
|
|
+
|
|
+ if (panic) {
|
|
+- ret = mtd_panic_write(mtd, cxt->nextpage * record_size,
|
|
+- record_size, &retlen, cxt->oops_buf);
|
|
++ int count = record_size / 0x800;
|
|
++ int i = 0;
|
|
++ const u_char * p = cxt->oops_buf;
|
|
++ while(count--) {
|
|
++ ret = mtd_write(mtd, cxt->nextpage * record_size + i * 0x800,
|
|
++ record_size - i * 0x800, &retlen, p);
|
|
++ if (ret == 0) {
|
|
++ break;
|
|
++ }
|
|
++ else {
|
|
++ if ((p + 0x800) != NULL) {
|
|
++ p = p + 0x800;
|
|
++ i++;
|
|
++ }
|
|
++ else {
|
|
++ break;
|
|
++ }
|
|
++ }
|
|
++ }
|
|
+ if (ret == -EOPNOTSUPP) {
|
|
+ printk(KERN_ERR "mtdoops: Cannot write from panic without panic_write\n");
|
|
+ return;
|
|
+@@ -195,10 +212,11 @@ static void mtdoops_write(struct mtdoops
|
|
+ } else
|
|
+ ret = mtd_write(mtd, cxt->nextpage * record_size,
|
|
+ record_size, &retlen, cxt->oops_buf);
|
|
+-
|
|
++#if 0
|
|
+ if (retlen != record_size || ret < 0)
|
|
+ printk(KERN_ERR "mtdoops: write failure at %ld (%td of %ld written), error %d\n",
|
|
+ cxt->nextpage * record_size, retlen, record_size, ret);
|
|
++#endif
|
|
+ mark_page_used(cxt, cxt->nextpage);
|
|
+ memset(cxt->oops_buf, 0xff, record_size);
|
|
+
|
|
+@@ -207,10 +225,12 @@ static void mtdoops_write(struct mtdoops
|
|
+
|
|
+ static void mtdoops_workfunc_write(struct work_struct *work)
|
|
+ {
|
|
++#if 0
|
|
+ struct mtdoops_context *cxt =
|
|
+ container_of(work, struct mtdoops_context, work_write);
|
|
+
|
|
+ mtdoops_write(cxt, 0);
|
|
++#endif
|
|
+ }
|
|
+
|
|
+ static void find_next_position(struct mtdoops_context *cxt)
|
|
--
|
|
2.25.1
|
|
|