[GIT,PULL] RISC-V Patches for the 6.4 Merge Window, Part 2

Pull-request

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

Message

Palmer Dabbelt May 5, 2023, 3:16 p.m. UTC

merged tag 'riscv-for-linus-6.4-mw1'
The following changes since commit 89d77f71f493a3663b10fa812d17f472935d24be:

  Merge tag 'riscv-for-linus-6.4-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux (2023-04-28 16:55:39 -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.4-mw2

for you to fetch changes up to c2d3c8441e3ddbfe41fea9282ddc6ee372e154cd:

  RISC-V: include cpufeature.h in cpufeature.c (2023-05-01 17:19:27 -0700)

----------------------------------------------------------------
RISC-V Patches for the 6.4 Merge Window, Part 2

* Support for hibernation.
* .rela.dyn has been moved to init.
* A fix for the SBI probing to allow for implementation-defined
  behavior.
* Various other fixes and cleanups throughout the tree.

----------------------------------------------------------------
There are still a few minor build issues with drivers, but patches are on the
lists.  Aside from that things look good with a merge from Linus' master as of
last night, I've got another test running now but I don't see anything scary.

----------------------------------------------------------------
Alexandre Ghiti (1):
      riscv: Move .rela.dyn to the init sections

Andrew Jones (1):
      RISC-V: Align SBI probe implementation with spec

Conor Dooley (3):
      RISC-V: fixup in-flight collision with ARCH_WANT_OPTIMIZE_VMEMMAP rename
      dt-bindings: riscv: explicitly mention assumption of Zicsr & Zifencei support
      RISC-V: include cpufeature.h in cpufeature.c

Guo Ren (1):
      riscv: compat_syscall_table: Fixup compile warning

Nathan Chancellor (1):
      riscv: Adjust dependencies of HAVE_DYNAMIC_FTRACE selection

Palmer Dabbelt (1):
      Merge patch series "RISC-V Hibernation Support"

Randy Dunlap (1):
      RISC-V: fix sifive and thead section mismatches in errata

Sia Jee Heng (4):
      RISC-V: Change suspend_save_csrs and suspend_restore_csrs to public function
      RISC-V: Factor out common code of __cpu_resume_enter()
      RISC-V: mm: Enable huge page support to kernel_page_present() function
      RISC-V: Add arch functions to support hibernation/suspend-to-disk

Song Shuai (1):
      riscv: mm: remove redundant parameter of create_fdt_early_page_table

 Documentation/devicetree/bindings/riscv/cpus.yaml |   6 +
 arch/riscv/Kconfig                                |  23 +-
 arch/riscv/errata/sifive/errata.c                 |   8 +-
 arch/riscv/errata/thead/errata.c                  |   6 +-
 arch/riscv/include/asm/assembler.h                |  82 +++++
 arch/riscv/include/asm/sbi.h                      |   2 +-
 arch/riscv/include/asm/suspend.h                  |  22 ++
 arch/riscv/kernel/Makefile                        |   2 +
 arch/riscv/kernel/asm-offsets.c                   |   5 +
 arch/riscv/kernel/cpu_ops.c                       |   2 +-
 arch/riscv/kernel/cpufeature.c                    |   1 +
 arch/riscv/kernel/hibernate-asm.S                 |  77 ++++
 arch/riscv/kernel/hibernate.c                     | 427 ++++++++++++++++++++++
 arch/riscv/kernel/sbi.c                           |  17 +-
 arch/riscv/kernel/suspend.c                       |   4 +-
 arch/riscv/kernel/suspend_entry.S                 |  34 +-
 arch/riscv/kernel/vmlinux.lds.S                   |  12 +-
 arch/riscv/kvm/main.c                             |   2 +-
 arch/riscv/mm/init.c                              |   6 +-
 arch/riscv/mm/pageattr.c                          |   8 +
 drivers/cpuidle/cpuidle-riscv-sbi.c               |   2 +-
 drivers/perf/riscv_pmu_sbi.c                      |   2 +-
 22 files changed, 682 insertions(+), 68 deletions(-)
 create mode 100644 arch/riscv/include/asm/assembler.h
 create mode 100644 arch/riscv/kernel/hibernate-asm.S
 create mode 100644 arch/riscv/kernel/hibernate.c

Comments

[e-mail] May 5, 2023, 8:33 p.m. UTC | #1

The pull request you sent on Fri, 05 May 2023 08:16:58 -0700 (PDT):

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

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/982365a8f5c453b3ecff131d60f254a7e67c9a2b

Thank you!