Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze 

Pull microblaze update from Michal Simek:
 "The main change is UAPI for Microblaze."

* 'next' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: signal: Declare do_notify_resume
  microblaze: lib: Add lib function declarations
  microblaze: lib: Remove helper macros
  microblaze: Add static qualifiers
  microblaze: Wire-up new system call kcmp
  microblaze: Fix intc_enable_or_unmask function
  microblaze: Do not initialized regs->r1 twice in ELF_PLAT_INIT
  microblaze: Remove passing the second arg to schedule_tail
  UAPI: (Scripted) Disintegrate arch/microblaze/include/asm
  microblaze: uaccess.h: Fix timerfd syscall
  microblaze: Remove BIP from childregs
parents 1ed55eac 4378bb69

arch/microblaze/include/asm/Kbuild

+0 −2
Original line number Diff line number Diff line 
include include/asm-generic/Kbuild.asm



header-y  += elf.h

generic-y += clkdev.h

generic-y += exec.h

generic-y += trace_clock.h

arch/microblaze/include/asm/elf.h

+1 −96
Original line number Diff line number Diff line
@@ -7,119 +7,24 @@ 
 * License. See the file "COPYING" in the main directory of this archive

 * for more details.

 */



#ifndef _ASM_MICROBLAZE_ELF_H

#define _ASM_MICROBLAZE_ELF_H



/*

 * Note there is no "official" ELF designation for Microblaze.

 * I've snaffled the value from the microblaze binutils source code

 * /binutils/microblaze/include/elf/microblaze.h

 */

#define EM_MICROBLAZE		189

#define EM_MICROBLAZE_OLD	0xbaab

#define ELF_ARCH		EM_MICROBLAZE



/*

 * This is used to ensure we don't load something for the wrong architecture.

 */

#define elf_check_arch(x)	((x)->e_machine == EM_MICROBLAZE \

				 || (x)->e_machine == EM_MICROBLAZE_OLD)



/*

 * These are used to set parameters in the core dumps.

 */

#define ELF_CLASS	ELFCLASS32

#include <uapi/asm/elf.h>



#ifndef __uClinux__



/*

 * ELF register definitions..

 */



#include <asm/ptrace.h>

#include <asm/byteorder.h>



#ifndef ELF_GREG_T

#define ELF_GREG_T

typedef unsigned long elf_greg_t;

#endif



#ifndef ELF_NGREG

#define ELF_NGREG (sizeof(struct pt_regs) / sizeof(elf_greg_t))

#endif



#ifndef ELF_GREGSET_T

#define ELF_GREGSET_T

typedef elf_greg_t elf_gregset_t[ELF_NGREG];

#endif



#ifndef ELF_FPREGSET_T

#define ELF_FPREGSET_T



/* TBD */

#define ELF_NFPREG	33	/* includes fsr */

typedef unsigned long elf_fpreg_t;

typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];



/* typedef struct user_fpu_struct elf_fpregset_t; */

#endif



/* This is the location that an ET_DYN program is loaded if exec'ed.  Typical

 * use of this is to invoke "./ld.so someprog" to test out a new version of

 * the loader.  We need to make sure that it is out of the way of the program

 * that it will "exec", and that there is sufficient room for the brk.

 */



#define ELF_ET_DYN_BASE         (0x08000000)



#ifdef __MICROBLAZEEL__

#define ELF_DATA	ELFDATA2LSB

#else

#define ELF_DATA	ELFDATA2MSB

#endif



#define ELF_EXEC_PAGESIZE	PAGE_SIZE





#define ELF_CORE_COPY_REGS(_dest, _regs)			\

	memcpy((char *) &_dest, (char *) _regs,		\

	sizeof(struct pt_regs));



/* This yields a mask that user programs can use to figure out what

 * instruction set this CPU supports.  This could be done in user space,

 * but it's not easy, and we've already done it here.

 */

#define ELF_HWCAP	(0)



/* This yields a string that ld.so will use to load implementation

 * specific libraries for optimization.  This is more specific in

 * intent than poking at uname or /proc/cpuinfo.



 * For the moment, we have only optimizations for the Intel generations,

 * but that could change...

 */

#define ELF_PLATFORM  (NULL)



/* Added _f parameter. Is this definition correct: TBD */

#define ELF_PLAT_INIT(_r, _f)				\

do {							\

	_r->r1 =  _r->r1 =  _r->r2 =  _r->r3 =		\

	_r->r4 =  _r->r5 =  _r->r6 =  _r->r7 =		\

	_r->r8 =  _r->r9 =  _r->r10 = _r->r11 =		\

	_r->r12 = _r->r13 = _r->r14 = _r->r15 =		\

	_r->r16 = _r->r17 = _r->r18 = _r->r19 =		\

	_r->r20 = _r->r21 = _r->r22 = _r->r23 =		\

	_r->r24 = _r->r25 = _r->r26 = _r->r27 =		\

	_r->r28 = _r->r29 = _r->r30 = _r->r31 =		\

	0;						\

} while (0)



