rewrite the gic implementation, some other fix ups

[lunaix-os.git] / lunaix-os / arch / aarch64 / includes / asm / soc / gic.h

diff --git a/lunaix-os/arch/aarch64/includes/asm/soc/gic.h b/lunaix-os/arch/aarch64/includes/asm/soc/gic.h
deleted file mode 100644 (file)
index cabcfc4..0000000
--- a/lunaix-os/arch/aarch64/includes/asm/soc/gic.h
+++ /dev/null
@@ -1,207 +0,0 @@
-#ifndef __LUNAIX_GIC_H
-#define __LUNAIX_GIC_H
-
-#include <lunaix/types.h>
-#include <lunaix/ds/bitmap.h>
-#include <lunaix/ds/hashtable.h>
-
-#include <hal/devtree.h>
-
-#include <asm/aa64_gic.h>
-#include <asm-generic/isrm.h>
-
-#define NR_CPU      1
-#define gic_bmp     PREP_BITMAP(gicreg_t, gic_intr, BMP_ORIENT_LSB)
-
-#define INITID_SGI_BASE     0
-#define INITID_SGI_END      15
-
-#define INITID_PPI_BASE     16
-#define INITID_PPI_END      31
-
-#define INITID_SPI_BASE     32
-#define INITID_SPI_END      1019
-
-#define INITID_SPEC_BASE    1020
-#define INITID_SPEC_END     1023
-
-#define INITID_ePPI_BASE    1056
-#define INITID_ePPI_END     1119
-
-#define INITID_eSPI_BASE    4096
-#define INITID_eSPI_END     5119
-
-#define INITID_LPI_BASE     8192
-
-#define INITID_SPI_NR       (INITID_SPEC_BASE - INITID_SPI_BASE)
-
-enum gic_int_type
-{
-    GIC_IDL,
-    GIC_LPI,
-    GIC_SPI,
-    GIC_PPI,
-    GIC_SGI,
-    GIC_RSV
-} compact;
-
-enum gic_tri_type
-{
-    GIC_TRIG_EDGE,
-    GIC_TRIG_LEVEL
-} compact;
-
-enum gic_grp_type
-{
-    GIC_G0,
-    GIC_G1S,
-    GIC_G1NS
-} compact;
-
-DECLARE_BITMAP(gic_bmp);
-
-struct gic_int_param
-{
-    enum gic_int_type class;
-    enum gic_tri_type trigger;
-    enum gic_grp_type group;
-    unsigned int priority;
-    int cpu_id;
-    bool as_nmi;
-    bool ext_range;
-};
-
-struct gic_intcfg {
-    enum gic_int_type class;
-    enum gic_tri_type trigger;
-    enum gic_grp_type group;
-    bool as_nmi;
-};
-
-struct gic_idomain
-{
-    DECLARE_HASHTABLE(recs, 32);
-    BITMAP(gic_bmp) ivmap;
-    unsigned int base;
-    bool extended;
-};
-
-struct gic_interrupt
-{
-    struct hlist_node node;
-
-    struct gic_idomain* domain;
-    
-    unsigned int intid;
-    struct gic_intcfg config;
-    
-    isr_cb handler;
-    void* payload;
-};
-
-struct gic_distributor
-{
-    BITMAP(gic_bmp) group;
-    BITMAP(gic_bmp) grpmod;
-    BITMAP(gic_bmp) enable;
-    BITMAP(gic_bmp) disable;
-    BITMAP(gic_bmp) icfg;
-    BITMAP(gic_bmp) nmi;
-};
-
-struct gic_rd
-{
-    gicreg_t base[FRAME_LEN];
-    gicreg_t sgi_base[FRAME_LEN];
-} compact align(4);
-
-struct gic_cpuif
-{
-    gicreg_t base[FRAME_LEN];
-} compact align(4);
-
-#define gic_reg64(base, index) (*(gicreg64_t*)(&base[index]))
-#define gic_regptr(base, index) (__ptr(&base[index]))
-
-struct gic_pe
-{
-    struct gic_interrupt* active;
-    reg_t iar_val;
-    unsigned int priority;
-
-    struct gic_rd* _rd;
-    struct gic_cpuif* _if;
-
-    struct gic_distributor rdist;
-
-    struct {
-        struct gic_idomain* local_ints;
-        struct gic_idomain* eppi;
-    } idomain;
-
-    struct {
-        unsigned int affinity;
-        unsigned int ppi_nr;
-        bool eppi_ready;
-    };
-};
-
-struct gic_its
-{
-    gicreg_t base[FRAME_LEN];        // control regs
-    gicreg_t trn_space[FRAME_LEN];   // translation space
-} compact align(4);
-
-struct gic_its_v41
-{
-    gicreg_t base[FRAME_LEN];        // control regs
-    gicreg_t trn_space[FRAME_LEN];   // translation space
-    gicreg_t vsgi_space[FRAME_LEN];  // vSGI space (v4.1+)
-} compact align(4);
-
-typedef unsigned char lpi_entry_t;
-
-struct arm_gic
-{
-    unsigned int max_intid;
-    struct gic_pe pes[NR_CPU];
-
-    struct {
-        unsigned int lpi_nr;
-        unsigned int spi_nr;
-        unsigned int espi_nr;
-        bool lpi_ready;
-        bool nmi_ready;
-        bool has_espi;
-        bool msi_via_spi;
-    };
-
-    struct {
-        gicreg_t* dist_base;
-        union {
-            struct gic_its* its;
-            struct gic_its_v41* its_v41;
-        };
-    } mmrs;
-
-    struct {
-        ptr_t prop_pa;
-        lpi_entry_t* prop_table;
-        
-        ptr_t pend;
-        BITMAP(gic_bmp) pendings;
-    } lpi_tables;
-
-    struct gic_distributor dist;
-    struct gic_distributor dist_e;
-
-    struct {
-        struct gic_idomain* lpi;
-        struct gic_idomain* spi;
-        struct gic_idomain* espi;
-    } idomain;
-
-    struct dt_node* gic_node;
-};
-
-#endif /* __LUNAIX_GIC_H */