From: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
To: "linuxppc-dev@ozlabs.org" <linuxppc-dev@ozlabs.org>,
Rex Feany <RFeany@mrv.com>, Scott Wood <scottwood@freescale.com>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>
Subject: [PATCH 1/6] 8xx: DTLB Error must check for more errors.
Date: Wed, 7 Oct 2009 22:45:59 +0200 [thread overview]
Message-ID: <1254948364-30074-2-git-send-email-Joakim.Tjernlund@transmode.se> (raw)
In-Reply-To: <1254948364-30074-1-git-send-email-Joakim.Tjernlund@transmode.se>
DataTLBError currently does:
if ((err & 0x02000000) == 0)
DSI();
This won't handle a store with no valid translation.
Change this to
if ((err & 0x48000000) != 0)
DSI();
that is, branch to DSI if either !permission or
!translation.
---
arch/powerpc/kernel/head_8xx.S | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/kernel/head_8xx.S b/arch/powerpc/kernel/head_8xx.S
index 52ff8c5..118bb05 100644
--- a/arch/powerpc/kernel/head_8xx.S
+++ b/arch/powerpc/kernel/head_8xx.S
@@ -472,8 +472,8 @@ DataTLBError:
/* First, make sure this was a store operation.
*/
mfspr r10, SPRN_DSISR
- andis. r11, r10, 0x0200 /* If set, indicates store op */
- beq 2f
+ andis. r11, r10, 0x4800 /* no translation, no permission. */
+ bne 2f /* branch if either is set */
/* The EA of a data TLB miss is automatically stored in the MD_EPN
* register. The EA of a data TLB error is automatically stored in
--
1.6.4.4
next prev parent reply other threads:[~2009-10-07 20:46 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-07 20:45 [PATCH 0/6] 8xx TLB fixes Joakim Tjernlund
2009-10-07 20:45 ` Joakim Tjernlund [this message]
2009-10-07 20:46 ` [PATCH 2/6] 8xx: get rid of _PAGE_HWWRITE dependency in MMU Joakim Tjernlund
2009-10-07 20:46 ` [PATCH 3/6] 8xx: invalidate non present TLBs Joakim Tjernlund
2009-10-07 20:46 ` [PATCH 4/6] 8xx: Tag DAR with 0x00f0 to catch buggy instructions Joakim Tjernlund
2009-10-07 20:46 ` [PATCH 5/6] 8xx: Fixup DAR from buggy dcbX instructions Joakim Tjernlund
2009-10-07 20:46 ` [PATCH 6/6] 8xx: start using dcbX instructions in various copy routines Joakim Tjernlund
2009-10-07 21:18 ` [PATCH 4/6] 8xx: Tag DAR with 0x00f0 to catch buggy instructions Benjamin Herrenschmidt
2009-10-07 22:13 ` Joakim Tjernlund
2009-10-07 22:21 ` Benjamin Herrenschmidt
2009-10-07 23:12 ` Joakim Tjernlund
2009-10-07 21:18 ` [PATCH 3/6] 8xx: invalidate non present TLBs Benjamin Herrenschmidt
2009-10-07 22:12 ` Joakim Tjernlund
2009-10-07 22:20 ` Benjamin Herrenschmidt
2009-10-08 19:22 ` Joakim Tjernlund
2009-10-08 20:11 ` Dan Malek
2009-10-08 20:18 ` Benjamin Herrenschmidt
2009-10-08 20:28 ` Benjamin Herrenschmidt
2009-10-08 22:08 ` Dan Malek
2009-10-08 22:23 ` Benjamin Herrenschmidt
2009-10-08 23:01 ` Joakim Tjernlund
2009-10-09 0:56 ` Benjamin Herrenschmidt
2009-10-09 0:36 ` Dan Malek
2009-10-09 0:57 ` Benjamin Herrenschmidt
2009-10-08 20:37 ` Joakim Tjernlund
2009-10-08 20:44 ` Benjamin Herrenschmidt
2009-10-09 0:05 ` Dan Malek
2009-10-08 20:42 ` Benjamin Herrenschmidt
2009-10-07 21:14 ` [PATCH 2/6] 8xx: get rid of _PAGE_HWWRITE dependency in MMU Benjamin Herrenschmidt
2009-10-07 22:08 ` Joakim Tjernlund
2009-10-07 22:20 ` Benjamin Herrenschmidt
2009-10-07 23:11 ` Joakim Tjernlund
2009-10-08 0:04 ` Benjamin Herrenschmidt
2009-10-08 0:19 ` Joakim Tjernlund
2009-10-08 0:28 ` Benjamin Herrenschmidt
2009-10-08 6:45 ` Joakim Tjernlund
2009-10-08 20:21 ` Benjamin Herrenschmidt
[not found] ` <OFCA7943E6.AFEF924A-ONC1257648.007E27B0-C1257648.007F62E9@LocalDomain>
2009-10-07 23:34 ` Joakim Tjernlund
-- strict thread matches above, loose matches on Subject: below --
2009-10-08 13:24 [PATCH 0/6] 8xx MMU fixes Joakim Tjernlund
2009-10-08 13:24 ` [PATCH 1/6] 8xx: DTLB Error must check for more errors Joakim Tjernlund
2009-10-08 20:48 ` Benjamin Herrenschmidt
2009-10-05 12:16 [PATCH 0/6] PowerPc 8xx TLB/MMU fixes Joakim Tjernlund
2009-10-05 12:16 ` [PATCH 1/6] 8xx: DTLB Error must check for more errors Joakim Tjernlund
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=1254948364-30074-2-git-send-email-Joakim.Tjernlund@transmode.se \
--to=joakim.tjernlund@transmode.se \
--cc=RFeany@mrv.com \
--cc=benh@kernel.crashing.org \
--cc=linuxppc-dev@ozlabs.org \
--cc=scottwood@freescale.com \
/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).