Changeset 44917


Ignore:
Timestamp:
2015-03-21T12:45:50+01:00 (3 years ago)
Author:
rmilecki
Message:

kernel: backport bgmac patches

This allows dropping some hacky bcm53xx bgmac patch forcing link state.

Signed-off-by: Rafał Miłecki <zajec5@…>

Location:
trunk/target/linux
Files:
8 added
1 deleted
6 edited
2 moved

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/generic/patches-3.18/072-bgmac-fix-device-initialization-on-Northstar-SoCs-co.patch

    r44916 r44917  
    1 From b053c5ad4d99d8f025efadd5c8b4bd84ea06eb6f Mon Sep 17 00:00:00 2001 
     1From 21697336d46b71dd031f29e426dda0b1e7f06cc0 Mon Sep 17 00:00:00 2001 
    22From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com> 
    3 Date: Wed, 11 Feb 2015 17:55:32 +0100 
    4 Subject: [PATCH FIX] bgmac: fix device initialization on Northstar SoCs 
    5  (condition typo) 
     3Date: Wed, 11 Feb 2015 18:06:34 +0100 
     4Subject: [PATCH] bgmac: fix device initialization on Northstar SoCs (condition 
     5 typo) 
    66MIME-Version: 1.0 
    77Content-Type: text/plain; charset=UTF-8 
     
    1313 
    1414Signed-off-by: Rafał Miłecki <zajec5@gmail.com> 
    15 --- 
    16 Can we have it for 3.20, please? 
     15Signed-off-by: David S. Miller <davem@davemloft.net> 
    1716--- 
    1817 drivers/net/ethernet/broadcom/bgmac.c | 5 +++-- 
    1918 1 file changed, 3 insertions(+), 2 deletions(-) 
    2019 
     20diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c 
     21index ea63cb0..676ffe0 100644 
    2122--- a/drivers/net/ethernet/broadcom/bgmac.c 
    2223+++ b/drivers/net/ethernet/broadcom/bgmac.c 
    23 @@ -1412,6 +1412,7 @@ static void bgmac_mii_unregister(struct 
     24@@ -1412,6 +1412,7 @@ static void bgmac_mii_unregister(struct bgmac *bgmac) 
    2425 /* http://bcm-v4.sipsolutions.net/mac-gbit/gmac/chipattach */ 
    2526 static int bgmac_probe(struct bcma_device *core) 
     
    2930        struct bgmac *bgmac; 
    3031        struct ssb_sprom *sprom = &core->bus->sprom; 
    31 @@ -1474,8 +1475,8 @@ static int bgmac_probe(struct bcma_devic 
     32@@ -1474,8 +1475,8 @@ static int bgmac_probe(struct bcma_device *core) 
    3233        bgmac_chip_reset(bgmac); 
    3334  
     
    4041                int ns_gmac; 
    4142  
     43--  
     441.8.4.5 
     45 
  • trunk/target/linux/generic/patches-3.18/773-bgmac-add-srab-switch.patch

    r44411 r44917  
    55--- a/drivers/net/ethernet/broadcom/bgmac.c 
    66+++ b/drivers/net/ethernet/broadcom/bgmac.c 
    7 @@ -16,6 +16,7 @@ 
    8  #include <linux/phy.h> 
     7@@ -17,6 +17,7 @@ 
     8 #include <linux/phy_fixed.h> 
    99 #include <linux/interrupt.h> 
    1010 #include <linux/dma-mapping.h> 
     
    1313  
    1414 static const struct bcma_device_id bgmac_bcma_tbl[] = { 
    15 @@ -1405,6 +1406,17 @@ static void bgmac_mii_unregister(struct 
     15@@ -1432,6 +1433,17 @@ static void bgmac_mii_unregister(struct 
    1616        mdiobus_free(mii_bus); 
    1717 } 
     
    3131  * BCMA bus ops 
    3232  **************************************************/ 
    33 @@ -1524,6 +1536,16 @@ static int bgmac_probe(struct bcma_devic 
     33@@ -1551,6 +1563,16 @@ static int bgmac_probe(struct bcma_devic 
    3434                goto err_dma_free; 
    3535        } 
     
    4848        if (err) { 
    4949                bgmac_err(bgmac, "Cannot register net device\n"); 
    50 @@ -1550,6 +1572,10 @@ static void bgmac_remove(struct bcma_dev 
     50@@ -1577,6 +1599,10 @@ static void bgmac_remove(struct bcma_dev 
    5151 { 
    5252        struct bgmac *bgmac = bcma_get_drvdata(core); 
  • trunk/target/linux/generic/patches-3.18/775-bgmac-check-length-of-received-frame.patch

    r43093 r44917  
    1010--- a/drivers/net/ethernet/broadcom/bgmac.c 
    1111+++ b/drivers/net/ethernet/broadcom/bgmac.c 
    12 @@ -363,6 +363,27 @@ static int bgmac_dma_rx_read(struct bgma 
     12@@ -361,6 +361,27 @@ static int bgmac_dma_rx_read(struct bgma 
    1313                        dma_addr_t old_dma_addr = slot->dma_addr; 
    1414                        int err; 
  • trunk/target/linux/generic/patches-3.19/070-bgmac-fix-device-initialization-on-Northstar-SoCs-co.patch

    r44916 r44917  
    1 From b053c5ad4d99d8f025efadd5c8b4bd84ea06eb6f Mon Sep 17 00:00:00 2001 
     1From 21697336d46b71dd031f29e426dda0b1e7f06cc0 Mon Sep 17 00:00:00 2001 
    22From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com> 
    3 Date: Wed, 11 Feb 2015 17:55:32 +0100 
    4 Subject: [PATCH FIX] bgmac: fix device initialization on Northstar SoCs 
    5  (condition typo) 
     3Date: Wed, 11 Feb 2015 18:06:34 +0100 
     4Subject: [PATCH] bgmac: fix device initialization on Northstar SoCs (condition 
     5 typo) 
    66MIME-Version: 1.0 
    77Content-Type: text/plain; charset=UTF-8 
     
    1313 
    1414Signed-off-by: Rafał Miłecki <zajec5@gmail.com> 
    15 --- 
    16 Can we have it for 3.20, please? 
     15Signed-off-by: David S. Miller <davem@davemloft.net> 
    1716--- 
    1817 drivers/net/ethernet/broadcom/bgmac.c | 5 +++-- 
    1918 1 file changed, 3 insertions(+), 2 deletions(-) 
    2019 
     20diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c 
     21index ea63cb0..676ffe0 100644 
    2122--- a/drivers/net/ethernet/broadcom/bgmac.c 
    2223+++ b/drivers/net/ethernet/broadcom/bgmac.c 
    23 @@ -1412,6 +1412,7 @@ static void bgmac_mii_unregister(struct 
     24@@ -1412,6 +1412,7 @@ static void bgmac_mii_unregister(struct bgmac *bgmac) 
    2425 /* http://bcm-v4.sipsolutions.net/mac-gbit/gmac/chipattach */ 
    2526 static int bgmac_probe(struct bcma_device *core) 
     
    2930        struct bgmac *bgmac; 
    3031        struct ssb_sprom *sprom = &core->bus->sprom; 
    31 @@ -1474,8 +1475,8 @@ static int bgmac_probe(struct bcma_devic 
     32@@ -1474,8 +1475,8 @@ static int bgmac_probe(struct bcma_device *core) 
    3233        bgmac_chip_reset(bgmac); 
    3334  
     
    4041                int ns_gmac; 
    4142  
     43--  
     441.8.4.5 
     45 
  • trunk/target/linux/generic/patches-3.19/773-bgmac-add-srab-switch.patch

    r44411 r44917  
    55--- a/drivers/net/ethernet/broadcom/bgmac.c 
    66+++ b/drivers/net/ethernet/broadcom/bgmac.c 
    7 @@ -16,6 +16,7 @@ 
    8  #include <linux/phy.h> 
     7@@ -17,6 +17,7 @@ 
     8 #include <linux/phy_fixed.h> 
    99 #include <linux/interrupt.h> 
    1010 #include <linux/dma-mapping.h> 
     
    1313  
    1414 static const struct bcma_device_id bgmac_bcma_tbl[] = { 
    15 @@ -1405,6 +1406,17 @@ static void bgmac_mii_unregister(struct 
     15@@ -1432,6 +1433,17 @@ static void bgmac_mii_unregister(struct 
    1616        mdiobus_free(mii_bus); 
    1717 } 
     
    3131  * BCMA bus ops 
    3232  **************************************************/ 
    33 @@ -1524,6 +1536,16 @@ static int bgmac_probe(struct bcma_devic 
     33@@ -1551,6 +1563,16 @@ static int bgmac_probe(struct bcma_devic 
    3434                goto err_dma_free; 
    3535        } 
     
    4848        if (err) { 
    4949                bgmac_err(bgmac, "Cannot register net device\n"); 
    50 @@ -1550,6 +1572,10 @@ static void bgmac_remove(struct bcma_dev 
     50@@ -1577,6 +1599,10 @@ static void bgmac_remove(struct bcma_dev 
    5151 { 
    5252        struct bgmac *bgmac = bcma_get_drvdata(core); 
  • trunk/target/linux/generic/patches-3.19/775-bgmac-check-length-of-received-frame.patch

    r43093 r44917  
    1010--- a/drivers/net/ethernet/broadcom/bgmac.c 
    1111+++ b/drivers/net/ethernet/broadcom/bgmac.c 
    12 @@ -363,6 +363,27 @@ static int bgmac_dma_rx_read(struct bgma 
     12@@ -361,6 +361,27 @@ static int bgmac_dma_rx_read(struct bgma 
    1313                        dma_addr_t old_dma_addr = slot->dma_addr; 
    1414                        int err; 
  • trunk/target/linux/generic/patches-4.0/773-bgmac-add-srab-switch.patch

    r44876 r44917  
    55--- a/drivers/net/ethernet/broadcom/bgmac.c 
    66+++ b/drivers/net/ethernet/broadcom/bgmac.c 
    7 @@ -16,6 +16,7 @@ 
    8  #include <linux/phy.h> 
     7@@ -17,6 +17,7 @@ 
     8 #include <linux/phy_fixed.h> 
    99 #include <linux/interrupt.h> 
    1010 #include <linux/dma-mapping.h> 
     
    1313  
    1414 static const struct bcma_device_id bgmac_bcma_tbl[] = { 
    15 @@ -1398,6 +1399,17 @@ static void bgmac_mii_unregister(struct 
     15@@ -1432,6 +1433,17 @@ static void bgmac_mii_unregister(struct 
    1616        mdiobus_free(mii_bus); 
    1717 } 
     
    3131  * BCMA bus ops 
    3232  **************************************************/ 
    33 @@ -1517,6 +1529,16 @@ static int bgmac_probe(struct bcma_devic 
     33@@ -1551,6 +1563,16 @@ static int bgmac_probe(struct bcma_devic 
    3434                goto err_dma_free; 
    3535        } 
     
    4848        if (err) { 
    4949                bgmac_err(bgmac, "Cannot register net device\n"); 
    50 @@ -1543,6 +1565,10 @@ static void bgmac_remove(struct bcma_dev 
     50@@ -1577,6 +1599,10 @@ static void bgmac_remove(struct bcma_dev 
    5151 { 
    5252        struct bgmac *bgmac = bcma_get_drvdata(core); 
  • trunk/target/linux/generic/patches-4.0/775-bgmac-check-length-of-received-frame.patch

    r44876 r44917  
    1010--- a/drivers/net/ethernet/broadcom/bgmac.c 
    1111+++ b/drivers/net/ethernet/broadcom/bgmac.c 
    12 @@ -360,6 +360,27 @@ static int bgmac_dma_rx_read(struct bgma 
     12@@ -361,6 +361,27 @@ static int bgmac_dma_rx_read(struct bgma 
    1313                        dma_addr_t old_dma_addr = slot->dma_addr; 
    1414                        int err; 
Note: See TracChangeset for help on using the changeset viewer.