Changeset 8565a42 in mainline for kernel/arch/mips32/src/mm

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/mips32/src/mm

Files:

• frame.c (modified) (14 diffs)
• tlb.c (modified) (9 diffs)

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

@@ -82 +82 @@
         if (frame == (KA2PA(MSIM_VIDEORAM) >> ZERO_PAGE_WIDTH))
                 return false;
-        
+
         /* MSIM device (dkeyboard) */
         if (frame == (KA2PA(MSIM_KBD_ADDRESS) >> ZERO_PAGE_WIDTH))
@@ -92 +92 @@
                 return false;
 #endif
-        
+
         return true;
 }
@@ -108 +108 @@
         if ((frame << ZERO_PAGE_WIDTH) < KA2PA(config.base))
                 return false;
-        
+
         /* Kernel */
         if (overlaps(frame << ZERO_PAGE_WIDTH, ZERO_PAGE_SIZE,
             KA2PA(config.base), config.kernel_size))
                 return false;
-        
+
         /* Kernel stack */
         if (overlaps(frame << ZERO_PAGE_WIDTH, ZERO_PAGE_SIZE,
             KA2PA(config.stack_base), config.stack_size))
                 return false;
-        
+
         /* Init tasks */
         bool safe = true;
@@ -128 +128 @@
                         break;
                 }
-        
+
         return safe;
 }
@@ -161 +161 @@
                             ZONE_AVAILABLE | ZONE_HIGHMEM);
         }
-        
+
         if (phys_regions_count < MAX_REGIONS) {
                 phys_regions[phys_regions_count].start = first;
@@ -182 +182 @@
 {
         ipl_t ipl = interrupts_disable();
-        
+
         /* Clear and initialize TLB */
         cp0_pagemask_write(ZERO_PAGE_MASK);
@@ -194 +194 @@
                 tlbwi();
         }
-                
+
         pfn_t start_frame = 0;
         pfn_t frame;
         bool avail = true;
-        
+
         /* Walk through all 1 MB frames */
         for (frame = 0; frame < ZERO_FRAMES; frame++) {
@@ -211 +211 @@
                                 tlb_prepare_entry_lo(&lo1, false, false, false, false, 0);
                                 tlb_prepare_entry_hi(&hi, ZERO_PAGE_ASID, ZERO_PAGE_ADDR);
-                                
+
                                 cp0_pagemask_write(ZERO_PAGE_MASK);
                                 cp0_entry_lo0_write(lo0.value);
@@ -218 +218 @@
                                 cp0_index_write(ZERO_PAGE_TLBI);
                                 tlbwi();
-                                
+
                                 ZERO_PAGE_VALUE = 0;
                                 if (ZERO_PAGE_VALUE != 0)
@@ -229 +229 @@
                         }
                 }
-                
+
                 if (!avail) {
                         frame_add_region(start_frame, frame, true);
@@ -236 +236 @@
                 }
         }
-        
+
         frame_add_region(start_frame, frame, true);
-        
+
         /* Blacklist interrupt vector frame */
         frame_mark_unavailable(0, 1);
@@ -267 +267 @@
         frame_mark_unavailable(0, 1024 * 1024 / FRAME_SIZE);
 #endif
-        
+
         /* Cleanup */
         cp0_pagemask_write(ZERO_PAGE_MASK);
@@ -275 +275 @@
         cp0_index_write(ZERO_PAGE_TLBI);
         tlbwi();
-        
+
         interrupts_restore(ipl);
 }
@@ -286 +286 @@
 {
         printf("[base    ] [size    ]\n");
-        
+
         size_t i;
         for (i = 0; i < phys_regions_count; i++) {

kernel/arch/mips32/src/mm/tlb.c

@@ -76 +76 @@
 
         /* Clear and initialize TLB. */
-        
+
         for (i = 0; i < TLB_ENTRY_COUNT; i++) {
                 cp0_index_write(i);
                 tlbwi();
         }
-        
+
         /*
          * The kernel is going to make use of some wired
@@ -98 +98 @@
         uintptr_t badvaddr;
         pte_t pte;
-        
+
         badvaddr = cp0_badvaddr_read();
 
@@ -291 +291 @@
         lo1_save.value = cp0_entry_lo1_read();
         mask_save.value = cp0_pagemask_read();
-        
+
         printf("[nr] [asid] [vpn2    ] [mask] [gvdc] [pfn     ]\n");
-        
+
         for (i = 0; i < TLB_ENTRY_COUNT; i++) {
                 cp0_index_write(i);
                 tlbr();
-                
+
                 mask.value = cp0_pagemask_read();
                 hi.value = cp0_entry_hi_read();
                 lo0.value = cp0_entry_lo0_read();
                 lo1.value = cp0_entry_lo1_read();
-                
+
                 printf("%-4u %-6u %0#10x %-#6x  %1u%1u%1u%1u  %0#10x\n",
                     i, hi.asid, HI_VPN22ADDR(hi.vpn2), mask.mask,
@@ -309 +309 @@
                     lo1.g, lo1.v, lo1.d, lo1.c, LO_PFN2ADDR(lo1.pfn));
         }
-        
+
         cp0_entry_hi_write(hi_save.value);
         cp0_entry_lo0_write(lo0_save.value);
@@ -339 +339 @@
                 cp0_entry_lo0_write(lo0.value);
                 cp0_entry_lo1_write(lo1.value);
-                                
+
                 tlbwi();
         }
-        
+
         cp0_entry_hi_write(hi_save.value);
 }
@@ -360 +360 @@
 
         hi_save.value = cp0_entry_hi_read();
-        
+
         for (i = 0; i < TLB_ENTRY_COUNT; i++) {
                 cp0_index_write(i);
                 tlbr();
-                
+
                 hi.value = cp0_entry_hi_read();
-                
+
                 if (hi.asid == asid) {
                         lo0.value = cp0_entry_lo0_read();
@@ -380 +380 @@
                 }
         }
-        
+
         cp0_entry_hi_write(hi_save.value);
 }
@@ -399 +399 @@
 
         assert(interrupts_disabled());
-        
+
         if (asid == ASID_INVALID)
                 return;
@@ -431 +431 @@
                 }
         }
-        
+
         cp0_entry_hi_write(hi_save.value);
 }