linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: Zang Roy-R61911 <r61911@freescale.com>
Cc: Xie Shaohui-B21989 <B21989@freescale.com>,
	Liu Qiang-B32616 <B32616@freescale.com>,
	Timur Tabi <timur@tabi.org>,
	"tiejun.chen" <tiejun.chen@windriver.com>,
	Fleming Andy-AFLEMING <afleming@freescale.com>,
	Bhushan Bharat-R65777 <R65777@freescale.com>,
	"linuxppc-dev@lists.ozlabs.org" <linuxppc-dev@lists.ozlabs.org>
Subject: Re: fsqrt
Date: Fri, 07 Jun 2013 18:53:10 +1000	[thread overview]
Message-ID: <1370595190.3766.359.camel@pasglop> (raw)
In-Reply-To: <3E027F8168735B46AC006B1D0C7BB0020B213A62@039-SN2MPN1-012.039d.mgd.msft.net>

On Fri, 2013-06-07 at 07:45 +0000, Zang Roy-R61911 wrote:
> 
> > -----Original Message-----
> > From: Benjamin Herrenschmidt [mailto:benh@kernel.crashing.org]
> > Another question...
> > 
> > Do you guys happen to have a patch to emulate fsqrt in the kernel ?
> > 
> > Fedora 19 seems to be using it ... among others.
> You mean this one
> arch/powerpc/math-emu/fsqrt.c ?

No. This is for setups that have no FPU, I don't think that will work
with an actual FPU.

fsqrt is an optional instruction in the architecture and FSL chips don't
use it. However it looks like Fedora is compiled with a toolchain that
generates it.

I've successfully launched the Fedora installer using this hack in the
kernel:

>From f75adba1ee91691d431e283184e15412114000d1 Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Fri, 7 Jun 2013 18:42:44 +1000
Subject: [PATCH] Gross hack

---
 arch/powerpc/include/asm/ppc-opcode.h |    2 ++
 arch/powerpc/kernel/Makefile          |    4 ++-
 arch/powerpc/kernel/fsqrt-emu.c       |   44 +++++++++++++++++++++++++++++++++
 arch/powerpc/kernel/traps.c           |    7 ++++++
 4 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 arch/powerpc/kernel/fsqrt-emu.c

diff --git a/arch/powerpc/include/asm/ppc-opcode.h b/arch/powerpc/include/asm/ppc-opcode.h
index eccfc16..146c5e9 100644
--- a/arch/powerpc/include/asm/ppc-opcode.h
+++ b/arch/powerpc/include/asm/ppc-opcode.h
@@ -88,6 +88,8 @@
 #define PPC_INST_DCBA_MASK		0xfc0007fe
 #define PPC_INST_DCBAL			0x7c2005ec
 #define PPC_INST_DCBZL			0x7c2007ec
+#define PPC_INST_FSQRT			0xfc00002c
+#define PPC_INST_FSQRT_MASK		0xfc1f07fe
 #define PPC_INST_ICBT			0x7c00002c
 #define PPC_INST_ISEL			0x7c00001e
 #define PPC_INST_ISEL_MASK		0xfc00003e
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index f960a79..64c9962 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -26,6 +26,8 @@ CFLAGS_REMOVE_ftrace.o = -pg -mno-sched-epilog
 CFLAGS_REMOVE_time.o = -pg -mno-sched-epilog
 endif
 
+CFLAGS_REMOVE_fsqrt-emu.o = -msoft-float
+
 obj-y				:= cputable.o ptrace.o syscalls.o \
 				   irq.o align.o signal_32.o pmc.o vdso.o \
 				   process.o systbl.o idle.o \
@@ -34,7 +36,7 @@ obj-y				:= cputable.o ptrace.o syscalls.o \
 				   udbg.o misc.o io.o dma.o \
 				   misc_$(CONFIG_WORD_SIZE).o vdso32/
 obj-$(CONFIG_PPC64)		+= setup_64.o sys_ppc32.o \
-				   signal_64.o ptrace32.o \
+				   signal_64.o ptrace32.o fsqrt-emu.o \
 				   paca.o nvram_64.o firmware.o
 obj-$(CONFIG_HAVE_HW_BREAKPOINT)	+= hw_breakpoint.o
 obj-$(CONFIG_PPC_BOOK3S_64)	+= cpu_setup_ppc970.o cpu_setup_pa6t.o
