Changeset 137 for trunk/hal/x86_64/drivers

Timestamp:

Jul 4, 2017, 10:17:44 AM (7 years ago)

Author:

max@…

Message:

improve the APIC implementation

File:

• trunk/hal/x86_64/drivers/soclib_xcu.c (modified) (4 diffs)

trunk/hal/x86_64/drivers/soclib_xcu.c

@@ -32 +32 @@
 extern size_t ioapic_pins;
 
+uint64_t apic_fake_status __in_kdata = 0;
+
+/*
+ * These indexes are used to translate a type::idx to a pin on the IOAPIC.
+ */
+uint32_t hwi_baseidx __in_kdata = 0;
+uint32_t wti_baseidx __in_kdata = 0;
+uint32_t pti_baseidx __in_kdata = 0;
+
 void soclib_xcu_init(chdev_t *icu, lid_t lid)
 {
@@ -38 +47 @@
         /* disable all IRQs */
         for (i = 0; i < ioapic_pins; i++) {
-                hal_ioapic_set_entry(i, IOENTRY_DISABLE);
+                hal_ioapic_disable_entry(i);
         }
 
@@ -44 +53 @@
 }
 
-void soclib_xcu_disable_irq( chdev_t  * icu,
-                             uint32_t   mask,
-                             uint32_t   type,
-                             lid_t      lid )
+void soclib_xcu_enable_irq(chdev_t *icu, uint32_t idx, uint32_t type,
+    lid_t lid)
 {
+        uint32_t pin;
+
+        switch (type) {
+                case HWI_TYPE:
+                        pin = hwi_baseidx + idx;
+                case WTI_TYPE:
+                        pin = wti_baseidx + idx;
+                case PTI_TYPE:
+                        pin = pti_baseidx + idx;
+                default:
+                        x86_panic("enabling wrong irq");
+        }
+
         x86_panic((char *)__func__);
 }
 
-void soclib_xcu_enable_irq( chdev_t  * icu,
-                            uint32_t   mask,
-                            uint32_t   type,
-                            lid_t      lid )
+void soclib_xcu_disable_irq(chdev_t *icu, uint32_t idx, uint32_t type,
+    lid_t lid)
 {
         x86_panic((char *)__func__);
@@ -83 +101 @@
 }
 
-void soclib_xcu_get_status( chdev_t  * icu,
-                            lid_t      lid,
-                            uint32_t * hwi_status,
-                            uint32_t * wti_status,
-                            uint32_t * pti_status )
+
+
+
+
+void soclib_xcu_get_status(chdev_t *icu, lid_t lid, uint32_t *hwi_status,
+    uint32_t *wti_status, uint32_t *pti_status)
 {
+        if (lid != 0) {
+                x86_panic("xcu_get_status should have lid==0");
+        }
+
         x86_panic((char *)__func__);
 }
+
+
+
+
+
 
 void soclib_xcu_send_ipi( xptr_t  icu_xp,