X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fgeneric%2Ffiles%2Fdrivers%2Fnet%2Fphy%2Far8216.c;h=c0b51e7c67434d5a3dee70f807d67c06abfcc57d;hb=dbeab3d4f98464c7c67832dbf38e35d5947442dd;hp=3a0483ddbab8fa3ee0912735ca217c7cc7ab600e;hpb=6dc5aa068a75932d19b579487f0d52b441dc3f76;p=openwrt.git diff --git a/target/linux/generic/files/drivers/net/phy/ar8216.c b/target/linux/generic/files/drivers/net/phy/ar8216.c index 3a0483ddba..c0b51e7c67 100644 --- a/target/linux/generic/files/drivers/net/phy/ar8216.c +++ b/target/linux/generic/files/drivers/net/phy/ar8216.c @@ -79,6 +79,7 @@ struct ar8xxx_chip { struct ar8216_priv { struct switch_dev dev; + struct mii_bus *mii_bus; struct phy_device *phy; u32 (*read)(struct ar8216_priv *priv, int reg); void (*write)(struct ar8216_priv *priv, int reg, u32 val); @@ -197,7 +198,11 @@ static const struct ar8xxx_mib_desc ar8236_mibs[] = { MIB_DESC(1, AR8236_STATS_TXLATECOL, "TxLateCol"), }; -#define to_ar8216(_dev) container_of(_dev, struct ar8216_priv, dev) +static inline struct ar8216_priv * +swdev_to_ar8216(struct switch_dev *swdev) +{ + return container_of(swdev, struct ar8216_priv, dev); +} static inline bool ar8xxx_has_gige(struct ar8216_priv *priv) { @@ -245,8 +250,7 @@ split_addr(u32 regaddr, u16 *r1, u16 *r2, u16 *page) static u32 ar8216_mii_read(struct ar8216_priv *priv, int reg) { - struct phy_device *phy = priv->phy; - struct mii_bus *bus = phy->bus; + struct mii_bus *bus = priv->mii_bus; u16 r1, r2, page; u16 lo, hi; @@ -267,8 +271,7 @@ ar8216_mii_read(struct ar8216_priv *priv, int reg) static void ar8216_mii_write(struct ar8216_priv *priv, int reg, u32 val) { - struct phy_device *phy = priv->phy; - struct mii_bus *bus = phy->bus; + struct mii_bus *bus = priv->mii_bus; u16 r1, r2, r3; u16 lo, hi; @@ -295,7 +298,7 @@ static void ar8216_phy_dbg_write(struct ar8216_priv *priv, int phy_addr, u16 dbg_addr, u16 dbg_data) { - struct mii_bus *bus = priv->phy->bus; + struct mii_bus *bus = priv->mii_bus; mutex_lock(&bus->mdio_lock); bus->write(bus, phy_addr, MII_ATH_DBG_ADDR, dbg_addr); @@ -306,7 +309,7 @@ ar8216_phy_dbg_write(struct ar8216_priv *priv, int phy_addr, static void ar8216_phy_mmd_write(struct ar8216_priv *priv, int phy_addr, u16 addr, u16 data) { - struct mii_bus *bus = priv->phy->bus; + struct mii_bus *bus = priv->mii_bus; mutex_lock(&bus->mdio_lock); bus->write(bus, phy_addr, MII_ATH_MMD_ADDR, addr); @@ -737,7 +740,7 @@ ar8236_hw_init(struct ar8216_priv *priv) return 0; /* Initialize the PHYs */ - bus = priv->phy->bus; + bus = priv->mii_bus; for (i = 0; i < 5; i++) { mdiobus_write(bus, i, MII_ADVERTISE, ADVERTISE_ALL | ADVERTISE_PAUSE_CAP | @@ -785,7 +788,7 @@ ar8316_hw_init(struct ar8216_priv *priv) u32 val, newval; struct mii_bus *bus; - val = priv->read(priv, 0x8); + val = priv->read(priv, AR8316_REG_POSTRIP); if (priv->phy->interface == PHY_INTERFACE_MODE_RGMII) { if (priv->port4_phy) { @@ -809,10 +812,10 @@ ar8316_hw_init(struct ar8216_priv *priv) if (val == newval) goto out; - priv->write(priv, 0x8, newval); + priv->write(priv, AR8316_REG_POSTRIP, newval); /* Initialize the ports */ - bus = priv->phy->bus; + bus = priv->mii_bus; for (i = 0; i < 5; i++) { if ((i == 4) && priv->port4_phy && priv->phy->interface == PHY_INTERFACE_MODE_RGMII) { @@ -830,9 +833,10 @@ ar8316_hw_init(struct ar8216_priv *priv) ADVERTISE_ALL | ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM); mdiobus_write(bus, i, MII_CTRL1000, ADVERTISE_1000FULL); mdiobus_write(bus, i, MII_BMCR, BMCR_RESET | BMCR_ANENABLE); - msleep(1000); } + msleep(1000); + out: priv->initialized = true; return 0; @@ -1034,7 +1038,7 @@ ar8327_hw_init(struct ar8216_priv *priv) priv->write(priv, AR8327_REG_POWER_ON_STRIP, new_pos); } - bus = priv->phy->bus; + bus = priv->mii_bus; for (i = 0; i < AR8327_NUM_PHYS; i++) { ar8327_phy_fixup(priv, i); @@ -1260,7 +1264,7 @@ static int ar8216_sw_set_vlan(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val) { - struct ar8216_priv *priv = to_ar8216(dev); + struct ar8216_priv *priv = swdev_to_ar8216(dev); priv->vlan = !!val->value.i; return 0; } @@ -1269,7 +1273,7 @@ static int ar8216_sw_get_vlan(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val) { - struct ar8216_priv *priv = to_ar8216(dev); + struct ar8216_priv *priv = swdev_to_ar8216(dev); val->value.i = priv->vlan; return 0; } @@ -1278,7 +1282,7 @@ ar8216_sw_get_vlan(struct switch_dev *dev, const struct switch_attr *attr, static int ar8216_sw_set_pvid(struct switch_dev *dev, int port, int vlan) { - struct ar8216_priv *priv = to_ar8216(dev); + struct ar8216_priv *priv = swdev_to_ar8216(dev); /* make sure no invalid PVIDs get set */ @@ -1292,7 +1296,7 @@ ar8216_sw_set_pvid(struct switch_dev *dev, int port, int vlan) static int ar8216_sw_get_pvid(struct switch_dev *dev, int port, int *vlan) { - struct ar8216_priv *priv = to_ar8216(dev); + struct ar8216_priv *priv = swdev_to_ar8216(dev); *vlan = priv->pvid[port]; return 0; } @@ -1301,7 +1305,7 @@ static int ar8216_sw_set_vid(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val) { - struct ar8216_priv *priv = to_ar8216(dev); + struct ar8216_priv *priv = swdev_to_ar8216(dev); priv->vlan_id[val->port_vlan] = val->value.i; return 0; } @@ -1310,7 +1314,7 @@ static int ar8216_sw_get_vid(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val) { - struct ar8216_priv *priv = to_ar8216(dev); + struct ar8216_priv *priv = swdev_to_ar8216(dev); val->value.i = priv->vlan_id[val->port_vlan]; return 0; } @@ -1319,7 +1323,7 @@ static int ar8216_sw_get_port_link(struct switch_dev *dev, int port, struct switch_port_link *link) { - struct ar8216_priv *priv = to_ar8216(dev); + struct ar8216_priv *priv = swdev_to_ar8216(dev); ar8216_read_port_link(priv, port, link); return 0; @@ -1328,7 +1332,7 @@ ar8216_sw_get_port_link(struct switch_dev *dev, int port, static int ar8216_sw_get_ports(struct switch_dev *dev, struct switch_val *val) { - struct ar8216_priv *priv = to_ar8216(dev); + struct ar8216_priv *priv = swdev_to_ar8216(dev); u8 ports = priv->vlan_table[val->port_vlan]; int i; @@ -1352,7 +1356,7 @@ ar8216_sw_get_ports(struct switch_dev *dev, struct switch_val *val) static int ar8216_sw_set_ports(struct switch_dev *dev, struct switch_val *val) { - struct ar8216_priv *priv = to_ar8216(dev); + struct ar8216_priv *priv = swdev_to_ar8216(dev); u8 *vt = &priv->vlan_table[val->port_vlan]; int i, j; @@ -1383,7 +1387,7 @@ ar8216_sw_set_ports(struct switch_dev *dev, struct switch_val *val) static int ar8216_sw_hw_apply(struct switch_dev *dev) { - struct ar8216_priv *priv = to_ar8216(dev); + struct ar8216_priv *priv = swdev_to_ar8216(dev); u8 portmask[AR8X16_MAX_PORTS]; int i, j; @@ -1450,7 +1454,7 @@ ar8216_sw_hw_apply(struct switch_dev *dev) static int ar8216_sw_reset_switch(struct switch_dev *dev) { - struct ar8216_priv *priv = to_ar8216(dev); + struct ar8216_priv *priv = swdev_to_ar8216(dev); int i; mutex_lock(&priv->reg_mutex); @@ -1475,7 +1479,7 @@ ar8216_sw_set_reset_mibs(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val) { - struct ar8216_priv *priv = to_ar8216(dev); + struct ar8216_priv *priv = swdev_to_ar8216(dev); unsigned int len; int ret; @@ -1503,7 +1507,7 @@ ar8216_sw_set_port_reset_mib(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val) { - struct ar8216_priv *priv = to_ar8216(dev); + struct ar8216_priv *priv = swdev_to_ar8216(dev); int port; int ret; @@ -1533,7 +1537,7 @@ ar8216_sw_get_port_mib(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val) { - struct ar8216_priv *priv = to_ar8216(dev); + struct ar8216_priv *priv = swdev_to_ar8216(dev); const struct ar8xxx_chip *chip = priv->chip; u64 *mib_stats; int port; @@ -1650,7 +1654,7 @@ ar8216_id_chip(struct ar8216_priv *priv) u16 id; int i; - val = ar8216_mii_read(priv, AR8216_REG_CTRL); + val = priv->read(priv, AR8216_REG_CTRL); if (val == ~0) return -ENODEV; @@ -1658,7 +1662,7 @@ ar8216_id_chip(struct ar8216_priv *priv) for (i = 0; i < AR8X16_PROBE_RETRIES; i++) { u16 t; - val = ar8216_mii_read(priv, AR8216_REG_CTRL); + val = priv->read(priv, AR8216_REG_CTRL); if (val == ~0) return -ENODEV; @@ -1686,10 +1690,8 @@ ar8216_id_chip(struct ar8216_priv *priv) break; default: printk(KERN_DEBUG - "ar8216: Unknown Atheros device [ver=%d, rev=%d, phy_id=%04x%04x]\n", - priv->chip_ver, priv->chip_rev, - mdiobus_read(priv->phy->bus, priv->phy->addr, 2), - mdiobus_read(priv->phy->bus, priv->phy->addr, 3)); + "ar8216: Unknown Atheros device [ver=%d, rev=%d]\n", + priv->chip_ver, priv->chip_rev); return -ENODEV; } @@ -1740,9 +1742,6 @@ ar8xxx_mib_init(struct ar8216_priv *priv) if (!priv->mib_stats) return -ENOMEM; - mutex_init(&priv->mib_lock); - INIT_DELAYED_WORK(&priv->mib_work, ar8xxx_mib_work_func); - return 0; } @@ -1757,13 +1756,89 @@ ar8xxx_mib_start(struct ar8216_priv *priv) } static void -ar8xxx_mib_cleanup(struct ar8216_priv *priv) +ar8xxx_mib_stop(struct ar8216_priv *priv) { if (!ar8xxx_has_mib_counters(priv)) return; cancel_delayed_work(&priv->mib_work); +} + +static struct ar8216_priv * +ar8xxx_create(void) +{ + struct ar8216_priv *priv; + + priv = kzalloc(sizeof(struct ar8216_priv), GFP_KERNEL); + if (priv == NULL) + return NULL; + + mutex_init(&priv->reg_mutex); + mutex_init(&priv->mib_lock); + INIT_DELAYED_WORK(&priv->mib_work, ar8xxx_mib_work_func); + + return priv; +} + +static void +ar8xxx_free(struct ar8216_priv *priv) +{ kfree(priv->mib_stats); + kfree(priv); +} + +static struct ar8216_priv * +ar8xxx_create_mii(struct mii_bus *bus) +{ + struct ar8216_priv *priv; + + priv = ar8xxx_create(); + if (priv) { + priv->mii_bus = bus; + priv->read = ar8216_mii_read; + priv->write = ar8216_mii_write; + } + + return priv; +} + +static int +ar8xxx_probe_switch(struct ar8216_priv *priv) +{ + struct switch_dev *swdev; + int ret; + + ret = ar8216_id_chip(priv); + if (ret) + return ret; + + swdev = &priv->dev; + swdev->cpu_port = AR8216_PORT_CPU; + swdev->ops = &ar8216_sw_ops; + + if (chip_is_ar8316(priv)) { + swdev->name = "Atheros AR8316"; + swdev->vlans = AR8X16_MAX_VLANS; + swdev->ports = AR8216_NUM_PORTS; + } else if (chip_is_ar8236(priv)) { + swdev->name = "Atheros AR8236"; + swdev->vlans = AR8216_NUM_VLANS; + swdev->ports = AR8216_NUM_PORTS; + } else if (chip_is_ar8327(priv)) { + swdev->name = "Atheros AR8327"; + swdev->vlans = AR8X16_MAX_VLANS; + swdev->ports = AR8327_NUM_PORTS; + } else { + swdev->name = "Atheros AR8216"; + swdev->vlans = AR8216_NUM_VLANS; + swdev->ports = AR8216_NUM_PORTS; + } + + ret = ar8xxx_mib_init(priv); + if (ret) + return ret; + + return 0; } static int @@ -1775,39 +1850,41 @@ ar8216_config_init(struct phy_device *pdev) int ret; if (!priv) { - priv = kzalloc(sizeof(struct ar8216_priv), GFP_KERNEL); + priv = ar8xxx_create_mii(pdev->bus); if (priv == NULL) return -ENOMEM; + + ret = ar8xxx_probe_switch(priv); + if (ret) + goto err_free_priv; } priv->phy = pdev; - ret = ar8216_id_chip(priv); - if (ret) - goto err_free_priv; + if (ar8xxx_has_gige(priv)) + pdev->supported = SUPPORTED_1000baseT_Full; + else + pdev->supported = SUPPORTED_100baseT_Full; + pdev->advertising = pdev->supported; if (pdev->addr != 0) { - if (ar8xxx_has_gige(priv)) { - pdev->supported |= SUPPORTED_1000baseT_Full; - pdev->advertising |= ADVERTISED_1000baseT_Full; - } - if (chip_is_ar8316(priv)) { /* check if we're attaching to the switch twice */ pdev = pdev->bus->phy_map[0]; if (!pdev) { - kfree(priv); + ar8xxx_free(priv); return 0; } /* switch device has not been initialized, reuse priv */ if (!pdev->priv) { priv->port4_phy = true; + priv->dev.ports = (AR8216_NUM_PORTS - 1); pdev->priv = priv; return 0; } - kfree(priv); + ar8xxx_free(priv); /* switch device has been initialized, reinit */ priv = pdev->priv; @@ -1818,55 +1895,16 @@ ar8216_config_init(struct phy_device *pdev) return 0; } - kfree(priv); + ar8xxx_free(priv); return 0; } - if (ar8xxx_has_gige(priv)) - pdev->supported = SUPPORTED_1000baseT_Full; - else - pdev->supported = SUPPORTED_100baseT_Full; - pdev->advertising = pdev->supported; - - mutex_init(&priv->reg_mutex); - priv->read = ar8216_mii_read; - priv->write = ar8216_mii_write; - pdev->priv = priv; swdev = &priv->dev; - swdev->cpu_port = AR8216_PORT_CPU; - swdev->ops = &ar8216_sw_ops; - swdev->ports = AR8216_NUM_PORTS; - - if (chip_is_ar8316(priv)) { - swdev->name = "Atheros AR8316"; - swdev->vlans = AR8X16_MAX_VLANS; - - if (priv->port4_phy) { - /* port 5 connected to the other mac, therefore unusable */ - swdev->ports = (AR8216_NUM_PORTS - 1); - } - } else if (chip_is_ar8236(priv)) { - swdev->name = "Atheros AR8236"; - swdev->vlans = AR8216_NUM_VLANS; - swdev->ports = AR8216_NUM_PORTS; - } else if (chip_is_ar8327(priv)) { - swdev->name = "Atheros AR8327"; - swdev->vlans = AR8X16_MAX_VLANS; - swdev->ports = AR8327_NUM_PORTS; - } else { - swdev->name = "Atheros AR8216"; - swdev->vlans = AR8216_NUM_VLANS; - } - - ret = ar8xxx_mib_init(priv); - if (ret) - goto err_free_priv; - ret = register_switch(swdev, pdev->attached_dev); if (ret) - goto err_cleanup_mib; + goto err_free_priv; printk(KERN_INFO "%s: %s switch driver attached.\n", pdev->attached_dev->name, swdev->name); @@ -1881,10 +1919,9 @@ ar8216_config_init(struct phy_device *pdev) if (ret) goto err_unregister_switch; - dev->phy_ptr = priv; - /* VID fixup only needed on ar8216 */ - if (chip_is_ar8216(priv) && pdev->addr == 0) { + if (chip_is_ar8216(priv)) { + dev->phy_ptr = priv; dev->priv_flags |= IFF_NO_IP_ALIGN; dev->eth_mangle_rx = ar8216_mangle_rx; dev->eth_mangle_tx = ar8216_mangle_tx; @@ -1898,10 +1935,9 @@ ar8216_config_init(struct phy_device *pdev) err_unregister_switch: unregister_switch(&priv->dev); -err_cleanup_mib: - ar8xxx_mib_cleanup(priv); err_free_priv: - kfree(priv); + ar8xxx_free(priv); + pdev->priv = NULL; return ret; } @@ -1956,42 +1992,98 @@ ar8216_config_aneg(struct phy_device *phydev) return genphy_config_aneg(phydev); } +static const u32 ar8xxx_phy_ids[] = { + 0x004dd033, + 0x004dd041, + 0x004dd042, +}; + +static bool +ar8xxx_phy_match(u32 phy_id) +{ + int i; + + for (i = 0; i < ARRAY_SIZE(ar8xxx_phy_ids); i++) + if (phy_id == ar8xxx_phy_ids[i]) + return true; + + return false; +} + +static bool +ar8xxx_is_possible(struct mii_bus *bus) +{ + unsigned i; + + for (i = 0; i < 4; i++) { + u32 phy_id; + + phy_id = mdiobus_read(bus, i, MII_PHYSID1) << 16; + phy_id |= mdiobus_read(bus, i, MII_PHYSID2); + if (!ar8xxx_phy_match(phy_id)) { + pr_debug("ar8xxx: unknown PHY at %s:%02x id:%08x\n", + dev_name(&bus->dev), i, phy_id); + return false; + } + } + + return true; +} + static int ar8216_probe(struct phy_device *pdev) { struct ar8216_priv *priv; int ret; - priv = kzalloc(sizeof(struct ar8216_priv), GFP_KERNEL); + /* skip PHYs at unused adresses */ + if (pdev->addr != 0 && pdev->addr != 4) + return -ENODEV; + + if (!ar8xxx_is_possible(pdev->bus)) + return -ENODEV; + + priv = ar8xxx_create_mii(pdev->bus); if (priv == NULL) return -ENOMEM; priv->phy = pdev; - ret = ar8216_id_chip(priv); - kfree(priv); + ret = ar8xxx_probe_switch(priv); + ar8xxx_free(priv); return ret; } static void -ar8216_remove(struct phy_device *pdev) +ar8216_detach(struct phy_device *pdev) { - struct ar8216_priv *priv = pdev->priv; struct net_device *dev = pdev->attached_dev; - if (!priv) + if (!dev) return; + dev->phy_ptr = NULL; dev->priv_flags &= ~IFF_NO_IP_ALIGN; dev->eth_mangle_rx = NULL; dev->eth_mangle_tx = NULL; +} + +static void +ar8216_remove(struct phy_device *pdev) +{ + struct ar8216_priv *priv = pdev->priv; + + if (!priv) + return; + + pdev->priv = NULL; if (pdev->addr == 0) unregister_switch(&priv->dev); - ar8xxx_mib_cleanup(priv); - kfree(priv); + ar8xxx_mib_stop(priv); + ar8xxx_free(priv); } static struct phy_driver ar8216_driver = { @@ -2001,6 +2093,7 @@ static struct phy_driver ar8216_driver = { .features = PHY_BASIC_FEATURES, .probe = ar8216_probe, .remove = ar8216_remove, + .detach = ar8216_detach, .config_init = &ar8216_config_init, .config_aneg = &ar8216_config_aneg, .read_status = &ar8216_read_status,