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

[bharder <bharder%methodlogic.net@localhost>]

On Tue, Apr 20, 2010 at 12:17:31AM +0200, Jean-Yves Migeon wrote:
> On 04/19/10 17:26, Dennis Ferguson wrote:
> >
> >On 19 Apr 2010, at 23:09 , Manuel Bouyer wrote:
> >>RTC BIOS diagnostic error 0x11<memory_size>
> >>mainbus0 (root)
> >>cpu0 at mainbus0 apid 0: Intel 686-class, 2327MHz, id 0x6fb
> >>cpu1 at mainbus0 apid 1<reboot here>
> >>
> >>With boot -1, the boot completes.
> >
> >Yes, so does mine.  And it isn't unlikely that mine stops
> >on the cpu1 line rather than the cpu0 line too, on a video
> >console it is on the screen for only a tiny bit of time and
> >I had to watch it boot a half dozen times before I managed
> >to get my eyes to see anything at all.
> 
> Please try this one:

Seems to work for me...

-bch

> Index: sys/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
> --- sys/arch/amd64/amd64/mptramp.S      18 Apr 2010 23:47:50 -0000      1.11
> +++ sys/arch/amd64/amd64/mptramp.S      19 Apr 2010 22:16:44 -0000
> @@ -166,7 +166,7 @@
>         movl    $MSR_EFER,%ecx
>         rdmsr
>         xorl    %eax,%eax
> -       orl     $(EFER_LME|EFER_SCE),%eax
> +       orl     $(EFER_LME|EFER_SCE|EFER_NXE),%eax
>         wrmsr
> 
>         movl    RELOC(mp_pdirpa),%ecx   # guaranteed < 4G
> 
> 
> This is a workaround, until I work out this problem with a cleaner solution.
> 

-- 

Brad Harder,
Method Logic Digital Consulting
http://www.methodlogic.net
http://twitter.com/bcharder