歌华链OpenWrt的软重启补丁制作

yum***

1. 前言
由于歌华链路由器采用的flash芯片为mx25l25635f， 在OpenWrt官方的驱动中仅有mx25l25635e, 故存在少许的兼容性。
表现为不能用命令 reboot 进行软重启。

2. 关于补丁
0) 软重启补丁包含2个文件，分别代表两种应用补丁的方法。
   这两种补丁选择其中之一即可。

   308-spi-nor-enable-4B-opcodes-for-mx25l25635f.patch
   408-spi-nor-m25p-shutdown-for-mx25l25635f.patch

1) 补丁只能用于歌华链固件的编译：(在linux内核4.14.95上运行正常)
   应用方法:将上述两个文件之一拷贝到目录：

   "target/linux/ramips/patches-4.14/"
   然后编译歌华链的固件即可。

   例如： #make -j5

2) 关于补丁对应的linux内核4.14.xx： (在linux内核4.14.95上运行正常)
   如果最后的两位版本号xx升级，可能补丁的位置会发生变化，
   此时需要自己重新制作补丁，不过补丁内容是一样的。(见下一条)

3) 这两个补丁总有一个能成功启动歌华链(第2个补丁兼容性应该更好)。如果不能启动，请接TTL/或者breed，刷另一个补丁的固件。

4) 检查是否成功的方法：
   【对于第1种补丁(308-xxx.patch)】, 成功编译完毕后打开文件:

"build_dir/target-mipsel_24kc_musl/linux-ramips_mt7621/linux-4.14.95/drivers/mtd/spi-nor/spi-nor.c"

  查找"mx"，找到下面内容行：
  { "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
  应用补丁后其内容变为：
  { "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_4B_OPCODES) },



  【对于第2种补丁(408-xxx.patch)】，成功编译完毕后打开文件:
  "build_dir/target-mipsel_24kc_musl/linux-ramips_mt7621/linux-4.14.95/drivers/mtd/devices/m25p80.c"
  在文件的最末尾，成功应用补丁后，其内容增加函数shutdown, 如下：

static void m25p_shutdown(struct spi_device *spi)
{
       struct m25p     *flash = spi_get_drvdata(spi);

       if ((&flash->spi_nor)->addr_width > 3) {
               printk(KERN_INFO "m25p80: exit 4-byte address mode\n");
               flash->command[0] = SPINOR_OP_EX4B;  // exit 4-byte address mode: 0xe9
               spi_write(flash->spi, flash->command, 1);
               flash->command[0] = 0x66;  // enable reset
               spi_write(flash->spi, flash->command, 1);
               flash->command[0] = 0x99;  // reset
               spi_write(flash->spi, flash->command, 1);
       }
}

static struct spi_driver m25p80_driver = {
    .driver = {
        .name   = "m25p80",
        .of_match_table = m25p_of_table,
    },
    .id_table   = m25p_ids,
    .probe  = m25p_probe,
    .remove = m25p_remove,
    .shutdown = m25p_shutdown,

    /* REVISIT: many of these chips have deep power-down modes, which
     * should clearly be entered on suspend() to minimize power use.
     * And also when they're otherwise idle...
     */
};

module_spi_driver(m25p80_driver);


3. 补丁文件


两种不同的方法编译的带软重启补丁固件:
链接: https://pan.baidu.com/s/1Nx0Hp4eFKnDtXRGUgTuorA 提取码: 1k62


2019-01-30 更新：
1) 其中补丁1的内容已经在OpenWrt官方补丁代码中，具体文件是： target/linux/ramips/patches-4.14/304-spi-nor-enable-4B-opcodes-for-mx25l25635f.patch
上游补丁： https://github.com/openwrt/openwrt/pull/1959
2) 在我自己的两台硬件都是v0.4的歌华链，其中一台软重启正常，另外一台则反复重启无法正常使用(现象：正在识别.../网络电缆被拔出)
3) 如果不能正常启动，应用第2个补丁即可。(注意先删除官方补丁或者第一个补丁304-spi-nor-enable-4B-opcodes-for-mx25l25635f.patch文件)

