Skip to content
Snippets Groups Projects
Commit 492dddbb authored by dam1n19's avatar dam1n19
Browse files

FIxed wiring issues with nanosoc expansion region

parent 3d9e91a9
No related branches found
No related tags found
No related merge requests found
...@@ -5,25 +5,486 @@ R ...@@ -5,25 +5,486 @@ R
A A
A A
A A
a 10000000 a 0x600107c0
r w 0x94748770
r a 0x600107c4
a 20000000 w 0x0e3109cc
r a 0x600107c8
r w 0xc4411b41
a 30000000 a 0x600107cc
r w 0x5349fe99
r a 0x600107d0
a 40006000 w 0xbc3bdfc1
r a 0x600107d4
r w 0xdeb5cb2a
r a 0x600107d8
r w 0xa0052ca2
a 30000200 a 0x600107dc
z 400 w 0x1761b000
A a 0x600107e0
C 201 w 0x1b5affff
a 0x600107e4
w 0xeab53b7e
a 0x600107e8
w 0x81152f06
a 0x600107ec
w 0x7d60ab33
a 0x600107f0
w 0x1ce3c906
a 0x600107f4
w 0x707476fe
a 0x600107f8
w 0x923737f4
a 0x600107fc
w 0x695b2443
a 0x60010fe0
r 0xe1711626
a 0x60010fe4
r 0xe14c46de
a 0x60010fe8
r 0xeb558be4
a 0x60010fec
r 0x960ea091
a 0x60010ff0
r 0x0dc803e5
a 0x60010ff4
r 0x4686ebb1
a 0x60010ff8
r 0xf498916a
a 0x60010ffc
r 0xe06f1bef
a 0x600107c0
w 0xf7079da3
a 0x600107c4
w 0xa0c46731
a 0x600107c8
w 0xc51f9e09
a 0x600107cc
w 0x8d8993e6
a 0x600107d0
w 0xfd33039d
a 0x600107d4
w 0xe8675d4a
a 0x600107d8
w 0xc0e513a1
a 0x600107dc
w 0x858c0663
a 0x600107e0
w 0xa1fb693e
a 0x600107e4
w 0xd5ebd6d4
a 0x600107e8
w 0x26f7441f
a 0x600107ec
w 0x907554b5
a 0x600107f0
w 0x9db705fd
a 0x600107f4
w 0x47a57bf5
a 0x600107f8
w 0xfe2518c8
a 0x600107fc
w 0x4c5b82c1
a 0x60010fe0
r 0x58d6d30f
a 0x60010fe4
r 0xef598a6e
a 0x60010fe8
r 0xcf65fdbb
a 0x60010fec
r 0x72fc05c5
a 0x60010ff0
r 0xce34de30
a 0x60010ff4
r 0x9d3c0a90
a 0x60010ff8
r 0x1623b2c9
a 0x60010ffc
r 0xd065f05e
a 0x600107c0
w 0x28b3253a
a 0x600107c4
w 0x96dbf9e5
a 0x600107c8
w 0x55e5ab02
a 0x600107cc
w 0x6bbbc74a
a 0x600107d0
w 0xed5fbca6
a 0x600107d4
w 0x73ece6c4
a 0x600107d8
w 0x832fa959
a 0x600107dc
w 0x7a0d31bf
a 0x600107e0
w 0xaa1320aa
a 0x600107e4
w 0x9fcb8eb3
a 0x600107e8
w 0x6bf549d9
a 0x600107ec
w 0x049bd3de
a 0x600107f0
w 0xdd09fb8d
a 0x600107f4
w 0x1285908a
a 0x600107f8
w 0x3eb37ea8
a 0x600107fc
w 0x68eb3a8c
a 0x60010fe0
r 0xed646faf
a 0x60010fe4
r 0xcc9f9269
a 0x60010fe8
r 0x15cd68c7
a 0x60010fec
r 0xbbf2982b
a 0x60010ff0
r 0x56fcb65d
a 0x60010ff4
r 0xb43f0fa3
a 0x60010ff8
r 0xa3be45c9
a 0x60010ffc
r 0xe4e3afb2
a 0x600107c0
w 0xbfcceaa6
a 0x600107c4
w 0xa2264db5
a 0x600107c8
w 0x4ba05e93
a 0x600107cc
w 0xb60ac4cb
a 0x600107d0
w 0x9edcb672
a 0x600107d4
w 0x00637780
a 0x600107d8
w 0x860e62d9
a 0x600107dc
w 0x8a983052
a 0x600107e0
w 0x35e38f6f
a 0x600107e4
w 0xd2e8b382
a 0x600107e8
w 0x3482b173
a 0x600107ec
w 0x9d76f455
a 0x600107f0
w 0x5b623fda
a 0x600107f4
w 0xb08ab5bf
a 0x600107f8
w 0x332433a7
a 0x600107fc
w 0x17aced3b
a 0x60010fe0
r 0x49393b4e
a 0x60010fe4
r 0x5a1b530b
a 0x60010fe8
r 0xea3cf2a9
a 0x60010fec
r 0x92343513
a 0x60010ff0
r 0x038b0529
a 0x60010ff4
r 0x5a54de49
a 0x60010ff8
r 0xc619f73f
a 0x60010ffc
r 0xad5d7f58
a 0x600107c0
w 0x2319760c
a 0x600107c4
w 0xc25e8486
a 0x600107c8
w 0xe2be9c44
a 0x600107cc
w 0x28e4aeaf
a 0x600107d0
w 0xae725608
a 0x600107d4
w 0xd394d5f8
a 0x600107d8
w 0xf6768cc7
a 0x600107dc
w 0x7f51d709
a 0x600107e0
w 0x4c99a726
a 0x600107e4
w 0x2586fbc4
a 0x600107e8
w 0xd2f30b37
a 0x600107ec
w 0x8c71f0c5
a 0x600107f0
w 0x4acf0b2d
a 0x600107f4
w 0xd0d8e335
a 0x600107f8
w 0x88af1d5f
a 0x600107fc
w 0xe69dad36
a 0x60010fe0
r 0x95262422
a 0x60010fe4
r 0x9a63b562
a 0x60010fe8
r 0x5ed0766b
a 0x60010fec
r 0xc6905543
a 0x60010ff0
r 0x29a2e390
a 0x60010ff4
r 0x08ffade5
a 0x60010ff8
r 0x1ca8459e
a 0x60010ffc
r 0x105755f3
a 0x600107c0
w 0x2a17c8e9
a 0x600107c4
w 0x63931b41
a 0x600107c8
w 0xd191bfc8
a 0x600107cc
w 0x40d7f3fc
a 0x600107d0
w 0x60754253
a 0x600107d4
w 0xd5f6ef4c
a 0x600107d8
w 0xa49ff89d
a 0x600107dc
w 0xb3f9bc39
a 0x600107e0
w 0x7ba3ec2e
a 0x600107e4
w 0xf100cac2
a 0x600107e8
w 0x552ac1d3
a 0x600107ec
w 0x657744db
a 0x600107f0
w 0xfa2402f8
a 0x600107f4
w 0x5e2ea772
a 0x600107f8
w 0x572c2bf0
a 0x600107fc
w 0x372eb887
a 0x60010fe0
r 0x38849fc2
a 0x60010fe4
r 0x96cf9939
a 0x60010fe8
r 0x96ee3bc5
a 0x60010fec
r 0x88e5f660
a 0x60010ff0
r 0xee44b230
a 0x60010ff4
r 0xcb265158
a 0x60010ff8
r 0x7d8c6b58
a 0x60010ffc
r 0x1f335cad
a 0x600107c0
w 0xac465530
a 0x600107c4
w 0x6e6a3d49
a 0x600107c8
w 0xe7f1461f
a 0x600107cc
w 0xc6f4b35f
a 0x600107d0
w 0xf82a46d6
a 0x600107d4
w 0x440244f5
a 0x600107d8
w 0x6bde0ef1
a 0x600107dc
w 0xb0787487
a 0x600107e0
w 0x1a96af96
a 0x600107e4
w 0xa55fef07
a 0x600107e8
w 0xea97471c
a 0x600107ec
w 0x35bad402
a 0x600107f0
w 0xb3733250
a 0x600107f4
w 0x75028929
a 0x600107f8
w 0x230c2b19
a 0x600107fc
w 0x0bfe6ea9
a 0x60010fe0
r 0xee161bc2
a 0x60010fe4
r 0xae0cb755
a 0x60010fe8
r 0x479570fd
a 0x60010fec
r 0x7f6590f6
a 0x60010ff0
r 0xaed161d2
a 0x60010ff4
r 0x02497784
a 0x60010ff8
r 0x37b05a4b
a 0x60010ffc
r 0x0b51e243
a 0x600107c0
w 0xec8225d7
a 0x600107c4
w 0x9193267a
a 0x600107c8
w 0xc3f24d94
a 0x600107cc
w 0xb295566e
a 0x600107d0
w 0x034a0bc0
a 0x600107d4
w 0x1a4d2e6b
a 0x600107d8
w 0xa6ed70c9
a 0x600107dc
w 0x4d573f76
a 0x600107e0
w 0x45b0e216
a 0x600107e4
w 0xdb750cbb
a 0x600107e8
w 0x4138b929
a 0x600107ec
w 0xd67d1bbd
a 0x600107f0
w 0x24fdf316
a 0x600107f4
w 0x0650c084
a 0x600107f8
w 0xf95e6e9c
a 0x600107fc
w 0x877e2642
a 0x60010fe0
r 0x60f9e31b
a 0x60010fe4
r 0x51c0db63
a 0x60010fe8
r 0xc555cde2
a 0x60010fec
r 0xa7112033
a 0x60010ff0
r 0xa5ae48a8
a 0x60010ff4
r 0x88674260
a 0x60010ff8
r 0xe0c7b6dd
a 0x60010ffc
r 0x6d572f08
a 0x600107c0
w 0x387dc590
a 0x600107c4
w 0x2966f6a3
a 0x600107c8
w 0xadd14662
a 0x600107cc
w 0x0bc2175e
a 0x600107d0
w 0x3d2556a0
a 0x600107d4
w 0x335c30a8
a 0x600107d8
w 0x50e7e900
a 0x600107dc
w 0xb1b72206
a 0x600107e0
w 0xc6f526b0
a 0x600107e4
w 0x15a4177f
a 0x600107e8
w 0xf0d718a4
a 0x600107ec
w 0x48879677
a 0x600107f0
w 0x8934d6c4
a 0x600107f4
w 0x50ab7c39
a 0x600107f8
w 0x3360bbd7
a 0x600107fc
w 0xefdf5963
a 0x60010fe0
r 0x3a012531
a 0x60010fe4
r 0xb6a8cf6c
a 0x60010fe8
r 0x400e3734
a 0x60010fec
r 0x5d160f7a
a 0x60010ff0
r 0xd4e713d3
a 0x60010ff4
r 0xaf5d19d2
a 0x60010ff8
r 0x309707c9
a 0x60010ffc
r 0x24eb65ee
a 0x600107c0
w 0x2a22cd0b
a 0x600107c4
w 0xf570eb78
a 0x600107c8
w 0xd3a5b873
a 0x600107cc
w 0x53d7f89b
a 0x600107d0
w 0xebedc242
a 0x600107d4
w 0x59a1ee9a
a 0x600107d8
w 0xcea792f4
a 0x600107dc
w 0xedf99c9c
a 0x600107e0
w 0x47ab7368
a 0x600107e4
w 0xa0eddacc
a 0x600107e8
w 0xe218002f
a 0x600107ec
w 0x1498319a
a 0x600107f0
w 0xb1f10e58
a 0x600107f4
w 0x8d03ecb0
a 0x600107f8
w 0x4408ab12
a 0x600107fc
w 0xcabcc637
a 0x60010fe0
r 0x090f1978
a 0x60010fe4
r 0xcc432473
a 0x60010fe8
r 0x7af5e3f6
a 0x60010fec
r 0x093d866f
a 0x60010ff0
r 0x80069d04
a 0x60010ff4
r 0x9fe9980d
a 0x60010ff8
r 0xb8a4b430
a 0x60010ffc
r 0x5951566a
 A  A
