From owner-svn-src-projects@freebsd.org Mon Mar 14 01:07:36 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9A7F8ACF78D
for <svn-src-projects@mailman.ysv.freebsd.org>;
Mon, 14 Mar 2016 01:07:36 +0000 (UTC)
(envelope-from jhibbits@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 4A64C1A1;
Mon, 14 Mar 2016 01:07:36 +0000 (UTC)
(envelope-from jhibbits@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2E17ZB4033353;
Mon, 14 Mar 2016 01:07:35 GMT (envelope-from jhibbits@FreeBSD.org)
Received: (from jhibbits@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2E17ZNW033351;
Mon, 14 Mar 2016 01:07:35 GMT (envelope-from jhibbits@FreeBSD.org)
Message-Id: <201603140107.u2E17ZNW033351@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to
jhibbits@FreeBSD.org using -f
From: Justin Hibbits <jhibbits@FreeBSD.org>
Date: Mon, 14 Mar 2016 01:07:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r296820 - in projects/powerpcspe/sys/powerpc: include
powerpc
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 14 Mar 2016 01:07:36 -0000
Author: jhibbits
Date: Mon Mar 14 01:07:34 2016
New Revision: 296820
URL: https://svnweb.freebsd.org/changeset/base/296820
Log:
Trap SPE Alignment faults.
With this, a mpc8544 based system (RB800) boots to multiuser.
Modified:
projects/powerpcspe/sys/powerpc/include/trap.h
projects/powerpcspe/sys/powerpc/powerpc/trap.c
Modified: projects/powerpcspe/sys/powerpc/include/trap.h
==============================================================================
--- projects/powerpcspe/sys/powerpc/include/trap.h Mon Mar 14 00:51:45 2016 (r296819)
+++ projects/powerpcspe/sys/powerpc/include/trap.h Mon Mar 14 01:07:34 2016 (r296820)
@@ -112,6 +112,7 @@
/* Macros to extract register information */
#define EXC_ALI_RST(dsisr) ((dsisr >> 5) & 0x1f) /* source or target */
#define EXC_ALI_RA(dsisr) (dsisr & 0x1f)
+#define EXC_ALI_SPE_REG(instr) ((instr >> 21) & 0x1f)
/*
* SRR1 bits for program exception traps. These identify what caused
Modified: projects/powerpcspe/sys/powerpc/powerpc/trap.c
==============================================================================
--- projects/powerpcspe/sys/powerpc/powerpc/trap.c Mon Mar 14 00:51:45 2016 (r296819)
+++ projects/powerpcspe/sys/powerpc/powerpc/trap.c Mon Mar 14 01:07:34 2016 (r296820)
@@ -750,9 +750,47 @@ static int
fix_unaligned(struct thread *td, struct trapframe *frame)
{
struct thread *fputhread;
+#ifdef __SPE__
+ uint32_t inst;
+#endif
int indicator, reg;
double *fpr;
+#ifdef __SPE__
+ indicator = (frame->cpu.booke.esr & (ESR_ST|ESR_SPE));
+ if (indicator & ESR_SPE) {
+ if (copyin((void *)frame->srr0, &inst, sizeof(inst)) != 0)
+ return (-1);
+ reg = EXC_ALI_SPE_REG(inst);
+ fpr = (double *)td->td_pcb->pcb_vec.vr[reg];
+ fputhread = PCPU_GET(vecthread);
+
+ /* Juggle the FPU to ensure that we've initialized
+ * the FPRs, and that their current state is in
+ * the PCB.
+ */
+ if (fputhread != td) {
+ if (fputhread)
+ save_vec(fputhread);
+ enable_vec(td);
+ }
+ save_vec(td);
+
+ if (!(indicator & ESR_ST)) {
+ if (copyin((void *)frame->dar, fpr,
+ sizeof(double)) != 0)
+ return (-1);
+ frame->fixreg[reg] = td->td_pcb->pcb_vec.vr[reg][1];
+ enable_vec(td);
+ } else {
+ td->td_pcb->pcb_vec.vr[reg][1] = frame->fixreg[reg];
+ if (copyout(fpr, (void *)frame->dar,
+ sizeof(double)) != 0)
+ return (-1);
+ }
+ return (0);
+ }
+#else
indicator = EXC_ALI_OPCODE_INDICATOR(frame->cpu.aim.dsisr);
switch (indicator) {
@@ -786,6 +824,7 @@ fix_unaligned(struct thread *td, struct
return (0);
break;
}
+#endif
return (-1);
}