csk***

感谢楼主，之前下载了您之前帖子里的修改好软重启补丁的官方OpenWrt版本，路由器出现正在识别...网络电缆被拔出，后来刷了高格，现在可以试试看这个帖子里的方法行不行

koc***

歌华链解决软重启问题后简直就是一台下载机

5710***

为什么我用老毛子软重启很正常啊

LGA***

补丁已经合并到官方了 https://git.openwrt.org/?p=openw ... 76361b243a082d36c60

yum***

LGA1150 发表于 2019-1-29 14:53
补丁已经合并到官方了 https://git.openwrt.org/?p=openwrt/openwrt.git;a=commitdiff;h=c2bcdabf2a1b1630c ...

歌华链很奇怪，在我的其中一台v0.4版本上， 这个补丁不停重启~~
(另外一个v0.4的歌华链正常)

LGA***

yumeimm 发表于 2019-1-30 23:13
歌华链很奇怪，在我的其中一台v0.4版本上， 这个补丁不能启动~~
(另外一个v0.4的歌华链正常)

TTL 输出？

koc***

yumeimm 发表于 2019-1-30 23:13
歌华链很奇怪，在我的其中一台v0.4版本上， 这个补丁不能启动~~
(另外一个v0.4的歌华链正常)

所以说0.4的也有2个版本了？！之前别人说0.4的有的刷最新breed砖了，有的没砖

hq***

V0.4 op官方最新 commit 一直不停重启

LGA***

kochiya 发表于 2019-1-31 06:26
所以说0.4的也有2个版本了？！之前别人说0.4的有的刷最新breed砖了，有的没砖

难道闪存芯片不一样？导致补丁出问题？

wack***

LGA1150 发表于 2019-1-31 16:30
难道闪存芯片不一样？导致补丁出问题？

我的V0.4无限重启的ttl日志：

1. Boot and Recovery Environment for Embedded Devices
   
2. Copyright (C) 2018 HackPascal <hackpascal@gmail.com>
   
3. Build date 2018-12-29 [git-135bed9]
   
4. Version 1.1 (r1266)
   
5. 
   
6. DRAM: 512MB
   
7. Platform: MediaTek MT7621A ver 1, eco 3
   
8. Board: GeHua GHL-R-001
   
9. Clocks: CPU: 880MHz, DDR: 1066MHz, Bus: 293MHz, Ref: 40MHz
   
10. Environment variables [url=home.php?mod=space&uid=162986]@[/url] 00040000 on flash bank 0, size 00010000
    
11. Flash: Macronix MX25L25635E (32MB) on mt7621-spi.0
    
12. rt2880-eth: MAC address from EEPROM is invalid, using default settings.
    
13. rt2880-eth: Using MAC address 00:0c:43:00:00:01
    
14. eth0: MediaTek MT7530 Gigabit switch
    
15. 
    
16. Network started on eth0, inet addr 192.168.1.1, netmask 255.255.255.0
    
17. 
    
18. Press any key to interrupt autoboot ... 0   
    
19. 
    
20. Trying to boot firmware from 0x00050000 in flash bank 0 ...
    
21. Reading data into memory ...
    
22. U-Boot firmware image header detected.
    
23.     Image Name:   MIPS OpenWrt Linux-4.14.96
    
24.     Data Size:    1910311 Bytes
    
25.     Load Address: 80001000
    
26.     Entry Point:  80001000
    
27. Uncompressing data (LZMA) ... done.
    
28. Flushing cache ... done.
    
29. 
    
30. Starting kernel at 0x80001000...
    
31. 
    
32. [    0.000000] Linux version 4.14.96 (Wacke@HOME-Server) (gcc version 8.2.0 (OpenWrt GCC 8.2.0 r8850-8ff0dd57bf)) #0 SMP Fri Feb 1 05:35:13 2019
    
