Updates from Pavel with new mux.

1. EIM arbiter was updated to take advantage of 3 additional address
lines, that bunnie routed from the CPU to the FPGA. Now we have 19 address
lines instead of 16, that means 19-2=17 effective bits when using 32-bit
access.

2. In the doc directory there's a draft version of current EIM memory map.

3. I've figured out why you guys could not use read and write signals from
the arbiter the way they were supposed to be used. I was wrong when I
expected Joachim's cores to have registered outputs. They have a
combinatorial output in fact. EIM arbiter's minimum latency is 1 cycle, so
we have to register data coming out of cores. I've added these three lines
to every core wrapper (sha1.v, sha256.v and sha512.v):
  reg [31 : 0]   tmp_read_data_reg;
  always @(posedge clk) tmp_read_data_reg <= tmp_read_data;
  assign read_data = tmp_read_data_reg;

4. Joachim told me, that we are going to have different types of cores
(HASH, RNG, CIPHER and so on), so I redesigned EIM multiplexor to have
separate modules for every core type. RNG and CIPHER selectors right now
are just templates with some dummy registers. Here is what was modified in
the HASH multiplexor:

4a. Core number 0 was added. It is not an actual HASH core, but a set of
global (board-level) registers. I've added three registers so far: board
type, bitstream version and one writeable dummy general-purpose register.

4b. Core instantiation was made conditional to allow selecting of what
cores to actually implement. We can have a project that offers a large
number of cores, so people can disable unnecessary cores to speed up
compile time and to save some slices for something else.

4c. I have disconnected .error() output from cores. As far as I understand
it gets asserted when some non-existent register is being addressed. In
most projects that I've seen writes to empty regions of memory are
discarded and reads return zeroes. If you really need this kind of error
checking, please re-connect this output as needed.

4d. core_selector.v has an instruction on how to add new HASH cores to our
design.

5. TC11() was added to hash_tester.c to check that we can read global
board-level registers and that we have access to segments other than
HASH. The last check reads dummy registers from RNG and CIPHER segments
(which are just templates now), this effectively tests the 3 new added
address bits.

1 files changed, 11 insertions, 9 deletions

diff --git a/rtl/src/verilog/eim_arbiter.v b/rtl/src/verilog/eim_arbiter.v
index 3dc6260..d21799f 100644
--- a/rtl/src/verilog/eim_arbiter.v
+++ b/rtl/src/verilog/eim_arbiter.v
@@ -39,7 +39,7 @@
 
 module eim_arbiter
 	(
-		eim_bclk, eim_cs0_n, eim_da,
+		eim_bclk, eim_cs0_n, eim_da, eim_a,
 		eim_lba_n, eim_wr_n,
 		eim_oe_n, eim_wait_n,
 
@@ -55,7 +55,8 @@ module eim_arbiter
 		//
 	input		wire				eim_bclk;		// | eim bus
 	input		wire				eim_cs0_n;		// |
-	inout		wire	[15: 0]	eim_da;			// |
+	inout		wire	[15: 0]	eim_da;			// |

+	input		wire	[18:16]	eim_a;			// |
 	input		wire				eim_lba_n;		// |
 	input		wire				eim_wr_n;		// |
 	input		wire				eim_oe_n;		// |
@@ -63,7 +64,7 @@ module eim_arbiter
 
 	input		wire				sys_clk;			// system clock
 
-	output	wire	[13: 0]	sys_addr;		// | user bus
+	output	wire	[16: 0]	sys_addr;		// | user bus
 	output	wire				sys_wren;		// |
 	output	wire	[31: 0]	sys_data_out;	// |
 	output	wire				sys_rden;		// |
@@ -107,7 +108,7 @@ module eim_arbiter
 	localparam	EIM_FSM_STATE_READ_DONE		= 5'b1_0_111;	// transaction complete
 
 	reg	[ 4: 0]	eim_fsm_state			= EIM_FSM_STATE_INIT;	// fsm state
-	reg	[13: 0]	eim_addr_latch			= {14{1'bX}};				// transaction address
+	reg	[16: 0]	eim_addr_latch			= {17{1'bX}};				// transaction address
 	reg	[15: 0]	eim_write_lsb_latch	= {16{1'bX}};				// lower 16 bits of data to write
 
 		/* These flags are used to wake up from INIT state. */
@@ -183,7 +184,7 @@ module eim_arbiter
 	always @(posedge eim_bclk)
 		//
 		if ((eim_fsm_state == EIM_FSM_STATE_INIT) && (eim_write_start_flag || eim_read_start_flag))
-			eim_addr_latch <= da_ro[15:2];
+			eim_addr_latch <= {eim_a[18:16], da_ro[15:2]};
 
 
 		//
@@ -256,10 +257,11 @@ module eim_arbiter
 		//
 
 	/* This block is used to transfer request data from BCLK clock domain to SYS_CLK clock domain and
-	 * then transfer acknowledge from SYS_CLK to BCLK clock domain in return. Af first 1+1+14+32 = 48 bits
-	 * are transfered, these are: write flag, read flag, address, write data. During read transaction
-	 * some bogus write data is passed, which is not used later anyway. During read requests 32 bits of data
-	 * are returned, during write requests 32 bits of bogus data are returned, that are never used later.
+	 * then transfer acknowledge from SYS_CLK to BCLK clock domain in return. Af first 1+1+3+14+32 = 51 bits
+	 * are transfered, these are: write flag, read flag, msb part of address, lsb part of address, write data.
+	 * During read transaction some bogus write data is passed, which is not used later anyway. During read
+	 * requests 32 bits of data are returned, during write requests 32 bits of bogus data are returned,
+	 * that are never used later.
 	 */
 
 	eim_arbiter_cdc eim_cdc