kernel: bgmac: update patches
authorHauke Mehrtens <hauke@hauke-m.de>
Thu, 26 Dec 2013 23:22:31 +0000 (23:22 +0000)
committerHauke Mehrtens <hauke@hauke-m.de>
Thu, 26 Dec 2013 23:22:31 +0000 (23:22 +0000)
This updates the bgmac backport patch to the current upstream version
and adds some more patches mostly for BCM4707.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 39165

target/linux/bcm53xx/patches-3.10/202-bgmac-make-bgmac-work-on-systems-without-nvram.patch
target/linux/generic/patches-3.10/770-bgmac-backport.patch
target/linux/generic/patches-3.10/771-bgmac-pending.patch [new file with mode: 0644]
target/linux/generic/patches-3.10/771-bgmac-phylib.patch [deleted file]
target/linux/generic/patches-3.10/772-bgmac-add-supprot-for-BCM4707.patch
target/linux/generic/patches-3.10/773-bgmac-add-srab-switch.patch
target/linux/generic/patches-3.10/774-bgmac-add-some-workaround-for-rev-4.patch
target/linux/generic/patches-3.10/775-bgmac-check-length-of-received-frame.patch [new file with mode: 0644]
target/linux/generic/patches-3.10/776-bgmac-add-dma-sync.patch [new file with mode: 0644]

index aae20cbeac45ed04635f60f565db2e36f9a2c851..a8e0b0bce435b439c8a6cc9f46a6afba5d8b840a 100644 (file)
@@ -30,7 +30,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  
  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),
