From owner-svn-src-head@freebsd.org  Fri Apr 22 15:04:48 2016
Return-Path: <owner-svn-src-head@freebsd.org>
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 0CC18B198EF;
 Fri, 22 Apr 2016 15:04:48 +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 D31C21EF4;
 Fri, 22 Apr 2016 15:04:47 +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 u3MF4leF066961;
 Fri, 22 Apr 2016 15:04:47 GMT (envelope-from br@FreeBSD.org)
Received: (from br@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3MF4lAX066960;
 Fri, 22 Apr 2016 15:04:47 GMT (envelope-from br@FreeBSD.org)
Message-Id: <201604221504.u3MF4lAX066960@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: br set sender to br@FreeBSD.org
 using -f
From: Ruslan Bukin <br@FreeBSD.org>
Date: Fri, 22 Apr 2016 15:04:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r298474 - head/sys/riscv/riscv
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.21
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 22 Apr 2016 15:04:48 -0000

Author: br
Date: Fri Apr 22 15:04:46 2016
New Revision: 298474
URL: https://svnweb.freebsd.org/changeset/base/298474

Log:
  Correct the event queue initialization.
  This fixes operation on Rocket Core.
  
  Sponsored by:	DARPA, AFRL
  Sponsored by:	HEIF5

Modified:
  head/sys/riscv/riscv/locore.S

Modified: head/sys/riscv/riscv/locore.S
==============================================================================
--- head/sys/riscv/riscv/locore.S	Fri Apr 22 13:44:12 2016	(r298473)
+++ head/sys/riscv/riscv/locore.S	Fri Apr 22 15:04:46 2016	(r298474)
@@ -73,18 +73,19 @@
 	sd	t1, 8(t0)	/* zero used */
 	mv	t2, t0
 	mv	t3, t0
-	li	t5, (HTIF_RING_SIZE - HTIF_RING_ENTRY_SZ)
+	li	t5, (HTIF_RING_SIZE)
 	li	t6, 0
 	add	t4, t0, t5
 1:
-	addi	t3, t3, 24	/* pointer to next */
-	beq	t3, t4, 2f	/* finish */
-	sd	t3, 16(t2)	/* store pointer */
-	addi	t2, t2, 24	/* next entry */
-	addi	t6, t6, 1	/* counter */
+	addi	t3, t3, HTIF_RING_ENTRY_SZ	/* pointer to next */
+	beq	t3, t4, 2f			/* finish */
+	sd	t3, 16(t2)			/* store pointer */
+	addi	t2, t2, HTIF_RING_ENTRY_SZ	/* next entry */
+	addi	t6, t6, 1			/* counter */
 	j	1b
 2:
-	sd	t0, 16(t3)	/* last -> first */
+	addi	t3, t3, -HTIF_RING_ENTRY_SZ
+	sd	t0, 16(t3)			/* last -> first */
 
 	li	t2, (HTIF_RING_SIZE)
 	add	s0, t0, t2