Changeset a1b9f63 in mainline for kernel/genarch/src/drivers

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.

Location:

kernel/genarch/src/drivers

Files:

• am335x/timer.c (modified) (1 diff)
• bcm2835/mbox.c (modified) (1 diff)
• ega/ega.c (modified) (1 diff)
• omap/uart.c (modified) (1 diff)
• pl011/pl011.c (modified) (1 diff)
• s3c24xx/uart.c (modified) (1 diff)

kernel/genarch/src/drivers/am335x/timer.c

@@ -101 +101 @@
         size = regs_map[id].size;
 
-        timer->regs = (void *) km_map(base_addr, size, PAGE_NOT_CACHEABLE);
+        timer->regs = (void *) km_map(base_addr, size, KM_NATURAL_ALIGNMENT,
+            PAGE_NOT_CACHEABLE);
         assert(timer->regs != NULL);
 

kernel/genarch/src/drivers/bcm2835/mbox.c

@@ -93 +93 @@
 
         fb_mbox = (void *) km_map(BCM2835_MBOX0_ADDR, sizeof(bcm2835_mbox_t),
-            PAGE_NOT_CACHEABLE);
+            KM_NATURAL_ALIGNMENT, PAGE_NOT_CACHEABLE);
 
         fb_desc->width = 640;

kernel/genarch/src/drivers/ega/ega.c

@@ -601 +601 @@
         instance->base = base;
         instance->addr = (uint8_t *) km_map(addr, EGA_VRAM_SIZE,
-            PAGE_WRITE | PAGE_NOT_CACHEABLE);
+            KM_NATURAL_ALIGNMENT, PAGE_WRITE | PAGE_NOT_CACHEABLE);
         if (!instance->addr) {
                 LOG("Unable to EGA video memory.");

kernel/genarch/src/drivers/omap/uart.c

@@ -88 +88 @@
 {
         assert(uart);
-        uart->regs = (void *)km_map(addr, size, PAGE_NOT_CACHEABLE);
+        uart->regs = (void *)km_map(addr, size, KM_NATURAL_ALIGNMENT,
+            PAGE_NOT_CACHEABLE);
 
         assert(uart->regs);

kernel/genarch/src/drivers/pl011/pl011.c

@@ -100 +100 @@
         assert(uart);
         uart->regs = (void *)km_map(addr, sizeof(pl011_uart_regs_t),
-            PAGE_NOT_CACHEABLE);
+            KM_NATURAL_ALIGNMENT, PAGE_NOT_CACHEABLE);
         assert(uart->regs);
 

kernel/genarch/src/drivers/s3c24xx/uart.c

@@ -116 +116 @@
         uart_dev->data = uart;
 
-        uart->io = (s3c24xx_uart_io_t *) km_map(paddr, PAGE_SIZE,
+        uart->io = (s3c24xx_uart_io_t *) km_map(paddr, PAGE_SIZE, PAGE_SIZE,
             PAGE_WRITE | PAGE_NOT_CACHEABLE);
         uart->indev = NULL;