From 7b72148c4ed6f518397780d77aafe6df70937f9c Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Mon, 30 Sep 2019 08:30:45 +0200 Subject: [PATCH] cpu: remove initial SERV support (we'll work in a branch to experiment with it) --- .gitmodules | 3 - litex/soc/cores/cpu/__init__.py | 2 - litex/soc/cores/cpu/serv/__init__.py | 1 - litex/soc/cores/cpu/serv/core.py | 96 ---------------------- litex/soc/software/bios/boot-helper-serv.S | 4 - litex/soc/software/bios/sdram.c | 2 - litex/soc/software/include/base/irq.h | 10 --- litex/soc/software/libbase/crt0-serv.S | 63 -------------- litex/soc/software/libbase/system.c | 6 -- 9 files changed, 187 deletions(-) delete mode 100644 litex/soc/cores/cpu/serv/__init__.py delete mode 100644 litex/soc/cores/cpu/serv/core.py delete mode 100644 litex/soc/software/bios/boot-helper-serv.S delete mode 100644 litex/soc/software/libbase/crt0-serv.S diff --git a/.gitmodules b/.gitmodules index 8587dd82d..17eaf734d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,6 +22,3 @@ [submodule "litex/soc/cores/cpu/rocket/verilog"] path = litex/soc/cores/cpu/rocket/verilog url = https://github.com/enjoy-digital/rocket-litex-verilog -[submodule "litex/soc/cores/cpu/serv/verilog"] - path = litex/soc/cores/cpu/serv/verilog - url = https://github.com/olofk/serv diff --git a/litex/soc/cores/cpu/__init__.py b/litex/soc/cores/cpu/__init__.py index b8d6aad2f..236dba4b4 100644 --- a/litex/soc/cores/cpu/__init__.py +++ b/litex/soc/cores/cpu/__init__.py @@ -30,7 +30,6 @@ from litex.soc.cores.cpu.picorv32 import PicoRV32 from litex.soc.cores.cpu.vexriscv import VexRiscv from litex.soc.cores.cpu.minerva import Minerva from litex.soc.cores.cpu.rocket import RocketRV64 -from litex.soc.cores.cpu.serv import SERV CPUS = { "lm32" : LM32, @@ -39,7 +38,6 @@ CPUS = { "vexriscv" : VexRiscv, "minerva" : Minerva, "rocket" : RocketRV64, - "serv" : SERV } # CPU Variants/Extensions Definition --------------------------------------------------------------- diff --git a/litex/soc/cores/cpu/serv/__init__.py b/litex/soc/cores/cpu/serv/__init__.py deleted file mode 100644 index b46284ac8..000000000 --- a/litex/soc/cores/cpu/serv/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from litex.soc.cores.cpu.serv.core import SERV diff --git a/litex/soc/cores/cpu/serv/core.py b/litex/soc/cores/cpu/serv/core.py deleted file mode 100644 index d5b8ce32b..000000000 --- a/litex/soc/cores/cpu/serv/core.py +++ /dev/null @@ -1,96 +0,0 @@ -# This file is Copyright (c) 2019 Florent Kermarrec - -# License: BSD - -import os - -from migen import * - -from litex.soc.interconnect import wishbone -from litex.soc.cores.cpu import CPU - - -CPU_VARIANTS = ["standard"] - - -class SERV(CPU): - name = "serv" - data_width = 32 - endianness = "little" - gcc_triple = ("riscv64-unknown-elf", "riscv32-unknown-elf") - linker_output_format = "elf32-littleriscv" - - @property - def gcc_triple(self): - return ("riscv64-unknown-elf", "riscv32-unknown-elf") - - @property - def gcc_flags(self): - flags = "-march=rv32i " - flags += "-mabi=ilp32 " - flags += "-D__serv__ " - return flags - - @property - def linker_output_format(self): - return "elf32-littleriscv" - - def __init__(self, platform, variant="standard"): - assert variant is "standard", "Unsupported variant %s" % variant - self.platform = platform - self.variant = variant - self.reset = Signal() - self.ibus = wishbone.Interface() - self.dbus = wishbone.Interface() - self.interrupt = Signal(32) - - # # # - - self.cpu_params = dict( - # clock / reset - i_clk = ClockSignal(), - i_i_rst = ResetSignal(), - - # timer irq - i_i_timer_irq = 0, - - # ibus - o_o_ibus_adr = self.ibus.adr, - o_o_ibus_cyc = self.ibus.cyc, - i_i_ibus_rdt = self.ibus.dat_r, - i_i_ibus_ack = self.ibus.ack, - - - # dbus - o_o_dbus_adr = self.dbus.adr, - o_o_dbus_dat = self.dbus.dat_w, - o_o_dbus_sel = self.dbus.sel, - o_o_dbus_we = self.dbus.we, - o_o_dbus_cyc = self.dbus.cyc, - i_i_dbus_rdt = self.dbus.dat_r, - i_i_dbus_ack = self.dbus.ack, - ) - self.comb += [ - self.ibus.stb.eq(self.ibus.cyc), - self.dbus.stb.eq(self.dbus.cyc), - ] - - # add verilog sources - self.add_sources(platform) - - def set_reset_address(self, reset_address): - assert not hasattr(self, "reset_address") - self.reset_address = reset_address - self.cpu_params.update(p_RESET_PC=reset_address) - - @staticmethod - def add_sources(platform): - vdir = os.path.join( - os.path.abspath(os.path.dirname(__file__)), - "verilog", "rtl") - platform.add_source_dir(vdir) - platform.add_verilog_include_path(vdir) - - def do_finalize(self): - assert hasattr(self, "reset_address") - self.specials += Instance("serv_top", **self.cpu_params) diff --git a/litex/soc/software/bios/boot-helper-serv.S b/litex/soc/software/bios/boot-helper-serv.S deleted file mode 100644 index e8bd5c760..000000000 --- a/litex/soc/software/bios/boot-helper-serv.S +++ /dev/null @@ -1,4 +0,0 @@ - .section .text, "ax", @progbits - .global boot_helper -boot_helper: - jr x13 diff --git a/litex/soc/software/bios/sdram.c b/litex/soc/software/bios/sdram.c index 897c03d50..f0c12edfe 100644 --- a/litex/soc/software/bios/sdram.c +++ b/litex/soc/software/bios/sdram.c @@ -44,8 +44,6 @@ __attribute__((unused)) static void cdelay(int i) __asm__ volatile("nop"); #elif defined (__powerpc__) __asm__ volatile("nop"); -#elif defined (__serv__) - __asm__ volatile("nop"); #else #error Unsupported architecture #endif diff --git a/litex/soc/software/include/base/irq.h b/litex/soc/software/include/base/irq.h index 0a0766e83..4bf6786c4 100644 --- a/litex/soc/software/include/base/irq.h +++ b/litex/soc/software/include/base/irq.h @@ -56,8 +56,6 @@ static inline unsigned int irq_getie(void) return (csrr(mstatus) & CSR_MSTATUS_MIE) != 0; #elif defined (__rocket__) return (csrr(mstatus) & CSR_MSTATUS_MIE) != 0; -#elif defined (__serv__) - return 0; /* FIXME */ #else #error Unsupported architecture #endif @@ -83,8 +81,6 @@ static inline void irq_setie(unsigned int ie) if(ie) csrs(mstatus,CSR_MSTATUS_MIE); else csrc(mstatus,CSR_MSTATUS_MIE); #elif defined (__rocket__) if(ie) csrs(mstatus,CSR_MSTATUS_MIE); else csrc(mstatus,CSR_MSTATUS_MIE); -#elif defined (__serv__) - /* FIXME */ #else #error Unsupported architecture #endif @@ -112,8 +108,6 @@ static inline unsigned int irq_getmask(void) return mask; #elif defined (__rocket__) return csr_readl(PLIC_ENABLED) >> 1; -#elif defined (__serv__) - return 0; /* FIXME */ #else #error Unsupported architecture #endif @@ -135,8 +129,6 @@ static inline void irq_setmask(unsigned int mask) asm volatile ("csrw %0, %1" :: "i"(CSR_IRQ_MASK), "r"(mask)); #elif defined (__rocket__) csr_writel(mask << 1, PLIC_ENABLED); -#elif defined (__serv__) - /* FIXME */ #else #error Unsupported architecture #endif @@ -162,8 +154,6 @@ static inline unsigned int irq_pending(void) return pending; #elif defined (__rocket__) return csr_readl(PLIC_PENDING) >> 1; -#elif defined (__serv__) - return 0;/* FIXME */ #else #error Unsupported architecture #endif diff --git a/litex/soc/software/libbase/crt0-serv.S b/litex/soc/software/libbase/crt0-serv.S deleted file mode 100644 index 6f6e9e6c0..000000000 --- a/litex/soc/software/libbase/crt0-serv.S +++ /dev/null @@ -1,63 +0,0 @@ -#define MIE_MEIE 0x800 - - .global _start -_start: - j reset_vector - -reset_vector: - la sp, _fstack - la t0, trap_vector - csrw mtvec, t0 - - // initialize .bss - la t0, _fbss - la t1, _ebss -1: beq t0, t1, 2f - sw zero, 0(t0) - addi t0, t0, 4 - j 1b -2: - // enable external interrupts - li t0, MIE_MEIE - csrs mie, t0 - - call main -1: j 1b - -trap_vector: - addi sp, sp, -16*4 - sw ra, 0*4(sp) - sw t0, 1*4(sp) - sw t1, 2*4(sp) - sw t2, 3*4(sp) - sw a0, 4*4(sp) - sw a1, 5*4(sp) - sw a2, 6*4(sp) - sw a3, 7*4(sp) - sw a4, 8*4(sp) - sw a5, 9*4(sp) - sw a6, 10*4(sp) - sw a7, 11*4(sp) - sw t3, 12*4(sp) - sw t4, 13*4(sp) - sw t5, 14*4(sp) - sw t6, 15*4(sp) - call isr - lw ra, 0*4(sp) - lw t0, 1*4(sp) - lw t1, 2*4(sp) - lw t2, 3*4(sp) - lw a0, 4*4(sp) - lw a1, 5*4(sp) - lw a2, 6*4(sp) - lw a3, 7*4(sp) - lw a4, 8*4(sp) - lw a5, 9*4(sp) - lw a6, 10*4(sp) - lw a7, 11*4(sp) - lw t3, 12*4(sp) - lw t4, 13*4(sp) - lw t5, 14*4(sp) - lw t6, 15*4(sp) - addi sp, sp, 16*4 - mret diff --git a/litex/soc/software/libbase/system.c b/litex/soc/software/libbase/system.c index 73e657785..bb15aad06 100644 --- a/litex/soc/software/libbase/system.c +++ b/litex/soc/software/libbase/system.c @@ -56,9 +56,6 @@ void flush_cpu_icache(void) #elif defined (__rocket__) /* FIXME: do something useful here! */ asm volatile("nop"); -#elif defined (__serv__) - /* no instruction cache */ - asm volatile("nop"); #else #error Unsupported architecture #endif @@ -104,9 +101,6 @@ void flush_cpu_dcache(void) #elif defined (__rocket__) /* FIXME: do something useful here! */ asm volatile("nop"); -#elif defined (__serv__) - /* no data cache */ - asm volatile("nop"); #else #error Unsupported architecture #endif