#ifdef __KERNEL__

#define SET_PERSONALITY(ex) \

	set_personality(PER_LINUX_32BIT | (current->personality & (~PER_MASK)))

#endif



#endif /* __uClinux__ */



#endif /* _ASM_MICROBLAZE_ELF_H */

arch/microblaze/include/asm/entry.h

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ DECLARE_PER_CPU(unsigned int, KM); /* Kernel/user mode */ 
DECLARE_PER_CPU(unsigned int, ENTRY_SP); /* Saved SP on kernel entry */

DECLARE_PER_CPU(unsigned int, R11_SAVE); /* Temp variable for entry */

DECLARE_PER_CPU(unsigned int, CURRENT_SAVE); /* Saved current pointer */



extern asmlinkage void do_notify_resume(struct pt_regs *regs, int in_syscall);

# endif /* __ASSEMBLY__ */



#endif /* _ASM_MICROBLAZE_ENTRY_H */

arch/microblaze/include/asm/ptrace.h

+2 −60
Original line number Diff line number Diff line
@@ -5,56 +5,12 @@ 
 * License. See the file "COPYING" in the main directory of this archive

 * for more details.

 */



#ifndef _ASM_MICROBLAZE_PTRACE_H

#define _ASM_MICROBLAZE_PTRACE_H



#ifndef __ASSEMBLY__



typedef unsigned long microblaze_reg_t;

#include <uapi/asm/ptrace.h>



struct pt_regs {

	microblaze_reg_t r0;

	microblaze_reg_t r1;

	microblaze_reg_t r2;

	microblaze_reg_t r3;

	microblaze_reg_t r4;

	microblaze_reg_t r5;

	microblaze_reg_t r6;

	microblaze_reg_t r7;

	microblaze_reg_t r8;

	microblaze_reg_t r9;

	microblaze_reg_t r10;

	microblaze_reg_t r11;

	microblaze_reg_t r12;

	microblaze_reg_t r13;

	microblaze_reg_t r14;

	microblaze_reg_t r15;

	microblaze_reg_t r16;

	microblaze_reg_t r17;

	microblaze_reg_t r18;

	microblaze_reg_t r19;

	microblaze_reg_t r20;

	microblaze_reg_t r21;

	microblaze_reg_t r22;

	microblaze_reg_t r23;

	microblaze_reg_t r24;

	microblaze_reg_t r25;

	microblaze_reg_t r26;

	microblaze_reg_t r27;

	microblaze_reg_t r28;

	microblaze_reg_t r29;

	microblaze_reg_t r30;

	microblaze_reg_t r31;

	microblaze_reg_t pc;

	microblaze_reg_t msr;

	microblaze_reg_t ear;

	microblaze_reg_t esr;

	microblaze_reg_t fsr;

	int pt_mode;

};



#ifdef __KERNEL__

#ifndef __ASSEMBLY__

#define kernel_mode(regs)		((regs)->pt_mode)

#define user_mode(regs)			(!kernel_mode(regs))
@@ -66,19 +22,5 @@ static inline long regs_return_value(struct pt_regs *regs) 
	return regs->r3;

}



#else /* __KERNEL__ */



/* pt_regs offsets used by gdbserver etc in ptrace syscalls */

#define PT_GPR(n)	((n) * sizeof(microblaze_reg_t))

#define PT_PC		(32 * sizeof(microblaze_reg_t))

#define PT_MSR		(33 * sizeof(microblaze_reg_t))

#define PT_EAR		(34 * sizeof(microblaze_reg_t))

#define PT_ESR		(35 * sizeof(microblaze_reg_t))

#define PT_FSR		(36 * sizeof(microblaze_reg_t))

#define PT_KERNEL_MODE	(37 * sizeof(microblaze_reg_t))



#endif /* __KERNEL */



#endif /* __ASSEMBLY__ */



#endif /* _ASM_MICROBLAZE_PTRACE_H */

arch/microblaze/include/asm/setup.h

+1 −5
Original line number Diff line number Diff line
@@ -7,15 +7,12 @@ 
 * License. See the file "COPYING" in the main directory of this archive

 * for more details.

 */



#ifndef _ASM_MICROBLAZE_SETUP_H

#define _ASM_MICROBLAZE_SETUP_H



#define COMMAND_LINE_SIZE	256

#include <uapi/asm/setup.h>



# ifndef __ASSEMBLY__



#  ifdef __KERNEL__

extern unsigned int boot_cpuid; /* move to smp.h */



extern char cmd_line[COMMAND_LINE_SIZE];
@@ -53,6 +50,5 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end); 
extern void *alloc_maybe_bootmem(size_t size, gfp_t mask);

extern void *zalloc_maybe_bootmem(size_t size, gfp_t mask);



#  endif/* __KERNEL__ */

# endif /* __ASSEMBLY__ */

#endif /* _ASM_MICROBLAZE_SETUP_H */