Changes in / [349e510d:ae49252] in mainline

Files:

• boot/Makefile.common (modified) (2 diffs)
• kernel/Makefile (modified) (1 diff)
• kernel/arch/abs32le/include/mm/page.h (modified) (2 diffs)
• kernel/arch/amd64/include/mm/page.h (modified) (2 diffs)
• kernel/arch/amd64/src/mm/page.c (modified) (1 diff)
• kernel/arch/arm32/include/mm/page.h (modified) (5 diffs)
• kernel/arch/ia32/include/mm/page.h (modified) (2 diffs)
• kernel/arch/ia32/src/mm/page.c (modified) (1 diff)
• kernel/arch/ia32/src/smp/apic.c (modified) (3 diffs)
• kernel/arch/mips32/include/mm/page.h (modified) (2 diffs)
• kernel/arch/ppc32/include/mm/page.h (modified) (2 diffs)
• kernel/arch/sparc64/src/smp/sun4u/ipi.c (modified) (1 diff)
• kernel/genarch/include/mm/page_pt.h (modified) (1 diff)
• kernel/genarch/src/mm/page_ht.c (modified) (2 diffs)
• kernel/genarch/src/mm/page_pt.c (modified) (7 diffs)
• kernel/generic/include/console/prompt.h (added)
• kernel/generic/include/debug.h (modified) (1 diff)
• kernel/generic/include/symtab.h (modified) (1 diff)
• kernel/generic/include/symtab_lookup.h (added)
• kernel/generic/src/console/kconsole.c (modified) (8 diffs)
• kernel/generic/src/console/prompt.c (added)
• kernel/generic/src/debug/symtab.c (modified) (5 diffs)
• kernel/generic/src/mm/as.c (modified) (3 diffs)
• kernel/generic/src/mm/tlb.c (modified) (2 diffs)
• uspace/Makefile (modified) (2 diffs)
• uspace/app/bdsh/cmds/modules/cat/cat.c (modified) (8 diffs)
• uspace/drv/block/ahci/Makefile (added)
• uspace/drv/block/ahci/ahci.c (added)
• uspace/drv/block/ahci/ahci.h (added)
• uspace/drv/block/ahci/ahci.ma (added)
• uspace/drv/block/ahci/ahci_hw.h (added)
• uspace/drv/block/ahci/ahci_sata.h (added)
• uspace/drv/bus/isa/isa.c (modified) (2 diffs)
• uspace/drv/nic/ne2k/dp8390.c (modified) (1 diff)
• uspace/lib/c/Makefile (modified) (1 diff)
• uspace/lib/c/generic/device/ahci.c (added)
• uspace/lib/c/include/device/ahci.h (added)
• uspace/lib/c/include/ipc/dev_iface.h (modified) (1 diff)
• uspace/lib/drv/Makefile (modified) (1 diff)
• uspace/lib/drv/generic/dev_iface.c (modified) (2 diffs)
• uspace/lib/drv/generic/remote_ahci.c (added)
• uspace/lib/drv/include/ahci_iface.h (added)
• uspace/lib/drv/include/remote_ahci.h (added)
• uspace/srv/bd/sata_bd/Makefile (added)
• uspace/srv/bd/sata_bd/sata_bd.c (added)
• uspace/srv/bd/sata_bd/sata_bd.h (added)
• uspace/srv/devman/main.c (modified) (1 diff)
• uspace/srv/hid/console/console.c (modified) (3 diffs)

boot/Makefile.common

@@ -98 +98 @@
         $(USPACE_PATH)/srv/bd/part/guid_part/g_part \
         $(USPACE_PATH)/srv/bd/part/mbr_part/mbr_part \
+        $(USPACE_PATH)/srv/bd/sata_bd/sata_bd \
         $(USPACE_PATH)/srv/clipboard/clipboard \
         $(USPACE_PATH)/srv/fs/tmpfs/tmpfs \
@@ -122 +123 @@
         nic/ne2k \
         nic/e1k \
-        nic/rtl8139
+        nic/rtl8139 \
+        block/ahci
 
 RD_DRV_CFG =

kernel/Makefile

@@ -196 +196 @@
         generic/src/console/chardev.c \
         generic/src/console/console.c \
+        generic/src/console/prompt.c \
         generic/src/cpu/cpu.c \
         generic/src/ddi/ddi.c \

kernel/arch/abs32le/include/mm/page.h

@@ -105 +105 @@
         set_pt_flags((pte_t *) (ptl3), (size_t) (i), (x))
 
+/* Set PTE present bit accessors for each level. */
+#define SET_PTL1_PRESENT_ARCH(ptl0, i)  \
+        set_pt_present((pte_t *) (ptl0), (size_t) (i))
+#define SET_PTL2_PRESENT_ARCH(ptl1, i)
+#define SET_PTL3_PRESENT_ARCH(ptl2, i)
+#define SET_FRAME_PRESENT_ARCH(ptl3, i) \
+        set_pt_present((pte_t *) (ptl3), (size_t) (i))
+
 /* Macros for querying the last level entries. */
 #define PTE_VALID_ARCH(p) \
@@ -173 +181 @@
 }
 
