Changeset 7f7d642 in mainline

Timestamp:

2018-08-31T10:52:51Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

516e780

Parents:

6bf5b8c

git-author:

Jakub Jermar <jakub@…> (2018-08-31 10:52:43)

git-committer:

Jakub Jermar <jakub@…> (2018-08-31 10:52:51)

Message:

Let km_map() handle the unaligned addresses

Location:

kernel/arch

Files:

• ppc32/src/ppc32.c (modified) (1 diff)
• sparc64/src/drivers/kbd.c (modified) (1 diff)

kernel/arch/ppc32/src/ppc32.c

@@ -237 +237 @@
 #ifdef CONFIG_MAC_KBD
                 uintptr_t pa = assigned_address[0].addr + 0x16000;
-                uintptr_t aligned_addr = ALIGN_DOWN(pa, PAGE_SIZE);
-                size_t offset = pa - aligned_addr;
                 size_t size = 2 * PAGE_SIZE;
 
-                cuda_t *cuda = (cuda_t *) (km_map(aligned_addr, offset + size,
-                    KM_NATURAL_ALIGNMENT,
-                    PAGE_WRITE | PAGE_NOT_CACHEABLE) + offset);
+                cuda_t *cuda = (cuda_t *) km_map(pa, size, KM_NATURAL_ALIGNMENT,
+                    PAGE_WRITE | PAGE_NOT_CACHEABLE);
 
                 /* Initialize I/O controller */

kernel/arch/sparc64/src/drivers/kbd.c

@@ -109 +109 @@
         }
 
-        /*
-         * We need to pass aligned address to hw_map().
-         * However, the physical keyboard address can
-         * be pretty much unaligned, depending on the
-         * underlying controller.
-         */
-        uintptr_t aligned_addr = ALIGN_DOWN(pa, PAGE_SIZE);
-        size_t offset = pa - aligned_addr;
-
-        ioport8_t *ns16550 = (ioport8_t *) (km_map(aligned_addr, offset + size,
-            KM_NATURAL_ALIGNMENT, PAGE_WRITE | PAGE_NOT_CACHEABLE) + offset);
+        ioport8_t *ns16550 = (ioport8_t *) km_map(pa, size,
+            KM_NATURAL_ALIGNMENT, PAGE_WRITE | PAGE_NOT_CACHEABLE);
 
         ns16550_instance_t *ns16550_instance = ns16550_init(ns16550, 0, inr, cir,