From owner-svn-src-head@FreeBSD.ORG Wed Oct 16 03:15:53 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 0D87D686; Wed, 16 Oct 2013 03:15:53 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id ED4A22B4D; Wed, 16 Oct 2013 03:15:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9G3FqoE009580; Wed, 16 Oct 2013 03:15:52 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9G3Fq6I009578; Wed, 16 Oct 2013 03:15:52 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201310160315.r9G3Fq6I009578@svn.freebsd.org> From: Adrian Chadd Date: Wed, 16 Oct 2013 03:15:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r256576 - head/sys/dev/etherswitch/arswitch X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Oct 2013 03:15:53 -0000 Author: adrian Date: Wed Oct 16 03:15:52 2013 New Revision: 256576 URL: http://svnweb.freebsd.org/changeset/base/256576 Log: Initial commit of AR9340 switch SoC support. This is just the chip initialisation code (for now.) It's not linked into the main build as it requires a bunch of other code to be tidied up and committed. But it indeed does function as advertised. Tested: * AR9344 SoC Added: head/sys/dev/etherswitch/arswitch/arswitch_9340.c (contents, props changed) head/sys/dev/etherswitch/arswitch/arswitch_9340.h (contents, props changed) Added: head/sys/dev/etherswitch/arswitch/arswitch_9340.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/dev/etherswitch/arswitch/arswitch_9340.c Wed Oct 16 03:15:52 2013 (r256576) @@ -0,0 +1,203 @@ +/*- + * Copyright (c) 2011-2012 Stefan Bethke. + * Copyright (c) 2013 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 +#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 /* XXX for probe */ +#include + +#include "mdio_if.h" +#include "miibus_if.h" +#include "etherswitch_if.h" + +/* + * AR9340 specific functions + */ +static int +ar9340_hw_setup(struct arswitch_softc *sc) +{ + + return (0); +} + +/* + * Initialise other global values for the AR9340. + */ +static int +ar9340_hw_global_setup(struct arswitch_softc *sc) +{ + + /* Enable CPU port; disable mirror port */ + arswitch_writereg(sc->sc_dev, AR8X16_REG_CPU_PORT, + AR8X16_CPU_PORT_EN | AR8X16_CPU_MIRROR_DIS); + + /* Setup TAG priority mapping */ + arswitch_writereg(sc->sc_dev, AR8X16_REG_TAG_PRIO, 0xfa50); + + /* Enable aging, MAC replacing */ + arswitch_writereg(sc->sc_dev, AR934X_REG_AT_CTRL, + 0x2b /* 5 min age time */ | + AR934X_AT_CTRL_AGE_EN | + AR934X_AT_CTRL_LEARN_CHANGE); + + /* Enable ARP frame acknowledge */ + arswitch_modifyreg(sc->sc_dev, AR934X_REG_QM_CTRL, + AR934X_QM_CTRL_ARP_EN, AR934X_QM_CTRL_ARP_EN); + + /* Enable Broadcast frames transmitted to the CPU */ + arswitch_modifyreg(sc->sc_dev, AR934X_REG_FLOOD_MASK, + AR934X_FLOOD_MASK_BC_DP(0), + AR934X_FLOOD_MASK_BC_DP(0)); + arswitch_modifyreg(sc->sc_dev, AR934X_REG_FLOOD_MASK, + AR934X_FLOOD_MASK_MC_DP(0), + AR934X_FLOOD_MASK_MC_DP(0)); + + /* Enable MIB counters */ + arswitch_modifyreg(sc->sc_dev, AR8X16_REG_MIB_FUNC0, + AR934X_MIB_ENABLE, AR934X_MIB_ENABLE); + + /* Setup MTU */ + arswitch_modifyreg(sc->sc_dev, AR8X16_REG_GLOBAL_CTRL, + AR7240_GLOBAL_CTRL_MTU_MASK, + SM(1536, AR7240_GLOBAL_CTRL_MTU_MASK)); + + /* Service Tag */ + arswitch_modifyreg(sc->sc_dev, AR8X16_REG_SERVICE_TAG, + AR8X16_SERVICE_TAG_MASK, 0); + + /* Settle time */ + DELAY(1000); + + /* + * Check PHY mode bits. + * + * This dictates whether the connected port is to be wired + * up via GMII or MII. I'm not sure why - this is an internal + * wiring issue. + */ + if (sc->is_gmii) { + device_printf(sc->sc_dev, "%s: GMII\n", __func__); + arswitch_modifyreg(sc->sc_dev, AR934X_REG_OPER_MODE0, + AR934X_OPER_MODE0_MAC_GMII_EN, + AR934X_OPER_MODE0_MAC_GMII_EN); + } else if (sc->is_mii) { + device_printf(sc->sc_dev, "%s: MII\n", __func__); + arswitch_modifyreg(sc->sc_dev, AR934X_REG_OPER_MODE0, + AR934X_OPER_MODE0_PHY_MII_EN, + AR934X_OPER_MODE0_PHY_MII_EN); + } else { + device_printf(sc->sc_dev, "%s: need is_gmii or is_mii set\n", + __func__); + return (ENXIO); + } + + /* + * Whether to connect PHY 4 via MII (ie a switch port) or + * treat it as a CPU port. + */ + if (sc->phy4cpu) { + device_printf(sc->sc_dev, "%s: PHY4 - CPU\n", __func__); + arswitch_modifyreg(sc->sc_dev, AR934X_REG_OPER_MODE1, + AR934X_REG_OPER_MODE1_PHY4_MII_EN, + AR934X_REG_OPER_MODE1_PHY4_MII_EN); + sc->info.es_nports = 4; + } else { + device_printf(sc->sc_dev, "%s: PHY4 - Local\n", __func__); + sc->info.es_nports = 5; + } + + /* Settle time */ + DELAY(1000); + + return (0); +} + +/* + * The AR9340 switch probes (almost) the same as the AR7240 on-chip switch. + * + * 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 +ar9340_probe(device_t dev) +{ + int is_9340 = 0; + + if (resource_int_value(device_get_name(dev), device_get_unit(dev), + "is_9340", &is_9340) != 0) + return (ENXIO); + + if (is_9340 == 0) + return (ENXIO); + + return (0); +} + +void +ar9340_attach(struct arswitch_softc *sc) +{ + + sc->hal.arswitch_hw_setup = ar9340_hw_setup; + sc->hal.arswitch_hw_global_setup = ar9340_hw_global_setup; + + /* Set the switch vlan capabilities. */ + sc->info.es_vlan_caps = ETHERSWITCH_VLAN_DOT1Q | + ETHERSWITCH_VLAN_PORT | ETHERSWITCH_VLAN_DOUBLE_TAG; + sc->info.es_nvlangroups = AR8X16_MAX_VLANS; +} Added: head/sys/dev/etherswitch/arswitch/arswitch_9340.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/dev/etherswitch/arswitch/arswitch_9340.h Wed Oct 16 03:15:52 2013 (r256576) @@ -0,0 +1,35 @@ +/*- + * Copyright (c) 2011-2012 Stefan Bethke. + * Copyright (c) 2031 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$ + */ +#ifndef __ARSWITCH_9340_H__ +#define __ARSWITCH_9340_H__ + +extern int ar9340_probe(device_t dev); +extern void ar9340_attach(struct arswitch_softc *sc); + +#endif /* __ARSWITCH_9340_H__ */