#define AR8X16_MAX_VLANS 128
#define AR8X16_PROBE_RETRIES 10
+struct ar8216_priv;
+
+#define AR8XXX_CAP_GIGE BIT(0)
+
+struct ar8xxx_chip {
+ unsigned long caps;
+
+ int (*hw_init)(struct ar8216_priv *priv);
+ void (*init_port)(struct ar8216_priv *priv, int port);
+ void (*setup_port)(struct ar8216_priv *priv, int port, u32 egress,
+ u32 ingress, u32 members, u32 pvid);
+ int (*atu_flush)(struct ar8216_priv *priv);
+ void (*vtu_flush)(struct ar8216_priv *priv);
+ void (*vtu_load_vlan)(struct ar8216_priv *priv, u32 vid, u32 port_mask);
+};
+
struct ar8216_priv {
struct switch_dev dev;
struct phy_device *phy;
const struct net_device_ops *ndo_old;
struct net_device_ops ndo;
struct mutex reg_mutex;
- int chip;
+ int chip_type;
+ const struct ar8xxx_chip *chip;
bool initialized;
bool port4_phy;
char buf[80];
#define to_ar8216(_dev) container_of(_dev, struct ar8216_priv, dev)
+static inline bool ar8xxx_has_gige(struct ar8216_priv *priv)
+{
+ return priv->chip->caps & AR8XXX_CAP_GIGE;
+}
+
static inline void
split_addr(u32 regaddr, u16 *r1, u16 *r2, u16 *page)
{
priv->write(priv, AR8216_REG_VTU, op);
}
+static void
+ar8216_vtu_flush(struct ar8216_priv *priv)
+{
+ ar8216_vtu_op(priv, AR8216_VTU_OP_FLUSH, 0);
+}
+
+static void
+ar8216_vtu_load_vlan(struct ar8216_priv *priv, u32 vid, u32 port_mask)
+{
+ u32 op;
+
+ op = AR8216_VTU_OP_LOAD | (vid << AR8216_VTU_VID_S);
+ ar8216_vtu_op(priv, op, port_mask);
+}
+
+static int
+ar8216_atu_flush(struct ar8216_priv *priv)
+{
+ int ret;
+
+ ret = ar8216_wait_bit(priv, AR8216_REG_ATU, AR8216_ATU_ACTIVE, 0);
+ if (!ret)
+ priv->write(priv, AR8216_REG_ATU, AR8216_ATU_OP_FLUSH);
+
+ return ret;
+}
+
static void
ar8216_setup_port(struct ar8216_priv *priv, int port, u32 egress, u32 ingress,
u32 members, u32 pvid)
{
u32 header;
- if (priv->vlan && port == AR8216_PORT_CPU && priv->chip == AR8216)
+ if (priv->vlan && port == AR8216_PORT_CPU && priv->chip_type == AR8216)
header = AR8216_PORT_CTRL_HEADER;
else
header = 0;
mutex_lock(&priv->reg_mutex);
/* flush all vlan translation unit entries */
- ar8216_vtu_op(priv, AR8216_VTU_OP_FLUSH, 0);
+ priv->chip->vtu_flush(priv);
memset(portmask, 0, sizeof(portmask));
if (!priv->init) {
portmask[i] |= vp & ~mask;
}
- ar8216_vtu_op(priv,
- AR8216_VTU_OP_LOAD |
- (priv->vlan_id[j] << AR8216_VTU_VID_S),
- priv->vlan_table[j]);
+ priv->chip->vtu_load_vlan(priv, priv->vlan_id[j],
+ priv->vlan_table[j]);
}
} else {
/* vlan disabled:
ingress = AR8216_IN_PORT_ONLY;
}
- if (priv->chip == AR8236)
- ar8236_setup_port(priv, i, egress, ingress, portmask[i],
- pvid);
- else
- ar8216_setup_port(priv, i, egress, ingress, portmask[i],
- pvid);
+ priv->chip->setup_port(priv, i, egress, ingress, portmask[i],
+ pvid);
}
mutex_unlock(&priv->reg_mutex);
return 0;
static void
ar8216_init_globals(struct ar8216_priv *priv)
{
- switch (priv->chip) {
+ switch (priv->chip_type) {
case AR8216:
/* standard atheros magic */
priv->write(priv, 0x38, 0xc000050e);
if (port == AR8216_PORT_CPU) {
priv->write(priv, AR8216_REG_PORT_STATUS(port),
AR8216_PORT_STATUS_LINK_UP |
- ((priv->chip == AR8316) ?
- AR8216_PORT_SPEED_1000M : AR8216_PORT_SPEED_100M) |
+ ar8xxx_has_gige(priv) ? AR8216_PORT_SPEED_1000M :
+ AR8216_PORT_SPEED_100M |
AR8216_PORT_STATUS_TXMAC |
AR8216_PORT_STATUS_RXMAC |
- ((priv->chip == AR8316) ? AR8216_PORT_STATUS_RXFLOW : 0) |
- ((priv->chip == AR8316) ? AR8216_PORT_STATUS_TXFLOW : 0) |
+ ((priv->chip_type == AR8316) ? AR8216_PORT_STATUS_RXFLOW : 0) |
+ ((priv->chip_type == AR8316) ? AR8216_PORT_STATUS_TXFLOW : 0) |
AR8216_PORT_STATUS_DUPLEX);
} else {
priv->write(priv, AR8216_REG_PORT_STATUS(port),
}
}
+static const struct ar8xxx_chip ar8216_chip = {
+ .hw_init = ar8216_hw_init,
+ .init_port = ar8216_init_port,
+ .setup_port = ar8216_setup_port,
+ .atu_flush = ar8216_atu_flush,
+ .vtu_flush = ar8216_vtu_flush,
+ .vtu_load_vlan = ar8216_vtu_load_vlan,
+};
+
+static const struct ar8xxx_chip ar8236_chip = {
+ .hw_init = ar8236_hw_init,
+ .init_port = ar8216_init_port,
+ .setup_port = ar8236_setup_port,
+ .atu_flush = ar8216_atu_flush,
+ .vtu_flush = ar8216_vtu_flush,
+ .vtu_load_vlan = ar8216_vtu_load_vlan,
+};
+
+static const struct ar8xxx_chip ar8316_chip = {
+ .caps = AR8XXX_CAP_GIGE,
+ .hw_init = ar8316_hw_init,
+ .init_port = ar8216_init_port,
+ .setup_port = ar8216_setup_port,
+ .atu_flush = ar8216_atu_flush,
+ .vtu_flush = ar8216_vtu_flush,
+ .vtu_load_vlan = ar8216_vtu_load_vlan,
+};
+
static int
ar8216_reset_switch(struct switch_dev *dev)
{
/* Configure all ports */
for (i = 0; i < AR8216_NUM_PORTS; i++)
- ar8216_init_port(priv, i);
+ priv->chip->init_port(priv, i);
ar8216_init_globals(priv);
mutex_unlock(&priv->reg_mutex);
u16 id;
int i;
- priv->chip = UNKNOWN;
+ priv->chip_type = UNKNOWN;
val = ar8216_mii_read(priv, AR8216_REG_CTRL);
if (val == ~0)
switch (id) {
case 0x0101:
- priv->chip = AR8216;
+ priv->chip_type = AR8216;
+ priv->chip = &ar8216_chip;
break;
case 0x0301:
- priv->chip = AR8236;
+ priv->chip_type = AR8236;
+ priv->chip = &ar8236_chip;
break;
case 0x1000:
case 0x1001:
- priv->chip = AR8316;
+ priv->chip_type = AR8316;
+ priv->chip = &ar8316_chip;
break;
default:
printk(KERN_DEBUG
goto err_free_priv;
if (pdev->addr != 0) {
- if (priv->chip == AR8316) {
+ if (ar8xxx_has_gige(priv)) {
pdev->supported |= SUPPORTED_1000baseT_Full;
pdev->advertising |= ADVERTISED_1000baseT_Full;
+ }
+ if (priv->chip_type == AR8316) {
/* check if we're attaching to the switch twice */
pdev = pdev->bus->phy_map[0];
if (!pdev) {
}
printk(KERN_INFO "%s: AR%d switch driver attached.\n",
- pdev->attached_dev->name, priv->chip);
+ pdev->attached_dev->name, priv->chip_type);
- pdev->supported = priv->chip == AR8316 ?
- SUPPORTED_1000baseT_Full : SUPPORTED_100baseT_Full;
+ 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);
swdev->ops = &ar8216_sw_ops;
swdev->ports = AR8216_NUM_PORTS;
- if (priv->chip == AR8316) {
+ if (priv->chip_type == AR8316) {
swdev->name = "Atheros AR8316";
swdev->vlans = AR8X16_MAX_VLANS;
/* port 5 connected to the other mac, therefore unusable */
swdev->ports = (AR8216_NUM_PORTS - 1);
}
- } else if (priv->chip == AR8236) {
+ } else if (priv->chip_type == AR8236) {
swdev->name = "Atheros AR8236";
swdev->vlans = AR8216_NUM_VLANS;
swdev->ports = AR8216_NUM_PORTS;
priv->init = true;
- ret = 0;
- if (priv->chip == AR8216)
- ret = ar8216_hw_init(priv);
- else if (priv->chip == AR8236)
- ret = ar8236_hw_init(priv);
- else if (priv->chip == AR8316)
- ret = ar8316_hw_init(priv);
-
+ ret = priv->chip->hw_init(priv);
if (ret)
goto err_free_priv;
dev->phy_ptr = priv;
/* VID fixup only needed on ar8216 */
- if (pdev->addr == 0 && priv->chip == AR8216) {
+ if (pdev->addr == 0 && priv->chip_type == AR8216) {
pdev->pkt_align = 2;
pdev->netif_receive_skb = ar8216_netif_receive_skb;
pdev->netif_rx = ar8216_netif_rx;
/* flush the address translation unit */
mutex_lock(&priv->reg_mutex);
- ret = ar8216_wait_bit(priv, AR8216_REG_ATU, AR8216_ATU_ACTIVE, 0);
- if (!ret)
- priv->write(priv, AR8216_REG_ATU, AR8216_ATU_OP_FLUSH);
+ ret = priv->chip->atu_flush(priv);
mutex_unlock(&priv->reg_mutex);
phydev->state = PHY_RUNNING;
projects / openwrt / svn-archive / archive.git / blobdiff