diff --git a/arch/powerpc/kernel/fsqrt-emu.c b/arch/powerpc/kernel/fsqrt-emu.c
new file mode 100644
index 0000000..2da4f71
--- /dev/null
+++ b/arch/powerpc/kernel/fsqrt-emu.c
@@ -0,0 +1,44 @@
+#include <linux/kernel.h>
+#include <linux/preempt.h>
+#include <linux/sched.h>
+#include <asm/ptrace.h>
+#include <asm/processor.h>
+#include <asm/switch_to.h>
+
+static double crackpot_sqrt(double val)
+{
+    int i;
+    float x, y;
+    const float f = 1.5F;
+
+    x = val * 0.5F;
+    y  = val;
+    i  = * ( int * ) &y;
+    i  = 0x5f3759df - ( i >> 1 );
+    y  = * ( float * ) &i;
+    y  = y * ( f - ( x * y * y ) );
+    y  = y * ( f - ( x * y * y ) );
+    return val * y;
+}
+
+int emulate_fsqrt_inst(struct pt_regs *regs, u32 instword)
+{
+	unsigned int frt_r = (instword >> 21) & 0x1f;
+	unsigned int frb_r = (instword >> 21) & 0x1f;
+	double frt, frb;
+
+	/* XXX THIS WHOLE THING IS JUST A HACK ! */
+	preempt_disable();
+	enable_kernel_fp();
+	frb = current->thread.fpr[frb_r][0];
+	frt = crackpot_sqrt(frb);
+	current->thread.fpr[frt_r][0] = frt;
+	if (instword & 1)
+		regs->ccr &= 0xff00ffff;
+	preempt_enable();
+
+	return 0;
+}
+
+
+
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index 6dfbb38..e677792 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -938,6 +938,8 @@ static int emulate_isel(struct pt_regs *regs, u32 instword)
 	return 0;
 }
 
+extern int emulate_fsqrt_inst(struct pt_regs *regs, u32 instword);
+
 #ifdef CONFIG_PPC_TRANSACTIONAL_MEM
 static inline bool tm_abort_check(struct pt_regs *regs, int cause)
 {
@@ -1018,6 +1020,11 @@ static int emulate_instruction(struct pt_regs *regs)
 		return emulate_isel(regs, instword);
 	}
 
