Commit 7214618c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'riscv/for-v5.5-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux 

Pull RISC-V fixes from Paul Walmsley:
 "Several fixes, and one cleanup, for RISC-V.

  Fixes:

   - Fix an error in a Kconfig file that resulted in an undefined
     Kconfig option "CONFIG_CONFIG_MMU"

   - Fix undefined Kconfig option "CONFIG_CONFIG_MMU"

   - Fix scratch register clearing in M-mode (affects nommu users)

   - Fix a mismerge on my part that broke the build for
     CONFIG_SPARSEMEM_VMEMMAP users

  Cleanup:

   - Move SiFive L2 cache-related code to drivers/soc, per request"

* tag 'riscv/for-v5.5-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
  riscv: move sifive_l2_cache.c to drivers/soc
  riscv: define vmemmap before pfn_to_page calls
  riscv: fix scratch register clearing in M-mode.
  riscv: Fix use of undefined config option CONFIG_CONFIG_MMU
parents 78bac77b 9209fb51

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -6027,6 +6027,7 @@ M: Yash Shah <yash.shah@sifive.com> 
L:	linux-edac@vger.kernel.org

S:	Supported

F:	drivers/edac/sifive_edac.c

F:	drivers/soc/sifive_l2_cache.c









EDAC-SKYLAKE









M:	Tony Luck <tony.luck@intel.com>
































arch/riscv/Kconfig



+1
−1






























Original line number
Diff line number
Diff line







@@ -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
































arch/riscv/include/asm/pgtable.h



+21
−17






























Original line number
Diff line number
Diff line







@@ -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)
































arch/riscv/kernel/head.S



+1
−1






























Original line number
Diff line number
Diff line







@@ -246,7 +246,7 @@ ENTRY(reset_regs)







	li	t4, 0









	li	t5, 0









	li	t6, 0









	csrw	sscratch, 0









	csrw	CSR_SCRATCH, 0



















#ifdef CONFIG_FPU









	csrr	t0, CSR_MISA
































arch/riscv/mm/Makefile



+0
−1






























Original line number
Diff line number
Diff line







@@ -10,7 +10,6 @@ obj-y += extable.o







obj-$(CONFIG_MMU) += fault.o









obj-y += cacheflush.o









obj-y += context.o









obj-y += sifive_l2_cache.o



















ifeq ($(CONFIG_MMU),y)









obj-$(CONFIG_SMP) += tlbflush.o