From owner-svn-src-projects@freebsd.org Sun Jan 15 10:33:54 2017 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 379C0CA5EA7 for ; Sun, 15 Jan 2017 10:33:54 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EC8E411CE; Sun, 15 Jan 2017 10:33:53 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0FAXr0o098602; Sun, 15 Jan 2017 10:33:53 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0FAXq0m098596; Sun, 15 Jan 2017 10:33:52 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201701151033.v0FAXq0m098596@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Sun, 15 Jan 2017 10:33:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r312227 - in projects/netbsd-tests-upstream-01-2017: sys/dev/etherswitch/arswitch tests/sys/kern/acct X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Jan 2017 10:33:54 -0000 Author: ngie Date: Sun Jan 15 10:33:52 2017 New Revision: 312227 URL: https://svnweb.freebsd.org/changeset/base/312227 Log: MFhead@r312226 Modified: projects/netbsd-tests-upstream-01-2017/sys/dev/etherswitch/arswitch/arswitch.c projects/netbsd-tests-upstream-01-2017/sys/dev/etherswitch/arswitch/arswitch_7240.c projects/netbsd-tests-upstream-01-2017/sys/dev/etherswitch/arswitch/arswitch_8316.c projects/netbsd-tests-upstream-01-2017/sys/dev/etherswitch/arswitch/arswitch_8327.c projects/netbsd-tests-upstream-01-2017/sys/dev/etherswitch/arswitch/arswitch_9340.c projects/netbsd-tests-upstream-01-2017/tests/sys/kern/acct/Makefile Directory Properties: projects/netbsd-tests-upstream-01-2017/ (props changed) Modified: projects/netbsd-tests-upstream-01-2017/sys/dev/etherswitch/arswitch/arswitch.c ============================================================================== --- projects/netbsd-tests-upstream-01-2017/sys/dev/etherswitch/arswitch/arswitch.c Sun Jan 15 10:29:53 2017 (r312226) +++ projects/netbsd-tests-upstream-01-2017/sys/dev/etherswitch/arswitch/arswitch.c Sun Jan 15 10:33:52 2017 (r312227) @@ -845,6 +845,7 @@ static int arswitch_setled(struct arswitch_softc *sc, int phy, int led, int style) { int shift; + int err; if (phy < 0 || phy > sc->numphys) return EINVAL; @@ -852,10 +853,15 @@ arswitch_setled(struct arswitch_softc *s if (style < 0 || style > ETHERSWITCH_PORT_LED_MAX) return (EINVAL); + ARSWITCH_LOCK(sc); + shift = ar8327_led_mapping[phy][led].shift; - return (arswitch_modifyreg(sc->sc_dev, + err = (arswitch_modifyreg(sc->sc_dev, ar8327_led_mapping[phy][led].reg, 0x03 << shift, led_pattern_table[style] << shift)); + ARSWITCH_UNLOCK(sc); + + return (err); } static void Modified: projects/netbsd-tests-upstream-01-2017/sys/dev/etherswitch/arswitch/arswitch_7240.c ============================================================================== --- projects/netbsd-tests-upstream-01-2017/sys/dev/etherswitch/arswitch/arswitch_7240.c Sun Jan 15 10:29:53 2017 (r312226) +++ projects/netbsd-tests-upstream-01-2017/sys/dev/etherswitch/arswitch/arswitch_7240.c Sun Jan 15 10:33:52 2017 (r312227) @@ -81,6 +81,8 @@ static int ar7240_hw_global_setup(struct arswitch_softc *sc) { + ARSWITCH_LOCK(sc); + /* Enable CPU port; disable mirror port */ arswitch_writereg(sc->sc_dev, AR8X16_REG_CPU_PORT, AR8X16_CPU_PORT_EN | AR8X16_CPU_MIRROR_DIS); @@ -103,6 +105,8 @@ ar7240_hw_global_setup(struct arswitch_s arswitch_modifyreg(sc->sc_dev, AR8X16_REG_SERVICE_TAG, AR8X16_SERVICE_TAG_MASK, 0); + ARSWITCH_UNLOCK(sc); + return (0); } Modified: projects/netbsd-tests-upstream-01-2017/sys/dev/etherswitch/arswitch/arswitch_8316.c ============================================================================== --- projects/netbsd-tests-upstream-01-2017/sys/dev/etherswitch/arswitch/arswitch_8316.c Sun Jan 15 10:29:53 2017 (r312226) +++ projects/netbsd-tests-upstream-01-2017/sys/dev/etherswitch/arswitch/arswitch_8316.c Sun Jan 15 10:33:52 2017 (r312227) @@ -127,6 +127,8 @@ static int ar8316_hw_global_setup(struct arswitch_softc *sc) { + ARSWITCH_LOCK(sc); + arswitch_writereg(sc->sc_dev, 0x38, AR8X16_MAGIC); /* Enable CPU port and disable mirror port. */ @@ -156,6 +158,7 @@ ar8316_hw_global_setup(struct arswitch_s arswitch_modifyreg(sc->sc_dev, AR8X16_REG_SERVICE_TAG, AR8X16_SERVICE_TAG_MASK, 0); + ARSWITCH_UNLOCK(sc); return (0); } Modified: projects/netbsd-tests-upstream-01-2017/sys/dev/etherswitch/arswitch/arswitch_8327.c ============================================================================== --- projects/netbsd-tests-upstream-01-2017/sys/dev/etherswitch/arswitch/arswitch_8327.c Sun Jan 15 10:29:53 2017 (r312226) +++ projects/netbsd-tests-upstream-01-2017/sys/dev/etherswitch/arswitch/arswitch_8327.c Sun Jan 15 10:33:52 2017 (r312227) @@ -708,6 +708,8 @@ ar8327_hw_global_setup(struct arswitch_s { uint32_t t; + ARSWITCH_LOCK(sc); + /* enable CPU port and disable mirror port */ t = AR8327_FWD_CTRL0_CPU_PORT_EN | AR8327_FWD_CTRL0_MIRROR_PORT; @@ -741,6 +743,7 @@ ar8327_hw_global_setup(struct arswitch_s /* GMAC0 (CPU), GMAC1..5 (PHYs), GMAC6 (CPU) */ sc->info.es_nports = 7; + ARSWITCH_UNLOCK(sc); return (0); } Modified: projects/netbsd-tests-upstream-01-2017/sys/dev/etherswitch/arswitch/arswitch_9340.c ============================================================================== --- projects/netbsd-tests-upstream-01-2017/sys/dev/etherswitch/arswitch/arswitch_9340.c Sun Jan 15 10:29:53 2017 (r312226) +++ projects/netbsd-tests-upstream-01-2017/sys/dev/etherswitch/arswitch/arswitch_9340.c Sun Jan 15 10:33:52 2017 (r312227) @@ -81,6 +81,8 @@ static int ar9340_hw_global_setup(struct arswitch_softc *sc) { + ARSWITCH_LOCK(sc); + /* Enable CPU port; disable mirror port */ arswitch_writereg(sc->sc_dev, AR8X16_REG_CPU_PORT, AR8X16_CPU_PORT_EN | AR8X16_CPU_MIRROR_DIS); @@ -142,6 +144,7 @@ ar9340_hw_global_setup(struct arswitch_s } else { device_printf(sc->sc_dev, "%s: need is_gmii or is_mii set\n", __func__); + ARSWITCH_UNLOCK(sc); return (ENXIO); } @@ -163,6 +166,7 @@ ar9340_hw_global_setup(struct arswitch_s /* Settle time */ DELAY(1000); + ARSWITCH_UNLOCK(sc); return (0); } Modified: projects/netbsd-tests-upstream-01-2017/tests/sys/kern/acct/Makefile ============================================================================== --- projects/netbsd-tests-upstream-01-2017/tests/sys/kern/acct/Makefile Sun Jan 15 10:29:53 2017 (r312226) +++ projects/netbsd-tests-upstream-01-2017/tests/sys/kern/acct/Makefile Sun Jan 15 10:33:52 2017 (r312227) @@ -13,7 +13,7 @@ acct_test.o: convert.c convert.c: ${SRCTOP}/sys/kern/kern_acct.c sed -n -e 's/log(/syslog(/g' \ - -e 's/exp/expected/g' \ + -e 's/exp/exponent/g' \ -e '/FLOAT_CONVERSION_START/,/FLOAT_CONVERSION_END/p' ${.ALLSRC} >${.TARGET}.tmp mv ${.TARGET}.tmp ${.TARGET}