diff --git a/sys/dev/etherswitch/arswitch/arswitch_reg.c b/sys/dev/etherswitch/arswitch/arswitch_reg.c index 3eb0600fdc3e..3251da8a2eec 100644 --- a/sys/dev/etherswitch/arswitch/arswitch_reg.c +++ b/sys/dev/etherswitch/arswitch/arswitch_reg.c @@ -1,211 +1,222 @@ /*- * 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$ */ #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include "mdio_if.h" #include "miibus_if.h" #include "etherswitch_if.h" static inline void arswitch_split_setpage(device_t dev, uint32_t addr, uint16_t *phy, uint16_t *reg) { struct arswitch_softc *sc = device_get_softc(dev); uint16_t page; page = ((addr) >> 9) & 0xffff; *phy = (((addr) >> 6) & 0x07) | 0x10; *reg = ((addr) >> 1) & 0x1f; if (sc->page != page) { MDIO_WRITEREG(device_get_parent(dev), 0x18, 0, page); sc->page = page; } } /* * Read half a register. Some of the registers define control bits, and * the sequence of half-word accesses matters. The register addresses * are word-even (mod 4). */ static inline int arswitch_readreg16(device_t dev, int addr) { uint16_t phy, reg; arswitch_split_setpage(dev, addr, &phy, ®); return (MDIO_READREG(device_get_parent(dev), phy, reg)); } /* * XXX NOTE: * * This may not work for AR7240 series embedded switches - * the per-PHY register space doesn't seem to be exposed. * * In that instance, it may be required to speak via * the internal switch PHY MDIO bus indirection. */ void arswitch_writedbg(device_t dev, int phy, uint16_t dbg_addr, uint16_t dbg_data) { (void) MDIO_WRITEREG(device_get_parent(dev), phy, MII_ATH_DBG_ADDR, dbg_addr); (void) MDIO_WRITEREG(device_get_parent(dev), phy, MII_ATH_DBG_DATA, dbg_data); } void arswitch_writemmd(device_t dev, int phy, uint16_t dbg_addr, uint16_t dbg_data) { (void) MDIO_WRITEREG(device_get_parent(dev), phy, MII_ATH_MMD_ADDR, dbg_addr); (void) MDIO_WRITEREG(device_get_parent(dev), phy, MII_ATH_MMD_DATA, dbg_data); } /* * Write half a register */ static inline int arswitch_writereg16(device_t dev, int addr, int data) { uint16_t phy, reg; arswitch_split_setpage(dev, addr, &phy, ®); return (MDIO_WRITEREG(device_get_parent(dev), phy, reg, data)); } int arswitch_readreg_lsb(device_t dev, int addr) { return (arswitch_readreg16(dev, addr)); } int arswitch_readreg_msb(device_t dev, int addr) { return (arswitch_readreg16(dev, addr + 2) << 16); } int arswitch_writereg_lsb(device_t dev, int addr, int data) { return (arswitch_writereg16(dev, addr, data & 0xffff)); } int arswitch_writereg_msb(device_t dev, int addr, int data) { return (arswitch_writereg16(dev, addr + 2, (data >> 16) & 0xffff)); } int arswitch_readreg(device_t dev, int addr) { return (arswitch_readreg_lsb(dev, addr) | arswitch_readreg_msb(dev, addr)); } int arswitch_writereg(device_t dev, int addr, int value) { + struct arswitch_softc *sc; + int r; + + sc = device_get_softc(dev); /* XXX Check the first write too? */ - arswitch_writereg_msb(dev, addr, value); - return (arswitch_writereg_lsb(dev, addr, value)); + if (sc->mii_lo_first) { + r = arswitch_writereg_lsb(dev, addr, value); + r |= arswitch_writereg_msb(dev, addr, value); + } else { + r = arswitch_writereg_msb(dev, addr, value); + r |= arswitch_writereg_lsb(dev, addr, value); + } + + return r; } int arswitch_modifyreg(device_t dev, int addr, int mask, int set) { int value; value = arswitch_readreg(dev, addr); value &= ~mask; value |= set; return (arswitch_writereg(dev, addr, value)); } int arswitch_waitreg(device_t dev, int addr, int mask, int val, int timeout) { int err, v; err = -1; while (1) { v = arswitch_readreg(dev, addr); v &= mask; if (v == val) { err = 0; break; } if (!timeout) break; DELAY(1); timeout--; } return (err); } diff --git a/sys/dev/etherswitch/arswitch/arswitchvar.h b/sys/dev/etherswitch/arswitch/arswitchvar.h index 91d755aa4926..10a942d861cb 100644 --- a/sys/dev/etherswitch/arswitch/arswitchvar.h +++ b/sys/dev/etherswitch/arswitch/arswitchvar.h @@ -1,97 +1,98 @@ /*- * 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 __ARSWITCHVAR_H__ #define __ARSWITCHVAR_H__ typedef enum { AR8X16_SWITCH_NONE, AR8X16_SWITCH_AR7240, AR8X16_SWITCH_AR8216, AR8X16_SWITCH_AR8226, AR8X16_SWITCH_AR8316, AR8X16_SWITCH_AR9340, } ar8x16_switch_type; /* * XXX TODO: start using this where required */ #define AR8X16_IS_SWITCH(_sc, _type) \ (!!((_sc)->sc_switchtype == AR8X16_SWITCH_ ## _type)) struct arswitch_softc { struct mtx sc_mtx; /* serialize access to softc */ device_t sc_dev; int phy4cpu; /* PHY4 is connected to the CPU */ int numphys; /* PHYs we manage */ int is_rgmii; /* PHY mode is RGMII (XXX which PHY?) */ int is_gmii; /* PHY mode is GMII (XXX which PHY?) */ int is_mii; /* PHY mode is MII (XXX which PHY?) */ int page; int is_internal_switch; + int mii_lo_first; ar8x16_switch_type sc_switchtype; char *ifname[AR8X16_NUM_PHYS]; device_t miibus[AR8X16_NUM_PHYS]; struct ifnet *ifp[AR8X16_NUM_PHYS]; struct callout callout_tick; etherswitch_info_t info; /* VLANs support */ int vid[AR8X16_MAX_VLANS]; uint32_t vlan_mode; struct { int (* arswitch_hw_setup) (struct arswitch_softc *); int (* arswitch_hw_global_setup) (struct arswitch_softc *); } hal; }; #define ARSWITCH_LOCK(_sc) \ mtx_lock(&(_sc)->sc_mtx) #define ARSWITCH_UNLOCK(_sc) \ mtx_unlock(&(_sc)->sc_mtx) #define ARSWITCH_LOCK_ASSERT(_sc, _what) \ mtx_assert(&(_sc)->sc_mtx, (_what)) #define ARSWITCH_TRYLOCK(_sc) \ mtx_trylock(&(_sc)->sc_mtx) #if defined(DEBUG) #define DPRINTF(dev, args...) device_printf(dev, args) #define DEVERR(dev, err, fmt, args...) do { \ if (err != 0) device_printf(dev, fmt, err, args); \ } while (0) #define DEBUG_INCRVAR(var) do { \ var++; \ } while (0) #else #define DPRINTF(dev, args...) #define DEVERR(dev, err, fmt, args...) #define DEBUG_INCRVAR(var) #endif #endif /* __ARSWITCHVAR_H__ */