Changeset 135

Timestamp:

Jul 3, 2017, 5:21:06 PM (7 years ago)

Author:

max@…

Message:

start moving the APIC into the XCU driver

Location:

trunk/hal/x86_64

Files:

• core/hal_apic.c (modified) (6 diffs)
• core/hal_apic.h (modified) (1 diff)
• core/hal_init.c (modified) (2 diffs)
• drivers/soclib_xcu.c (modified) (1 diff)

trunk/hal/x86_64/core/hal_apic.c

@@ -114 +114 @@
 /* -------------------------------------------------------------------------- */
 
+size_t ioapic_pins __in_kdata = 0;
 paddr_t ioapic_pa __in_kdata = 0;
 vaddr_t ioapic_va __in_kdata = 0;
@@ -133 +134 @@
 #define IOREDTBL        0x10
 
-#define IOENTRY_DISABLE 0x10000
-
 void hal_ioapic_write(uint8_t reg, uint32_t val)
 {
@@ -155 +154 @@
 static void hal_ioapic_init()
 {
-        size_t i, pins;
         uint32_t ver;
+        size_t i;
 
         ioapic_va = hal_gpt_bootstrap_valloc(1); // XXX: should be shared
@@ -163 +162 @@
 
         ver = hal_ioapic_read(IOAPICVER);
-        pins = ((ver >> 16) & 0xFF) + 1;
+        ioapic_pins = ((ver >> 16) & 0xFF) + 1;
 
         /* Explicitly disable (mask) each vector */
-        for (i = 0; i < pins; i++) {
+        for (i = 0; i < ioapic_pins; i++) {
                 hal_ioapic_set_entry(i, IOENTRY_DISABLE);
         }
+
+        x86_printf("IOAPICPINS: #%z\n", ioapic_pins);
 
         /* Now, enable the keyboard */
@@ -205 +206 @@
         /* Initialize the LAPIC timer to the maximum value */
         hal_lapic_write(LAPIC_ICR_TIMER, 0xFFFFFFFF); 
+
+        /* Initialize the PIT */
+        hal_pit_init();
 
         pittick = hal_pit_timer_read() + 1;
@@ -239 +243 @@
  *  - APIC internal error (ERR)
  *  - Extended (Implementation dependent)
+ * Only the Spurious and APIC Timer interrupts are enabled.
  */
 static void hal_lapic_init()

trunk/hal/x86_64/core/hal_apic.h

@@ -21 +21 @@
 
 #ifndef x86_ASM
+void hal_ioapic_set_entry(uint8_t index, uint64_t data);
+
 uint32_t hal_lapic_gid();
 void hal_apic_init();
 #endif
+
+/*
+ *******************************************************************************
+ * IOAPIC
+ *******************************************************************************
+ */
+
+#define IOENTRY_DISABLE 0x10000
+
+
+/*
+ *******************************************************************************
+ * LAPIC
+ *******************************************************************************
+ */
 
 #define LAPIC_SPURIOUS_VECTOR   LAPICVEC_MIN

trunk/hal/x86_64/core/hal_init.c

@@ -80 +80 @@
 }
 
+/* -------------------------------------------------------------------------- */
+
+static void init_bootinfo_icu(boot_device_t *dev)
+{
+        memset(dev, 0, sizeof(boot_device_t));
+
+        dev->base = NULL; /* XXX */
+        dev->type = (DEV_FUNC_ICU << 16) | IMPL_ICU_XCU;
+        dev->channels = 1;
+        dev->param0 = 0;
+        dev->param1 = 0;
+        dev->param2 = 0;
+        dev->param3 = 0;
+
+#ifdef NOTYET
+    uint32_t    irqs;                 /*! number of input IRQs                              */
+    boot_irq_t  irq[32];              /*! array of input IRQS (PIC and ICU only)            */
+#endif
+}
+
 static size_t init_bootinfo_pages_nr()
 {
@@ -190 +210 @@
         info->rsvd_nr = init_bootinfo_rsvd(&info->rsvd);
 
-        /* dev_ XXX */
+        init_bootinfo_icu(&info->dev_icu);
+        /* TODO: dev_mmc */
+        /* TODO: dev_dma */
+
         offset = hal_gpt_bootstrap_uniformize();
         info->pages_offset = offset / PAGE_SIZE;

trunk/hal/x86_64/drivers/soclib_xcu.c

@@ -27 +27 @@
 #include <chdev.h>
 
+#include <hal_apic.h>
 #include <hal_internal.h>
 
-void soclib_xcu_init( chdev_t * icu,
-                      lid_t     lid )
+extern size_t ioapic_pins;
+
+void soclib_xcu_init(chdev_t *icu, lid_t lid)
 {
+        size_t i;
+
+        /* disable all IRQs */
+        for (i = 0; i < ioapic_pins; i++) {
+                hal_ioapic_set_entry(i, IOENTRY_DISABLE);
+        }
+
         x86_panic((char *)__func__);
 }