Message-ID: <mhng-f76eb33c-7cc1-426f-8f29-37f6bb78baec@palmer-ri-x1c9>
Date:   Wed, 14 Dec 2022 10:40:05 -0800 (PST)
From:   Palmer Dabbelt <palmer@...osinc.com>
To:     Linus Torvalds <torvalds@...ux-foundation.org>
CC:         linux-riscv@...ts.infradead.org, linux-kernel@...r.kernel.org
Subject: [GIT PULL] RISC-V Patches for the 6.2 Merge Window, Part 1

The following changes since commit 9abf2313adc1ca1b6180c508c25f22f9395cc780:

  Linux 6.1-rc1 (2022-10-16 15:36:24 -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.2-mw1

for you to fetch changes up to 6e66e96e31b81fb08075d18a3e2c201f1e2171da:

  Merge patch series "Documentation: RISC-V: patch-acceptance changes" (2022-12-13 09:38:30 -0800)

----------------------------------------------------------------
RISC-V Patches for the 6.2 Merge Window, Part 1

* Support for the T-Head PMU via the perf subsystem.
* ftrace support for rv32.
* Support for non-volatile memory devices.
* Various fixes and cleanups.

----------------------------------------------------------------
I didn't have a part 2 planned, but I just stumbled into a build issue with
the Arm LPAE IOMMU being enabled on rv32, which is worked around via
https://lore.kernel.org/r/20221214180409.7354-1-palmer@rivosinc.com/ .
Anything would be a fix, though, as I'm essentially pretending we're in RCs
aside from what's here.

I've sent the diffstat against v6.1-rc1, as targeting a recent master produces
something huge (though still a reasonable shortlog).  I'm not entirely sure
what's going on there: I have some old merge bases (due to old patch sets) so
hopefully that's the problem, but it's also my first time seriously using b4 so
sorry if I've screwed something up.  The only intentionally suspect thing I've
done is include 5c20a3a9df19 ("RISC-V: Fix compilation without
RISCV_ISA_ZICBOM") as it fixes a build issue in the following patch set and
didn't land via the usual flow, but I think that's the cleanest way to do it as
the patch was already directly on top of rc1.

I'm seeing one merge conflict, here's my resolution if it helps any:

@@@ -161,7 -161,7 +163,8 @@@ CONFIG_VIRTIO_MMIO=
  CONFIG_RPMSG_CHAR=y
  CONFIG_RPMSG_CTRL=y
  CONFIG_RPMSG_VIRTIO=y
 +CONFIG_LIBNVDIMM=y
+ CONFIG_ARCH_R9A07G043=y
  CONFIG_EXT4_FS=y
  CONFIG_EXT4_FS_POSIX_ACL=y
  CONFIG_EXT4_FS_SECURITY=y

----------------------------------------------------------------
Alexandre Ghiti (1):
      riscv: Fix P4D_SHIFT definition for 3-level page table mode

Andrew Bresticker (1):
      RISC-V: Fix unannoted hardirqs-on in return to userspace slow-path

Andrew Jones (9):
      RISC-V: Fix compilation without RISCV_ISA_ZICBOM
      riscv: Don't duplicate __ALTERNATIVE_CFG in __ALTERNATIVE_CFG_2
      riscv: alternatives: Don't name unused macro parameters
      riscv: alternatives: Drop the underscores from the assembly macro names
      riscv: Don't duplicate _ALTERNATIVE_CFG* macros
      RISC-V: Improve use of isa2hwcap[]
      RISC-V: Introduce riscv_isa_extension_check
      RISC-V: Ensure Zicbom has a valid block size
      riscv: Apply a static assert to riscv_isa_ext_id

Anup Patel (3):
      RISC-V: Fix MEMREMAP_WB for systems with Svpbmt
      RISC-V: Implement arch specific PMEM APIs
      RISC-V: Enable PMEM drivers

Binglei Wang (1):
      riscv: add riscv rethook implementation

Cleo John (1):
      riscv: fix styling in ucontext header

Conor Dooley (4):
      RISC-V: enable sparsemem by default for defconfig
      irqchip/sifive-plic: remove user selectability of SIFIVE_PLIC
      irqchip/riscv-intc: remove user selectability of RISCV_INTC
      RISC-V: stop selecting SIFIVE_PLIC at the SoC level

Guo Ren (3):
      riscv: stacktrace: Fixup ftrace_graph_ret_addr retp argument
      riscv: stacktrace: Make walk_stackframe cross pt_regs frame
      riscv: Fixup compile error with !MMU

Hal Feng (1):
      RISC-V: defconfig: Enable CONFIG_SERIAL_8250_DW

Heiko Stuebner (2):
      RISC-V: Cache SBI vendor values
      drivers/perf: riscv_pmu_sbi: add support for PMU variant on T-Head C9xx cores

Heinrich Schuchardt (1):
      riscv/vdso: typo therefor

Jamie Iles (4):
      RISC-V: use REG_S/REG_L for mcount
      RISC-V: reduce mcount save space on RV32
      RISC-V: preserve a1 in mcount
      RISC-V: enable dynamic ftrace for RV32I

Jinyu Tang (1):
      riscv: support update_mmu_tlb()

Jisheng Zhang (3):
      riscv: remove special treatment for the link order of head.o
      riscv: fix race when vmap stack overflow
      riscv: boot: add zstd support

Lad Prabhakar (1):
      riscv: Kconfig: Enable cpufreq kconfig menu

Li Huafei (2):
      RISC-V: kexec: Fix memory leak of fdt buffer
      RISC-V: kexec: Fix memory leak of elf header buffer

Liu Shixin (2):
      riscv: Enable HAVE_ARCH_HUGE_VMAP for 64BIT
      riscv: Enable HAVE_ARCH_HUGE_VMALLOC for 64BIT

Palmer Dabbelt (17):
      riscv_pmu_sbi: add support for PMU variant on T-Head C9xx cores
      Merge patch series "RISC-V: Dynamic ftrace support for RV32I"
      Merge patch series "Support VMCOREINFO export for RISCV64"
      Merge patch "RISC-V: Fix unannoted hardirqs-on in return to userspace slow-path"
      Merge patch series "Add PMEM support for RISC-V"
      Merge patch series "RISC-V interrupt controller select cleanup"
      Merge patch series "riscv: Fix crash during early errata patching"
      Merge patch series "RISC-V: Ensure Zicbom has a valid block size"
      Merge patch series "riscv: alternative-macros.h cleanups"
      RISC-V: Align the shadow stack
      RISC-V: Add some comments about the shadow and overflow stacks
      Merge patch series "RISC-V: Align the shadow stack"
      Documentation: RISC-V: Fix a typo in patch-acceptance
      Documentation: RISC-V: Allow patches for non-standard behavior
      Documentation: RISC-V: Mention the UEFI Standards
      Documentation: RISC-V: patch-acceptance: s/implementor/implementer
      Merge patch series "Documentation: RISC-V: patch-acceptance changes"

Qinglin Pan (1):
      riscv: mm: call best_map_size many times during linear-mapping

Samuel Holland (2):
      riscv: Fix crash during early errata patching
      riscv: Move cast inside kernel_mapping_[pv]a_to_[vp]a

Sergey Matyukevich (1):
      riscv: mm: notify remote harts about mmu cache updates

Tong Tiangen (2):
      riscv/mm: hugepage's PG_dcache_clean flag is only set in head page
      riscv/mm: add arch hook arch_clear_hugepage_flags

Xianting Tian (2):
      RISC-V: Add arch_crash_save_vmcoreinfo support
      Documentation: kdump: describe VMCOREINFO export for RISCV64

 Documentation/admin-guide/kdump/vmcoreinfo.rst     | 29 +++++++
 .../features/vm/huge-vmap/arch-support.txt         |  2 +-
 Documentation/riscv/patch-acceptance.rst           | 22 +++--
 arch/riscv/Kconfig                                 | 19 +++--
 arch/riscv/Kconfig.erratas                         | 13 +++
 arch/riscv/Kconfig.socs                            |  5 --
 arch/riscv/boot/Makefile                           |  3 +
 arch/riscv/configs/defconfig                       |  3 +
 arch/riscv/errata/thead/errata.c                   | 19 +++++
 arch/riscv/include/asm/alternative-macros.h        | 99 +++++++---------------
 arch/riscv/include/asm/asm.h                       |  1 +
 arch/riscv/include/asm/cacheflush.h                | 15 ++--
 arch/riscv/include/asm/errata_list.h               | 16 +++-
 arch/riscv/include/asm/hugetlb.h                   |  6 ++
 arch/riscv/include/asm/hwcap.h                     |  3 +-
 arch/riscv/include/asm/io.h                        |  5 ++
 arch/riscv/include/asm/kexec.h                     |  5 ++
 arch/riscv/include/asm/kprobes.h                   |  2 -
 arch/riscv/include/asm/mmu.h                       |  2 +
 arch/riscv/include/asm/page.h                      | 18 ++--
 arch/riscv/include/asm/pgtable-64.h                |  6 +-
 arch/riscv/include/asm/pgtable.h                   |  5 +-
 arch/riscv/include/asm/sbi.h                       |  5 ++
 arch/riscv/include/asm/tlbflush.h                  | 18 ++++
 arch/riscv/include/asm/vdso.h                      |  2 +-
 arch/riscv/include/asm/vmalloc.h                   | 18 ++++
 arch/riscv/include/uapi/asm/ucontext.h             | 12 ++-
 arch/riscv/kernel/Makefile                         |  1 +
 arch/riscv/kernel/cpu.c                            | 30 ++++++-
 arch/riscv/kernel/cpufeature.c                     | 43 +++++++---
 arch/riscv/kernel/crash_core.c                     | 21 +++++
 arch/riscv/kernel/elf_kexec.c                      | 14 +++
 arch/riscv/kernel/entry.S                          | 34 +++++---
 arch/riscv/kernel/mcount.S                         | 44 +++++-----
 arch/riscv/kernel/probes/Makefile                  |  2 +-
 arch/riscv/kernel/probes/kprobes.c                 | 13 ---
 arch/riscv/kernel/probes/rethook.c                 | 27 ++++++
 arch/riscv/kernel/probes/rethook.h                 |  8 ++
 .../{kprobes_trampoline.S => rethook_trampoline.S} |  6 +-
 arch/riscv/kernel/signal.c                         | 34 +++++---
 arch/riscv/kernel/stacktrace.c                     | 11 ++-
 arch/riscv/kernel/traps.c                          | 30 ++++++-
 arch/riscv/mm/Makefile                             |  2 +
 arch/riscv/mm/cacheflush.c                         | 45 ++++++++++
 arch/riscv/mm/context.c                            | 10 +++
 arch/riscv/mm/dma-noncoherent.c                    | 41 ---------
 arch/riscv/mm/init.c                               | 25 +++---
 arch/riscv/mm/pgtable.c                            | 83 ++++++++++++++++++
 arch/riscv/mm/physaddr.c                           |  2 +-
 arch/riscv/mm/pmem.c                               | 21 +++++
 arch/riscv/mm/tlbflush.c                           | 28 +++---
 drivers/irqchip/Kconfig                            | 21 +----
 drivers/perf/riscv_pmu_sbi.c                       | 34 +++++---
 scripts/head-object-list.txt                       |  1 -
 54 files changed, 684 insertions(+), 300 deletions(-)
 create mode 100644 arch/riscv/kernel/crash_core.c
 create mode 100644 arch/riscv/kernel/probes/rethook.c
 create mode 100644 arch/riscv/kernel/probes/rethook.h
 rename arch/riscv/kernel/probes/{kprobes_trampoline.S => rethook_trampoline.S} (94%)
 create mode 100644 arch/riscv/mm/pgtable.c
 create mode 100644 arch/riscv/mm/pmem.c

Powered by blists - more mailing lists