33. [    0.000000] SoC Type: MediaTek MT7621 ver:1 eco:3
    
34. [    0.000000] bootconsole [early0] enabled
    
35. [    0.000000] CPU0 revision is: 0001992f (MIPS 1004Kc)
    
36. [    0.000000] MIPS: machine is GeHua GHL-R-001
    
37. [    0.000000] Determined physical RAM map:
    
38. [    0.000000]  memory: 1c000000 @ 00000000 (usable)
    
39. [    0.000000]  memory: 04000000 @ 20000000 (usable)
    
40. [    0.000000] Initrd not found or empty - disabling initrd
    
41. [    0.000000] VPE topology {2,2} total 4
    
42. [    0.000000] Primary instruction cache 32kB, VIPT, 4-way, linesize 32 bytes.
    
43. [    0.000000] Primary data cache 32kB, 4-way, PIPT, no aliases, linesize 32 bytes
    
44. [    0.000000] MIPS secondary cache 256kB, 8-way, linesize 32 bytes.
    
45. [    0.000000] Zone ranges:
    
46. [    0.000000]   Normal   [mem 0x0000000000000000-0x000000000fffffff]
    
47. [    0.000000]   HighMem  [mem 0x0000000010000000-0x0000000023ffffff]
    
48. [    0.000000] Movable zone start for each node
    
49. [    0.000000] Early memory node ranges
    
50. [    0.000000]   node   0: [mem 0x0000000000000000-0x000000001bffffff]
    
51. [    0.000000]   node   0: [mem 0x0000000020000000-0x0000000023ffffff]
    
52. [    0.000000] Initmem setup node 0 [mem 0x0000000000000000-0x0000000023ffffff]
    
53. [    0.000000] random: get_random_bytes called from start_kernel+0x90/0x4a4 with crng_init=0
    
54. [    0.000000] percpu: Embedded 14 pages/cpu @81490000 s26192 r8192 d22960 u57344
    
55. [    0.000000] Built 1 zonelists, mobility grouping on.  Total pages: 130560
    
56. [    0.000000] Kernel command line: console=ttyS0,57600 rootfstype=squashfs,jffs2
    
57. [    0.000000] PID hash table entries: 1024 (order: 0, 4096 bytes)
    
58. [    0.000000] Dentry cache hash table entries: 32768 (order: 5, 131072 bytes)
    
59. [    0.000000] Inode-cache hash table entries: 16384 (order: 4, 65536 bytes)
    
60. [    0.000000] Writing ErrCtl register=00000000
    
61. [    0.000000] Readback ErrCtl register=00000000
    
62. [    0.000000] Memory: 512888K/524288K available (4498K kernel code, 229K rwdata, 1008K rodata, 268K init, 247K bss, 11400K reserved, 0K cma-reserved, 262144K highmem)
    
63. [    0.000000] SLUB: HWalign=32, Order=0-3, MinObjects=0, CPUs=4, Nodes=1
    
64. [    0.000000] Hierarchical RCU implementation.
    
65. [    0.000000] NR_IRQS: 256
    
66. [    0.000000] CPU Clock: 880MHz
    
67. [    0.000000] clocksource: GIC: mask: 0xffffffffffffffff max_cycles: 0xcaf478abb4, max_idle_ns: 440795247997 ns
    
68. [    0.000000] clocksource: MIPS: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 4343773742 ns
    
69. [    0.000010] sched_clock: 32 bits at 440MHz, resolution 2ns, wraps every 4880645118ns
    
70. [    0.015511] Calibrating delay loop... 586.13 BogoMIPS (lpj=2930688)
    
71. [    0.087836] pid_max: default: 32768 minimum: 301
    
72. [    0.097149] Mount-cache hash table entries: 1024 (order: 0, 4096 bytes)
    
