From: Greg Kroah-Hartman Date: Fri, 17 Jul 2026 07:40:18 +0000 (+0200) Subject: drop a riscv patch X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cce675858636e3cdc48191d16594ba6b4a3835a1;p=thirdparty%2Fkernel%2Fstable-queue.git drop a riscv patch --- diff --git a/queue-5.15/riscv-mm-define-direct_map_physmem_end.patch b/queue-5.15/riscv-mm-define-direct_map_physmem_end.patch deleted file mode 100644 index d7bb236ee0..0000000000 --- a/queue-5.15/riscv-mm-define-direct_map_physmem_end.patch +++ /dev/null @@ -1,47 +0,0 @@ -From f3336b48cf9d3f2d1fc78e3289c0ded2f00876ee Mon Sep 17 00:00:00 2001 -From: Vivian Wang -Date: Sat, 6 Jun 2026 20:17:54 -0600 -Subject: riscv: mm: Define DIRECT_MAP_PHYSMEM_END - -From: Vivian Wang - -commit f3336b48cf9d3f2d1fc78e3289c0ded2f00876ee upstream. - -On RISC-V, the actual mappable range of physical address space is -dependent on the current MMU mode i.e. satp_mode (See -Documentation/arch/riscv/vm-layout.rst). - -Define the DIRECT_MAP_PHYSMEM_END macro based on the existing virtual -address space layout macros to expose this information to -get_free_mem_region(). Otherwise, it returns a region that couldn't be -mapped, which breaks ZONE_DEVICE. - -Cc: stable@vger.kernel.org # v6.13+ -Tested-by: Han Gao # SG2044 -Signed-off-by: Vivian Wang -Link: https://patch.msgid.link/20260309-riscv-sparsemem-vmemmap-limits-v1-2-f40efe18e3cd@iscas.ac.cn -Signed-off-by: Paul Walmsley -Signed-off-by: Greg Kroah-Hartman ---- - arch/riscv/include/asm/pgtable.h | 10 ++++++++++ - 1 file changed, 10 insertions(+) - ---- a/arch/riscv/include/asm/pgtable.h -+++ b/arch/riscv/include/asm/pgtable.h -@@ -60,6 +60,16 @@ - */ - #define vmemmap ((struct page *)VMEMMAP_START - (phys_ram_base >> PAGE_SHIFT)) - -+/* Needed to limit get_free_mem_region() */ -+#if defined(CONFIG_FLATMEM) -+#define DIRECT_MAP_PHYSMEM_END (phys_ram_base + KERN_VIRT_SIZE - 1) -+#elif defined(CONFIG_SPARSEMEM_VMEMMAP) -+#define DIRECT_MAP_PHYSMEM_END \ -+ ((vmemmap_start_pfn + VMEMMAP_SIZE / sizeof(struct page)) * PAGE_SIZE - 1) -+#elif defined(CONFIG_SPARSEMEM) -+/* DIRECT_MAP_PHYSMEM_END is not limited by VA space assignment in this case */ -+#endif -+ - #define PCI_IO_SIZE SZ_16M - #define PCI_IO_END VMEMMAP_START - #define PCI_IO_START (PCI_IO_END - PCI_IO_SIZE) diff --git a/queue-5.15/series b/queue-5.15/series index 93175f02b1..45289bdc57 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -174,7 +174,6 @@ tracing-prevent-out-of-bounds-read-in-glob-matching.patch nfsv4-include-may_write-in-open-permission-mask-for-o_trunc.patch exfat-bound-uniname-advance-in-exfat_find_dir_entry.patch ntb-epf-fix-request_irq-unwind-in-ntb_epf_init_isr.patch -riscv-mm-define-direct_map_physmem_end.patch kvm-vmx-grab-vmcs12-on-cr8-interception-update-iff-vcpu-is-in-guest-mode.patch udmabuf-fix-dma-direction-mismatch-in-release_udmabuf.patch i2c-core-fix-adapter-deregistration-race.patch diff --git a/queue-6.1/riscv-mm-define-direct_map_physmem_end.patch b/queue-6.1/riscv-mm-define-direct_map_physmem_end.patch deleted file mode 100644 index 84d4a4f924..0000000000 --- a/queue-6.1/riscv-mm-define-direct_map_physmem_end.patch +++ /dev/null @@ -1,47 +0,0 @@ -From f3336b48cf9d3f2d1fc78e3289c0ded2f00876ee Mon Sep 17 00:00:00 2001 -From: Vivian Wang -Date: Sat, 6 Jun 2026 20:17:54 -0600 -Subject: riscv: mm: Define DIRECT_MAP_PHYSMEM_END - -From: Vivian Wang - -commit f3336b48cf9d3f2d1fc78e3289c0ded2f00876ee upstream. - -On RISC-V, the actual mappable range of physical address space is -dependent on the current MMU mode i.e. satp_mode (See -Documentation/arch/riscv/vm-layout.rst). - -Define the DIRECT_MAP_PHYSMEM_END macro based on the existing virtual -address space layout macros to expose this information to -get_free_mem_region(). Otherwise, it returns a region that couldn't be -mapped, which breaks ZONE_DEVICE. - -Cc: stable@vger.kernel.org # v6.13+ -Tested-by: Han Gao # SG2044 -Signed-off-by: Vivian Wang -Link: https://patch.msgid.link/20260309-riscv-sparsemem-vmemmap-limits-v1-2-f40efe18e3cd@iscas.ac.cn -Signed-off-by: Paul Walmsley -Signed-off-by: Greg Kroah-Hartman ---- - arch/riscv/include/asm/pgtable.h | 10 ++++++++++ - 1 file changed, 10 insertions(+) - ---- a/arch/riscv/include/asm/pgtable.h -+++ b/arch/riscv/include/asm/pgtable.h -@@ -81,6 +81,16 @@ - */ - #define vmemmap ((struct page *)VMEMMAP_START - vmemmap_start_pfn) - -+/* Needed to limit get_free_mem_region() */ -+#if defined(CONFIG_FLATMEM) -+#define DIRECT_MAP_PHYSMEM_END (phys_ram_base + KERN_VIRT_SIZE - 1) -+#elif defined(CONFIG_SPARSEMEM_VMEMMAP) -+#define DIRECT_MAP_PHYSMEM_END \ -+ ((vmemmap_start_pfn + VMEMMAP_SIZE / sizeof(struct page)) * PAGE_SIZE - 1) -+#elif defined(CONFIG_SPARSEMEM) -+/* DIRECT_MAP_PHYSMEM_END is not limited by VA space assignment in this case */ -+#endif -+ - #define PCI_IO_SIZE SZ_16M - #define PCI_IO_END VMEMMAP_START - #define PCI_IO_START (PCI_IO_END - PCI_IO_SIZE) diff --git a/queue-6.1/series b/queue-6.1/series index d7976af3a7..f558cf5d76 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -226,7 +226,6 @@ nfsv4-include-may_write-in-open-permission-mask-for-o_trunc.patch module-decompress-check-return-value-of-module_extend_max_pages.patch exfat-bound-uniname-advance-in-exfat_find_dir_entry.patch ntb-epf-fix-request_irq-unwind-in-ntb_epf_init_isr.patch -riscv-mm-define-direct_map_physmem_end.patch kvm-vmx-refresh-guest_pending_dbg_exceptions.bs-on-all-injected-dbs.patch kvm-vmx-grab-vmcs12-on-cr8-interception-update-iff-vcpu-is-in-guest-mode.patch udmabuf-fix-dma-direction-mismatch-in-release_udmabuf.patch diff --git a/queue-6.12/riscv-mm-define-direct_map_physmem_end.patch b/queue-6.12/riscv-mm-define-direct_map_physmem_end.patch deleted file mode 100644 index bc87a01336..0000000000 --- a/queue-6.12/riscv-mm-define-direct_map_physmem_end.patch +++ /dev/null @@ -1,47 +0,0 @@ -From f3336b48cf9d3f2d1fc78e3289c0ded2f00876ee Mon Sep 17 00:00:00 2001 -From: Vivian Wang -Date: Sat, 6 Jun 2026 20:17:54 -0600 -Subject: riscv: mm: Define DIRECT_MAP_PHYSMEM_END - -From: Vivian Wang - -commit f3336b48cf9d3f2d1fc78e3289c0ded2f00876ee upstream. - -On RISC-V, the actual mappable range of physical address space is -dependent on the current MMU mode i.e. satp_mode (See -Documentation/arch/riscv/vm-layout.rst). - -Define the DIRECT_MAP_PHYSMEM_END macro based on the existing virtual -address space layout macros to expose this information to -get_free_mem_region(). Otherwise, it returns a region that couldn't be -mapped, which breaks ZONE_DEVICE. - -Cc: stable@vger.kernel.org # v6.13+ -Tested-by: Han Gao # SG2044 -Signed-off-by: Vivian Wang -Link: https://patch.msgid.link/20260309-riscv-sparsemem-vmemmap-limits-v1-2-f40efe18e3cd@iscas.ac.cn -Signed-off-by: Paul Walmsley -Signed-off-by: Greg Kroah-Hartman ---- - arch/riscv/include/asm/pgtable.h | 10 ++++++++++ - 1 file changed, 10 insertions(+) - ---- a/arch/riscv/include/asm/pgtable.h -+++ b/arch/riscv/include/asm/pgtable.h -@@ -89,6 +89,16 @@ - */ - #define vmemmap ((struct page *)VMEMMAP_START - vmemmap_start_pfn) - -+/* Needed to limit get_free_mem_region() */ -+#if defined(CONFIG_FLATMEM) -+#define DIRECT_MAP_PHYSMEM_END (phys_ram_base + KERN_VIRT_SIZE - 1) -+#elif defined(CONFIG_SPARSEMEM_VMEMMAP) -+#define DIRECT_MAP_PHYSMEM_END \ -+ ((vmemmap_start_pfn + VMEMMAP_SIZE / sizeof(struct page)) * PAGE_SIZE - 1) -+#elif defined(CONFIG_SPARSEMEM) -+/* DIRECT_MAP_PHYSMEM_END is not limited by VA space assignment in this case */ -+#endif -+ - #define PCI_IO_SIZE SZ_16M - #define PCI_IO_END VMEMMAP_START - #define PCI_IO_START (PCI_IO_END - PCI_IO_SIZE) diff --git a/queue-6.12/series b/queue-6.12/series index 148876b662..635d9437dc 100644 --- a/queue-6.12/series +++ b/queue-6.12/series @@ -307,7 +307,6 @@ nfsv4-include-may_write-in-open-permission-mask-for-o_trunc.patch module-decompress-check-return-value-of-module_extend_max_pages.patch exfat-bound-uniname-advance-in-exfat_find_dir_entry.patch ntb-epf-fix-request_irq-unwind-in-ntb_epf_init_isr.patch -riscv-mm-define-direct_map_physmem_end.patch riscv-mm-unconditionally-sfence.vma-for-spurious-fault.patch mm-fix-mmap-errno-value-when-map_droppable-is-not-supported.patch selftests-mm-fix-and-speedup-droppable-test.patch diff --git a/queue-6.6/riscv-mm-define-direct_map_physmem_end.patch b/queue-6.6/riscv-mm-define-direct_map_physmem_end.patch deleted file mode 100644 index 6acb0207fd..0000000000 --- a/queue-6.6/riscv-mm-define-direct_map_physmem_end.patch +++ /dev/null @@ -1,47 +0,0 @@ -From f3336b48cf9d3f2d1fc78e3289c0ded2f00876ee Mon Sep 17 00:00:00 2001 -From: Vivian Wang -Date: Sat, 6 Jun 2026 20:17:54 -0600 -Subject: riscv: mm: Define DIRECT_MAP_PHYSMEM_END - -From: Vivian Wang - -commit f3336b48cf9d3f2d1fc78e3289c0ded2f00876ee upstream. - -On RISC-V, the actual mappable range of physical address space is -dependent on the current MMU mode i.e. satp_mode (See -Documentation/arch/riscv/vm-layout.rst). - -Define the DIRECT_MAP_PHYSMEM_END macro based on the existing virtual -address space layout macros to expose this information to -get_free_mem_region(). Otherwise, it returns a region that couldn't be -mapped, which breaks ZONE_DEVICE. - -Cc: stable@vger.kernel.org # v6.13+ -Tested-by: Han Gao # SG2044 -Signed-off-by: Vivian Wang -Link: https://patch.msgid.link/20260309-riscv-sparsemem-vmemmap-limits-v1-2-f40efe18e3cd@iscas.ac.cn -Signed-off-by: Paul Walmsley -Signed-off-by: Greg Kroah-Hartman ---- - arch/riscv/include/asm/pgtable.h | 10 ++++++++++ - 1 file changed, 10 insertions(+) - ---- a/arch/riscv/include/asm/pgtable.h -+++ b/arch/riscv/include/asm/pgtable.h -@@ -86,6 +86,16 @@ - */ - #define vmemmap ((struct page *)VMEMMAP_START - vmemmap_start_pfn) - -+/* Needed to limit get_free_mem_region() */ -+#if defined(CONFIG_FLATMEM) -+#define DIRECT_MAP_PHYSMEM_END (phys_ram_base + KERN_VIRT_SIZE - 1) -+#elif defined(CONFIG_SPARSEMEM_VMEMMAP) -+#define DIRECT_MAP_PHYSMEM_END \ -+ ((vmemmap_start_pfn + VMEMMAP_SIZE / sizeof(struct page)) * PAGE_SIZE - 1) -+#elif defined(CONFIG_SPARSEMEM) -+/* DIRECT_MAP_PHYSMEM_END is not limited by VA space assignment in this case */ -+#endif -+ - #define PCI_IO_SIZE SZ_16M - #define PCI_IO_END VMEMMAP_START - #define PCI_IO_START (PCI_IO_END - PCI_IO_SIZE) diff --git a/queue-6.6/series b/queue-6.6/series index 47ea0cfb89..4598da6ab0 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -293,7 +293,6 @@ edac-i10nm-don-t-fail-probing-if-adxl-is-missing.patch watchdog-apple-add-apple-t8103-wdt-compatible.patch tracing-prevent-out-of-bounds-read-in-glob-matching.patch nfsv4-include-may_write-in-open-permission-mask-for-o_trunc.patch -riscv-mm-define-direct_map_physmem_end.patch module-decompress-check-return-value-of-module_extend_max_pages.patch exfat-bound-uniname-advance-in-exfat_find_dir_entry.patch ntb-epf-fix-request_irq-unwind-in-ntb_epf_init_isr.patch