+NO_TRACE static inline void set_pt_present(pte_t *pt, size_t i)
+    WRITES(ARRAY_RANGE(pt, PTL0_ENTRIES_ARCH))
+    REQUIRES_ARRAY_MUTABLE(pt, PTL0_ENTRIES_ARCH)
+{
+        pte_t *p = &pt[i];
+
+        p->present = 1;
+}
+
 extern void page_arch_init(void);
 extern void page_fault(unsigned int, istate_t *);

kernel/arch/amd64/include/mm/page.h

@@ -119 +119 @@
         set_pt_flags((pte_t *) (ptl3), (size_t) (i), (x))
 
+/* Set PTE present bit accessors for each level. */
+#define SET_PTL1_PRESENT_ARCH(ptl0, i) \
+        set_pt_present((pte_t *) (ptl0), (size_t) (i))
+#define SET_PTL2_PRESENT_ARCH(ptl1, i) \
+        set_pt_present((pte_t *) (ptl1), (size_t) (i))
+#define SET_PTL3_PRESENT_ARCH(ptl2, i) \
+        set_pt_present((pte_t *) (ptl2), (size_t) (i))
+#define SET_FRAME_PRESENT_ARCH(ptl3, i) \
+        set_pt_present((pte_t *) (ptl3), (size_t) (i))
+
 /* Macros for querying the last-level PTE entries. */
 #define PTE_VALID_ARCH(p) \
@@ -215 +225 @@
 }
 
+NO_TRACE static inline void set_pt_present(pte_t *pt, size_t i)
+{
+        pte_t *p = &pt[i];
+
+        p->present = 1;
+}
+
 extern void page_arch_init(void);
 extern void page_fault(unsigned int, istate_t *);

kernel/arch/amd64/src/mm/page.c

@@ -57 +57 @@
         uintptr_t cur;
         unsigned int identity_flags =
-            PAGE_CACHEABLE | PAGE_EXEC | PAGE_GLOBAL | PAGE_WRITE;
+            PAGE_GLOBAL | PAGE_CACHEABLE | PAGE_EXEC | PAGE_WRITE | PAGE_READ;
                 
         page_mapping_operations = &pt_mapping_operations;

kernel/arch/arm32/include/mm/page.h

@@ -40 +40 @@
 #include <mm/mm.h>
 #include <arch/exception.h>
+#include <arch/barrier.h>
 #include <trace.h>
 
@@ -109 +110 @@
 #define SET_FRAME_FLAGS_ARCH(ptl3, i, x) \
         set_pt_level1_flags((pte_t *) (ptl3), (size_t) (i), (x))
+
+/* Set PTE present bit accessors for each level. */
+#define SET_PTL1_PRESENT_ARCH(ptl0, i) \
+        set_pt_level0_present((pte_t *) (ptl0), (size_t) (i))
+#define SET_PTL2_PRESENT_ARCH(ptl1, i)
+#define SET_PTL3_PRESENT_ARCH(ptl2, i)
+#define SET_FRAME_PRESENT_ARCH(ptl3, i) \
+        set_pt_level1_present((pte_t *) (ptl3), (size_t) (i))
 
 /* Macros for querying the last-level PTE entries. */
@@ -267 +276 @@
 }
 
+NO_TRACE static inline void set_pt_level0_present(pte_t *pt, size_t i)
+{
+        pte_level0_t *p = &pt[i].l0;
+
+        p->should_be_zero = 0;
+        write_barrier();
+        p->descriptor_type = PTE_DESCRIPTOR_COARSE_TABLE;
+}
 
 /** Sets flags of level 1 page table entry.
@@ -283 +300 @@
         pte_level1_t *p = &pt[i].l1;
         
-        if (flags & PAGE_NOT_PRESENT) {
+        if (flags & PAGE_NOT_PRESENT)
                 p->descriptor_type = PTE_DESCRIPTOR_NOT_PRESENT;
-                p->access_permission_3 = 1;
-        } else {
+        else
                 p->descriptor_type = PTE_DESCRIPTOR_SMALL_PAGE;
-                p->access_permission_3 = p->access_permission_0;
-        }
         
         p->cacheable = p->bufferable = (flags & PAGE_CACHEABLE) != 0;
@@ -312 +326 @@
 }
 
-
+NO_TRACE static inline void set_pt_level1_present(pte_t *pt, size_t i)
+{
+        pte_level1_t *p = &pt[i].l1;
+
+        p->descriptor_type = PTE_DESCRIPTOR_SMALL_PAGE;
+}
+        
 extern void page_arch_init(void);
 
-
 #endif /* __ASM__ */
 

kernel/arch/ia32/include/mm/page.h

@@ -115 +115 @@
         set_pt_flags((pte_t *) (ptl3), (size_t) (i), (x))
 
+/* Set PTE present bit accessors for each level. */
+#define SET_PTL1_PRESENT_ARCH(ptl0, i) \
+        set_pt_present((pte_t *) (ptl0), (size_t) (i))
+#define SET_PTL2_PRESENT_ARCH(ptl1, i)
+#define SET_PTL3_PRESENT_ARCH(ptl2, i)
+#define SET_FRAME_PRESENT_ARCH(ptl3, i) \
+        set_pt_present((pte_t *) (ptl3), (size_t) (i))
+
 /* Macros for querying the last level entries. */
 #define PTE_VALID_ARCH(p) \