-@@ -1490,7 +1494,7 @@ static int bgmac_probe(struct bcma_devic
+@@ -1441,7 +1445,7 @@ static int bgmac_probe(struct bcma_devic
        int err;
  
        /* We don't support 2nd, 3rd, ... units, SPROM has to be adjusted */
@@ -39,7 +39,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
                pr_err("Unsupported core_unit %d\n", core->core_unit);
                return -ENOTSUPP;
        }
-@@ -1528,8 +1532,7 @@ static int bgmac_probe(struct bcma_devic
+@@ -1476,8 +1480,7 @@ static int bgmac_probe(struct bcma_devic
        }
        bgmac->cmn = core->bus->drv_gmac_cmn.core;
  
@@ -49,7 +49,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
        bgmac->phyaddr &= BGMAC_PHY_MASK;
        if (bgmac->phyaddr == BGMAC_PHY_MASK) {
                bgmac_err(bgmac, "No PHY found\n");
-@@ -1579,8 +1582,7 @@ static int bgmac_probe(struct bcma_devic
+@@ -1527,8 +1530,7 @@ static int bgmac_probe(struct bcma_devic
        /* TODO: reset the external phy. Specs are needed */
        bgmac_phy_reset(bgmac);
  
index 38a34a930f1d49a20b1eea34ec8b96ef196ebce8..c6c8736866217d0300daf3c5d3a353f2a8b7c949 100644 (file)
@@ -338,7 +338,156 @@ patches for bgmac backported from net-next/master
                            ring->num_slots * sizeof(struct bgmac_dma_desc));
  
                ring->start = 0;
-@@ -909,9 +958,9 @@ static void bgmac_chip_reset(struct bgma
+@@ -633,70 +682,6 @@ static int bgmac_phy_write(struct bgmac
+       return 0;
+ }
+-/* http://bcm-v4.sipsolutions.net/mac-gbit/gmac/chipphyforce */
+-static void bgmac_phy_force(struct bgmac *bgmac)
+-{
+-      u16 ctl;
+-      u16 mask = ~(BGMAC_PHY_CTL_SPEED | BGMAC_PHY_CTL_SPEED_MSB |
+-                   BGMAC_PHY_CTL_ANENAB | BGMAC_PHY_CTL_DUPLEX);
+-
+-      if (bgmac->phyaddr == BGMAC_PHY_NOREGS)
+-              return;
+-
+-      if (bgmac->autoneg)
+-              return;
+-
+-      ctl = bgmac_phy_read(bgmac, bgmac->phyaddr, BGMAC_PHY_CTL);
+-      ctl &= mask;
+-      if (bgmac->full_duplex)
+-              ctl |= BGMAC_PHY_CTL_DUPLEX;
+-      if (bgmac->speed == BGMAC_SPEED_100)
+-              ctl |= BGMAC_PHY_CTL_SPEED_100;
+-      else if (bgmac->speed == BGMAC_SPEED_1000)
+-              ctl |= BGMAC_PHY_CTL_SPEED_1000;
+-      bgmac_phy_write(bgmac, bgmac->phyaddr, BGMAC_PHY_CTL, ctl);
+-}
+-
+-/* http://bcm-v4.sipsolutions.net/mac-gbit/gmac/chipphyadvertise */
+-static void bgmac_phy_advertise(struct bgmac *bgmac)
+-{
+-      u16 adv;
+-
+-      if (bgmac->phyaddr == BGMAC_PHY_NOREGS)
+-              return;
+-
+-      if (!bgmac->autoneg)
+-              return;
+-
+-      /* Adv selected 10/100 speeds */
+-      adv = bgmac_phy_read(bgmac, bgmac->phyaddr, BGMAC_PHY_ADV);
+-      adv &= ~(BGMAC_PHY_ADV_10HALF | BGMAC_PHY_ADV_10FULL |
+-               BGMAC_PHY_ADV_100HALF | BGMAC_PHY_ADV_100FULL);
+-      if (!bgmac->full_duplex && bgmac->speed & BGMAC_SPEED_10)
+-              adv |= BGMAC_PHY_ADV_10HALF;
+-      if (!bgmac->full_duplex && bgmac->speed & BGMAC_SPEED_100)
+-              adv |= BGMAC_PHY_ADV_100HALF;
+-      if (bgmac->full_duplex && bgmac->speed & BGMAC_SPEED_10)
+-              adv |= BGMAC_PHY_ADV_10FULL;
+-      if (bgmac->full_duplex && bgmac->speed & BGMAC_SPEED_100)
+-              adv |= BGMAC_PHY_ADV_100FULL;
+-      bgmac_phy_write(bgmac, bgmac->phyaddr, BGMAC_PHY_ADV, adv);
+-
+-      /* Adv selected 1000 speeds */
+-      adv = bgmac_phy_read(bgmac, bgmac->phyaddr, BGMAC_PHY_ADV2);
+-      adv &= ~(BGMAC_PHY_ADV2_1000HALF | BGMAC_PHY_ADV2_1000FULL);
+-      if (!bgmac->full_duplex && bgmac->speed & BGMAC_SPEED_1000)
+-              adv |= BGMAC_PHY_ADV2_1000HALF;
+-      if (bgmac->full_duplex && bgmac->speed & BGMAC_SPEED_1000)
+-              adv |= BGMAC_PHY_ADV2_1000FULL;
+-      bgmac_phy_write(bgmac, bgmac->phyaddr, BGMAC_PHY_ADV2, adv);
+-
+-      /* Restart */
+-      bgmac_phy_write(bgmac, bgmac->phyaddr, BGMAC_PHY_CTL,
+-                      bgmac_phy_read(bgmac, bgmac->phyaddr, BGMAC_PHY_CTL) |
+-                      BGMAC_PHY_CTL_RESTART);
+-}
+-
+ /* http://bcm-v4.sipsolutions.net/mac-gbit/gmac/chipphyinit */
+ static void bgmac_phy_init(struct bgmac *bgmac)
+ {
+@@ -827,19 +812,28 @@ static void bgmac_clear_mib(struct bgmac
+ }
+ /* http://bcm-v4.sipsolutions.net/mac-gbit/gmac/gmac_speed */
+-static void bgmac_speed(struct bgmac *bgmac, int speed)
++static void bgmac_mac_speed(struct bgmac *bgmac)
+ {
+       u32 mask = ~(BGMAC_CMDCFG_ES_MASK | BGMAC_CMDCFG_HD);
+       u32 set = 0;
+-      if (speed & BGMAC_SPEED_10)
++      switch (bgmac->mac_speed) {
++      case SPEED_10:
+               set |= BGMAC_CMDCFG_ES_10;
+-      if (speed & BGMAC_SPEED_100)
++              break;
++      case SPEED_100:
+               set |= BGMAC_CMDCFG_ES_100;
+-      if (speed & BGMAC_SPEED_1000)
++              break;
++      case SPEED_1000:
+               set |= BGMAC_CMDCFG_ES_1000;
+-      if (!bgmac->full_duplex)
++              break;
++      default:
++              bgmac_err(bgmac, "Unsupported speed: %d\n", bgmac->mac_speed);
++      }
++
++      if (bgmac->mac_duplex == DUPLEX_HALF)
+               set |= BGMAC_CMDCFG_HD;
++
+       bgmac_cmdcfg_maskset(bgmac, mask, set, true);
+ }
+@@ -848,10 +842,9 @@ static void bgmac_miiconfig(struct bgmac
+       u8 imode = (bgmac_read(bgmac, BGMAC_DEV_STATUS) & BGMAC_DS_MM_MASK) >>
+                       BGMAC_DS_MM_SHIFT;
+       if (imode == 0 || imode == 1) {
+-              if (bgmac->autoneg)
+-                      bgmac_speed(bgmac, BGMAC_SPEED_100);
+-              else
+-                      bgmac_speed(bgmac, bgmac->speed);
++              bgmac->mac_speed = SPEED_100;
++              bgmac->mac_duplex = DUPLEX_FULL;
++              bgmac_mac_speed(bgmac);
+       }
+ }
+@@ -884,9 +877,9 @@ static void bgmac_chip_reset(struct bgma
+       }
+       iost = bcma_aread32(core, BCMA_IOST);
+-      if ((ci->id == BCMA_CHIP_ID_BCM5357 && ci->pkg == 10) ||
++      if ((ci->id == BCMA_CHIP_ID_BCM5357 && ci->pkg == BCMA_PKG_ID_BCM47186) ||
+           (ci->id == BCMA_CHIP_ID_BCM4749 && ci->pkg == 10) ||
+-          (ci->id == BCMA_CHIP_ID_BCM53572 && ci->pkg == 9))
++          (ci->id == BCMA_CHIP_ID_BCM53572 && ci->pkg == BCMA_PKG_ID_BCM47188))
+               iost &= ~BGMAC_BCMA_IOST_ATTACHED;
+       if (iost & BGMAC_BCMA_IOST_ATTACHED) {
+@@ -898,30 +891,35 @@ static void bgmac_chip_reset(struct bgma
+       bcma_core_enable(core, flags);
+       if (core->id.rev > 2) {
+-              bgmac_set(bgmac, BCMA_CLKCTLST, 1 << 8);
+-              bgmac_wait_value(bgmac->core, BCMA_CLKCTLST, 1 << 24, 1 << 24,
++              bgmac_set(bgmac, BCMA_CLKCTLST,
++                        BGMAC_BCMA_CLKCTLST_MISC_PLL_REQ);
++              bgmac_wait_value(bgmac->core, BCMA_CLKCTLST,
++                               BGMAC_BCMA_CLKCTLST_MISC_PLL_ST,
++                               BGMAC_BCMA_CLKCTLST_MISC_PLL_ST,
+                                1000);
+       }
+-      if (ci->id == BCMA_CHIP_ID_BCM5357 || ci->id == BCMA_CHIP_ID_BCM4749 ||
++      if (ci->id == BCMA_CHIP_ID_BCM5357 ||
++          ci->id == BCMA_CHIP_ID_BCM4749 ||
+           ci->id == BCMA_CHIP_ID_BCM53572) {
+               struct bcma_drv_cc *cc = &bgmac->core->bus->drv_cc;
                u8 et_swtype = 0;
                u8 sw_type = BGMAC_CHIPCTL_1_SW_TYPE_EPHY |
                             BGMAC_CHIPCTL_1_IF_TYPE_MII;
@@ -350,7 +499,30 @@ patches for bgmac backported from net-next/master
                        if (kstrtou8(buf, 0, &et_swtype))
                                bgmac_err(bgmac, "Failed to parse et_swtype (%s)\n",
                                          buf);
-@@ -970,6 +1019,8 @@ static void bgmac_chip_reset(struct bgma
+                       et_swtype &= 0x0f;
+                       et_swtype <<= 4;
+                       sw_type = et_swtype;
+-              } else if (ci->id == BCMA_CHIP_ID_BCM5357 && ci->pkg == 9) {
++              } else if (ci->id == BCMA_CHIP_ID_BCM5357 && ci->pkg == BCMA_PKG_ID_BCM5358) {
+                       sw_type = BGMAC_CHIPCTL_1_SW_TYPE_EPHYRMII;
+-              } else if ((ci->id != BCMA_CHIP_ID_BCM53572 && ci->pkg == 10) ||
+-                         (ci->id == BCMA_CHIP_ID_BCM53572 && ci->pkg == 9)) {
++              } else if ((ci->id == BCMA_CHIP_ID_BCM5357 && ci->pkg == BCMA_PKG_ID_BCM47186) ||
++                         (ci->id == BCMA_CHIP_ID_BCM4749 && ci->pkg == 10) ||
++                         (ci->id == BCMA_CHIP_ID_BCM53572 && ci->pkg == BCMA_PKG_ID_BCM47188)) {
+                       sw_type = BGMAC_CHIPCTL_1_IF_TYPE_RGMII |
+                                 BGMAC_CHIPCTL_1_SW_TYPE_RGMII;
+               }
+@@ -960,6 +958,8 @@ static void bgmac_chip_reset(struct bgma
+                            BGMAC_CMDCFG_CFE |
+                            BGMAC_CMDCFG_SR,
+                            false);
++      bgmac->mac_speed = SPEED_UNKNOWN;
++      bgmac->mac_duplex = DUPLEX_UNKNOWN;
+       bgmac_clear_mib(bgmac);
+       if (core->id.id == BCMA_CORE_4706_MAC_GBIT)
+@@ -970,6 +970,8 @@ static void bgmac_chip_reset(struct bgma
        bgmac_miiconfig(bgmac);
        bgmac_phy_init(bgmac);
  
@@ -359,8 +531,205 @@ patches for bgmac backported from net-next/master
        bgmac->int_status = 0;
  }
  
+@@ -1057,13 +1059,6 @@ static void bgmac_chip_init(struct bgmac
+       bgmac_write(bgmac, BGMAC_RXMAX_LENGTH, 32 + ETHER_MAX_LEN);
+-      if (!bgmac->autoneg) {
+-              bgmac_speed(bgmac, bgmac->speed);
+-              bgmac_phy_force(bgmac);
+-      } else if (bgmac->speed) { /* if there is anything to adv */
+-              bgmac_phy_advertise(bgmac);
+-      }
+-
+       if (full_init) {
+               bgmac_dma_init(bgmac);
+               if (1) /* FIXME: is there any case we don't want IRQs? */
+@@ -1153,6 +1148,8 @@ static int bgmac_open(struct net_device
+       }
+       napi_enable(&bgmac->napi);
++      phy_start(bgmac->phy_dev);
++
+       netif_carrier_on(net_dev);
+ err_out:
+@@ -1165,6 +1162,8 @@ static int bgmac_stop(struct net_device
+       netif_carrier_off(net_dev);
++      phy_stop(bgmac->phy_dev);
++
+       napi_disable(&bgmac->napi);
+       bgmac_chip_intrs_off(bgmac);
+       free_irq(bgmac->core->irq, net_dev);
+@@ -1243,61 +1242,16 @@ static int bgmac_get_settings(struct net
+ {
+       struct bgmac *bgmac = netdev_priv(net_dev);
+-      cmd->supported = SUPPORTED_10baseT_Half |
+-                       SUPPORTED_10baseT_Full |
+-                       SUPPORTED_100baseT_Half |
+-                       SUPPORTED_100baseT_Full |
+-                       SUPPORTED_1000baseT_Half |
+-                       SUPPORTED_1000baseT_Full |
+-                       SUPPORTED_Autoneg;
+-
+-      if (bgmac->autoneg) {
+-              WARN_ON(cmd->advertising);
+-              if (bgmac->full_duplex) {
+-                      if (bgmac->speed & BGMAC_SPEED_10)
+-                              cmd->advertising |= ADVERTISED_10baseT_Full;
+-                      if (bgmac->speed & BGMAC_SPEED_100)
+-                              cmd->advertising |= ADVERTISED_100baseT_Full;
+-                      if (bgmac->speed & BGMAC_SPEED_1000)
+-                              cmd->advertising |= ADVERTISED_1000baseT_Full;
+-              } else {
+-                      if (bgmac->speed & BGMAC_SPEED_10)
+-                              cmd->advertising |= ADVERTISED_10baseT_Half;
+-                      if (bgmac->speed & BGMAC_SPEED_100)
+-                              cmd->advertising |= ADVERTISED_100baseT_Half;
+-                      if (bgmac->speed & BGMAC_SPEED_1000)
+-                              cmd->advertising |= ADVERTISED_1000baseT_Half;
+-              }
+-      } else {
+-              switch (bgmac->speed) {
+-              case BGMAC_SPEED_10:
+-                      ethtool_cmd_speed_set(cmd, SPEED_10);
+-                      break;
+-              case BGMAC_SPEED_100:
+-                      ethtool_cmd_speed_set(cmd, SPEED_100);
+-                      break;
+-              case BGMAC_SPEED_1000:
+-                      ethtool_cmd_speed_set(cmd, SPEED_1000);
+-                      break;
+-              }
+-      }
+-
+-      cmd->duplex = bgmac->full_duplex ? DUPLEX_FULL : DUPLEX_HALF;
+-
+-      cmd->autoneg = bgmac->autoneg;
+-
+-      return 0;
++      return phy_ethtool_gset(bgmac->phy_dev, cmd);
+ }
+-#if 0
+ static int bgmac_set_settings(struct net_device *net_dev,
+                             struct ethtool_cmd *cmd)
+ {
+       struct bgmac *bgmac = netdev_priv(net_dev);
+-      return -1;
++      return phy_ethtool_sset(bgmac->phy_dev, cmd);
+ }
+-#endif
+ static void bgmac_get_drvinfo(struct net_device *net_dev,
+                             struct ethtool_drvinfo *info)
+@@ -1308,6 +1262,7 @@ static void bgmac_get_drvinfo(struct net
+ static const struct ethtool_ops bgmac_ethtool_ops = {
+       .get_settings           = bgmac_get_settings,
++      .set_settings           = bgmac_set_settings,
+       .get_drvinfo            = bgmac_get_drvinfo,
+ };
+@@ -1326,9 +1281,35 @@ static int bgmac_mii_write(struct mii_bu
+       return bgmac_phy_write(bus->priv, mii_id, regnum, value);
+ }
++static void bgmac_adjust_link(struct net_device *net_dev)
++{
++      struct bgmac *bgmac = netdev_priv(net_dev);
++      struct phy_device *phy_dev = bgmac->phy_dev;
++      bool update = false;
++
++      if (phy_dev->link) {
++              if (phy_dev->speed != bgmac->mac_speed) {
++                      bgmac->mac_speed = phy_dev->speed;
++                      update = true;
++              }
++
++              if (phy_dev->duplex != bgmac->mac_duplex) {
++                      bgmac->mac_duplex = phy_dev->duplex;
++                      update = true;
++              }
++      }
++
++      if (update) {
++              bgmac_mac_speed(bgmac);
++              phy_print_status(phy_dev);
++      }
++}
++
+ static int bgmac_mii_register(struct bgmac *bgmac)
+ {
+       struct mii_bus *mii_bus;
++      struct phy_device *phy_dev;
++      char bus_id[MII_BUS_ID_SIZE + 3];
+       int i, err = 0;
+       mii_bus = mdiobus_alloc();
+@@ -1360,8 +1341,22 @@ static int bgmac_mii_register(struct bgm
+       bgmac->mii_bus = mii_bus;
++      /* Connect to the PHY */
++      snprintf(bus_id, sizeof(bus_id), PHY_ID_FMT, mii_bus->id,
++               bgmac->phyaddr);
++      phy_dev = phy_connect(bgmac->net_dev, bus_id, &bgmac_adjust_link,
++                            PHY_INTERFACE_MODE_MII);
++      if (IS_ERR(phy_dev)) {
++              bgmac_err(bgmac, "PHY connecton failed\n");
++              err = PTR_ERR(phy_dev);
++              goto err_unregister_bus;
++      }
++      bgmac->phy_dev = phy_dev;
++
+       return err;
++err_unregister_bus:
++      mdiobus_unregister(mii_bus);
+ err_free_irq:
+       kfree(mii_bus->irq);
+ err_free_bus:
+@@ -1416,9 +1411,6 @@ static int bgmac_probe(struct bcma_devic
+       bcma_set_drvdata(core, bgmac);
+       /* Defaults */
+-      bgmac->autoneg = true;
+-      bgmac->full_duplex = true;
+-      bgmac->speed = BGMAC_SPEED_10 | BGMAC_SPEED_100 | BGMAC_SPEED_1000;
+       memcpy(bgmac->net_dev->dev_addr, mac, ETH_ALEN);
+       /* On BCM4706 we need common core to access PHY */
 --- a/drivers/net/ethernet/broadcom/bgmac.h
 +++ b/drivers/net/ethernet/broadcom/bgmac.h
+@@ -95,7 +95,11 @@
+ #define  BGMAC_RXQ_CTL_MDP_SHIFT              24
+ #define BGMAC_GPIO_SELECT                     0x194
+ #define BGMAC_GPIO_OUTPUT_EN                  0x198
+-/* For 0x1e0 see BCMA_CLKCTLST */
++
++/* For 0x1e0 see BCMA_CLKCTLST. Below are BGMAC specific bits */
++#define  BGMAC_BCMA_CLKCTLST_MISC_PLL_REQ     0x00000100
++#define  BGMAC_BCMA_CLKCTLST_MISC_PLL_ST      0x01000000
++
+ #define BGMAC_HW_WAR                          0x1e4
+ #define BGMAC_PWR_CTL                         0x1e8
+ #define BGMAC_DMA_BASE0                               0x200           /* Tx and Rx controller */
+@@ -342,10 +346,6 @@
+ #define BGMAC_CHIPCTL_1_SW_TYPE_RGMII         0x000000C0
+ #define BGMAC_CHIPCTL_1_RXC_DLL_BYPASS                0x00010000
+-#define BGMAC_SPEED_10                                0x0001
+-#define BGMAC_SPEED_100                               0x0002
+-#define BGMAC_SPEED_1000                      0x0004
+-
+ #define BGMAC_WEIGHT  64
+ #define ETHER_MAX_LEN   1518
 @@ -384,6 +384,8 @@ struct bgmac_dma_ring {
        u16 mmio_base;
        struct bgmac_dma_desc *cpu_base;
@@ -370,3 +739,25 @@ patches for bgmac backported from net-next/master
  
        struct bgmac_slot_info slots[BGMAC_RX_RING_SLOTS];
  };
+@@ -400,6 +402,7 @@ struct bgmac {
+       struct net_device *net_dev;
+       struct napi_struct napi;
+       struct mii_bus *mii_bus;
++      struct phy_device *phy_dev;
+       /* DMA */
+       struct bgmac_dma_ring tx_ring[BGMAC_MAX_TX_RINGS];
+@@ -414,10 +417,9 @@ struct bgmac {
+       u32 int_mask;
+       u32 int_status;
+-      /* Speed-related */
+-      int speed;
+-      bool autoneg;
+-      bool full_duplex;
++      /* Current MAC state */
++      int mac_speed;
++      int mac_duplex;
+       u8 phyaddr;
+       bool has_robosw;
diff --git a/target/linux/generic/patches-3.10/771-bgmac-pending.patch b/target/linux/generic/patches-3.10/771-bgmac-pending.patch
new file mode 100644 (file)
index 0000000..42a5fe3
--- /dev/null
@@ -0,0 +1,78 @@
+--- a/drivers/net/ethernet/broadcom/bgmac.c
++++ b/drivers/net/ethernet/broadcom/bgmac.c
+@@ -725,11 +725,9 @@ static void bgmac_phy_reset(struct bgmac
+       if (bgmac->phyaddr == BGMAC_PHY_NOREGS)
+               return;
+-      bgmac_phy_write(bgmac, bgmac->phyaddr, BGMAC_PHY_CTL,
+-                      BGMAC_PHY_CTL_RESET);
++      bgmac_phy_write(bgmac, bgmac->phyaddr, MII_BMCR, BMCR_RESET);
+       udelay(100);
+-      if (bgmac_phy_read(bgmac, bgmac->phyaddr, BGMAC_PHY_CTL) &
+-          BGMAC_PHY_CTL_RESET)
++      if (bgmac_phy_read(bgmac, bgmac->phyaddr, MII_BMCR) & BMCR_RESET)
+               bgmac_err(bgmac, "PHY reset failed\n");
+       bgmac_phy_init(bgmac);
+ }
+@@ -1200,27 +1198,11 @@ static int bgmac_set_mac_address(struct
+ static int bgmac_ioctl(struct net_device *net_dev, struct ifreq *ifr, int cmd)
+ {
+       struct bgmac *bgmac = netdev_priv(net_dev);
+-      struct mii_ioctl_data *data = if_mii(ifr);
+-      switch (cmd) {
+-      case SIOCGMIIPHY:
+-              data->phy_id = bgmac->phyaddr;
+-              /* fallthru */
+-      case SIOCGMIIREG:
+-              if (!netif_running(net_dev))
+-                      return -EAGAIN;
+-              data->val_out = bgmac_phy_read(bgmac, data->phy_id,
+-                                             data->reg_num & 0x1f);
+-              return 0;
+-      case SIOCSMIIREG:
+-              if (!netif_running(net_dev))
+-                      return -EAGAIN;
+-              bgmac_phy_write(bgmac, data->phy_id, data->reg_num & 0x1f,
+-                              data->val_in);
+-              return 0;
+-      default:
+-              return -EOPNOTSUPP;
+-      }
++      if (!netif_running(net_dev))
++              return -EINVAL;
++
++      return phy_mii_ioctl(bgmac->phy_dev, ifr, cmd);
+ }
+ static const struct net_device_ops bgmac_netdev_ops = {
+--- a/drivers/net/ethernet/broadcom/bgmac.h
++++ b/drivers/net/ethernet/broadcom/bgmac.h
+@@ -220,27 +220,6 @@
+ #define BGMAC_RX_STATUS                               0xb38
+ #define BGMAC_TX_STATUS                               0xb3c
+-#define BGMAC_PHY_CTL                         0x00
+-#define  BGMAC_PHY_CTL_SPEED_MSB              0x0040
+-#define  BGMAC_PHY_CTL_DUPLEX                 0x0100          /* duplex mode */
+-#define  BGMAC_PHY_CTL_RESTART                        0x0200          /* restart autonegotiation */
+-#define  BGMAC_PHY_CTL_ANENAB                 0x1000          /* enable autonegotiation */
+-#define  BGMAC_PHY_CTL_SPEED                  0x2000
+-#define  BGMAC_PHY_CTL_LOOP                   0x4000          /* loopback */
+-#define  BGMAC_PHY_CTL_RESET                  0x8000          /* reset */
+-/* Helpers */
+-#define  BGMAC_PHY_CTL_SPEED_10                       0
+-#define  BGMAC_PHY_CTL_SPEED_100              BGMAC_PHY_CTL_SPEED
+-#define  BGMAC_PHY_CTL_SPEED_1000             BGMAC_PHY_CTL_SPEED_MSB
+-#define BGMAC_PHY_ADV                         0x04
+-#define  BGMAC_PHY_ADV_10HALF                 0x0020          /* advertise 10MBits/s half duplex */
+-#define  BGMAC_PHY_ADV_10FULL                 0x0040          /* advertise 10MBits/s full duplex */
+-#define  BGMAC_PHY_ADV_100HALF                        0x0080          /* advertise 100MBits/s half duplex */
+-#define  BGMAC_PHY_ADV_100FULL                        0x0100          /* advertise 100MBits/s full duplex */
+-#define BGMAC_PHY_ADV2                                0x09
+-#define  BGMAC_PHY_ADV2_1000HALF              0x0100          /* advertise 1000MBits/s half duplex */
+-#define  BGMAC_PHY_ADV2_1000FULL              0x0200          /* advertise 1000MBits/s full duplex */
+-
+ /* BCMA GMAC core specific IO Control (BCMA_IOCTL) flags */
+ #define BGMAC_BCMA_IOCTL_SW_CLKEN             0x00000004      /* PHY Clock Enable */
+ #define BGMAC_BCMA_IOCTL_SW_RESET             0x00000008      /* PHY Reset */
diff --git a/target/linux/generic/patches-3.10/771-bgmac-phylib.patch b/target/linux/generic/patches-3.10/771-bgmac-phylib.patch
deleted file mode 100644 (file)
index 9f2584e..0000000
+++ /dev/null
@@ -1,194 +0,0 @@
-Use phy lib for the phy. This is needed to get the switch connected to 
-the phy and driven by b53 working.
-
-Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-
---- a/drivers/net/ethernet/broadcom/bgmac.c
-+++ b/drivers/net/ethernet/broadcom/bgmac.c
-@@ -1252,27 +1252,14 @@ static int bgmac_set_mac_address(struct
- static int bgmac_ioctl(struct net_device *net_dev, struct ifreq *ifr, int cmd)
- {
-       struct bgmac *bgmac = netdev_priv(net_dev);
--      struct mii_ioctl_data *data = if_mii(ifr);
--      switch (cmd) {
--      case SIOCGMIIPHY:
--              data->phy_id = bgmac->phyaddr;
--              /* fallthru */
--      case SIOCGMIIREG:
--              if (!netif_running(net_dev))
--                      return -EAGAIN;
--              data->val_out = bgmac_phy_read(bgmac, data->phy_id,
--                                             data->reg_num & 0x1f);
--              return 0;
--      case SIOCSMIIREG:
--              if (!netif_running(net_dev))
--                      return -EAGAIN;
--              bgmac_phy_write(bgmac, data->phy_id, data->reg_num & 0x1f,
--                              data->val_in);
--              return 0;
--      default:
--              return -EOPNOTSUPP;
--      }
-+      if (!netif_running(net_dev))
-+              return -EINVAL;
-+
-+      if (!bgmac->phydev)
-+              return -EINVAL;
-+
-+      return phy_mii_ioctl(bgmac->phydev, ifr, cmd);
- }
- static const struct net_device_ops bgmac_netdev_ops = {
-@@ -1294,61 +1281,16 @@ static int bgmac_get_settings(struct net
- {
-       struct bgmac *bgmac = netdev_priv(net_dev);
--      cmd->supported = SUPPORTED_10baseT_Half |
--                       SUPPORTED_10baseT_Full |
--                       SUPPORTED_100baseT_Half |
--                       SUPPORTED_100baseT_Full |
--                       SUPPORTED_1000baseT_Half |
--                       SUPPORTED_1000baseT_Full |
--                       SUPPORTED_Autoneg;
--
--      if (bgmac->autoneg) {
--              WARN_ON(cmd->advertising);
--              if (bgmac->full_duplex) {
--                      if (bgmac->speed & BGMAC_SPEED_10)
--                              cmd->advertising |= ADVERTISED_10baseT_Full;
--                      if (bgmac->speed & BGMAC_SPEED_100)
--                              cmd->advertising |= ADVERTISED_100baseT_Full;
--                      if (bgmac->speed & BGMAC_SPEED_1000)
--                              cmd->advertising |= ADVERTISED_1000baseT_Full;
--              } else {
--                      if (bgmac->speed & BGMAC_SPEED_10)
--                              cmd->advertising |= ADVERTISED_10baseT_Half;
--                      if (bgmac->speed & BGMAC_SPEED_100)
--                              cmd->advertising |= ADVERTISED_100baseT_Half;
--                      if (bgmac->speed & BGMAC_SPEED_1000)
--                              cmd->advertising |= ADVERTISED_1000baseT_Half;
--              }
--      } else {
--              switch (bgmac->speed) {
--              case BGMAC_SPEED_10:
--                      ethtool_cmd_speed_set(cmd, SPEED_10);
--                      break;
--              case BGMAC_SPEED_100:
--                      ethtool_cmd_speed_set(cmd, SPEED_100);
--                      break;
--              case BGMAC_SPEED_1000:
--                      ethtool_cmd_speed_set(cmd, SPEED_1000);
--                      break;
--              }
--      }
--
--      cmd->duplex = bgmac->full_duplex ? DUPLEX_FULL : DUPLEX_HALF;
--
--      cmd->autoneg = bgmac->autoneg;
--
--      return 0;
-+      return phy_ethtool_gset(bgmac->phydev, cmd);
- }
--#if 0
- static int bgmac_set_settings(struct net_device *net_dev,
-                             struct ethtool_cmd *cmd)
- {
-       struct bgmac *bgmac = netdev_priv(net_dev);
--      return -1;
-+      return phy_ethtool_sset(bgmac->phydev, cmd);
- }
--#endif
- static void bgmac_get_drvinfo(struct net_device *net_dev,
-                             struct ethtool_drvinfo *info)
-@@ -1359,6 +1301,7 @@ static void bgmac_get_drvinfo(struct net
- static const struct ethtool_ops bgmac_ethtool_ops = {
-       .get_settings           = bgmac_get_settings,
-+      .set_settings           = bgmac_set_settings,
-       .get_drvinfo            = bgmac_get_drvinfo,
- };
-@@ -1377,10 +1320,36 @@ static int bgmac_mii_write(struct mii_bu
-       return bgmac_phy_write(bus->priv, mii_id, regnum, value);
- }
-+static void bgmac_adjust_link(struct net_device *dev)
-+{
-+      struct bgmac *bgmac = netdev_priv(dev);
-+      struct phy_device *phydev = bgmac->phydev;
-+      bool status_changed = 0;
-+
-+      BUG_ON(!phydev);
-+
-+      if (bgmac->old_link != phydev->link) {
-+              status_changed = 1;
-+              bgmac->old_link = phydev->link;
-+      }
-+
-+      /* reflect duplex change */
-+      if (phydev->link && (bgmac->old_duplex != phydev->duplex)) {
-+              status_changed = 1;
-+              bgmac->old_duplex = phydev->duplex;
-+      }
-+
-+      if (status_changed)
-+              phy_print_status(phydev);
-+}
-+
- static int bgmac_mii_register(struct bgmac *bgmac)
- {
-       struct mii_bus *mii_bus;
-       int i, err = 0;
-+      struct phy_device *phydev = NULL;
-+      char phy_id[MII_BUS_ID_SIZE + 3];
-+      struct net_device *net_dev = bgmac->net_dev;
-       mii_bus = mdiobus_alloc();
-       if (!mii_bus)
-@@ -1411,7 +1380,28 @@ static int bgmac_mii_register(struct bgm
-       bgmac->mii_bus = mii_bus;
--      return err;
-+      /* connect to PHY */
-+      snprintf(phy_id, sizeof(phy_id), PHY_ID_FMT,
-+               mii_bus->id, bgmac->phyaddr);
-+
-+      phydev = phy_connect(net_dev, phy_id, &bgmac_adjust_link,
-+                           PHY_INTERFACE_MODE_MII);
-+
-+      if (IS_ERR(phydev)) {
-+              netdev_err(net_dev, "could not attach PHY: %s\n", phy_id);
-+              bgmac->phyaddr = BGMAC_PHY_NOREGS;
-+              return PTR_ERR(phydev);
-+      }
-+
-+      bgmac->phydev = phydev;
-+      bgmac->old_link = 0;
-+      bgmac->old_duplex = -1;
-+      bgmac->phyaddr = phydev->addr;
-+
-+      netdev_info(net_dev, "attached PHY driver [%s] (mii_bus:phy_addr=%s)\n",
-+                  phydev->drv->name, dev_name(&phydev->dev));
-+
-+      return 0;
- err_free_irq:
-       kfree(mii_bus->irq);
---- a/drivers/net/ethernet/broadcom/bgmac.h
-+++ b/drivers/net/ethernet/broadcom/bgmac.h
-@@ -401,7 +401,10 @@ struct bgmac {
-       struct bcma_device *cmn; /* Reference to CMN core for BCM4706 */
-       struct net_device *net_dev;
-       struct napi_struct napi;
-+      struct phy_device *phydev;
-       struct mii_bus *mii_bus;
-+      int old_link;
-+      int old_duplex;
-       /* DMA */
-       struct bgmac_dma_ring tx_ring[BGMAC_MAX_TX_RINGS];
index a4e51774d5ffae79230a6e43c4fb8d0d5d27359b..0e0b246eef195e4f511677b274102a36c586c5d3 100644 (file)
@@ -4,78 +4,57 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 
 --- a/drivers/net/ethernet/broadcom/bgmac.c
 +++ b/drivers/net/ethernet/broadcom/bgmac.c
-@@ -887,6 +887,8 @@ static void bgmac_speed(struct bgmac *bg
-               set |= BGMAC_CMDCFG_ES_100;
-       if (speed & BGMAC_SPEED_1000)
+@@ -825,6 +825,9 @@ static void bgmac_mac_speed(struct bgmac
+       case SPEED_1000:
                set |= BGMAC_CMDCFG_ES_1000;
-+      if (speed & BGMAC_SPEED_2500)
+               break;
++      case SPEED_2500:
 +              set |= BGMAC_CMDCFG_ES_2500;
-       if (!bgmac->full_duplex)
-               set |= BGMAC_CMDCFG_HD;
-       bgmac_cmdcfg_maskset(bgmac, mask, set, true);
-@@ -894,13 +896,28 @@ static void bgmac_speed(struct bgmac *bg
++              break;
+       default:
+               bgmac_err(bgmac, "Unsupported speed: %d\n", bgmac->mac_speed);
+       }
+@@ -837,12 +840,25 @@ static void bgmac_mac_speed(struct bgmac
  
  static void bgmac_miiconfig(struct bgmac *bgmac)
  {
 -      u8 imode = (bgmac_read(bgmac, BGMAC_DEV_STATUS) & BGMAC_DS_MM_MASK) >>
 -                      BGMAC_DS_MM_SHIFT;
 -      if (imode == 0 || imode == 1) {
--              if (bgmac->autoneg)
--                      bgmac_speed(bgmac, BGMAC_SPEED_100);
--              else
+-              bgmac->mac_speed = SPEED_100;
 +      struct bcma_device *core = bgmac->core;
 +      struct bcma_chipinfo *ci = &core->bus->chipinfo;
++      u8 imode;
 +
 +      if (ci->id == BCMA_CHIP_ID_BCM4707 ||
 +          ci->id == BCMA_CHIP_ID_BCM53018) {
-+              if (bgmac->autoneg) {
-+                      bcma_awrite32(core, BCMA_IOCTL,
-+                                    bcma_aread32(core, BCMA_IOCTL) | 0x44);
-+
-+                      bgmac_speed(bgmac, BGMAC_SPEED_2500);
-+              } else {
-                       bgmac_speed(bgmac, bgmac->speed);
-+              }
++              bcma_awrite32(core, BCMA_IOCTL,
++                            bcma_aread32(core, BCMA_IOCTL) | 0x44);
++              bgmac->mac_speed = SPEED_2500;
+               bgmac->mac_duplex = DUPLEX_FULL;
+               bgmac_mac_speed(bgmac);
 +      } else {
-+              u8 imode = (bgmac_read(bgmac, BGMAC_DEV_STATUS) &
-+                          BGMAC_DS_MM_MASK) >> BGMAC_DS_MM_SHIFT;
++              imode = (bgmac_read(bgmac, BGMAC_DEV_STATUS) & BGMAC_DS_MM_MASK) >>
++                      BGMAC_DS_MM_SHIFT;
 +              if (imode == 0 || imode == 1) {
-+                      if (bgmac->autoneg)
-+                              bgmac_speed(bgmac, BGMAC_SPEED_100);
-+                      else
-+                              bgmac_speed(bgmac, bgmac->speed);
++                      bgmac->mac_speed = SPEED_100;
++                      bgmac->mac_duplex = DUPLEX_FULL;
++                      bgmac_mac_speed(bgmac);
 +              }
        }
  }
  
-@@ -946,7 +963,8 @@ static void bgmac_chip_reset(struct bgma
+@@ -888,7 +904,8 @@ static void bgmac_chip_reset(struct bgma
  
        bcma_core_enable(core, flags);
  
 -      if (core->id.rev > 2) {
 +      if (core->id.rev > 2 && ci->id != BCMA_CHIP_ID_BCM4707 &&
 +          ci->id != BCMA_CHIP_ID_BCM53018) {
-               bgmac_set(bgmac, BCMA_CLKCTLST, 1 << 8);
-               bgmac_wait_value(bgmac->core, BCMA_CLKCTLST, 1 << 24, 1 << 24,
-                                1000);
-@@ -967,10 +985,13 @@ static void bgmac_chip_reset(struct bgma
-                       et_swtype &= 0x0f;
-                       et_swtype <<= 4;
-                       sw_type = et_swtype;
--              } else if (ci->id == BCMA_CHIP_ID_BCM5357 && ci->pkg == 9) {
-+              } else if (ci->id == BCMA_CHIP_ID_BCM5357 &&
-+                         ci->pkg == BCMA_PKG_ID_BCM5358) {
-                       sw_type = BGMAC_CHIPCTL_1_SW_TYPE_EPHYRMII;
--              } else if ((ci->id != BCMA_CHIP_ID_BCM53572 && ci->pkg == 10) ||
--                         (ci->id == BCMA_CHIP_ID_BCM53572 && ci->pkg == 9)) {
-+              } else if ((ci->id != BCMA_CHIP_ID_BCM53572 &&
-+                          ci->pkg == BCMA_PKG_ID_BCM47186) ||
-+                         (ci->id == BCMA_CHIP_ID_BCM53572 &&
-+                          ci->pkg == BCMA_PKG_ID_BCM47188)) {
-                       sw_type = BGMAC_CHIPCTL_1_IF_TYPE_RGMII |
-                                 BGMAC_CHIPCTL_1_SW_TYPE_RGMII;
-               }
-@@ -1077,12 +1098,15 @@ static void bgmac_enable(struct bgmac *b
+               bgmac_set(bgmac, BCMA_CLKCTLST,
+                         BGMAC_BCMA_CLKCTLST_MISC_PLL_REQ);
+               bgmac_wait_value(bgmac->core, BCMA_CLKCTLST,
+@@ -1026,12 +1043,15 @@ static void bgmac_enable(struct bgmac *b
                break;
        }
  
@@ -97,7 +76,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  }
  
  /* http://bcm-v4.sipsolutions.net/mac-gbit/gmac/chipinit */
-@@ -1488,6 +1512,25 @@ static int bgmac_probe(struct bcma_devic
+@@ -1421,6 +1441,25 @@ static int bgmac_probe(struct bcma_devic
                goto err_netdev_free;
        }
  
@@ -125,7 +104,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
        err = bgmac_dma_alloc(bgmac);
 --- a/drivers/net/ethernet/broadcom/bgmac.h
 +++ b/drivers/net/ethernet/broadcom/bgmac.h
-@@ -185,6 +185,7 @@
+@@ -189,6 +189,7 @@
  #define   BGMAC_CMDCFG_ES_10                  0x00000000
  #define   BGMAC_CMDCFG_ES_100                 0x00000004
  #define   BGMAC_CMDCFG_ES_1000                        0x00000008
@@ -133,11 +112,3 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  #define  BGMAC_CMDCFG_PROM                    0x00000010      /* Set to activate promiscuous mode */
  #define  BGMAC_CMDCFG_PAD_EN                  0x00000020
  #define  BGMAC_CMDCFG_CF                      0x00000040
-@@ -345,6 +346,7 @@
- #define BGMAC_SPEED_10                                0x0001
- #define BGMAC_SPEED_100                               0x0002
- #define BGMAC_SPEED_1000                      0x0004
-+#define BGMAC_SPEED_2500                      0x0008
- #define BGMAC_WEIGHT  64
index be253064b11d2946422143319ff79d7711621514..a60ba3ce6638f0940173ed5a536448cd63d92151 100644 (file)
@@ -12,7 +12,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  #include <bcm47xx_nvram.h>
  
  static const struct bcma_device_id bgmac_bcma_tbl[] = {
-@@ -1443,6 +1444,17 @@ static void bgmac_mii_unregister(struct
+@@ -1375,6 +1376,17 @@ static void bgmac_mii_unregister(struct
        mdiobus_free(mii_bus);
  }
  
@@ -30,7 +30,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  /**************************************************
   * BCMA bus ops
   **************************************************/
-@@ -1561,6 +1573,16 @@ static int bgmac_probe(struct bcma_devic
+@@ -1490,6 +1502,16 @@ static int bgmac_probe(struct bcma_devic
                goto err_dma_free;
        }
  
@@ -47,7 +47,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
        err = register_netdev(bgmac->net_dev);
        if (err) {
                bgmac_err(bgmac, "Cannot register net device\n");
-@@ -1590,6 +1612,10 @@ static void bgmac_remove(struct bcma_dev
+@@ -1519,6 +1541,10 @@ static void bgmac_remove(struct bcma_dev
  {
        struct bgmac *bgmac = bcma_get_drvdata(core);
  
@@ -60,7 +60,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
        bgmac_mii_unregister(bgmac);
 --- a/drivers/net/ethernet/broadcom/bgmac.h
 +++ b/drivers/net/ethernet/broadcom/bgmac.h
-@@ -430,6 +430,9 @@ struct bgmac {
+@@ -405,6 +405,9 @@ struct bgmac {
        bool has_robosw;
  
        bool loopback;
index 4e1a449b902750c493efcdc15fafbd97e7702205..659c66e40b8700ff7651a79d4eaae771d50aa56b 100644 (file)
@@ -14,7 +14,7 @@ Subject: [PATCH] bgmac: add some workaround for rev 4
        u32 ctl;
  
        ctl = bgmac_read(bgmac, ring->mmio_base + BGMAC_DMA_TX_CTL);
-+      if (bgmac->core->id.rev == 4) {
++      if (bgmac->core->id.rev >= 4) {
 +              ctl &= ~BGMAC_DMA_TX_BL_MASK;
 +              ctl |= BGMAC_DMA_TX_BL_128 << BGMAC_DMA_TX_BL_SHIFT;
 +              ctl &= ~BGMAC_DMA_TX_MR_MASK;
@@ -32,7 +32,7 @@ Subject: [PATCH] bgmac: add some workaround for rev 4
        ctl |= BGMAC_DMA_RX_OVERFLOW_CONT;
        ctl |= BGMAC_RX_FRAME_OFFSET << BGMAC_DMA_RX_FRAME_OFFSET_SHIFT;
 +
-+      if (bgmac->core->id.rev == 4) {
++      if (bgmac->core->id.rev >= 4) {
 +              ctl &= ~BGMAC_DMA_RX_BL_MASK;
 +              ctl |= BGMAC_DMA_RX_BL_128 << BGMAC_DMA_RX_BL_SHIFT;
 +
@@ -45,7 +45,7 @@ Subject: [PATCH] bgmac: add some workaround for rev 4
        bgmac_write(bgmac, ring->mmio_base + BGMAC_DMA_RX_CTL, ctl);
  }
  
-@@ -812,13 +833,13 @@ static void bgmac_cmdcfg_maskset(struct
+@@ -746,13 +767,13 @@ static void bgmac_cmdcfg_maskset(struct
        u32 cmdcfg = bgmac_read(bgmac, BGMAC_CMDCFG);
        u32 new_val = (cmdcfg & mask) | set;
  
@@ -61,16 +61,16 @@ Subject: [PATCH] bgmac: add some workaround for rev 4
        udelay(2);
  }
  
-@@ -1029,7 +1050,7 @@ static void bgmac_chip_reset(struct bgma
+@@ -972,7 +993,7 @@ static void bgmac_chip_reset(struct bgma
                             BGMAC_CMDCFG_PROM |
                             BGMAC_CMDCFG_NLC |
                             BGMAC_CMDCFG_CFE |
 -                           BGMAC_CMDCFG_SR,
 +                           BGMAC_CMDCFG_SR(core->id.rev),
                             false);
-       bgmac_clear_mib(bgmac);
-@@ -1070,7 +1091,7 @@ static void bgmac_enable(struct bgmac *b
+       bgmac->mac_speed = SPEED_UNKNOWN;
+       bgmac->mac_duplex = DUPLEX_UNKNOWN;
+@@ -1015,7 +1036,7 @@ static void bgmac_enable(struct bgmac *b
  
        cmdcfg = bgmac_read(bgmac, BGMAC_CMDCFG);
        bgmac_cmdcfg_maskset(bgmac, ~(BGMAC_CMDCFG_TE | BGMAC_CMDCFG_RE),
@@ -81,7 +81,7 @@ Subject: [PATCH] bgmac: add some workaround for rev 4
        bgmac_write(bgmac, BGMAC_CMDCFG, cmdcfg);
 --- a/drivers/net/ethernet/broadcom/bgmac.h
 +++ b/drivers/net/ethernet/broadcom/bgmac.h
-@@ -194,7 +194,9 @@
+@@ -198,7 +198,9 @@
  #define  BGMAC_CMDCFG_TAI                     0x00000200
  #define  BGMAC_CMDCFG_HD                      0x00000400      /* Set if in half duplex mode */
  #define  BGMAC_CMDCFG_HD_SHIFT                        10
@@ -92,7 +92,7 @@ Subject: [PATCH] bgmac: add some workaround for rev 4
  #define  BGMAC_CMDCFG_ML                      0x00008000      /* Set to activate mac loopback mode */
  #define  BGMAC_CMDCFG_AE                      0x00400000
  #define  BGMAC_CMDCFG_CFE                     0x00800000
-@@ -255,9 +257,34 @@
+@@ -238,9 +240,34 @@
  #define  BGMAC_DMA_TX_SUSPEND                 0x00000002
  #define  BGMAC_DMA_TX_LOOPBACK                        0x00000004
  #define  BGMAC_DMA_TX_FLUSH                   0x00000010
@@ -127,7 +127,7 @@ Subject: [PATCH] bgmac: add some workaround for rev 4
  #define BGMAC_DMA_TX_INDEX                    0x04
  #define BGMAC_DMA_TX_RINGLO                   0x08
  #define BGMAC_DMA_TX_RINGHI                   0x0C
-@@ -285,8 +312,33 @@
+@@ -268,8 +295,33 @@
  #define  BGMAC_DMA_RX_DIRECT_FIFO             0x00000100
  #define  BGMAC_DMA_RX_OVERFLOW_CONT           0x00000400
  #define  BGMAC_DMA_RX_PARITY_DISABLE          0x00000800
diff --git a/target/linux/generic/patches-3.10/775-bgmac-check-length-of-received-frame.patch b/target/linux/generic/patches-3.10/775-bgmac-check-length-of-received-frame.patch
new file mode 100644 (file)
index 0000000..3b818be
--- /dev/null
@@ -0,0 +1,41 @@
+From 2d12a9abf3f81de5b51852e3cfcba8cedac82642 Mon Sep 17 00:00:00 2001
+From: Hauke Mehrtens <hauke@hauke-m.de>
+Date: Fri, 6 Dec 2013 01:14:52 +0100
+Subject: [PATCH] bgmac: check length of received frame
+
+---
+ drivers/net/ethernet/broadcom/bgmac.c |    9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+--- a/drivers/net/ethernet/broadcom/bgmac.c
++++ b/drivers/net/ethernet/broadcom/bgmac.c
+@@ -347,6 +347,7 @@ static int bgmac_dma_rx_read(struct bgma
+               struct sk_buff *skb = slot->skb;
+               struct bgmac_rx_header *rx;
+               u16 len, flags;
++              int count;
+               /* Unmap buffer to make it accessible to the CPU */
+               dma_sync_single_for_cpu(dma_dev, slot->dma_addr,
+@@ -355,6 +356,12 @@ static int bgmac_dma_rx_read(struct bgma
+               /* Get info from the header */
+               rx = (struct bgmac_rx_header *)skb->data;
+               len = le16_to_cpu(rx->len);
++              for (count = 0; count < 200; count++) {
++                      len = le16_to_cpu(rx->len);
++                      if (len)
++                              break;
++                      udelay(1);
++              }
+               flags = le16_to_cpu(rx->flags);
+               do {
+@@ -362,7 +369,7 @@ static int bgmac_dma_rx_read(struct bgma
+                       int err;
+                       /* Check for poison and drop or pass the packet */
+-                      if (len == 0xdead && flags == 0xbeef) {
++                      if (!len || (len == 0xdead && flags == 0xbeef)) {
+                               bgmac_err(bgmac, "Found poisoned packet at slot %d, DMA issue!\n",
+                                         ring->start);
+                               dma_sync_single_for_device(dma_dev,
diff --git a/target/linux/generic/patches-3.10/776-bgmac-add-dma-sync.patch b/target/linux/generic/patches-3.10/776-bgmac-add-dma-sync.patch
new file mode 100644 (file)
index 0000000..29fdd6b
--- /dev/null
@@ -0,0 +1,46 @@
+From 88d0993dbe84a9b88212a4845fca28bf4c919ffb Mon Sep 17 00:00:00 2001
+From: Hauke Mehrtens <hauke@hauke-m.de>
+Date: Tue, 26 Nov 2013 23:59:32 +0100
+Subject: [PATCH 14/16] bgmac: stuff
+
+---
+ drivers/net/ethernet/broadcom/bgmac.c |    7 +++++++
+ 1 file changed, 7 insertions(+)
+
+--- a/drivers/net/ethernet/broadcom/bgmac.c
++++ b/drivers/net/ethernet/broadcom/bgmac.c
+@@ -120,6 +120,7 @@ static netdev_tx_t bgmac_dma_tx_add(stru
+       struct net_device *net_dev = bgmac->net_dev;
+       struct bgmac_dma_desc *dma_desc;
+       struct bgmac_slot_info *slot;
++      int size = ring->num_slots * sizeof(struct bgmac_dma_desc);
+       u32 ctl0, ctl1;
+       int free_slots;
+@@ -160,6 +161,8 @@ static netdev_tx_t bgmac_dma_tx_add(stru
+       dma_desc->ctl0 = cpu_to_le32(ctl0);
+       dma_desc->ctl1 = cpu_to_le32(ctl1);
++      dma_sync_single_for_device(dma_dev, ring->dma_base, size, DMA_TO_DEVICE);
++
+       netdev_sent_queue(net_dev, skb->len);
+       wmb();
+@@ -311,6 +314,8 @@ static void bgmac_dma_rx_setup_desc(stru
+                                   struct bgmac_dma_ring *ring, int desc_idx)
+ {
+       struct bgmac_dma_desc *dma_desc = ring->cpu_base + desc_idx;
++      struct device *dma_dev = bgmac->core->dma_dev;
++      int size = ring->num_slots * sizeof(struct bgmac_dma_desc);
+       u32 ctl0 = 0, ctl1 = 0;
+       if (desc_idx == ring->num_slots - 1)
+@@ -325,6 +330,8 @@ static void bgmac_dma_rx_setup_desc(stru
+       dma_desc->addr_high = cpu_to_le32(upper_32_bits(ring->slots[desc_idx].dma_addr));
+       dma_desc->ctl0 = cpu_to_le32(ctl0);
+       dma_desc->ctl1 = cpu_to_le32(ctl1);
++
++      dma_sync_single_for_device(dma_dev, ring->dma_base, size, DMA_TO_DEVICE);
+ }
+ static int bgmac_dma_rx_read(struct bgmac *bgmac, struct bgmac_dma_ring *ring,