mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-29 10:08:59 +00:00
25d8aa7d02
One patch that wasn't ported due to a lot of conflict is: 901-Revert-bcma-switch-GPIO-portions-to-use-GPIOLIB_IRQC.patch Hopefully a correct/real fix will get developed before we switch brcm47xx to the 4.14. This IS NOT ready for switching/trying/using 4.19 yet due to some DMA regression affecting bgmac: [ 0.945472] bgmac_bcma bcma0:2: Found PHY addr: 25 [ 0.954565] libphy: bcma_mdio mii bus: probed [ 0.959486] ------------[ cut here ]------------ [ 0.964387] WARNING: CPU: 0 PID: 1 at ./include/linux/dma-mapping.h:516 bgmac_enet_probe+0x1b4/0x5c4 [ 0.973751] Modules linked in: [ 0.976913] CPU: 0 PID: 1 Comm: swapper Not tainted 4.19.9 #0 [ 0.982750] Stack : 804a0000 804597c4 00000000 00000000 80458fd8 8381bc2c 838282d4 80481a47 [ 0.991367] 8042e3ec 00000001 804d38f0 00000204 83980000 00000065 8381bbe0 6f55b24f [ 0.999975] 00000000 00000000 80520000 00002018 00000000 00000075 00000007 00000000 [ 1.008583] 00000000 80480000 000ee811 00000000 00000000 00000000 80432c00 80248db8 [ 1.017196] 00000009 00000204 83980000 803ad7b0 00000000 801feeec 00000000 804d0000 [ 1.025804] ... [ 1.028325] Call Trace: [ 1.030875] [<8000aef8>] show_stack+0x58/0x100 [ 1.035513] [<8001f8b4>] __warn+0xe4/0x118 [ 1.039708] [<8001f9a4>] warn_slowpath_null+0x48/0x64 [ 1.044935] [<80248db8>] bgmac_enet_probe+0x1b4/0x5c4 [ 1.050101] [<802498e0>] bgmac_probe+0x558/0x590 [ 1.054906] [<80252fd0>] bcma_device_probe+0x38/0x70 [ 1.060017] [<8020e1e8>] really_probe+0x170/0x2e8 [ 1.064891] [<8020e714>] __driver_attach+0xa4/0xec [ 1.069784] [<8020c1e0>] bus_for_each_dev+0x58/0xb0 [ 1.074833] [<8020d590>] bus_add_driver+0xf8/0x218 [ 1.079731] [<8020ef24>] driver_register+0xcc/0x11c [ 1.084804] [<804b54cc>] bgmac_init+0x1c/0x44 [ 1.089258] [<8000121c>] do_one_initcall+0x7c/0x1a0 [ 1.094343] [<804a1d34>] kernel_init_freeable+0x150/0x218 [ 1.099886] [<803a082c>] kernel_init+0x10/0x104 [ 1.104583] [<80005878>] ret_from_kernel_thread+0x14/0x1c [ 1.110107] ---[ end trace f441c0d873d1fb5b ]--- [ 1.114914] bgmac_bcma bcma0:2: Allocation of TX ring 0x200 failed [ 1.121215] bgmac_bcma bcma0:2: Unable to alloc memory for DMA [ 1.127626] bgmac_bcma: probe of bcma0:2 failed with error -12 [ 1.133838] bgmac_bcma: Broadcom 47xx GBit MAC driver loaded Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
42 lines
1.2 KiB
Diff
42 lines
1.2 KiB
Diff
From: b.sander
|
|
Subject: [PATCH] pci: IDE fix
|
|
|
|
These are standard probing messages when using pdc202xx_old:
|
|
pdc202xx_old 0000:00:01.0: IDE controller (0x105a:0x0d30 rev 0x02)
|
|
PCI: Enabling device 0000:00:01.0 (0004 -> 0007)
|
|
PCI: Fixing up device 0000:00:01.0
|
|
0000:00:01.0: (U)DMA Burst Bit DISABLED Primary PCI Mode Secondary PCI Mode.
|
|
0000:00:01.0: FORCING BURST BIT 0x00->0x01 ACTIVE
|
|
pdc202xx_old 0000:00:01.0: 100% native mode on irq 6
|
|
|
|
With the default MAX_HWIFS value after above we get:
|
|
ide2: BM-DMA at 0x0400-0x0407
|
|
ide3: BM-DMA at 0x0408-0x040f
|
|
Probing IDE interface ide2...
|
|
hde: CF500, CFA DISK drive
|
|
|
|
As you can see it's ide2 + ide3 and hde.
|
|
|
|
With this patch applied we get:
|
|
ide0: BM-DMA at 0x0400-0x0407
|
|
ide1: BM-DMA at 0x0408-0x040f
|
|
Probing IDE interface ide0...
|
|
hda: CF500, CFA DISK drive
|
|
|
|
This fixes OpenWrt ticket #7061: https://dev.openwrt.org/ticket/7061
|
|
---
|
|
--- a/include/linux/ide.h
|
|
+++ b/include/linux/ide.h
|
|
@@ -235,7 +235,11 @@ static inline void ide_std_init_ports(st
|
|
hw->io_ports.ctl_addr = ctl_addr;
|
|
}
|
|
|
|
+#if defined CONFIG_BCM47XX
|
|
+# define MAX_HWIFS 2
|
|
+#else
|
|
#define MAX_HWIFS 10
|
|
+#endif
|
|
|
|
/*
|
|
* Now for the data we need to maintain per-drive: ide_drive_t
|