Hardware/litex
1
0
Fork 0
mirror of https://github.com/enjoy-digital/litex.git synced 2025-01-04 09:52:26 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/enjoy-digital/litex

Browse source
This commit is contained in:
Florent Kermarrec 2016-04-13 01:19:21 +02:00
commit fcd8d792a1
10 changed files with 65 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
litex/boards/platforms/sim.py
View file

@ -10,24 +10,24 @@ _io = [
("sys_clk", 0, SimPins(1)), ("sys_clk", 0, SimPins(1)),
("sys_rst", 0, SimPins(1)), ("sys_rst", 0, SimPins(1)),
("serial", 0, ("serial", 0,
Subsignal("source_stb", SimPins(1)), Subsignal("source_valid", SimPins(1)),
Subsignal("source_ack", SimPins(1)), Subsignal("source_ready", SimPins(1)),
Subsignal("source_data", SimPins(8)), Subsignal("source_data", SimPins(8)),
Subsignal("sink_stb", SimPins(1)), Subsignal("sink_valid", SimPins(1)),
Subsignal("sink_ack", SimPins(1)), Subsignal("sink_ready", SimPins(1)),
Subsignal("sink_data", SimPins(8)), Subsignal("sink_data", SimPins(8)),
), ),
("eth_clocks", 0, ("eth_clocks", 0,
Subsignal("none", SimPins(1)), Subsignal("none", SimPins(1)),
), ),
("eth", 0, ("eth", 0,
Subsignal("source_stb", SimPins(1)), Subsignal("source_valid", SimPins(1)),
Subsignal("source_ack", SimPins(1)), Subsignal("source_ready", SimPins(1)),
Subsignal("source_data", SimPins(8)), Subsignal("source_data", SimPins(8)),
Subsignal("sink_stb", SimPins(1)), Subsignal("sink_valid", SimPins(1)),
Subsignal("sink_ack", SimPins(1)), Subsignal("sink_ready", SimPins(1)),
Subsignal("sink_data", SimPins(8)), Subsignal("sink_data", SimPins(8)),
), ),
] ]

38
litex/build/sim/dut_tb.cpp
View file

