From owner-svn-src-all@freebsd.org Fri Apr 22 15:12:06 2016 Return-Path: Delivered-To: svn-src-all@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 574FDB19B73; Fri, 22 Apr 2016 15:12:06 +0000 (UTC) (envelope-from br@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 2787414E0; Fri, 22 Apr 2016 15:12:06 +0000 (UTC) (envelope-from br@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3MFC5Qj067948; Fri, 22 Apr 2016 15:12:05 GMT (envelope-from br@FreeBSD.org) Received: (from br@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3MFC5vH067947; Fri, 22 Apr 2016 15:12:05 GMT (envelope-from br@FreeBSD.org) Message-Id: <201604221512.u3MFC5vH067947@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: br set sender to br@FreeBSD.org using -f From: Ruslan Bukin Date: Fri, 22 Apr 2016 15:12:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r298476 - head/sys/riscv/htif X-SVN-Group: head 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.21 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, 22 Apr 2016 15:12:06 -0000 Author: br Date: Fri Apr 22 15:12:05 2016 New Revision: 298476 URL: https://svnweb.freebsd.org/changeset/base/298476 Log: Add memory barriers (fence instructions) so the data wrotten by hardware to physical address now can be read by VA. This fixes operation on Rocket Core (FPGA). Sponsored by: DARPA, AFRL Sponsored by: HEIF5 Modified: head/sys/riscv/htif/htif_block.c Modified: head/sys/riscv/htif/htif_block.c ============================================================================== --- head/sys/riscv/htif/htif_block.c Fri Apr 22 15:08:50 2016 (r298475) +++ head/sys/riscv/htif/htif_block.c Fri Apr 22 15:12:05 2016 (r298476) @@ -115,6 +115,7 @@ htif_blk_intr(void *arg, uint64_t entry) data = HTIF_DEV_DATA(entry); if (sc->curtag == data) { + wmb(); sc->cmd_done = 1; wakeup(&sc->intr_chan); } else { @@ -198,6 +199,7 @@ htif_blk_task(void *arg) { struct htif_blk_request req __aligned(HTIF_ALIGN); struct htif_blk_softc *sc; + uint64_t req_paddr; struct bio *bp; uint64_t paddr; uint64_t cmd; @@ -217,11 +219,13 @@ htif_blk_task(void *arg) if (bp->bio_cmd == BIO_READ || bp->bio_cmd == BIO_WRITE) { HTIF_BLK_LOCK(sc); + rmb(); req.offset = (bp->bio_pblkno * sc->disk->d_sectorsize); req.size = bp->bio_bcount; paddr = vtophys(bp->bio_data); KASSERT(paddr != 0, ("paddr is 0")); req.addr = paddr; + sc->curtag++; req.tag = sc->curtag; cmd = sc->index; @@ -230,9 +234,9 @@ htif_blk_task(void *arg) cmd |= (HTIF_CMD_READ << HTIF_CMD_SHIFT); else cmd |= (HTIF_CMD_WRITE << HTIF_CMD_SHIFT); - paddr = vtophys(&req); - KASSERT(paddr != 0, ("paddr is 0")); - cmd |= paddr; + req_paddr = vtophys(&req); + KASSERT(req_paddr != 0, ("req_paddr is 0")); + cmd |= req_paddr; sc->cmd_done = 0; htif_command(cmd);