Commit e27fc7e4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc64: Patch sun4v code sequences properly on module load.
  sparc: Kill custom io_remap_pfn_range().
  sparc: Stash orig_i0 into %g6 instead of %g2
  sparc: Fix handling of orig_i0 wrt. debugging when restarting syscalls.
  sparc: sigutil: Include <linux/errno.h>
parents b6844523 0b64120c

arch/sparc/include/asm/pgtable_32.h

+16 −4
Original line number Diff line number Diff line
@@ -431,10 +431,6 @@ extern unsigned long *sparc_valid_addr_bitmap; 
#define kern_addr_valid(addr) \

	(test_bit(__pa((unsigned long)(addr))>>20, sparc_valid_addr_bitmap))



extern int io_remap_pfn_range(struct vm_area_struct *vma,

			      unsigned long from, unsigned long pfn,

			      unsigned long size, pgprot_t prot);



/*

 * For sparc32&64, the pfn in io_remap_pfn_range() carries <iospace> in

 * its high 4 bits.  These macros/functions put it there or get it from there.
@@ -443,6 +439,22 @@ extern int io_remap_pfn_range(struct vm_area_struct *vma, 
#define GET_IOSPACE(pfn)		(pfn >> (BITS_PER_LONG - 4))

#define GET_PFN(pfn)			(pfn & 0x0fffffffUL)



extern int remap_pfn_range(struct vm_area_struct *, unsigned long, unsigned long,

			   unsigned long, pgprot_t);



static inline int io_remap_pfn_range(struct vm_area_struct *vma,

				     unsigned long from, unsigned long pfn,

				     unsigned long size, pgprot_t prot)

{

	unsigned long long offset, space, phys_base;



	offset = ((unsigned long long) GET_PFN(pfn)) << PAGE_SHIFT;

	space = GET_IOSPACE(pfn);

	phys_base = offset | (space << 32ULL);



	return remap_pfn_range(vma, from, phys_base >> PAGE_SHIFT, size, prot);

}



#define __HAVE_ARCH_PTEP_SET_ACCESS_FLAGS

#define ptep_set_access_flags(__vma, __address, __ptep, __entry, __dirty) \

({									  \

arch/sparc/include/asm/pgtable_64.h

+16 −4
Original line number Diff line number Diff line
@@ -757,10 +757,6 @@ static inline bool kern_addr_valid(unsigned long addr) 


extern int page_in_phys_avail(unsigned long paddr);



extern int io_remap_pfn_range(struct vm_area_struct *vma, unsigned long from,

			       unsigned long pfn,

			       unsigned long size, pgprot_t prot);



/*

 * For sparc32&64, the pfn in io_remap_pfn_range() carries <iospace> in

 * its high 4 bits.  These macros/functions put it there or get it from there.
@@ -769,6 +765,22 @@ extern int io_remap_pfn_range(struct vm_area_struct *vma, unsigned long from, 
#define GET_IOSPACE(pfn)		(pfn >> (BITS_PER_LONG - 4))

#define GET_PFN(pfn)			(pfn & 0x0fffffffffffffffUL)



extern int remap_pfn_range(struct vm_area_struct *, unsigned long, unsigned long,

			   unsigned long, pgprot_t);



static inline int io_remap_pfn_range(struct vm_area_struct *vma,

				     unsigned long from, unsigned long pfn,

				     unsigned long size, pgprot_t prot)

{

	unsigned long offset = GET_PFN(pfn) << PAGE_SHIFT;

	int space = GET_IOSPACE(pfn);

	unsigned long phys_base;



	phys_base = offset | (((unsigned long) space) << 32UL);



	return remap_pfn_range(vma, from, phys_base >> PAGE_SHIFT, size, prot);

}



#include <asm-generic/pgtable.h>



/* We provide our own get_unmapped_area to cope with VA holes and

arch/sparc/kernel/entry.h

+7 −0
Original line number Diff line number Diff line
@@ -42,6 +42,9 @@ extern void fpsave(unsigned long *fpregs, unsigned long *fsr, 
extern void fpload(unsigned long *fpregs, unsigned long *fsr);



#else /* CONFIG_SPARC32 */



#include <asm/trap_block.h>



struct popc_3insn_patch_entry {

	unsigned int	addr;

