Re: Today's -current no longer boots on my amd64 machine

[Jean-Yves Migeon <jeanyves.migeon%free.fr@localhost>]

On 04/20/10 00:37, Joerg Sonnenberger wrote:
> On Tue, Apr 20, 2010 at 12:17:31AM +0200, Jean-Yves Migeon wrote:
> > Please try this one:
>
> See the comment in acpi/acpi_wakecode.S why this isn't enough.

Yep I know, and I also have to check about the CPUID_NOX feature of cpuid.

Index: arch/amd64/amd64/mptramp.S
===================================================================
RCS file: /cvsroot/src/sys/arch/amd64/amd64/mptramp.S,v
retrieving revision 1.11
diff -u -u -r1.11 mptramp.S
--- arch/amd64/amd64/mptramp.S  18 Apr 2010 23:47:50 -0000      1.11
+++ arch/amd64/amd64/mptramp.S  19 Apr 2010 23:49:19 -0000
@@ -223,6 +223,14 @@
        testq   %rdi, %rdi
        jz      1b

+       movl    _C_LABEL(cpu_feature)+2*4,%eax  /* cpu_feature[2] */
+       andl    $CPUID_NOX,%eax
+       jz      1f
+       movl    $MSR_EFER,%ecx
+       rdmsr
+       orl     $EFER_NXE,%eax  /* enable No-Execute feature */
+       wrmsr
+
 1:
        movq    CPU_INFO_IDLELWP(%rdi),%rsi
        movq    L_PCB(%rsi),%rsi


--
Jean-Yves Migeon
jeanyves.migeon%free.fr@localhost