| Message ID | 20150423144948.GA13435@fluid.dannf |
|---|---|
| State | New |
| Headers | show |
On Thu, Apr 23, 2015 at 08:49:48AM -0600, dann frazier wrote: > This is a resubmittal of the arm64 EFI stub support changes. > > v2 changes: > * Use git cherry-pick -x to generate clean cherry pick commits. > * Use "backported from" notation when cherry picks are not clean. > * Add a [Config] commit, generated by updateconfigs. > * Other than the config update, code is identical to the > arm64-efi branch from the initial submission. > Thanks for resubmitting. I spend some time reviewing this patchset and it looks sane to me. Collin also did some smoke test in this v2 on some x86 EFI platforms (thanks Collin!) and no regressions were found. Although this a big patchset, and since it doesn't break non-EFI arm64 systems (as Dann's has tested this too), here's my: Acked-by: Luis Henriques <luis.henriques@canonical.com> Cheers, -- Luís > The following changes since commit ca13cad7da7caa499f54e2d2bd458b2441276fe1: > > Linux 3.13.11-ckt18 (2015-04-07 12:22:35 -0700) > > are available in the git repository at: > > git://kernel.ubuntu.com/dannf/trusty-xgene.git arm64-efi-cleaner > > for you to fetch changes up to 54216ebf255273dcefba57b49569b63651b5e9da: > > arm64: efi: only attempt efi map setup if booting via EFI (2015-04-23 08:23:23 -0600) > > ---------------------------------------------------------------- > Ard Biesheuvel (1): > efi/arm64: ignore dtb= when UEFI SecureBoot is enabled > > Leif Lindholm (2): > doc: arm: add UEFI support documentation > arm64: efi: only attempt efi map setup if booting via EFI > > Marc Zyngier (1): > arm64: fixmap: fix missing sub-page offset for earlyprintk > > Mark Salter (11): > add generic fixmap.h > mm: create generic early_ioremap() support > arm64: initialize pgprot info earlier in boot > arm64: add early_ioremap support > efi: create memory map iteration helper > lib: add fdt_empty_tree.c > efi: add helper function to get UEFI params from FDT > arm64: Add function to create identity mappings > arm64: add EFI runtime services > arm64: efi: add EFI stub > doc: arm64: add description of EFI stub support > > Roy Franz (3): > efi: Add get_dram_base() helper function > doc: efi-stub.txt updates for ARM > efi: Add shared FDT related functions for ARM/ARM64 > > dann frazier (3): > UBUNTU: [Config] CONFIG_{EFI_PARAMS_FROM_FDT,GENERIC_EARLY_IOREMAP,LIBFDT}=y > UBUNTU: Move get_dram_base to arm private file > UBUNTU: arm64: Implement efi_enabled() > > Documentation/arm/00-INDEX | 2 + > Documentation/arm/uefi.txt | 64 ++++ > Documentation/arm64/booting.txt | 4 + > Documentation/arm64/memory.txt | 4 +- > Documentation/efi-stub.txt | 33 ++- > arch/arm64/Kconfig | 17 ++ > arch/arm64/include/asm/Kbuild | 1 + > arch/arm64/include/asm/efi.h | 15 + > arch/arm64/include/asm/fixmap.h | 67 +++++ > arch/arm64/include/asm/io.h | 1 + > arch/arm64/include/asm/memory.h | 2 +- > arch/arm64/include/asm/mmu.h | 3 + > arch/arm64/kernel/Makefile | 3 + > arch/arm64/kernel/early_printk.c | 4 +- > arch/arm64/kernel/efi-entry.S | 109 +++++++ > arch/arm64/kernel/efi-stub.c | 87 ++++++ > arch/arm64/kernel/efi.c | 478 ++++++++++++++++++++++++++++++ > arch/arm64/kernel/head.S | 121 +++++++- > arch/arm64/kernel/setup.c | 9 + > arch/arm64/mm/ioremap.c | 86 +++++- > arch/arm64/mm/mmu.c | 99 +++---- > debian.master/config/config.common.ubuntu | 3 + > drivers/firmware/efi/Kconfig | 7 + > drivers/firmware/efi/arm-stub.c | 291 ++++++++++++++++++ > drivers/firmware/efi/efi-stub-helper.c | 7 + > drivers/firmware/efi/efi.c | 79 +++++ > drivers/firmware/efi/fdt.c | 285 ++++++++++++++++++ > include/asm-generic/early_ioremap.h | 42 +++ > include/asm-generic/fixmap.h | 100 +++++++ > include/linux/efi.h | 20 +- > lib/Makefile | 3 +- > lib/fdt_empty_tree.c | 2 + > mm/Kconfig | 3 + > mm/Makefile | 1 + > mm/early_ioremap.c | 245 +++++++++++++++ > 35 files changed, 2221 insertions(+), 76 deletions(-) > create mode 100644 Documentation/arm/uefi.txt > create mode 100644 arch/arm64/include/asm/efi.h > create mode 100644 arch/arm64/include/asm/fixmap.h > create mode 100644 arch/arm64/kernel/efi-entry.S > create mode 100644 arch/arm64/kernel/efi-stub.c > create mode 100644 arch/arm64/kernel/efi.c > create mode 100644 drivers/firmware/efi/arm-stub.c > create mode 100644 drivers/firmware/efi/fdt.c > create mode 100644 include/asm-generic/early_ioremap.h > create mode 100644 include/asm-generic/fixmap.h > create mode 100644 lib/fdt_empty_tree.c > create mode 100644 mm/early_ioremap.c > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team
Looks good to me, especially given the regression testing done by C. King.
Applied this patchset to Trusty master-next branch with a small
change: I moved patch
"UBUNTU: [Config] CONFIG_{EFI_PARAMS_FROM_FDT,GENERIC_EARLY_IOREMAP,LIBFDT}=y"
to the top.
Cheers,
--
Luís
On Thu, Apr 23, 2015 at 08:49:48AM -0600, dann frazier wrote:
> This is a resubmittal of the arm64 EFI stub support changes.
>
> v2 changes:
> * Use git cherry-pick -x to generate clean cherry pick commits.
> * Use "backported from" notation when cherry picks are not clean.
> * Add a [Config] commit, generated by updateconfigs.
> * Other than the config update, code is identical to the
> arm64-efi branch from the initial submission.
>
> The following changes since commit ca13cad7da7caa499f54e2d2bd458b2441276fe1:
>
> Linux 3.13.11-ckt18 (2015-04-07 12:22:35 -0700)
>
> are available in the git repository at:
>
> git://kernel.ubuntu.com/dannf/trusty-xgene.git arm64-efi-cleaner
>
> for you to fetch changes up to 54216ebf255273dcefba57b49569b63651b5e9da:
>
> arm64: efi: only attempt efi map setup if booting via EFI (2015-04-23 08:23:23 -0600)
>
> ----------------------------------------------------------------
> Ard Biesheuvel (1):
> efi/arm64: ignore dtb= when UEFI SecureBoot is enabled
>
> Leif Lindholm (2):
> doc: arm: add UEFI support documentation
> arm64: efi: only attempt efi map setup if booting via EFI
>
> Marc Zyngier (1):
> arm64: fixmap: fix missing sub-page offset for earlyprintk
>
> Mark Salter (11):
> add generic fixmap.h
> mm: create generic early_ioremap() support
> arm64: initialize pgprot info earlier in boot
> arm64: add early_ioremap support
> efi: create memory map iteration helper
> lib: add fdt_empty_tree.c
> efi: add helper function to get UEFI params from FDT
> arm64: Add function to create identity mappings
> arm64: add EFI runtime services
> arm64: efi: add EFI stub
> doc: arm64: add description of EFI stub support
>
> Roy Franz (3):
> efi: Add get_dram_base() helper function
> doc: efi-stub.txt updates for ARM
> efi: Add shared FDT related functions for ARM/ARM64
>
> dann frazier (3):
> UBUNTU: [Config] CONFIG_{EFI_PARAMS_FROM_FDT,GENERIC_EARLY_IOREMAP,LIBFDT}=y
> UBUNTU: Move get_dram_base to arm private file
> UBUNTU: arm64: Implement efi_enabled()
>
> Documentation/arm/00-INDEX | 2 +
> Documentation/arm/uefi.txt | 64 ++++
> Documentation/arm64/booting.txt | 4 +
> Documentation/arm64/memory.txt | 4 +-
> Documentation/efi-stub.txt | 33 ++-
> arch/arm64/Kconfig | 17 ++
> arch/arm64/include/asm/Kbuild | 1 +
> arch/arm64/include/asm/efi.h | 15 +
> arch/arm64/include/asm/fixmap.h | 67 +++++
> arch/arm64/include/asm/io.h | 1 +
> arch/arm64/include/asm/memory.h | 2 +-
> arch/arm64/include/asm/mmu.h | 3 +
> arch/arm64/kernel/Makefile | 3 +
> arch/arm64/kernel/early_printk.c | 4 +-
> arch/arm64/kernel/efi-entry.S | 109 +++++++
> arch/arm64/kernel/efi-stub.c | 87 ++++++
> arch/arm64/kernel/efi.c | 478 ++++++++++++++++++++++++++++++
> arch/arm64/kernel/head.S | 121 +++++++-
> arch/arm64/kernel/setup.c | 9 +
> arch/arm64/mm/ioremap.c | 86 +++++-
> arch/arm64/mm/mmu.c | 99 +++----
> debian.master/config/config.common.ubuntu | 3 +
> drivers/firmware/efi/Kconfig | 7 +
> drivers/firmware/efi/arm-stub.c | 291 ++++++++++++++++++
> drivers/firmware/efi/efi-stub-helper.c | 7 +
> drivers/firmware/efi/efi.c | 79 +++++
> drivers/firmware/efi/fdt.c | 285 ++++++++++++++++++
> include/asm-generic/early_ioremap.h | 42 +++
> include/asm-generic/fixmap.h | 100 +++++++
> include/linux/efi.h | 20 +-
> lib/Makefile | 3 +-
> lib/fdt_empty_tree.c | 2 +
> mm/Kconfig | 3 +
> mm/Makefile | 1 +
> mm/early_ioremap.c | 245 +++++++++++++++
> 35 files changed, 2221 insertions(+), 76 deletions(-)
> create mode 100644 Documentation/arm/uefi.txt
> create mode 100644 arch/arm64/include/asm/efi.h
> create mode 100644 arch/arm64/include/asm/fixmap.h
> create mode 100644 arch/arm64/kernel/efi-entry.S
> create mode 100644 arch/arm64/kernel/efi-stub.c
> create mode 100644 arch/arm64/kernel/efi.c
> create mode 100644 drivers/firmware/efi/arm-stub.c
> create mode 100644 drivers/firmware/efi/fdt.c
> create mode 100644 include/asm-generic/early_ioremap.h
> create mode 100644 include/asm-generic/fixmap.h
> create mode 100644 lib/fdt_empty_tree.c
> create mode 100644 mm/early_ioremap.c
>
> --
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team
On Fri, Apr 24, 2015 at 11:14 AM, Luis Henriques <luis.henriques@canonical.com> wrote: > Applied this patchset to Trusty master-next branch with a small > change: Thanks! > I moved patch > > "UBUNTU: [Config] CONFIG_{EFI_PARAMS_FROM_FDT,GENERIC_EARLY_IOREMAP,LIBFDT}=y" > > to the top. Quick question on that. In the past I used to submit changes with the config tweaks added after the Kconfig options were added. However, I noticed that when they got merged, the config changes would get reordered to the beginning. I figured that was to aide bisecting since, if you land on a commit in between the two, the user would get prompted. In this case it doesn't matter - the user won't get prompted either way. I would like to learn how to do it correctly - could someone enlighten me? :) -dann > Cheers, > -- > Luís > > On Thu, Apr 23, 2015 at 08:49:48AM -0600, dann frazier wrote: >> This is a resubmittal of the arm64 EFI stub support changes. >> >> v2 changes: >> * Use git cherry-pick -x to generate clean cherry pick commits. >> * Use "backported from" notation when cherry picks are not clean. >> * Add a [Config] commit, generated by updateconfigs. >> * Other than the config update, code is identical to the >> arm64-efi branch from the initial submission. >> >> The following changes since commit ca13cad7da7caa499f54e2d2bd458b2441276fe1: >> >> Linux 3.13.11-ckt18 (2015-04-07 12:22:35 -0700) >> >> are available in the git repository at: >> >> git://kernel.ubuntu.com/dannf/trusty-xgene.git arm64-efi-cleaner >> >> for you to fetch changes up to 54216ebf255273dcefba57b49569b63651b5e9da: >> >> arm64: efi: only attempt efi map setup if booting via EFI (2015-04-23 08:23:23 -0600) >> >> ---------------------------------------------------------------- >> Ard Biesheuvel (1): >> efi/arm64: ignore dtb= when UEFI SecureBoot is enabled >> >> Leif Lindholm (2): >> doc: arm: add UEFI support documentation >> arm64: efi: only attempt efi map setup if booting via EFI >> >> Marc Zyngier (1): >> arm64: fixmap: fix missing sub-page offset for earlyprintk >> >> Mark Salter (11): >> add generic fixmap.h >> mm: create generic early_ioremap() support >> arm64: initialize pgprot info earlier in boot >> arm64: add early_ioremap support >> efi: create memory map iteration helper >> lib: add fdt_empty_tree.c >> efi: add helper function to get UEFI params from FDT >> arm64: Add function to create identity mappings >> arm64: add EFI runtime services >> arm64: efi: add EFI stub >> doc: arm64: add description of EFI stub support >> >> Roy Franz (3): >> efi: Add get_dram_base() helper function >> doc: efi-stub.txt updates for ARM >> efi: Add shared FDT related functions for ARM/ARM64 >> >> dann frazier (3): >> UBUNTU: [Config] CONFIG_{EFI_PARAMS_FROM_FDT,GENERIC_EARLY_IOREMAP,LIBFDT}=y >> UBUNTU: Move get_dram_base to arm private file >> UBUNTU: arm64: Implement efi_enabled() >> >> Documentation/arm/00-INDEX | 2 + >> Documentation/arm/uefi.txt | 64 ++++ >> Documentation/arm64/booting.txt | 4 + >> Documentation/arm64/memory.txt | 4 +- >> Documentation/efi-stub.txt | 33 ++- >> arch/arm64/Kconfig | 17 ++ >> arch/arm64/include/asm/Kbuild | 1 + >> arch/arm64/include/asm/efi.h | 15 + >> arch/arm64/include/asm/fixmap.h | 67 +++++ >> arch/arm64/include/asm/io.h | 1 + >> arch/arm64/include/asm/memory.h | 2 +- >> arch/arm64/include/asm/mmu.h | 3 + >> arch/arm64/kernel/Makefile | 3 + >> arch/arm64/kernel/early_printk.c | 4 +- >> arch/arm64/kernel/efi-entry.S | 109 +++++++ >> arch/arm64/kernel/efi-stub.c | 87 ++++++ >> arch/arm64/kernel/efi.c | 478 ++++++++++++++++++++++++++++++ >> arch/arm64/kernel/head.S | 121 +++++++- >> arch/arm64/kernel/setup.c | 9 + >> arch/arm64/mm/ioremap.c | 86 +++++- >> arch/arm64/mm/mmu.c | 99 +++---- >> debian.master/config/config.common.ubuntu | 3 + >> drivers/firmware/efi/Kconfig | 7 + >> drivers/firmware/efi/arm-stub.c | 291 ++++++++++++++++++ >> drivers/firmware/efi/efi-stub-helper.c | 7 + >> drivers/firmware/efi/efi.c | 79 +++++ >> drivers/firmware/efi/fdt.c | 285 ++++++++++++++++++ >> include/asm-generic/early_ioremap.h | 42 +++ >> include/asm-generic/fixmap.h | 100 +++++++ >> include/linux/efi.h | 20 +- >> lib/Makefile | 3 +- >> lib/fdt_empty_tree.c | 2 + >> mm/Kconfig | 3 + >> mm/Makefile | 1 + >> mm/early_ioremap.c | 245 +++++++++++++++ >> 35 files changed, 2221 insertions(+), 76 deletions(-) >> create mode 100644 Documentation/arm/uefi.txt >> create mode 100644 arch/arm64/include/asm/efi.h >> create mode 100644 arch/arm64/include/asm/fixmap.h >> create mode 100644 arch/arm64/kernel/efi-entry.S >> create mode 100644 arch/arm64/kernel/efi-stub.c >> create mode 100644 arch/arm64/kernel/efi.c >> create mode 100644 drivers/firmware/efi/arm-stub.c >> create mode 100644 drivers/firmware/efi/fdt.c >> create mode 100644 include/asm-generic/early_ioremap.h >> create mode 100644 include/asm-generic/fixmap.h >> create mode 100644 lib/fdt_empty_tree.c >> create mode 100644 mm/early_ioremap.c >> >> -- >> kernel-team mailing list >> kernel-team@lists.ubuntu.com >> https://lists.ubuntu.com/mailman/listinfo/kernel-team
On 04/24/2015 01:02 PM, Dann Frazier wrote: > On Fri, Apr 24, 2015 at 11:14 AM, Luis Henriques > <luis.henriques@canonical.com> wrote: >> Applied this patchset to Trusty master-next branch with a small >> change: > > Thanks! > >> I moved patch >> >> "UBUNTU: [Config] CONFIG_{EFI_PARAMS_FROM_FDT,GENERIC_EARLY_IOREMAP,LIBFDT}=y" >> >> to the top. > > Quick question on that. In the past I used to submit changes with the > config tweaks added after the Kconfig options were added. However, I > noticed that when they got merged, the config changes would get > reordered to the beginning. I figured that was to aide bisecting > since, if you land on a commit in between the two, the user would get > prompted. In this case it doesn't matter - the user won't get prompted > either way. I would like to learn how to do it correctly - could > someone enlighten me? :) > > -dann Bisectability without adding Kconfig prompts is exactly why I reorder those commits.
On Fri, Apr 24, 2015 at 01:07:53PM -0500, Tim Gardner wrote: > On 04/24/2015 01:02 PM, Dann Frazier wrote: > >On Fri, Apr 24, 2015 at 11:14 AM, Luis Henriques > ><luis.henriques@canonical.com> wrote: > >>Applied this patchset to Trusty master-next branch with a small > >>change: > > > >Thanks! > > > >>I moved patch > >> > >> "UBUNTU: [Config] CONFIG_{EFI_PARAMS_FROM_FDT,GENERIC_EARLY_IOREMAP,LIBFDT}=y" > >> > >>to the top. > > > >Quick question on that. In the past I used to submit changes with the > >config tweaks added after the Kconfig options were added. However, I > >noticed that when they got merged, the config changes would get > >reordered to the beginning. I figured that was to aide bisecting > >since, if you land on a commit in between the two, the user would get > >prompted. In this case it doesn't matter - the user won't get prompted > >either way. I would like to learn how to do it correctly - could > >someone enlighten me? :) > > > > -dann > > Bisectability without adding Kconfig prompts is exactly why I > reorder those commits. > > -- > Tim Gardner tim.gardner@canonical.com Ok, makes sense. I've re-ordered that commit to be the first one again and pushed the master-next branch. Sorry for messing that up, Dann. Cheers, -- Luís
This is a resubmittal of the arm64 EFI stub support changes. v2 changes: * Use git cherry-pick -x to generate clean cherry pick commits. * Use "backported from" notation when cherry picks are not clean. * Add a [Config] commit, generated by updateconfigs. * Other than the config update, code is identical to the arm64-efi branch from the initial submission. The following changes since commit ca13cad7da7caa499f54e2d2bd458b2441276fe1: Linux 3.13.11-ckt18 (2015-04-07 12:22:35 -0700) are available in the git repository at: git://kernel.ubuntu.com/dannf/trusty-xgene.git arm64-efi-cleaner for you to fetch changes up to 54216ebf255273dcefba57b49569b63651b5e9da: arm64: efi: only attempt efi map setup if booting via EFI (2015-04-23 08:23:23 -0600) ---------------------------------------------------------------- Ard Biesheuvel (1): efi/arm64: ignore dtb= when UEFI SecureBoot is enabled Leif Lindholm (2): doc: arm: add UEFI support documentation arm64: efi: only attempt efi map setup if booting via EFI Marc Zyngier (1): arm64: fixmap: fix missing sub-page offset for earlyprintk Mark Salter (11): add generic fixmap.h mm: create generic early_ioremap() support arm64: initialize pgprot info earlier in boot arm64: add early_ioremap support efi: create memory map iteration helper lib: add fdt_empty_tree.c efi: add helper function to get UEFI params from FDT arm64: Add function to create identity mappings arm64: add EFI runtime services arm64: efi: add EFI stub doc: arm64: add description of EFI stub support Roy Franz (3): efi: Add get_dram_base() helper function doc: efi-stub.txt updates for ARM efi: Add shared FDT related functions for ARM/ARM64 dann frazier (3): UBUNTU: [Config] CONFIG_{EFI_PARAMS_FROM_FDT,GENERIC_EARLY_IOREMAP,LIBFDT}=y UBUNTU: Move get_dram_base to arm private file UBUNTU: arm64: Implement efi_enabled() Documentation/arm/00-INDEX | 2 + Documentation/arm/uefi.txt | 64 ++++ Documentation/arm64/booting.txt | 4 + Documentation/arm64/memory.txt | 4 +- Documentation/efi-stub.txt | 33 ++- arch/arm64/Kconfig | 17 ++ arch/arm64/include/asm/Kbuild | 1 + arch/arm64/include/asm/efi.h | 15 + arch/arm64/include/asm/fixmap.h | 67 +++++ arch/arm64/include/asm/io.h | 1 + arch/arm64/include/asm/memory.h | 2 +- arch/arm64/include/asm/mmu.h | 3 + arch/arm64/kernel/Makefile | 3 + arch/arm64/kernel/early_printk.c | 4 +- arch/arm64/kernel/efi-entry.S | 109 +++++++ arch/arm64/kernel/efi-stub.c | 87 ++++++ arch/arm64/kernel/efi.c | 478 ++++++++++++++++++++++++++++++ arch/arm64/kernel/head.S | 121 +++++++- arch/arm64/kernel/setup.c | 9 + arch/arm64/mm/ioremap.c | 86 +++++- arch/arm64/mm/mmu.c | 99 +++---- debian.master/config/config.common.ubuntu | 3 + drivers/firmware/efi/Kconfig | 7 + drivers/firmware/efi/arm-stub.c | 291 ++++++++++++++++++ drivers/firmware/efi/efi-stub-helper.c | 7 + drivers/firmware/efi/efi.c | 79 +++++ drivers/firmware/efi/fdt.c | 285 ++++++++++++++++++ include/asm-generic/early_ioremap.h | 42 +++ include/asm-generic/fixmap.h | 100 +++++++ include/linux/efi.h | 20 +- lib/Makefile | 3 +- lib/fdt_empty_tree.c | 2 + mm/Kconfig | 3 + mm/Makefile | 1 + mm/early_ioremap.c | 245 +++++++++++++++ 35 files changed, 2221 insertions(+), 76 deletions(-) create mode 100644 Documentation/arm/uefi.txt create mode 100644 arch/arm64/include/asm/efi.h create mode 100644 arch/arm64/include/asm/fixmap.h create mode 100644 arch/arm64/kernel/efi-entry.S create mode 100644 arch/arm64/kernel/efi-stub.c create mode 100644 arch/arm64/kernel/efi.c create mode 100644 drivers/firmware/efi/arm-stub.c create mode 100644 drivers/firmware/efi/fdt.c create mode 100644 include/asm-generic/early_ioremap.h create mode 100644 include/asm-generic/fixmap.h create mode 100644 lib/fdt_empty_tree.c create mode 100644 mm/early_ioremap.c