oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Preparations for PAE support

Browse Source 
Change-Id: I9a7c9ed9f803e2e26d745d14149a8aec64ab0c75
This commit is contained in:
rlfnb 2016-07-12 17:20:41 +02:00 committed by Lionel Sambuc
parent e70e5a1722
commit bf609e1012
10 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
minix/include/arch/i386/include/vm.h
View File

@ -74,6 +74,7 @@ i386/vm.h
#define CPUID1_EDX_FPU (1L) /* FPU presence */
#define CPUID1_EDX_PSE (1L << 3) /* Page Size Extension */
#define CPUID1_EDX_SYSENTER (1L << 11) /* Intel SYSENTER */
#define CPUID1_EDX_PAE (1L << 6) /* Physical Address Extension */
#define CPUID1_EDX_PGE (1L << 13) /* Page Global (bit) Enable */
#define CPUID1_EDX_APIC_ON_CHIP (1L << 9) /* APIC is present on the chip */
#define CPUID1_EDX_TSC (1L << 4) /* Timestamp counter present */

2
minix/include/minix/cpufeature.h
View File

@ -25,6 +25,8 @@
#define _CPUF_I386_SYSENTER 16 /* Intel SYSENTER instrs */
#define _CPUF_I386_SYSCALL 17 /* AMD SYSCALL instrs */
#define _CPUF_I386_PAE 18 /* Page Address Extension */
int _cpufeature(int featureno);
#endif

4
minix/kernel/Makefile
View File

@ -43,6 +43,10 @@ CPPFLAGS+= -I${NETBSDSRCDIR}/minix/include/arch/${MACHINE_ARCH}/include
.include "system/Makefile.inc"
.if ${MKPAE:Uno} != "no"
CPPFLAGS+= -DPAE=1
.endif
.ifdef CONFIG_SMP
SRCS+= smp.c
.endif

1
minix/kernel/arch/i386/arch_reset.c
View File

@ -11,7 +11,6 @@
#include <sys/reboot.h>
#include <assert.h>
#include <signal.h>
#include <machine/vm.h>
#include <minix/u64.h>

5
minix/kernel/arch/i386/pg_utils.c
View File

@ -208,6 +208,11 @@ void vm_enable_paging(void)
pgeok = _cpufeature(_CPUF_I386_PGE);
#ifdef PAE
if(_cpufeature(_CPUF_I386_PAE) == 0)
panic("kernel built with PAE support, CPU seems to lack PAE support?\n");
#endif
cr0= read_cr0();
cr4= read_cr4();

3
minix/kernel/main.c
View File

@ -337,6 +337,9 @@ static void announce(void)
{
/* Display the MINIX startup banner. */
printf("\nMINIX %s. "
#ifdef PAE
"(PAE) "
#endif
#ifdef _VCS_REVISION
"(" _VCS_REVISION ")\n"
#endif

2
minix/lib/libc/arch/i386/_cpufeature.c
View File

@ -51,6 +51,8 @@ int _cpufeature(int cpufeature)
switch(cpufeature) {
case _CPUF_I386_PSE:
return edx & CPUID1_EDX_PSE;
case _CPUF_I386_PAE:
return edx & CPUID1_EDX_PAE;
case _CPUF_I386_PGE:
return edx & CPUID1_EDX_PGE;
case _CPUF_I386_APIC_ON_CHIP:

2
minix/lib/libmagicrt/include/st/state_transfer.h
View File

@ -40,7 +40,7 @@ typedef struct _st_init_info_t {
typedef struct st_alloc_pages {
int num_pages;
void *virt_addr;
uint32_t phys_addr;
phys_bytes phys_addr;
struct st_alloc_pages *previous;
} st_alloc_pages;

4
minix/servers/vm/Makefile
View File

@ -12,6 +12,10 @@ SRCS= main.c alloc.c utility.c exit.c fork.c break.c \
LDFLAGS+= -T ${.CURDIR}/arch/${MACHINE_ARCH}/vm.lds
.endif
.if ${MKPAE:Uno} != "no"
CPPFLAGS+= -DPAE=1
.endif
DPADD+= ${LIBSYS} ${LIBEXEC}
LDADD+= -lsys -lexec

6
share/mk/bsd.own.mk
View File

@ -1268,7 +1268,7 @@ _MKVARS.yes+= \
MKSYSDEBUG MKLIVEUPDATE MKLWIP MKLLVMCMDS
.if (${MACHINE_ARCH} == "i386")
_MKVARS.yes+= \
MKWATCHDOG MKACPI MKAPIC MKDEBUGREG MKINSTALLBOOT MKPCI
MKWATCHDOG MKACPI MKPAE MKAPIC MKDEBUGREG MKINSTALLBOOT MKPCI
.endif
.for var in ${_MKVARS.yes}
@ -1309,7 +1309,7 @@ _MKVARS.no+= \
MKIMAGEONLY MKSMALL MKBITCODE MKMAGIC MKASR MKSRC
.if !empty(MACHINE_ARCH:Mearm*)
_MKVARS.no+= \
MKWATCHDOG MKACPI MKAPIC MKDEBUGREG MKINSTALLBOOT MKPCI
MKWATCHDOG MKPAE MKACPI MKAPIC MKDEBUGREG MKINSTALLBOOT MKPCI
.endif
.for var in ${_MKVARS.no}
@ -1497,7 +1497,7 @@ ${var}?= yes
#MINIX-specific vars
.for var in \
USE_WATCHDOG USE_ACPI USE_APIC USE_DEBUGREG USE_SYSDEBUG \
USE_WATCHDOG USE_ACPI USE_PAE USE_APIC USE_DEBUGREG USE_SYSDEBUG \
USE_LIVEUPDATE USE_PCI USE_BITCODE USE_MAGIC USE_ASR
.if (${${var:S/USE_/MK/}} == "no")
${var}:= no