Changeset a1b9f63 in mainline for kernel/arch/arm32/src/mach

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/arch/arm32/src/mach

Files:

• beagleboardxm/beagleboardxm.c (modified) (1 diff)
• beaglebone/beaglebone.c (modified) (1 diff)
• gta02/gta02.c (modified) (1 diff)
• integratorcp/integratorcp.c (modified) (2 diffs)
• raspberrypi/raspberrypi.c (modified) (2 diffs)

kernel/arch/arm32/src/mach/beagleboardxm/beagleboardxm.c

@@ -102 +102 @@
         beagleboard.irc_addr =
             (void *) km_map(AMDM37x_IRC_BASE_ADDRESS, AMDM37x_IRC_SIZE,
-            PAGE_NOT_CACHEABLE);
+            KM_NATURAL_ALIGNMENT, PAGE_NOT_CACHEABLE);
         assert(beagleboard.irc_addr);
         omap_irc_init(beagleboard.irc_addr);

kernel/arch/arm32/src/mach/beaglebone/beaglebone.c

@@ -88 +88 @@
 {
         bbone.irc_addr = (void *) km_map(AM335x_IRC_BASE_ADDRESS,
-            AM335x_IRC_SIZE, PAGE_NOT_CACHEABLE);
+            AM335x_IRC_SIZE, KM_NATURAL_ALIGNMENT, PAGE_NOT_CACHEABLE);
 
         bbone.cm_per_addr = (void *) km_map(AM335x_CM_PER_BASE_ADDRESS,
-            AM335x_CM_PER_SIZE, PAGE_NOT_CACHEABLE);
+            AM335x_CM_PER_SIZE, KM_NATURAL_ALIGNMENT, PAGE_NOT_CACHEABLE);
 
         bbone.cm_dpll_addr = (void *) km_map(AM335x_CM_DPLL_BASE_ADDRESS,
-            AM335x_CM_DPLL_SIZE, PAGE_NOT_CACHEABLE);
+            AM335x_CM_DPLL_SIZE, KM_NATURAL_ALIGNMENT, PAGE_NOT_CACHEABLE);
 
         bbone.ctrl_module = (void *) km_map(AM335x_CTRL_MODULE_BASE_ADDRESS,
-            AM335x_CTRL_MODULE_SIZE, PAGE_NOT_CACHEABLE);
+            AM335x_CTRL_MODULE_SIZE, KM_NATURAL_ALIGNMENT,
+            PAGE_NOT_CACHEABLE);
 
         assert(bbone.irc_addr != NULL);

kernel/arch/arm32/src/mach/gta02/gta02.c

@@ -103 +103 @@
 
         gta02_timer = (void *) km_map(S3C24XX_TIMER_ADDRESS, PAGE_SIZE,
-            PAGE_NOT_CACHEABLE);
-        irqc_regs = (void *) km_map(S3C24XX_IRQC_ADDRESS, PAGE_SIZE,
+            PAGE_SIZE, PAGE_NOT_CACHEABLE);
+        irqc_regs = (void *) km_map(S3C24XX_IRQC_ADDRESS, PAGE_SIZE, PAGE_SIZE,
             PAGE_NOT_CACHEABLE);
 

kernel/arch/arm32/src/mach/integratorcp/integratorcp.c

@@ -135 +135 @@
 void icp_init(void)
 {
-        icp.hw_map.uart = km_map(ICP_UART, PAGE_SIZE,
-            PAGE_WRITE | PAGE_NOT_CACHEABLE);
-        icp.hw_map.kbd_ctrl = km_map(ICP_KBD, PAGE_SIZE, PAGE_NOT_CACHEABLE);
+        icp.hw_map.uart = km_map(ICP_UART, PAGE_SIZE, PAGE_SIZE,
+            PAGE_WRITE | PAGE_NOT_CACHEABLE);
+        icp.hw_map.kbd_ctrl = km_map(ICP_KBD, PAGE_SIZE, PAGE_SIZE,
+            PAGE_NOT_CACHEABLE);
         icp.hw_map.kbd_stat = icp.hw_map.kbd_ctrl + ICP_KBD_STAT;
         icp.hw_map.kbd_data = icp.hw_map.kbd_ctrl + ICP_KBD_DATA;
         icp.hw_map.kbd_intstat = icp.hw_map.kbd_ctrl + ICP_KBD_INTR_STAT;
-        icp.hw_map.rtc = km_map(ICP_RTC, PAGE_SIZE,
+        icp.hw_map.rtc = km_map(ICP_RTC, PAGE_SIZE, PAGE_SIZE,
             PAGE_WRITE | PAGE_NOT_CACHEABLE);
         icp.hw_map.rtc1_load = icp.hw_map.rtc + ICP_RTC1_LOAD_OFFSET;
@@ -150 +151 @@
         icp.hw_map.rtc1_intrstat = icp.hw_map.rtc + ICP_RTC1_INTRSTAT_OFFSET;
 
-        icp.hw_map.irqc = km_map(ICP_IRQC, PAGE_SIZE,
+        icp.hw_map.irqc = km_map(ICP_IRQC, PAGE_SIZE, PAGE_SIZE,
             PAGE_WRITE | PAGE_NOT_CACHEABLE);
         icp.hw_map.irqc_mask = icp.hw_map.irqc + ICP_IRQC_MASK_OFFSET;
         icp.hw_map.irqc_unmask = icp.hw_map.irqc + ICP_IRQC_UNMASK_OFFSET;
-        icp.hw_map.cmcr = km_map(ICP_CMCR, PAGE_SIZE,
+        icp.hw_map.cmcr = km_map(ICP_CMCR, PAGE_SIZE, PAGE_SIZE,
             PAGE_WRITE | PAGE_NOT_CACHEABLE);
         icp.hw_map.sdramcr = icp.hw_map.cmcr + ICP_SDRAMCR_OFFSET;
-        icp.hw_map.vga = km_map(ICP_VGA, PAGE_SIZE,
+        icp.hw_map.vga = km_map(ICP_VGA, PAGE_SIZE, PAGE_SIZE,
             PAGE_WRITE | PAGE_NOT_CACHEABLE);
 

kernel/arch/arm32/src/mach/raspberrypi/raspberrypi.c

@@ -103 +103 @@
         /* Initialize interrupt controller */
         raspi.irc = (void *) km_map(BCM2835_IRC_ADDR, sizeof(bcm2835_irc_t),
-            PAGE_NOT_CACHEABLE);
+            KM_NATURAL_ALIGNMENT, PAGE_NOT_CACHEABLE);
         assert(raspi.irc);
         bcm2835_irc_init(raspi.irc);
@@ -109 +109 @@
         /* Initialize system timer */
         raspi.timer = (void *) km_map(BCM2835_TIMER_ADDR,
-            sizeof(bcm2835_timer_t),
-            PAGE_NOT_CACHEABLE);
+            sizeof(bcm2835_timer_t), KM_NATURAL_ALIGNMENT, PAGE_NOT_CACHEABLE);
 }