Changeset b9f1585 in mainline for uspace

Timestamp:

2019-01-03T06:53:22Z (7 years ago)

Author:

Vojtech Horky <vojtech.horky@…>

Branches:

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

Children:

043d464f

Parents:

b4a4ad94 (diff), 7acd787 (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 upstream changes

Location:

uspace

Files:

• Makefile (modified) (1 diff)
• app/bdsh/cmds/modules/ls/ls.c (modified) (1 diff)
• app/pci/Makefile (added)
• app/pci/doc/doxygroups.h (added)
• app/pci/pci.c (added)
• drv/bus/pci/pciintel/Makefile (modified) (1 diff)
• drv/bus/pci/pciintel/ctl.c (added)
• drv/bus/pci/pciintel/ctl.h (added)
• drv/bus/pci/pciintel/pci.c (modified) (8 diffs)
• drv/bus/pci/pciintel/pci.h (modified) (4 diffs)
• lib/c/Makefile (modified) (1 diff)
• lib/c/generic/io/chargrid.c (modified) (1 diff)
• lib/c/generic/pci.c (added)
• lib/c/include/ipc/pci.h (added)
• lib/c/include/pci.h (added)
• lib/c/include/types/pci.h (added)
• lib/clui/tinput.c (modified) (5 diffs)
• srv/locsrv/locsrv.c (modified) (1 diff)
• srv/vfs/vfs_ops.c (modified) (1 diff)

uspace/Makefile

@@ -67 +67 @@
         app/netecho \
         app/nterm \
+        app/pci \
         app/perf \
         app/redir \

uspace/app/bdsh/cmds/modules/ls/ls.c

@@ -199 +199 @@
 
         /* Populate the directory list. */
-        if (ls.recursive) {
+        if (ls.recursive && nbdirs > 0) {
                 tmp = (struct dir_elem_t *) realloc(*dir_list_ptr,
                     nbdirs * sizeof(struct dir_elem_t));

uspace/drv/bus/pci/pciintel/Makefile

@@ -32 +32 @@
 
 SOURCES = \
+        ctl.c \
         pci.c
 

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

@@ -1 +1 @@
 /*
+ * Copyright (c) 2019 Jiri Svoboda
  * Copyright (c) 2010 Lenka Trochtova
- * Copyright (c) 2018 Jiri Svoboda
  * All rights reserved.
  *
@@ -58 +58 @@
 #include <pci_dev_iface.h>
 
+#include "ctl.h"
 #include "pci.h"
+#include "pci_regs.h"
 
 #define NAME "pciintel"
@@ -73 +75 @@
 
 /** Obtain PCI bus soft-state from DDF device node */
-#if 0
-static pci_bus_t *pci_bus(ddf_dev_t *dnode)
+pci_bus_t *pci_bus(ddf_dev_t *dnode)
 {
         return ddf_dev_data_get(dnode);
 }
-#endif
 
 /** Obtain PCI bus soft-state from function soft-state */
@@ -448 +448 @@
 
         /* TODO add subsys ids, but those exist only in header type 0 */
+}
+
+/** Get first PCI function.
+ *
+ * @param bus PCI bus
+ * @return First PCI function on @a bus or @c NULL if there is none
+ */
+pci_fun_t *pci_fun_first(pci_bus_t *bus)
+{
+        link_t *link;
+
+        link = list_first(&bus->funs);
+        if (link == NULL)
+                return NULL;
+
+        return list_get_instance(link, pci_fun_t, lfuns);
+}
+
+/** Get next PCI function.
+ *
+ * @param cur Current function
+ * @return Next PCI function on the same bus or @c NULL if there is none
+ */
+pci_fun_t *pci_fun_next(pci_fun_t *cur)
+{
+        link_t *link;
+
+        link = list_next(&cur->lfuns, &cur->busptr->funs);
+        if (link == NULL)
+                return NULL;
+
+        return list_get_instance(link, pci_fun_t, lfuns);
 }
 
@@ -691 +723 @@
                                 continue;
                         }
+
+                        list_append(&fun->lfuns, &bus->funs);
                 }
         }
@@ -718 +752 @@
                 goto fail;
         }
