Changeset 138 for trunk/hal/x86_64/drivers

Timestamp:

Jul 4, 2017, 12:05:39 PM (7 years ago)

Author:

max@…

Message:

update

File:

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

trunk/hal/x86_64/drivers/soclib_xcu.c

@@ -1 +1 @@
 /*
- * soclib_xcu.c - soclib XCU driver API implementation.
+ * soclib_xcu.c - x86 XCU driver API implementation.
  *
- * Authors  Alain Greiner    (2016)
- *
- * Copyright (c) UPMC Sorbonne Universites
+ * Copyright (c) 2017 Maxime Villard
  *
  * This file is part of ALMOS-MKH.
  *
- * ALMOS-MKH.is free software; you can redistribute it and/or modify it
+ * ALMOS-MKH is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by
  * the Free Software Foundation; version 2.0 of the License.
  *
- * ALMOS-MKH.is distributed in the hope that it will be useful, but
+ * ALMOS-MKH is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -18 +16 @@
  *
  * You should have received a copy of the GNU General Public License
- * along with ALMOS-kernel; if not, write to the Free Software Foundation,
+ * along with ALMOS-MKH.; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
@@ -28 +26 @@
 
 #include <hal_apic.h>
+#include <hal_segmentation.h>
 #include <hal_internal.h>
 
 extern size_t ioapic_pins;
-
-uint64_t apic_fake_status __in_kdata = 0;
 
 /*
@@ -40 +37 @@
 uint32_t wti_baseidx __in_kdata = 0;
 uint32_t pti_baseidx __in_kdata = 0;
+
+static uint32_t get_pin(uint32_t idx, uint32_t type)
+{
+        switch (type) {
+                case HWI_TYPE:
+                        return hwi_baseidx + idx;
+                case WTI_TYPE:
+                        return wti_baseidx + idx;
+                case PTI_TYPE:
+                        return pti_baseidx + idx;
+                default:
+                        x86_panic("get_pin: wrong type");
+                        return 0;
+        }
+}
 
 void soclib_xcu_init(chdev_t *icu, lid_t lid)
@@ -56 +68 @@
     lid_t lid)
 {
+        uint8_t dest = (uint8_t)lid; /* XXX */
         uint32_t pin;
+        uint8_t vec;
+
+        pin = get_pin(idx, type);
 
         switch (type) {
                 case HWI_TYPE:
-                        pin = hwi_baseidx + idx;
+                        vec = VECTOR_APIC_XCU_HWI;
                 case WTI_TYPE:
-                        pin = wti_baseidx + idx;
+                        vec = VECTOR_APIC_XCU_WTI;
                 case PTI_TYPE:
-                        pin = pti_baseidx + idx;
+                        vec = VECTOR_APIC_XCU_PTI;
                 default:
                         x86_panic("enabling wrong irq");
         }
+
+        hal_ioapic_set_entry(pin, vec, dest);
 
         x86_panic((char *)__func__);
@@ -75 +93 @@
     lid_t lid)
 {
+        uint32_t pin = get_pin(idx, type);
+
+        hal_ioapic_disable_entry(pin);
+
         x86_panic((char *)__func__);
 }
 
-void soclib_xcu_get_masks( chdev_t   * icu,
-                           lid_t       lid,
-                           uint32_t  * hwi_mask,
-                           uint32_t  * wti_mask,
-                           uint32_t  * pti_mask )
+void soclib_xcu_get_masks(chdev_t *icu, lid_t lid, uint32_t *hwi_mask,
+    uint32_t *wti_mask, uint32_t *pti_mask)
 {
         x86_panic((char *)__func__);
@@ -101 +120 @@
 }
 
-
-
-
-
 void soclib_xcu_get_status(chdev_t *icu, lid_t lid, uint32_t *hwi_status,
     uint32_t *wti_status, uint32_t *pti_status)
@@ -114 +129 @@
         x86_panic((char *)__func__);
 }
-
-
-
-
-
 
 void soclib_xcu_send_ipi( xptr_t  icu_xp,