1
0
Commit Graph

104 Commits

Author SHA1 Message Date
636a46c052 make sure SlowIO clock divider is initialized on reset 2016-06-08 10:02:21 -07:00
28161cab45 Merge AddrHashMap and AddrMap 2016-06-03 13:46:53 -07:00
695be2f0ae hasti: work-around unsupported 0-width signals 2016-06-01 16:38:49 -07:00
8983b0e865 hopefully the last fix for AXI -> AHB converter 2016-06-01 15:01:52 -07:00
53a0e6cb9c another fix for AXI -> AHB converter 2016-06-01 11:35:36 -07:00
d0988902f2 fix NASTI -> HASTI bridge 2016-05-31 19:47:50 -07:00
56897f707a Don't rely on Mux1H output when no inputs are hot 2016-05-27 13:38:01 -07:00
056d7ec93a Drive hmastlock low in Nasti-Hasti converter 2016-05-27 12:23:18 -07:00
e036d3a04a Chisel3: gender issue 2016-05-26 15:59:08 -07:00
a2b9d337b6 No need for full-throughput queues in NastiErrorSlave 2016-05-26 01:03:40 -07:00
2ece3e6102 Use Mem for ReorderQueue data
This might improve FPGA QoR.
2016-05-26 01:02:56 -07:00
1c8745dfd2 ahb: backport to chisel2
Merges #16
2016-05-25 12:11:26 -07:00
a9599302bd fix cloneType in nasti.scala (#14) 2016-05-24 17:10:17 -07:00
5bc78aba99 Merge pull request #15 from terpstra/ahb
Ahb
2016-05-24 17:06:03 -07:00
b921bae107 ahb: eliminate trait abused for constants 2016-05-24 14:20:45 -07:00
200c69c106 ahb: support hmastlock acquistion of crossbar 2016-05-24 14:20:45 -07:00
e1e8eda419 ahb: add a test SRAM 2016-05-24 14:20:42 -07:00
1db40687c6 ahb: eliminate now-unnecesary non-standard hreadyin 2016-05-24 14:14:22 -07:00
15cad8414d ahb: put signals in the order they appear in signal traces in the spec 2016-05-24 14:14:22 -07:00
f30f8d9f79 ahb: reduce obsolete degenerate cases of a crossbar 2016-05-24 14:14:22 -07:00
0368b6db6b ahb: replace defective crossbar with a functional one
The previous crossbar had the following bugs:
  1. a bursting master could be preempted
     the AHB-lite spec requires a slave receive the entire burst

  2. a waited master could be replaced
     the AHB-lite spec requires haddr/etc to remain unchanged

  3. hmastlock did no ensure exclusive access
     atomic operations could be pre-empted
2016-05-24 14:14:22 -07:00
2b37f37335 ahb: helper methods 2016-05-24 14:14:21 -07:00
ef2aae26a8 ahb: rename hreadyout to standard hready, mark hreadyin for death 2016-05-24 14:14:21 -07:00
2f8a77f27a ahb: include all AHB-lite constants 2016-05-24 14:14:21 -07:00
7896c4157e ahb: parameterize poci 2016-05-24 14:14:21 -07:00
93447eb274 ahb: make hasti parameters location sensitive 2016-05-24 14:14:17 -07:00
44740cb6b2 parameterize Hasti address and data bits 2016-05-06 11:30:50 -07:00
64991d3947 add AXI to AHB converter 2016-05-06 11:30:50 -07:00
be21f6962b make GlobalAddrHashMap a config variable 2016-05-02 18:22:43 -07:00
e4ace55d77 Address Map refactoring 2016-04-28 16:12:35 -07:00
c8b1f0801b Remove start address option from AddrMapEntries
It appears to never be used, and clutters things.  The new invariant is
that AddrMaps are relative and AddrHashMaps are absolute.
2016-04-27 14:52:05 -07:00
d3dee2c6c6 support countSlaves on empty address maps 2016-04-27 14:51:52 -07:00
6260ad56e8 stop using MMIOBase and encode cacheability in address map 2016-04-21 15:33:53 -07:00
1967186a96 add id field to NastiWriteDataChannel 2016-04-19 09:39:45 -07:00
42c4d1e51f add NastiMemoryDemux 2016-04-19 09:39:15 -07:00
0bf8d07aba make AtosSerializedIO clock divisible 2016-04-19 09:39:15 -07:00
1dc8af894e fix serializer/deserializer and add Atos serdes/desser 2016-04-19 09:39:15 -07:00
d66d8f0cd4 fix SMI converter 2016-04-01 18:32:15 -07:00
015992bc9e no longer need MIFMasterTagBits 2016-03-28 12:24:11 -07:00
34852e406d fix bug in NastiRouter 2016-03-28 12:22:43 -07:00
db09f310a1 Define MIFMasterTagBits as # bits a master can *use* in tag 2016-03-11 16:48:13 -08:00
4f5b1da58b add a resp_len helper to AtosRequest 2016-02-23 16:24:32 -08:00
db3b2c264c Add constructors, converters, and serdes for AXI tunneled over SERDES (AtoS) 2016-02-23 16:24:32 -08:00
fbd66ac87b expose a count in MultiWidthFifo 2016-02-19 11:20:43 -08:00
5241ee6442 add multi-width FIFO 2016-02-19 11:20:43 -08:00
770f2742de Make NastiMemorySelector a subtype of NastiInterconnect
When RocketChip has a single memory configuration I want to ensure no extra
hardware is being generated by only instantiating a NastiMemoryInterconnect
rather than a NastiMemorySelector, which I believe will insert a Mux with 0
when there is only one config (because there aren't any 0-width wires allowed).
2016-02-17 10:41:01 -08:00
6b39db8ce6 Add "NastiMemorySelector", a memory interconnect
On Hurricane we want to be able to support multiple memory channels but have a
fallback to fewer, since the full configuration is going to require a
complicated FPGA setup.  This adds another sort of interconnect that can switch
between having different numbers of top-level memory channels active at chip
boot time.

This interconnect is a bit funny: changing the select input when there is
memory traffic is a bad idea.  This is fine for this use case, since we really
only care about changing the memory configuration at boot time -- since it'll
scramble the memory of the machine it's not so useful, anyway.

The advantage is that we don't have to have a full 8x8 Nasti crossbar in our
chip, which would be fairly expensive.  Changing the crossbar would garble
memory as well, so it's not like it would add any extra functionality.
2016-02-16 23:59:01 -08:00
fef8a2d862 make sure NastiIOStreamIOConverter does not depend on external last signal 2016-02-15 09:48:35 -08:00
b4856da819 Merge pull request #6 from ucb-bar/chisel3
Chisel 3 Support
2016-02-05 17:15:49 -08:00
62257e0b04 Uncomment MemSerializedIO.cloneType()
Not sure why this was commented, but when I build this against Chisel3 it fails
without this override.
2016-02-04 15:28:46 -08:00