+
+        list_initialize(&bus->funs);
         fibril_mutex_initialize(&bus->conf_mutex);
 
@@ -802 +838 @@
         }
 
+        ddf_fun_set_conn_handler(ctl, pci_ctl_connection);
+
         /* Enumerate functions. */
         ddf_msg(LVL_DEBUG, "Enumerating the bus");
@@ -816 +854 @@
         }
 
+        rc = ddf_fun_add_to_category(ctl, "pci");
+        if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "Failed adding control function to category "
+                    "'pci'.");
+                goto fail;
+        }
+
         hw_res_clean_resource_list(&hw_resources);
 

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

@@ -37 +37 @@
 #define PCI_H_
 
+#include <adt/list.h>
+#include <ddi.h>
 #include <ddf/driver.h>
-#include "pci_regs.h"
+#include <fibril_synch.h>
 
 #define PCI_MAX_HW_RES 10
@@ -50 +52 @@
         pio_window_t pio_win;
         fibril_mutex_t conf_mutex;
+        /** List of functions (of pci_fun_t) */
+        list_t funs;
 } pci_bus_t;
 
@@ -55 +59 @@
         pci_bus_t *busptr;
         ddf_fun_t *fnode;
+        /** Link to @c busptr->funs */
+        link_t lfuns;
 
         int bus;
@@ -71 +77 @@
 } pci_fun_t;
 
+extern pci_bus_t *pci_bus(ddf_dev_t *);
+
 extern void pci_fun_create_match_ids(pci_fun_t *);
+extern pci_fun_t *pci_fun_first(pci_bus_t *);
+extern pci_fun_t *pci_fun_next(pci_fun_t *);
 
 extern uint8_t pci_conf_read_8(pci_fun_t *, int);

uspace/lib/c/Makefile

@@ -165 +165 @@
         generic/assert.c \
         generic/bsearch.c \
+        generic/pci.c \
         generic/pio_trace.c \
         generic/qsort.c \

uspace/lib/c/generic/io/chargrid.c

@@ -263 +263 @@
 void chargrid_set_cursor(chargrid_t *scrbuf, sysarg_t col, sysarg_t row)
 {
+        if (col >= scrbuf->cols || row >= scrbuf->rows)
+                return;
+
         scrbuf->col = col;
         scrbuf->row = row;

uspace/lib/clui/tinput.c

@@ -56 +56 @@
 } seek_dir_t;
 
+static void tinput_update_origin(tinput_t *);
 static void tinput_init(tinput_t *);
 static void tinput_insert_string(tinput_t *, const char *);
@@ -71 +72 @@
 static void tinput_console_set_lpos(tinput_t *ti, unsigned lpos)
 {
-        console_set_pos(ti->console, LIN_TO_COL(ti, lpos),
-            LIN_TO_ROW(ti, lpos));
+        unsigned col = LIN_TO_COL(ti, lpos);
+        unsigned row = LIN_TO_ROW(ti, lpos);
+
+        assert(col < ti->con_cols);
+        assert(row < ti->con_rows);
+        console_set_pos(ti->console, col, row);
 }
 
@@ -163 +168 @@
 static void tinput_position_caret(tinput_t *ti)
 {
+        tinput_update_origin(ti);
         tinput_console_set_lpos(ti, ti->text_coord + ti->pos);
 }
@@ -232 +238 @@
 
         tinput_display_tail(ti, ti->pos - 1, 0);
-        tinput_update_origin(ti);
         tinput_position_caret(ti);
 }
@@ -276 +281 @@
 
         tinput_display_tail(ti, ti->pos - ilen, 0);
-        tinput_update_origin(ti);
         tinput_position_caret(ti);
 }

uspace/srv/locsrv/locsrv.c

@@ -1390 +1390 @@
         categ_dir_add_cat(&cdir, cat);
 
+        cat = category_new("pci");
+        categ_dir_add_cat(&cdir, cat);
+
         return true;
 }

uspace/srv/vfs/vfs_ops.c

@@ -892 +892 @@
         rc = vfs_fd_alloc(&file, false, out_fd);
         if (rc != EOK) {
+                fibril_rwlock_read_unlock(&namespace_rwlock);
                 vfs_node_put(node);
                 vfs_file_put(parent);