aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm53xx
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-10-02 22:25:26 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2013-10-02 22:25:26 +0000
commit125fc703bb1477599809db96e5d62a1915864fad (patch)
treed76f4136170f30410d8b653febd478d90b6feaf0 /target/linux/bcm53xx
parent06c8b90ebf32eacd45ff196c4c58e51ec7321868 (diff)
downloadupstream-125fc703bb1477599809db96e5d62a1915864fad.tar.gz
upstream-125fc703bb1477599809db96e5d62a1915864fad.tar.bz2
upstream-125fc703bb1477599809db96e5d62a1915864fad.zip
kernel: bgmac: move other bgmac patches to generic
The bgmac driver will be used on the brcm47xx and the bcm53xx target. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 38289
Diffstat (limited to 'target/linux/bcm53xx')
-rw-r--r--target/linux/bcm53xx/patches-3.10/202-bgmac-make-bgmac-work-on-systems-without-nvram.patch4
-rw-r--r--target/linux/bcm53xx/patches-3.10/203-bgmac-register-phy.patch189
-rw-r--r--target/linux/bcm53xx/patches-3.10/204-bgmac-add-supprot-for-BCM4707.patch122
-rw-r--r--target/linux/bcm53xx/patches-3.10/205-bgmac-add-srab-switch.patch68
4 files changed, 2 insertions, 381 deletions
diff --git a/target/linux/bcm53xx/patches-3.10/202-bgmac-make-bgmac-work-on-systems-without-nvram.patch b/target/linux/bcm53xx/patches-3.10/202-bgmac-make-bgmac-work-on-systems-without-nvram.patch
index eda49b6416..07ba44a53e 100644
--- a/target/linux/bcm53xx/patches-3.10/202-bgmac-make-bgmac-work-on-systems-without-nvram.patch
+++ b/target/linux/bcm53xx/patches-3.10/202-bgmac-make-bgmac-work-on-systems-without-nvram.patch
@@ -7,10 +7,10 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
--- a/drivers/net/ethernet/broadcom/bgmac.c
+++ b/drivers/net/ethernet/broadcom/bgmac.c
-@@ -16,7 +16,11 @@
- #include <linux/phy.h>
+@@ -17,7 +17,11 @@
#include <linux/interrupt.h>
#include <linux/dma-mapping.h>
+ #include <linux/platform_data/b53.h>
+#ifdef CONFIG_BCM47XX
#include <bcm47xx_nvram.h>
+#else
diff --git a/target/linux/bcm53xx/patches-3.10/203-bgmac-register-phy.patch b/target/linux/bcm53xx/patches-3.10/203-bgmac-register-phy.patch
deleted file mode 100644
index 7bf66dfaf4..0000000000
--- a/target/linux/bcm53xx/patches-3.10/203-bgmac-register-phy.patch
+++ /dev/null
@@ -1,189 +0,0 @@
---- a/drivers/net/ethernet/broadcom/bgmac.c
-+++ b/drivers/net/ethernet/broadcom/bgmac.c
-@@ -1233,27 +1233,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 = {
-@@ -1275,61 +1262,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)
-@@ -1340,6 +1282,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,
- };
-
-@@ -1358,10 +1301,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)
-@@ -1392,7 +1361,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];
diff --git a/target/linux/bcm53xx/patches-3.10/204-bgmac-add-supprot-for-BCM4707.patch b/target/linux/bcm53xx/patches-3.10/204-bgmac-add-supprot-for-BCM4707.patch
deleted file mode 100644
index 63959a9570..0000000000
--- a/target/linux/bcm53xx/patches-3.10/204-bgmac-add-supprot-for-BCM4707.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-bgmac: add supprot for BCM4707
-
-
-Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
----
- drivers/net/ethernet/broadcom/bgmac.c | 56 +++++++++++++++++++++++----------
- drivers/net/ethernet/broadcom/bgmac.h | 2 ++
- 2 files changed, 42 insertions(+), 16 deletions(-)
-
---- a/drivers/net/ethernet/broadcom/bgmac.c
-+++ b/drivers/net/ethernet/broadcom/bgmac.c
-@@ -868,6 +868,8 @@ static void bgmac_speed(struct bgmac *bg
- set |= BGMAC_CMDCFG_ES_100;
- if (speed & BGMAC_SPEED_1000)
- set |= BGMAC_CMDCFG_ES_1000;
-+ if (speed & BGMAC_SPEED_2500)
-+ set |= BGMAC_CMDCFG_ES_2500;
- if (!bgmac->full_duplex)
- set |= BGMAC_CMDCFG_HD;
- bgmac_cmdcfg_maskset(bgmac, mask, set, true);
-@@ -875,13 +877,28 @@ static void bgmac_speed(struct bgmac *bg
-
- 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
-+ struct bcma_device *core = bgmac->core;
-+ struct bcma_chipinfo *ci = &core->bus->chipinfo;
-+
-+ 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);
-+ }
-+ } else {
-+ 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);
-+ }
- }
- }
-
-@@ -927,7 +944,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);
-@@ -948,10 +966,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;
- }
-@@ -1058,12 +1079,15 @@ static void bgmac_enable(struct bgmac *b
- break;
- }
-
-- rxq_ctl = bgmac_read(bgmac, BGMAC_RXQ_CTL);
-- rxq_ctl &= ~BGMAC_RXQ_CTL_MDP_MASK;
-- bp_clk = bcma_pmu_get_bus_clock(&bgmac->core->bus->drv_cc) / 1000000;
-- mdp = (bp_clk * 128 / 1000) - 3;
-- rxq_ctl |= (mdp << BGMAC_RXQ_CTL_MDP_SHIFT);
-- bgmac_write(bgmac, BGMAC_RXQ_CTL, rxq_ctl);
-+ if (ci->id != BCMA_CHIP_ID_BCM4707 &&
-+ ci->id != BCMA_CHIP_ID_BCM53018) {
-+ rxq_ctl = bgmac_read(bgmac, BGMAC_RXQ_CTL);
-+ rxq_ctl &= ~BGMAC_RXQ_CTL_MDP_MASK;
-+ bp_clk = bcma_pmu_get_bus_clock(&bgmac->core->bus->drv_cc) / 1000000;
-+ mdp = (bp_clk * 128 / 1000) - 3;
-+ rxq_ctl |= (mdp << BGMAC_RXQ_CTL_MDP_SHIFT);
-+ bgmac_write(bgmac, BGMAC_RXQ_CTL, rxq_ctl);
-+ }
- }
-
- /* http://bcm-v4.sipsolutions.net/mac-gbit/gmac/chipinit */
---- a/drivers/net/ethernet/broadcom/bgmac.h
-+++ b/drivers/net/ethernet/broadcom/bgmac.h
-@@ -185,6 +185,7 @@
- #define BGMAC_CMDCFG_ES_10 0x00000000
- #define BGMAC_CMDCFG_ES_100 0x00000004
- #define BGMAC_CMDCFG_ES_1000 0x00000008
-+#define BGMAC_CMDCFG_ES_2500 0x0000000C
- #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
-
diff --git a/target/linux/bcm53xx/patches-3.10/205-bgmac-add-srab-switch.patch b/target/linux/bcm53xx/patches-3.10/205-bgmac-add-srab-switch.patch
deleted file mode 100644
index cb498154a4..0000000000
--- a/target/linux/bcm53xx/patches-3.10/205-bgmac-add-srab-switch.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- a/drivers/net/ethernet/broadcom/bgmac.c
-+++ b/drivers/net/ethernet/broadcom/bgmac.c
-@@ -16,6 +16,7 @@
- #include <linux/phy.h>
- #include <linux/interrupt.h>
- #include <linux/dma-mapping.h>
-+#include <linux/platform_data/b53.h>
- #ifdef CONFIG_BCM47XX
- #include <bcm47xx_nvram.h>
- #else
-@@ -1424,6 +1425,17 @@ static void bgmac_mii_unregister(struct
- mdiobus_free(mii_bus);
- }
-
-+static struct b53_platform_data bgmac_b53_pdata = {
-+};
-+
-+static struct platform_device bgmac_b53_dev = {
-+ .name = "b53-srab-switch",
-+ .id = -1,
-+ .dev = {
-+ .platform_data = &bgmac_b53_pdata,
-+ },
-+};
-+
- /**************************************************
- * BCMA bus ops
- **************************************************/
-@@ -1523,6 +1535,16 @@ static int bgmac_probe(struct bcma_devic
- goto err_dma_free;
- }
-
-+ if (core->id.id != BCMA_CHIP_ID_BCM4707 &&
-+ core->id.id != BCMA_CHIP_ID_BCM53018 &&
-+ !bgmac_b53_pdata.regs) {
-+ bgmac_b53_pdata.regs = ioremap_nocache(0x18007000, 0x1000);
-+
-+ err = platform_device_register(&bgmac_b53_dev);
-+ if (!err)
-+ bgmac->b53_device = &bgmac_b53_dev;
-+ }
-+
- err = register_netdev(bgmac->net_dev);
- if (err) {
- bgmac_err(bgmac, "Cannot register net device\n");
-@@ -1552,6 +1574,10 @@ static void bgmac_remove(struct bcma_dev
- {
- struct bgmac *bgmac = bcma_get_drvdata(core);
-
-+ if (bgmac->b53_device)
-+ platform_device_unregister(&bgmac_b53_dev);
-+ bgmac->b53_device = NULL;
-+
- netif_napi_del(&bgmac->napi);
- unregister_netdev(bgmac->net_dev);
- bgmac_mii_unregister(bgmac);
---- a/drivers/net/ethernet/broadcom/bgmac.h
-+++ b/drivers/net/ethernet/broadcom/bgmac.h
-@@ -430,6 +430,9 @@ struct bgmac {
- bool has_robosw;
-
- bool loopback;
-+
-+ /* platform device for associated switch */
-+ struct platform_device *b53_device;
- };
-
- static inline u32 bgmac_read(struct bgmac *bgmac, u16 offset)