Further arswitch work:

* Add in the AR724x support.  It probes the same as an AR8216/AR8316, so
  just add in a hint to force the probe success rather than auto-detecting
  it.

* Add in the missing entries from conf/files, lacking in the previous
  commit.

The register values and CPU port / mirror port initialisation value was
obtained from Linux OpenWRT ag71xx_ar7240.c.

The DELAY(1000) to let things settle is my local workaround.  For some
reason, PHY4 doesn't seem to probe very reliably without it.  It's quite
possible that we're missing some MDIO bus initialisation code in if_arge
for the AR724x case.  As I dislike DELAY() workarounds in general, it's
definitely worth trying to figure out why this is the case.

Tested on:	AP93 (AR7240) reference design

Obtained from:	Linux OpenWRT

5 files changed, 207 insertions, 1 deletions

diff --git a/sys/conf/files b/sys/conf/files
index a8c9891..3c84cf6 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -3688,3 +3688,16 @@ dev/xen/xenpci/evtchn.c         optional xenpci
 dev/etherswitch/mdio_if.m	optional miiproxy
 dev/etherswitch/mdio.c		optional miiproxy
 dev/etherswitch/miiproxy.c	optional miiproxy
+
+dev/etherswitch/etherswitch.c	optional etherswitch
+dev/etherswitch/etherswitch_if.m	optional etherswitch
+
+dev/etherswitch/rtl8366/rtl8366rb.c		optional rtl8366rb
+
+dev/etherswitch/arswitch/arswitch.c		optional arswitch
+dev/etherswitch/arswitch/arswitch_reg.c		optional arswitch
+dev/etherswitch/arswitch/arswitch_phy.c		optional arswitch
+dev/etherswitch/arswitch/arswitch_8216.c	optional arswitch
+dev/etherswitch/arswitch/arswitch_8226.c	optional arswitch
+dev/etherswitch/arswitch/arswitch_8316.c	optional arswitch
+dev/etherswitch/arswitch/arswitch_7240.c	optional arswitch
diff --git a/sys/dev/etherswitch/arswitch/arswitch.c b/sys/dev/etherswitch/arswitch/arswitch.c
index 4130b36..1410838 100644
--- a/sys/dev/etherswitch/arswitch/arswitch.c
+++ b/sys/dev/etherswitch/arswitch/arswitch.c
@@ -59,6 +59,7 @@
 #include <dev/etherswitch/arswitch/arswitch_reg.h>
 #include <dev/etherswitch/arswitch/arswitch_phy.h>
 
+#include <dev/etherswitch/arswitch/arswitch_7240.h>
 #include <dev/etherswitch/arswitch/arswitch_8216.h>
 #include <dev/etherswitch/arswitch/arswitch_8226.h>
 #include <dev/etherswitch/arswitch/arswitch_8316.h>
@@ -96,6 +97,15 @@ arswitch_probe(device_t dev)
 	sc = device_get_softc(dev);
 	bzero(sc, sizeof(*sc));
 	sc->page = -1;
+
+	/* AR7240 probe */
+	if (ar7240_probe(dev) == 0) {
+		chipname = "AR7240";
+		sc->sc_switchtype = AR8X16_SWITCH_AR7240;
+		goto done;
+	}
+
+	/* AR8xxx probe */
 	id = arswitch_readreg(dev, AR8X16_REG_MASK_CTRL);
 	switch ((id & AR8X16_MASK_CTRL_VER_MASK) >>
 	    AR8X16_MASK_CTRL_VER_SHIFT) {
@@ -114,6 +124,8 @@ arswitch_probe(device_t dev)
 	default:
 		chipname = NULL;
 	}