+	if ((instword & PPC_INST_FSQRT_MASK) == PPC_INST_FSQRT) {
+		PPC_WARN_EMULATED(isel, regs);
+		return emulate_fsqrt_inst(regs, instword);
+	}
+
 #ifdef CONFIG_PPC64
 	/* Emulate the mfspr rD, DSCR. */
 	if ((((instword & PPC_INST_MFSPR_DSCR_USER_MASK) ==
-- 
1.7.10.4

  reply	other threads:[~2013-06-07  8:53 UTC|newest]

Thread overview: 78+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-16  4:47 SATA FSL and upstreaming Benjamin Herrenschmidt
2013-05-16  5:45 ` Benjamin Herrenschmidt
2013-05-16  5:55   ` tiejun.chen
2013-05-16  6:06     ` Benjamin Herrenschmidt
2013-05-16  5:59   ` Zang Roy-R61911
2013-05-16  6:01   ` Bhushan Bharat-R65777
2013-05-16  6:05     ` Zang Roy-R61911
2013-05-16  6:09       ` Benjamin Herrenschmidt
2013-05-16  6:17         ` tiejun.chen
2013-05-16  6:20           ` Zang Roy-R61911
2013-05-16  6:25             ` tiejun.chen
2013-05-16  7:20               ` Zang Roy-R61911
2013-05-16  6:26             ` Benjamin Herrenschmidt
2013-05-16  6:21           ` Benjamin Herrenschmidt
2013-05-16  6:35             ` tiejun.chen
2013-05-16  6:37               ` Zang Roy-R61911
2013-05-16  6:40               ` Benjamin Herrenschmidt
2013-05-16  6:43                 ` tiejun.chen
2013-05-16  6:48                   ` Bhushan Bharat-R65777
2013-05-16  6:49                     ` Zang Roy-R61911
2013-05-16  6:53                       ` Benjamin Herrenschmidt
2013-05-16  6:56                         ` tiejun.chen
2013-05-16  7:01                         ` Zang Roy-R61911
2013-05-16  7:05                           ` Benjamin Herrenschmidt
2013-05-16  7:13                             ` Bhushan Bharat-R65777
2013-05-16  7:26                               ` Benjamin Herrenschmidt
2013-05-16  7:20                             ` Xie Shaohui-B21989
2013-05-16  7:25                             ` Bhushan Bharat-R65777
2013-05-16  6:59                       ` Benjamin Herrenschmidt
2013-05-16  7:17                         ` Zang Roy-R61911
2013-05-16  6:52                     ` Benjamin Herrenschmidt
2013-05-16 14:56                       ` Timur Tabi
2013-06-07  3:52                         ` Benjamin Herrenschmidt
2013-06-07  4:39                           ` Benjamin Herrenschmidt
2013-06-07  4:45                             ` Zang Roy-R61911
2013-06-07  4:47                               ` Benjamin Herrenschmidt
2013-06-07  4:50                                 ` Zang Roy-R61911
2013-06-07  7:41                                   ` fsqrt Benjamin Herrenschmidt
2013-06-07  7:45                                     ` fsqrt Zang Roy-R61911
2013-06-07  8:53                                       ` Benjamin Herrenschmidt [this message]
2013-06-07  8:59                                         ` fsqrt Benjamin Herrenschmidt
2013-06-07 10:48                                           ` fsqrt David Laight
2013-06-07 12:14                                             ` fsqrt Benjamin Herrenschmidt
2013-06-07 19:19                                               ` fsqrt Kumar Gala
2013-06-07 23:23                                                 ` fsqrt Benjamin Herrenschmidt
2013-06-07 23:25                                                   ` fsqrt Benjamin Herrenschmidt
2013-06-07 23:30                                                     ` fsqrt Benjamin Herrenschmidt
2013-06-08  0:20                                                       ` fsqrt Dan Malek
2013-06-08  0:34                                                         ` fsqrt Benjamin Herrenschmidt
2013-06-08  1:13                                                           ` fsqrt Dan Malek
2013-06-08  4:31                                                             ` fsqrt Benjamin Herrenschmidt
2013-06-09  6:32                                                             ` fsqrt Benjamin Herrenschmidt
2013-06-07  7:46                                     ` fsqrt tiejun.chen
2013-06-07  8:53                                       ` fsqrt Benjamin Herrenschmidt
2013-06-07  9:02                                         ` fsqrt tiejun.chen
2013-06-07 12:07                                           ` fsqrt Benjamin Herrenschmidt
2013-06-07  7:05                               ` FSL 64-bit DMA window question Benjamin Herrenschmidt
2013-06-07  7:58                                 ` Zang Roy-R61911
2013-06-07  8:55                                   ` Benjamin Herrenschmidt
2013-06-07  9:44                                     ` Zang Roy-R61911
2013-06-07 12:09                                       ` Benjamin Herrenschmidt
     [not found]                                         ` <1370642488.6813.15@snotra>
2013-06-07 22:02                                           ` Scott Wood
2013-06-07 22:09                                             ` Benjamin Herrenschmidt
2013-06-07 22:34                                               ` Scott Wood
2013-06-07 22:39                                                 ` Benjamin Herrenschmidt
2013-06-07 23:29                                                   ` Scott Wood
2013-06-07 23:33                                                     ` Benjamin Herrenschmidt
2013-06-07 12:09                             ` SATA FSL and upstreaming Timur Tabi
2013-05-16  6:17         ` Zang Roy-R61911
2013-05-16  6:23           ` Benjamin Herrenschmidt
2013-05-16  6:33             ` Bhushan Bharat-R65777
2013-05-16  6:34               ` Benjamin Herrenschmidt
2013-05-16  6:35               ` Zang Roy-R61911
2013-05-16  6:37               ` Benjamin Herrenschmidt
2013-05-16  6:41                 ` tiejun.chen
2013-05-16  6:48               ` Zang Roy-R61911
2013-05-16  6:24 ` Xie Shaohui-B21989
2013-05-16  6:31   ` Benjamin Herrenschmidt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1370595190.3766.359.camel@pasglop \
    --to=benh@kernel.crashing.org \
    --cc=B21989@freescale.com \
    --cc=B32616@freescale.com \
    --cc=R65777@freescale.com \
    --cc=afleming@freescale.com \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=r61911@freescale.com \
    --cc=tiejun.chen@windriver.com \
    --cc=timur@tabi.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).