@@ -194 +202 @@
 }
 
+NO_TRACE static inline void set_pt_present(pte_t *pt, size_t i)
+{
+        pte_t *p = &pt[i];
+
+        p->present = 1;
+}
+
 extern void page_arch_init(void);
 extern void page_fault(unsigned int, istate_t *);

kernel/arch/ia32/src/mm/page.c

@@ -71 +71 @@
         for (cur = 0; cur < min(config.identity_size, config.physmem_end);
             cur += FRAME_SIZE) {
-                flags = PAGE_CACHEABLE | PAGE_WRITE;
-                if ((PA2KA(cur) >= config.base) &&
-                    (PA2KA(cur) < config.base + config.kernel_size))
-                        flags |= PAGE_GLOBAL;
+                flags = PAGE_GLOBAL | PAGE_CACHEABLE | PAGE_WRITE | PAGE_READ;
                 page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, flags);
         }

kernel/arch/ia32/src/smp/apic.c

@@ -259 +259 @@
 }
 
+#define DELIVS_PENDING_SILENT_RETRIES   4       
+
+static void l_apic_wait_for_delivery(void)
+{
+        icr_t icr;
+        unsigned retries = 0;
+
+        do {
+                if (retries++ > DELIVS_PENDING_SILENT_RETRIES) {
+                        retries = 0;
+#ifdef CONFIG_DEBUG
+                        printf("IPI is pending.\n");
+#endif
+                        delay(20);
+                }
+                icr.lo = l_apic[ICRlo];
+        } while (icr.delivs == DELIVS_PENDING);
+        
+}
+
 /** Send all CPUs excluding CPU IPI vector.
  *
@@ -279 +299 @@
         
         l_apic[ICRlo] = icr.lo;
-        
-        icr.lo = l_apic[ICRlo];
-        if (icr.delivs == DELIVS_PENDING) {
-#ifdef CONFIG_DEBUG
-                printf("IPI is pending.\n");
-#endif
-        }
+
+        l_apic_wait_for_delivery();
         
         return apic_poll_errors();
@@ -327 +342 @@
                 return 0;
         
+        l_apic_wait_for_delivery();
+
         icr.lo = l_apic[ICRlo];
-        if (icr.delivs == DELIVS_PENDING) {
-#ifdef CONFIG_DEBUG
-                printf("IPI is pending.\n");
-#endif
-        }
-        
         icr.delmod = DELMOD_INIT;
         icr.destmod = DESTMOD_PHYS;

kernel/arch/mips32/include/mm/page.h

@@ -128 +128 @@
         set_pt_flags((pte_t *) (ptl3), (size_t) (i), (x))
 
+/* Set PTE present bit accessors for each level. */
+#define SET_PTL1_PRESENT_ARCH(ptl0, i) \
+        set_pt_present((pte_t *) (ptl0), (size_t) (i))
+#define SET_PTL2_PRESENT_ARCH(ptl1, i)
+#define SET_PTL3_PRESENT_ARCH(ptl2, i)
+#define SET_FRAME_PRESENT_ARCH(ptl3, i) \
+        set_pt_present((pte_t *) (ptl3), (size_t) (i))
+
 /* Last-level info macros. */
 #define PTE_VALID_ARCH(pte)                     (*((uint32_t *) (pte)) != 0)
@@ -182 +190 @@
 }
 
+NO_TRACE static inline void set_pt_present(pte_t *pt, size_t i)
+{
+        pte_t *p = &pt[i];
+
+        p->p = 1;
+}
+        
+
 extern void page_arch_init(void);
 

kernel/arch/ppc32/include/mm/page.h

@@ -128 +128 @@
 #define SET_FRAME_FLAGS_ARCH(ptl3, i, x) \
         set_pt_flags((pte_t *) (ptl3), (size_t) (i), (x))
+
+/* Set PTE present accessors for each level. */
+#define SET_PTL1_PRESENT_ARCH(ptl0, i) \
+        set_pt_present((pte_t *) (ptl0), (size_t) (i))
+
+#define SET_PTL2_PRESENT_ARCH(ptl1, i)
+#define SET_PTL3_PRESENT_ARCH(ptl2, i)
+
+#define SET_FRAME_PRESENT_ARCH(ptl3, i) \
+        set_pt_present((pte_t *) (ptl3), (size_t) (i))
 
 /* Macros for querying the last-level PTEs. */
@@ -175 +185 @@
 }
 
+NO_TRACE static inline void set_pt_present(pte_t *pt, size_t i)
+{
+        pte_t *entry = &pt[i];
+
+        entry->present = 1;
+}
+
 extern void page_arch_init(void);
 

kernel/arch/sparc64/src/smp/sun4u/ipi.c

@@ -124 +124 @@
                         (void) interrupts_disable();
                 }
-        } while (done);
+        } while (!done);
         
         preemption_enable();

kernel/genarch/include/mm/page_pt.h

