soc/cpu: simplify integration of CPU without interrupts (and automatically use UART_P...

diff --git a/litex/soc/cores/cpu/serv/core.py b/litex/soc/cores/cpu/serv/core.py
index c919fb5326449e1c830de778f4aabd55a3142db0..4fb2f0a493a50fb76e9d2314d9f20f70034aaa3b 100644 (file)
--- a/litex/soc/cores/cpu/serv/core.py
+++ b/litex/soc/cores/cpu/serv/core.py
@@ -37,7 +37,6 @@ class SERV(CPU):
         self.ibus      = ibus = wishbone.Interface()
         self.dbus      = dbus = wishbone.Interface()
         self.buses     = [ibus, dbus]
-        self.interrupt = Signal(32)
 
         # # #
 

diff --git a/litex/soc/integration/soc.py b/litex/soc/integration/soc.py
index b06abdef7b27592d702b2f405822e67562240668..dcea829aaafd40a615bbccad37b979a38a1d6b5d 100644 (file)
--- a/litex/soc/integration/soc.py
+++ b/litex/soc/integration/soc.py
@@ -723,7 +723,7 @@ class SoC(Module):
             raise
         self.constants[name] = SoCConstant(value)
 
-    def add_config(self, name, value):
+    def add_config(self, name, value=None):
         name = "CONFIG_" + name
         if isinstance(value, str):
             self.add_constant(name + "_" + value)
@@ -784,8 +784,10 @@ class SoC(Module):
             for n, cpu_bus in enumerate(self.cpu.buses):
                 self.bus.add_master(name="cpu_bus{}".format(n), master=cpu_bus)
             self.csr.add("cpu", use_loc_if_exists=True)
-            for name, loc in self.cpu.interrupts.items():
-                self.irq.add(name, loc)
+            if hasattr(self.cpu, "interrupt"):
+                for name, loc in self.cpu.interrupts.items():
+                    self.irq.add(name, loc)
+                self.add_config("CPU_HAS_INTERRUPT")
             if hasattr(self, "ctrl"):
                 self.comb += self.cpu.reset.eq(self.ctrl.reset)
             self.add_config("CPU_RESET_ADDR", reset_address)
@@ -797,7 +799,8 @@ class SoC(Module):
         self.check_if_exists(name)
         setattr(self.submodules, name, Timer())
         self.csr.add(name, use_loc_if_exists=True)
-        self.irq.add(name, use_loc_if_exists=True)
+        if hasattr(self.cpu, "interrupt"):
+            self.irq.add(name, use_loc_if_exists=True)
 
     # SoC finalization -----------------------------------------------------------------------------
     def do_finalize(self):
@@ -974,7 +977,10 @@ class LiteXSoC(SoC):
 
         self.csr.add("uart_phy", use_loc_if_exists=True)
         self.csr.add("uart", use_loc_if_exists=True)
-        self.irq.add("uart", use_loc_if_exists=True)
+        if hasattr(self.cpu, "interrupt"):
+            self.irq.add("uart", use_loc_if_exists=True)
+        else:
+            self.add_constant("UART_POLLING")
 
     # Add SDRAM ------------------------------------------------------------------------------------
     def add_sdram(self, name, phy, module, origin, size=None,

diff --git a/litex/soc/integration/soc_core.py b/litex/soc/integration/soc_core.py
index ab8704ced39065ffd0c56cb8ebccd17ce6bf8ae1..3eb0016c70560ec2d71809c154cb07b8ca3d617c 100644 (file)
--- a/litex/soc/integration/soc_core.py
+++ b/litex/soc/integration/soc_core.py
@@ -132,9 +132,6 @@ class SoCCore(LiteXSoC):
         self.cpu_type                   = cpu_type
         self.cpu_variant                = cpu_variant
 
-        if cpu_type == "serv":
-            self.add_constant("UART_POLLING") # FIXME: use UART in polling mode for SERV bringup
-
         self.integrated_rom_size        = integrated_rom_size
         self.integrated_rom_initialized = integrated_rom_init != []
         self.integrated_sram_size       = integrated_sram_size

diff --git a/litex/soc/software/bios/boot.c b/litex/soc/software/bios/boot.c
index c6c8b95832c1f50f2c7c766fc0ff7f9fb12e09cc..08b3be4a8ad061a4d4f800e2fe6cb83f8b4bedfa 100644 (file)
--- a/litex/soc/software/bios/boot.c
+++ b/litex/soc/software/bios/boot.c
@@ -18,6 +18,7 @@
 
 #include <generated/mem.h>
 #include <generated/csr.h>
+#include <generated/soc.h>
 
 #ifdef CSR_ETHMAC_BASE
 #include <net/microudp.h>
@@ -38,8 +39,10 @@ static void __attribute__((noreturn)) boot(unsigned long r1, unsigned long r2, u
        printf("Executing booted program at 0x%08x\n\n", addr);
        printf("--============= \e[1mLiftoff!\e[0m ===============--\n");
        uart_sync();
+#ifdef CONFIG_CPU_HAS_INTERRUPT
        irq_setmask(0);
        irq_setie(0);
+#endif
 /* FIXME: understand why flushing icache on Vexriscv make boot fail  */
 #ifndef __vexriscv__
        flush_cpu_icache();

diff --git a/litex/soc/software/bios/isr.c b/litex/soc/software/bios/isr.c
index f33cdac43e288953b9685770b9daee3be46ef4f7..0044f3d162c5099ffd4e1f4b0b9fd13900018bcf 100644 (file)
--- a/litex/soc/software/bios/isr.c
+++ b/litex/soc/software/bios/isr.c
@@ -4,14 +4,16 @@
 
 
 #include <generated/csr.h>
+#include <generated/soc.h>
 #include <irq.h>
 #include <uart.h>
 #include <stdio.h>
 
+void isr(void);
 
-#if defined(__blackparrot__) /*TODO: Update this function for BP*/ //
+#ifdef CONFIG_CPU_HAS_INTERRUPT
 
-void isr(void);
+#if defined(__blackparrot__) /*TODO: Update this function for BP*/ //
 void isr(void)
 {
   static int onetime = 0;
@@ -36,7 +38,6 @@ void plic_init(void)
        *((unsigned int *)PLIC_THRSHLD) = 0;
 }
 
-void isr(void);
 void isr(void)
 {
        unsigned int claim;
@@ -62,7 +63,6 @@ void isr(void)
        }
 }
 #else
-void isr(void);
 void isr(void)
 {
        __attribute__((unused)) unsigned int irqs;
@@ -75,3 +75,9 @@ void isr(void)
 #endif
 }
 #endif
+
+#else
+
+void isr(void){};
+
+#endif

diff --git a/litex/soc/software/bios/main.c b/litex/soc/software/bios/main.c
index 08fc6faa950d8985d4b3dd97b9066cf55332fac4..b6501edbbb4210827ff5d76fa079d1fb96310056 100644 (file)
--- a/litex/soc/software/bios/main.c
+++ b/litex/soc/software/bios/main.c
@@ -616,9 +616,10 @@ int main(int i, char **c)
 {
        char buffer[64];
        int sdr_ok;
-
+#ifdef CONFIG_CPU_HAS_INTERRUPT
        irq_setmask(0);
        irq_setie(1);
+#endif
        uart_init();
 
        printf("\n");

diff --git a/litex/soc/software/include/base/irq.h b/litex/soc/software/include/base/irq.h
index 6a2f73944c77b01ebb37455eefe50e89b44b098e..9fd8e1805b0fc8612cfddc8907c9712ef6e08aa4 100644 (file)
--- a/litex/soc/software/include/base/irq.h
+++ b/litex/soc/software/include/base/irq.h
@@ -7,6 +7,9 @@ extern "C" {
 
 #include <system.h>
 #include <generated/csr.h>
+#include <generated/soc.h>
+
+#ifdef CONFIG_CPU_HAS_INTERRUPT
 
 #ifdef __picorv32__
 // PicoRV32 has a very limited interrupt support, implemented via custom
@@ -71,12 +74,8 @@ 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 (__microwatt__)
-       return 0; /* No interrupt support on Microwatt */
 #elif defined (__blackparrot__)
        return (csrr(mstatus) & CSR_MSTATUS_MIE) != 0; /* FIXME */
-#elif defined (__serv__)
-       return 0; /* No interrupt support on SERV */
 #else
 #error Unsupported architecture
 #endif
@@ -102,12 +101,8 @@ 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 (__microwatt__)
-       /* No interrupt support on Microwatt */
 #elif defined (__blackparrot__)
        if(ie) csrs(mstatus,CSR_MSTATUS_MIE); else csrc(mstatus,CSR_MSTATUS_MIE); /* FIXME */
-#elif defined (__serv__)
-       /* No interrupt support on SERV */
 #else
 #error Unsupported architecture
 #endif
@@ -135,12 +130,8 @@ static inline unsigned int irq_getmask(void)
        return mask;
 #elif defined (__rocket__)
        return *((unsigned int *)PLIC_ENABLED) >> 1;
-#elif defined (__microwatt__)
-       return 0; /* No interrupt support on Microwatt */
 #elif defined (__blackparrot__)
        return 0; /* FIXME */
-#elif defined (__serv__)
-       return 0; /* No interrupt support on SERV */
 #else
 #error Unsupported architecture
 #endif
@@ -162,12 +153,8 @@ static inline void irq_setmask(unsigned int mask)
        asm volatile ("csrw %0, %1" :: "i"(CSR_IRQ_MASK), "r"(mask));
 #elif defined (__rocket__)
        *((unsigned int *)PLIC_ENABLED) = mask << 1;
-#elif defined (__microwatt__)
-       /* No interrupt support on Microwatt */
 #elif defined (__blackparrot__)
        /* FIXME */
-#elif defined (__serv__)
-       /* No interrupt support on SERV */
 #else
 #error Unsupported architecture
 #endif
@@ -193,12 +180,8 @@ static inline unsigned int irq_pending(void)
        return pending;
 #elif defined (__rocket__)
        return *((unsigned int *)PLIC_PENDING) >> 1;
-#elif defined (__microwatt__)
-       return 0; /* No interrupt support on Microwatt */
 #elif defined (__blackparrot__)
        return csr_readl(PLIC_PENDING) >> 1; /* FIXME */
-#elif defined (__serv__)
-       return 0; /* No interrupt support on SERV */
 #else
 #error Unsupported architecture
 #endif
@@ -208,4 +191,6 @@ static inline unsigned int irq_pending(void)
 }
 #endif
 
+#endif
+
 #endif /* __IRQ_H */