73. [    0.110169] Mountpoint-cache hash table entries: 1024 (order: 0, 4096 bytes)
    
74. [    0.126002] Hierarchical SRCU implementation.
    
75. [    0.135476] smp: Bringing up secondary CPUs ...
    
76. [    8.082989] Primary instruction cache 32kB, VIPT, 4-way, linesize 32 bytes.
    
77. [    8.082999] Primary data cache 32kB, 4-way, PIPT, no aliases, linesize 32 bytes
    
78. [    8.083011] MIPS secondary cache 256kB, 8-way, linesize 32 bytes.
    
79. [    8.083157] CPU1 revision is: 0001992f (MIPS 1004Kc)
    
80. [    0.204844] Synchronize counters for CPU 1: done.
    
81. [    5.133760] Primary instruction cache 32kB, VIPT, 4-way, linesize 32 bytes.
    
82. [    5.133768] Primary data cache 32kB, 4-way, PIPT, no aliases, linesize 32 bytes
    
83. [    5.133776] MIPS secondary cache 256kB, 8-way, linesize 32 bytes.
    
84. [    5.133850] CPU2 revision is: 0001992f (MIPS 1004Kc)
    
85. [    0.325574] Synchronize counters for CPU 2: done.
    
86. [    7.041069] Primary instruction cache 32kB, VIPT, 4-way, linesize 32 bytes.
    
87. [    7.041077] Primary data cache 32kB, 4-way, PIPT, no aliases, linesize 32 bytes
    
88. [    7.041085] MIPS secondary cache 256kB, 8-way, linesize 32 bytes.
    
89. [    7.041185] CPU3 revision is: 0001992f (MIPS 1004Kc)
    
90. [    0.445144] Synchronize counters for CPU 3: done.
    
91. [    0.504749] smp: Brought up 1 node, 4 CPUs
    
92. [    0.516557] clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 19112604462750000 ns
    
93. [    0.536031] futex hash table entries: 1024 (order: 3, 32768 bytes)
    
94. [    0.548493] pinctrl core: initialized pinctrl subsystem
    
95. [    0.560272] NET: Registered protocol family 16
    
96. [    0.579528] pull PCIe RST: RALINK_RSTCTRL = 0
    
97. [    0.888322] release PCIe RST: RALINK_RSTCTRL = 7000000
    
98. [    0.898385] ***** Xtal 40MHz *****
    
99. [    0.905117] release PCIe RST: RALINK_RSTCTRL = 7000000
    
100. [    0.915321] Port 0 N_FTS = 1b102800
     
101. [    0.922222] Port 1 N_FTS = 1b102800
     
102. [    0.929145] Port 2 N_FTS = 1b102800
     
103. [    2.087168] PCIE2 no card, disable it(RST&CLK)
     
104. [    2.095857]  -> 21007f2
     
105. [    2.100679] PCIE0 enabled
     
106. [    2.105875] PCIE1 enabled
     
107. [    2.111059] PCI host bridge /pcie@1e140000 ranges:
     
108. [    2.120584]  MEM 0x0000000060000000..0x000000006fffffff
     
109. [    2.130940]   IO 0x000000001e160000..0x000000001e16ffff
     
110. [    2.141310] PCI coherence region base: 0xbfbf8000, mask/settings: 0x60000000
     
111. [    2.164640] mt7621_gpio 1e000600.gpio: registering 32 gpios
     
112. [    2.175975] mt7621_gpio 1e000600.gpio: registering 32 gpios
     
113. [    2.187208] mt7621_gpio 1e000600.gpio: registering 32 gpios
     
114. [    2.199854] PCI host bridge to bus 0000:00
     
115. [    2.207877] pci_bus 0000:00: root bus resource [mem 0x60000000-0x6fffffff]
     
116. [    2.221549] pci_bus 0000:00: root bus resource [io  0xffffffff]
     
117. [    2.233275] pci_bus 0000:00: root bus resource [??? 0x00000000 flags 0x0]
     
