Rebose obsolete patches (merged upstream)
See: https://lists.infradead.org/pipermail/linux-riscv/2019-December/007983.html Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
This commit is contained in:
parent
ac78b1388f
commit
6057fbf263
|
@ -1,26 +0,0 @@
|
||||||
From abb381aff5d1a48381fdcc19b5e48bf277d60699 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Fedora Kernel Team <kernel-team@fedoraproject.org>
|
|
||||||
Date: Thu, 19 Dec 2019 09:04:40 +0000
|
|
||||||
Subject: [PATCH 1/3] riscv: Fix use of undefined config option
|
|
||||||
CONFIG_CONFIG_MMU
|
|
||||||
|
|
||||||
---
|
|
||||||
arch/riscv/Kconfig | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
|
|
||||||
index cea2f9b..fe94135 100644
|
|
||||||
--- a/arch/riscv/Kconfig
|
|
||||||
+++ b/arch/riscv/Kconfig
|
|
||||||
@@ -154,7 +154,7 @@ config GENERIC_HWEIGHT
|
|
||||||
def_bool y
|
|
||||||
|
|
||||||
config FIX_EARLYCON_MEM
|
|
||||||
- def_bool CONFIG_MMU
|
|
||||||
+ def_bool MMU
|
|
||||||
|
|
||||||
config PGTABLE_LEVELS
|
|
||||||
int
|
|
||||||
--
|
|
||||||
2.24.1
|
|
||||||
|
|
|
@ -1,68 +0,0 @@
|
||||||
From a72a881518aba3c31aa8af25470c5a5649045b98 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Fedora Kernel Team <kernel-team@fedoraproject.org>
|
|
||||||
Date: Thu, 19 Dec 2019 09:06:14 +0000
|
|
||||||
Subject: [PATCH 3/3] riscv: define vmemmap before pfn_to_page calls
|
|
||||||
|
|
||||||
---
|
|
||||||
arch/riscv/include/asm/pgtable.h | 38 ++++++++++++++++++--------------
|
|
||||||
1 file changed, 21 insertions(+), 17 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h
|
|
||||||
index 7ff0ed4..36ae017 100644
|
|
||||||
--- a/arch/riscv/include/asm/pgtable.h
|
|
||||||
+++ b/arch/riscv/include/asm/pgtable.h
|
|
||||||
@@ -90,6 +90,27 @@ extern pgd_t swapper_pg_dir[];
|
|
||||||
#define __S110 PAGE_SHARED_EXEC
|
|
||||||
#define __S111 PAGE_SHARED_EXEC
|
|
||||||
|
|
||||||
+#define VMALLOC_SIZE (KERN_VIRT_SIZE >> 1)
|
|
||||||
+#define VMALLOC_END (PAGE_OFFSET - 1)
|
|
||||||
+#define VMALLOC_START (PAGE_OFFSET - VMALLOC_SIZE)
|
|
||||||
+
|
|
||||||
+/*
|
|
||||||
+ * Roughly size the vmemmap space to be large enough to fit enough
|
|
||||||
+ * struct pages to map half the virtual address space. Then
|
|
||||||
+ * position vmemmap directly below the VMALLOC region.
|
|
||||||
+ */
|
|
||||||
+#define VMEMMAP_SHIFT \
|
|
||||||
+ (CONFIG_VA_BITS - PAGE_SHIFT - 1 + STRUCT_PAGE_MAX_SHIFT)
|
|
||||||
+#define VMEMMAP_SIZE BIT(VMEMMAP_SHIFT)
|
|
||||||
+#define VMEMMAP_END (VMALLOC_START - 1)
|
|
||||||
+#define VMEMMAP_START (VMALLOC_START - VMEMMAP_SIZE)
|
|
||||||
+
|
|
||||||
+/*
|
|
||||||
+ * Define vmemmap for pfn_to_page & page_to_pfn calls. Needed if kernel
|
|
||||||
+ * is configured with CONFIG_SPARSEMEM_VMEMMAP enabled.
|
|
||||||
+ */
|
|
||||||
+#define vmemmap ((struct page *)VMEMMAP_START)
|
|
||||||
+
|
|
||||||
static inline int pmd_present(pmd_t pmd)
|
|
||||||
{
|
|
||||||
return (pmd_val(pmd) & (_PAGE_PRESENT | _PAGE_PROT_NONE));
|
|
||||||
@@ -400,23 +421,6 @@ static inline int ptep_clear_flush_young(struct vm_area_struct *vma,
|
|
||||||
#define __pte_to_swp_entry(pte) ((swp_entry_t) { pte_val(pte) })
|
|
||||||
#define __swp_entry_to_pte(x) ((pte_t) { (x).val })
|
|
||||||
|
|
||||||
-#define VMALLOC_SIZE (KERN_VIRT_SIZE >> 1)
|
|
||||||
-#define VMALLOC_END (PAGE_OFFSET - 1)
|
|
||||||
-#define VMALLOC_START (PAGE_OFFSET - VMALLOC_SIZE)
|
|
||||||
-
|
|
||||||
-/*
|
|
||||||
- * Roughly size the vmemmap space to be large enough to fit enough
|
|
||||||
- * struct pages to map half the virtual address space. Then
|
|
||||||
- * position vmemmap directly below the VMALLOC region.
|
|
||||||
- */
|
|
||||||
-#define VMEMMAP_SHIFT \
|
|
||||||
- (CONFIG_VA_BITS - PAGE_SHIFT - 1 + STRUCT_PAGE_MAX_SHIFT)
|
|
||||||
-#define VMEMMAP_SIZE BIT(VMEMMAP_SHIFT)
|
|
||||||
-#define VMEMMAP_END (VMALLOC_START - 1)
|
|
||||||
-#define VMEMMAP_START (VMALLOC_START - VMEMMAP_SIZE)
|
|
||||||
-
|
|
||||||
-#define vmemmap ((struct page *)VMEMMAP_START)
|
|
||||||
-
|
|
||||||
#define PCI_IO_SIZE SZ_16M
|
|
||||||
#define PCI_IO_END VMEMMAP_START
|
|
||||||
#define PCI_IO_START (PCI_IO_END - PCI_IO_SIZE)
|
|
||||||
--
|
|
||||||
2.24.1
|
|
||||||
|
|
|
@ -871,12 +871,6 @@ Patch526: libertas-Fix-two-buffer-overflows-at-parsing-bss-descriptor.patch
|
||||||
# https://github.com/sifive/riscv-linux/commits/dev/paulw/cpufreq-dt-aloe-v5.3-rc4
|
# https://github.com/sifive/riscv-linux/commits/dev/paulw/cpufreq-dt-aloe-v5.3-rc4
|
||||||
Patch570: 0002-SiFive-Unleashed-CPUFreq.patch
|
Patch570: 0002-SiFive-Unleashed-CPUFreq.patch
|
||||||
|
|
||||||
# https://patchwork.kernel.org/patch/11297277/
|
|
||||||
Patch571: 0001-riscv-Fix-use-of-undefined-config-option-CONFIG_CONF.patch
|
|
||||||
|
|
||||||
# https://patchwork.kernel.org/patch/11297561/
|
|
||||||
Patch572: 0003-riscv-define-vmemmap-before-pfn_to_page-calls.patch
|
|
||||||
|
|
||||||
# https://patchwork.kernel.org/patch/11299999/
|
# https://patchwork.kernel.org/patch/11299999/
|
||||||
Patch573: 0002-riscv-reject-invalid-syscalls-below-1.patch
|
Patch573: 0002-riscv-reject-invalid-syscalls-below-1.patch
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue