svn commit: r298474 - head/sys/riscv/riscv

[Ruslan Bukin]

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