tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'riscv-for-linus-6.5-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux

Pull RISC-V fixes from Palmer Dabbelt:

- A pair of fixes for build-related failures in the selftests

- A fix for a sparse warning in acpi_os_ioremap()

- A fix to restore the kernel PA offset in vmcoreinfo, to fix crash
handling

* tag 'riscv-for-linus-6.5-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
Documentation: kdump: Add va_kernel_pa_offset for RISCV64
riscv: Export va_kernel_pa_offset in vmcoreinfo
RISC-V: ACPI: Fix acpi_os_ioremap to return iomem address
selftests: riscv: Fix compilation error with vstate_exec_nolibc.c
selftests/riscv: fix potential build failure during the "emit_tests" step

Linus Torvalds e661f98c ea4f142f

+11 -5
+6
Documentation/admin-guide/kdump/vmcoreinfo.rst
··· 624 624 * VMALLOC_START ~ VMALLOC_END : vmalloc() / ioremap() space. 625 625 * VMEMMAP_START ~ VMEMMAP_END : vmemmap space, used for struct page array. 626 626 * KERNEL_LINK_ADDR : start address of Kernel link and BPF 627 + 628 + va_kernel_pa_offset 629 + ------------------- 630 + 631 + Indicates the offset between the kernel virtual and physical mappings. 632 + Used to translate virtual to physical addresses.
+1 -1
arch/riscv/include/asm/acpi.h
··· 19 19 #define PHYS_CPUID_INVALID INVALID_HARTID 20 20 21 21 /* ACPI table mapping after acpi_permanent_mmap is set */ 22 - void *acpi_os_ioremap(acpi_physical_address phys, acpi_size size); 22 + void __iomem *acpi_os_ioremap(acpi_physical_address phys, acpi_size size); 23 23 #define acpi_os_ioremap acpi_os_ioremap 24 24 25 25 #define acpi_strict 1 /* No out-of-spec workarounds on RISC-V */
+2 -2
arch/riscv/kernel/acpi.c
··· 215 215 early_iounmap(map, size); 216 216 } 217 217 218 - void *acpi_os_ioremap(acpi_physical_address phys, acpi_size size) 218 + void __iomem *acpi_os_ioremap(acpi_physical_address phys, acpi_size size) 219 219 { 220 - return memremap(phys, size, MEMREMAP_WB); 220 + return (void __iomem *)memremap(phys, size, MEMREMAP_WB); 221 221 } 222 222 223 223 #ifdef CONFIG_PCI
+2
arch/riscv/kernel/crash_core.c
··· 18 18 vmcoreinfo_append_str("NUMBER(MODULES_END)=0x%lx\n", MODULES_END); 19 19 #endif 20 20 vmcoreinfo_append_str("NUMBER(KERNEL_LINK_ADDR)=0x%lx\n", KERNEL_LINK_ADDR); 21 + vmcoreinfo_append_str("NUMBER(va_kernel_pa_offset)=0x%lx\n", 22 + kernel_map.va_kernel_pa_offset); 21 23 }
-2
tools/testing/selftests/riscv/vector/vstate_exec_nolibc.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0-only 2 - #include <sys/prctl.h> 3 - 4 2 #define THIS_PROGRAM "./vstate_exec_nolibc" 5 3 6 4 int main(int argc, char **argv)