Changeset 32921


Ignore:
Timestamp:
2012-07-31T16:27:31+02:00 (6 years ago)
Author:
jogo
Message:

bcm63xx: update enetswitch driver

Update enetswith driver with latest fixes and additions.

Signed-off-by: Jonas Gorski <jonas.gorski+openwrt@…>

Location:
trunk/target/linux/brcm63xx/patches-3.3
Files:
6 added
9 edited
16 moved

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/brcm63xx/patches-3.3/416-bcm63xx_enet-reset-port-link-state-in-bcm_enetsw_ope.patch

    r32920 r32921  
    1818--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c 
    1919+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c 
    20 @@ -2214,6 +2214,8 @@ static int bcm_enetsw_open(struct net_de 
     20@@ -2213,6 +2213,8 @@ static int bcm_enetsw_open(struct net_de 
    2121                enetsw_writeb(priv, ENETSW_PTCTRL_RXDIS_MASK | 
    2222                              ENETSW_PTCTRL_TXDIS_MASK, 
  • trunk/target/linux/brcm63xx/patches-3.3/423-bcm63xx_enet-fix-lockup-on-BCM6328.patch

    r32920 r32921  
    1 From 37d151859e09d09a950ad3ae615db1903bcc59d3 Mon Sep 17 00:00:00 2001 
     1From 382a0b0dc4cbd0e0fbfd6c2d132e972c3d1245b0 Mon Sep 17 00:00:00 2001 
    22From: Jonas Gorski <jonas.gorski@gmail.com> 
    33Date: Sun, 13 Nov 2011 14:59:37 +0100 
    4 Subject: [PATCH 43/79] bcm63xx_enet: fix lockup on BCM6328 
     4Subject: [PATCH 39/84] bcm63xx_enet: fix lockup on BCM6328 
    55 
    66BCM6328 locks up on a maxburst size of 16, reduce it to 8 for BCM6328 and 
     
    99Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> 
    1010--- 
    11  drivers/net/ethernet/broadcom/bcm63xx_enet.c |   14 ++++++++------ 
     11 drivers/net/ethernet/broadcom/bcm63xx_enet.c |   13 +++++++------ 
    1212 drivers/net/ethernet/broadcom/bcm63xx_enet.h |    4 ++++ 
    13  2 files changed, 12 insertions(+), 6 deletions(-) 
     13 2 files changed, 11 insertions(+), 6 deletions(-) 
    1414 
    1515--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c 
     
    4444 } 
    4545  
    46 @@ -1700,6 +1699,8 @@ static int __devinit bcm_enet_probe(stru 
    47                 return -ENOMEM; 
     46@@ -1701,6 +1700,7 @@ static int __devinit bcm_enet_probe(stru 
    4847        priv = netdev_priv(dev); 
    4948  
    50 +       priv->dma_maxburst = bcm_enet_is_sw(priv) ? 
    51 +                       BCMENETSW_DMA_MAXBURST : BCMENET_DMA_MAXBURST; 
     49        priv->enet_is_sw = false; 
     50+       priv->dma_maxburst = BCMENET_DMA_MAXBURST; 
     51  
    5252        ret = compute_hw_mtu(priv, dev->mtu); 
    5353        if (ret) 
    54                 goto out; 
    55 @@ -2263,9 +2264,9 @@ static int bcm_enetsw_open(struct net_de 
     54@@ -2282,9 +2282,9 @@ static int bcm_enetsw_open(struct net_de 
    5655        enet_dmas_writel(priv, 0, ENETDMAS_SRAM4_REG(priv->tx_chan)); 
    5756  
     
    6564  
    6665        /* set flow control low/high threshold to 1/3 / 2/3 */ 
    67 @@ -2727,6 +2728,7 @@ static int __devinit bcm_enetsw_probe(st 
     66@@ -2749,6 +2749,7 @@ static int __devinit bcm_enetsw_probe(st 
    6867        priv->irq_tx = irq_tx; 
    6968        priv->rx_ring_size = BCMENET_DEF_RX_DESC; 
  • trunk/target/linux/brcm63xx/patches-3.3/424-MIPS-BCM63XX-add-support-for-BCM6328-in-bcm_enetsw.patch

    r32920 r32921  
    1 From 44e21f4c7c556573fff0432f7846086763df3455 Mon Sep 17 00:00:00 2001 
     1From f1c1bfa89cdac76a215d0e21161da9f8f8373437 Mon Sep 17 00:00:00 2001 
    22From: Jonas Gorski <jonas.gorski@gmail.com> 
    33Date: Tue, 14 Jun 2011 21:14:39 +0200 
    4 Subject: [PATCH 44/79] MIPS: BCM63XX: add support for BCM6328 in bcm_enetsw 
     4Subject: [PATCH 40/84] MIPS: BCM63XX: add support for BCM6328 in bcm_enetsw 
    55 
    66Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> 
    77--- 
    8  arch/mips/bcm63xx/clk.c                      |   34 +++++++++++++++++++------- 
    9  arch/mips/bcm63xx/dev-enet.c                 |    4 +-- 
    10  drivers/net/ethernet/broadcom/bcm63xx_enet.h |    2 +- 
    11  3 files changed, 28 insertions(+), 12 deletions(-) 
     8 arch/mips/bcm63xx/clk.c                            |   34 ++++++++++++++----- 
     9 arch/mips/bcm63xx/dev-enet.c                       |    9 +++-- 
     10 .../include/asm/mach-bcm63xx/bcm63xx_dev_enet.h    |    1 + 
     11 3 files changed, 32 insertions(+), 12 deletions(-) 
    1212 
    1313--- a/arch/mips/bcm63xx/clk.c 
     
    8080  
    8181        ret = register_shared(); 
    82 --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.h 
    83 +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.h 
    84 @@ -368,7 +368,7 @@ struct bcm_enet_priv { 
     82@@ -241,7 +241,10 @@ bcm63xx_enetsw_register(const struct bcm 
    8583  
    86  static inline int bcm_enet_is_sw(struct bcm_enet_priv *priv) 
    87  { 
    88 -       if (BCMCPU_IS_6368()) 
    89 +       if (BCMCPU_IS_6328() || BCMCPU_IS_6368()) 
    90                 return 1; 
    91         else 
    92                 return 0; 
     84        memcpy(bcm63xx_enetsw_device.dev.platform_data, pd, sizeof (*pd)); 
     85  
     86-       enetsw_pd.num_ports = ENETSW_PORTS_6368; 
     87+       if (BCMCPU_IS_6328()) 
     88+               enetsw_pd.num_ports = ENETSW_PORTS_6328; 
     89+       else if (BCMCPU_IS_6368()) 
     90+               enetsw_pd.num_ports = ENETSW_PORTS_6368; 
     91  
     92        ret = platform_device_register(&bcm63xx_enetsw_device); 
     93        if (ret) 
     94--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_enet.h 
     95+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_enet.h 
     96@@ -43,6 +43,7 @@ struct bcm63xx_enet_platform_data { 
     97  * on board ethernet switch platform data 
     98  */ 
     99 #define ENETSW_MAX_PORT        6 
     100+#define ENETSW_PORTS_6328 5 /* 4 FE PHY + 1 RGMII */ 
     101 #define ENETSW_PORTS_6368 6 /* 4 FE PHY + 2 RGMII */ 
     102  
     103 #define ENETSW_RGMII_PORT0     4 
  • trunk/target/linux/brcm63xx/patches-3.3/427-MIPS-BCM63XX-Register-SPI-flash-if-present.patch

    r32920 r32921  
    9393 #define STRAPBUS_6368_BOOT_SEL_NAND    0 
    9494 #define STRAPBUS_6368_BOOT_SEL_SERIAL  1 
    95 @@ -1227,6 +1228,7 @@ 
     95@@ -1240,6 +1241,7 @@ 
    9696 #define SERDES_PCIE_EXD_EN             (1 << 15) 
    9797  
  • trunk/target/linux/brcm63xx/patches-3.3/520-bcm63xx-add-support-for-96368MVWG-board.patch

    r32643 r32921  
    1111--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    1212+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    13 @@ -2015,6 +2015,80 @@ static struct board_info __initdata boar 
     13@@ -2015,6 +2015,78 @@ static struct board_info __initdata boar 
    1414 #endif 
    1515  
     
    4343+                               .used   = 1, 
    4444+                               .phy_id = 0x12, 
    45 +                               .external_phy = 1, 
    4645+                               .name   = "port0", 
    4746+                       }, 
     
    5049+                               .used   = 1, 
    5150+                               .phy_id = 0x11, 
    52 +                               .external_phy = 1, 
    5351+                               .name   = "port3", 
    5452+                       }, 
     
    9290  */ 
    9391 static const struct board_info __initdata *bcm963xx_boards[] = { 
    94 @@ -2063,6 +2137,10 @@ static const struct board_info __initdat 
     92@@ -2063,6 +2135,10 @@ static const struct board_info __initdat 
    9593        &board_HW553, 
    9694        &board_spw303v, 
     
    103101  
    104102 static void __init nb4_nvram_fixup(void) 
    105 @@ -2244,12 +2322,25 @@ void __init board_prom_init(void) 
     103@@ -2244,12 +2320,25 @@ void __init board_prom_init(void) 
    106104                bcm63xx_pci_enabled = 1; 
    107105                if (BCMCPU_IS_6348()) 
  • trunk/target/linux/brcm63xx/patches-3.3/521-bcm63xx-add-support-for-96368MVNgr-board.patch

    r32086 r32921  
    1010--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    1111+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    12 @@ -2086,6 +2086,72 @@ static struct board_info __initdata boar 
     12@@ -2084,6 +2084,72 @@ static struct board_info __initdata boar 
    1313        .has_ohci0 = 1, 
    1414        .has_ehci0 = 1, 
     
    8383  
    8484 /* 
    85 @@ -2140,6 +2206,7 @@ static const struct board_info __initdat 
     85@@ -2138,6 +2204,7 @@ static const struct board_info __initdat 
    8686  
    8787 #ifdef CONFIG_BCM63XX_CPU_6368 
  • trunk/target/linux/brcm63xx/patches-3.3/522-MIPS-BCM63XX-add-96328avng-reference-board.patch

    r32086 r32921  
    9191  */ 
    9292 #ifdef CONFIG_BCM63XX_CPU_6338 
    93 @@ -2158,6 +2232,9 @@ static struct board_info __initdata boar 
     93@@ -2156,6 +2230,9 @@ static struct board_info __initdata boar 
    9494  * all boards 
    9595  */ 
  • trunk/target/linux/brcm63xx/patches-3.3/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch

    r32086 r32921  
    8787  
    8888 /* 
    89 @@ -2234,6 +2304,7 @@ static struct board_info __initdata boar 
     89@@ -2232,6 +2302,7 @@ static struct board_info __initdata boar 
    9090 static const struct board_info __initdata *bcm963xx_boards[] = { 
    9191 #ifdef CONFIG_BCM63XX_CPU_6328 
  • trunk/target/linux/brcm63xx/patches-3.3/524-board_dsl_274xb_rev_f.patch

    r32086 r32921  
    121121  
    122122 /* 
    123 @@ -2305,6 +2408,7 @@ static const struct board_info __initdat 
     123@@ -2303,6 +2406,7 @@ static const struct board_info __initdat 
    124124 #ifdef CONFIG_BCM63XX_CPU_6328 
    125125        &board_96328avng, 
  • trunk/target/linux/brcm63xx/patches-3.3/525-board_96348w3.patch

    r32920 r32921  
    5959  
    6060 /* 
    61 @@ -2438,6 +2489,7 @@ static const struct board_info __initdat 
     61@@ -2436,6 +2487,7 @@ static const struct board_info __initdat 
    6262        &board_ct536_ct5621, 
    6363        &board_96348A_122, 
  • trunk/target/linux/brcm63xx/patches-3.3/526-board_CT6373-1.patch

    r32920 r32921  
    127127        .name                           = "HW553", 
    128128        .expected_cpu_id                = 0x6358, 
    129 @@ -2504,6 +2616,7 @@ static const struct board_info __initdat 
     129@@ -2502,6 +2614,7 @@ static const struct board_info __initdat 
    130130        &board_nb4_ser_r2, 
    131131        &board_nb4_fxc_r1, 
  • trunk/target/linux/brcm63xx/patches-3.3/527-board_dva-g3810bn-tl-1.patch

    r32920 r32921  
    7373  
    7474 /* 
    75 @@ -2619,6 +2684,7 @@ static const struct board_info __initdat 
     75@@ -2617,6 +2682,7 @@ static const struct board_info __initdat 
    7676        &board_ct6373_1, 
    7777        &board_HW553, 
  • trunk/target/linux/brcm63xx/patches-3.3/801-ssb_export_fallback_sprom.patch

    r32893 r32921  
    99 #include <linux/spi/spi_gpio.h> 
    1010 #include <linux/spi/74x164.h> 
    11 @@ -2831,7 +2832,7 @@ static void __init nb4_nvram_fixup(void) 
     11@@ -2829,7 +2830,7 @@ static void __init nb4_nvram_fixup(void) 
    1212  * bcm4318 WLAN work 
    1313  */ 
     
    1818        .board_rev              = 0x17, 
    1919        .country_code           = 0x0, 
    20 @@ -2851,6 +2852,7 @@ static struct ssb_sprom bcm63xx_sprom = 
     20@@ -2849,6 +2850,7 @@ static struct ssb_sprom bcm63xx_sprom = 
    2121        .boardflags_lo          = 0x2848, 
    2222        .boardflags_hi          = 0x0000, 
Note: See TracChangeset for help on using the changeset viewer.