diff options
author | Hauke Mehrtens <hauke@openwrt.org> | 2014-01-04 23:46:44 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@openwrt.org> | 2014-01-04 23:46:44 +0000 |
commit | 9325c51a43c4b8b07243038e7becb3696e1b5496 (patch) | |
tree | f2b04163ad6f992a9db0d5d517e3194b26c6c735 /target/linux/bcm53xx/patches-3.10/202-bgmac-make-bgmac-work-on-systems-without-nvram.patch | |
parent | cd0a4c8d599d83d3ac91cad2c161235bbe7c9286 (diff) | |
download | upstream-9325c51a43c4b8b07243038e7becb3696e1b5496.tar.gz upstream-9325c51a43c4b8b07243038e7becb3696e1b5496.tar.bz2 upstream-9325c51a43c4b8b07243038e7becb3696e1b5496.zip |
bcm53xx: make the l2x0 L2 cache controller work
This fixes the DMA problems with the Ethernet driver.
This also updates some other parts of the patches.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39203 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/bcm53xx/patches-3.10/202-bgmac-make-bgmac-work-on-systems-without-nvram.patch')
-rw-r--r-- | target/linux/bcm53xx/patches-3.10/202-bgmac-make-bgmac-work-on-systems-without-nvram.patch | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/target/linux/bcm53xx/patches-3.10/202-bgmac-make-bgmac-work-on-systems-without-nvram.patch b/target/linux/bcm53xx/patches-3.10/202-bgmac-make-bgmac-work-on-systems-without-nvram.patch index e11a31f1f2..73bffe59a3 100644 --- a/target/linux/bcm53xx/patches-3.10/202-bgmac-make-bgmac-work-on-systems-without-nvram.patch +++ b/target/linux/bcm53xx/patches-3.10/202-bgmac-make-bgmac-work-on-systems-without-nvram.patch @@ -31,18 +31,7 @@ The PHY says it is not connected by default, just ignore it. static const struct bcma_device_id bgmac_bcma_tbl[] = { BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_4706_MAC_GBIT, BCMA_ANY_REV, BCMA_ANY_CLASS), -@@ -165,6 +169,10 @@ static netdev_tx_t bgmac_dma_tx_add(stru - - netdev_sent_queue(net_dev, skb->len); - -+ if (bgmac->core->bus->chipinfo.id == BCMA_CHIP_ID_BCM4707 || -+ bgmac->core->bus->chipinfo.id == BCMA_CHIP_ID_BCM53018) -+ mdelay(1); -+ - wmb(); - - /* Increase ring->end to point empty slot. We tell hardware the first -@@ -1438,7 +1446,7 @@ static int bgmac_probe(struct bcma_devic +@@ -1438,7 +1442,7 @@ static int bgmac_probe(struct bcma_devic int err; /* We don't support 2nd, 3rd, ... units, SPROM has to be adjusted */ @@ -51,7 +40,7 @@ The PHY says it is not connected by default, just ignore it. pr_err("Unsupported core_unit %d\n", core->core_unit); return -ENOTSUPP; } -@@ -1534,8 +1542,7 @@ static int bgmac_probe(struct bcma_devic +@@ -1534,8 +1538,7 @@ static int bgmac_probe(struct bcma_devic /* TODO: reset the external phy. Specs are needed */ bgmac_phy_reset(bgmac); |