Re: [PATCH v6 0/9] Add UEFI support for RISC-V

[Palmer Dabbelt <palmer@dabbelt.com>]

On Wed, 26 Aug 2020 04:22:07 PDT (-0700), ardb@kernel.org wrote:
> On Tue, 25 Aug 2020 at 20:04, Palmer Dabbelt <palmer@dabbelt.com> wrote:
>>
>> On Wed, 19 Aug 2020 15:24:16 PDT (-0700), Atish Patra wrote:
>> > This series adds UEFI support for RISC-V.
>> >
>> > Linux kernel: v5.9-rc1
>> > U-Boot: v2020.07
>> > OpenSBI: master
>> >
>> > Patch 1-3 are generic riscv feature addition required for UEFI support.
>> > Patch 4-7 adds the efi stub support for RISC-V which was reviewed few months back.
>> > https://www.spinics.net/lists/linux-efi/msg19144.html
>> > Patch 8 just renames arm-init code so that it can be used across different
>> > architectures.
>> > Patch 9 adds the runtime services for RISC-V.
>> >
>> > The working set of patches can also be found in following git repo.
>> > https://github.com/atishp04/linux/tree/uefi_riscv_5.10_v6
>> >
>> > The patches have been verified on following platforms:
>> > 1. Qemu (both RV32 & RV64) for the following bootflow
>> >    OpenSBI->U-Boot->Linux
>> >    EDK2->Linux
>> > 2. HiFive unleashed using (RV64) for the following bootflow
>> >    OpenSBI->U-Boot->Linux
>> >    EDK2->Linux
>> >
>> > Thanks Abner & Daniel for all work done for EDK2.
>> > The EDK2 instructions are available here.
>> > https://github.com/JohnAZoidberg/riscv-edk2-docker/
>> >
>> > Note:
>> > 1. Currently, EDK2 RISC-V port doesn't support OVMF package. That's why
>> > EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER should be enabled to load initrd via
>> > commandline until OVMF patches are available.
>> >
>> > 2. For RV32, maximum allocated memory should be 1G as RISC-V kernel can not map
>> > beyond 1G of physical memory for RV32.
>> >
>> > 3. Runtime services have been verified with fwts on EDK2.
>> >
>> > ***********************************************************************
>> > [root@fedora-riscv ~]# fwts uefirtvariable
>> > Running 1 tests, results appended to results.log
>> > Test: UEFI Runtime service variable interface tests.
>> >   Test UEFI RT service get variable interface.            1 passed
>> >   Test UEFI RT service get next variable name interface.  4 passed
>> >   Test UEFI RT service set variable interface.            7 passed, 1 warning
>> >   Test UEFI RT service query variable info interface.     1 passed
>> >   Test UEFI RT service variable interface stress test.    2 passed
>> >   Test UEFI RT service set variable interface stress t..  4 passed
>> >   Test UEFI RT service query variable info interface s..  1 passed
>> >   Test UEFI RT service get variable interface, invalid..  5 passed
>> >   Test UEFI RT variable services supported status.        1 skipped
>> >
>> > Test           |Pass |Fail |Abort|Warn |Skip |Info |
>> > uefirtvariable |   25|     |     |    1|    1|     |
>> > Total:         |   25|    0|    0|    1|    1|    0|
>> >
>> > ***********************************************************************
>> >
>> > Changes from v5->v6:
>> > 1. Fixed the static declaration for pt_ops.
>> > 2. Added Reviewed/Acked-by.
>> >
>> > Changes from v4->v5:
>> > 1. Late mappings allocations are now done through function pointers.
>> > 2. EFI run time services are verified using full linux boot and fwts using EDK2.
>> >
>> > Changes from v3->v4:
>> > 1. Used pgd mapping to avoid copying DT to bss.
>> >
>> > Changes from v2->v3:
>> > 1. Fixed few bugs in run time services page table mapping.
>> > 2. Dropped patch 1 as it is already taken into efi-tree.
>> > 3. Sent few generic mmu fixes as a separate series to ease the merge conflicts.
>> >
>> > Changes from v1->v2:
>> > 1. Removed patch 1 as it is already taken into efi-tree.
>> > 2. Fixed compilation issues with patch 9.
>> > 3. Moved few function prototype declaration to header file to keep kbuild happy.
>> >
>> > Changes from previous version:
>> > 1. Added full ioremap support.
>> > 2. Added efi runtime services support.
>> > 3. Fixes mm issues
>> >
>> > Anup Patel (1):
>> > RISC-V: Move DT mapping outof fixmap
>> >
>> > Atish Patra (8):
>> > RISC-V: Add early ioremap support
>> > RISC-V: Implement late mapping page table allocation functions
>> > include: pe.h: Add RISC-V related PE definition
>> > RISC-V: Add PE/COFF header for EFI stub
>> > RISC-V: Add EFI stub support.
>> > efi: Rename arm-init to efi-init common for all arch
>> > RISC-V: Add EFI runtime services
>> > RISC-V: Add page table dump support for uefi
>> >
>> > arch/riscv/Kconfig                            |  25 +++
>> > arch/riscv/Makefile                           |   1 +
>> > arch/riscv/configs/defconfig                  |   1 +
>> > arch/riscv/include/asm/Kbuild                 |   1 +
>> > arch/riscv/include/asm/efi.h                  |  56 +++++
>> > arch/riscv/include/asm/fixmap.h               |  16 +-
>> > arch/riscv/include/asm/io.h                   |   1 +
>> > arch/riscv/include/asm/mmu.h                  |   2 +
>> > arch/riscv/include/asm/pgtable.h              |   5 +
>> > arch/riscv/include/asm/sections.h             |  13 ++
>> > arch/riscv/kernel/Makefile                    |   5 +
>> > arch/riscv/kernel/efi-header.S                | 104 ++++++++++
>> > arch/riscv/kernel/efi.c                       | 105 ++++++++++
>> > arch/riscv/kernel/head.S                      |  17 +-
>> > arch/riscv/kernel/head.h                      |   2 -
>> > arch/riscv/kernel/image-vars.h                |  51 +++++
>> > arch/riscv/kernel/setup.c                     |  17 +-
>> > arch/riscv/kernel/vmlinux.lds.S               |  22 +-
>> > arch/riscv/mm/init.c                          | 191 +++++++++++++-----
>> > arch/riscv/mm/ptdump.c                        |  48 ++++-
>> > drivers/firmware/efi/Kconfig                  |   3 +-
>> > drivers/firmware/efi/Makefile                 |   4 +-
>> > .../firmware/efi/{arm-init.c => efi-init.c}   |   0
>> > drivers/firmware/efi/libstub/Makefile         |  10 +
>> > drivers/firmware/efi/libstub/efi-stub.c       |  11 +-
>> > drivers/firmware/efi/libstub/riscv-stub.c     | 110 ++++++++++
>> > drivers/firmware/efi/riscv-runtime.c          | 143 +++++++++++++
>> > include/linux/pe.h                            |   3 +
>> > 28 files changed, 900 insertions(+), 67 deletions(-)
>> > create mode 100644 arch/riscv/include/asm/efi.h
>> > create mode 100644 arch/riscv/include/asm/sections.h
>> > create mode 100644 arch/riscv/kernel/efi-header.S
>> > create mode 100644 arch/riscv/kernel/efi.c
>> > create mode 100644 arch/riscv/kernel/image-vars.h
>> > rename drivers/firmware/efi/{arm-init.c => efi-init.c} (100%)
>> > create mode 100644 drivers/firmware/efi/libstub/riscv-stub.c
>> > create mode 100644 drivers/firmware/efi/riscv-runtime.c
>>
>> I've put these on for-next.  It's still pretty early in the cycle so there's
>> some time to fix stuff up, but it looks like we've pretty much come to
>> consensus on this.
>>
>
> I requested the following when acking these changes:
>
> """
> Note to the maintainer: to the extent possible, please put the patches
> in this series that touch drivers/firmware/efi on a separate branch
> based on v5.9-rc1, and merge that into your for-v5.10 branch at the
> appropriate spot. I don't have anything queued in the EFI tree at the
> moment, and so these changes can happily go through the riscv tree, as
> long as I am not forced to merge a bunch of unrelated changes on the
> off chance that something does come up.
> """
>
> Something has come up, and given that the patch
>
> efi: Rename arm-init to efi-init common for all arch
>
> lives on your for-next branch after a bunch of RISCV changes, I cannot
> merge anything for EFI without pulling all of that into the EFI tree
> as well.
>
> Also, it is not clear to me whether the current ordering does not
> break bisect, given that efi-init.o is referenced in patch #8 but is
> not created until patch #9
>
> So could you please do the following:
>
> - drop 'efi: Rename arm-init to efi-init common for all arch' from the
> top of your for-next branch
> - create a separate topic branch that carries the dropped patch
> - recreate the for-next branch so the topic branch is merged into it
> at the right spot (i.e., before patch #8)
>
> That way, I can merge your topic branch into the EFI tree as well, and
> apply the other EFI changes on top of it.

Sorry, I forgot about that.  I'll go deal with this, but probably not today
because of Plumbers.