Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1194081 > unrolled thread

[PATCH 3.10 ~ 3.14] efi: fix the efi 32bit boot failed problem

Started by<fupan.li@windriver.com>
First post2015-07-28 12:30 +0200
Last post2015-08-03 04:20 +0200
Articles 4 — 3 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH 3.10 ~ 3.14] efi: fix the efi 32bit boot failed problem <fupan.li@windriver.com> - 2015-07-28 12:30 +0200
    Re: [PATCH 3.10 ~ 3.14] efi: fix the efi 32bit boot failed problem Matt Fleming <matt@codeblueprint.co.uk> - 2015-07-30 17:10 +0200
      Re: [PATCH 3.10 ~ 3.14] efi: fix the efi 32bit boot failed problem fupan <fupan.li@windriver.com> - 2015-08-03 03:50 +0200
      Re: [PATCH 3.10 ~ 3.14] efi: fix the efi 32bit boot failed problem fupan <fupan.li@windriver.com> - 2015-08-03 04:20 +0200

#1194081 — [PATCH 3.10 ~ 3.14] efi: fix the efi 32bit boot failed problem

From<fupan.li@windriver.com>
Date2015-07-28 12:30 +0200
Subject[PATCH 3.10 ~ 3.14] efi: fix the efi 32bit boot failed problem
Message-ID<pRaj2-6q0-79@gated-at.bofh.it>
From: fli <fupan.li@windriver.com>

The commit 35d5134b7d5a55e269c953096224248b9f6f72c2
Author: Matt Fleming <matt@console-pimps.org>
Date:   Tue Apr 8 13:14:00 2014 +0100

    x86/efi: Correct EFI boot stub use of code32_start

imported a bug, which should use the label's address instead
of the value stored in the label's address to caculate the
code32_start address.

Signed-off-by: fli <fupan.li@windriver.com>
---
 arch/x86/boot/compressed/head_32.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
index abb988a..3b28eff 100644
--- a/arch/x86/boot/compressed/head_32.S
+++ b/arch/x86/boot/compressed/head_32.S
@@ -54,7 +54,7 @@ ENTRY(efi_pe_entry)
 	call	reloc
 reloc:
 	popl	%ecx
-	subl	reloc, %ecx
+	subl	$reloc, %ecx
 	movl	%ecx, BP_code32_start(%eax)
 
 	sub	$0x4, %esp
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [next] | [standalone]


#1196113

FromMatt Fleming <matt@codeblueprint.co.uk>
Date2015-07-30 17:10 +0200
Message-ID<pRXD5-1Xv-37@gated-at.bofh.it>
In reply to#1194081
(Add linux-efi, Luis and Greg)

On Tue, 28 Jul, at 06:21:19PM, fupan.li@windriver.com wrote:
> From: fli <fupan.li@windriver.com>
> 
> The commit 35d5134b7d5a55e269c953096224248b9f6f72c2
> Author: Matt Fleming <matt@console-pimps.org>
> Date:   Tue Apr 8 13:14:00 2014 +0100
> 
>     x86/efi: Correct EFI boot stub use of code32_start
> 
> imported a bug, which should use the label's address instead
> of the value stored in the label's address to caculate the
> code32_start address.
> 
> Signed-off-by: fli <fupan.li@windriver.com>
> ---
>  arch/x86/boot/compressed/head_32.S | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
> index abb988a..3b28eff 100644
> --- a/arch/x86/boot/compressed/head_32.S
> +++ b/arch/x86/boot/compressed/head_32.S
> @@ -54,7 +54,7 @@ ENTRY(efi_pe_entry)
>  	call	reloc
>  reloc:
>  	popl	%ecx
> -	subl	reloc, %ecx
> +	subl	$reloc, %ecx
>  	movl	%ecx, BP_code32_start(%eax)
>  
>  	sub	$0x4, %esp

Woa, nice catch!

The commit message could do with a little work however. In particular
the usual way to refer to a commit is like this: commit 35d5134b7d5a
("x86/efi: Correct EFI boot stub use of code32_start"). And the
Signed-off-by line should contain your full name.

Luis, Greg, what is the procedure for submitting a patch that is only
required for stable?

-- 
Matt Fleming, Intel Open Source Technology Center
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]


#1198488

Fromfupan <fupan.li@windriver.com>
Date2015-08-03 03:50 +0200
Message-ID<pTd33-4V9-9@gated-at.bofh.it>
In reply to#1196113
On 07/31/2015 08:21 PM, Luis Henriques wrote:
> On Fri, Jul 31, 2015 at 01:05:19PM +0100, Matt Fleming wrote:
>> On Fri, 31 Jul, at 09:22:33AM, fupan wrote:
>>> Hi, Matt
>>>
>>> Will you take care of this patch or I send a V2?
>>   
>> Could you please send a V2 with the changes to the commit message that I
>> suggested previously? Thanks!
>>
> I'm replying to this thread simply to include Jiri on the CC list as I
> believe 3.12 will also require this fix.  Please make sure he's in the
> list for the v2.
Hi, Luís

No problem.

BTW, actually all of the branch from 3.10 to 3.14 will need this fix.

Fupan
>
> [ It looks like the 3.16 kernel I'm maintaining isn't affected, BTW. ]
>
> Cheers,
> --
> Luís
>
>

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]


#1198493

Fromfupan <fupan.li@windriver.com>
Date2015-08-03 04:20 +0200
Message-ID<pTdw5-5Po-5@gated-at.bofh.it>
In reply to#1196113
On 07/31/2015 08:05 PM, Matt Fleming wrote:
> On Fri, 31 Jul, at 09:22:33AM, fupan wrote:
>> Hi, Matt
>>
>> Will you take care of this patch or I send a V2?
>   
> Could you please send a V2 with the changes to the commit message that I
> suggested previously? Thanks!
>
NP!

Thanks!

Fupan
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web