	unsigned int	insns[3];
@@ -57,6 +60,10 @@ extern struct popc_6insn_patch_entry __popc_6insn_patch, 
	__popc_6insn_patch_end;



extern void __init per_cpu_patch(void);

extern void sun4v_patch_1insn_range(struct sun4v_1insn_patch_entry *,

				    struct sun4v_1insn_patch_entry *);

extern void sun4v_patch_2insn_range(struct sun4v_2insn_patch_entry *,

				    struct sun4v_2insn_patch_entry *);

extern void __init sun4v_patch(void);

extern void __init boot_cpu_id_too_large(int cpu);

extern unsigned int dcache_parity_tl1_occurred;

arch/sparc/kernel/module.c

+27 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
#include <asm/processor.h>

#include <asm/spitfire.h>



#include "entry.h"



#ifdef CONFIG_SPARC64



#include <linux/jump_label.h>
@@ -203,6 +205,29 @@ int apply_relocate_add(Elf_Shdr *sechdrs, 
}



#ifdef CONFIG_SPARC64

static void do_patch_sections(const Elf_Ehdr *hdr,

			      const Elf_Shdr *sechdrs)

{

	const Elf_Shdr *s, *sun4v_1insn = NULL, *sun4v_2insn = NULL;

	char *secstrings = (void *)hdr + sechdrs[hdr->e_shstrndx].sh_offset;



	for (s = sechdrs; s < sechdrs + hdr->e_shnum; s++) {

		if (!strcmp(".sun4v_1insn_patch", secstrings + s->sh_name))

			sun4v_1insn = s;

		if (!strcmp(".sun4v_2insn_patch", secstrings + s->sh_name))

			sun4v_2insn = s;

	}



	if (sun4v_1insn && tlb_type == hypervisor) {

		void *p = (void *) sun4v_1insn->sh_addr;

		sun4v_patch_1insn_range(p, p + sun4v_1insn->sh_size);

	}

	if (sun4v_2insn && tlb_type == hypervisor) {

		void *p = (void *) sun4v_2insn->sh_addr;

		sun4v_patch_2insn_range(p, p + sun4v_2insn->sh_size);

	}

}



int module_finalize(const Elf_Ehdr *hdr,

		    const Elf_Shdr *sechdrs,

		    struct module *me)
@@ -210,6 +235,8 @@ int module_finalize(const Elf_Ehdr *hdr, 
	/* make jump label nops */

	jump_label_apply_nops(me);



	do_patch_sections(hdr, sechdrs);



	/* Cheetah's I-cache is fully coherent.  */

	if (tlb_type == spitfire) {

		unsigned long va;

arch/sparc/kernel/setup_64.c

+29 −19
Original line number Diff line number Diff line
@@ -234,41 +234,51 @@ void __init per_cpu_patch(void) 
	}

}



void __init sun4v_patch(void)

void sun4v_patch_1insn_range(struct sun4v_1insn_patch_entry *start,

			     struct sun4v_1insn_patch_entry *end)

{

	extern void sun4v_hvapi_init(void);

	struct sun4v_1insn_patch_entry *p1;

	struct sun4v_2insn_patch_entry *p2;



	if (tlb_type != hypervisor)

		return;

	while (start < end) {

		unsigned long addr = start->addr;



	p1 = &__sun4v_1insn_patch;

	while (p1 < &__sun4v_1insn_patch_end) {

		unsigned long addr = p1->addr;



		*(unsigned int *) (addr +  0) = p1->insn;

		*(unsigned int *) (addr +  0) = start->insn;

		wmb();

		__asm__ __volatile__("flush	%0" : : "r" (addr +  0));



		p1++;

		start++;

	}

}



	p2 = &__sun4v_2insn_patch;

	while (p2 < &__sun4v_2insn_patch_end) {

		unsigned long addr = p2->addr;

void sun4v_patch_2insn_range(struct sun4v_2insn_patch_entry *start,

			     struct sun4v_2insn_patch_entry *end)

{

	while (start < end) {

		unsigned long addr = start->addr;



		*(unsigned int *) (addr +  0) = p2->insns[0];

		*(unsigned int *) (addr +  0) = start->insns[0];

		wmb();

		__asm__ __volatile__("flush	%0" : : "r" (addr +  0));



		*(unsigned int *) (addr +  4) = p2->insns[1];

		*(unsigned int *) (addr +  4) = start->insns[1];

		wmb();

		__asm__ __volatile__("flush	%0" : : "r" (addr +  4));



		p2++;

		start++;

	}

}



void __init sun4v_patch(void)

{

	extern void sun4v_hvapi_init(void);



	if (tlb_type != hypervisor)

		return;



	sun4v_patch_1insn_range(&__sun4v_1insn_patch,

				&__sun4v_1insn_patch_end);



	sun4v_patch_2insn_range(&__sun4v_2insn_patch,

				&__sun4v_2insn_patch_end);



	sun4v_hvapi_init();

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE