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

Commit cdaabbd7 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] iwmmxt thread state alignment 



This patch removes the reliance of iwmmxt on hand coded alignments.
Since thread_info is always 8K aligned, specifying that fpstate is
8-byte aligned achieves the same effect without needing to resort
to hand coded alignments.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 04916c0e

arch/arm/kernel/asm-offsets.c

+3 −1
Original line number Diff line number Diff line
@@ -57,7 +57,9 @@ int main(void) 
  DEFINE(TI_TP_VALUE,		offsetof(struct thread_info, tp_value));

  DEFINE(TI_FPSTATE,		offsetof(struct thread_info, fpstate));

  DEFINE(TI_VFPSTATE,		offsetof(struct thread_info, vfpstate));

  DEFINE(TI_IWMMXT_STATE,	(offsetof(struct thread_info, fpstate)+4)&~7);

#ifdef CONFIG_IWMMXT

  DEFINE(TI_IWMMXT_STATE,	offsetof(struct thread_info, fpstate.iwmmxt));

#endif

  BLANK();

  DEFINE(S_R0,			offsetof(struct pt_regs, ARM_r0));

  DEFINE(S_R1,			offsetof(struct pt_regs, ARM_r1));

arch/arm/kernel/ptrace.c

+4 −10
Original line number Diff line number Diff line
@@ -610,15 +610,12 @@ static int ptrace_setfpregs(struct task_struct *tsk, void __user *ufp) 
static int ptrace_getwmmxregs(struct task_struct *tsk, void __user *ufp)

{

	struct thread_info *thread = task_thread_info(tsk);

	void *ptr = &thread->fpstate;



	if (!test_ti_thread_flag(thread, TIF_USING_IWMMXT))

		return -ENODATA;

	iwmmxt_task_disable(thread);  /* force it to ram */

	/* The iWMMXt state is stored doubleword-aligned.  */

	if (((long) ptr) & 4)

		ptr += 4;

	return copy_to_user(ufp, ptr, 0x98) ? -EFAULT : 0;

	return copy_to_user(ufp, &thread->fpstate.iwmmxt, IWMMXT_SIZE)

		? -EFAULT : 0;

}



/*
@@ -627,15 +624,12 @@ static int ptrace_getwmmxregs(struct task_struct *tsk, void __user *ufp) 
static int ptrace_setwmmxregs(struct task_struct *tsk, void __user *ufp)

{

	struct thread_info *thread = task_thread_info(tsk);

	void *ptr = &thread->fpstate;



	if (!test_ti_thread_flag(thread, TIF_USING_IWMMXT))

		return -EACCES;

	iwmmxt_task_release(thread);  /* force a reload */

	/* The iWMMXt state is stored doubleword-aligned.  */

	if (((long) ptr) & 4)

		ptr += 4;

	return copy_from_user(ptr, ufp, 0x98) ? -EFAULT : 0;

	return copy_from_user(&thead->fpstate.iwmmxt, ufp, IWMMXT_SIZE)

		? -EFAULT : 0;

}



#endif

include/asm-arm/fpstate.h

+3 −1
Original line number Diff line number Diff line
@@ -55,8 +55,10 @@ struct fp_soft_struct { 
	unsigned int save[FP_SOFT_SIZE];		/* undefined information */

};



#define IWMMXT_SIZE	0x98



struct iwmmxt_struct {

	unsigned int save[0x98/sizeof(int) + 1];

	unsigned int save[IWMMXT_SIZE / sizeof(unsigned int)];

};



union fp_state {

include/asm-arm/thread_info.h

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ struct thread_info { 
	struct cpu_context_save	cpu_context;	/* cpu context */

	__u8			used_cp[16];	/* thread used copro */

	unsigned long		tp_value;

	union fp_state		fpstate;

	union fp_state		fpstate __attribute__((aligned(8)));

	union vfp_state		vfpstate;

	struct restart_block	restart_block;

};