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: 39165master
parent
ac8d562503
commit
bc3d934148
@ -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 */
|
@ -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];
|
@ -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,
|
@ -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,
|
Loading…
Reference in new issue