Commit 7a934f4b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull RISC-V fixes from Palmer Dabbelt:

 - A fix for a missing fence when generating the NOMMU sigreturn
   trampoline

 - A set of fixes for early DTB handling of reserved memory nodes

* tag 'riscv-for-linus-6.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
  riscv: No need to relocate the dtb as it lies in the fixmap region
  riscv: Do not set initial_boot_params to the linear address of the dtb
  riscv: Move early dtb mapping into the fixmap region
  riscv: add icache flush for nommu sigreturn trampoline
parents 95abc817 1b50f956

Documentation/riscv/vm-layout.rst

+3 −3
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ RISC-V Linux Kernel SV39 
                                                              | Kernel-space virtual memory, shared between all processes:

  ____________________________________________________________|___________________________________________________________

                    |            |                  |         |

   ffffffc6fee00000 | -228    GB | ffffffc6feffffff |    2 MB | fixmap

   ffffffc6fea00000 | -228    GB | ffffffc6feffffff |    6 MB | fixmap

   ffffffc6ff000000 | -228    GB | ffffffc6ffffffff |   16 MB | PCI io

   ffffffc700000000 | -228    GB | ffffffc7ffffffff |    4 GB | vmemmap

   ffffffc800000000 | -224    GB | ffffffd7ffffffff |   64 GB | vmalloc/ioremap space
@@ -83,7 +83,7 @@ RISC-V Linux Kernel SV48 
                                                              | Kernel-space virtual memory, shared between all processes:

  ____________________________________________________________|___________________________________________________________

                    |            |                  |         |

   ffff8d7ffee00000 |  -114.5 TB | ffff8d7ffeffffff |    2 MB | fixmap

   ffff8d7ffea00000 |  -114.5 TB | ffff8d7ffeffffff |    6 MB | fixmap

   ffff8d7fff000000 |  -114.5 TB | ffff8d7fffffffff |   16 MB | PCI io

   ffff8d8000000000 |  -114.5 TB | ffff8f7fffffffff |    2 TB | vmemmap

   ffff8f8000000000 |  -112.5 TB | ffffaf7fffffffff |   32 TB | vmalloc/ioremap space
@@ -119,7 +119,7 @@ RISC-V Linux Kernel SV57 
                                                              | Kernel-space virtual memory, shared between all processes:

  ____________________________________________________________|___________________________________________________________

                    |            |                  |         |

   ff1bfffffee00000 | -57     PB | ff1bfffffeffffff |    2 MB | fixmap

   ff1bfffffea00000 | -57     PB | ff1bfffffeffffff |    6 MB | fixmap

   ff1bffffff000000 | -57     PB | ff1bffffffffffff |   16 MB | PCI io

   ff1c000000000000 | -57     PB | ff1fffffffffffff |    1 PB | vmemmap

   ff20000000000000 | -56     PB | ff5fffffffffffff |   16 PB | vmalloc/ioremap space

arch/riscv/include/asm/fixmap.h

+8 −0
Original line number Diff line number Diff line
@@ -22,6 +22,14 @@ 
 */

enum fixed_addresses {

	FIX_HOLE,

	/*

	 * The fdt fixmap mapping must be PMD aligned and will be mapped

	 * using PMD entries in fixmap_pmd in 64-bit and a PGD entry in 32-bit.

	 */

	FIX_FDT_END,

	FIX_FDT = FIX_FDT_END + FIX_FDT_SIZE / PAGE_SIZE - 1,



	/* Below fixmaps will be mapped using fixmap_pte */

	FIX_PTE,

	FIX_PMD,

	FIX_PUD,

arch/riscv/include/asm/pgtable.h

+6 −2
Original line number Diff line number Diff line
@@ -87,9 +87,13 @@ 


#define FIXADDR_TOP      PCI_IO_START

#ifdef CONFIG_64BIT

#define FIXADDR_SIZE     PMD_SIZE

#define MAX_FDT_SIZE	 PMD_SIZE

#define FIX_FDT_SIZE	 (MAX_FDT_SIZE + SZ_2M)

#define FIXADDR_SIZE     (PMD_SIZE + FIX_FDT_SIZE)

#else

#define FIXADDR_SIZE     PGDIR_SIZE

#define MAX_FDT_SIZE	 PGDIR_SIZE

#define FIX_FDT_SIZE	 MAX_FDT_SIZE

#define FIXADDR_SIZE     (PGDIR_SIZE + FIX_FDT_SIZE)

#endif

#define FIXADDR_START    (FIXADDR_TOP - FIXADDR_SIZE)

arch/riscv/kernel/setup.c

+1 −5
Original line number Diff line number Diff line
@@ -278,12 +278,8 @@ void __init setup_arch(char **cmdline_p) 
#if IS_ENABLED(CONFIG_BUILTIN_DTB)

	unflatten_and_copy_device_tree();

#else

	if (early_init_dt_verify(__va(XIP_FIXUP(dtb_early_pa))))

	unflatten_device_tree();

	else

		pr_err("No DTB found in kernel mappings\n");

#endif

	early_init_fdt_scan_reserved_mem();

	misc_mem_init();



	init_resources();

arch/riscv/kernel/signal.c

+8 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <asm/signal32.h>

#include <asm/switch_to.h>

#include <asm/csr.h>

#include <asm/cacheflush.h>



extern u32 __user_rt_sigreturn[2];
@@ -181,6 +182,7 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set, 
{

	struct rt_sigframe __user *frame;

	long err = 0;

	unsigned long __maybe_unused addr;



	frame = get_sigframe(ksig, regs, sizeof(*frame));

	if (!access_ok(frame, sizeof(*frame)))
@@ -209,7 +211,12 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set, 
	if (copy_to_user(&frame->sigreturn_code, __user_rt_sigreturn,

			 sizeof(frame->sigreturn_code)))

		return -EFAULT;

	regs->ra = (unsigned long)&frame->sigreturn_code;



	addr = (unsigned long)&frame->sigreturn_code;

	/* Make sure the two instructions are pushed to icache. */

	flush_icache_range(addr, addr + sizeof(frame->sigreturn_code));



	regs->ra = addr;

#endif /* CONFIG_MMU */



	/*