118. [    2.246765] pci_bus 0000:00: No busn resource found for root bus, will use [bus 00-ff]
     
119. [    2.263334] pci 0000:00:00.0: bridge configuration invalid ([bus 00-00]), reconfiguring
     
120. [    2.279144] pci 0000:00:01.0: bridge configuration invalid ([bus 00-00]), reconfiguring
     
121. [    2.296498] pci 0000:00:00.0: BAR 0: no space for [mem size 0x80000000]
     
122. [    2.309539] pci 0000:00:00.0: BAR 0: failed to assign [mem size 0x80000000]
     
123. [    2.323345] pci 0000:00:01.0: BAR 0: no space for [mem size 0x80000000]
     
124. [    2.336477] pci 0000:00:01.0: BAR 0: failed to assign [mem size 0x80000000]
     
125. [    2.350301] pci 0000:00:00.0: BAR 8: assigned [mem 0x60000000-0x600fffff]
     
126. [    2.363788] pci 0000:00:01.0: BAR 8: assigned [mem 0x60100000-0x601fffff]
     
127. [    2.377259] pci 0000:00:01.0: BAR 9: assigned [mem 0x60200000-0x602fffff pref]
     
128. [    2.391600] pci 0000:00:00.0: BAR 1: assigned [mem 0x60300000-0x6030ffff]
     
129. [    2.405092] pci 0000:00:01.0: BAR 1: assigned [mem 0x60310000-0x6031ffff]
     
130. [    2.418566] pci 0000:01:00.0: BAR 0: assigned [mem 0x60000000-0x600fffff]
     
131. [    2.432045] pci 0000:00:00.0: PCI bridge to [bus 01]
     
132. [    2.441873] pci 0000:00:00.0:   bridge window [mem 0x60000000-0x600fffff]
     
133. [    2.455372] pci 0000:02:00.0: BAR 0: assigned [mem 0x60100000-0x601fffff 64bit]
     
134. [    2.469891] pci 0000:02:00.0: BAR 6: assigned [mem 0x60200000-0x6020ffff pref]
     
135. [    2.484219] pci 0000:00:01.0: PCI bridge to [bus 02]
     
136. [    2.494057] pci 0000:00:01.0:   bridge window [mem 0x60100000-0x601fffff]
     
137. [    2.507547] pci 0000:00:01.0:   bridge window [mem 0x60200000-0x602fffff pref]
     
138. [    2.523346] clocksource: Switched to clocksource GIC
     
139. [    2.534689] NET: Registered protocol family 2
     
140. [    2.543965] TCP established hash table entries: 2048 (order: 1, 8192 bytes)
     
141. [    2.557709] TCP bind hash table entries: 2048 (order: 2, 16384 bytes)
     
142. [    2.570504] TCP: Hash tables configured (established 2048 bind 2048)
     
143. [    2.583224] UDP hash table entries: 256 (order: 1, 8192 bytes)
     
144. [    2.594733] UDP-Lite hash table entries: 256 (order: 1, 8192 bytes)
     
145. [    2.607421] NET: Registered protocol family 1
     
146. [    2.853291] 4 CPUs re-calibrate udelay(lpj = 2924544)
     
147. [    2.864088] Crashlog allocated RAM at address 0x3f00000
     
148. [    2.875275] workingset: timestamp_bits=30 max_order=17 bucket_order=0
     
149. [    2.892080] random: fast init done
     
150. [    2.894137] squashfs: version 4.0 (2009/01/31) Phillip Lougher
     
151. [    2.910311] jffs2: version 2.2 (NAND) (SUMMARY) (LZMA) (RTIME) (CMODE_PRIORITY) (c) 2001-2006 Red Hat, Inc.
     
152. [    2.933781] bounce: pool size: 64 pages
     
153. [    2.941276] io scheduler noop registered
     
154. [    2.949052] io scheduler deadline registered (default)
     