@@ -115 +115 @@
 
 /*
+ * These macros are provided to set the present bit within the page tables.
+ *
+ */
+#define SET_PTL1_PRESENT(ptl0, i)   SET_PTL1_PRESENT_ARCH(ptl0, i)
+#define SET_PTL2_PRESENT(ptl1, i)   SET_PTL2_PRESENT_ARCH(ptl1, i)
+#define SET_PTL3_PRESENT(ptl2, i)   SET_PTL3_PRESENT_ARCH(ptl2, i)
+#define SET_FRAME_PRESENT(ptl3, i)  SET_FRAME_PRESENT_ARCH(ptl3, i)
+
+/*
  * Macros for querying the last-level PTEs.
  *

kernel/genarch/src/mm/page_ht.c

@@ -45 +45 @@
 #include <typedefs.h>
 #include <arch/asm.h>
+#include <arch/barrier.h>
 #include <synch/spinlock.h>
 #include <arch.h>
@@ -207 +208 @@
                 pte->page = ALIGN_DOWN(page, PAGE_SIZE);
                 pte->frame = ALIGN_DOWN(frame, FRAME_SIZE);
+
+                write_barrier();
                 
                 hash_table_insert(&page_ht, key, &pte->link);

kernel/genarch/src/mm/page_pt.c

@@ -43 +43 @@
 #include <arch/mm/page.h>
 #include <arch/mm/as.h>
+#include <arch/barrier.h>
 #include <typedefs.h>
 #include <arch/asm.h>
@@ -86 +87 @@
                 SET_PTL1_ADDRESS(ptl0, PTL0_INDEX(page), KA2PA(newpt));
                 SET_PTL1_FLAGS(ptl0, PTL0_INDEX(page),
-                    PAGE_PRESENT | PAGE_USER | PAGE_EXEC | PAGE_CACHEABLE |
+                    PAGE_NOT_PRESENT | PAGE_USER | PAGE_EXEC | PAGE_CACHEABLE |
                     PAGE_WRITE);
+                write_barrier();
+                SET_PTL1_PRESENT(ptl0, PTL0_INDEX(page));
         }
         
@@ -98 +101 @@
                 SET_PTL2_ADDRESS(ptl1, PTL1_INDEX(page), KA2PA(newpt));
                 SET_PTL2_FLAGS(ptl1, PTL1_INDEX(page),
-                    PAGE_PRESENT | PAGE_USER | PAGE_EXEC | PAGE_CACHEABLE |
+                    PAGE_NOT_PRESENT | PAGE_USER | PAGE_EXEC | PAGE_CACHEABLE |
                     PAGE_WRITE);
+                write_barrier();
+                SET_PTL2_PRESENT(ptl1, PTL1_INDEX(page));       
         }
         
@@ -110 +115 @@
                 SET_PTL3_ADDRESS(ptl2, PTL2_INDEX(page), KA2PA(newpt));
                 SET_PTL3_FLAGS(ptl2, PTL2_INDEX(page),
-                    PAGE_PRESENT | PAGE_USER | PAGE_EXEC | PAGE_CACHEABLE |
+                    PAGE_NOT_PRESENT | PAGE_USER | PAGE_EXEC | PAGE_CACHEABLE |
                     PAGE_WRITE);
+                write_barrier();
+                SET_PTL3_PRESENT(ptl2, PTL2_INDEX(page));
         }
         
@@ -117 +124 @@
         
         SET_FRAME_ADDRESS(ptl3, PTL3_INDEX(page), frame);
-        SET_FRAME_FLAGS(ptl3, PTL3_INDEX(page), flags);
+        SET_FRAME_FLAGS(ptl3, PTL3_INDEX(page), flags | PAGE_NOT_PRESENT);
+        write_barrier();
+        SET_FRAME_PRESENT(ptl3, PTL3_INDEX(page));
 }
 
@@ -279 +288 @@
         if (GET_PTL1_FLAGS(ptl0, PTL0_INDEX(page)) & PAGE_NOT_PRESENT)
                 return NULL;
+
+        read_barrier();
         
         pte_t *ptl1 = (pte_t *) PA2KA(GET_PTL1_ADDRESS(ptl0, PTL0_INDEX(page)));
         if (GET_PTL2_FLAGS(ptl1, PTL1_INDEX(page)) & PAGE_NOT_PRESENT)
                 return NULL;
+
+#if (PTL1_ENTRIES != 0)
+        read_barrier();
+#endif
         
         pte_t *ptl2 = (pte_t *) PA2KA(GET_PTL2_ADDRESS(ptl1, PTL1_INDEX(page)));
         if (GET_PTL3_FLAGS(ptl2, PTL2_INDEX(page)) & PAGE_NOT_PRESENT)
                 return NULL;
+
+#if (PTL2_ENTRIES != 0)
+        read_barrier();
+#endif
         
         pte_t *ptl3 = (pte_t *) PA2KA(GET_PTL3_ADDRESS(ptl2, PTL2_INDEX(page)));
@@ -346 +365 @@
                 SET_PTL1_ADDRESS(ptl0, PTL0_INDEX(addr), KA2PA(l1));
                 SET_PTL1_FLAGS(ptl0, PTL0_INDEX(addr),
-                    PAGE_PRESENT | PAGE_USER | PAGE_EXEC | PAGE_CACHEABLE |
-                    PAGE_WRITE);
+                    PAGE_PRESENT | PAGE_USER | PAGE_CACHEABLE |
+                    PAGE_EXEC | PAGE_WRITE | PAGE_READ);
         }
 }

kernel/generic/include/debug.h

@@ -37 +37 @@
 
 #include <panic.h>
-#include <symtab.h>
+#include <symtab_lookup.h>
 
 #define CALLER  ((uintptr_t) __builtin_return_address(0))

kernel/generic/include/symtab.h

@@ -36 +36 @@
 #define KERN_SYMTAB_H_
 
-#include <typedefs.h>
+#include <symtab_lookup.h>
+#include <console/chardev.h>
 
-#define MAX_SYMBOL_NAME  64
-
-struct symtab_entry {
-        uint64_t address_le;
-        char symbol_name[MAX_SYMBOL_NAME];
-};
-
-extern int symtab_name_lookup(uintptr_t, const char **, uintptr_t *);
-extern const char *symtab_fmt_name_lookup(uintptr_t);
-extern int symtab_addr_lookup(const char *, uintptr_t *);
 extern void symtab_print_search(const char *);
-extern int symtab_compl(char *, size_t);
-
-#ifdef CONFIG_SYMTAB
-
-/** Symtable linked together by build process
- *
- */
-extern struct symtab_entry symbol_table[];
-
-#endif /* CONFIG_SYMTAB */
+extern int symtab_compl(char *, size_t, indev_t *);
 
 #endif

