ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-23 23:42:43 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

ipq806x: fix a nasty stmmac data corruption bug caused by faulty DMA initialization

Browse Source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 47594
This commit is contained in:
Felix Fietkau 2015-11-22 19:07:00 +00:00
parent 3789b1f5a0
commit a32f301b62
2 changed files with 78 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
target/linux/ipq806x/patches-3.18/710-stmmac-fix-ipq806x-DMA-configuration.patch Normal file
View File

@ -0,0 +1,39 @@
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c
@@ -259,6 +259,7 @@ static int ipq806x_gmac_probe(struct pla
{
struct plat_stmmacenet_data *plat_dat;
struct stmmac_resources stmmac_res;
+ struct stmmac_dma_cfg *dma_cfg;
struct device *dev = &pdev->dev;
struct ipq806x_gmac *gmac;
int val;
@@ -348,6 +349,16 @@ static int ipq806x_gmac_probe(struct pla
plat_dat->bsp_priv = gmac;
plat_dat->fix_mac_speed = ipq806x_gmac_fix_mac_speed;
+ dma_cfg = devm_kzalloc(&pdev->dev, sizeof(*dma_cfg),
+ GFP_KERNEL);
+
+ dma_cfg->pbl = 32;
+ dma_cfg->burst_len = DMA_AXI_BLEN_16 |
+ (7 << DMA_AXI_RD_OSR_LMT_SHIFT) |
+ (7 << DMA_AXI_WR_OSR_LMT_SHIFT);
+
+ plat_dat->dma_cfg = dma_cfg;
+
return stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
}
--- a/include/linux/stmmac.h
+++ b/include/linux/stmmac.h
@@ -73,6 +73,9 @@
| DMA_AXI_BLEN_32 | DMA_AXI_BLEN_64 \
| DMA_AXI_BLEN_128 | DMA_AXI_BLEN_256)
+#define DMA_AXI_RD_OSR_LMT_SHIFT 16
+#define DMA_AXI_WR_OSR_LMT_SHIFT 20
+
/* Platfrom data for platform device structure's platform_data field */
struct stmmac_mdio_bus_data {

39
target/linux/ipq806x/patches-4.1/710-stmmac-fix-ipq806x-DMA-configuration.patch Normal file
View File

@ -0,0 +1,39 @@
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c
@@ -259,6 +259,7 @@ static int ipq806x_gmac_probe(struct pla
{
struct plat_stmmacenet_data *plat_dat;
struct stmmac_resources stmmac_res;
+ struct stmmac_dma_cfg *dma_cfg;
struct device *dev = &pdev->dev;
struct ipq806x_gmac *gmac;
int val;
@@ -348,6 +349,16 @@ static int ipq806x_gmac_probe(struct pla
plat_dat->bsp_priv = gmac;
plat_dat->fix_mac_speed = ipq806x_gmac_fix_mac_speed;
+ dma_cfg = devm_kzalloc(&pdev->dev, sizeof(*dma_cfg),
+ GFP_KERNEL);
+
+ dma_cfg->pbl = 32;
+ dma_cfg->burst_len = DMA_AXI_BLEN_16 |
+ (7 << DMA_AXI_RD_OSR_LMT_SHIFT) |
+ (7 << DMA_AXI_WR_OSR_LMT_SHIFT);
+
+ plat_dat->dma_cfg = dma_cfg;
+
return stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
}
--- a/include/linux/stmmac.h
+++ b/include/linux/stmmac.h
@@ -73,6 +73,9 @@
| DMA_AXI_BLEN_32 | DMA_AXI_BLEN_64 \
| DMA_AXI_BLEN_128 | DMA_AXI_BLEN_256)
+#define DMA_AXI_RD_OSR_LMT_SHIFT 16
+#define DMA_AXI_WR_OSR_LMT_SHIFT 20
+
/* Platfrom data for platform device structure's platform_data field */
struct stmmac_mdio_bus_data {