[GIT,PULL] RISC-V Patches for the 6.6 Merge Window, Part 2 (try 2)

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git tags/riscv-for-linus-6.6-mw2-2

Message

Palmer Dabbelt Sept. 9, 2023, 2:25 p.m. UTC

merged tag 'riscv-for-linus-6.6-mw1'
The following changes since commit e0152e7481c6c63764d6ea8ee41af5cf9dfac5e9:

  Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux (2023-09-01 08:09:48 -0700)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git tags/riscv-for-linus-6.6-mw2-2

for you to fetch changes up to c6a906cce61a8015b622707f9c12003f90673399:

  soc: renesas: Kconfig: For ARCH_R9A07G043 select the required configs if dependencies are met (2023-09-08 11:25:29 -0700)

----------------------------------------------------------------
RISC-V Patches for the 6.6 Merge Window, Part 2 (try 2)

* The kernel now dynamically probes for misaligned access speed, as
  opposed to relying on a table of known implementations.
* Support for non-coherent devices on systems using the Andes AX45MP
  core, including the RZ/Five SoCs.
* Support for the V extension in ptrace(), again.
* Support for KASLR.
* Support for the BPF prog pack allocator in RISC-V.
* A handful of bug fixes and cleanups.

----------------------------------------------------------------
None of these are super critical so no big deal if it's too late, but I do feel
pretty bad that Prabhakar's been pushing on the DMA stuff for a long time and
figured it'd be better to send this out even if it's late.

The diffstat looks good this time and nobody's mentioned any issues (at least
that I can see) so I think this one is looking better, but apologies in
advance if something else has gone off the rails.  The BPF docs merge conflict
is also gone, so I just have the internal one in libstub for KASLR.  I think I
got that correct, but here's the blurb from yesterday:

I resolved the libstub conflict as part of mergeing in the patch set.  The
actual conflict also looks pretty straight-forward: we refactored some KASLR
handling out to shared code, but there was also a new argument added.  I
resolved it when picking up the patch series, but after talking to some of the
Arm folks I'm not quite sure that was the right way to go.  So it won't show up
when actually merging, but figured I'd say something anyway as end up doing
that sort of "fix a conflict when merging a patch set" from time to time.

----------------------------------------------------------------
Alexandre Ghiti (5):
      riscv: Introduce virtual kernel mapping KASLR
      riscv: Dump out kernel offset information on panic
      arm64: libstub: Move KASLR handling functions to kaslr.c
      libstub: Fix compilation warning for rv32
      riscv: libstub: Implement KASLR by using generic functions

Andy Chiu (1):
      RISC-V: Add ptrace support for vectors

Arnd Bergmann (2):
      riscv: dma-mapping: only invalidate after DMA, not flush
      riscv: dma-mapping: skip invalidation before bidirectional DMA

Evan Green (2):
      RISC-V: Probe for unaligned access speed
      RISC-V: alternative: Remove feature_probe_func

Lad Prabhakar (11):
      riscv: dma-mapping: switch over to generic implementation
      riscv: asm: vendorid_list: Add Andes Technology to the vendors list
      riscv: errata: Add Andes alternative ports
      riscv: mm: dma-noncoherent: nonstandard cache operations support
      dt-bindings: cache: andestech,ax45mp-cache: Add DT binding documentation for L2 cache controller
      cache: Add L2 cache management for Andes AX45MP RISC-V core
      soc: renesas: Kconfig: Select the required configs for RZ/Five SoC
      riscv: Kconfig: Select DMA_DIRECT_REMAP only if MMU is enabled
      riscv: Kconfig.errata: Drop dependency for MMU in ERRATA_ANDES_CMO config
      riscv: Kconfig.errata: Add dependency for RISCV_SBI in ERRATA_ANDES config
      soc: renesas: Kconfig: For ARCH_R9A07G043 select the required configs if dependencies are met

Palmer Dabbelt (6):
      Merge patch series "RISC-V: Probe for misaligned access speed"
      Merge patch series "riscv: dma-mapping: unify support for cache flushes"
      Merge patch series "Add non-coherent DMA support for AX45MP"
      Merge patch "RISC-V: Add ptrace support for vectors"
      Merge patch series "riscv: Introduce KASLR"
      Merge patch series "bpf, riscv: use BPF prog pack allocator in BPF JIT"

