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

Commit 39cee08b authored by Paul Bolle's avatar Paul Bolle Committed by Benjamin Herrenschmidt
Browse files

powerpc/8xx: Remove last traces of 8XX_MINIMAL_FPEMU 



The Kconfig symbol 8XX_MINIMAL_FPEMU was removed in commit 968219fa
("powerpc/8xx: Remove 8xx specific "minimal FPU emulation""). But that
commit didn't remove all code depending on that symbol. Do so now.

Signed-off-by: default avatarPaul Bolle <pebolle@tiscali.nl>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent f0870c55

arch/powerpc/include/asm/emulated_ops.h

+0 −2
Original line number Diff line number Diff line
@@ -46,8 +46,6 @@ extern struct ppc_emulated { 
	struct ppc_emulated_entry unaligned;

#ifdef CONFIG_MATH_EMULATION

	struct ppc_emulated_entry math;

#elif defined(CONFIG_8XX_MINIMAL_FPEMU)

	struct ppc_emulated_entry 8xx;

#endif

#ifdef CONFIG_VSX

	struct ppc_emulated_entry vsx;

arch/powerpc/kernel/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -117,8 +117,6 @@ obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o 
obj-$(CONFIG_FUNCTION_GRAPH_TRACER)	+= ftrace.o

obj-$(CONFIG_FTRACE_SYSCALLS)	+= ftrace.o



obj-$(CONFIG_8XX_MINIMAL_FPEMU) += softemu8xx.o



ifneq ($(CONFIG_PPC_INDIRECT_PIO),y)

obj-y				+= iomap.o

endif

arch/powerpc/kernel/softemu8xx.c

deleted100644 → 0
+0 −199
Original line number Diff line number Diff line 
/*

 * Software emulation of some PPC instructions for the 8xx core.

 *

 * Copyright (C) 1998 Dan Malek (dmalek@jlc.net)

 *

 * Software floating emuation for the MPC8xx processor.  I did this mostly

 * because it was easier than trying to get the libraries compiled for

 * software floating point.  The goal is still to get the libraries done,

 * but I lost patience and needed some hacks to at least get init and

 * shells running.  The first problem is the setjmp/longjmp that save

 * and restore the floating point registers.

 *

 * For this emulation, our working registers are found on the register

 * save area.

 */



#include <linux/errno.h>

#include <linux/sched.h>

#include <linux/kernel.h>

#include <linux/mm.h>

#include <linux/stddef.h>

#include <linux/unistd.h>

#include <linux/ptrace.h>

#include <linux/user.h>

#include <linux/interrupt.h>



#include <asm/pgtable.h>

#include <asm/uaccess.h>

#include <asm/io.h>



/* Eventually we may need a look-up table, but this works for now.

*/

#define LFS	48

#define LFD	50

#define LFDU	51

#define STFD	54

#define STFDU	55

#define FMR	63



void print_8xx_pte(struct mm_struct *mm, unsigned long addr)

{

	pgd_t *pgd;

	pmd_t *pmd;

	pte_t *pte;



	printk(" pte @ 0x%8lx: ", addr);

	pgd = pgd_offset(mm, addr & PAGE_MASK);

	if (pgd) {

		pmd = pmd_offset(pud_offset(pgd, addr & PAGE_MASK),

		                 addr & PAGE_MASK);

		if (pmd && pmd_present(*pmd)) {

			pte = pte_offset_kernel(pmd, addr & PAGE_MASK);

			if (pte) {

				printk(" (0x%08lx)->(0x%08lx)->0x%08lx\n",

				        (long)pgd, (long)pte, (long)pte_val(*pte));

#define pp ((long)pte_val(*pte))

				printk(" RPN: %05lx PP: %lx SPS: %lx SH: %lx "

				       "CI: %lx v: %lx\n",

				       pp>>12,    /* rpn */

				       (pp>>10)&3, /* pp */

				       (pp>>3)&1, /* small */

				       (pp>>2)&1, /* shared */

				       (pp>>1)&1, /* cache inhibit */

				       pp&1       /* valid */

				       );

#undef pp

			}

			else {

				printk("no pte\n");

			}

		}

		else {

			printk("no pmd\n");

		}

	}

	else {

		printk("no pgd\n");

	}

}



int get_8xx_pte(struct mm_struct *mm, unsigned long addr)

{

	pgd_t *pgd;

	pmd_t *pmd;

	pte_t *pte;

	int retval = 0;



	pgd = pgd_offset(mm, addr & PAGE_MASK);

	if (pgd) {

		pmd = pmd_offset(pud_offset(pgd, addr & PAGE_MASK),

		                 addr & PAGE_MASK);

		if (pmd && pmd_present(*pmd)) {

			pte = pte_offset_kernel(pmd, addr & PAGE_MASK);

			if (pte) {

				retval = (int)pte_val(*pte);

			}

		}

	}

	return retval;

}



/*

 * We return 0 on success, 1 on unimplemented instruction, and EFAULT

 * if a load/store faulted.

 */

int Soft_emulate_8xx(struct pt_regs *regs)

{

	u32 inst, instword;

	u32 flreg, idxreg, disp;

	int retval;

	s16 sdisp;

	u32 *ea, *ip;



	retval = 0;



	instword = *((u32 *)regs->nip);

	inst = instword >> 26;



	flreg = (instword >> 21) & 0x1f;

	idxreg = (instword >> 16) & 0x1f;

	disp = instword & 0xffff;



	ea = (u32 *)(regs->gpr[idxreg] + disp);

	ip = (u32 *)&current->thread.TS_FPR(flreg);



	switch ( inst )

	{

	case LFD:

		/* this is a 16 bit quantity that is sign extended

		 * so use a signed short here -- Cort

		 */

		sdisp = (instword & 0xffff);

		ea = (u32 *)(regs->gpr[idxreg] + sdisp);

		if (copy_from_user(ip, ea, sizeof(double)))

			retval = -EFAULT;

		break;



	case LFDU:

		if (copy_from_user(ip, ea, sizeof(double)))

			retval = -EFAULT;

		else

			regs->gpr[idxreg] = (u32)ea;

		break;

	case LFS:

		sdisp = (instword & 0xffff);

		ea = (u32 *)(regs->gpr[idxreg] + sdisp);

		if (copy_from_user(ip, ea, sizeof(float)))

			retval = -EFAULT;

		break;

	case STFD:

		/* this is a 16 bit quantity that is sign extended

		 * so use a signed short here -- Cort

		 */

		sdisp = (instword & 0xffff);

		ea = (u32 *)(regs->gpr[idxreg] + sdisp);

		if (copy_to_user(ea, ip, sizeof(double)))

			retval = -EFAULT;

		break;



	case STFDU:

		if (copy_to_user(ea, ip, sizeof(double)))

			retval = -EFAULT;

		else

			regs->gpr[idxreg] = (u32)ea;

		break;

	case FMR:

		/* assume this is a fp move -- Cort */

		memcpy(ip, &current->thread.TS_FPR((instword>>11)&0x1f),

		       sizeof(double));

		break;

	default:

		retval = 1;

		printk("Bad emulation %s/%d\n"

		       " NIP: %08lx instruction: %08x opcode: %x "

		       "A: %x B: %x C: %x code: %x rc: %x\n",

		       current->comm,current->pid,

		       regs->nip,

		       instword,inst,

		       (instword>>16)&0x1f,

		       (instword>>11)&0x1f,

		       (instword>>6)&0x1f,

		       (instword>>1)&0x3ff,

		       instword&1);

		{

			int pa;

			print_8xx_pte(current->mm,regs->nip);

			pa = get_8xx_pte(current->mm,regs->nip) & PAGE_MASK;

			pa |= (regs->nip & ~PAGE_MASK);

			pa = (unsigned long)__va(pa);

			printk("Kernel VA for NIP %x ", pa);

			print_8xx_pte(current->mm,pa);

		}

	}



	if (retval == 0)

		regs->nip += 4;



	return retval;

}