[OpenWrt-Devel] [PATCH] mvsw6171: note support for 88E6172 switches
Nikita Nazarenko
nnazarenko at radiofid.com
Mon Dec 22 10:26:02 EST 2014
This patch is a dirty modification of mv6171 driver and must be merged
with it in future. mv6171 and 6172 are similar enough to be merged in
one driver.
Significant differences:
* struct vlan_state in struct mv6172_state contains additional field
port_state which contain STU port information. It can be useful for 6171
driver;
* mvsv6172_vtu_program contain STU record creation for each vlan from
port_state field. That isn't best practice of STU usage, but simpliest;
* mvsw6172_set_vlan_ports contain filling port_state for each port in
vlan with forwarding state.
* probe function contain check for 6176 or 6172 chip id
* constants in mv6172.h renamed and rearranged to conform with datasheet
naming
other changes mostly for debugging and error/statistic collecting
What can be done better:
* Retrieve statistics from stats counter
* implement interrupt support in addition to polling switch busy flag
* Better STU and ATU support, but that is a complicated task affecting
swconfig and netlink interface between kernel and userspace.
* Support for Provider and DSA modes. also complicated for same reason
* Many other nice features that can be utilized with marvell switches
Best regards
Nikita Nazarenko
---
.../linux/generic/files/drivers/net/phy/mvsw6172.c | 1200
++++++++++++++++++++
.../linux/generic/files/drivers/net/phy/mvsw6172.h | 262 +++++
.../generic/patches-3.10/733-phy_mvsw6172.patch | 24 +
3 files changed, 1486 insertions(+)
create mode 100644 target/linux/generic/files/drivers/net/phy/mvsw6172.c
create mode 100644 target/linux/generic/files/drivers/net/phy/mvsw6172.h
create mode 100644
target/linux/generic/patches-3.10/733-phy_mvsw6172.patch
diff --git a/target/linux/generic/files/drivers/net/phy/mvsw6172.c
b/target/linux/generic/files/drivers/net/phy/mvsw6172.c
new file mode 100644
index 0000000..b6b68a4
--- /dev/null
+++ b/target/linux/generic/files/drivers/net/phy/mvsw6172.c
@@ -0,0 +1,1200 @@
+/*
+ * Marvell 88E6172 switch driver
+ *
+ * Copyright (c) 2014 Nikita Nazarenko <nnazarenko at radiofid.com>
+ * Based on code (c) 2014 Claudio Leite <leitec at staticky.com>
+ * Based on code (c) 2008 Felix Fietkau <nbd at openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License v2 as published by the
+ * Free Software Foundation
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/list.h>
+#include <linux/mii.h>
+#include <linux/phy.h>
+#include <linux/of.h>
+#include <linux/of_mdio.h>
+#include <linux/delay.h>
+#include <linux/switch.h>
+#include <linux/device.h>
+#include <linux/platform_device.h>
+
+#include "mvsw6172.h"
+
+MODULE_DESCRIPTION("Marvell 88E6172 Switch driver");
+MODULE_AUTHOR("Nikita Nazarenko <nnazarenko at radiofid.com>");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:mvsw6172");
+
+/*
+ * Register access is done through direct or indirect addressing,
+ * depending on how the switch is physically connected.
+ *
+ * Direct addressing: all port and global registers directly
+ * accessible via an address/register pair
+ *
+ * Indirect addressing: switch is mapped at a single address,
+ * port and global registers accessible via a single command/data
+ * register pair
+ */
+
+static int
+mvsw61xx_wait_mask_raw(struct mii_bus *bus, int addr,
+ int reg, u16 mask, u16 val)
+{
+ int i = 100;
+ u16 r;
+
+ do {
+ r = bus->read(bus, addr, reg);
+ if ((r & mask) == val)
+ return 0;
+ } while (--i > 0);
+
+ return -ETIMEDOUT;
+}
+
+static u16
+r16(struct mii_bus *bus, bool indirect, int base_addr, int addr, int reg)
+{
+ u16 ind_addr;
+
+ if (!indirect)
+ return bus->read(bus, addr, reg);
+
+ /* Indirect read: First, make sure switch is free */
+ mvsw61xx_wait_mask_raw(bus, base_addr, MV_INDIRECT_REG_CMD,
+ MV_INDIRECT_INPROGRESS, 0);
+
+ /* Load address and request read */
+ ind_addr = MV_INDIRECT_READ | (addr << MV_INDIRECT_ADDR_S) | reg;
+ bus->write(bus, base_addr, MV_INDIRECT_REG_CMD,
+ ind_addr);
+
+ /* Wait until it's ready */
+ mvsw61xx_wait_mask_raw(bus, base_addr, MV_INDIRECT_REG_CMD,
+ MV_INDIRECT_INPROGRESS, 0);
+
+ /* Read the requested data */
+ return bus->read(bus, base_addr, MV_INDIRECT_REG_DATA);
+}
+
+static void
+w16(struct mii_bus *bus, bool indirect, int base_addr, int addr,
+ int reg, u16 val)
+{
+ u16 ind_addr;
+
+ if (!indirect) {
+ bus->write(bus, addr, reg, val);
+ return;
+ }
+
+ /* Indirect write: First, make sure switch is free */
+ mvsw61xx_wait_mask_raw(bus, base_addr, MV_INDIRECT_REG_CMD,
+ MV_INDIRECT_INPROGRESS, 0);
+
+ /* Load the data to be written */
+ bus->write(bus, base_addr, MV_INDIRECT_REG_DATA, val);
+
+ /* Wait again for switch to be free */
+ mvsw61xx_wait_mask_raw(bus, base_addr, MV_INDIRECT_REG_CMD,
+ MV_INDIRECT_INPROGRESS, 0);
+
+ /* Load address, and issue write command */
+ ind_addr = MV_INDIRECT_WRITE | (addr << MV_INDIRECT_ADDR_S) | reg;
+ bus->write(bus, base_addr, MV_INDIRECT_REG_CMD,
+ ind_addr);
+}
+
+/* swconfig support */
+
+static inline u16
+sr16(struct switch_dev *dev, int addr, int reg)
+{
+ struct mvsw6172_state *state = get_state(dev);
+ u16 ret = r16(state->bus, state->is_indirect, state->base_addr,
addr, reg);
+ pr_info("read from %s addr:0x%X reg:0x%X
result:0x%X\n",dev->devname,addr,reg,ret);
+ return ret;
+}
+
+static inline void
+sw16(struct switch_dev *dev, int addr, int reg, u16 val)
+{
+ struct mvsw6172_state *state = get_state(dev);
+ pr_info("write to %s addr:0x%X reg:0x%X
value:0x%X\n",dev->devname,addr,reg,val);
+ w16(state->bus, state->is_indirect, state->base_addr, addr, reg, val);
+}
+
+static int
+mvsw61xx_wait_mask_s(struct switch_dev *dev, int addr,
+ int reg, u16 mask, u16 val)
+{
+ int i = 100;
+ u16 r;
+
+ do {
+ r = sr16(dev, addr, reg) & mask;
+ if (r == val)
+ return 0;
+ } while (--i > 0);
+
+ return -ETIMEDOUT;
+}
+
+static int
+mvsw6172_get_port_mask(struct switch_dev *dev,
+ const struct switch_attr *attr, struct switch_val *val)
+{
+ struct mvsw6172_state *state = get_state(dev);
+ char *buf = state->buf;
+ int port, len, i;
+ u16 reg;
+
+ port = val->port_vlan;
+ reg = sr16(dev, MV_PORTREG(VLANMAP, port)) & MV_PORTS_MASK;
+
+ len = sprintf(buf, "0x%04x: ", reg);
+
+ for (i = 0; i < MV_PORTS; i++) {
+ if (reg & (1 << i))
+ len += sprintf(buf + len, "%d ", i);
+ else if (i == port)
+ len += sprintf(buf + len, "(%d) ", i);
+ }
+
+ val->value.s = buf;
+
+ return 0;
+}
+
+static int
+mvsw6172_get_port_qmode(struct switch_dev *dev,
+ const struct switch_attr *attr, struct switch_val *val)
+{
+ struct mvsw6172_state *state = get_state(dev);
+
+ val->value.i = state->ports[val->port_vlan].qmode;
+
+ return 0;
+}
+
+static int
+mvsw6172_set_port_qmode(struct switch_dev *dev,
+ const struct switch_attr *attr, struct switch_val *val)
+{
+ struct mvsw6172_state *state = get_state(dev);
+
+ state->ports[val->port_vlan].qmode = val->value.i;
+
+ return 0;
+}
+
+static int
+mvsw6172_get_pvid(struct switch_dev *dev, int port, int *val)
+{
+ struct mvsw6172_state *state = get_state(dev);
+
+ *val = state->ports[port].pvid;
+
+ return 0;
+}
+
+static int
+mvsw6172_set_pvid(struct switch_dev *dev, int port, int val)
+{
+ struct mvsw6172_state *state = get_state(dev);
+
+ if (val < 0 || val >= MV_VLANS)
+ return -EINVAL;
+
+ state->ports[port].pvid = (u16)val;
+
+ return 0;
+}
+
+static int
+mvsw6172_get_port_status(struct switch_dev *dev,
+ const struct switch_attr *attr, struct switch_val *val)
+{
+ struct mvsw6172_state *state = get_state(dev);
+ char *buf = state->buf;
+ u16 status, speed;
+ int len;
+
+ status = sr16(dev, MV_PORTREG(STATUS, val->port_vlan));
+ speed = (status & MV_PORT_STATUS_SPEED_MASK) >>
+ MV_PORT_STATUS_SPEED_SHIFT;
+
+ len = sprintf(buf, "link: ");
+ if (status & MV_PORT_STATUS_LINK) {
+ len += sprintf(buf + len, "up, speed: ");
+
+ switch (speed) {
+ case MV_PORT_STATUS_SPEED_10:
+ len += sprintf(buf + len, "10");
+ break;
+ case MV_PORT_STATUS_SPEED_100:
+ len += sprintf(buf + len, "100");
+ break;
+ case MV_PORT_STATUS_SPEED_1000:
+ len += sprintf(buf + len, "1000");
+ break;
+ }
+
+ len += sprintf(buf + len, " Mbps, duplex: ");
+
+ if (status & MV_PORT_STATUS_FDX)
+ len += sprintf(buf + len, "full");
+ else
+ len += sprintf(buf + len, "half");
+ } else {
+ len += sprintf(buf + len, "down");
+ }
+
+ val->value.s = buf;
+
+ return 0;
+}
+
+static int
+mvsw6172_get_port_speed(struct switch_dev *dev,
+ const struct switch_attr *attr, struct switch_val *val)
+{
+ u16 status, speed;
+
+ status = sr16(dev, MV_PORTREG(STATUS, val->port_vlan));
+ speed = (status & MV_PORT_STATUS_SPEED_MASK) >>
+ MV_PORT_STATUS_SPEED_SHIFT;
+
+ val->value.i = 0;
+
+ if (status & MV_PORT_STATUS_LINK) {
+ switch (speed) {
+ case MV_PORT_STATUS_SPEED_10:
+ val->value.i = 10;
+ break;
+ case MV_PORT_STATUS_SPEED_100:
+ val->value.i = 100;
+ break;
+ case MV_PORT_STATUS_SPEED_1000:
+ val->value.i = 1000;
+ break;
+ }
+ }
+
+ return 0;
+}
+
+static int mvsw6172_get_vlan_ports(struct switch_dev *dev,
+ struct switch_val *val)
+{
+ struct mvsw6172_state *state = get_state(dev);
+ int i, j, mode, vno;
+
+ vno = val->port_vlan;
+
+ if (vno <= 0 || vno >= dev->vlans)
+ return -EINVAL;
+
+ for (i = 0, j = 0; i < dev->ports; i++) {
+ if (state->vlans[vno].mask & (1 << i)) {
+ val->value.ports[j].id = i;
+
+ mode = (state->vlans[vno].port_mode >> (i * 4)) & 0xf;
+ pr_info( "get_vlan_ports: vlan, %d port %d mode 0x%X\n",
vno, i, mode);
+ if (mode == MV_VTUCTL_EGRESS_TAGGED)
+ val->value.ports[j].flags = (1 << SWITCH_PORT_FLAG_TAGGED);
+ else
+ val->value.ports[j].flags = 0;
+
+ pr_info( "get_vlan_ports: vlan, %d port %d flags 0x%X\n",
vno, i,val->value.ports[j].flags);
+ j++;
+ }
+ }
+
+ val->len = j;
+
+ return 0;
+}
+
+static int mvsw6172_set_vlan_ports(struct switch_dev *dev,
+ struct switch_val *val)
+{
+ struct mvsw6172_state *state = get_state(dev);
+ int i, mode, pno, vno;
+
+ vno = val->port_vlan;
+
+ if (vno <= 0 || vno >= dev->vlans)
+ return -EINVAL;
+
+ state->vlans[vno].mask = 0;
+ state->vlans[vno].port_mode = 0;
+ state->vlans[vno].port_state = 0;
+
+ if(state->vlans[vno].vid == 0)
+ state->vlans[vno].vid = vno;
+
+ for (i = 0; i < val->len; i++) {
+ pno = val->value.ports[i].id;
+
+ state->vlans[vno].mask |= (1 << pno);
+ pr_info("vlan:%d port:%d flags: 0x%X\n",vno, pno,
val->value.ports[i].flags);
+ if (val->value.ports[i].flags & (1 << SWITCH_PORT_FLAG_TAGGED))
+ mode = MV_VTUCTL_EGRESS_TAGGED;
+ else
+ mode = MV_VTUCTL_EGRESS_UNTAGGED;
+
+ pr_info("vlan:%d port:%d mode: 0x%X\n",vno, pno, mode);
+ state->vlans[vno].port_mode |= mode << (pno * 4);
+ state->vlans[vno].port_state |= MV_STUCTL_FORWARDING << (pno*4);
+ }
+
+ /*
+ * DISCARD is nonzero, so it must be explicitly
+ * set on ports not in the VLAN.
+ */
+ for (i = 0; i < dev->ports; i++)
+ if (!(state->vlans[vno].mask & (1 << i)))
+ state->vlans[vno].port_mode |=
+ MV_VTUCTL_DISCARD << (i * 4);
+
+ pr_info("VLAN %d port_mode: %X\n", vno, state->vlans[vno].port_mode);
+
+ return 0;
+}
+
+static int mvsw6172_get_vlan_port_based(struct switch_dev *dev,
+ const struct switch_attr *attr, struct switch_val *val)
+{
+ struct mvsw6172_state *state = get_state(dev);
+ int vno = val->port_vlan;
+
+ if (vno <= 0 || vno >= dev->vlans)
+ return -EINVAL;
+
+ if (state->vlans[vno].port_based)
+ val->value.i = 1;
+ else
+ val->value.i = 0;
+
+ return 0;
+}
+
+static int mvsw6172_set_vlan_port_based(struct switch_dev *dev,
+ const struct switch_attr *attr, struct switch_val *val)
+{
+ struct mvsw6172_state *state = get_state(dev);
+ int vno = val->port_vlan;
+
+ if (vno <= 0 || vno >= dev->vlans)
+ return -EINVAL;
+
+ if (val->value.i == 1)
+ state->vlans[vno].port_based = true;
+ else
+ state->vlans[vno].port_based = false;
+
+ return 0;
+}
+
+static int mvsw6172_get_vid(struct switch_dev *dev,
+ const struct switch_attr *attr, struct switch_val *val)
+{
+ struct mvsw6172_state *state = get_state(dev);
+ int vno = val->port_vlan;
+
+ if (vno <= 0 || vno >= dev->vlans)
+ return -EINVAL;
+
+ val->value.i = state->vlans[vno].vid;
+
+ return 0;
+}
+
+static int mvsw6172_set_vid(struct switch_dev *dev,
+ const struct switch_attr *attr, struct switch_val *val)
+{
+ struct mvsw6172_state *state = get_state(dev);
+ int vno = val->port_vlan;
+
+ if (vno <= 0 || vno >= dev->vlans)
+ return -EINVAL;
+
+ state->vlans[vno].vid = val->value.i;
+
+ return 0;
+}
+
+static int mvsw6172_get_enable_vlan(struct switch_dev *dev,
+ const struct switch_attr *attr, struct switch_val *val)
+{
+ struct mvsw6172_state *state = get_state(dev);
+
+ val->value.i = state->vlan_enabled;
+
+ return 0;
+}
+
+static int mvsw6172_set_enable_vlan(struct switch_dev *dev,
+ const struct switch_attr *attr, struct switch_val *val)
+{
+ struct mvsw6172_state *state = get_state(dev);
+
+ state->vlan_enabled = val->value.i;
+
+ return 0;
+}
+
+static int mvsw6172_vtu_program(struct switch_dev *dev)
+{
+ struct mvsw6172_state *state = get_state(dev);
+ u16 v1, v2, s1, s2;
+ int i;
+ int ret;
+
+ /* Flush */
+ ret = mvsw61xx_wait_mask_s(dev, MV_GLOBALREG(VTU_OP),
+ MV_VTUOP_INPROGRESS, 0);
+ if( ret ) {
+ pr_info("wait mask timed out");
+ }
+ sw16(dev, MV_GLOBALREG(VTU_OP),
+ MV_VTUOP_INPROGRESS | MV_VTUOP_PURGE);
+
+ /* Write VLAN table */
+ for (i = 1; i < dev->vlans; i++) {
+ if (state->vlans[i].mask == 0 ||
+ state->vlans[i].vid == 0 ||
+ state->vlans[i].port_based == true)
+ continue;
+
+ ret = mvsw61xx_wait_mask_s(dev, MV_GLOBALREG(VTU_OP),
+ MV_VTUOP_INPROGRESS, 0);
+ if( ret ) {
+ pr_info("wait mask timed out");
+ }
+
+ v1 = (u16)((state->vlans[i].port_mode & 0xffff));
+ v2 = (u16)(((state->vlans[i].port_mode >> 16) & 0xffff) );
+ s1 = (u16)((state->vlans[i].port_state & 0xffff));
+ s2 = (u16)(((state->vlans[i].port_state >> 16) & 0xffff) );
+
+ sw16(dev, MV_GLOBALREG(VTU_SID),(state->vlans[i].vid));
+ sw16(dev, MV_GLOBALREG(VTU_DATA1),s1);
+ sw16(dev, MV_GLOBALREG(VTU_DATA2),s2);
+ sw16(dev, MV_GLOBALREG(VTU_VID), MV_VTU_VID_VALID);
+ sw16(dev, MV_GLOBALREG(VTU_OP),
+ MV_VTUOP_INPROGRESS | MV_VTUOP_STULOAD);
+
+ ret = mvsw61xx_wait_mask_s(dev, MV_GLOBALREG(VTU_OP),
+ MV_VTUOP_INPROGRESS, 0);
+
+ sw16(dev, MV_GLOBALREG(VTU_VID),
+ MV_VTU_VID_VALID | (state->vlans[i].vid)); // where
0xFFF - 12 bit mask to prevent writing to other registers
+
+ sw16(dev, MV_GLOBALREG(VTU_SID), (state->vlans[i].vid));
+ sw16(dev, MV_GLOBALREG(VTU_FID), 0x0);
+ sw16(dev, MV_GLOBALREG(VTU_DATA1), v1);
+ sw16(dev, MV_GLOBALREG(VTU_DATA2), v2);
+ sw16(dev, MV_GLOBALREG(VTU_DATA3), 0x00);
+ pr_info("Programming VLAN 0x%X, v1(0x%X), v2(0x%X),
VID_REGISTER(0x%X)\n",state->vlans[i].vid,v1,v2,MV_VTU_VID_VALID |
((state->vlans[i].vid) & 0xFFF));
+
+ sw16(dev, MV_GLOBALREG(VTU_OP), 0 |
+ MV_VTUOP_INPROGRESS | MV_VTUOP_LOAD );
+ ret = mvsw61xx_wait_mask_s(dev, MV_GLOBALREG(VTU_OP),
+ MV_VTUOP_INPROGRESS, 0);
+ if( ret ) {
+ pr_info("wait mask timed out");
+ }
+ }
+
+ return 0;
+}
+
+static void mvsw6172_vlan_port_config(struct switch_dev *dev, int vno)
+{
+ struct mvsw6172_state *state = get_state(dev);
+ int i, mode;
+
+ for (i = 0; i < dev->ports; i++) {
+ if (!(state->vlans[vno].mask & (1 << i)))
+ continue;
+
+ mode = (state->vlans[vno].port_mode >> (i * 4)) & 0xf;
+
+ if(mode == MV_VTUCTL_EGRESS_UNTAGGED || mode ==
MV_VTUCTL_EGRESS_TAGGED)
+ state->ports[i].pvid = state->vlans[vno].vid;
+
+ if (state->vlans[vno].port_based)
+ state->ports[i].mask |= state->vlans[vno].mask;
+ else {
+ if( i == state->cpu_port0 || i == state->cpu_port1 ){
+ state->ports[i].qmode = MV_8021Q_MODE_FALLBACK;
+ } else {
+ state->ports[i].qmode = MV_8021Q_MODE_SECURE;
+ }
+ }
+ }
+}
+
+static int mvsw6172_update_state(struct switch_dev *dev)
+{
+ struct mvsw6172_state *state = get_state(dev);
+ int i;
+ u16 reg;
+
+ if (!state->registered)
+ return -EINVAL;
+
+ /*
+ * CHECK: according to DSDT this setting valid only for 6165 and
6097 families
+ *
+ * Set 802.1q-only mode if vlan_enabled is true.
+ *
+ * Without this, even if 802.1q is enabled for
+ * a port/VLAN, it still depends on the port-based
+ * VLAN mask being set.
+ *
+ * With this setting, port-based VLANs are still
+ * functional, provided the VID is not in the VTU.
+ */
+ reg = sr16(dev, MV_GLOBAL2REG(SDET_POLARITY));
+
+ if (state->vlan_enabled)
+ reg |= MV_8021Q_VLAN_ONLY;
+ else
+ reg &= ~MV_8021Q_VLAN_ONLY;
+
+ sw16(dev, MV_GLOBAL2REG(SDET_POLARITY), reg);
+
+ /*
+ * Set port-based VLAN masks on each port
+ * based only on VLAN definitions known to
+ * the driver (i.e. in state).
+ *
+ * This means any pre-existing port mapping is
+ * wiped out once our driver is initialized.
+ */
+ for (i = 0; i < dev->ports; i++) {
+ state->ports[i].mask = 0;
+ state->ports[i].qmode = MV_8021Q_MODE_DISABLE;
+ }
+
+ for (i = 0; i < dev->vlans; i++)
+ mvsw6172_vlan_port_config(dev, i);
+
+ for (i = 0; i < dev->ports; i++) {
+ reg = sr16(dev, MV_PORTREG(VLANID, i)) & ~MV_PVID_MASK;
+ reg |= state->ports[i].pvid;
+ reg &= ~(1 << 12); // explicitly disable Force default VID
+ sw16(dev, MV_PORTREG(VLANID, i), reg);
+
+ state->ports[i].mask &= ~(1 << i);
+
+ reg = sr16(dev, MV_PORTREG(VLANMAP, i)) & ~MV_PORTS_MASK;
+ reg |= state->ports[i].mask;
+ sw16(dev, MV_PORTREG(VLANMAP, i), reg);
+
+ reg = sr16(dev, MV_PORTREG(CONTROL2, i)) &
+ ~MV_8021Q_MODE_MASK;
+ reg |= state->ports[i].qmode << MV_8021Q_MODE_SHIFT;
+ sw16(dev, MV_PORTREG(CONTROL2, i), reg);
+ }
+
+ mvsw6172_vtu_program(dev);
+
+ return 0;
+}
+
+static int mvsw6172_apply(struct switch_dev *dev)
+{
+ return mvsw6172_update_state(dev);
+}
+
+static int mvsw6172_reset(struct switch_dev *dev)
+{
+ struct mvsw6172_state *state = get_state(dev);
+ int i;
+ u16 reg;
+ int ret;
+
+ /* Disable all ports before reset */
+ for (i = 0; i < dev->ports; i++) {
+ reg = sr16(dev, MV_PORTREG(CONTROL, i)) &
+ ~MV_PORTCTRL_ENABLED;
+ sw16(dev, MV_PORTREG(CONTROL, i), reg);
+ }
+
+ reg = sr16(dev, MV_GLOBALREG(CONTROL)) | MV_CONTROL_RESET;
+
+ sw16(dev, MV_GLOBALREG(CONTROL), reg);
+ if (mvsw61xx_wait_mask_s(dev, MV_GLOBALREG(CONTROL),
+ MV_CONTROL_RESET, 0) < 0)
+ return -ETIMEDOUT;
+
+ /* test if all ok*/
+ for (i = 0; i < dev->ports; i++) {
+ state->ports[i].qmode = 0;
+ state->ports[i].mask = 0;
+ state->ports[i].pvid = 0;
+
+ /* Force flow control off */
+ reg = sr16(dev, MV_PORTREG(PHYCTL, i)) & ~MV_PHYCTL_FC_MASK;
+ reg |= MV_PHYCTL_FC_DISABLE;
+ sw16(dev, MV_PORTREG(PHYCTL, i), reg);
+
+ /* Set port association vector */
+ sw16(dev, MV_PORTREG(ASSOC, i), (1 << i));
+ }
+
+ for (i = 0; i < dev->vlans; i++) {
+ state->vlans[i].port_based = false;
+ state->vlans[i].mask = 0;
+ state->vlans[i].vid = 0;
+ state->vlans[i].port_mode = 0;
+ state->vlans[i].port_state = 0;
+ }
+
+ state->vlan_enabled = 0;
+
+ mvsw6172_update_state(dev);
+
+ /* Re-enable ports */
+ for (i = 0; i < dev->ports; i++) {
+ reg = sr16(dev, MV_PORTREG(CONTROL, i)) |
+ MV_PORTCTRL_ENABLED;
+ reg &= ~(MV_PORTCTRL_VLANTUN);
+ sw16(dev, MV_PORTREG(CONTROL, i), reg);
+ }
+
+ return 0;
+}
+
+enum {
+ MVSW61XX_ENABLE_VLAN,
+ MVSW61XX_VTU_BASE,
+ MVSW61XX_VTU_VIOLATION,
+ MVSW61XX_STU_BASE,
+ MVSW61XX_ATU_BASE,
+};
+
+enum {
+ MVSW61XX_VLAN_PORT_BASED,
+ MVSW61XX_VLAN_ID,
+ MVSW61XX_VLAN_VTU_RECORD,
+};
+
+enum {
+ MVSW61XX_PORT_MASK,
+ MVSW61XX_PORT_QMODE,
+ MVSW61XX_PORT_STATUS,
+ MVSW61XX_PORT_LINK,
+ MVSW61XX_PORT_IN_FILTERED,
+ MVSW61XX_PORT_OUT_ACCEPTED,
+ MVSW61XX_PORT_DISCARD_COUNTER,
+};
+
+static int
+mvsw6172_get_port_in_filtered(struct switch_dev *dev,
+ const struct switch_attr *attr, struct switch_val *val)
+{
+ val->value.i = sr16(dev, MV_PORTREG(IN_FILTERED, val->port_vlan));
+
+ return 0;
+}
+
+static int
+mvsw6172_get_port_out_accepted(struct switch_dev *dev,
+ const struct switch_attr *attr, struct switch_val *val)
+{
+ val->value.i = sr16(dev, MV_PORTREG(OUT_ACCEPTED, val->port_vlan));
+
+ return 0;
+}
+
+static int
+mvsw6172_get_port_discard_count(struct switch_dev *dev,
+ const struct switch_attr *attr, struct switch_val *val)
+{
+ uint32_t count = sr16(dev, MV_PORTREG(RX_DISCARD_LOW,
val->port_vlan)) + (sr16(dev, MV_PORTREG(RX_DISCARD_HIGH,
val->port_vlan)) << 16);
+ val->value.i = count;
+
+ return 0;
+}
+
+static int mvsw6172_get_vtu_base (struct switch_dev *dev,
+ const struct switch_attr *attr, struct switch_val *val)
+{
+ struct mvsw6172_state *state = get_state(dev);
+ int len = 0;
+ unsigned int vid,data1,data2,data3,fid,sid;
+
+ memset(state->buf,0,sizeof(state->buf));
+ vid = 0xfff;
+ sw16(dev, MV_GLOBALREG(VTU_VID), vid);
+ do {
+ //do request for vtu
+ mvsw61xx_wait_mask_s(dev, MV_GLOBALREG(VTU_OP),
+ MV_VTUOP_INPROGRESS, 0);
+ sw16(dev, MV_GLOBALREG(VTU_OP),
+ MV_VTUOP_INPROGRESS | MV_VTUOP_VTU_GET_NEXT);
+ mvsw61xx_wait_mask_s(dev, MV_GLOBALREG(VTU_OP),
+ MV_VTUOP_INPROGRESS, 0);
+
+ vid = sr16(dev, MV_GLOBALREG(VTU_VID));
+ data1 = sr16(dev, MV_GLOBALREG(VTU_DATA1));
+ data2 = sr16(dev, MV_GLOBALREG(VTU_DATA2));
+ data3 = sr16(dev, MV_GLOBALREG(VTU_DATA3));
+ fid = sr16(dev, MV_GLOBALREG(VTU_FID));
+ sid = sr16(dev, MV_GLOBALREG(VTU_SID));
+
+ if( (vid & 0x1000) ) {
+
+ // print info
+ len += snprintf(state->buf + len, sizeof(state->buf)-len,
"VID: %X, UseVIDPri: 0x%X, VIDPri: 0x%X Ports: 0x%X, SID: 0x%X,
VIDPolicy: 0x%X, FID: 0x%X \n",
+ (vid & 0xFFF),
+ (data3 & (1 << 15)) >> 15,
+ (data3 & (0x7 << 12)) >> 12,
+ (data1 & 0x3333) + ((data2 & 0x333) << 16),
+ sid & 0x3f,
+ (fid & (1 << 12)) >> 12,
+ (fid & 0xfff)
+ );
+ }
+ if( len >= sizeof(state->buf) ){
+ len = sizeof(state->buf);
+ pr_info("VTU string buffer filled. End.\n");
+ goto end;
+ }
+ } while( (vid & 0xFFF) != 0xFFF );
+end:
+ val->value.s = state->buf;
+ val->len = len;
+
+ return 0;
+}
+
+static int mvsw6172_get_vtu_violation (struct switch_dev *dev,
+ const struct switch_attr *attr, struct switch_val *val)
+{
+ struct mvsw6172_state *state = get_state(dev);
+ int len = 0;
+ unsigned int vid, vtu_op;
+
+ memset(state->buf,0,sizeof(state->buf));
+
+ // get violation info
+ mvsw61xx_wait_mask_s(dev, MV_GLOBALREG(VTU_OP),
+ MV_VTUOP_INPROGRESS, 0);
+ sw16(dev, MV_GLOBALREG(VTU_OP)
+ , MV_VTUOP_INPROGRESS | MV_VTUOP_GET_VIOLATION);
+ mvsw61xx_wait_mask_s(dev, MV_GLOBALREG(VTU_OP),
+ MV_VTUOP_INPROGRESS, 0);
+ vtu_op = sr16(dev, MV_GLOBALREG(VTU_OP));
+ vid = sr16(dev, MV_GLOBALREG(VTU_VID));
+
+ if( vtu_op & (1 << 5)) {
+ len += snprintf(state->buf + len, sizeof(state->buf)-len, "VTU
MEMBER VIOLATION: VID: %X, Port: %d \n",
+ vid & 0xfff,
+ (vtu_op & 0xF)
+ );
+ } else if( vtu_op & (1 << 6)) {
+ len += snprintf(state->buf + len, sizeof(state->buf)-len, "VTU
MISS VIOLATION: VID: %X, Port: %d \n",
+ vid & 0xfff,
+ (vtu_op & 0xF)
+ );
+ }
+
+ val->value.s = state->buf;
+ val->len = len;
+
+ return 0;
+}
+
+static int mvsw6172_get_vlan_vtu_record (struct switch_dev *dev,
+ const struct switch_attr *attr, struct switch_val *val)
+{
+ struct mvsw6172_state *state = get_state(dev);
+ int len = 0;
+ unsigned int vid,data1,data2,data3,fid,sid;
+
+ memset(state->buf,0,sizeof(state->buf));
+
+ vid = val->port_vlan;
+
+ if( state->vlans[vid].port_based ) {
+ val->value.s = "";
+ val->len = 1;
+ return 0;
+ }
+
+ sw16(dev, MV_GLOBALREG(VTU_VID), vid - 1);
+ //do request for vtu
+ mvsw61xx_wait_mask_s(dev, MV_GLOBALREG(VTU_OP),
+ MV_VTUOP_INPROGRESS, 0);
+ sw16(dev, MV_GLOBALREG(VTU_OP),
+ MV_VTUOP_INPROGRESS | MV_VTUOP_VTU_GET_NEXT);
+ mvsw61xx_wait_mask_s(dev, MV_GLOBALREG(VTU_OP),
+ MV_VTUOP_INPROGRESS, 0);
+
+ vid = sr16(dev, MV_GLOBALREG(VTU_VID));
+ data1 = sr16(dev, MV_GLOBALREG(VTU_DATA1));
+ data2 = sr16(dev, MV_GLOBALREG(VTU_DATA2));
+ data3 = sr16(dev, MV_GLOBALREG(VTU_DATA3));
+ fid = sr16(dev, MV_GLOBALREG(VTU_FID));
+ sid = sr16(dev, MV_GLOBALREG(VTU_SID));
+
+ // print info
+ len += snprintf(state->buf + len, sizeof(state->buf)-len, "VID: %X,
Valid: %s, UseVIDPri: 0x%X, VIDPri: 0x%X Ports: 0x%X, SID: 0x%X,
VIDPolicy: 0x%X, FID: 0x%X \n",
+ (vid & 0xFFF),
+ (vid & 0x1000) ? "true" : "false",
+ (data3 & (1 << 15)) >> 15,
+ (data3 & (0x7 << 12)) >> 12,
+ (data1 & 0x3333) + ((data2 & 0x333) << 16),
+ sid & 0x3f,
+ (fid & (1 << 12)) >> 12,
+ (fid & 0xfff)
+ );
+
+ val->value.s = state->buf;
+ val->len = len;
+
+ return 0;
+}
+
+static int mvsw6172_get_stu_base (struct switch_dev *dev,
+ const struct switch_attr *attr, struct switch_val *val)
+{
+ struct mvsw6172_state *state = get_state(dev);
+ int len = 0;
+ unsigned int vid,data1,data2,data3,sid;
+
+ memset(state->buf,0,sizeof(state->buf));
+ sid = 0x3F;
+ sw16(dev, MV_GLOBALREG(VTU_SID), sid);
+ do {
+ //do request for vtu
+ mvsw61xx_wait_mask_s(dev, MV_GLOBALREG(VTU_OP),
+ MV_VTUOP_INPROGRESS, 0);
+ sw16(dev, MV_GLOBALREG(VTU_OP),
+ MV_VTUOP_INPROGRESS | MV_VTUOP_STU_GET_NEXT);
+ mvsw61xx_wait_mask_s(dev, MV_GLOBALREG(VTU_OP),
+ MV_VTUOP_INPROGRESS, 0);
+
+ vid = sr16(dev, MV_GLOBALREG(VTU_VID));
+ data1 = sr16(dev, MV_GLOBALREG(VTU_DATA1));
+ data2 = sr16(dev, MV_GLOBALREG(VTU_DATA2));
+ data3 = sr16(dev, MV_GLOBALREG(VTU_DATA3));
+ sid = sr16(dev, MV_GLOBALREG(VTU_SID));
+ if( (vid & 0x1000) ) {
+ // print info
+ len += snprintf(state->buf + len, sizeof(state->buf)-len,
"SID: %X, Valid: %s(0x%X), Ports: 0x%X\n",
+ sid,
+ (vid & (1 << 12)) ? "true" : "false",
+ vid,
+ (data1 & 0xCCCC) + ((data2 & 0xCCC) << 16)
+ );
+
+ if( len >= sizeof(state->buf) ){
+ len = sizeof(state->buf);
+ pr_info("STU string buffer filled. End.\n");
+ goto end;
+ }
+ }
+ } while( sid != 0x3F );
+end:
+ val->value.s = state->buf;
+ val->len = len;
+
+ return 0;
+}
+
+static const struct switch_attr mvsw6172_global[] = {
+ [MVSW61XX_ENABLE_VLAN] = {
+ .id = MVSW61XX_ENABLE_VLAN,
+ .type = SWITCH_TYPE_INT,
+ .name = "enable_vlan",
+ .description = "Enable 802.1q VLAN support",
+ .get = mvsw6172_get_enable_vlan,
+ .set = mvsw6172_set_enable_vlan,
+ },
+ [MVSW61XX_VTU_BASE] = {
+ .id = MVSW61XX_VTU_BASE,
+ .type = SWITCH_TYPE_STRING,
+ .name = "VTU database",
+ .description = "show VTU base",
+ .get = mvsw6172_get_vtu_base,
+ },
+ [MVSW61XX_STU_BASE] = {
+ .id = MVSW61XX_STU_BASE,
+ .type = SWITCH_TYPE_STRING,
+ .name = "STU database",
+ .description = "show STU base",
+ .get = mvsw6172_get_stu_base,
+ },
+ [MVSW61XX_VTU_VIOLATION] = {
+ .id = MVSW61XX_VTU_VIOLATION,
+ .type = SWITCH_TYPE_STRING,
+ .name = "VTU violation",
+ .description = "Last VTU access violation",
+ .get = mvsw6172_get_vtu_violation,
+ },
+};
+
+static const struct switch_attr mvsw6172_vlan[] = {
+ [MVSW61XX_VLAN_PORT_BASED] = {
+ .id = MVSW61XX_VLAN_PORT_BASED,
+ .type = SWITCH_TYPE_INT,
+ .name = "port_based",
+ .description = "Use port-based (non-802.1q) VLAN only",
+ .get = mvsw6172_get_vlan_port_based,
+ .set = mvsw6172_set_vlan_port_based,
+ },
+ [MVSW61XX_VLAN_ID] = {
+ .id = MVSW61XX_VLAN_ID,
+ .type = SWITCH_TYPE_INT,
+ .name = "vid",
+ .description = "Get/set VLAN ID",
+ .get = mvsw6172_get_vid,
+ .set = mvsw6172_set_vid,
+ },
+ [MVSW61XX_VLAN_VTU_RECORD] = {
+ .id = MVSW61XX_VLAN_VTU_RECORD,
+ .type = SWITCH_TYPE_STRING,
+ .name = "VTU record",
+ .description = "Get VLAN VTU record",
+ .get = mvsw6172_get_vlan_vtu_record,
+ },
+};
+
+static const struct switch_attr mvsw6172_port[] = {
+ [MVSW61XX_PORT_MASK] = {
+ .id = MVSW61XX_PORT_MASK,
+ .type = SWITCH_TYPE_STRING,
+ .description = "Port-based VLAN mask",
+ .name = "mask",
+ .get = mvsw6172_get_port_mask,
+ .set = NULL,
+ },
+ [MVSW61XX_PORT_QMODE] = {
+ .id = MVSW61XX_PORT_QMODE,
+ .type = SWITCH_TYPE_INT,
+ .description = "802.1q mode: 0=off/1=fallback/2=check/3=secure",
+ .name = "qmode",
+ .get = mvsw6172_get_port_qmode,
+ .set = mvsw6172_set_port_qmode,
+ },
+ [MVSW61XX_PORT_STATUS] = {
+ .id = MVSW61XX_PORT_STATUS,
+ .type = SWITCH_TYPE_STRING,
+ .description = "Return port status",
+ .name = "status",
+ .get = mvsw6172_get_port_status,
+ .set = NULL,
+ },
+ [MVSW61XX_PORT_LINK] = {
+ .id = MVSW61XX_PORT_LINK,
+ .type = SWITCH_TYPE_INT,
+ .description = "Get link speed",
+ .name = "link",
+ .get = mvsw6172_get_port_speed,
+ .set = NULL,
+ },
+ [MVSW61XX_PORT_IN_FILTERED] = {
+ .id = MVSW61XX_PORT_IN_FILTERED,
+ .type = SWITCH_TYPE_INT,
+ .description = "IN filtered packets counter",
+ .name = "in_filtered",
+ .get = mvsw6172_get_port_in_filtered,
+ .set = NULL,
+ },
+ [MVSW61XX_PORT_OUT_ACCEPTED] = {
+ .id = MVSW61XX_PORT_OUT_ACCEPTED,
+ .type = SWITCH_TYPE_INT,
+ .description = "OUT accepted packets counter",
+ .name = "out_accepted",
+ .get = mvsw6172_get_port_out_accepted,
+ .set = NULL,
+ },
+ [MVSW61XX_PORT_DISCARD_COUNTER] = {
+ .id = MVSW61XX_PORT_DISCARD_COUNTER,
+ .type = SWITCH_TYPE_INT,
+ .description = "Discarded packets counter",
+ .name = "discard_count",
+ .get = mvsw6172_get_port_discard_count,
+ .set = NULL,
+ },
+};
+
+static const struct switch_dev_ops mvsw6172_ops = {
+ .attr_global = {
+ .attr = mvsw6172_global,
+ .n_attr = ARRAY_SIZE(mvsw6172_global),
+ },
+ .attr_vlan = {
+ .attr = mvsw6172_vlan,
+ .n_attr = ARRAY_SIZE(mvsw6172_vlan),
+ },
+ .attr_port = {
+ .attr = mvsw6172_port,
+ .n_attr = ARRAY_SIZE(mvsw6172_port),
+ },
+ .get_port_pvid = mvsw6172_get_pvid,
+ .set_port_pvid = mvsw6172_set_pvid,
+ .get_vlan_ports = mvsw6172_get_vlan_ports,
+ .set_vlan_ports = mvsw6172_set_vlan_ports,
+ .apply_config = mvsw6172_apply,
+ .reset_switch = mvsw6172_reset,
+};
+
+/* end swconfig stuff */
+
+static int mvsw6172_probe(struct platform_device *pdev)
+{
+ struct mvsw6172_state *state;
+ struct device_node *np = pdev->dev.of_node;
+ struct device_node *mdio;
+ char* ident;
+ u32 val;
+ u16 reg;
+ int err;
+
+ state = kzalloc(sizeof(*state), GFP_KERNEL);
+ if (!state)
+ return -ENOMEM;
+
+ mdio = of_parse_phandle(np, "mii-bus", 0);
+ if (!mdio) {
+ dev_err(&pdev->dev, "Couldn't get MII bus handle\n");
+ err = -ENODEV;
+ goto out_err;
+ }
+
+ state->bus = of_mdio_find_bus(mdio);
+ if (!state->bus) {
+ dev_err(&pdev->dev, "Couldn't find MII bus from handle\n");
+ err = -ENODEV;
+ goto out_err;
+ }
+
+ state->is_indirect = of_property_read_bool(np, "is-indirect");
+
+ if (state->is_indirect) {
+ if (of_property_read_u32(np, "reg", &val)) {
+ dev_err(&pdev->dev, "Switch address not specified\n");
+ err = -ENODEV;
+ goto out_err;
+ }
+
+ state->base_addr = val;
+ } else {
+ state->base_addr = MV_BASE;
+ }
+
+ reg = r16(state->bus, state->is_indirect, state->base_addr,
+ MV_PORTREG(IDENT, 0)) & MV_IDENT_MASK;
+
+ switch( reg ) {
+ case MV_IDENT_VALUE_6176:
+ ident = MV_IDENT_STRING_6176;
+ break;
+ case MV_IDENT_VALUE_6172:
+ ident = MV_IDENT_STRING_6172;
+ break;
+ default:
+ dev_err(&pdev->dev, "No switch found at 0x%02x\n",
+ state->base_addr);
+ err = -ENODEV;
+ goto out_err;
+ break;
+ }
+
+ platform_set_drvdata(pdev, state);
+
+ dev_info(&pdev->dev, "Found %s at %s:%02x\n", ident,
+ state->bus->id, state->base_addr);
+
+ dev_info(&pdev->dev, "Using %sdirect addressing\n",
+ (state->is_indirect ? "in" : ""));
+
+ if (of_property_read_u32(np, "cpu-port-0", &val)) {
+ dev_err(&pdev->dev, "CPU port not set\n");
+ err = -ENODEV;
+ goto out_err;
+ }
+
+ state->cpu_port0 = val;
+ state->dev.cpu_port=state->cpu_port0;
+
+ if (!of_property_read_u32(np, "cpu-port-1", &val)){
+ state->cpu_port1 = val;
+ } else {
+ state->cpu_port1 = -1;
+ }
+
+ state->dev.vlans = MV_VLANS;
+
+ state->dev.ports = MV_PORTS;
+ state->dev.name = ident;
+ state->dev.ops = &mvsw6172_ops;
+ state->dev.alias = dev_name(&pdev->dev);
+
+ err = register_switch(&state->dev, NULL);
+ if (err < 0)
+ goto out_err;
+
+ state->registered = true;
+
+ return 0;
+out_err:
+ kfree(state);
+ return err;
+}
+
+static int
+mvsw6172_remove(struct platform_device *pdev)
+{
+ struct mvsw6172_state *state = platform_get_drvdata(pdev);
+
+ if (state->registered)
+ unregister_switch(&state->dev);
+
+ kfree(state);
+
+ return 0;
+}
+
+static const struct of_device_id mvsw6172_match[] = {
+ { .compatible = "marvell,88e6172" },
+ { .compatible = "marvell,88e6176" },
+ { }
+};
+MODULE_DEVICE_TABLE(of, mvsw6172_match);
+
+static struct platform_driver mvsw6172_driver = {
+ .probe = mvsw6172_probe,
+ .remove = mvsw6172_remove,
+ .driver = {
+ .name = "mvsw6172",
+ .of_match_table = of_match_ptr(mvsw6172_match),
+ .owner = THIS_MODULE,
+ },
+};
+
+static int __init mvsw6172_module_init(void)
+{
+ return platform_driver_register(&mvsw6172_driver);
+}
+late_initcall(mvsw6172_module_init);
+
+static void __exit mvsw6172_module_exit(void)
+{
+ platform_driver_unregister(&mvsw6172_driver);
+}
+module_exit(mvsw6172_module_exit);
diff --git a/target/linux/generic/files/drivers/net/phy/mvsw6172.h
b/target/linux/generic/files/drivers/net/phy/mvsw6172.h
new file mode 100644
index 0000000..4e357e1
--- /dev/null
+++ b/target/linux/generic/files/drivers/net/phy/mvsw6172.h
@@ -0,0 +1,262 @@
+/*
+ * Marvell 88E6172/76 switch driver
+ *
+ * Copyright (c) 2014 Nikita Nazarenko <nnazarenko at radiofid.com>
+ *
+ * Based on code (c) 2014 Claudio Leite <leitec at staticky.com>
+ * Based on code (c) 2008 Felix Fietkau <nbd at openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License v2 as published by the
+ * Free Software Foundation
+ */
+
+#ifndef __MVSW6172_H
+#define __MVSW6172_H
+
+#define MV_PORTS 7
+#define MV_PORTS_MASK ((1 << MV_PORTS) - 1)
+
+#define MV_BASE 0x10
+
+#define MV_SWITCHPORT_BASE 0x10
+#define MV_SWITCHPORT(_n) (MV_SWITCHPORT_BASE + (_n))
+#define MV_SWITCHREGS (MV_BASE + 0xb)
+
+#define MV_VLANS 64
+
+enum {
+ MV_PORT_STATUS = 0x00,
+ MV_PORT_PHYCTL = 0x01,
+ MV_PORT_JAMCTL = 0x02,
+ MV_PORT_IDENT = 0x03,
+ MV_PORT_CONTROL = 0x04,
+ MV_PORT_CONTROL1 = 0x05,
+ MV_PORT_VLANMAP = 0x06,
+ MV_PORT_VLANID = 0x07,
+ MV_PORT_CONTROL2 = 0x08,
+ MV_PORT_ASSOC = 0x0b,
+ MV_PORT_RX_DISCARD_LOW = 0x10,
+ MV_PORT_RX_DISCARD_HIGH = 0x11,
+ MV_PORT_IN_FILTERED = 0x12,
+ MV_PORT_OUT_ACCEPTED = 0x13,
+};
+#define MV_PORTREG(_type, _port) MV_SWITCHPORT(_port), MV_PORT_##_type
+
+enum {
+ MV_PORT_STATUS_FDX = (1 << 10),
+ MV_PORT_STATUS_LINK = (1 << 11),
+};
+
+enum {
+ MV_PORT_STATUS_SPEED_10 = 0x00,
+ MV_PORT_STATUS_SPEED_100 = 0x01,
+ MV_PORT_STATUS_SPEED_1000 = 0x02,
+};
+#define MV_PORT_STATUS_SPEED_SHIFT 8
+#define MV_PORT_STATUS_SPEED_MASK (3 << 8)
+
+enum {
+ MV_PORTCTRL_BLOCK = (1 << 0),
+ MV_PORTCTRL_LEARN = (2 << 0),
+ MV_PORTCTRL_ENABLED = (3 << 0),
+ MV_PORTCTRL_VLANTUN = (1 << 7),
+ MV_PORTCTRL_EGRESS = (1 << 12),
+};
+
+#define MV_PHYCTL_FC_MASK (3 << 6)
+
+enum {
+ MV_PHYCTL_FC_ENABLE = (3 << 6),
+ MV_PHYCTL_FC_DISABLE = (1 << 6),
+};
+
+enum {
+ MV_8021Q_EGRESS_UNMODIFIED = 0x00,
+ MV_8021Q_EGRESS_UNTAGGED = 0x01,
+ MV_8021Q_EGRESS_TAGGED = 0x02,
+ MV_8021Q_EGRESS_ADDTAG = 0x03,
+};
+
+#define MV_8021Q_MODE_SHIFT 10
+#define MV_8021Q_MODE_MASK (0x3 << MV_8021Q_MODE_SHIFT)
+
+enum {
+ MV_8021Q_MODE_DISABLE = 0x00,
+ MV_8021Q_MODE_FALLBACK = 0x01,
+ MV_8021Q_MODE_CHECK = 0x02,
+ MV_8021Q_MODE_SECURE = 0x03,
+};
+
+enum {
+ MV_8021Q_VLAN_ONLY = (1 << 15),
+};
+
+
+#define MV_PORTASSOC_MONITOR (1 << 15)
+
+enum {
+ MV_SWITCH_ATU_FID0 = 0x01,
+ MV_SWITCH_ATU_FID1 = 0x02,
+ MV_SWITCH_ATU_SID = 0x03,
+ MV_SWITCH_CTRL = 0x04,
+ MV_SWITCH_ATU_CTRL = 0x0a,
+ MV_SWITCH_ATU_OP = 0x0b,
+ MV_SWITCH_ATU_DATA = 0x0c,
+ MV_SWITCH_ATU_MAC0 = 0x0d,
+ MV_SWITCH_ATU_MAC1 = 0x0e,
+ MV_SWITCH_ATU_MAC2 = 0x0f,
+ MV_SWITCH_GLOBAL = 0x1b,
+ MV_SWITCH_GLOBAL2 = 0x1c,
+};
+#define MV_SWITCHREG(_type) MV_SWITCHREGS, MV_SWITCH_##_type
+
+enum {
+ MV_SWITCHCTL_EEIE = (1 << 0),
+ MV_SWITCHCTL_PHYIE = (1 << 1),
+ MV_SWITCHCTL_ATUDONE = (1 << 2),
+ MV_SWITCHCTL_ATUIE = (1 << 3),
+ MV_SWITCHCTL_CTRMODE = (1 << 8),
+ MV_SWITCHCTL_RELOAD = (1 << 9),
+ MV_SWITCHCTL_MSIZE = (1 << 10),
+ MV_SWITCHCTL_DROP = (1 << 13),
+};
+
+enum {
+#define MV_ATUCTL_AGETIME_MIN 16
+#define MV_ATUCTL_AGETIME_MAX 4080
+#define MV_ATUCTL_AGETIME(_n) ((((_n) / 16) & 0xff) << 4)
+ MV_ATUCTL_ATU_256 = (0 << 12),
+ MV_ATUCTL_ATU_512 = (1 << 12),
+ MV_ATUCTL_ATU_1K = (2 << 12),
+ MV_ATUCTL_ATUMASK = (3 << 12),
+ MV_ATUCTL_NO_LEARN = (1 << 14),
+ MV_ATUCTL_RESET = (1 << 15),
+};
+
+enum {
+#define MV_ATUOP_DBNUM(_n) ((_n) & 0x0f)
+ MV_ATUOP_NOOP = (0 << 12),
+ MV_ATUOP_FLUSH_ALL = (1 << 12),
+ MV_ATUOP_FLUSH_U = (2 << 12),
+ MV_ATUOP_LOAD_DB = (3 << 12),
+ MV_ATUOP_GET_NEXT = (4 << 12),
+ MV_ATUOP_FLUSH_DB = (5 << 12),
+ MV_ATUOP_FLUSH_DB_UU = (6 << 12),
+ MV_ATUOP_INPROGRESS = (1 << 15),
+};
+
+enum {
+ MV_GLOBAL_STATUS = 0x00,
+ MV_GLOBAL_ATU_FID = 0x01,
+ MV_GLOBAL_VTU_FID = 0x02,
+ MV_GLOBAL_VTU_SID = 0x03,
+ MV_GLOBAL_CONTROL = 0x04,
+ MV_GLOBAL_VTU_OP = 0x05,
+ MV_GLOBAL_VTU_VID = 0x06,
+ MV_GLOBAL_VTU_DATA1 = 0x07,
+ MV_GLOBAL_VTU_DATA2 = 0x08,
+ MV_GLOBAL_VTU_DATA3 = 0x09,
+ MV_GLOBAL_GLOBAL_CONTROL2 = 0x1C,
+};
+#define MV_GLOBALREG(_type) MV_SWITCH_GLOBAL, MV_GLOBAL_##_type
+
+
+enum {
+ MV_GLOBAL2_SDET_POLARITY = 0x1D,
+};
+#define MV_GLOBAL2REG(_type) MV_SWITCH_GLOBAL2, MV_GLOBAL2_##_type
+
+enum {
+ MV_VTU_VID_VALID = (1 << 12),
+};
+
+enum {
+ MV_VTUOP_PURGE = (1 << 12),
+ MV_VTUOP_LOAD = (3 << 12),
+ MV_VTUOP_INPROGRESS = (1 << 15),
+ MV_VTUOP_STULOAD = (5 << 12),
+ MV_VTUOP_VTU_GET_NEXT = (4 << 12),
+ MV_VTUOP_STU_GET_NEXT = (6 << 12),
+ MV_VTUOP_GET_VIOLATION = (7 << 12),
+};
+
+enum {
+ MV_CONTROL_RESET = (1 << 15),
+ MV_CONTROL_PPU_ENABLE = (1 << 14),
+};
+
+enum {
+ MV_VTUCTL_EGRESS_UNMODIFIED = 0x00,
+ MV_VTUCTL_EGRESS_UNTAGGED = 0x01,
+ MV_VTUCTL_EGRESS_TAGGED = 0x02,
+ MV_VTUCTL_DISCARD = 0x03,
+};
+
+enum {
+ MV_STUCTL_DISABLED = 0x00,
+ MV_STUCTL_BLOCKING = 0x10,
+ MV_STUCTL_LEARNING = 0x20,
+ MV_STUCTL_FORWARDING = 0x30,
+};
+
+enum {
+ MV_STUCTL_STATE_DISABLED = 0x00,
+ MV_STUCTL_STATE_BLOCKING = 0x01,
+ MV_STUCTL_STATE_LEARNING = 0x02,
+ MV_STUCTL_STATE_FORWARDING = 0x03,
+};
+
+enum {
+ MV_INDIRECT_REG_CMD = 0,
+ MV_INDIRECT_REG_DATA = 1,
+};
+
+enum {
+ MV_INDIRECT_INPROGRESS = 0x8000,
+ MV_INDIRECT_WRITE = 0x9400,
+ MV_INDIRECT_READ = 0x9800,
+};
+#define MV_INDIRECT_ADDR_S 5
+
+#define MV_IDENT_MASK 0xfff0
+#define MV_IDENT_VALUE_6176 0x1760
+#define MV_IDENT_VALUE_6172 0x1720
+#define MV_IDENT_STRING_6176 "MV88E6176"
+#define MV_IDENT_STRING_6172 "MV88E6172"
+
+#define MV_PVID_MASK 0x0fff
+
+struct mvsw6172_state {
+ struct switch_dev dev;
+ struct mii_bus *bus;
+ int base_addr;
+
+ bool registered;
+ bool is_indirect;
+
+ int cpu_port0;
+ int cpu_port1;
+
+ int vlan_enabled;
+ struct port_state {
+ u16 pvid;
+ u16 mask;
+ u8 qmode;
+ } ports[MV_PORTS];
+
+ struct vlan_state {
+ bool port_based;
+
+ u16 mask;
+ u16 vid;
+ u32 port_mode;
+ u32 port_state;
+ } vlans[MV_VLANS];
+
+ char buf[1024];
+};
+
+#define get_state(_dev) container_of((_dev), struct mvsw6172_state, dev)
+
+#endif
diff --git a/target/linux/generic/patches-3.10/733-phy_mvsw6172.patch
b/target/linux/generic/patches-3.10/733-phy_mvsw6172.patch
new file mode 100644
index 0000000..a594fe9
--- /dev/null
+++ b/target/linux/generic/patches-3.10/733-phy_mvsw6172.patch
@@ -0,0 +1,24 @@
+--- a/drivers/net/phy/Kconfig 2014-10-22 16:21:39.427405185 +0400
++++ b/drivers/net/phy/Kconfig 2014-10-22 16:22:05.601755370 +0400
+@@ -135,6 +135,10 @@
+ tristate "Driver for Marvell 88E6171 switches"
+ select SWCONFIG
+
++config MVSW6172_PHY
++ tristate "Driver for Marvell 88E6172/88E6176 switches"
++ select SWCONFIG
++
+ config IP17XX_PHY
+ tristate "Driver for IC+ IP17xx switches"
+ select SWCONFIG
+
+--- a/drivers/net/phy/Makefile 2014-10-22 16:22:11.861998575 +0400
++++ b/drivers/net/phy/Makefile 2014-10-22 16:22:29.442681567 +0400
+@@ -20,6 +20,7 @@
+ obj-$(CONFIG_ADM6996_PHY) += adm6996.o
+ obj-$(CONFIG_MVSWITCH_PHY) += mvswitch.o
+ obj-$(CONFIG_MVSW6171_PHY) += mvsw6171.o
++obj-$(CONFIG_MVSW6172_PHY) += mvsw6172.o
+ obj-$(CONFIG_IP17XX_PHY) += ip17xx.o
+ obj-$(CONFIG_REALTEK_PHY) += realtek.o
+ obj-$(CONFIG_AR8216_PHY) += ar8216.o
--
2.1.3
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
More information about the openwrt-devel
mailing list