Re: "x86/boot/compressed/64: Prepare trampoline memory" breaks boot on Zotac CI-321

[Heiner Kallweit]

Am 03.03.2018 um 11:02 schrieb Ingo Molnar:
> 
> * Heiner Kallweit <hkallweit1@xxxxxxxxx> wrote:
> 
>> Am 03.03.2018 um 00:50 schrieb Dexuan-Linux Cui:
>>> On Fri, Mar 2, 2018 at 12:57 PM, Heiner Kallweit <hkallweit1@xxxxxxxxx <mailto:hkallweit1@xxxxxxxxx>> wrote:
>>>
>>>     Recently my Mini PC Zotac CI-321 started to reboot immediately before
>>>     anything was written to the console.
>>>
>>>     Bisecting lead to b91993a87aff "x86/boot/compressed/64: Prepare
>>>     trampoline memory" being the change breaking boot.
>>>
>>>     If you need any more information, please let me know.
>>>
>>>     Rgds, Heiner
>>>
>>>
>>> This may fix the issue: https://lkml.org/lkml/2018/2/13/668
>>>
>>> Kirill posted a v2 patchset 3 days ago and I suppose the patchset should include the fix.
>>>
>> Thanks for the link. I bisected based on the latest next kernel including
>> v2 of the patchset (IOW - the potential fix is included already).
> 
> Are you sure? b91993a87aff is the old patch-set - which I just removed from -next 
> and which should thus be gone in the Monday iteration of -next.
> 
> I have not merged v2 in -tip yet, did it get applied via some other tree?
> 
> Thanks,
> 
> 	Ingo
> 
I wanted to apply the fix mentioned in the link but found that the statement was movq already.
Therefore my (most likely false) understanding that it's v2.
I'll re-test once v2 is out and let you know.

Rgds, Heiner


 diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
 index 70b30f2bc9e0..99a0e7993252 100644
 --- a/arch/x86/boot/compressed/head_64.S
 +++ b/arch/x86/boot/compressed/head_64.S
 @@ -332,7 +332,7 @@ ENTRY(startup_64)
 
  	/* Make sure we have GDT with 32-bit code segment */
  	leaq	gdt(%rip), %rax
 -	movl	%eax, gdt64+2(%rip)
 +	movq	%rax, gdt64+2(%rip)
  	lgdt	gdt64(%rip)
 
  	/*
 -- 
  Kirill A. Shutemov