From 798634a9c585fc58ee50220e14269493a23b47cc Mon Sep 17 00:00:00 2001 From: "Andreas.Olofsson" Date: Thu, 15 Oct 2020 09:38:12 -0400 Subject: [PATCH] Renaming emesh as enoc (better description) --- {emesh => enoc}/README.md | 0 {emesh => enoc}/docs/emesh.js | 0 .../node_modules/.bin/which | 0 .../fs-extra/node_modules/.bin/rimraf | 0 .../request/node_modules/.bin/har-validator | 0 .../request/node_modules/.bin/uuid | 0 .../node_modules/.bin/sshpk-conv | 0 .../node_modules/.bin/sshpk-sign | 0 .../node_modules/.bin/sshpk-verify | 0 {emesh => enoc}/dv/README | 0 {emesh => enoc}/dv/egen.pl | 0 {emesh => enoc}/dv/emesh_monitor.v | 0 {emesh => enoc}/hdl/ememory.v | 0 {emesh => enoc}/hdl/emesh_constants.v | 0 .../emesh2packet.v => enoc/hdl/emesh_encode.v | 65 +++++++++++-------- {emesh => enoc}/hdl/emesh_if.v | 0 {emesh => enoc}/hdl/emesh_mux.v | 0 {emesh => enoc}/hdl/emesh_rdalign.v | 0 {emesh => enoc}/hdl/emesh_readback.v | 0 {emesh => enoc}/hdl/emesh_wralign.v | 0 {emesh => enoc}/hdl/packet2emesh.v | 3 + 21 files changed, 42 insertions(+), 26 deletions(-) rename {emesh => enoc}/README.md (100%) rename {emesh => enoc}/docs/emesh.js (100%) rename {emesh => enoc}/docs/node_modules/phantomjs-prebuilt/node_modules/.bin/which (100%) rename {emesh => enoc}/docs/node_modules/phantomjs-prebuilt/node_modules/fs-extra/node_modules/.bin/rimraf (100%) rename {emesh => enoc}/docs/node_modules/phantomjs-prebuilt/node_modules/request/node_modules/.bin/har-validator (100%) rename {emesh => enoc}/docs/node_modules/phantomjs-prebuilt/node_modules/request/node_modules/.bin/uuid (100%) rename {emesh => enoc}/docs/node_modules/phantomjs-prebuilt/node_modules/request/node_modules/http-signature/node_modules/.bin/sshpk-conv (100%) rename {emesh => enoc}/docs/node_modules/phantomjs-prebuilt/node_modules/request/node_modules/http-signature/node_modules/.bin/sshpk-sign (100%) rename {emesh => enoc}/docs/node_modules/phantomjs-prebuilt/node_modules/request/node_modules/http-signature/node_modules/.bin/sshpk-verify (100%) rename {emesh => enoc}/dv/README (100%) rename {emesh => enoc}/dv/egen.pl (100%) rename {emesh => enoc}/dv/emesh_monitor.v (100%) rename {emesh => enoc}/hdl/ememory.v (100%) rename {emesh => enoc}/hdl/emesh_constants.v (100%) rename emesh/hdl/emesh2packet.v => enoc/hdl/emesh_encode.v (72%) rename {emesh => enoc}/hdl/emesh_if.v (100%) rename {emesh => enoc}/hdl/emesh_mux.v (100%) rename {emesh => enoc}/hdl/emesh_rdalign.v (100%) rename {emesh => enoc}/hdl/emesh_readback.v (100%) rename {emesh => enoc}/hdl/emesh_wralign.v (100%) rename {emesh => enoc}/hdl/packet2emesh.v (97%) diff --git a/emesh/README.md b/enoc/README.md similarity index 100% rename from emesh/README.md rename to enoc/README.md diff --git a/emesh/docs/emesh.js b/enoc/docs/emesh.js similarity index 100% rename from emesh/docs/emesh.js rename to enoc/docs/emesh.js diff --git a/emesh/docs/node_modules/phantomjs-prebuilt/node_modules/.bin/which b/enoc/docs/node_modules/phantomjs-prebuilt/node_modules/.bin/which similarity index 100% rename from emesh/docs/node_modules/phantomjs-prebuilt/node_modules/.bin/which rename to enoc/docs/node_modules/phantomjs-prebuilt/node_modules/.bin/which diff --git a/emesh/docs/node_modules/phantomjs-prebuilt/node_modules/fs-extra/node_modules/.bin/rimraf b/enoc/docs/node_modules/phantomjs-prebuilt/node_modules/fs-extra/node_modules/.bin/rimraf similarity index 100% rename from emesh/docs/node_modules/phantomjs-prebuilt/node_modules/fs-extra/node_modules/.bin/rimraf rename to enoc/docs/node_modules/phantomjs-prebuilt/node_modules/fs-extra/node_modules/.bin/rimraf diff --git a/emesh/docs/node_modules/phantomjs-prebuilt/node_modules/request/node_modules/.bin/har-validator b/enoc/docs/node_modules/phantomjs-prebuilt/node_modules/request/node_modules/.bin/har-validator similarity index 100% rename from emesh/docs/node_modules/phantomjs-prebuilt/node_modules/request/node_modules/.bin/har-validator rename to enoc/docs/node_modules/phantomjs-prebuilt/node_modules/request/node_modules/.bin/har-validator diff --git a/emesh/docs/node_modules/phantomjs-prebuilt/node_modules/request/node_modules/.bin/uuid b/enoc/docs/node_modules/phantomjs-prebuilt/node_modules/request/node_modules/.bin/uuid similarity index 100% rename from emesh/docs/node_modules/phantomjs-prebuilt/node_modules/request/node_modules/.bin/uuid rename to enoc/docs/node_modules/phantomjs-prebuilt/node_modules/request/node_modules/.bin/uuid diff --git a/emesh/docs/node_modules/phantomjs-prebuilt/node_modules/request/node_modules/http-signature/node_modules/.bin/sshpk-conv b/enoc/docs/node_modules/phantomjs-prebuilt/node_modules/request/node_modules/http-signature/node_modules/.bin/sshpk-conv similarity index 100% rename from emesh/docs/node_modules/phantomjs-prebuilt/node_modules/request/node_modules/http-signature/node_modules/.bin/sshpk-conv rename to enoc/docs/node_modules/phantomjs-prebuilt/node_modules/request/node_modules/http-signature/node_modules/.bin/sshpk-conv diff --git a/emesh/docs/node_modules/phantomjs-prebuilt/node_modules/request/node_modules/http-signature/node_modules/.bin/sshpk-sign b/enoc/docs/node_modules/phantomjs-prebuilt/node_modules/request/node_modules/http-signature/node_modules/.bin/sshpk-sign similarity index 100% rename from emesh/docs/node_modules/phantomjs-prebuilt/node_modules/request/node_modules/http-signature/node_modules/.bin/sshpk-sign rename to enoc/docs/node_modules/phantomjs-prebuilt/node_modules/request/node_modules/http-signature/node_modules/.bin/sshpk-sign diff --git a/emesh/docs/node_modules/phantomjs-prebuilt/node_modules/request/node_modules/http-signature/node_modules/.bin/sshpk-verify b/enoc/docs/node_modules/phantomjs-prebuilt/node_modules/request/node_modules/http-signature/node_modules/.bin/sshpk-verify similarity index 100% rename from emesh/docs/node_modules/phantomjs-prebuilt/node_modules/request/node_modules/http-signature/node_modules/.bin/sshpk-verify rename to enoc/docs/node_modules/phantomjs-prebuilt/node_modules/request/node_modules/http-signature/node_modules/.bin/sshpk-verify diff --git a/emesh/dv/README b/enoc/dv/README similarity index 100% rename from emesh/dv/README rename to enoc/dv/README diff --git a/emesh/dv/egen.pl b/enoc/dv/egen.pl similarity index 100% rename from emesh/dv/egen.pl rename to enoc/dv/egen.pl diff --git a/emesh/dv/emesh_monitor.v b/enoc/dv/emesh_monitor.v similarity index 100% rename from emesh/dv/emesh_monitor.v rename to enoc/dv/emesh_monitor.v diff --git a/emesh/hdl/ememory.v b/enoc/hdl/ememory.v similarity index 100% rename from emesh/hdl/ememory.v rename to enoc/hdl/ememory.v diff --git a/emesh/hdl/emesh_constants.v b/enoc/hdl/emesh_constants.v similarity index 100% rename from emesh/hdl/emesh_constants.v rename to enoc/hdl/emesh_constants.v diff --git a/emesh/hdl/emesh2packet.v b/enoc/hdl/emesh_encode.v similarity index 72% rename from emesh/hdl/emesh2packet.v rename to enoc/hdl/emesh_encode.v index 30d1ccc..7460fa0 100644 --- a/emesh/hdl/emesh2packet.v +++ b/enoc/hdl/emesh_encode.v @@ -36,25 +36,25 @@ * The command field has the following options: * * - * | Command[15:0] | 15:8 | 7 | 6:4 | 3:0 | - * |-----------------|-------|----------|-------------|-------| - * | WRITE-SINGLE | CTRL | NEAR/FAR | SIZE[2:0] | 0000 | - * | WRITE-IRQ | CTRL | NEAR/FAR | SIZE[2:0] | 0001 | - * | WRITE-START | LEN | NEAR/FAR | SIZE[2:0] | 0010 | - * | WRITE-STREAM | CTRL | STOP | CTRL | 0011 | - * | WRITE-MULTICAST | | NEAR/FAR | SIZE[2:0] | 0100 | - * | WRITE-IO | | NEAR/FAR | 64,DIR[1:0] | 0101 | - * | TBD | | NEAR/FAR | SIZE[2:0] | 0110 | - * | TBD | | NEAR/FAR | SIZE[2:0] | 0111 | - * |-----------------|-------|----------|-------------|-------| - * | READ | CH | NEAR/FAR | SIZE[2:0] | 1000 | - * | ATOMIC-OP | CH | NEAR/FAR | SIZE[2:0] | 1001 | - * | CAS | CH | NEAR/FAR | SIZE[2:0] | 1010 | - * | READ-IO | CH | NEAR/FAR | 64,DIR[1:0] | 1011 | - * | TBD | CH | NEAR/FAR | SIZE[2:0] | 1101 | - * | TBD | CH | NEAR/FAR | SIZE[2:0] | 1110 | - * | TBD | CH | NEAR/FAR | SIZE[2:0] | 1111 | - * | TBD | CH | NEAR/FAR | SIZE[2:0] | 1111 | + * | Command[15:0] | 15:12 | 11:8 | 7 | 6:4 | 3:0 | + * |-----------------|---------|---------|-----------|-------|-------| + * | WRITE-SINGLE | | | LOCAL | SIZE[2:0] | 0000 | + * | WRITE-IRQ | | | LOCAL | SIZE[2:0] | 0001 | + * | WRITE-BURST | | LEN[3:0]| LOCAL | SIZE[2:0] | 0010 | + * | WRITE-BURSTDATA | | | STOP | | 0011 | + * | WRITE-MULTICAST | | | LOCAL | SIZE[2:0] | 0100 | + * | WRITE-IO | | | LOCAL | 0,DIR[1:0]| 0101 | + * | TBD | | | LOCAL | SIZE[2:0] | 0110 | + * | TBD | | | LOCAL | SIZE[2:0] | 0111 | + * |-----------------|------- |---------|-------|-----------|-------| + * | READ | | LEN[3:0]| LOCAL | SIZE[2:0] | 1000 | + * | ATOMIC-ADD | | | LOCAL | SIZE[2:0] | 1001 | + * | ATOMIC-AND | | | LOCAL | SIZE[2:0] | 1010 | + * | ATOMIC-OR | | | LOCAL | SIZE[2:0] | 1011 | + * | ATOMIC-XOR | | | LOCAL | SIZE[2:0] | 1100 | + * | CAS | | | LOCAL | SIZE[2:0] | 1101 | + * | READ-IO | | | LOCAL | 0,DIR[1:0]| 1110 | + * | TBD | | | LOCAL | 0,DIR[1:0]| 1111 | * * SIZE DECODE: * 000=8b @@ -84,17 +84,30 @@ module emesh2packet parameter PW = 144) ( //Emesh signal bundle - input [15:0] cmd_out, //cmd[15:8] can be optionally set to zero - input [AW-1:0] dstaddr_out, //destination address - input [AW-1:0] srcaddr_out, //source address (for reads) - input [2*AW-1:0] data_out, //data + input [3:0] opcode_in, + input [2:0] size_in,//size of each transfer + input [3:0] burst_in,//length of burst (up to 16) + input [7:0] ctrl_in, + input local_in,//local address + input stop_in, + input [15:0] cmd_out,//transaction command + input [AW-1:0] dstaddr_in, //destination address + input [AW-1:0] srcaddr_in, //source address (for reads) + input [2*AW-1:0] data_in, //data //Output packet output [PW-1:0] packet_out ); - //Selector for src/data field - assign write = cmd_out[3]; - + //############################################ + // Hard Coded selector for read/write formats + //############################################ + + assign cmd_out[3:0] = opcode_in[3:0]; + assign cmd_out[6:4] = size_in[2:0]; + assign cmd_out[7] = local_in + assign cmd_out[15:8] = ctrl_in[7:0]; + assign write = ~cmd_out[3]; + generate //############################ // 16-Bit ("lite/apb like") diff --git a/emesh/hdl/emesh_if.v b/enoc/hdl/emesh_if.v similarity index 100% rename from emesh/hdl/emesh_if.v rename to enoc/hdl/emesh_if.v diff --git a/emesh/hdl/emesh_mux.v b/enoc/hdl/emesh_mux.v similarity index 100% rename from emesh/hdl/emesh_mux.v rename to enoc/hdl/emesh_mux.v diff --git a/emesh/hdl/emesh_rdalign.v b/enoc/hdl/emesh_rdalign.v similarity index 100% rename from emesh/hdl/emesh_rdalign.v rename to enoc/hdl/emesh_rdalign.v diff --git a/emesh/hdl/emesh_readback.v b/enoc/hdl/emesh_readback.v similarity index 100% rename from emesh/hdl/emesh_readback.v rename to enoc/hdl/emesh_readback.v diff --git a/emesh/hdl/emesh_wralign.v b/enoc/hdl/emesh_wralign.v similarity index 100% rename from emesh/hdl/emesh_wralign.v rename to enoc/hdl/emesh_wralign.v diff --git a/emesh/hdl/packet2emesh.v b/enoc/hdl/packet2emesh.v similarity index 97% rename from emesh/hdl/packet2emesh.v rename to enoc/hdl/packet2emesh.v index bef0f0b..7fcc918 100644 --- a/emesh/hdl/packet2emesh.v +++ b/enoc/hdl/packet2emesh.v @@ -16,6 +16,7 @@ module packet2emesh input [PW-1:0] packet_in, //Emesh signal bundle output [15:0] cmd_in, // command + output write_in,// indicates a write transaction output [AW-1:0] dstaddr_in, // read/write target address output [AW-1:0] srcaddr_in, // read return address output [2*AW-1:0] data_in // write data @@ -117,6 +118,8 @@ module packet2emesh end end // block: aw128 endgenerate + + assign write_in = cmd_in[3]; endmodule // packet2emesh