[libcpu][riscv]统一plic

Author: heyuanjie87

libcpu/risc-v/t-head/c908/plic.c libcpu/risc-v/plic/plic.clibcpu/risc-v/t-head/c908/plic.c renamed to libcpu/risc-v/plic/plic.c

@@ -31,7 +31,7 @@ struct plic_handler
 };
 
 rt_inline void plic_toggle(struct plic_handler *handler, int hwirq, int enable);
-struct plic_handler plic_handlers[C908_NR_CPUS];
+struct plic_handler plic_handlers[NR_CPUS];
 static void *plic_irq_priority[INTERRUPTS_MAX] = {RT_NULL};
 
 rt_inline void plic_irq_toggle(int hwirq, int enable)
@@ -153,7 +153,7 @@ rt_inline void plic_toggle(struct plic_handler *handler, int hwirq, int enable)
     }
 }
 
-void plic_init(void)
+void plic_init(unsigned long base_pa)
 {
     int nr_irqs;
     int nr_context;
@@ -167,16 +167,16 @@ void plic_init(void)
         return;
     }
 
-    nr_context = C908_NR_CONTEXT;
+    nr_context = PLIC_NR_CONTEXT;
 
-    plic_regs = (void *)C908_PLIC_PHY_ADDR;
+    plic_regs = (void *)base_pa;
     if (!plic_regs)
     {
         LOG_E("fatal error, plic is reg space is null.");
         return;
     }
 
-    nr_irqs = C908_PLIC_NR_EXT_IRQS;
+    nr_irqs = IRQ_MAX_NR;
 
     for (i = 0; i < nr_context; i ++)
     {

libcpu/risc-v/t-head/c908/plic.h libcpu/risc-v/plic/plic.hlibcpu/risc-v/t-head/c908/plic.h renamed to libcpu/risc-v/plic/plic.h

@@ -14,14 +14,8 @@
 
 #include <interrupt.h>
 
-#ifndef C908_PLIC_PHY_ADDR
-#define C908_PLIC_PHY_ADDR              (0xF00000000UL)
-#endif
-#define C908_PLIC_NR_EXT_IRQS           (IRQ_MAX_NR)
-#define C908_NR_CPUS                    (NR_CPUS)
-
 /* M and S mode context. */
-#define C908_NR_CONTEXT                 (2)
+#define PLIC_NR_CONTEXT                 (2)
 
 #define MAX_DEVICES                     1024
 #define MAX_CONTEXTS                    15872
@@ -50,7 +44,7 @@
 #define CONTEXT_THRESHOLD               0x00
 #define CONTEXT_CLAIM                   0x04
 
-void plic_init(void);
+void plic_init(unsigned long base_pa);
 void plic_enable_irq(int irqno);
 void plic_disable_irq(int irqno);
 // tell PLIC that we've served this IRQ

libcpu/risc-v/t-head/c906/interrupt.c

@@ -15,6 +15,10 @@
 #include "riscv.h"
 #include "plic.h"
 
+#ifndef C906_PLIC_PHY_ADDR
+#define C906_PLIC_PHY_ADDR              (0x10000000)
+#endif
+
 extern rt_atomic_t rt_interrupt_nest;
 extern rt_uint32_t rt_interrupt_from_thread, rt_interrupt_to_thread;
 extern rt_uint32_t rt_thread_switch_interrupt_flag;
@@ -32,7 +36,7 @@ static void rt_hw_interrupt_handler(int vector, void *param)
 void rt_hw_interrupt_init(void)
 {
     /* init interrupt controller */
-    plic_init();
+    plic_init(C906_PLIC_PHY_ADDR);
 
     rt_int32_t idx;
 

libcpu/risc-v/t-head/c908/interrupt.c

@@ -15,6 +15,10 @@
 #include "riscv.h"
 #include "plic.h"
 
+#ifndef C908_PLIC_PHY_ADDR
+#define C908_PLIC_PHY_ADDR              (0xF00000000UL)
+#endif
+
 extern rt_atomic_t rt_interrupt_nest;
 extern rt_uint32_t rt_interrupt_from_thread, rt_interrupt_to_thread;
 extern rt_uint32_t rt_thread_switch_interrupt_flag;
@@ -32,7 +36,7 @@ static void rt_hw_interrupt_handler(int vector, void *param)
 void rt_hw_interrupt_init(void)
 {
     /* init interrupt controller */
-    plic_init();
+    plic_init(C908_PLIC_PHY_ADDR);
 
     rt_int32_t idx;