From owner-svn-src-head@freebsd.org Wed Dec 28 19:41:00 2016 Return-Path: Delivered-To: svn-src-head@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 C8507C9599A; Wed, 28 Dec 2016 19:41:00 +0000 (UTC) (envelope-from kan@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 775D51E98; Wed, 28 Dec 2016 19:41:00 +0000 (UTC) (envelope-from kan@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBSJexkQ066492; Wed, 28 Dec 2016 19:40:59 GMT (envelope-from kan@FreeBSD.org) Received: (from kan@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBSJexhN066491; Wed, 28 Dec 2016 19:40:59 GMT (envelope-from kan@FreeBSD.org) Message-Id: <201612281940.uBSJexhN066491@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kan set sender to kan@FreeBSD.org using -f From: Alexander Kabaev Date: Wed, 28 Dec 2016 19:40:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r310722 - head/sys/mips/ingenic 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.23 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, 28 Dec 2016 19:41:00 -0000 Author: kan Date: Wed Dec 28 19:40:59 2016 New Revision: 310722 URL: https://svnweb.freebsd.org/changeset/base/310722 Log: Do not use read-modify-write on MSC control register. The register is write-only, so just write only bits we want. Submitted by: jmcneill Modified: head/sys/mips/ingenic/jz4780_mmc.c Modified: head/sys/mips/ingenic/jz4780_mmc.c ============================================================================== --- head/sys/mips/ingenic/jz4780_mmc.c Wed Dec 28 18:42:43 2016 (r310721) +++ head/sys/mips/ingenic/jz4780_mmc.c Wed Dec 28 19:40:59 2016 (r310722) @@ -412,13 +412,9 @@ static int jz4780_mmc_reset(struct jz4780_mmc_softc *sc) { int timeout; - int reg; /* Stop the clock */ - reg = JZ_MMC_READ_4(sc, JZ_MSC_CTRL); - reg &= ~(JZ_CLOCK_CTRL_M); - reg |= JZ_CLOCK_STOP; - JZ_MMC_WRITE_4(sc, JZ_MSC_CTRL, reg); + JZ_MMC_WRITE_4(sc, JZ_MSC_CTRL, JZ_CLOCK_STOP); timeout = 1000; while (--timeout > 0) { @@ -432,9 +428,7 @@ jz4780_mmc_reset(struct jz4780_mmc_softc } /* Reset */ - reg = JZ_MMC_READ_4(sc, JZ_MSC_CTRL); - reg |= JZ_RESET; - JZ_MMC_WRITE_4(sc, JZ_MSC_CTRL, reg); + JZ_MMC_WRITE_4(sc, JZ_MSC_CTRL, JZ_RESET); timeout = 10; while (--timeout > 0) { @@ -647,7 +641,7 @@ jz4780_mmc_request(device_t bus, device_ { struct jz4780_mmc_softc *sc; struct mmc_command *cmd; - uint32_t cmdat, ctrl, iwait; + uint32_t cmdat, iwait; int blksz; sc = device_get_softc(bus); @@ -731,9 +725,7 @@ jz4780_mmc_request(device_t bus, device_ JZ_MMC_WRITE_4(sc, JZ_MSC_CMD, cmd->opcode); JZ_MMC_WRITE_4(sc, JZ_MSC_CMDAT, cmdat); - ctrl = JZ_MMC_READ_4(sc, JZ_MSC_CTRL); - ctrl |= JZ_START_OP | JZ_CLOCK_START; - JZ_MMC_WRITE_4(sc, JZ_MSC_CTRL, ctrl); + JZ_MMC_WRITE_4(sc, JZ_MSC_CTRL, JZ_START_OP | JZ_CLOCK_START); callout_reset(&sc->sc_timeoutc, sc->sc_timeout * hz, jz4780_mmc_timeout, sc); @@ -853,8 +845,7 @@ jz4780_mmc_disable_clock(struct jz4780_m { int timeout; - JZ_MMC_WRITE_4(sc, JZ_MSC_CTRL, - JZ_MMC_READ_4(sc, JZ_MSC_CTRL) | JZ_CLOCK_STOP); + JZ_MMC_WRITE_4(sc, JZ_MSC_CTRL, JZ_CLOCK_STOP); for (timeout = 1000; timeout > 0; timeout--) if ((JZ_MMC_READ_4(sc, JZ_MSC_STAT) & JZ_CLK_EN) == 0)