kernel/generic/src/console/kconsole.c

@@ -43 +43 @@
 #include <console/chardev.h>
 #include <console/cmd.h>
+#include <console/prompt.h>
 #include <print.h>
 #include <panic.h>
@@ -201 +202 @@
  *
  */
-NO_TRACE static int cmdtab_compl(char *input, size_t size)
+NO_TRACE static int cmdtab_compl(char *input, size_t size, indev_t *indev)
 {
         const char *name = input;
         
         size_t found = 0;
+        
+        /*
+         * Maximum Match Length: Length of longest matching common
+         * substring in case more than one match is found.
+         */
+        size_t max_match_len = size;
+        size_t max_match_len_tmp = size;
+        size_t input_len = str_length(input);
         link_t *pos = NULL;
         const char *hint;
         char *output = malloc(MAX_CMDLINE, 0);
+        size_t hints_to_show = MAX_TAB_HINTS - 1;
+        size_t total_hints_shown = 0;
+        bool continue_showing_hints = true;
         
         output[0] = 0;
@@ -218 +230 @@
                 pos = pos->next;
                 found++;
+        }
+        
+        /*
+         * If the number of possible completions is more than MAX_TAB_HINTS,
+         * ask the user whether to display them or not.
+         */
+        if (found > MAX_TAB_HINTS) {
+                printf("\n");
+                continue_showing_hints =
+                    console_prompt_display_all_hints(indev, found);
         }
         
@@ -225 +247 @@
                 while (cmdtab_search_one(name, &pos)) {
                         cmd_info_t *hlp = list_get_instance(pos, cmd_info_t, link);
-                        printf("%s (%s)\n", hlp->name, hlp->description);
+                        
+                        if (continue_showing_hints) {
+                                printf("%s (%s)\n", hlp->name, hlp->description);
+                                --hints_to_show;
+                                ++total_hints_shown;
+                                
+                                if ((hints_to_show == 0) && (total_hints_shown != found)) {
+                                        /* Ask user to continue */
+                                        continue_showing_hints =
+                                            console_prompt_more_hints(indev, &hints_to_show);
+                                }
+                        }
+                        
                         pos = pos->next;
-                }
+                        
+                        for (max_match_len_tmp = 0;
+                            (output[max_match_len_tmp] ==
+                            hlp->name[input_len + max_match_len_tmp]) &&
+                            (max_match_len_tmp < max_match_len); ++max_match_len_tmp);
+                        
+                        max_match_len = max_match_len_tmp;
+                }
+                
+                /* Keep only the characters common in all completions */
+                output[max_match_len] = 0;
         }
         
@@ -280 +324 @@
                                 continue;
                         
-                        /* Find the beginning of the word
-                           and copy it to tmp */
+                        /*
+                         * Find the beginning of the word
+                         * and copy it to tmp
+                         */
                         size_t beg;
                         for (beg = position - 1; (beg > 0) && (!isspace(current[beg]));
@@ -294 +340 @@
                         if (beg == 0) {
                                 /* Command completion */
-                                found = cmdtab_compl(tmp, STR_BOUNDS(MAX_CMDLINE));
+                                found = cmdtab_compl(tmp, STR_BOUNDS(MAX_CMDLINE), indev);
                         } else {
                                 /* Symbol completion */
-                                found = symtab_compl(tmp, STR_BOUNDS(MAX_CMDLINE));
+                                found = symtab_compl(tmp, STR_BOUNDS(MAX_CMDLINE), indev);
                         }
                         
                         if (found == 0)
                                 continue;
-                        
-                        if (found > 1) {
-                                /* No unique hint, list was printed */
-                                printf("%s> ", prompt);
-                                printf("%ls", current);
-                                print_cc('\b', wstr_length(current) - position);
-                                continue;
-                        }
-                        
-                        /* We have a hint */
-                        
+
+                        /*
+                         * We have hints, possibly many. In case of more than one hint,
+                         * tmp will contain the common prefix.
+                         */
                         size_t off = 0;
                         size_t i = 0;
@@ -318 +358 @@
                                 if (!wstr_linsert(current, ch, position + i, MAX_CMDLINE))
                                         break;
+                                
                                 i++;
                         }