Puranjay Mohan (4):
      bpf: make bpf_prog_pack allocator portable
      riscv: extend patch_text_nosync() for multiple pages
      riscv: implement a memset like function for text
      bpf, riscv: use prog pack allocator in the BPF JIT

 .../bindings/cache/andestech,ax45mp-cache.yaml     |  81 ++++++++
 Documentation/riscv/hwprobe.rst                    |  11 +-
 MAINTAINERS                                        |   7 +
 arch/arm64/include/asm/efi.h                       |   2 +
 arch/riscv/Kconfig                                 |  28 ++-
 arch/riscv/Kconfig.errata                          |  21 ++
 arch/riscv/errata/Makefile                         |   1 +
 arch/riscv/errata/andes/Makefile                   |   1 +
 arch/riscv/errata/andes/errata.c                   |  66 +++++++
 arch/riscv/errata/thead/errata.c                   |   8 -
 arch/riscv/include/asm/alternative.h               |   8 +-
 arch/riscv/include/asm/cpufeature.h                |   2 +
 arch/riscv/include/asm/dma-noncoherent.h           |  28 +++
 arch/riscv/include/asm/efi.h                       |   2 +
 arch/riscv/include/asm/errata_list.h               |   5 +
 arch/riscv/include/asm/page.h                      |   3 +
 arch/riscv/include/asm/patch.h                     |   1 +
 arch/riscv/include/asm/vendorid_list.h             |   1 +
 arch/riscv/include/uapi/asm/ptrace.h               |  13 +-
 arch/riscv/kernel/Makefile                         |   1 +
 arch/riscv/kernel/alternative.c                    |  24 +--
 arch/riscv/kernel/copy-unaligned.S                 |  71 +++++++
 arch/riscv/kernel/copy-unaligned.h                 |  13 ++
 arch/riscv/kernel/cpufeature.c                     | 104 ++++++++++
 arch/riscv/kernel/image-vars.h                     |   1 +
 arch/riscv/kernel/patch.c                          | 114 ++++++++++-
 arch/riscv/kernel/pi/Makefile                      |   2 +-
 arch/riscv/kernel/pi/cmdline_early.c               |  13 ++
 arch/riscv/kernel/pi/fdt_early.c                   |  30 +++
 arch/riscv/kernel/ptrace.c                         |  79 ++++++++
 arch/riscv/kernel/setup.c                          |  25 +++
 arch/riscv/kernel/smpboot.c                        |   3 +-
 arch/riscv/mm/dma-noncoherent.c                    | 103 +++++++++-
 arch/riscv/mm/init.c                               |  36 +++-
 arch/riscv/mm/pmem.c                               |  13 ++
 arch/riscv/net/bpf_jit.h                           |   3 +
 arch/riscv/net/bpf_jit_comp64.c                    |  60 ++++--
 arch/riscv/net/bpf_jit_core.c                      | 106 ++++++++--
 drivers/Kconfig                                    |   2 +
 drivers/Makefile                                   |   1 +
 drivers/cache/Kconfig                              |  11 ++
 drivers/cache/Makefile                             |   3 +
 drivers/cache/ax45mp_cache.c                       | 213 +++++++++++++++++++++
 drivers/firmware/efi/libstub/Makefile              |   4 +-
 drivers/firmware/efi/libstub/arm64-stub.c          | 117 ++---------
 drivers/firmware/efi/libstub/efistub.h             |   8 +
 drivers/firmware/efi/libstub/kaslr.c               | 159 +++++++++++++++
 drivers/firmware/efi/libstub/riscv-stub.c          |  33 ++--
 drivers/soc/renesas/Kconfig                        |   5 +
 include/uapi/linux/elf.h                           |   2 +
 kernel/bpf/core.c                                  |   8 +-
 51 files changed, 1440 insertions(+), 216 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/cache/andestech,ax45mp-cache.yaml
 create mode 100644 arch/riscv/errata/andes/Makefile
 create mode 100644 arch/riscv/errata/andes/errata.c
 create mode 100644 arch/riscv/include/asm/dma-noncoherent.h
 create mode 100644 arch/riscv/kernel/copy-unaligned.S
 create mode 100644 arch/riscv/kernel/copy-unaligned.h
 create mode 100644 arch/riscv/kernel/pi/fdt_early.c
 create mode 100644 drivers/cache/Kconfig
 create mode 100644 drivers/cache/Makefile
 create mode 100644 drivers/cache/ax45mp_cache.c
 create mode 100644 drivers/firmware/efi/libstub/kaslr.c

Comments

[e-mail] Sept. 9, 2023, 9:54 p.m. UTC | #1

The pull request you sent on Sat, 09 Sep 2023 07:25:43 -0700 (PDT):

> git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git tags/riscv-for-linus-6.6-mw2-2

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/1b37a0a2d46f0c5fa5eee170ddeeb83342faa117

Thank you!

[e-mail] Sept. 11, 2023, 4:07 p.m. UTC | #2

Hello:

This pull request was applied to riscv/linux.git (for-next)
by Linus Torvalds <[e-mail]>:

On Sat, 09 Sep 2023 07:25:43 -0700 (PDT) you wrote:
> merged tag 'riscv-for-linus-6.6-mw1'
> The following changes since commit e0152e7481c6c63764d6ea8ee41af5cf9dfac5e9:
> 
>   Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux (2023-09-01 08:09:48 -0700)
> 
> are available in the Git repository at:
> 
> [...]

Here is the summary with links:
  - [GIT,PULL] RISC-V Patches for the 6.6 Merge Window, Part 2 (try 2)
    https://git.kernel.org/riscv/c/1b37a0a2d46f

You are awesome, thank you!