mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 01:11:14 +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>
74 lines
2.1 KiB
Diff
74 lines
2.1 KiB
Diff
From 597715c61ae75a05ab3310a34ff3857a006f0f63 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
|
|
Date: Thu, 20 Nov 2014 21:32:42 +0100
|
|
Subject: [PATCH] bcma: add table of serial flashes with smaller blocks
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
|
|
---
|
|
drivers/bcma/driver_chipcommon_sflash.c | 29 +++++++++++++++++++++++++++++
|
|
1 file changed, 29 insertions(+)
|
|
|
|
--- a/drivers/bcma/driver_chipcommon_sflash.c
|
|
+++ b/drivers/bcma/driver_chipcommon_sflash.c
|
|
@@ -9,6 +9,7 @@
|
|
|
|
#include <linux/platform_device.h>
|
|
#include <linux/bcma/bcma.h>
|
|
+#include <bcm47xx_board.h>
|
|
|
|
static struct resource bcma_sflash_resource = {
|
|
.name = "bcma_sflash",
|
|
@@ -42,6 +43,13 @@ static const struct bcma_sflash_tbl_e bc
|
|
{ NULL },
|
|
};
|
|
|
|
+/* Some devices use smaller blocks (and have more of them) */
|
|
+static const struct bcma_sflash_tbl_e bcma_sflash_st_shrink_tbl[] = {
|
|
+ { "M25P16", 0x14, 0x1000, 512, },
|
|
+ { "M25P32", 0x15, 0x1000, 1024, },
|
|
+ { NULL },
|
|
+};
|
|
+
|
|
static const struct bcma_sflash_tbl_e bcma_sflash_sst_tbl[] = {
|
|
{ "SST25WF512", 1, 0x1000, 16, },
|
|
{ "SST25VF512", 0x48, 0x1000, 16, },
|
|
@@ -85,6 +93,24 @@ static void bcma_sflash_cmd(struct bcma_
|
|
bcma_err(cc->core->bus, "SFLASH control command failed (timeout)!\n");
|
|
}
|
|
|
|
+const struct bcma_sflash_tbl_e *bcma_sflash_shrink_flash(u32 id)
|
|
+{
|
|
+ enum bcm47xx_board board = bcm47xx_board_get();
|
|
+ const struct bcma_sflash_tbl_e *e;
|
|
+
|
|
+ switch (board) {
|
|
+ case BCM47XX_BOARD_NETGEAR_WGR614_V10:
|
|
+ case BCM47XX_BOARD_NETGEAR_WNR1000_V3:
|
|
+ for (e = bcma_sflash_st_shrink_tbl; e->name; e++) {
|
|
+ if (e->id == id)
|
|
+ return e;
|
|
+ }
|
|
+ return NULL;
|
|
+ default:
|
|
+ return NULL;
|
|
+ }
|
|
+}
|
|
+
|
|
/* Initialize serial flash access */
|
|
int bcma_sflash_init(struct bcma_drv_cc *cc)
|
|
{
|
|
@@ -115,6 +141,10 @@ int bcma_sflash_init(struct bcma_drv_cc
|
|
case 0x13:
|
|
return -ENOTSUPP;
|
|
default:
|
|
+ e = bcma_sflash_shrink_flash(id);
|
|
+ if (e)
|
|
+ break;
|
|
+
|
|
for (e = bcma_sflash_st_tbl; e->name; e++) {
|
|
if (e->id == id)
|
|
break;
|