155. [    2.960370] Serial: 8250/16550 driver, 3 ports, IRQ sharing disabled
     
156. [    2.974663] console [ttyS0] disabled
     
157. [    2.981673] 1e000c00.uartlite: ttyS0 at MMIO 0x1e000c00 (irq = 18, base_baud = 3125000) is a 16550A
     
158. [    2.999717] console [ttyS0] enabled
     
159. [    2.999717] console [ttyS0] enabled
     
160. [    3.013436] bootconsole [early0] disabled
     
161. [    3.013436] bootconsole [early0] disabled
     
162. [    3.030075] 1e000e00.uartlite3: ttyS1 at MMIO 0x1e000e00 (irq = 19, base_baud = 3125000) is a 16550A
     
163. [    3.048965] cacheinfo: Unable to detect cache hierarchy for CPU 0
     
164. [    3.061971] MediaTek Nand driver init, version v2.1 Fix AHB virt2phys error
     
165. [    3.076282] spi-mt7621 1e000b00.spi: sys_freq: 220000000
     
166. [    3.087868] m25p80 spi0.0: mx25l25635f (32768 Kbytes)
     
167. [    3.097990] 4 fixed-partitions partitions found on MTD device spi0.0
     
168. [    3.110641] Creating 4 MTD partitions on "spi0.0":
     
169. [    3.120187] 0x000000000000-0x000000030000 : "u-boot"
     
170. [    3.131234] 0x000000030000-0x000000040000 : "u-boot-env"
     
171. [    3.142907] 0x000000040000-0x000000050000 : "factory"
     
172. [    3.154098] 0x000000050000-0x000002000000 : "firmware"
     
173. [    3.198301] libphy: Fixed MDIO Bus: probed
     
174. [    3.275181] mtk_soc_eth 1e100000.ethernet: generated random MAC address 66:63:de:0c:a7:0c
     
175. [    3.291652] libphy: mdio: probed
     
176. [    4.697741] mtk_soc_eth 1e100000.ethernet: loaded mt7530 driver
     
177. [    4.710347] mtk_soc_eth 1e100000.ethernet eth0: mediatek frame engine at 0xbe100000, irq 21
     
178. [    4.729300] NET: Registered protocol family 10
     
179. [    4.739565] Segment Routing with IPv6
     
180. [    4.746965] NET: Registered protocol family 17
     
181. [    4.755873] 8021q: 802.1Q VLAN Support v1.8
     
182. [    4.766782] hctosys: unable to open rtc device (rtc0)
     
183. [    4.777688] VFS: Cannot open root device "(null)" or unknown-block(0,0): error -6
     
184. [    4.792587] Please append a correct "root=" boot option; here are the available partitions:
     
185. [    4.809220] 1f00             192 mtdblock0
     
186. [    4.809227]  (driver?)
     
187. [    4.822225] 1f01              64 mtdblock1
     
188. [    4.822230]  (driver?)
     
189. [    4.835236] 1f02              64 mtdblock2
     
190. [    4.835241]  (driver?)
     
191. [    4.848238] 1f03           32448 mtdblock3
     
192. [    4.848243]  (driver?)
     
193. [    4.861236] Kernel panic - not syncing: VFS: Unable to mount root fs on unknown-block(0,0)
     
194. [    4.879387] Rebooting in 1 seconds..
     

复制代码

LGA***

wackejohn 发表于 2019-2-3 21:22
我的V0.4无限重启的ttl日志：

Flash 芯片上印的型号是什么？

wack***

LGA1150 发表于 2019-2-3 21:27
Flash 芯片上印的型号是什么？

MX25L25635FMI-10G

LGA***

wackejohn 发表于 2019-2-3 21:22
我的V0.4无限重启的ttl日志：

用原厂 uboot 还会这样吗

wack***

LGA1150 发表于 2019-2-3 23:06
用原厂 uboot 还会这样吗

原厂uboot是一样的情况。。。。