Changeset a35b458 in mainline for kernel/arch/ppc32/src/mm

Timestamp:

2018-03-02T20:10:49Z (8 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

f1380b7

Parents:

3061bc1

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-02-28 17:38:31)

git-committer:

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

Message:

style: Remove trailing whitespace on _all_ lines, including empty ones, for particular file types.

Command used: tools/srepl '\s\+$' '' -- *.c *.h *.py *.sh *.s *.S *.ag

Currently, whitespace on empty lines is very inconsistent.
There are two basic choices: Either remove the whitespace, or keep empty lines
indented to the level of surrounding code. The former is AFAICT more common,
and also much easier to do automatically.

Alternatively, we could write script for automatic indentation, and use that
instead. However, if such a script exists, it's possible to use the indented
style locally, by having the editor apply relevant conversions on load/save,
without affecting remote repository. IMO, it makes more sense to adopt
the simpler rule.

Location:

kernel/arch/ppc32/src/mm

Files:

• as.c (modified) (1 diff)
• frame.c (modified) (5 diffs)
• pht.c (modified) (8 diffs)
• tlb.c (modified) (6 diffs)

kernel/arch/ppc32/src/mm/as.c

@@ -56 +56 @@
 {
         uint32_t sr;
-        
+
         /* Lower 2 GB, user and supervisor access */
         for (sr = 0; sr < 8; sr++)
                 sr_set(0x6000, as->asid, sr);
-        
+
         /* Upper 2 GB, only supervisor access */
         for (sr = 8; sr < 16; sr++)

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

@@ -45 +45 @@
 {
         printf("[base    ] [size    ]\n");
-        
+
         size_t i;
         for (i = 0; i < memmap.cnt; i++) {
@@ -57 +57 @@
         pfn_t minconf = 2;
         size_t i;
-        
+
         for (i = 0; i < memmap.cnt; i++) {
                 /* To be safe, make the available zone possibly smaller */
@@ -64 +64 @@
                 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;
@@ -86 +86 @@
                 }
         }
-        
+
 }
 
@@ -92 +92 @@
 {
         frame_common_arch_init(true);
-        
+
         /* First is exception vector, second is 'implementation specific',
            third and fourth is reserved, other contain real mode code */
         frame_mark_unavailable(0, 8);
-        
+
         /* Mark the Page Hash Table frames as unavailable */
         uint32_t sdr1 = sdr1_get();
-        
+
         // FIXME: compute size of PHT exactly
         frame_mark_unavailable(ADDR2PFN(sdr1 & 0xffff000), 16);

kernel/arch/ppc32/src/mm/pht.c

@@ -93 +93 @@
         uint32_t page = (vaddr >> 12) & 0xffff;
         uint32_t api = (vaddr >> 22) & 0x3f;
-        
+
         uint32_t vsid = sr_get(vaddr);
         uint32_t sdr1 = sdr1_get();
-        
+
         // FIXME: compute size of PHT exactly
         phte_t *phte = (phte_t *) PA2KA(sdr1 & 0xffff0000);
-        
+
         /* Primary hash (xor) */
         uint32_t h = 0;
@@ -106 +106 @@
         uint32_t i;
         bool found = false;
-        
+
         /* Find colliding PTE in PTEG */
         for (i = 0; i < 8; i++) {
@@ -117 +117 @@
                 }
         }
-        
+
         if (!found) {
                 /* Find unused PTE in PTEG */
@@ -127 +127 @@
                 }
         }
-        
+
         if (!found) {
                 /* Secondary hash (not) */
                 uint32_t base2 = (~hash & 0x3ff) << 3;
-                
+
                 /* Find colliding PTE in PTEG */
                 for (i = 0; i < 8; i++) {
@@ -144 +144 @@
                         }
                 }
-                
+
                 if (!found) {
                         /* Find unused PTE in PTEG */
@@ -156 +156 @@
                         }
                 }
-                
+
                 if (!found)
                         i = RANDI(seed) % 8;
         }
-        
+
         phte[base + i].v = 1;
         phte[base + i].vsid = vsid;
@@ -181 +181 @@
 {
         uintptr_t badvaddr;
-        
+
         if (n == VECTOR_DATA_STORAGE)
                 badvaddr = istate->dar;
         else
                 badvaddr = istate->pc;
-        
+
         pte_t pte;
         bool found = find_mapping_and_check(AS, badvaddr,
             PF_ACCESS_READ /* FIXME */, istate, &pte);
-        
+
         if (found) {
                 /* Record access to PTE */
@@ -201 +201 @@
 {
         uint32_t sdr1 = sdr1_get();
-        
+
         // FIXME: compute size of PHT exactly
         phte_t *phte = (phte_t *) PA2KA(sdr1 & 0xffff0000);
-        
+
         // FIXME: this invalidates all PHT entries,
         // which is an overkill, invalidate only

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

@@ -42 +42 @@
         ptehi_t ptehi;
         ptelo_t ptelo;
-        
+
         asm volatile (
                 "mfspr %[tlbmiss], 980\n"
@@ -51 +51 @@
                   [ptelo] "=r" (ptelo)
         );
-        
+
         uint32_t badvaddr = tlbmiss & 0xfffffffc;
         uint32_t physmem = physmem_top();
-        
+
         if ((badvaddr < PA2KA(0)) || (badvaddr >= PA2KA(physmem)))
                 return; // FIXME
-        
+
         ptelo.rpn = KA2PA(badvaddr) >> 12;
         ptelo.wimg = 0;
         ptelo.pp = 2; // FIXME
-        
+
         uint32_t index = 0;
         asm volatile (
@@ -84 +84 @@
                 "sync\n"
         );
-        
+
         for (unsigned int i = 0; i < 0x00040000; i += 0x00001000) {
                 asm volatile (
@@ -91 +91 @@
                 );
         }
-        
+
         asm volatile (
                 "eieio\n"
@@ -143 +143 @@
 {
         uint32_t sr;
-        
+
         for (sr = 0; sr < 16; sr++) {
                 uint32_t vsid = sr_get(sr << 28);
-                
+
                 printf("sr[%02" PRIu32 "]: vsid=%#0" PRIx32 " (asid=%" PRIu32 ")"
                     "%s%s\n", sr, vsid & UINT32_C(0x00ffffff),
@@ -153 +153 @@
                     ((vsid >> 29) & 1) ? " user" : "");
         }
-        
+
         uint32_t upper;
         uint32_t lower;
         uint32_t mask;
         uint32_t length;
-        
+
         PRINT_BAT("ibat[0]", 528, 529);
         PRINT_BAT("ibat[1]", 530, 531);
         PRINT_BAT("ibat[2]", 532, 533);
         PRINT_BAT("ibat[3]", 534, 535);
-        
+
         PRINT_BAT("dbat[0]", 536, 537);
         PRINT_BAT("dbat[1]", 538, 539);