@ -19,11 +19,11 @@
/* ios */ /* ios */
#ifdef SERIAL_SOURCE_STB #ifdef SERIAL_SOURCE_VALID
#define WITH_SERIAL #define WITH_SERIAL
#endif #endif
#ifdef ETH_SOURCE_STB #ifdef ETH_SOURCE_VALID
#define WITH_ETH #define WITH_ETH
#endif #endif
@ -62,7 +62,7 @@ struct sim {
int eth_txbuffer_len; int eth_txbuffer_len;
int eth_rxbuffer_len; int eth_rxbuffer_len;
int eth_rxbuffer_pos; int eth_rxbuffer_pos;
int eth_last_source_stb; int eth_last_source_valid;
#endif #endif
}; };
@ -123,7 +123,7 @@ void eth_init(struct sim *s, const char *dev, const char*tap)
s->eth_txbuffer_len = 0; s->eth_txbuffer_len = 0;
s->eth_rxbuffer_len = 0; s->eth_rxbuffer_len = 0;
s->eth_rxbuffer_pos = 0; s->eth_rxbuffer_pos = 0;
s->eth_last_source_stb = 0; s->eth_last_source_valid = 0;
s->eth_dev = dev; s->eth_dev = dev;
s->eth_tap = tap; s->eth_tap = tap;
} }
@ -187,8 +187,8 @@ VerilatedVcdC* tfp;
int console_service(struct sim *s) int console_service(struct sim *s)
{ {
/* fpga --> console */ /* fpga --> console */
SERIAL_SOURCE_ACK = 1; SERIAL_SOURCE_READY = 1;
if(SERIAL_SOURCE_STB == 1) { if(SERIAL_SOURCE_VALID == 1) {
if(SERIAL_SOURCE_DATA == '\n') if(SERIAL_SOURCE_DATA == '\n')
putchar('\r'); putchar('\r');
putchar(SERIAL_SOURCE_DATA); putchar(SERIAL_SOURCE_DATA);
@ -196,7 +196,7 @@ int console_service(struct sim *s)
} }
/* console --> fpga */ /* console --> fpga */
SERIAL_SINK_STB = 0; SERIAL_SINK_VALID = 0;
if(s->tick%(1000) == 0) { if(s->tick%(1000) == 0) {
if(kbhit()) { if(kbhit()) {
char c = getch(); char c = getch();
@ -204,7 +204,7 @@ int console_service(struct sim *s)
printf("\r\n"); printf("\r\n");
return -1; return -1;
} else { } else {
SERIAL_SINK_STB = 1; SERIAL_SINK_VALID = 1;
SERIAL_SINK_DATA = c; SERIAL_SINK_DATA = c;
} }
} }
@ -263,17 +263,17 @@ int console_read(struct sim *s, unsigned char *buf)
int console_service(struct sim *s) int console_service(struct sim *s)
{ {
/* fpga --> console */ /* fpga --> console */
SERIAL_SOURCE_ACK = 1; SERIAL_SOURCE_READY = 1;
if(SERIAL_SOURCE_STB == 1) { if(SERIAL_SOURCE_VALID == 1) {
s->serial_tx_data = SERIAL_SOURCE_DATA; s->serial_tx_data = SERIAL_SOURCE_DATA;
console_write(s, &(s->serial_tx_data), 1); console_write(s, &(s->serial_tx_data), 1);
} }
/* console --> fpga */ /* console --> fpga */
SERIAL_SINK_STB = 0; SERIAL_SINK_VALID = 0;
if(console_read(s, &(s->serial_rx_data))) if(console_read(s, &(s->serial_rx_data)))
{ {
SERIAL_SINK_STB = 1; SERIAL_SINK_VALID = 1;
SERIAL_SINK_DATA = s->serial_rx_data; SERIAL_SINK_DATA = s->serial_rx_data;
} }
return 0; return 0;
@ -283,30 +283,30 @@ int console_service(struct sim *s)
#ifdef WITH_ETH #ifdef WITH_ETH
int ethernet_service(struct sim *s) { int ethernet_service(struct sim *s) {
/* fpga --> tap */ /* fpga --> tap */
ETH_SOURCE_ACK = 1; ETH_SOURCE_READY = 1;
if(ETH_SOURCE_STB == 1) { if(ETH_SOURCE_VALID == 1) {
s->eth_txbuffer[s->eth_txbuffer_len] = ETH_SOURCE_DATA; s->eth_txbuffer[s->eth_txbuffer_len] = ETH_SOURCE_DATA;
s->eth_txbuffer_len++; s->eth_txbuffer_len++;
} else { } else {
if(s->eth_last_source_stb) { if(s->eth_last_source_valid) {
eth_write(s, s->eth_txbuffer, s->eth_txbuffer_len); eth_write(s, s->eth_txbuffer, s->eth_txbuffer_len);
s->eth_txbuffer_len = 0; s->eth_txbuffer_len = 0;
} }
} }
s->eth_last_source_stb = ETH_SOURCE_STB; s->eth_last_source_valid = ETH_SOURCE_VALID;
/* tap --> fpga */ /* tap --> fpga */
if(s->eth_rxbuffer_len == 0) { if(s->eth_rxbuffer_len == 0) {
ETH_SINK_STB = 0; ETH_SINK_VALID = 0;
s->eth_rxbuffer_pos = 0; s->eth_rxbuffer_pos = 0;
s->eth_rxbuffer_len = eth_read(s, s->eth_rxbuffer); s->eth_rxbuffer_len = eth_read(s, s->eth_rxbuffer);
} else { } else {
if(s->eth_rxbuffer_pos < MAX(s->eth_rxbuffer_len, 60)) { if(s->eth_rxbuffer_pos < MAX(s->eth_rxbuffer_len, 60)) {
ETH_SINK_STB = 1; ETH_SINK_VALID = 1;
ETH_SINK_DATA = s->eth_rxbuffer[s->eth_rxbuffer_pos]; ETH_SINK_DATA = s->eth_rxbuffer[s->eth_rxbuffer_pos];
s->eth_rxbuffer_pos++; s->eth_rxbuffer_pos++;
} else { } else {
ETH_SINK_STB = 0; ETH_SINK_VALID = 0;
s->eth_rxbuffer_len = 0; s->eth_rxbuffer_len = 0;
memset(s->eth_rxbuffer, 0, 1532); memset(s->eth_rxbuffer, 0, 1532);
} }

40
litex/build/sim/verilator.py
View file

@ -31,20 +31,20 @@ def _build_tb(platform, vns, serial, template):
raise ValueError raise ValueError
try: try:
ios += """ ios += """
#define SERIAL_SOURCE_STB dut->{serial_source_stb} #define SERIAL_SOURCE_VALID dut->{serial_source_valid}
#define SERIAL_SOURCE_ACK dut->{serial_source_ack} #define SERIAL_SOURCE_READY dut->{serial_source_ready}
#define SERIAL_SOURCE_DATA dut->{serial_source_data} #define SERIAL_SOURCE_DATA dut->{serial_source_data}
#define SERIAL_SINK_STB dut->{serial_sink_stb} #define SERIAL_SINK_VALID dut->{serial_sink_valid}
#define SERIAL_SINK_ACK dut->{serial_sink_ack} #define SERIAL_SINK_READY dut->{serial_sink_ready}
#define SERIAL_SINK_DATA dut->{serial_sink_data} #define SERIAL_SINK_DATA dut->{serial_sink_data}
""".format( """.format(
serial_source_stb=io_name("serial", "source_stb"), serial_source_valid=io_name("serial", "source_valid"),
serial_source_ack=io_name("serial", "source_ack"), serial_source_ready=io_name("serial", "source_ready"),
serial_source_data=io_name("serial", "source_data"), serial_source_data=io_name("serial", "source_data"),
serial_sink_stb=io_name("serial", "sink_stb"), serial_sink_valid=io_name("serial", "sink_valid"),
serial_sink_ack=io_name("serial", "sink_ack"), serial_sink_ready=io_name("serial", "sink_ready"),
serial_sink_data=io_name("serial", "sink_data"), serial_sink_data=io_name("serial", "sink_data"),
) )
except: except:
@ -52,20 +52,20 @@ def _build_tb(platform, vns, serial, template):
try: try:
ios += """ ios += """
#define ETH_SOURCE_STB dut->{eth_source_stb} #define ETH_SOURCE_VALID dut->{eth_source_valid}
#define ETH_SOURCE_ACK dut->{eth_source_ack} #define ETH_SOURCE_READY dut->{eth_source_ready}
#define ETH_SOURCE_DATA dut->{eth_source_data} #define ETH_SOURCE_DATA dut->{eth_source_data}
#define ETH_SINK_STB dut->{eth_sink_stb} #define ETH_SINK_VALID dut->{eth_sink_valid}
#define ETH_SINK_ACK dut->{eth_sink_ack} #define ETH_SINK_READY dut->{eth_sink_ready}
#define ETH_SINK_DATA dut->{eth_sink_data} #define ETH_SINK_DATA dut->{eth_sink_data}
""".format( """.format(
eth_source_stb=io_name("eth", "source_stb"), eth_source_valid=io_name("eth", "source_valid"),
eth_source_ack=io_name("eth", "source_ack"), eth_source_ready=io_name("eth", "source_ready"),
eth_source_data=io_name("eth", "source_data"), eth_source_data=io_name("eth", "source_data"),
eth_sink_stb=io_name("eth", "sink_stb"), eth_sink_valid=io_name("eth", "sink_valid"),
eth_sink_ack=io_name("eth", "sink_ack"), eth_sink_ready=io_name("eth", "sink_ready"),
eth_sink_data=io_name("eth", "sink_data"), eth_sink_data=io_name("eth", "sink_data"),
) )
except: except:

8
litex/soc/cores/uart/core.py
View file

@ -117,13 +117,13 @@ class RS232PHYModel(Module):
self.source = stream.Endpoint([("data", 8)]) self.source = stream.Endpoint([("data", 8)])
self.comb += [ self.comb += [
pads.source_stb.eq(self.sink.valid), pads.source_valid.eq(self.sink.valid),
pads.source_data.eq(self.sink.data), pads.source_data.eq(self.sink.data),
self.sink.ready.eq(pads.source_ack), self.sink.ready.eq(pads.source_ready),
self.source.valid.eq(pads.sink_stb), self.source.valid.eq(pads.sink_valid),
self.source.data.eq(pads.sink_data), self.source.data.eq(pads.sink_data),
pads.sink_ack.eq(self.source.ready) pads.sink_ready.eq(self.source.ready)
] ]

11
litex/soc/integration/soc_sdram.py
View file

@ -11,7 +11,7 @@ __all__ = ["SoCSDRAM", "soc_sdram_args", "soc_sdram_argdict"]
class ControllerInjector(Module, AutoCSR): class ControllerInjector(Module, AutoCSR):
def __init__(self, phy, controller_type, geom_settings, timing_settings): def __init__(self, phy, controller_type, geom_settings, timing_settings, controller_settings):
self.submodules.dfii = dfii.DFIInjector(geom_settings.addressbits, geom_settings.bankbits, self.submodules.dfii = dfii.DFIInjector(geom_settings.addressbits, geom_settings.bankbits,
phy.settings.dfi_databits, phy.settings.nphases) phy.settings.dfi_databits, phy.settings.nphases)
self.comb += self.dfii.master.connect(phy.dfi) self.comb += self.dfii.master.connect(phy.dfi)
@ -19,7 +19,8 @@ class ControllerInjector(Module, AutoCSR):
if controller_type == "lasmicon": if controller_type == "lasmicon":
self.submodules.controller = controller = lasmicon.LASMIcon(phy.settings, self.submodules.controller = controller = lasmicon.LASMIcon(phy.settings,
geom_settings, geom_settings,
timing_settings) timing_settings,
controller_settings)
self.comb += controller.dfi.connect(self.dfii.slave) self.comb += controller.dfi.connect(self.dfii.slave)
self.submodules.crossbar = lasmi_bus.LASMIxbar([controller.lasmic], self.submodules.crossbar = lasmi_bus.LASMIxbar([controller.lasmic],
@ -43,7 +44,7 @@ class SoCSDRAM(SoCCore):
def __init__(self, platform, clk_freq, l2_size=8192, **kwargs): def __init__(self, platform, clk_freq, l2_size=8192, **kwargs):
SoCCore.__init__(self, platform, clk_freq, **kwargs) SoCCore.__init__(self, platform, clk_freq, **kwargs)
self.l2_size = l2_size self.l2_size = l2_size
self._sdram_phy = [] self._sdram_phy = []
self._wb_sdram_ifs = [] self._wb_sdram_ifs = []
self._wb_sdram = wishbone.Interface() self._wb_sdram = wishbone.Interface()
@ -53,12 +54,12 @@ class SoCSDRAM(SoCCore):
raise FinalizeError raise FinalizeError
self._wb_sdram_ifs.append(interface) self._wb_sdram_ifs.append(interface)
def register_sdram(self, phy, sdram_controller_type, geom_settings, timing_settings): def register_sdram(self, phy, sdram_controller_type, geom_settings, timing_settings, controller_settings=None):
assert not self._sdram_phy assert not self._sdram_phy
self._sdram_phy.append(phy) # encapsulate in list to prevent CSR scanning self._sdram_phy.append(phy) # encapsulate in list to prevent CSR scanning
self.submodules.sdram = ControllerInjector( self.submodules.sdram = ControllerInjector(
phy, sdram_controller_type, geom_settings, timing_settings) phy, sdram_controller_type, geom_settings, timing_settings, controller_settings)
dfi_databits_divisor = 1 if phy.settings.memtype == "SDR" else 2 dfi_databits_divisor = 1 if phy.settings.memtype == "SDR" else 2
sdram_width = phy.settings.dfi_databits//dfi_databits_divisor sdram_width = phy.settings.dfi_databits//dfi_databits_divisor

1
litex/soc/interconnect/stream.py
View file

@ -388,6 +388,7 @@ class CombinatorialActor(BinaryActor):
class PipelinedActor(BinaryActor): class PipelinedActor(BinaryActor):
def __init__(self, latency): def __init__(self, latency):
self.latency = latency
self.pipe_ce = Signal() self.pipe_ce = Signal()
BinaryActor.__init__(self, latency) BinaryActor.__init__(self, latency)

2
litex/soc/software/common.mak
View file

@ -7,7 +7,7 @@ ifeq ($(CLANG),1)
CC_normal := clang -target $(TRIPLE) -integrated-as CC_normal := clang -target $(TRIPLE) -integrated-as
CX_normal := clang++ -target $(TRIPLE) -integrated-as CX_normal := clang++ -target $(TRIPLE) -integrated-as
else else
CC_normal := $(TARGET_PREFIX)gcc CC_normal := $(TARGET_PREFIX)gcc -std=gnu99
CX_normal := $(TARGET_PREFIX)g++ CX_normal := $(TARGET_PREFIX)g++
endif endif
AR_normal := $(TARGET_PREFIX)ar AR_normal := $(TARGET_PREFIX)ar

4
litex/soc/software/include/base/system.h
View file

@ -15,14 +15,14 @@ static inline unsigned long mfspr(unsigned long add)
{ {
unsigned long ret; unsigned long ret;
__asm__ __volatile__ ("l.mfspr %0,r0,%1" : "=r" (ret) : "K" (add)); __asm__ __volatile__ ("l.mfspr %0,%1,0" : "=r" (ret) : "r" (add));
return ret; return ret;
} }
static inline void mtspr(unsigned long add, unsigned long val) static inline void mtspr(unsigned long add, unsigned long val)
{ {
__asm__ __volatile__ ("l.mtspr r0,%1,%0" : : "K" (add), "r" (val)); __asm__ __volatile__ ("l.mtspr %0,%1,0" : : "r" (add), "r" (val));
} }
#endif #endif

3
litex/soc/software/libcompiler_rt/Makefile
View file

@ -17,6 +17,9 @@ libcompiler_rt.a: $(OBJECTS)
$(CC) -c $(CFLAGS) $(1) $(SOC_DIRECTORY)/software/libcompiler_rt/mulsi3.c -o mulsi3.o $(CC) -c $(CFLAGS) $(1) $(SOC_DIRECTORY)/software/libcompiler_rt/mulsi3.c -o mulsi3.o
$(AR) crs libcompiler_rt.a $(OBJECTS) $(AR) crs libcompiler_rt.a $(OBJECTS)
mulsi3.o: $(SOC_DIRECTORY)/software/libcompiler_rt/mulsi3.c
$(compile)
%.o: $(SOC_DIRECTORY)/software/compiler_rt/lib/builtins/%.c %.o: $(SOC_DIRECTORY)/software/compiler_rt/lib/builtins/%.c
$(compile) $(compile)

2
litex/soc/software/libnet/microudp.c
View file

@ -10,7 +10,7 @@
#include <net/microudp.h> #include <net/microudp.h>
//#define DEBUG_MICROUDP_TX //#define DEBUG_MICROUDP_TX
//#define DEBUG_MICROUDP_TX //#define DEBUG_MICROUDP_RX
#define ETHERTYPE_ARP 0x0806 #define ETHERTYPE_ARP 0x0806
#define ETHERTYPE_IP 0x0800 #define ETHERTYPE_IP 0x0800