+                        
+                        if (found > 1) {
+                                /* No unique hint, list was printed */
+                                printf("%s> ", prompt);
+                                printf("%ls", current);
+                                position += str_length(tmp);
+                                print_cc('\b', wstr_length(current) - position);
+                                continue;
+                        }
+                        
+                        /* We have a hint */
                         
                         printf("%ls", current + position);
@@ -540 +592 @@
 /** Parse command line.
  *
- * @param cmdline Command line as read from input device. 
+ * @param cmdline Command line as read from input device.
  * @param size    Size (in bytes) of the string.
  *

kernel/generic/src/debug/symtab.c

@@ -43 +43 @@
 #include <typedefs.h>
 #include <errno.h>
+#include <console/prompt.h>
 
 /** Get name of a symbol that seems most likely to correspond to address.
@@ -209 +210 @@
  *
  */
-int symtab_compl(char *input, size_t size)
+int symtab_compl(char *input, size_t size, indev_t *indev)
 {
 #ifdef CONFIG_SYMTAB
@@ -227 +228 @@
         char output[MAX_SYMBOL_NAME];
         
+        /*
+         * Maximum Match Length: Length of longest matching common substring in
+         * case more than one match is found.
+         */
+        size_t max_match_len = size;
+        size_t max_match_len_tmp = size;
+        size_t input_len = str_length(input);
+        char *sym_name;
+        size_t hints_to_show = MAX_TAB_HINTS - 1;
+        size_t total_hints_shown = 0;
+        bool continue_showing_hints = true;
+        
         output[0] = 0;
+        
+        while ((hint = symtab_search_one(name, &pos)))
+                pos++;
+        
+        pos = 0;
         
         while ((hint = symtab_search_one(name, &pos))) {
@@ -235 +253 @@
                 pos++;
                 found++;
+        }
+        
+        /*
+         * If the number of possible completions is more than MAX_TAB_HINTS,
+         * ask the user whether to display them or not.
+         */
+        if (found > MAX_TAB_HINTS) {
+                printf("\n");
+                continue_showing_hints =
+                    console_prompt_display_all_hints(indev, found);
         }
         
@@ -241 +269 @@
                 pos = 0;
                 while (symtab_search_one(name, &pos)) {
-                        printf("%s\n", symbol_table[pos].symbol_name);
+                        sym_name = symbol_table[pos].symbol_name;
                         pos++;
+                        
+                        if (continue_showing_hints) {
+                                /* We are still showing hints */
+                                printf("%s\n", sym_name);
+                                --hints_to_show;
+                                ++total_hints_shown;
+                                
+                                if ((hints_to_show == 0) && (total_hints_shown != found)) {
+                                        /* Ask the user to continue */
+                                        continue_showing_hints =
+                                            console_prompt_more_hints(indev, &hints_to_show);
+                                }
+                        }
+                        
+                        for (max_match_len_tmp = 0;
+                            (output[max_match_len_tmp] ==
+                            sym_name[input_len + max_match_len_tmp]) &&
+                            (max_match_len_tmp < max_match_len); ++max_match_len_tmp);
+                        
+                        max_match_len = max_match_len_tmp;
                 }
+                
+                /* Keep only the characters common in all completions */
+                output[max_match_len] = 0;
         }
         

kernel/generic/src/mm/as.c

@@ -665 +665 @@
                 
                 page_table_lock(as, false);
-                
-                /*
-                 * Start TLB shootdown sequence.
-                 */
-                ipl_t ipl = tlb_shootdown_start(TLB_INVL_PAGES, as->asid,
-                    area->base + P2SZ(pages), area->pages - pages);
                 
                 /*
@@ -726 +720 @@
                                 }
                                 
+                                /*
+                                 * Start TLB shootdown sequence.
+                                 *
+                                 * The sequence is rather short and can be
+                                 * repeated multiple times. The reason is that
+                                 * we don't want to have used_space_remove()
+                                 * inside the sequence as it may use a blocking
+                                 * memory allocation for its B+tree. Blocking
+                                 * while holding the tlblock spinlock is
+                                 * forbidden and would hit a kernel assertion.
+                                 */
+
+                                ipl_t ipl = tlb_shootdown_start(TLB_INVL_PAGES,
+                                    as->asid, area->base + P2SZ(pages),
+                                    area->pages - pages);
+                
                                 for (; i < size; i++) {
                                         pte_t *pte = page_mapping_find(as,
@@ -743 +753 @@
                                         page_mapping_remove(as, ptr + P2SZ(i));
                                 }
+                
+                                /*
+                                 * Finish TLB shootdown sequence.
+                                 */
+                
+                                tlb_invalidate_pages(as->asid,
+                                    area->base + P2SZ(pages),
+                                    area->pages - pages);
+                
+                                /*
+                                 * Invalidate software translation caches
+                                 * (e.g. TSB on sparc64, PHT on ppc32).
+                                 */
+                                as_invalidate_translation_cache(as,
+                                    area->base + P2SZ(pages),
+                                    area->pages - pages);
+                                tlb_shootdown_finalize(ipl);
                         }
                 }