+
+done:
 	DPRINTF(dev, "chipname=%s, rev=%02x\n", chipname,
 	    id & AR8X16_MASK_CTRL_REV_MASK);
 	if (chipname != NULL) {
@@ -176,7 +188,9 @@ arswitch_attach(device_t dev)
 	/*
 	 * Attach switch related functions
 	 */
-	if (AR8X16_IS_SWITCH(sc, AR8216))
+	if (AR8X16_IS_SWITCH(sc, AR7240))
+		ar7240_attach(sc);
+	else if (AR8X16_IS_SWITCH(sc, AR8216))
 		ar8216_attach(sc);
 	else if (AR8X16_IS_SWITCH(sc, AR8226))
 		ar8226_attach(sc);
diff --git a/sys/dev/etherswitch/arswitch/arswitch_7240.c b/sys/dev/etherswitch/arswitch/arswitch_7240.c
new file mode 100644
index 0000000..c4b6ba8
--- /dev/null
+++ b/sys/dev/etherswitch/arswitch/arswitch_7240.c
@@ -0,0 +1,143 @@
+/*-
+ * Copyright (c) 2011-2012 Stefan Bethke.
+ * Copyright (c) 2012 Adrian Chadd.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#include <sys/param.h>
+#include <sys/bus.h>
+#include <sys/errno.h>
+#include <sys/kernel.h>
+#include <sys/module.h>
+#include <sys/socket.h>
+#include <sys/sockio.h>
+#include <sys/sysctl.h>
+#include <sys/systm.h>
+
+#include <net/if.h>
+#include <net/if_arp.h>
+#include <net/ethernet.h>
+#include <net/if_dl.h>
+#include <net/if_media.h>
+#include <net/if_types.h>
+
+#include <machine/bus.h>
+#include <dev/iicbus/iic.h>
+#include <dev/iicbus/iiconf.h>
+#include <dev/iicbus/iicbus.h>
+#include <dev/mii/mii.h>
+#include <dev/mii/miivar.h>
+#include <dev/etherswitch/mdio.h>
+
+#include <dev/etherswitch/etherswitch.h>
+
+#include <dev/etherswitch/arswitch/arswitchreg.h>
+#include <dev/etherswitch/arswitch/arswitchvar.h>
+#include <dev/etherswitch/arswitch/arswitch_reg.h>
+#include <dev/etherswitch/arswitch/arswitch_phy.h>	/* XXX for probe */
+#include <dev/etherswitch/arswitch/arswitch_7240.h>
+
+#include "mdio_if.h"
+#include "miibus_if.h"
+#include "etherswitch_if.h"
+
+/* XXX belongs in arswitch_7240_reg.h */
+
+#define	AR7240_REG_CPU_PORT		0x78
+#define		AR7240_MIRROR_PORT_MASK		0x000000f0
+#define		AR7240_MIRROR_PORT_S		4
+#define		AR7240_CPU_PORT_EN		0x00000100
+
+#define	AR7240_REG_TAG_PRIORITY		0x70
+
+/*
+ * AR7240 specific functions
+ */
+static int
+ar7240_hw_setup(struct arswitch_softc *sc)
+{
+
+	/* Enable CPU port; disable mirror port */
+	arswitch_writereg(sc->sc_dev, AR7240_REG_CPU_PORT,
+	    AR7240_CPU_PORT_EN |
+	    (15 << AR7240_MIRROR_PORT_S));
+
+	/*
+	 * Let things settle; probing PHY4 doesn't seem reliable
+	 * without a litle delay.
+	 */
+	DELAY(1000);
+
+	return (0);
+}
+
+/*
+ * Initialise other global values for the AR7240.
+ */
+static int
+ar7240_hw_global_setup(struct arswitch_softc *sc)
+{
+
+	/* Setup TAG priority mapping */
+	arswitch_writereg(sc->sc_dev, AR7240_REG_TAG_PRIORITY, 0xfa50);
+
+	/* XXX MTU */
+
+	/* XXX Service Tag */
+
+	return (0);
+}
+
+/*
+ * The AR7240 probes the same as the AR8216.
+ *
+ * However, the support is slightly different.
+ *
+ * So instead of checking the PHY revision or mask register contents,
+ * we simply fall back to a hint check.
+ */
+int
+ar7240_probe(device_t dev)
+{
+	int is_7240 = 0;
+
+	if (resource_int_value(device_get_name(dev), device_get_unit(dev),
+	    "is_7240", &is_7240) != 0)
+		return (ENXIO);
+
+	if (is_7240 == 0)
+		return (ENXIO);
+
+	return (0);
+}
+
+void
+ar7240_attach(struct arswitch_softc *sc)
+{
+
+	sc->hal.arswitch_hw_setup = ar7240_hw_setup;
+	sc->hal.arswitch_hw_global_setup = ar7240_hw_global_setup;
+}
diff --git a/sys/dev/etherswitch/arswitch/arswitch_7240.h b/sys/dev/etherswitch/arswitch/arswitch_7240.h
new file mode 100644
index 0000000..838a6d1
--- /dev/null
+++ b/sys/dev/etherswitch/arswitch/arswitch_7240.h
@@ -0,0 +1,35 @@
+/*-
+ * Copyright (c) 2011-2012 Stefan Bethke.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+#ifndef	__ARSWITCH_7240_H__
+#define	__ARSWITCH_7240_H__
+
+extern	int ar7240_probe(device_t dev);
+extern	void ar7240_attach(struct arswitch_softc *sc);
+
+#endif	/* __ARSWITCH_7240_H__ */
+
diff --git a/sys/dev/etherswitch/arswitch/arswitchvar.h b/sys/dev/etherswitch/arswitch/arswitchvar.h
index 6f9d59e..4121161 100644
--- a/sys/dev/etherswitch/arswitch/arswitchvar.h
+++ b/sys/dev/etherswitch/arswitch/arswitchvar.h
@@ -30,6 +30,7 @@
 
 typedef enum {
 	AR8X16_SWITCH_NONE,
+	AR8X16_SWITCH_AR7240,
 	AR8X16_SWITCH_AR8216,
 	AR8X16_SWITCH_AR8226,
 	AR8X16_SWITCH_AR8316,