Merge branch 'master' into prog-loader

[lunaix-os.git] / lunaix-os / hal / pci.c

diff --git a/lunaix-os/hal/pci.c b/lunaix-os/hal/pci.c
index aa6acd16f036ff0adb8b2c864a0370a54ae750a9..8969224502e492c4141220c5b8f87be4772695e8 100644 (file)
--- a/lunaix-os/hal/pci.c
+++ b/lunaix-os/hal/pci.c
@@ -11,6 +11,7 @@
 #include <hal/acpi/acpi.h>
 #include <hal/apic.h>
 #include <hal/pci.h>
+#include <klibc/string.h>
 #include <lunaix/fs/twifs.h>
 #include <lunaix/mm/valloc.h>
 #include <lunaix/spike.h>
@@ -18,7 +19,8 @@
 
 LOG_MODULE("PCI")
 
-static struct llist_header pci_devices;
+static DEFINE_LLIST(pci_devices);
+static DEFINE_LLIST(pci_drivers);
 
 void
 pci_probe_msi_info(struct pci_device* device);
@@ -26,7 +28,7 @@ pci_probe_msi_info(struct pci_device* device);
 void
 pci_probe_device(int bus, int dev, int funct)
 {
-    uint32_t base = PCI_ADDRESS(bus, dev, funct);
+    u32_t base = PCI_ADDRESS(bus, dev, funct);
     pci_reg_t reg1 = pci_read_cspace(base, 0);
 
     // Vendor=0xffff则表示设备不存在
@@ -66,6 +68,23 @@ pci_probe_device(int bus, int dev, int funct)
     pci_probe_bar_info(device);
 
     llist_append(&pci_devices, &device->dev_chain);
+
+    if (!pci_bind_driver(device)) {
+        kprintf(KWARN "dev.%d:%d:%d %x:%x unknown device\n",
+                bus,
+                dev,
+                funct,
+                PCI_DEV_VENDOR(reg1),
+                PCI_DEV_DEVID(reg1));
+    } else {
+        kprintf("dev.%d:%d:%d %x:%x %s\n",
+                bus,
+                dev,
+                funct,
+                PCI_DEV_VENDOR(reg1),
+                PCI_DEV_DEVID(reg1),
+                device->driver.type->name);
+    }
 }
 
 void
@@ -73,7 +92,7 @@ pci_probe()
 {
     // 暴力扫描所有PCI设备
     // XXX: 尽管最多会有256条PCI总线，但就目前而言，只考虑bus #0就足够了
-    for (int bus = 0; bus < 1; bus++) {
+    for (int bus = 0; bus < 256; bus++) {
         for (int dev = 0; dev < 32; dev++) {
             pci_probe_device(bus, dev, 0);
         }
@@ -83,7 +102,7 @@ pci_probe()
 void
 pci_probe_bar_info(struct pci_device* device)
 {
-    uint32_t bar;
+    u32_t bar;
     struct pci_base_addr* ba;
     for (size_t i = 0; i < 6; i++) {
         ba = &device->bar[i];
@@ -113,7 +132,7 @@ pci_probe_msi_info(struct pci_device* device)
     }
 
     pci_reg_t cap_ptr = pci_read_cspace(device->cspace_base, 0x34) & 0xff;
-    uint32_t cap_hdr;
+    u32_t cap_hdr;
 
     while (cap_ptr) {
         cap_hdr = pci_read_cspace(device->cspace_base, cap_ptr);
@@ -223,7 +242,7 @@ pci_build_fsmapping()
 }
 
 size_t
-pci_bar_sizing(struct pci_device* dev, uint32_t* bar_out, uint32_t bar_num)
+pci_bar_sizing(struct pci_device* dev, u32_t* bar_out, u32_t bar_num)
 {
     pci_reg_t bar = pci_read_cspace(dev->cspace_base, PCI_REG_BAR(bar_num));
     if (!bar) {
@@ -246,10 +265,10 @@ void
 pci_setup_msi(struct pci_device* device, int vector)
 {
     // Dest: APIC#0, Physical Destination, No redirection
-    uint32_t msi_addr = (__APIC_BASE_PADDR);
+    u32_t msi_addr = (__APIC_BASE_PADDR);
 
     // Edge trigger, Fixed delivery
-    uint32_t msi_data = vector;
+    u32_t msi_data = vector;
 
     pci_write_cspace(
       device->cspace_base, PCI_MSI_ADDR(device->msi_loc), msi_addr);
@@ -275,7 +294,7 @@ pci_setup_msi(struct pci_device* device, int vector)
 struct pci_device*
 pci_get_device_by_id(uint16_t vendorId, uint16_t deviceId)
 {
-    uint32_t dev_info = vendorId | (deviceId << 16);
+    u32_t dev_info = vendorId | (deviceId << 16);
     struct pci_device *pos, *n;
     llist_for_each(pos, n, &pci_devices, dev_chain)
     {
@@ -288,7 +307,7 @@ pci_get_device_by_id(uint16_t vendorId, uint16_t deviceId)
 }
 
 struct pci_device*
-pci_get_device_by_class(uint32_t class)
+pci_get_device_by_class(u32_t class)
 {
     struct pci_device *pos, *n;
     llist_for_each(pos, n, &pci_devices, dev_chain)
@@ -301,10 +320,51 @@ pci_get_device_by_class(uint32_t class)
     return NULL;
 }
 
+void
+pci_add_driver(const char* name,
+               u32_t class,
+               u32_t vendor,
+               u32_t devid,
+               pci_drv_init init)
+{
+    struct pci_driver* pci_drv = valloc(sizeof(*pci_drv));
+    *pci_drv = (struct pci_driver){ .create_driver = init,
+                                    .dev_info = (vendor << 16) | devid,
+                                    .dev_class = class };
+    if (name) {
+        strncpy(pci_drv->name, name, PCI_DRV_NAME_LEN);
+    }
+
+    llist_append(&pci_drivers, &pci_drv->drivers);
+}
+
+int
+pci_bind_driver(struct pci_device* pci_dev)
+{
+    struct pci_driver *pos, *n;
+    llist_for_each(pos, n, &pci_drivers, drivers)
+    {
+        if (pos->dev_info) {
+            if (pos->dev_info == pci_dev->device_info) {
+                goto check_type;
+            }
+            continue;
+        }
+    check_type:
+        if (pos->dev_class) {
+            if (pos->dev_class == PCI_DEV_CLASS(pci_dev->class_info)) {
+                pci_dev->driver.type = pos;
+                pci_dev->driver.instance = pos->create_driver(pci_dev);
+                return 1;
+            }
+        }
+    }
+    return 0;
+}
+
 void
 pci_init()
 {
-    llist_init_head(&pci_devices);
     acpi_context* acpi = acpi_get_context();
     assert_msg(acpi, "ACPI not initialized.");
     if (acpi->mcfg.alloc_num) {