-                
-                /*
-                 * Finish TLB shootdown sequence.
-                 */
-                
-                tlb_invalidate_pages(as->asid, area->base + P2SZ(pages),
-                    area->pages - pages);
-                
-                /*
-                 * Invalidate software translation caches
-                 * (e.g. TSB on sparc64, PHT on ppc32).
-                 */
-                as_invalidate_translation_cache(as, area->base + P2SZ(pages),
-                    area->pages - pages);
-                tlb_shootdown_finalize(ipl);
-                
                 page_table_unlock(as, false);
         } else {

kernel/generic/src/mm/tlb.c

@@ -162 +162 @@
         
         size_t i;
-        for (i = 0; i < CPU->tlb_messages_count; CPU->tlb_messages_count--) {
+        for (i = 0; i < CPU->tlb_messages_count; i++) {
                 tlb_invalidate_type_t type = CPU->tlb_messages[i].type;
                 asid_t asid = CPU->tlb_messages[i].asid;
@@ -188 +188 @@
         }
         
+        CPU->tlb_messages_count = 0;
         irq_spinlock_unlock(&CPU->lock, false);
         CPU->tlb_active = true;

uspace/Makefile

@@ -86 +86 @@
         srv/vfs \
         srv/bd/ata_bd \
+        srv/bd/sata_bd \
         srv/bd/file_bd \
         srv/bd/gxe_bd \
@@ -106 +107 @@
         drv/infrastructure/root \
         drv/infrastructure/rootvirt \
+        drv/block/ahci \
         drv/char/i8042 \
         drv/char/ps2mouse \

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

@@ -62 +62 @@
 static sysarg_t console_rows = 0;
 static bool should_quit = false;
+static bool dash_represents_stdin = false;
 
 static console_ctrl_t *console = NULL;
@@ -73 +74 @@
         { "more", no_argument, 0, 'm' },
         { "hex", no_argument, 0, 'x' },
+        { "stdin", no_argument, 0, 's' },
         { 0, 0, 0, 0 }
 };
@@ -93 +95 @@
                 "  -m, --more       Pause after each screen full\n"
                 "  -x, --hex        Print bytes as hex values\n"
+                "  -s  --stdin      Treat `-' in file list as standard input\n"
                 "Currently, %s is under development, some options don't work.\n",
                 cmdname, cmdname);
@@ -172 +175 @@
         off64_t file_size = 0, length = 0;
 
-        fd = open(fname, O_RDONLY);
+        bool reading_stdin = dash_represents_stdin && (str_cmp(fname, "-") == 0);
+        
+        if (reading_stdin) {
+                fd = fileno(stdin);
+                /* Allow storing the whole UTF-8 character. */
+                blen = STR_BOUNDS(1);
+        } else
+                fd = open(fname, O_RDONLY);
+        
         if (fd < 0) {
                 printf("Unable to open %s\n", fname);
@@ -207 +218 @@
 
         do {
-                bytes = read(fd, buff + copied_bytes, (
-                        (length != CAT_FULL_FILE && length - (off64_t)count <= (off64_t)(blen - copied_bytes)) ?
-                        (size_t)(length - count) :
-                        (blen - copied_bytes) ) );
+                size_t bytes_to_read;
+                if (reading_stdin) {
+                        bytes_to_read = 1;
+                } else {
+                        if ((length != CAT_FULL_FILE) &&
+                            (length - (off64_t)count <= (off64_t)(blen - copied_bytes))) {
+                                bytes_to_read = (size_t) (length - count);
+                        } else {
+                                bytes_to_read = blen - copied_bytes;
+                        }
+                }
+                
+                bytes = read(fd, buff + copied_bytes, bytes_to_read);
                 bytes += copied_bytes;
                 copied_bytes = 0;
@@ -242 +262 @@
                         reads++;
                 }
+                
+                if (reading_stdin)
+                        fflush(stdout);
         } while (bytes > 0 && !should_quit && (count < length || length == CAT_FULL_FILE));
 
@@ -284 +307 @@
 
         for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
-                c = getopt_long(argc, argv, "xhvmH:t:b:", long_options, &opt_ind);
+                c = getopt_long(argc, argv, "xhvmH:t:b:s", long_options, &opt_ind);
                 switch (c) {
                 case 'h':
@@ -318 +341 @@
                         hex = true;
                         break;
+                case 's':
+                        dash_represents_stdin = true;
+                        break;
                 }
         }

uspace/drv/bus/isa/isa.c

@@ -201 +201 @@
 
         isa_fun_t *fun = ddf_fun_data_alloc(fnode, sizeof(isa_fun_t));
