Changeset 41811af in mainline for uspace/drv/pciintel/pci.c

Timestamp:

2011-06-10T10:14:26Z (14 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

ab547063

Parents:

9536e6e (diff), 390d80d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline

File:

• uspace/drv/pciintel/pci.c (modified) (11 diffs)

uspace/drv/pciintel/pci.c

@@ -52 +52 @@
 #include <ipc/devman.h>
 #include <ipc/dev_iface.h>
+#include <ipc/irc.h>
+#include <ns.h>
+#include <ipc/services.h>
+#include <sysinfo.h>
 #include <ops/hw_res.h>
 #include <device/hw_res.h>
 #include <ddi.h>
 #include <libarch/ddi.h>
+#include <pci_dev_iface.h>
 
 #include "pci.h"
@@ -84 +89 @@
 static bool pciintel_enable_interrupt(ddf_fun_t *fnode)
 {
-        /* TODO */
-        
-        return false;
+        /* This is an old ugly way, copied from ne2000 driver */
+        assert(fnode);
+        pci_fun_t *dev_data = (pci_fun_t *) fnode->driver_data;
+        
+        sysarg_t apic;
+        sysarg_t i8259;
+        
+        async_sess_t *irc_sess = NULL;
+        
+        if (((sysinfo_get_value("apic", &apic) == EOK) && (apic))
+            || ((sysinfo_get_value("i8259", &i8259) == EOK) && (i8259))) {
+                irc_sess = service_connect_blocking(EXCHANGE_SERIALIZE,
+                    SERVICE_IRC, 0, 0);
+        }
+        
+        if (!irc_sess)
+                return false;
+        
+        size_t i = 0;
+        hw_resource_list_t *res = &dev_data->hw_resources;
+        for (; i < res->count; i++) {
+                if (res->resources[i].type == INTERRUPT) {
+                        const int irq = res->resources[i].res.interrupt.irq;
+                        
+                        async_exch_t *exch = async_exchange_begin(irc_sess);
+                        const int rc =
+                            async_req_1_0(exch, IRC_ENABLE_INTERRUPT, irq);
+                        async_exchange_end(exch);
+                        
+                        if (rc != EOK) {
+                                async_hangup(irc_sess);
+                                return false;
+                        }
+                }
+        }
+        
+        async_hangup(irc_sess);
+        return true;
+}
+
+static int pci_config_space_write_32(ddf_fun_t *fun, uint32_t address,
+    uint32_t data)
+{
+        if (address > 252)
+                return EINVAL;
+        pci_conf_write_32(PCI_FUN(fun), address, data);
+        return EOK;
+}
+
+static int pci_config_space_write_16(
+    ddf_fun_t *fun, uint32_t address, uint16_t data)
+{
+        if (address > 254)
+                return EINVAL;
+        pci_conf_write_16(PCI_FUN(fun), address, data);
+        return EOK;
+}
+
+static int pci_config_space_write_8(
+    ddf_fun_t *fun, uint32_t address, uint8_t data)
+{
+        if (address > 255)
+                return EINVAL;
+        pci_conf_write_8(PCI_FUN(fun), address, data);
+        return EOK;
+}
+
+static int pci_config_space_read_32(
+    ddf_fun_t *fun, uint32_t address, uint32_t *data)
+{
+        if (address > 252)
+                return EINVAL;
+        *data = pci_conf_read_32(PCI_FUN(fun), address);
+        return EOK;
+}
+
+static int pci_config_space_read_16(
+    ddf_fun_t *fun, uint32_t address, uint16_t *data)
+{
+        if (address > 254)
+                return EINVAL;
+        *data = pci_conf_read_16(PCI_FUN(fun), address);
+        return EOK;
+}
+
+static int pci_config_space_read_8(
+    ddf_fun_t *fun, uint32_t address, uint8_t *data)
+{
+        if (address > 255)
+                return EINVAL;
+        *data = pci_conf_read_8(PCI_FUN(fun), address);
+        return EOK;
 }
 
@@ -94 +188 @@
 };
 
