OpenWrt – Diff between revs 2 and 3

Subversion Repositories:

?pathlinks?

Rev 2 – Details – Blame – Last modification – View Log

 	mutex_unlock(&bus->mdio_lock);
-	return ret;
-}
-void
-ar8xxx_phy_dbg_read(struct ar8xxx_priv *priv, int phy_addr,
-           u16 dbg_addr, u16 *dbg_data)
-{
-       struct mii_bus *bus = priv->mii_bus;
-       mutex_lock(&bus->mdio_lock);
-       bus->write(bus, phy_addr, MII_ATH_DBG_ADDR, dbg_addr);
-       *dbg_data = bus->read(bus, phy_addr, MII_ATH_DBG_DATA);
-       mutex_unlock(&bus->mdio_lock);
+	return ret;
+}
 void
+{
 	struct mii_bus *bus = priv->mii_bus;
 	u16 r2, page;
 	u16 r1_func0, r1_func1, r1_func2;
 	u32 t, val0, val1, val2;
+	int i;
 	split_addr(AR8216_REG_ATU_FUNC0, &r1_func0, &r2, &page);
 	r2 |= 0x10;
 		*status = (val2 & AR8216_ATU_STATUS) >> AR8216_ATU_STATUS_S;
 		if (!*status)
+			break;
-			break;
+		i = 0;
+		t = AR8216_ATU_PORT0;
+		while (!(val2 & t) && ++i < priv->dev.ports)
+			t <<= 1;
-		a->portmap = (val2 & AR8216_ATU_PORTS) >> AR8216_ATU_PORTS_S;
+		a->port = i;
 		a->mac[0] = (val0 & AR8216_ATU_ADDR5) >> AR8216_ATU_ADDR5_S;
 		a->mac[1] = (val0 & AR8216_ATU_ADDR4) >> AR8216_ATU_ADDR4_S;
 		a->mac[2] = (val1 & AR8216_ATU_ADDR3) >> AR8216_ATU_ADDR3_S;
 		 * ARL table can include multiple valid entries
 		 * per MAC, just with differing status codes
 		 */
 		for (j = 0; j < i; ++j) {
 			a1 = &priv->arl_table[j];
-			if (!memcmp(a->mac, a1->mac, sizeof(a->mac))) {
+			if (a->port == a1->port && !memcmp(a->mac, a1->mac, sizeof(a->mac)))
-				/* ignore ports already seen in former entry */
-				a->portmap &= ~a1->portmap;
-				if (!a->portmap)
-					goto duplicate;
+				goto duplicate;
-			}
+		}
+	}
 				AR8XXX_NUM_ARL_RECORDS);
 	for (j = 0; j < priv->dev.ports; ++j) {
 		for (k = 0; k < i; ++k) {
 			a = &priv->arl_table[k];
-			if (!(a->portmap & BIT(j)))
+			if (a->port != j)
 				continue;
 			len += snprintf(buf + len, sizeof(priv->arl_buf) - len,
 					"Port %d: MAC %02x:%02x:%02x:%02x:%02x:%02x\n",
 					j,
+	}
 	phydev->duplex = link.duplex ? DUPLEX_FULL : DUPLEX_HALF;
 	phydev->state = PHY_RUNNING;
-	netif_carrier_on(phydev->attached_dev);
-	if (phydev->adjust_link)
+	netif_carrier_on(phydev->attached_dev);
-		phydev->adjust_link(phydev->attached_dev);
+	phydev->adjust_link(phydev->attached_dev);
 	return 0;
 	struct ar8xxx_priv *priv;
 	struct switch_dev *swdev;
 	int ret;
 	/* skip PHYs at unused adresses */
-	if (phydev->mdio.addr != 0 && phydev->mdio.addr != 3 && phydev->mdio.addr != 4)
+	if (phydev->mdio.addr != 0 && phydev->mdio.addr != 4)
 		return -ENODEV;
 	} else {
 		if (ar8xxx_has_gige(priv)) {
 			phydev->supported |= SUPPORTED_1000baseT_Full;
 			phydev->advertising |= ADVERTISED_1000baseT_Full;
+		}
-		if (priv->chip->phy_rgmii_set)
-			priv->chip->phy_rgmii_set(priv, phydev);
+	}
 	phydev->priv = priv;