Changeset 8565a42 in mainline for kernel/arch/riscv64/src

Timestamp:

2018-03-02T20:34:50Z (8 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

a1a81f69, d5e5fd1

Parents:

3061bc1 (diff), 34e1206 (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.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:34:50)

git-committer:

GitHub <noreply@…> (2018-03-02 20:34:50)

Message:

Remove all trailing whitespace, everywhere.

See individual commit messages for details.

Location:

kernel/arch/riscv64/src

Files:

• boot/boot.S (modified) (1 diff)
• context.S (modified) (2 diffs)
• drivers/ucb.c (modified) (3 diffs)
• mm/frame.c (modified) (4 diffs)
• mm/page.c (modified) (3 diffs)
• riscv64.c (modified) (2 diffs)

kernel/arch/riscv64/src/boot/boot.S

@@ -36 +36 @@
         /* Setup temporary stack */
         la sp, temp_stack
-        
+
         /* Create the first stack frame */
         addi sp, sp, -16
-        
+
         /* Call riscv64_pre_main() */
         jal riscv64_pre_main
-        
+
         /* Call main_bsp() */
         jal main_bsp
-        
+
         /* Not reached */
         csrci sstatus, SSTATUS_SIE_MASK

kernel/arch/riscv64/src/context.S

@@ -47 +47 @@
         sd s10, CONTEXT_OFFSET_S10(a0)
         sd s11, CONTEXT_OFFSET_S11(a0)
-        
+
         sd ra, CONTEXT_OFFSET_PC(a0)
         sd sp, CONTEXT_OFFSET_SP(a0)
-        
+
         # context_save returns 1
         li a0, 1
@@ -71 +71 @@
         ld s10, CONTEXT_OFFSET_S10(a0)
         ld s11, CONTEXT_OFFSET_S11(a0)
-        
+
         ld ra, CONTEXT_OFFSET_PC(a0)
         ld sp, CONTEXT_OFFSET_SP(a0)
-        
+
         # context_restore returns 0
         li a0, 0

kernel/arch/riscv64/src/drivers/ucb.c

@@ -53 +53 @@
         if (!val)
                 return;
-        
+
         *fromhost = 0;
 }
@@ -68 +68 @@
         if (!htifdev)
                 return NULL;
-        
+
         outdev_initialize("htifdev", htifdev, &htifdev_ops);
         return htifdev;
@@ -78 +78 @@
             (((uint64_t) cmd) << 48) |
             (payload & UINT64_C(0xffffffffffff));
-        
+
         while (*tohost)
                 poll_fromhost();
-        
+
         *tohost = val;
 }

kernel/arch/riscv64/src/mm/frame.c

@@ -56 +56 @@
         pfn_t minconf =
             max3(ADDR2PFN(physmem_start), htif_frame + 1, pt_frame + 1);
-        
+
         for (size_t i = 0; i < memmap.cnt; i++) {
                 /* To be safe, make the available zone possibly smaller */
@@ -63 +63 @@
                 size_t size = ALIGN_DOWN(memmap.zones[i].size -
                     (base - ((uintptr_t) memmap.zones[i].start)), FRAME_SIZE);
-                
+
                 if (!frame_adjust_zone_bounds(low, &base, &size))
                         return;
-                
+
                 pfn_t pfn = ADDR2PFN(base);
                 size_t count = SIZE2FRAMES(size);
                 pfn_t conf;
-                
+
                 if (low) {
                         if ((minconf < pfn) || (minconf >= pfn + count))
@@ -76 +76 @@
                         else
                                 conf = minconf;
-                        
+
                         zone_create(pfn, count, conf,
                             ZONE_AVAILABLE | ZONE_LOWMEM);
@@ -91 +91 @@
 {
         frame_common_arch_init(true);
-        
+
         frame_mark_unavailable(htif_frame, 1);
         frame_mark_unavailable(pt_frame, 1);

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

@@ -53 +53 @@
         if (config.cpu_active == 1) {
                 page_mapping_operations = &pt_mapping_operations;
-                
+
                 page_table_lock(AS_KERNEL, true);
-                
+
                 /*
                  * PA2KA(identity) mapping for all low-memory frames.
@@ -64 +64 @@
                         page_mapping_insert(AS_KERNEL, PA2KA(cur), cur,
                             PAGE_GLOBAL | PAGE_CACHEABLE | PAGE_EXEC | PAGE_WRITE | PAGE_READ);
-                
+
                 page_table_unlock(AS_KERNEL, true);
-                
+
                 // FIXME: register page fault extension handler
-                
+
                 write_satp((uintptr_t) AS_KERNEL->genarch.page_table);
-                
+
                 /* The boot page table is no longer needed. */
                 // FIXME: frame_mark_available(pt_frame, 1);
@@ -84 +84 @@
         uint64_t satp = ((ptl0 >> FRAME_WIDTH) & SATP_PFN_MASK) |
             SATP_MODE_SV48;
-        
+
         asm volatile (
                 "csrw sptbr, %[satp]\n"

kernel/arch/riscv64/src/riscv64.c

@@ -69 +69 @@
         htif_frame = bootinfo->htif_frame;
         pt_frame = bootinfo->pt_frame;
-        
+
         htif_init(bootinfo->ucbinfo.tohost, bootinfo->ucbinfo.fromhost);
-        
+
         /* Copy tasks map. */
         init.cnt = min3(bootinfo->taskmap.cnt, TASKMAP_MAX_RECORDS,
             CONFIG_INIT_TASKS);
-        
+
         for (size_t i = 0; i < init.cnt; i++) {
                 init.tasks[i].paddr = KA2PA(bootinfo->taskmap.tasks[i].addr);
@@ -82 +82 @@
                     bootinfo->taskmap.tasks[i].name);
         }
-        
+
         /* Copy physical memory map. */
         memmap.total = bootinfo->memmap.total;