-static ddf_dev_ops_t pci_fun_ops;
+static pci_dev_iface_t pci_dev_ops = {
+        .config_space_read_8 = &pci_config_space_read_8,
+        .config_space_read_16 = &pci_config_space_read_16,
+        .config_space_read_32 = &pci_config_space_read_32,
+        .config_space_write_8 = &pci_config_space_write_8,
+        .config_space_write_16 = &pci_config_space_write_16,
+        .config_space_write_32 = &pci_config_space_write_32
+};
+
+static ddf_dev_ops_t pci_fun_ops = {
+        .interfaces[HW_RES_DEV_IFACE] = &pciintel_hw_res_ops,
+        .interfaces[PCI_DEV_IFACE] = &pci_dev_ops
+};
 
 static int pci_add_device(ddf_dev_t *);
@@ -288 +394 @@
         /* Get the value of the BAR. */
         val = pci_conf_read_32(fun, addr);
+
+#define IO_MASK  (~0x3)
+#define MEM_MASK (~0xf)
         
         io = (bool) (val & 1);
         if (io) {
                 addrw64 = false;
+                mask = IO_MASK;
         } else {
+                mask = MEM_MASK;
                 switch ((val >> 1) & 3) {
                 case 0:
@@ -308 +419 @@
         /* Get the address mask. */
         pci_conf_write_32(fun, addr, 0xffffffff);
-        mask = pci_conf_read_32(fun, addr);
+        mask &= pci_conf_read_32(fun, addr);
         
         /* Restore the original value. */
@@ -469 +580 @@
         
         ddf_msg(LVL_DEBUG, "pci_add_device");
-        dnode->parent_phone = -1;
+        dnode->parent_sess = NULL;
         
         bus = pci_bus_new();
@@ -480 +591 @@
         dnode->driver_data = bus;
         
-        dnode->parent_phone = devman_parent_device_connect(dnode->handle,
-            IPC_FLAG_BLOCKING);
-        if (dnode->parent_phone < 0) {
+        dnode->parent_sess = devman_parent_device_connect(EXCHANGE_SERIALIZE,
+            dnode->handle, IPC_FLAG_BLOCKING);
+        if (!dnode->parent_sess) {
                 ddf_msg(LVL_ERROR, "pci_add_device failed to connect to the "
-                    "parent's driver.");
-                rc = dnode->parent_phone;
+                    "parent driver.");
+                rc = ENOENT;
                 goto fail;
         }
@@ -491 +602 @@
         hw_resource_list_t hw_resources;
         
-        rc = hw_res_get_resource_list(dnode->parent_phone, &hw_resources);
+        rc = hw_res_get_resource_list(dnode->parent_sess, &hw_resources);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "pci_add_device failed to get hw resources "
@@ -544 +655 @@
         if (bus != NULL)
                 pci_bus_delete(bus);
-        if (dnode->parent_phone >= 0)
-                async_hangup(dnode->parent_phone);
+        
+        if (dnode->parent_sess)
+                async_hangup(dnode->parent_sess);
+        
         if (got_res)
                 hw_res_clean_resource_list(&hw_resources);
+        
         if (ctl != NULL)
                 ddf_fun_destroy(ctl);
-
+        
         return rc;
 }
@@ -558 +672 @@
         ddf_log_init(NAME, LVL_ERROR);
         pci_fun_ops.interfaces[HW_RES_DEV_IFACE] = &pciintel_hw_res_ops;
+        pci_fun_ops.interfaces[PCI_DEV_IFACE] = &pci_dev_ops;
 }
 
@@ -629 +744 @@
 size_t pci_bar_mask_to_size(uint32_t mask)
 {
-        return ((mask & 0xfffffff0) ^ 0xffffffff) + 1;
+        size_t size = mask & ~(mask - 1);
+        return size;
 }