-        if (fun == NULL)
+        if (fun == NULL) {
+                ddf_fun_destroy(fnode);
                 return NULL;
+        }
 
         fibril_mutex_initialize(&fun->mutex);
@@ -552 +554 @@
 
         isa_fun_t *fun = isa_fun_create(isa, fun_name);
+        free(fun_name);
         if (fun == NULL) {
-                free(fun_name);
                 return NULL;
         }

uspace/drv/nic/ne2k/dp8390.c

@@ -201 +201 @@
         /* Check if the DP8390 is really there */
         uint8_t val = pio_read_8(ne2k->port + DP_CR);
-        if ((val & (CR_STP | CR_DM_ABORT)) != (CR_STP | CR_DM_ABORT))
+        if ((val & (CR_STP | CR_TXP | CR_DM_ABORT)) != (CR_STP | CR_DM_ABORT))
                 return EXDEV;
         

uspace/lib/c/Makefile

@@ -71 +71 @@
         generic/device/nic.c \
         generic/device/pci.c \
+        generic/device/ahci.c \
         generic/elf/elf_load.c \
         generic/event.c \

uspace/lib/c/include/ipc/dev_iface.h

@@ -51 +51 @@
         /** Interface provided by USB HID devices. */
         USBHID_DEV_IFACE,
+        /** Interface provided by AHCI devices. */
+        AHCI_DEV_IFACE,
 
         DEV_IFACE_MAX

uspace/lib/drv/Makefile

@@ -44 +44 @@
         generic/remote_pci.c \
         generic/remote_usbhc.c \
-        generic/remote_usbhid.c
+        generic/remote_usbhid.c \
+        generic/remote_ahci.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/lib/drv/generic/dev_iface.c

@@ -46 +46 @@
 #include "remote_usbhid.h"
 #include "remote_pci.h"
+#include "remote_ahci.h"
 
 static iface_dipatch_table_t remote_ifaces = {
@@ -55 +56 @@
                 &remote_usb_iface,
                 &remote_usbhc_iface,
-                &remote_usbhid_iface
+                &remote_usbhid_iface,
+                &remote_ahci_iface
         }
 };

uspace/srv/devman/main.c

@@ -419 +419 @@
         
         /* Check that function with same name is not there already. */
-        if (find_fun_node_in_device(tree, pdev, fun_name) != NULL) {
+        fun_node_t *tfun = find_fun_node_in_device(tree, pdev, fun_name);
+        if (tfun) {
+                fun_del_ref(tfun);      /* drop the new unwanted reference */
                 fibril_rwlock_write_unlock(&tree->rwlock);
                 dev_del_ref(pdev);

uspace/srv/hid/console/console.c

@@ -76 +76 @@
 } console_state_t;
 
+#define UTF8_CHAR_BUFFER_SIZE (STR_BOUNDS(1) + 1)
+
 typedef struct {
         atomic_t refcnt;           /**< Connection reference count */
         prodcons_t input_pc;       /**< Incoming keyboard events */
+        char char_remains[UTF8_CHAR_BUFFER_SIZE]; /**< Not yet sent bytes of last char event. */
+        size_t char_remains_len;   /**< Number of not yet sent bytes. */
         
         fibril_mutex_t mtx;        /**< Lock protecting mutable fields */
@@ -613 +617 @@
         
         size_t pos = 0;
+        
+        /*
+         * Read input from keyboard and copy it to the buffer.
+         * We need to handle situation when wchar is split by 2 following
+         * reads.
+         */
         while (pos < size) {
-                link_t *link = prodcons_consume(&cons->input_pc);
-                kbd_event_t *event = list_get_instance(link, kbd_event_t, link);
-                
-                if (event->type == KEY_PRESS) {
-                        buf[pos] = event->c;
+                /* Copy to the buffer remaining characters. */
+                while ((pos < size) && (cons->char_remains_len > 0)) {
+                        buf[pos] = cons->char_remains[0];
                         pos++;
-                }
-                
-                free(event);
+                        
+                        /* Unshift the array. */
+                        for (size_t i = 1; i < cons->char_remains_len; i++)
+                                cons->char_remains[i - 1] = cons->char_remains[i];
+                        
+                        cons->char_remains_len--;
+                }
+                
+                /* Still not enough? Then get another key from the queue. */
+                if (pos < size) {
+                        link_t *link = prodcons_consume(&cons->input_pc);
+                        kbd_event_t *event = list_get_instance(link, kbd_event_t, link);
+                        
+                        /* Accept key presses of printable chars only. */
+                        if ((event->type == KEY_PRESS) && (event->c != 0)) {
+                                wchar_t tmp[2] = { event->c, 0 };
+                                wstr_to_str(cons->char_remains, UTF8_CHAR_BUFFER_SIZE, tmp);
+                                cons->char_remains_len = str_size(cons->char_remains);
+                        }
+                        
+                        free(event);
+                }
         }
         
@@ -930 +957 @@
                 fibril_mutex_initialize(&consoles[i].mtx);
                 prodcons_initialize(&consoles[i].input_pc);
+                consoles[i].char_remains_len = 0;
                 
                 if (graphics_state == GRAPHICS_FULL) {