From: "Kweh, Hock Leong" <hock.leong.kweh@intel.com>
To: "Bryan O'Donoghue" <pure.logic@nexus-software.ie>,
Borislav Petkov <bp@alien8.de>
Cc: Matt Fleming <matt@console-pimps.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
"Ong, Boon Leong" <boon.leong.ong@intel.com>,
LKML <linux-kernel@vger.kernel.org>,
"linux-efi@vger.kernel.org" <linux-efi@vger.kernel.org>,
Sam Protsenko <semen.protsenko@linaro.org>,
Peter Jones <pjones@redhat.com>,
Andy Lutomirski <luto@amacapital.net>,
"Roy Franz" <roy.franz@linaro.org>,
James Bottomley <James.Bottomley@hansenpartnership.com>,
Linux FS Devel <linux-fsdevel@vger.kernel.org>,
"Fleming, Matt" <matt.fleming@intel.com>
Subject: RE: [PATCH v7 1/2] efi: export efi_capsule_supported() function symbol
Date: Tue, 6 Oct 2015 10:53:46 +0000 [thread overview]
Message-ID: <F54AEECA5E2B9541821D670476DAE19C4A864B5D@PGSMSX102.gar.corp.intel.com> (raw)
In-Reply-To: <5612EB38.2050209@nexus-software.ie>
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="utf-8", Size: 3493 bytes --]
> -----Original Message-----
> From: Bryan O'Donoghue [mailto:pure.logic@nexus-software.ie]
> Sent: Tuesday, October 06, 2015 5:27 AM
>
> Wilson - trying to test this out on a Galileo Gen2 - which branch are you doing
> this against ?
>
> I can apply the first patch you're proposing to squash your commit into
>
> https://lkml.org/lkml/diff/2014/10/7/390/1
>
> but then trying to apply the first in your series on top of that patch I get
>
> deckard@aineko:~/Development/linux$ git
> apply ../patches/capsule_wilson/1_2.eml
> ../patches/capsule_wilson/1_2.eml:72: trailing whitespace.
> EXPORT_SYMBOL_GPL(efi_capsule_supported);
> error: drivers/firmware/efi/capsule.c: No such file or directory
>
> https://kernel.googlesource.com/pub/scm/linux/kernel/git/mfleming/efi/+/
> capsule/drivers/firmware/efi/capsule.c
>
>
> ??
If you are applying Matt's patch https://lkml.org/lkml/diff/2014/10/7/390/1 which
had been created 1 year ago to mainline vanilla kernel (Linux 4.3-rc4), you are not
able to direct patch in due to the Makefile error below:
~/MyWorks/linux_mainline$ git apply .git/rebase-apply/0001 --reject
Checking patch arch/x86/kernel/reboot.c...
Hunk #1 succeeded at 527 (offset 11 lines).
Checking patch drivers/firmware/efi/Makefile...
error: while searching for:
#
# Makefile for linux kernel
#
obj-$(CONFIG_EFI) += efi.o vars.o reboot.o
obj-$(CONFIG_EFI_VARS) += efivars.o
obj-$(CONFIG_EFI_VARS_PSTORE) += efi-pstore.o
obj-$(CONFIG_UEFI_CPER) += cper.o
error: patch failed: drivers/firmware/efi/Makefile:1
Checking patch drivers/firmware/efi/capsule.c...
Checking patch drivers/firmware/efi/reboot.c...
Checking patch include/linux/efi.h...
Hunk #1 succeeded at 122 (offset 3 lines).
Hunk #2 succeeded at 983 (offset 23 lines).
Hunk #3 succeeded at 1235 (offset 23 lines).
Hunk #4 succeeded at 1317 (offset 23 lines).
Applied patch arch/x86/kernel/reboot.c cleanly.
Applying patch drivers/firmware/efi/Makefile with 1 rejects...
Rejected hunk #1.
Applied patch drivers/firmware/efi/capsule.c cleanly.
Applied patch drivers/firmware/efi/reboot.c cleanly.
Applied patch include/linux/efi.h cleanly.
You should resolve the Makefile error and then git add 5 files below:
- arch/x86/kernel/reboot.c
- drivers/firmware/efi/Makefile
- drivers/firmware/efi/reboot.c
- include/linux/efi.h
- drivers/firmware/efi/capsule.c
then you are able to patch in my patchset.
>
> If so - then why not use the interface here ?
> https://kernel.googlesource.com/pub/scm/linux/kernel/git/mfleming/efi/+/
> capsule
>
> (Sorry I know I'm coming to this thread late)
>
> Aside from that, I'm curious which types of capsules you've used here too -
> does it include the MFH header ? Keep in mind the initial firmware that
> shipped with Galileo will depend on that MFH being present.
>
> http://download.intel.com/support/processors/quark/sb/quark_secureboot
> prm_330234_001.pdf
> - Section A1 - table 7 ?
>
> So if we boot a 4.x kernel with that initial firmware version 0.75 if memory
> serves - it's important that the capsule.c code handles the MFH.
>
Already got agreement with Matt that Quark Security Header patch will not
be upstream to mainline as it is not a standard header. So Intel will carry this
patch ourselves.
Thanks & Regards,
Wilson
ÿôèº{.nÇ+·®+%Ëÿ±éݶ\x17¥wÿº{.nÇ+·¥{±þG«éÿ{ayº\x1dÊÚë,j\a¢f£¢·hïêÿêçz_è®\x03(éÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?¨èÚ&£ø§~á¶iOæ¬z·vØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?I¥
next prev parent reply other threads:[~2015-10-06 10:54 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-05 20:15 [PATCH v7 0/2] Enable capsule loader interface for efi firmware updating Kweh, Hock Leong
2015-10-05 20:15 ` [PATCH v7 1/2] efi: export efi_capsule_supported() function symbol Kweh, Hock Leong
2015-10-05 13:13 ` Borislav Petkov
2015-10-05 15:19 ` Kweh, Hock Leong
2015-10-05 21:27 ` Bryan O'Donoghue
2015-10-06 10:53 ` Kweh, Hock Leong [this message]
2015-10-06 14:53 ` Bryan O'Donoghue
2015-10-07 2:01 ` Kweh, Hock Leong
2015-10-07 8:27 ` Bryan O'Donoghue
2015-10-10 22:02 ` Matt Fleming
2015-10-11 14:28 ` Kweh, Hock Leong
2015-10-11 19:03 ` Matt Fleming
2015-10-05 20:15 ` [PATCH v7 2/2] efi: a misc char interface for user to update efi firmware Kweh, Hock Leong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=F54AEECA5E2B9541821D670476DAE19C4A864B5D@PGSMSX102.gar.corp.intel.com \
--to=hock.leong.kweh@intel.com \
--cc=James.Bottomley@hansenpartnership.com \
--cc=boon.leong.ong@intel.com \
--cc=bp@alien8.de \
--cc=gregkh@linuxfoundation.org \
--cc=linux-efi@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@amacapital.net \
--cc=matt.fleming@intel.com \
--cc=matt@console-pimps.org \
--cc=pjones@redhat.com \
--cc=pure.logic@nexus-software.ie \
--cc=roy.franz@linaro.org \
--cc=semen.protsenko@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).