From owner-svn-src-all@freebsd.org Fri Nov 20 11:27:27 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 395F02C6472; Fri, 20 Nov 2020 11:27:27 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CcvR319LSz3CqF; Fri, 20 Nov 2020 11:27:27 +0000 (UTC) (envelope-from manu@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1B45A1537F; Fri, 20 Nov 2020 11:27:27 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0AKBRQw2089701; Fri, 20 Nov 2020 11:27:26 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0AKBRQr4089700; Fri, 20 Nov 2020 11:27:26 GMT (envelope-from manu@FreeBSD.org) Message-Id: <202011201127.0AKBRQr4089700@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Fri, 20 Nov 2020 11:27:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r367877 - head/sys/arm/allwinner X-SVN-Group: head X-SVN-Commit-Author: manu X-SVN-Commit-Paths: head/sys/arm/allwinner X-SVN-Commit-Revision: 367877 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Nov 2020 11:27:27 -0000 Author: manu Date: Fri Nov 20 11:27:26 2020 New Revision: 367877 URL: https://svnweb.freebsd.org/changeset/base/367877 Log: if_awg: Add a function to enable/disable the mac tx/rx No functional changes intended Modified: head/sys/arm/allwinner/if_awg.c Modified: head/sys/arm/allwinner/if_awg.c ============================================================================== --- head/sys/arm/allwinner/if_awg.c Fri Nov 20 11:27:08 2020 (r367876) +++ head/sys/arm/allwinner/if_awg.c Fri Nov 20 11:27:26 2020 (r367877) @@ -716,15 +716,30 @@ awg_setup_core(struct awg_softc *sc) val |= BASIC_CTL_RX_TX_PRI; WR4(sc, EMAC_BASIC_CTL_1, val); - /* Enable transmitter */ - val = RD4(sc, EMAC_TX_CTL_0); - WR4(sc, EMAC_TX_CTL_0, val | TX_EN); +} - /* Enable receiver */ - val = RD4(sc, EMAC_RX_CTL_0); - WR4(sc, EMAC_RX_CTL_0, val | RX_EN | CHECK_CRC); +static void +awg_enable_mac(struct awg_softc *sc, bool enable) +{ + uint32_t tx, rx; + + AWG_ASSERT_LOCKED(sc); + + tx = RD4(sc, EMAC_TX_CTL_0); + rx = RD4(sc, EMAC_RX_CTL_0); + if (enable) { + tx |= TX_EN; + rx |= RX_EN | CHECK_CRC; + } else { + tx &= ~TX_EN; + rx &= ~(RX_EN | CHECK_CRC); + } + + WR4(sc, EMAC_TX_CTL_0, tx); + WR4(sc, EMAC_RX_CTL_0, rx); } + static void awg_enable_dma_intr(struct awg_softc *sc) { @@ -781,6 +796,7 @@ awg_init_locked(struct awg_softc *sc) awg_setup_rxfilter(sc); awg_setup_core(sc); + awg_enable_mac(sc, true); awg_init_dma(sc); if_setdrvflagbits(ifp, IFF_DRV_RUNNING, IFF_DRV_OACTIVE); @@ -820,13 +836,7 @@ awg_stop(struct awg_softc *sc) val |= FLUSH_TX_FIFO; WR4(sc, EMAC_TX_CTL_1, val); - /* Disable transmitter */ - val = RD4(sc, EMAC_TX_CTL_0); - WR4(sc, EMAC_TX_CTL_0, val & ~TX_EN); - - /* Disable receiver */ - val = RD4(sc, EMAC_RX_CTL_0); - WR4(sc, EMAC_RX_CTL_0, val & ~RX_EN); + awg_enable_mac(sc, false); /* Disable interrupts */ awg_disable_dma_intr(sc);