Changeset 3569955 in mainline

Timestamp:

2011-11-05T17:11:22Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

5664cf64

Parents:

d5a78e28 (diff), 54de4836 (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 with mainline

Location:

uspace

Files:

• drv/bus/pci/pciintel/pci.c (modified) (8 diffs)
• drv/bus/pci/pciintel/pci.h (modified) (1 diff)
• lib/drv/generic/driver.c (modified) (1 diff)

uspace/drv/bus/pci/pciintel/pci.c

@@ -78 +78 @@
 #define PCI_BUS_FROM_FUN(fun) ((fun)->busptr)
 
+/** Max is 47, align to something nice. */
+#define ID_MAX_STR_LEN 50
+
 static hw_resource_list_t *pciintel_get_resources(ddf_fun_t *fnode)
 {
@@ -225 +228 @@
         fibril_mutex_lock(&bus->conf_mutex);
         
-        uint32_t conf_addr;
-        conf_addr = CONF_ADDR(fun->bus, fun->dev, fun->fn, reg);
+        const uint32_t conf_addr = CONF_ADDR(fun->bus, fun->dev, fun->fn, reg);
         void *addr = bus->conf_data_port + (reg & 3);
         
@@ -311 +313 @@
 void pci_fun_create_match_ids(pci_fun_t *fun)
 {
-        char *match_id_str;
         int rc;
-        
-        asprintf(&match_id_str, "pci/ven=%04x&dev=%04x",
+        char match_id_str[ID_MAX_STR_LEN];
+
+        /* Vendor ID & Device ID, length(incl \0) 22 */
+        rc = snprintf(match_id_str, ID_MAX_STR_LEN, "pci/ven=%04x&dev=%04x",
             fun->vendor_id, fun->device_id);
-
-        if (match_id_str == NULL) {
-                ddf_msg(LVL_ERROR, "Out of memory creating match ID.");
-                return;
+        if (rc < 0) {
+                ddf_msg(LVL_ERROR, "Failed creating match ID str: %s",
+                    str_error(rc));
         }
 
         rc = ddf_fun_add_match_id(fun->fnode, match_id_str, 90);
         if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed adding match ID: %s",
+                ddf_msg(LVL_ERROR, "Failed adding match ID: %s", str_error(rc));
+        }
+
+        /* Class, subclass, prog IF, revision, length(incl \0) 47 */
+        rc = snprintf(match_id_str, ID_MAX_STR_LEN,
+            "pci/class=%02x&subclass=%02x&progif=%02x&revision=%02x",
+            fun->class_code, fun->subclass_code, fun->prog_if, fun->revision);
+        if (rc < 0) {
+                ddf_msg(LVL_ERROR, "Failed creating match ID str: %s",
                     str_error(rc));
         }
-        
-        free(match_id_str);
-        
-        /* TODO add more ids (with subsys ids, using class id etc.) */
+
+        rc = ddf_fun_add_match_id(fun->fnode, match_id_str, 70);
+        if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "Failed adding match ID: %s", str_error(rc));
+        }
+
+        /* Class, subclass, prog IF, length(incl \0) 35 */
+        rc = snprintf(match_id_str, ID_MAX_STR_LEN,
+            "pci/class=%02x&subclass=%02x&progif=%02x",
+            fun->class_code, fun->subclass_code, fun->prog_if);
+        if (rc < 0) {
+                ddf_msg(LVL_ERROR, "Failed creating match ID str: %s",
+                    str_error(rc));
+        }
+
+        rc = ddf_fun_add_match_id(fun->fnode, match_id_str, 60);
+        if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "Failed adding match ID: %s", str_error(rc));
+        }
+
+        /* Class, subclass, length(incl \0) 25 */
+        rc = snprintf(match_id_str, ID_MAX_STR_LEN,
+            "pci/class=%02x&subclass=%02x",
+            fun->class_code, fun->subclass_code);
+        if (rc < 0) {
+                ddf_msg(LVL_ERROR, "Failed creating match ID str: %s",
+                    str_error(rc));
+        }
+
+        rc = ddf_fun_add_match_id(fun->fnode, match_id_str, 50);
+        if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "Failed adding match ID: %s", str_error(rc));
+        }
+
+        /* Class, length(incl \0) 13 */
+        rc = snprintf(match_id_str, ID_MAX_STR_LEN, "pci/class=%02x",
+            fun->class_code);
+        if (rc < 0) {
+                ddf_msg(LVL_ERROR, "Failed creating match ID str: %s",
+                    str_error(rc));
+        }
+
+        rc = ddf_fun_add_match_id(fun->fnode, match_id_str, 40);
+        if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "Failed adding match ID: %s", str_error(rc));
+        }
+
+        /* TODO add subsys ids, but those exist only in header type 0 */
 }
 
@@ -481 +535 @@
                 for (fnum = 0; multi && fnum < 8; fnum++) {
                         pci_fun_init(fun, bus_num, dnum, fnum);
-                        fun->vendor_id = pci_conf_read_16(fun,
-                            PCI_VENDOR_ID);
-                        fun->device_id = pci_conf_read_16(fun,
-                            PCI_DEVICE_ID);
                         if (fun->vendor_id == 0xffff) {
                                 /*
@@ -511 +561 @@
                         
                         fnode = ddf_fun_create(bus->dnode, fun_inner, fun_name);
+                        free(fun_name);
                         if (fnode == NULL) {
                                 ddf_msg(LVL_ERROR, "Failed creating function.");
@@ -516 +567 @@
                         }
                         
-                        free(fun_name);
                         fun->fnode = fnode;
                         
@@ -691 +741 @@
         fun->dev = dev;
         fun->fn = fn;
+        fun->vendor_id = pci_conf_read_16(fun, PCI_VENDOR_ID);
+        fun->device_id = pci_conf_read_16(fun, PCI_DEVICE_ID);
+        fun->class_code = pci_conf_read_8(fun, PCI_BASE_CLASS);
+        fun->subclass_code = pci_conf_read_8(fun, PCI_SUB_CLASS);
+        fun->prog_if = pci_conf_read_8(fun, PCI_PROG_IF);
+        fun->revision = pci_conf_read_8(fun, PCI_REVISION_ID);
 }
 
@@ -711 +767 @@
 bool pci_alloc_resource_list(pci_fun_t *fun)
 {
-        fun->hw_resources.resources =
-            (hw_resource_t *) malloc(PCI_MAX_HW_RES * sizeof(hw_resource_t));
-        return fun->hw_resources.resources != NULL;
+        fun->hw_resources.resources = fun->resources;
+        return true;
 }
 
 void pci_clean_resource_list(pci_fun_t *fun)
 {
-        if (fun->hw_resources.resources != NULL) {
-                free(fun->hw_resources.resources);
-                fun->hw_resources.resources = NULL;
-        }
+        fun->hw_resources.resources = NULL;
 }
 

uspace/drv/bus/pci/pciintel/pci.h

@@ -60 +60 @@
         int vendor_id;
         int device_id;
+        uint8_t class_code;
+        uint8_t subclass_code;
+        uint8_t prog_if;
+        uint8_t revision;
         hw_resource_list_t hw_resources;
+        hw_resource_t resources[PCI_MAX_HW_RES];
 } pci_fun_t;
 

uspace/lib/drv/generic/driver.c

@@ -970 +970 @@
         
         match_id->id = str_dup(match_id_str);
-        match_id->score = 90;
+        match_id->score = match_score;
         
         add_match_id(&fun->match_ids, match_id);