Changeset a1b9f63 in mainline for kernel/genarch/include

Timestamp:

2018-08-31T10:32:40Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6bf5b8c

Parents:

b1834a01

git-author:

Jakub Jermar <jakub@…> (2018-08-31 09:54:11)

git-committer:

Jakub Jermar <jakub@…> (2018-08-31 10:32:40)

Message:

Add alignment argument to km_map()

km_map() currently always applies alignment requirement equal to the
size of the mapped region. Most of the time, the natural alignment is
unnecessarily strong and especially on 32-bit systems may contribute to
km_map() failures for regions with size in the order of several hundred
megabytes.

This change adds an extra argument to km_map() which allows the caller
to indicate the desired alignment. The old behaviour can be specified
by passing KM_NATURAL_ALIGNMENT as alignment.

This change only adds the alignment argument, but does not change the
alignment requirement anywhere.

File:

• kernel/genarch/include/genarch/drivers/amdm37x/gpt.h (modified) (2 diffs)

kernel/genarch/include/genarch/drivers/amdm37x/gpt.h

@@ -208 +208 @@
         // TODO find a nicer way to setup 32kHz clock source for timer1
         // reg 0x48004C40 is CM_CLKSEL_WKUP see page 485 of the manual
-        ioport32_t *clksel = (void *) km_map(0x48004C40, 4, PAGE_NOT_CACHEABLE);
+        ioport32_t *clksel = (void *) km_map(0x48004C40, 4, PAGE_SIZE,
+            PAGE_NOT_CACHEABLE);
         *clksel &= ~1;
         km_unmap((uintptr_t)clksel, 4);
@@ -214 +215 @@
         assert(timer);
         /* Map control register */
-        timer->regs = (void *) km_map(ioregs, iosize, PAGE_NOT_CACHEABLE);
+        timer->regs = (void *) km_map(ioregs, iosize, KM_NATURAL_ALIGNMENT,
+            PAGE_NOT_CACHEABLE);
 
         /* Reset the timer */