Index: kernel/arch/arm32/Makefile.inc =================================================================== --- kernel/arch/arm32/Makefile.inc (revision 60d931d2ab10130e11bbd48f2a9b389bc4e76ec1) +++ kernel/arch/arm32/Makefile.inc (revision 34511297c505e3db8e8d821daa74d5c4cb7abd4c) @@ -33,5 +33,5 @@ ATSIGN = % -GCC_CFLAGS += -march=armv4 -fno-omit-frame-pointer -mapcs-frame +GCC_CFLAGS += -fno-omit-frame-pointer -mapcs-frame -march=$(subst _,-,$(PROCESSOR)) BITS = 32 @@ -74,4 +74,8 @@ endif +ifeq ($(MACHINE),beagleboardxm) + ARCH_SOURCES += arch/$(KARCH)/src/mach/beagleboardxm/beagleboardxm.c +endif + ifeq ($(CONFIG_PL050),y) ARCH_SOURCES += genarch/src/drivers/pl050/pl050.c Index: kernel/arch/arm32/_link.ld.in =================================================================== --- kernel/arch/arm32/_link.ld.in (revision 60d931d2ab10130e11bbd48f2a9b389bc4e76ec1) +++ kernel/arch/arm32/_link.ld.in (revision 34511297c505e3db8e8d821daa74d5c4cb7abd4c) @@ -9,4 +9,6 @@ #ifdef MACHINE_gta02 #define KERNEL_LOAD_ADDRESS 0xb0a08000 +#elif defined MACHINE_beagleboardxm +#define KERNEL_LOAD_ADDRESS 0x80a00000 #else #define KERNEL_LOAD_ADDRESS 0x80a00000 Index: kernel/arch/arm32/include/asm.h =================================================================== --- kernel/arch/arm32/include/asm.h (revision 60d931d2ab10130e11bbd48f2a9b389bc4e76ec1) +++ kernel/arch/arm32/include/asm.h (revision 34511297c505e3db8e8d821daa74d5c4cb7abd4c) @@ -43,7 +43,13 @@ #include -/** No such instruction on ARM to sleep CPU. */ +/** No such instruction on old ARM to sleep CPU. + * + * ARMv7 introduced wait for event and wait for interrupt (wfe/wfi). + */ NO_TRACE static inline void cpu_sleep(void) { +#ifdef PROCESSOR_armv7_a + asm volatile ( "wfe" :: ); +#endif } Index: kernel/arch/arm32/include/cpu.h =================================================================== --- kernel/arch/arm32/include/cpu.h (revision 60d931d2ab10130e11bbd48f2a9b389bc4e76ec1) +++ kernel/arch/arm32/include/cpu.h (revision 34511297c505e3db8e8d821daa74d5c4cb7abd4c) @@ -41,5 +41,5 @@ -/** Struct representing ARM CPU identifiaction. */ +/** Struct representing ARM CPU identification. */ typedef struct { /** Implementator (vendor) number. */ Index: kernel/arch/arm32/include/mach/beagleboardxm/beagleboardxm.h =================================================================== --- kernel/arch/arm32/include/mach/beagleboardxm/beagleboardxm.h (revision 34511297c505e3db8e8d821daa74d5c4cb7abd4c) +++ kernel/arch/arm32/include/mach/beagleboardxm/beagleboardxm.h (revision 34511297c505e3db8e8d821daa74d5c4cb7abd4c) @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2012 Jan Vesely + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +/** @addtogroup arm32beagleboardxm beagleboardxm + * @brief BeagleBoard-xM platform. + * @ingroup arm32 + * @{ + */ +/** @file + * @brief BeagleBoard platform driver. + */ + +#ifndef KERN_arm32_beagleboardxm_H_ +#define KERN_arm32_beagleboardxm_H_ + +#include + +extern struct arm_machine_ops bbxm_machine_ops; + +#endif + +/** @} + */ + Index: kernel/arch/arm32/include/machine_func.h =================================================================== --- kernel/arch/arm32/include/machine_func.h (revision 60d931d2ab10130e11bbd48f2a9b389bc4e76ec1) +++ kernel/arch/arm32/include/machine_func.h (revision 34511297c505e3db8e8d821daa74d5c4cb7abd4c) @@ -108,4 +108,6 @@ extern size_t machine_get_irq_count(void); +extern const char * machine_get_platform_name(void); + #endif Index: kernel/arch/arm32/include/mm/frame.h =================================================================== --- kernel/arch/arm32/include/mm/frame.h (revision 60d931d2ab10130e11bbd48f2a9b389bc4e76ec1) +++ kernel/arch/arm32/include/mm/frame.h (revision 34511297c505e3db8e8d821daa74d5c4cb7abd4c) @@ -48,4 +48,6 @@ #ifdef MACHINE_gta02 #define BOOT_PAGE_TABLE_ADDRESS 0x30010000 +#elif defined MACHINE_beagleboardxm +#define BOOT_PAGE_TABLE_ADDRESS 0x80008000 #else #define BOOT_PAGE_TABLE_ADDRESS 0x00008000 @@ -57,4 +59,6 @@ #ifdef MACHINE_gta02 #define PHYSMEM_START_ADDR 0x30008000 +#elif defined MACHINE_beagleboardxm +#define PHYSMEM_START_ADDR 0x80000000 #else #define PHYSMEM_START_ADDR 0x00000000 Index: kernel/arch/arm32/include/mm/page.h =================================================================== --- kernel/arch/arm32/include/mm/page.h (revision 60d931d2ab10130e11bbd48f2a9b389bc4e76ec1) +++ kernel/arch/arm32/include/mm/page.h (revision 34511297c505e3db8e8d821daa74d5c4cb7abd4c) @@ -46,4 +46,13 @@ #define PAGE_SIZE FRAME_SIZE +#ifdef MACHINE_beagleboardxm +#ifndef __ASM__ +# define KA2PA(x) ((uintptr_t) (x)) +# define PA2KA(x) ((uintptr_t) (x)) +#else +# define KA2PA(x) (x) +# define PA2KA(x) (x) +#endif +#else #ifndef __ASM__ # define KA2PA(x) (((uintptr_t) (x)) - 0x80000000) @@ -53,57 +62,58 @@ # define PA2KA(x) ((x) + 0x80000000) #endif +#endif /* Number of entries in each level. */ -#define PTL0_ENTRIES_ARCH (1 << 12) /* 4096 */ -#define PTL1_ENTRIES_ARCH 0 -#define PTL2_ENTRIES_ARCH 0 +#define PTL0_ENTRIES_ARCH (1 << 12) /* 4096 */ +#define PTL1_ENTRIES_ARCH 0 +#define PTL2_ENTRIES_ARCH 0 /* coarse page tables used (256 * 4 = 1KB per page) */ -#define PTL3_ENTRIES_ARCH (1 << 8) /* 256 */ +#define PTL3_ENTRIES_ARCH (1 << 8) /* 256 */ /* Page table sizes for each level. */ -#define PTL0_SIZE_ARCH FOUR_FRAMES -#define PTL1_SIZE_ARCH 0 -#define PTL2_SIZE_ARCH 0 -#define PTL3_SIZE_ARCH ONE_FRAME +#define PTL0_SIZE_ARCH FOUR_FRAMES +#define PTL1_SIZE_ARCH 0 +#define PTL2_SIZE_ARCH 0 +#define PTL3_SIZE_ARCH ONE_FRAME /* Macros calculating indices into page tables for each level. */ -#define PTL0_INDEX_ARCH(vaddr) (((vaddr) >> 20) & 0xfff) -#define PTL1_INDEX_ARCH(vaddr) 0 -#define PTL2_INDEX_ARCH(vaddr) 0 -#define PTL3_INDEX_ARCH(vaddr) (((vaddr) >> 12) & 0x0ff) +#define PTL0_INDEX_ARCH(vaddr) (((vaddr) >> 20) & 0xfff) +#define PTL1_INDEX_ARCH(vaddr) 0 +#define PTL2_INDEX_ARCH(vaddr) 0 +#define PTL3_INDEX_ARCH(vaddr) (((vaddr) >> 12) & 0x0ff) /* Get PTE address accessors for each level. */ #define GET_PTL1_ADDRESS_ARCH(ptl0, i) \ - ((pte_t *) ((((pte_t *)(ptl0))[(i)].l0).coarse_table_addr << 10)) + ((pte_t *) ((((pte_t *)(ptl0))[(i)].l0).coarse_table_addr << 10)) #define GET_PTL2_ADDRESS_ARCH(ptl1, i) \ - (ptl1) + (ptl1) #define GET_PTL3_ADDRESS_ARCH(ptl2, i) \ - (ptl2) + (ptl2) #define GET_FRAME_ADDRESS_ARCH(ptl3, i) \ - ((uintptr_t) ((((pte_t *)(ptl3))[(i)].l1).frame_base_addr << 12)) + ((uintptr_t) ((((pte_t *)(ptl3))[(i)].l1).frame_base_addr << 12)) /* Set PTE address accessors for each level. */ #define SET_PTL0_ADDRESS_ARCH(ptl0) \ - (set_ptl0_addr((pte_t *) (ptl0))) + (set_ptl0_addr((pte_t *) (ptl0))) #define SET_PTL1_ADDRESS_ARCH(ptl0, i, a) \ - (((pte_t *) (ptl0))[(i)].l0.coarse_table_addr = (a) >> 10) + (((pte_t *) (ptl0))[(i)].l0.coarse_table_addr = (a) >> 10) #define SET_PTL2_ADDRESS_ARCH(ptl1, i, a) #define SET_PTL3_ADDRESS_ARCH(ptl2, i, a) #define SET_FRAME_ADDRESS_ARCH(ptl3, i, a) \ - (((pte_t *) (ptl3))[(i)].l1.frame_base_addr = (a) >> 12) + (((pte_t *) (ptl3))[(i)].l1.frame_base_addr = (a) >> 12) /* Get PTE flags accessors for each level. */ #define GET_PTL1_FLAGS_ARCH(ptl0, i) \ - get_pt_level0_flags((pte_t *) (ptl0), (size_t) (i)) + get_pt_level0_flags((pte_t *) (ptl0), (size_t) (i)) #define GET_PTL2_FLAGS_ARCH(ptl1, i) \ - PAGE_PRESENT + PAGE_PRESENT #define GET_PTL3_FLAGS_ARCH(ptl2, i) \ - PAGE_PRESENT + PAGE_PRESENT #define GET_FRAME_FLAGS_ARCH(ptl3, i) \ - get_pt_level1_flags((pte_t *) (ptl3), (size_t) (i)) + get_pt_level1_flags((pte_t *) (ptl3), (size_t) (i)) /* Set PTE flags accessors for each level. */ #define SET_PTL1_FLAGS_ARCH(ptl0, i, x) \ - set_pt_level0_flags((pte_t *) (ptl0), (size_t) (i), (x)) + set_pt_level0_flags((pte_t *) (ptl0), (size_t) (i), (x)) #define SET_PTL2_FLAGS_ARCH(ptl1, i, x) #define SET_PTL3_FLAGS_ARCH(ptl2, i, x) @@ -119,221 +129,11 @@ set_pt_level1_present((pte_t *) (ptl3), (size_t) (i)) -/* Macros for querying the last-level PTE entries. */ -#define PTE_VALID_ARCH(pte) \ - (*((uint32_t *) (pte)) != 0) -#define PTE_PRESENT_ARCH(pte) \ - (((pte_t *) (pte))->l0.descriptor_type != 0) -#define PTE_GET_FRAME_ARCH(pte) \ - (((pte_t *) (pte))->l1.frame_base_addr << FRAME_WIDTH) -#define PTE_WRITABLE_ARCH(pte) \ - (((pte_t *) (pte))->l1.access_permission_0 == PTE_AP_USER_RW_KERNEL_RW) -#define PTE_EXECUTABLE_ARCH(pte) \ - 1 - -#ifndef __ASM__ - -/** Level 0 page table entry. */ -typedef struct { - /* 0b01 for coarse tables, see below for details */ - unsigned descriptor_type : 2; - unsigned impl_specific : 3; - unsigned domain : 4; - unsigned should_be_zero : 1; - - /* Pointer to the coarse 2nd level page table (holding entries for small - * (4KB) or large (64KB) pages. ARM also supports fine 2nd level page - * tables that may hold even tiny pages (1KB) but they are bigger (4KB - * per table in comparison with 1KB per the coarse table) - */ - unsigned coarse_table_addr : 22; -} ATTRIBUTE_PACKED pte_level0_t; - -/** Level 1 page table entry (small (4KB) pages used). */ -typedef struct { - - /* 0b10 for small pages */ - unsigned descriptor_type : 2; - unsigned bufferable : 1; - unsigned cacheable : 1; - - /* access permissions for each of 4 subparts of a page - * (for each 1KB when small pages used */ - unsigned access_permission_0 : 2; - unsigned access_permission_1 : 2; - unsigned access_permission_2 : 2; - unsigned access_permission_3 : 2; - unsigned frame_base_addr : 20; -} ATTRIBUTE_PACKED pte_level1_t; - -typedef union { - pte_level0_t l0; - pte_level1_t l1; -} pte_t; - -/* Level 1 page tables access permissions */ - -/** User mode: no access, privileged mode: no access. */ -#define PTE_AP_USER_NO_KERNEL_NO 0 - -/** User mode: no access, privileged mode: read/write. */ -#define PTE_AP_USER_NO_KERNEL_RW 1 - -/** User mode: read only, privileged mode: read/write. */ -#define PTE_AP_USER_RO_KERNEL_RW 2 - -/** User mode: read/write, privileged mode: read/write. */ -#define PTE_AP_USER_RW_KERNEL_RW 3 - - -/* pte_level0_t and pte_level1_t descriptor_type flags */ - -/** pte_level0_t and pte_level1_t "not present" flag (used in descriptor_type). */ -#define PTE_DESCRIPTOR_NOT_PRESENT 0 - -/** pte_level0_t coarse page table flag (used in descriptor_type). */ -#define PTE_DESCRIPTOR_COARSE_TABLE 1 - -/** pte_level1_t small page table flag (used in descriptor type). */ -#define PTE_DESCRIPTOR_SMALL_PAGE 2 - - -/** Sets the address of level 0 page table. - * - * @param pt Pointer to the page table to set. - * - */ -NO_TRACE static inline void set_ptl0_addr(pte_t *pt) -{ - asm volatile ( - "mcr p15, 0, %[pt], c2, c0, 0\n" - :: [pt] "r" (pt) - ); -} - - -/** Returns level 0 page table entry flags. - * - * @param pt Level 0 page table. - * @param i Index of the entry to return. - * - */ -NO_TRACE static inline int get_pt_level0_flags(pte_t *pt, size_t i) -{ - pte_level0_t *p = &pt[i].l0; - int np = (p->descriptor_type == PTE_DESCRIPTOR_NOT_PRESENT); - - return (np << PAGE_PRESENT_SHIFT) | (1 << PAGE_USER_SHIFT) | - (1 << PAGE_READ_SHIFT) | (1 << PAGE_WRITE_SHIFT) | - (1 << PAGE_EXEC_SHIFT) | (1 << PAGE_CACHEABLE_SHIFT); -} - -/** Returns level 1 page table entry flags. - * - * @param pt Level 1 page table. - * @param i Index of the entry to return. - * - */ -NO_TRACE static inline int get_pt_level1_flags(pte_t *pt, size_t i) -{ - pte_level1_t *p = &pt[i].l1; - - int dt = p->descriptor_type; - int ap = p->access_permission_0; - - return ((dt == PTE_DESCRIPTOR_NOT_PRESENT) << PAGE_PRESENT_SHIFT) | - ((ap == PTE_AP_USER_RO_KERNEL_RW) << PAGE_READ_SHIFT) | - ((ap == PTE_AP_USER_RW_KERNEL_RW) << PAGE_READ_SHIFT) | - ((ap == PTE_AP_USER_RW_KERNEL_RW) << PAGE_WRITE_SHIFT) | - ((ap != PTE_AP_USER_NO_KERNEL_RW) << PAGE_USER_SHIFT) | - ((ap == PTE_AP_USER_NO_KERNEL_RW) << PAGE_READ_SHIFT) | - ((ap == PTE_AP_USER_NO_KERNEL_RW) << PAGE_WRITE_SHIFT) | - (1 << PAGE_EXEC_SHIFT) | - (p->bufferable << PAGE_CACHEABLE); -} - -/** Sets flags of level 0 page table entry. - * - * @param pt level 0 page table - * @param i index of the entry to be changed - * @param flags new flags - * - */ -NO_TRACE static inline void set_pt_level0_flags(pte_t *pt, size_t i, int flags) -{ - pte_level0_t *p = &pt[i].l0; - - if (flags & PAGE_NOT_PRESENT) { - p->descriptor_type = PTE_DESCRIPTOR_NOT_PRESENT; - /* - * Ensures that the entry will be recognized as valid when - * PTE_VALID_ARCH applied. - */ - p->should_be_zero = 1; - } else { - p->descriptor_type = PTE_DESCRIPTOR_COARSE_TABLE; - p->should_be_zero = 0; - } -} - -NO_TRACE static inline void set_pt_level0_present(pte_t *pt, size_t i) -{ - pte_level0_t *p = &pt[i].l0; - - p->should_be_zero = 0; - write_barrier(); - p->descriptor_type = PTE_DESCRIPTOR_COARSE_TABLE; -} - -/** Sets flags of level 1 page table entry. - * - * We use same access rights for the whole page. When page - * is not preset we store 1 in acess_rigts_3 so that at least - * one bit is 1 (to mark correct page entry, see #PAGE_VALID_ARCH). - * - * @param pt Level 1 page table. - * @param i Index of the entry to be changed. - * @param flags New flags. - * - */ -NO_TRACE static inline void set_pt_level1_flags(pte_t *pt, size_t i, int flags) -{ - pte_level1_t *p = &pt[i].l1; - - if (flags & PAGE_NOT_PRESENT) - p->descriptor_type = PTE_DESCRIPTOR_NOT_PRESENT; - else - p->descriptor_type = PTE_DESCRIPTOR_SMALL_PAGE; - - p->cacheable = p->bufferable = (flags & PAGE_CACHEABLE) != 0; - - /* default access permission */ - p->access_permission_0 = p->access_permission_1 = - p->access_permission_2 = p->access_permission_3 = - PTE_AP_USER_NO_KERNEL_RW; - - if (flags & PAGE_USER) { - if (flags & PAGE_READ) { - p->access_permission_0 = p->access_permission_1 = - p->access_permission_2 = p->access_permission_3 = - PTE_AP_USER_RO_KERNEL_RW; - } - if (flags & PAGE_WRITE) { - p->access_permission_0 = p->access_permission_1 = - p->access_permission_2 = p->access_permission_3 = - PTE_AP_USER_RW_KERNEL_RW; - } - } -} - -NO_TRACE static inline void set_pt_level1_present(pte_t *pt, size_t i) -{ - pte_level1_t *p = &pt[i].l1; - - p->descriptor_type = PTE_DESCRIPTOR_SMALL_PAGE; -} - -extern void page_arch_init(void); - -#endif /* __ASM__ */ +#if defined(PROCESSOR_armv6) | defined(PROCESSOR_armv7_a) +#include "page_armv6.h" +#elif defined(PROCESSOR_armv4) | defined(PROCESSOR_armv5) +#include "page_armv4.h" +#else +#error "Unsupported architecture" +#endif #endif Index: kernel/arch/arm32/include/mm/page_armv4.h =================================================================== --- kernel/arch/arm32/include/mm/page_armv4.h (revision 34511297c505e3db8e8d821daa74d5c4cb7abd4c) +++ kernel/arch/arm32/include/mm/page_armv4.h (revision 34511297c505e3db8e8d821daa74d5c4cb7abd4c) @@ -0,0 +1,269 @@ +/* + * Copyright (c) 2007 Pavel Jancik, Michal Kebrt + * Copyright (c) 2012 Jan Vesely + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup arm32mm + * @{ + */ +/** @file + * @brief Paging related declarations. + */ + +#ifndef KERN_arm32_PAGE_armv4_H_ +#define KERN_arm32_PAGE_armv4_H_ + +#ifndef KERN_arm32_PAGE_H_ +#error "Do not include arch specific page.h directly use generic page.h instead" +#endif + +/* Macros for querying the last-level PTE entries. */ +#define PTE_VALID_ARCH(pte) \ + (*((uint32_t *) (pte)) != 0) +#define PTE_PRESENT_ARCH(pte) \ + (((pte_t *) (pte))->l0.descriptor_type != 0) +#define PTE_GET_FRAME_ARCH(pte) \ + (((pte_t *) (pte))->l1.frame_base_addr << FRAME_WIDTH) +#define PTE_WRITABLE_ARCH(pte) \ + (((pte_t *) (pte))->l1.access_permission_0 == PTE_AP_USER_RW_KERNEL_RW) +#define PTE_EXECUTABLE_ARCH(pte) \ + 1 + +#ifndef __ASM__ + +/** Level 0 page table entry. */ +typedef struct { + /* 0b01 for coarse tables, see below for details */ + unsigned descriptor_type : 2; + unsigned impl_specific : 3; + unsigned domain : 4; + unsigned should_be_zero : 1; + + /* Pointer to the coarse 2nd level page table (holding entries for small + * (4KB) or large (64KB) pages. ARM also supports fine 2nd level page + * tables that may hold even tiny pages (1KB) but they are bigger (4KB + * per table in comparison with 1KB per the coarse table) + */ + unsigned coarse_table_addr : 22; +} ATTRIBUTE_PACKED pte_level0_t; + +/** Level 1 page table entry (small (4KB) pages used). */ +typedef struct { + + /* 0b10 for small pages */ + unsigned descriptor_type : 2; + unsigned bufferable : 1; + unsigned cacheable : 1; + + /* access permissions for each of 4 subparts of a page + * (for each 1KB when small pages used */ + unsigned access_permission_0 : 2; + unsigned access_permission_1 : 2; + unsigned access_permission_2 : 2; + unsigned access_permission_3 : 2; + unsigned frame_base_addr : 20; +} ATTRIBUTE_PACKED pte_level1_t; + +typedef union { + pte_level0_t l0; + pte_level1_t l1; +} pte_t; + +/* Level 1 page tables access permissions */ + +/** User mode: no access, privileged mode: no access. */ +#define PTE_AP_USER_NO_KERNEL_NO 0 + +/** User mode: no access, privileged mode: read/write. */ +#define PTE_AP_USER_NO_KERNEL_RW 1 + +/** User mode: read only, privileged mode: read/write. */ +#define PTE_AP_USER_RO_KERNEL_RW 2 + +/** User mode: read/write, privileged mode: read/write. */ +#define PTE_AP_USER_RW_KERNEL_RW 3 + + +/* pte_level0_t and pte_level1_t descriptor_type flags */ + +/** pte_level0_t and pte_level1_t "not present" flag (used in descriptor_type). */ +#define PTE_DESCRIPTOR_NOT_PRESENT 0 + +/** pte_level0_t coarse page table flag (used in descriptor_type). */ +#define PTE_DESCRIPTOR_COARSE_TABLE 1 + +/** pte_level1_t small page table flag (used in descriptor type). */ +#define PTE_DESCRIPTOR_SMALL_PAGE 2 + + +/** Sets the address of level 0 page table. + * + * @param pt Pointer to the page table to set. + * + */ +NO_TRACE static inline void set_ptl0_addr(pte_t *pt) +{ + asm volatile ( + "mcr p15, 0, %[pt], c2, c0, 0\n" + :: [pt] "r" (pt) + ); +} + + +/** Returns level 0 page table entry flags. + * + * @param pt Level 0 page table. + * @param i Index of the entry to return. + * + */ +NO_TRACE static inline int get_pt_level0_flags(pte_t *pt, size_t i) +{ + pte_level0_t *p = &pt[i].l0; + int np = (p->descriptor_type == PTE_DESCRIPTOR_NOT_PRESENT); + + return (np << PAGE_PRESENT_SHIFT) | (1 << PAGE_USER_SHIFT) | + (1 << PAGE_READ_SHIFT) | (1 << PAGE_WRITE_SHIFT) | + (1 << PAGE_EXEC_SHIFT) | (1 << PAGE_CACHEABLE_SHIFT); +} + +/** Returns level 1 page table entry flags. + * + * @param pt Level 1 page table. + * @param i Index of the entry to return. + * + */ +NO_TRACE static inline int get_pt_level1_flags(pte_t *pt, size_t i) +{ + pte_level1_t *p = &pt[i].l1; + + int dt = p->descriptor_type; + int ap = p->access_permission_0; + + return ((dt == PTE_DESCRIPTOR_NOT_PRESENT) << PAGE_PRESENT_SHIFT) | + ((ap == PTE_AP_USER_RO_KERNEL_RW) << PAGE_READ_SHIFT) | + ((ap == PTE_AP_USER_RW_KERNEL_RW) << PAGE_READ_SHIFT) | + ((ap == PTE_AP_USER_RW_KERNEL_RW) << PAGE_WRITE_SHIFT) | + ((ap != PTE_AP_USER_NO_KERNEL_RW) << PAGE_USER_SHIFT) | + ((ap == PTE_AP_USER_NO_KERNEL_RW) << PAGE_READ_SHIFT) | + ((ap == PTE_AP_USER_NO_KERNEL_RW) << PAGE_WRITE_SHIFT) | + (1 << PAGE_EXEC_SHIFT) | + (p->bufferable << PAGE_CACHEABLE); +} + +/** Sets flags of level 0 page table entry. + * + * @param pt level 0 page table + * @param i index of the entry to be changed + * @param flags new flags + * + */ +NO_TRACE static inline void set_pt_level0_flags(pte_t *pt, size_t i, int flags) +{ + pte_level0_t *p = &pt[i].l0; + + if (flags & PAGE_NOT_PRESENT) { + p->descriptor_type = PTE_DESCRIPTOR_NOT_PRESENT; + /* + * Ensures that the entry will be recognized as valid when + * PTE_VALID_ARCH applied. + */ + p->should_be_zero = 1; + } else { + p->descriptor_type = PTE_DESCRIPTOR_COARSE_TABLE; + p->should_be_zero = 0; + } +} + + +/** Sets flags of level 1 page table entry. + * + * We use same access rights for the whole page. When page + * is not preset we store 1 in acess_rigts_3 so that at least + * one bit is 1 (to mark correct page entry, see #PAGE_VALID_ARCH). + * + * @param pt Level 1 page table. + * @param i Index of the entry to be changed. + * @param flags New flags. + * + */ +NO_TRACE static inline void set_pt_level1_flags(pte_t *pt, size_t i, int flags) +{ + pte_level1_t *p = &pt[i].l1; + + if (flags & PAGE_NOT_PRESENT) + p->descriptor_type = PTE_DESCRIPTOR_NOT_PRESENT; + else + p->descriptor_type = PTE_DESCRIPTOR_SMALL_PAGE; + + p->cacheable = p->bufferable = (flags & PAGE_CACHEABLE) != 0; + + /* default access permission */ + p->access_permission_0 = p->access_permission_1 = + p->access_permission_2 = p->access_permission_3 = + PTE_AP_USER_NO_KERNEL_RW; + + if (flags & PAGE_USER) { + if (flags & PAGE_READ) { + p->access_permission_0 = p->access_permission_1 = + p->access_permission_2 = p->access_permission_3 = + PTE_AP_USER_RO_KERNEL_RW; + } + if (flags & PAGE_WRITE) { + p->access_permission_0 = p->access_permission_1 = + p->access_permission_2 = p->access_permission_3 = + PTE_AP_USER_RW_KERNEL_RW; + } + } +} + +NO_TRACE static inline void set_pt_level0_present(pte_t *pt, size_t i) +{ + pte_level0_t *p = &pt[i].l0; + + p->should_be_zero = 0; + write_barrier(); + p->descriptor_type = PTE_DESCRIPTOR_COARSE_TABLE; +} + + +NO_TRACE static inline void set_pt_level1_present(pte_t *pt, size_t i) +{ + pte_level1_t *p = &pt[i].l1; + + p->descriptor_type = PTE_DESCRIPTOR_SMALL_PAGE; +} + + +extern void page_arch_init(void); + + +#endif /* __ASM__ */ + +#endif + +/** @} + */ Index: kernel/arch/arm32/include/mm/page_armv6.h =================================================================== --- kernel/arch/arm32/include/mm/page_armv6.h (revision 34511297c505e3db8e8d821daa74d5c4cb7abd4c) +++ kernel/arch/arm32/include/mm/page_armv6.h (revision 34511297c505e3db8e8d821daa74d5c4cb7abd4c) @@ -0,0 +1,285 @@ +/* + * Copyright (c) 2012 Jan Vesely + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup arm32mm + * @{ + */ +/** @file + * @brief Paging related declarations. + */ + +#ifndef KERN_arm32_PAGE_armv7_H_ +#define KERN_arm32_PAGE_armv7_H_ + +#ifndef KERN_arm32_PAGE_H_ +#error "Do not include arch specific page.h directly use generic page.h instead" +#endif + +/* Macros for querying the last-level PTE entries. */ +#define PTE_VALID_ARCH(pte) \ + (*((uint32_t *) (pte)) != 0) +#define PTE_PRESENT_ARCH(pte) \ + (((pte_t *) (pte))->l0.descriptor_type != 0) +#define PTE_GET_FRAME_ARCH(pte) \ + (((pte_t *) (pte))->l1.frame_base_addr << FRAME_WIDTH) +#define PTE_WRITABLE_ARCH(pte) \ + (((pte_t *) (pte))->l1.access_permission_1 != PTE_AP1_RO) +#define PTE_EXECUTABLE_ARCH(pte) \ + (((pte_t *) (pte))->l1.descriptor_type != PTE_DESCRIPTOR_SMALL_PAGE_NX) + +#ifndef __ASM__ + +/** Level 0 page table entry. */ +typedef struct { + /* 0b01 for coarse tables, see below for details */ + unsigned descriptor_type : 2; + unsigned pxn : 1; + unsigned ns : 1; + unsigned should_be_zero_0 : 1; + unsigned domain : 4; + unsigned should_be_zero_1 : 1; + + /* Pointer to the coarse 2nd level page table (holding entries for small + * (4KB) or large (64KB) pages. ARM also supports fine 2nd level page + * tables that may hold even tiny pages (1KB) but they are bigger (4KB + * per table in comparison with 1KB per the coarse table) + */ + unsigned coarse_table_addr : 22; +} ATTRIBUTE_PACKED pte_level0_t; + +/** Level 1 page table entry (small (4KB) pages used). */ +typedef struct { + + /* 0b10 for small pages, 0b11 for NX small pages */ + unsigned descriptor_type : 2; + unsigned bufferable : 1; + unsigned cacheable : 1; + unsigned access_permission_0 : 2; + unsigned tex : 3; + unsigned access_permission_1 : 1; + unsigned shareable : 1; + unsigned non_global : 1; + unsigned frame_base_addr : 20; +} ATTRIBUTE_PACKED pte_level1_t; + +typedef union { + pte_level0_t l0; + pte_level1_t l1; +} pte_t; + +/* Level 1 page tables access permissions */ + +/** User mode: no access, privileged mode: no access. */ +#define PTE_AP0_USER_NO_KERNEL_NO 0 + +/** User mode: no access, privileged mode: read/write. */ +#define PTE_AP0_USER_NO_KERNEL_FULL 1 + +/** User mode: read only, privileged mode: read/write. */ +#define PTE_AP0_USER_LIMITED_KERNEL_FULL 2 + +/** User mode: read/write, privileged mode: read/write. */ +#define PTE_AP0_USER_FULL_KERNEL_FULL 3 + +/** Allow writes */ +#define PTE_AP1_RO 1 + + +/* pte_level0_t and pte_level1_t descriptor_type flags */ + +/** pte_level0_t and pte_level1_t "not present" flag (used in descriptor_type). */ +#define PTE_DESCRIPTOR_NOT_PRESENT 0 + +/** pte_level0_t coarse page table flag (used in descriptor_type). */ +#define PTE_DESCRIPTOR_COARSE_TABLE 1 + +/** pte_level1_t small page table flag (used in descriptor type). */ +#define PTE_DESCRIPTOR_SMALL_PAGE 2 + +/** pte_level1_t small page table flag with NX (used in descriptor type). */ +#define PTE_DESCRIPTOR_SMALL_PAGE_NX 3 + +/** Sets the address of level 0 page table. + * + * @param pt Pointer to the page table to set. + * + */ +NO_TRACE static inline void set_ptl0_addr(pte_t *pt) +{ + asm volatile ( + "mcr p15, 0, %[pt], c2, c0, 0\n" + :: [pt] "r" (pt) + ); +} + + +/** Returns level 0 page table entry flags. + * + * @param pt Level 0 page table. + * @param i Index of the entry to return. + * + */ +NO_TRACE static inline int get_pt_level0_flags(pte_t *pt, size_t i) +{ + const pte_level0_t *p = &pt[i].l0; + const unsigned np = (p->descriptor_type == PTE_DESCRIPTOR_NOT_PRESENT); + + return (np << PAGE_PRESENT_SHIFT) | (1 << PAGE_USER_SHIFT) | + (1 << PAGE_READ_SHIFT) | (1 << PAGE_WRITE_SHIFT) | + (1 << PAGE_EXEC_SHIFT) | (1 << PAGE_CACHEABLE_SHIFT); +} + +/** Returns level 1 page table entry flags. + * + * @param pt Level 1 page table. + * @param i Index of the entry to return. + * + */ +NO_TRACE static inline int get_pt_level1_flags(pte_t *pt, size_t i) +{ + const pte_level1_t *p = &pt[i].l1; + + const unsigned dt = p->descriptor_type; + const unsigned ap0 = p->access_permission_0; + const unsigned ap1 = p->access_permission_1; + + return ((dt == PTE_DESCRIPTOR_NOT_PRESENT) << PAGE_PRESENT_SHIFT) | + ((dt != PTE_DESCRIPTOR_SMALL_PAGE_NX) << PAGE_EXEC_SHIFT) | + ((ap0 == PTE_AP0_USER_LIMITED_KERNEL_FULL) << PAGE_READ_SHIFT) | + ((ap0 == PTE_AP0_USER_FULL_KERNEL_FULL) << PAGE_READ_SHIFT) | + ((ap0 == PTE_AP0_USER_NO_KERNEL_FULL) << PAGE_READ_SHIFT) | + ((ap0 != PTE_AP0_USER_NO_KERNEL_FULL) << PAGE_USER_SHIFT) | + (((ap1 != PTE_AP1_RO) && (ap0 == PTE_AP0_USER_FULL_KERNEL_FULL)) << PAGE_WRITE_SHIFT) | + (((ap1 != PTE_AP1_RO) && (ap0 == PTE_AP0_USER_NO_KERNEL_FULL)) << PAGE_WRITE_SHIFT) | + (p->bufferable << PAGE_CACHEABLE); +} + +/** Sets flags of level 0 page table entry. + * + * @param pt level 0 page table + * @param i index of the entry to be changed + * @param flags new flags + * + */ +NO_TRACE static inline void set_pt_level0_flags(pte_t *pt, size_t i, int flags) +{ + pte_level0_t *p = &pt[i].l0; + + if (flags & PAGE_NOT_PRESENT) { + p->descriptor_type = PTE_DESCRIPTOR_NOT_PRESENT; + /* + * Ensures that the entry will be recognized as valid when + * PTE_VALID_ARCH applied. + */ + p->should_be_zero_0 = 1; + p->should_be_zero_1 = 1; + } else { + p->descriptor_type = PTE_DESCRIPTOR_COARSE_TABLE; + p->should_be_zero_0 = 0; + p->should_be_zero_1 = 0; + p->domain = 0; + p->ns = 0; + } +} + + +/** Sets flags of level 1 page table entry. + * + * We use same access rights for the whole page. When page + * is not preset we store 1 in acess_rigts_3 so that at least + * one bit is 1 (to mark correct page entry, see #PAGE_VALID_ARCH). + * + * @param pt Level 1 page table. + * @param i Index of the entry to be changed. + * @param flags New flags. + * + */ +NO_TRACE static inline void set_pt_level1_flags(pte_t *pt, size_t i, int flags) +{ + pte_level1_t *p = &pt[i].l1; + + if (flags & PAGE_NOT_PRESENT) { + p->descriptor_type = PTE_DESCRIPTOR_NOT_PRESENT; + } else { + if (flags & PAGE_EXEC) + p->descriptor_type = PTE_DESCRIPTOR_SMALL_PAGE; + else + p->descriptor_type = PTE_DESCRIPTOR_SMALL_PAGE_NX; + } + + /* tex=0 buf=1 and cache=1 => normal memory + * tex=0 buf=1 and cache=0 => shareable device mmio + */ + p->cacheable = (flags & PAGE_CACHEABLE); + p->bufferable = 1; + p->tex = 0; + + /* Shareable is ignored for devices (non-cacheable), + * turn it on for normal memory. */ + p->shareable = 1; + + p->non_global = !(flags & PAGE_GLOBAL); + + /* default access permission: kernel only*/ + p->access_permission_0 = PTE_AP0_USER_NO_KERNEL_FULL; + + if (flags & PAGE_USER) { + p->access_permission_0 = PTE_AP0_USER_FULL_KERNEL_FULL; + // TODO Fix kernel to use PAGE_WRITE flag properly and + // apply this for kernel pages as well. + if (!(flags & PAGE_WRITE)) + p->access_permission_1 = PTE_AP1_RO; + } +} + +NO_TRACE static inline void set_pt_level0_present(pte_t *pt, size_t i) +{ + pte_level0_t *p = &pt[i].l0; + + p->should_be_zero_0 = 0; + p->should_be_zero_1 = 0; + write_barrier(); + p->descriptor_type = PTE_DESCRIPTOR_COARSE_TABLE; +} + +NO_TRACE static inline void set_pt_level1_present(pte_t *pt, size_t i) +{ + pte_level1_t *p = &pt[i].l1; + + p->descriptor_type = PTE_DESCRIPTOR_SMALL_PAGE; +} + + +extern void page_arch_init(void); + +#endif /* __ASM__ */ + +#endif + +/** @} + */ Index: kernel/arch/arm32/include/mm/page_fault.h =================================================================== --- kernel/arch/arm32/include/mm/page_fault.h (revision 60d931d2ab10130e11bbd48f2a9b389bc4e76ec1) +++ kernel/arch/arm32/include/mm/page_fault.h (revision 34511297c505e3db8e8d821daa74d5c4cb7abd4c) @@ -40,18 +40,26 @@ -/** Decribes CP15 "fault status register" (FSR). */ -typedef struct { - unsigned status : 3; - unsigned domain : 4; - unsigned zero : 1; - unsigned should_be_zero : 24; -} ATTRIBUTE_PACKED fault_status_t; - - -/** Help union used for casting integer value into #fault_status_t. */ +/** Decribes CP15 "fault status register" (FSR). + * + * See ARM Architecture Reference Manual ch. B4.9.6 (pdf p.743). + */ typedef union { - fault_status_t fs; - uint32_t dummy; -} fault_status_union_t; + struct { + unsigned status : 4; + unsigned domain : 4; + unsigned zero : 1; + unsigned sbz0 : 1; + unsigned fs : 1; /**< armv6+ mandated, earlier IPLM. DEFINED */ + unsigned wr : 1; /**< armv6+ only */ + unsigned should_be_zero : 20; + } ATTRIBUTE_PACKED data; + struct { + unsigned status : 4; + unsigned sbz0 : 6; + unsigned fs : 1; + unsigned should_be_zero : 21; + } ATTRIBUTE_PACKED inst; + uint32_t raw; +} fault_status_t; Index: kernel/arch/arm32/include/regutils.h =================================================================== --- kernel/arch/arm32/include/regutils.h (revision 60d931d2ab10130e11bbd48f2a9b389bc4e76ec1) +++ kernel/arch/arm32/include/regutils.h (revision 34511297c505e3db8e8d821daa74d5c4cb7abd4c) @@ -41,5 +41,20 @@ #define STATUS_REG_MODE_MASK 0x1f +#define CP15_R1_MMU_ENABLE_BIT (1 << 0) +#define CP15_R1_ALIGNMENT_ENABLE_BIT (1 << 1) +#define CP15_R1_CACHE_ENABLE_BIT (1 << 2) +#define CP15_R1_BRANCH_PREDICT_BIT (1 << 11) +#define CP15_R1_INST_CACHE_BIT (1 << 12) #define CP15_R1_HIGH_VECTORS_BIT (1 << 13) +#define CP15_R1_ROUND_ROBIN_BIT (1 << 14) +#define CP15_R1_HA_ENABLE_BIT (1 << 17) +#define CP15_R1_WXN_BIT (1 << 19) /* Only if virt. supported */ +#define CP15_R1_UWXN_BIT (1 << 20) /* Only if virt. supported */ +#define CP15_R1_FI_BIT (1 << 21) +#define CP15_R1_VE_BIT (1 << 24) +#define CP15_R1_EE_BIT (1 << 25) +#define CP15_R1_NMFI_BIT (1 << 27) +#define CP15_R1_TRE_BIT (1 << 28) +#define CP15_R1_AFE_BIT (1 << 29) /* ARM Processor Operation Modes */ Index: kernel/arch/arm32/src/arm32.c =================================================================== --- kernel/arch/arm32/src/arm32.c (revision 60d931d2ab10130e11bbd48f2a9b389bc4e76ec1) +++ kernel/arch/arm32/src/arm32.c (revision 34511297c505e3db8e8d821daa74d5c4cb7abd4c) @@ -49,4 +49,5 @@ #include #include +#include /** Performs arm32-specific initialization before main_bsp() is called. */ @@ -116,4 +117,8 @@ { machine_input_init(); + const char *platform = machine_get_platform_name(); + + sysinfo_set_item_data("platform", NULL, (void *) platform, + str_size(platform)); } Index: kernel/arch/arm32/src/cpu/cpu.c =================================================================== --- kernel/arch/arm32/src/cpu/cpu.c (revision 60d931d2ab10130e11bbd48f2a9b389bc4e76ec1) +++ kernel/arch/arm32/src/cpu/cpu.c (revision 34511297c505e3db8e8d821daa74d5c4cb7abd4c) @@ -44,14 +44,17 @@ /** Implementators (vendor) names */ static const char *imp_data[] = { - "?", /* IMP_DATA_START_OFFSET */ - "ARM Ltd", /* 0x41 */ - "", /* 0x42 */ - "", /* 0x43 */ - "Digital Equipment Corporation", /* 0x44 */ - "", "", "", "", "", "", "", "", "", "", /* 0x45 - 0x4e */ - "", "", "", "", "", "", "", "", "", "", /* 0x4f - 0x58 */ - "", "", "", "", "", "", "", "", "", "", /* 0x59 - 0x62 */ - "", "", "", "", "", "", /* 0x63 - 0x68 */ - "Intel Corporation" /* 0x69 */ + "?", /* IMP_DATA_START_OFFSET */ + "ARM Limited", /* 0x41 */ + "", "", /* 0x42 - 0x43 */ + "Digital Equipment Corporation", /* 0x44 */ + "", "", "", "", "", "", "", "", /* 0x45 - 0x4c */ + "Motorola, Freescale Semicondutor Inc.", /* 0x4d */ + "", "", "", /* 0x4e - 0x50 */ + "Qualcomm Inc.", /* 0x51 */ + "", "", "", "", /* 0x52 - 0x55 */ + "Marvell Semiconductor", /* 0x56 */ + "", "", "", "", "", "", "", "", "", "", /* 0x57 - 0x60 */ + "", "", "", "", "", "", "", "", /* 0x61 - 0x68 */ + "Intel Corporation" /* 0x69 */ }; @@ -97,4 +100,23 @@ void cpu_arch_init(void) { +#if defined(PROCESSOR_armv7_a) + uint32_t control_reg = 0; + asm volatile ( + "mrc p15, 0, %[control_reg], c1, c0" + : [control_reg] "=r" (control_reg) + ); + + /* Turn off tex remap */ + control_reg &= ~CP15_R1_TRE_BIT; + /* Turn off accessed flag */ + control_reg &= ~(CP15_R1_AFE_BIT | CP15_R1_HA_ENABLE_BIT); + /* Enable caching */ + control_reg |= CP15_R1_CACHE_ENABLE_BIT; + + asm volatile ( + "mcr p15, 0, %[control_reg], c1, c0" + :: [control_reg] "r" (control_reg) + ); +#endif } @@ -112,11 +134,12 @@ cpu_arch_t * cpu_arch = &m->arch; - if ((cpu_arch->imp_num) > 0 && - (cpu_arch->imp_num < (imp_data_length + IMP_DATA_START_OFFSET))) { + const unsigned imp_offset = cpu_arch->imp_num - IMP_DATA_START_OFFSET; + + if (imp_offset < imp_data_length) { vendor = imp_data[cpu_arch->imp_num - IMP_DATA_START_OFFSET]; } - if ((cpu_arch->arch_num) > 0 && - (cpu_arch->arch_num < arch_data_length)) { + // TODO CPUs with arch_num == 0xf use CPUID scheme for identification + if (cpu_arch->arch_num < arch_data_length) { architecture = arch_data[cpu_arch->arch_num]; } Index: kernel/arch/arm32/src/exception.c =================================================================== --- kernel/arch/arm32/src/exception.c (revision 60d931d2ab10130e11bbd48f2a9b389bc4e76ec1) +++ kernel/arch/arm32/src/exception.c (revision 34511297c505e3db8e8d821daa74d5c4cb7abd4c) @@ -117,9 +117,24 @@ #ifdef HIGH_EXCEPTION_VECTORS -/** Activates use of high exception vectors addresses. */ +/** Activates use of high exception vectors addresses. + * + * "High vectors were introduced into some implementations of ARMv4 and are + * required in ARMv6 implementations. High vectors allow the exception vector + * locations to be moved from their normal address range 0x00000000-0x0000001C + * at the bottom of the 32-bit address space, to an alternative address range + * 0xFFFF0000-0xFFFF001C near the top of the address space. These alternative + * locations are known as the high vectors. + * + * Prior to ARMv6, it is IMPLEMENTATION DEFINED whether the high vectors are + * supported. When they are, a hardware configuration input selects whether + * the normal vectors or the high vectors are to be used from + * reset." ARM Architecture Reference Manual A2.6.11 (p. 64 in the PDF). + * + * ARM920T (gta02) TRM A2.3.5 (PDF p. 36) and ARM926EJ-S (icp) 2.3.2 (PDF p. 42) + * say that armv4 an armv5 chips that we support implement this. + */ static void high_vectors(void) { - uint32_t control_reg; - + uint32_t control_reg = 0; asm volatile ( "mrc p15, 0, %[control_reg], c1, c0" @@ -153,4 +168,5 @@ void exception_init(void) { + // TODO check for availability of high vectors for <= armv5 #ifdef HIGH_EXCEPTION_VECTORS high_vectors(); Index: kernel/arch/arm32/src/mach/beagleboardxm/beagleboardxm.c =================================================================== --- kernel/arch/arm32/src/mach/beagleboardxm/beagleboardxm.c (revision 34511297c505e3db8e8d821daa74d5c4cb7abd4c) +++ kernel/arch/arm32/src/mach/beagleboardxm/beagleboardxm.c (revision 34511297c505e3db8e8d821daa74d5c4cb7abd4c) @@ -0,0 +1,259 @@ +/* + * Copyright (c) 2012 Jan Vesely + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +/** @addtogroup arm32beagleboardxm + * @{ + */ +/** @file + * @brief BeagleBoard-xM platform driver. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static void bbxm_init(void); +static void bbxm_timer_irq_start(void); +static void bbxm_cpu_halt(void); +static void bbxm_get_memory_extents(uintptr_t *start, size_t *size); +static void bbxm_irq_exception(unsigned int exc_no, istate_t *istate); +static void bbxm_frame_init(void); +static void bbxm_output_init(void); +static void bbxm_input_init(void); +static size_t bbxm_get_irq_count(void); +static const char *bbxm_get_platform_name(void); + +#define BBXM_MEMORY_START 0x80000000 /* physical */ +#define BBXM_MEMORY_SIZE 0x20000000 /* 512 MB */ + +static struct beagleboard { + amdm37x_dispc_regs_t *dispc; + amdm37x_irc_regs_t *irc_addr; + amdm37x_uart_t uart; + amdm37x_gpt_t timer; +} beagleboard; + +struct arm_machine_ops bbxm_machine_ops = { + .machine_init = bbxm_init, + .machine_timer_irq_start = bbxm_timer_irq_start, + .machine_cpu_halt = bbxm_cpu_halt, + .machine_get_memory_extents = bbxm_get_memory_extents, + .machine_irq_exception = bbxm_irq_exception, + .machine_frame_init = bbxm_frame_init, + .machine_output_init = bbxm_output_init, + .machine_input_init = bbxm_input_init, + .machine_get_irq_count = bbxm_get_irq_count, + .machine_get_platform_name = bbxm_get_platform_name +}; + +static irq_ownership_t bb_timer_irq_claim(irq_t *irq) +{ + return IRQ_ACCEPT; +} + +static void bbxm_setup_fb(unsigned width, unsigned height, unsigned bpp) +{ + const unsigned pixel_bytes = (bpp / 8); + const size_t size = ALIGN_UP(width * height * pixel_bytes, FRAME_SIZE); + const unsigned frames = size / FRAME_SIZE; + unsigned order = 0; + unsigned frame = 1; + while (frame < frames) { + frame *= 2; + ++order; + } + printf("Allocating %d (2^%d) frames.\n", size, order); + /* prefer highmem as we don't care about virtual mapping. */ + void *buffer = frame_alloc(order, FRAME_LOWMEM); + ASSERT(buffer); + + amdm37x_dispc_setup_fb(beagleboard.dispc, width, height, bpp, + (uintptr_t) buffer); + + fb_properties_t prop = { + .addr = (uintptr_t)buffer, + .offset = 0, + .x = width, + .y = height, + .scan = width * pixel_bytes, + .visual = VISUAL_RGB_5_6_5_LE + }; + switch (bpp) + { + case 8: + prop.visual = VISUAL_INDIRECT_8; break; + case 16: + prop.visual = VISUAL_RGB_5_6_5_LE; break; + case 24: + prop.visual = VISUAL_BGR_8_8_8; break; + case 32: + prop.visual = VISUAL_RGB_8_8_8_0; break; + default: + printf("Invalid framebuffer bit depth: bailing out.\n"); + return; + } + outdev_t *fb_dev = fb_init(&prop); + if (fb_dev) + stdout_wire(fb_dev); + +} + +static void bb_timer_irq_handler(irq_t *irq) +{ + /* + * We are holding a lock which prevents preemption. + * Release the lock, call clock() and reacquire the lock again. + */ + amdm37x_gpt_irq_ack(&beagleboard.timer); + spinlock_unlock(&irq->lock); + clock(); + spinlock_lock(&irq->lock); +} + +static void bbxm_init(void) +{ + /* Initialize interrupt controller */ + beagleboard.irc_addr = + (void *) km_map(AMDM37x_IRC_BASE_ADDRESS, AMDM37x_IRC_SIZE, + PAGE_NOT_CACHEABLE); + ASSERT(beagleboard.irc_addr); + amdm37x_irc_init(beagleboard.irc_addr); + + /* Map display controller */ + beagleboard.dispc = (void*) km_map(AMDM37x_DISPC_BASE_ADDRESS, + AMDM37x_DISPC_SIZE, PAGE_NOT_CACHEABLE); + ASSERT(beagleboard.dispc); + + /* Initialize timer, pick timer1, because it is in always-power domain + * and has special capabilities for regular ticks */ + amdm37x_gpt_timer_ticks_init(&beagleboard.timer, + AMDM37x_GPT1_BASE_ADDRESS, AMDM37x_GPT1_SIZE, HZ); +} + +static void bbxm_timer_irq_start(void) +{ + /* Initialize timer IRQ */ + static irq_t timer_irq; + irq_initialize(&timer_irq); + timer_irq.devno = device_assign_devno(); + timer_irq.inr = AMDM37x_GPT1_IRQ; + timer_irq.claim = bb_timer_irq_claim; + timer_irq.handler = bb_timer_irq_handler; + irq_register(&timer_irq); + + /* Enable timer interrupt */ + amdm37x_irc_enable(beagleboard.irc_addr, AMDM37x_GPT1_IRQ); + + /* Start timer here */ + amdm37x_gpt_timer_ticks_start(&beagleboard.timer); +} + +static void bbxm_cpu_halt(void) +{ + while (1); +} + +/** Get extents of available memory. + * + * @param start Place to store memory start address (physical). + * @param size Place to store memory size. + */ +static void bbxm_get_memory_extents(uintptr_t *start, size_t *size) +{ + *start = BBXM_MEMORY_START; + *size = BBXM_MEMORY_SIZE; +} + +static void bbxm_irq_exception(unsigned int exc_no, istate_t *istate) +{ + const unsigned inum = amdm37x_irc_inum_get(beagleboard.irc_addr); + amdm37x_irc_irq_ack(beagleboard.irc_addr); + + irq_t *irq = irq_dispatch_and_lock(inum); + if (irq) { + /* The IRQ handler was found. */ + irq->handler(irq); + spinlock_unlock(&irq->lock); + } else { + /* Spurious interrupt.*/ + printf("cpu%d: spurious interrupt (inum=%d)\n", + CPU->id, inum); + } +} + +static void bbxm_frame_init(void) +{ +} + +static void bbxm_output_init(void) +{ +#ifdef CONFIG_FB + bbxm_setup_fb(CONFIG_BFB_WIDTH, CONFIG_BFB_HEIGHT, CONFIG_BFB_BPP); +#else + (void)bbxm_setup_fb; +#endif + /* UART3 is wired to external RS232 connector */ + const bool ok = amdm37x_uart_init(&beagleboard.uart, + AMDM37x_UART3_IRQ, AMDM37x_UART3_BASE_ADDRESS, AMDM37x_UART3_SIZE); + if (ok) { + stdout_wire(&beagleboard.uart.outdev); + } +} + +static void bbxm_input_init(void) +{ + srln_instance_t *srln_instance = srln_init(); + if (srln_instance) { + indev_t *sink = stdin_wire(); + indev_t *srln = srln_wire(srln_instance, sink); + amdm37x_uart_input_wire(&beagleboard.uart, srln); + amdm37x_irc_enable(beagleboard.irc_addr, AMDM37x_UART3_IRQ); + } +} + +size_t bbxm_get_irq_count(void) +{ + return AMDM37x_IRC_IRQ_COUNT; +} + +const char *bbxm_get_platform_name(void) +{ + return "beagleboardxm"; +} + +/** + * @} + */ Index: kernel/arch/arm32/src/machine_func.c =================================================================== --- kernel/arch/arm32/src/machine_func.c (revision 60d931d2ab10130e11bbd48f2a9b389bc4e76ec1) +++ kernel/arch/arm32/src/machine_func.c (revision 34511297c505e3db8e8d821daa74d5c4cb7abd4c) @@ -42,4 +42,5 @@ #include #include +#include /** Pointer to machine_ops structure being used. */ @@ -55,4 +56,6 @@ #elif defined(MACHINE_integratorcp) machine_ops = &icp_machine_ops; +#elif defined(MACHINE_beagleboardxm) + machine_ops = &bbxm_machine_ops; #else #error Machine type not defined. @@ -131,4 +134,10 @@ } +const char * machine_get_platform_name(void) +{ + if (machine_ops->machine_get_platform_name) + return machine_ops->machine_get_platform_name(); + return NULL; +} /** @} */ Index: kernel/arch/arm32/src/mm/page.c =================================================================== --- kernel/arch/arm32/src/mm/page.c (revision 60d931d2ab10130e11bbd48f2a9b389bc4e76ec1) +++ kernel/arch/arm32/src/mm/page.c (revision 34511297c505e3db8e8d821daa74d5c4cb7abd4c) @@ -52,14 +52,16 @@ void page_arch_init(void) { - int flags = PAGE_CACHEABLE; + int flags = PAGE_CACHEABLE | PAGE_EXEC; page_mapping_operations = &pt_mapping_operations; page_table_lock(AS_KERNEL, true); - uintptr_t cur; - /* Kernel identity mapping */ - for (cur = PHYSMEM_START_ADDR; - cur < min(config.identity_size, config.physmem_end); + //FIXME: We need to consider the possibility that + //identity_base > identity_size and physmem_end. + //This might lead to overflow if identity_size is too big. + for (uintptr_t cur = PHYSMEM_START_ADDR; + cur < min(KA2PA(config.identity_base) + + config.identity_size, config.physmem_end); cur += FRAME_SIZE) page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, flags); Index: kernel/arch/arm32/src/mm/page_fault.c =================================================================== --- kernel/arch/arm32/src/mm/page_fault.c (revision 60d931d2ab10130e11bbd48f2a9b389bc4e76ec1) +++ kernel/arch/arm32/src/mm/page_fault.c (revision 34511297c505e3db8e8d821daa74d5c4cb7abd4c) @@ -42,27 +42,38 @@ #include -/** Returns value stored in fault status register. +/** Returns value stored in comnbined/data fault status register. * * @return Value stored in CP15 fault status register (FSR). + * + * "VMSAv6 added a fifth fault status bit (bit[10]) to both the IFSR and DFSR. + * It is IMPLEMENTATION DEFINED how this bit is encoded in earlier versions of + * the architecture. A write flag (bit[11] of the DFSR) has also been + * introduced." + * ARM Architecture Reference Manual version i ch. B4.6 (PDF p. 719) + * + * See ch. B4.9.6 for location of data/instruction FSR. + * */ -static inline fault_status_t read_fault_status_register(void) +static inline fault_status_t read_data_fault_status_register(void) { - fault_status_union_t fsu; + fault_status_t fsu; - /* fault status is stored in CP15 register 5 */ + /* Combined/Data fault status is stored in CP15 register 5, c0. */ asm volatile ( "mrc p15, 0, %[dummy], c5, c0, 0" - : [dummy] "=r" (fsu.dummy) + : [dummy] "=r" (fsu.raw) ); - return fsu.fs; + return fsu; } -/** Returns FAR (fault address register) content. +/** Returns DFAR (fault address register) content. * - * @return FAR (fault address register) content (address that caused a page + * This register is equivalent to FAR on pre armv6 machines. + * + * @return DFAR (fault address register) content (address that caused a page * fault) */ -static inline uintptr_t read_fault_address_register(void) +static inline uintptr_t read_data_fault_address_register(void) { uintptr_t ret; @@ -77,4 +88,5 @@ } +#if defined(PROCESSOR_armv4) | defined(PROCESSOR_armv5) /** Decides whether read or write into memory is requested. * @@ -97,5 +109,5 @@ panic("page_fault - instruction does not access memory " "(instr_code: %#0" PRIx32 ", badvaddr:%p).", - instr_union.pc, (void *) badvaddr); + *(uint32_t*)instr_union.instr, (void *) badvaddr); return PF_ACCESS_EXEC; } @@ -136,4 +148,5 @@ inst, (void *) badvaddr); } +#endif /** Handles "data abort" exception (load or store at invalid address). @@ -145,10 +158,15 @@ void data_abort(unsigned int exc_no, istate_t *istate) { - fault_status_t fsr __attribute__ ((unused)) = - read_fault_status_register(); - uintptr_t badvaddr = read_fault_address_register(); + uintptr_t badvaddr = read_data_fault_address_register(); - pf_access_t access = get_memory_access_type(istate->pc, badvaddr); - +#if defined(PROCESSOR_armv6) | defined(PROCESSOR_armv7_a) + fault_status_t fsr = read_data_fault_status_register(); + const pf_access_t access = + fsr.data.wr ? PF_ACCESS_WRITE : PF_ACCESS_READ; +#elif defined(PROCESSOR_armv4) | defined(PROCESSOR_armv5) + const pf_access_t access = get_memory_access_type(istate->pc, badvaddr); +#else +#error "Unsupported architecture" +#endif int ret = as_page_fault(badvaddr, access, istate); @@ -167,4 +185,5 @@ void prefetch_abort(unsigned int exc_no, istate_t *istate) { + /* NOTE: We should use IFAR and IFSR here. */ int ret = as_page_fault(istate->pc, PF_ACCESS_EXEC, istate);