X X
! !
\ No newline at end of file
...@@ -961,7 +961,7 @@ nanosoc_exp #(.ADDRWIDTH(29) ...@@ -961,7 +961,7 @@ nanosoc_exp #(.ADDRWIDTH(29)
.HADDRS (HADDR_exp[28:0]), .HADDRS (HADDR_exp[28:0]),
.HTRANSS (HTRANS_exp), .HTRANSS (HTRANS_exp),
.HSIZES (HSIZE_exp), .HSIZES (HSIZE_exp),
.HWRITES (HWDATA_exp), .HWRITES (HWRITE_exp),
.HREADYS (HREADYMUX_exp), .HREADYS (HREADYMUX_exp),
.HWDATAS (HWDATA_exp), .HWDATAS (HWDATA_exp),
......
...@@ -12,7 +12,8 @@ ...@@ -12,7 +12,8 @@
`include "cmsdk_ahb_slave_mux.v" `include "cmsdk_ahb_slave_mux.v"
module nanosoc_exp #( module nanosoc_exp #(
parameter ADDRWIDTH=29 // Region Address Width parameter ADDRWIDTH=29, // Region Address Width
parameter ACCEL_ADDRWIDTH=12 // Region Address Width
)( )(
input wire HCLK, // Clock input wire HCLK, // Clock
input wire HRESETn, // Reset input wire HRESETn, // Reset
...@@ -35,31 +36,17 @@ module nanosoc_exp #( ...@@ -35,31 +36,17 @@ module nanosoc_exp #(
// Internal Wires // Internal Wires
//******************************************************************************** //********************************************************************************
// AHB Lite BUS SIGNALS
wire hready;
wire hresp;
wire [31:0] hrdata;
wire [1:0] htrans;
wire [2:0] hburst;
wire [3:0] hprot;
wire [2:0] hsize;
wire hwrite;
wire hmastlock;
wire [31:0] haddr;
wire [31:0] hwdata;
// Accelerator AHB Signals // Accelerator AHB Signals
wire hsel0; wire HSEL0;
wire hreadyout0; wire HREADYOUT0;
wire hresp0; wire HRESP0;
wire [31:0] hrdata0; wire [31:0] HRDATA0;
// Default Slave AHB Signals // Default Slave AHB Signals
wire hsel1; wire HSEL1;
wire hreadyout1; wire HREADYOUT1;
wire hresp1; wire HRESP1;
wire [31:0] hrdata1; wire [31:0] HRDATA1;
//******************************************************************************** //********************************************************************************
// Address decoder, need to be changed for other configuration // Address decoder, need to be changed for other configuration
...@@ -67,8 +54,8 @@ wire [31:0] hrdata1; ...@@ -67,8 +54,8 @@ wire [31:0] hrdata1;
// 0x00010000 - 0x00010FFF : HSEL #0 - Hash Accelerator // 0x00010000 - 0x00010FFF : HSEL #0 - Hash Accelerator
// Other addresses : HSEL #1 - Default slave // Other addresses : HSEL #1 - Default slave
assign hsel0 = (haddr[ADDRWIDTH-1:12] == 'h00010) ? 1'b1:1'b0; assign HSEL0 = (HADDRS[ADDRWIDTH-1:12] == 'h00010) ? 1'b1:1'b0;
assign hsel1 = hsel0 ? 1'b0:1'b1; assign HSEL1 = HSEL0 ? 1'b0:1'b1;
//******************************************************************************** //********************************************************************************
// Slave multiplexer module: // Slave multiplexer module:
...@@ -89,15 +76,15 @@ cmsdk_ahb_slave_mux #( ...@@ -89,15 +76,15 @@ cmsdk_ahb_slave_mux #(
) u_ahb_slave_mux ( ) u_ahb_slave_mux (
.HCLK (HCLK), .HCLK (HCLK),
.HRESETn (HRESETn), .HRESETn (HRESETn),
.HREADY (hready), .HREADY (HREADYS),
.HSEL0 (hsel0), // Input Port 0 .HSEL0 (HSEL0), // Input Port 0
.HREADYOUT0 (hreadyout0), .HREADYOUT0 (HREADYOUT0),
.HRESP0 (hresp0), .HRESP0 (HRESP0),
.HRDATA0 (hrdata0), .HRDATA0 (HRDATA0),
.HSEL1 (hsel1), // Input Port 1 .HSEL1 (HSEL1), // Input Port 1
.HREADYOUT1 (hreadyout1), .HREADYOUT1 (HREADYOUT1),
.HRESP1 (hresp1), .HRESP1 (HRESP1),
.HRDATA1 (hrdata1), .HRDATA1 (HRDATA1),
.HSEL2 (1'b0), // Input Port 2 .HSEL2 (1'b0), // Input Port 2
.HREADYOUT2 (), .HREADYOUT2 (),
.HRESP2 (), .HRESP2 (),
...@@ -131,32 +118,32 @@ cmsdk_ahb_slave_mux #( ...@@ -131,32 +118,32 @@ cmsdk_ahb_slave_mux #(
.HRESP9 (), .HRESP9 (),
.HRDATA9 (), .HRDATA9 (),
.HREADYOUT (hready), // Outputs .HREADYOUT (HREADYOUTS), // Outputs
.HRESP (hresp), .HRESP (HRESPS),
.HRDATA (hrdata) .HRDATA (HRDATAS)
); );
//******************************************************************************** //********************************************************************************
// Slave module 1: example AHB slave module // Slave module 1: example AHB slave module
//******************************************************************************** //********************************************************************************
wrapper_sha256_hashing_stream #(ADDRWIDTH wrapper_sha256_hashing_stream #(ACCEL_ADDRWIDTH
) accelerator ( ) accelerator (
.HCLK (HCLK), .HCLK (HCLK),
.HRESETn (HRESETn), .HRESETn (HRESETn),
// Input slave port: 32 bit data bus interface // Input slave port: 32 bit data bus interface
.HSELS (hsel0), .HSELS (HSEL0),
.HADDRS (haddr[ADDRWIDTH-1:0]), .HADDRS (HADDRS[ACCEL_ADDRWIDTH-1:0]),
.HTRANSS (htrans), .HTRANSS (HTRANSS),
.HSIZES (hsize), .HSIZES (HSIZES),
.HWRITES (hwrite), .HWRITES (HWRITES),
.HREADYS (hready), .HREADYS (HREADYS),
.HWDATAS (hwdata), .HWDATAS (HWDATAS),
.HREADYOUTS (hreadyout0), .HREADYOUTS (HREADYOUT0),
.HRESPS (hresp0), .HRESPS (HRESP0),
.HRDATAS (hrdata0) .HRDATAS (HRDATA0)
); );
...@@ -167,13 +154,13 @@ cmsdk_ahb_slave_mux #( ...@@ -167,13 +154,13 @@ cmsdk_ahb_slave_mux #(
cmsdk_ahb_default_slave u_ahb_default_slave( cmsdk_ahb_default_slave u_ahb_default_slave(
.HCLK (HCLK), .HCLK (HCLK),
.HRESETn (HRESETn), .HRESETn (HRESETn),
.HSEL (hsel1), .HSEL (HSEL1),
.HTRANS (htrans), .HTRANS (HTRANSS),
.HREADY (hready), .HREADY (HREADYS),
.HREADYOUT (hreadyout1), .HREADYOUT (HREADYOUT1),
.HRESP (hresp1) .HRESP (HRESPS)
); );
assign hrdata1 = {32{1'b0}}; // Default slave don't have data assign HRDATA1 = {32{1'b0}}; // Default slave don't have data
endmodule endmodule
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment