From: Ben Hutchings <ben@decadent.org.uk>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: torvalds@linux-foundation.org, akpm@linux-foundation.org,
alan@lxorguk.ukuu.org.uk,
James Bottomley <JBottomley@Parallels.com>,
Helge Deller <deller@gmx.de>
Subject: [ 20/82] [PARISC] fix TLB fault path on PA2.0 narrow systems
Date: Fri, 08 Jun 2012 05:19:00 +0100 [thread overview]
Message-ID: <20120608041843.557206006@decadent.org.uk> (raw)
In-Reply-To: <20120608041840.861504477@decadent.org.uk>
3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: James Bottomley <JBottomley@Parallels.com>
commit 2f649c1f6f0fef445ce79a19b79e5ce8fe9d7f19 upstream.
commit 5e185581d7c46ddd33cd9c01106d1fc86efb9376
Author: James Bottomley <JBottomley@Parallels.com>
[PARISC] fix PA1.1 oops on boot
Didn't quite fix the crash on boot. It moved it from PA1.1 processors to
PA2.0 narrow kernels. The final fix is to make sure the [id]tlb_miss_20 paths
also work. Even on narrow systems, these paths require using the wide
instructions becuase the tlb insertion format is wide. Fix this by
conditioning the dep[wd],z on whether we're being called from _11 or _20[w]
paths.
Tested-by: Helge Deller <deller@gmx.de>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
arch/parisc/kernel/entry.S | 30 +++++++++++++++++-------------
1 file changed, 17 insertions(+), 13 deletions(-)
diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S
index 5350342..07ef351 100644
--- a/arch/parisc/kernel/entry.S
+++ b/arch/parisc/kernel/entry.S
@@ -552,7 +552,7 @@
* entry (identifying the physical page) and %r23 up with
* the from tlb entry (or nothing if only a to entry---for
* clear_user_page_asm) */
- .macro do_alias spc,tmp,tmp1,va,pte,prot,fault
+ .macro do_alias spc,tmp,tmp1,va,pte,prot,fault,patype
cmpib,COND(<>),n 0,\spc,\fault
ldil L%(TMPALIAS_MAP_START),\tmp
#if defined(CONFIG_64BIT) && (TMPALIAS_MAP_START >= 0x80000000)
@@ -581,11 +581,15 @@
*/
cmpiclr,= 0x01,\tmp,%r0
ldi (_PAGE_DIRTY|_PAGE_READ|_PAGE_WRITE),\prot
-#ifdef CONFIG_64BIT
+.ifc \patype,20
depd,z \prot,8,7,\prot
-#else
+.else
+.ifc \patype,11
depw,z \prot,8,7,\prot
-#endif
+.else
+ .error "undefined PA type to do_alias"
+.endif
+.endif
/*
* OK, it is in the temp alias region, check whether "from" or "to".
* Check "subtle" note in pacache.S re: r23/r26.
@@ -1189,7 +1193,7 @@ dtlb_miss_20w:
nop
dtlb_check_alias_20w:
- do_alias spc,t0,t1,va,pte,prot,dtlb_fault
+ do_alias spc,t0,t1,va,pte,prot,dtlb_fault,20
idtlbt pte,prot
@@ -1213,7 +1217,7 @@ nadtlb_miss_20w:
nop
nadtlb_check_alias_20w:
- do_alias spc,t0,t1,va,pte,prot,nadtlb_emulate
+ do_alias spc,t0,t1,va,pte,prot,nadtlb_emulate,20
idtlbt pte,prot
@@ -1245,7 +1249,7 @@ dtlb_miss_11:
nop
dtlb_check_alias_11:
- do_alias spc,t0,t1,va,pte,prot,dtlb_fault
+ do_alias spc,t0,t1,va,pte,prot,dtlb_fault,11
idtlba pte,(va)
idtlbp prot,(va)
@@ -1277,7 +1281,7 @@ nadtlb_miss_11:
nop
nadtlb_check_alias_11:
- do_alias spc,t0,t1,va,pte,prot,nadtlb_emulate
+ do_alias spc,t0,t1,va,pte,prot,nadtlb_emulate,11
idtlba pte,(va)
idtlbp prot,(va)
@@ -1304,7 +1308,7 @@ dtlb_miss_20:
nop
dtlb_check_alias_20:
- do_alias spc,t0,t1,va,pte,prot,dtlb_fault
+ do_alias spc,t0,t1,va,pte,prot,dtlb_fault,20
idtlbt pte,prot
@@ -1330,7 +1334,7 @@ nadtlb_miss_20:
nop
nadtlb_check_alias_20:
- do_alias spc,t0,t1,va,pte,prot,nadtlb_emulate
+ do_alias spc,t0,t1,va,pte,prot,nadtlb_emulate,20
idtlbt pte,prot
@@ -1457,7 +1461,7 @@ naitlb_miss_20w:
nop
naitlb_check_alias_20w:
- do_alias spc,t0,t1,va,pte,prot,naitlb_fault
+ do_alias spc,t0,t1,va,pte,prot,naitlb_fault,20
iitlbt pte,prot
@@ -1511,7 +1515,7 @@ naitlb_miss_11:
nop
naitlb_check_alias_11:
- do_alias spc,t0,t1,va,pte,prot,itlb_fault
+ do_alias spc,t0,t1,va,pte,prot,itlb_fault,11
iitlba pte,(%sr0, va)
iitlbp prot,(%sr0, va)
@@ -1557,7 +1561,7 @@ naitlb_miss_20:
nop
naitlb_check_alias_20:
- do_alias spc,t0,t1,va,pte,prot,naitlb_fault
+ do_alias spc,t0,t1,va,pte,prot,naitlb_fault,20
iitlbt pte,prot
next prev parent reply other threads:[~2012-06-08 4:19 UTC|newest]
Thread overview: 92+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-08 4:18 [ 00/82] 3.2.20-stable review Ben Hutchings
2012-06-08 4:18 ` [ 01/82] iommu/amd: Add workaround for event log erratum Ben Hutchings
2012-06-08 4:18 ` [ 02/82] MIPS: BCM63XX: Add missing include for bcm63xx_gpio.h Ben Hutchings
2012-06-08 4:18 ` [ 03/82] cifs: Include backup intent search flags during searches {try #2) Ben Hutchings
2012-06-08 4:18 ` [ 04/82] sunrpc: fix loss of task->tk_status after rpc_delay call in xprt_alloc_slot Ben Hutchings
2012-06-08 4:18 ` [ 05/82] exofs: Fix CRASH on very early IO errors Ben Hutchings
2012-06-08 4:18 ` [ 06/82] cifs: fix oops while traversing open file list (try #4) Ben Hutchings
2012-06-08 4:18 ` [ 07/82] [SCSI] Fix dm-multipath starvation when scsi host is busy Ben Hutchings
2012-06-08 4:18 ` [ 08/82] ixp4xx: fix compilation by adding gpiolib support Ben Hutchings
2012-06-08 4:18 ` [ 09/82] drm/i915: properly handle interlaced bit for sdvo dtd conversion Ben Hutchings
2012-06-08 4:18 ` [ 10/82] drm/i915: enable vdd when switching off the eDP panel Ben Hutchings
2012-06-08 4:18 ` [ 11/82] drm/i915: Add Clientron E830 to the ignore LVDS list Ben Hutchings
2012-06-08 4:18 ` [ 12/82] drm/i915: Ignore LVDS on hp t5745 and hp st5747 thin client Ben Hutchings
2012-06-08 4:18 ` [ 13/82] drm/i915: no lvds quirk for HP t5740e Thin Client Ben Hutchings
2012-06-08 4:18 ` [ 14/82] drm/i915: wait for a vblank to pass after tv detect Ben Hutchings
2012-06-08 4:18 ` [ 15/82] drm/i915: Update GEN6_RP_CONTROL definitions Ben Hutchings
2012-06-08 4:18 ` [ 16/82] drm/i915: always use RPNSWREQ for turbo change requests Ben Hutchings
2012-06-08 4:18 ` [ 17/82] solos-pci: Fix DMA support Ben Hutchings
2012-06-08 4:18 ` [ 18/82] microblaze: Do not select GENERIC_GPIO by default Ben Hutchings
2012-06-08 4:18 ` [ 19/82] [PARISC] fix boot failure on 32-bit systems caused by branch stubs placed before .text Ben Hutchings
2012-06-08 4:19 ` Ben Hutchings [this message]
2012-06-08 4:19 ` [ 21/82] iwlwifi: update BT traffic load states correctly Ben Hutchings
2012-06-08 4:19 ` [ 22/82] iwlwifi: do not use shadow registers by default Ben Hutchings
2012-06-08 4:19 ` [ 23/82] wl1251: fix oops on early interrupt Ben Hutchings
2012-06-08 4:19 ` [ 24/82] NFSv4: Map NFS4ERR_SHARE_DENIED into an EACCES error instead of EIO Ben Hutchings
2012-06-08 4:19 ` [ 25/82] drm/radeon: fix XFX quirk Ben Hutchings
2012-06-08 4:19 ` [ 26/82] ath9k: fix a use-after-free-bug when ath_tx_setup_buffer() fails Ben Hutchings
2012-06-08 4:19 ` [ 27/82] mac80211: fix ADDBA declined after suspend with wowlan Ben Hutchings
2012-06-08 4:19 ` [ 28/82] mm/fork: fix overflow in vma length when copying mmap on clone Ben Hutchings
2012-06-08 4:19 ` [ 29/82] mm: consider all swapped back pages in used-once logic Ben Hutchings
2012-06-08 4:19 ` [ 30/82] hugetlb: fix resv_map leak in error path Ben Hutchings
2012-06-08 4:19 ` [ 31/82] mm/vmalloc.c: change void* into explict vm_struct* Ben Hutchings
2012-06-08 10:41 ` David Rientjes
2012-06-08 10:55 ` Minchan Kim
2012-06-08 12:16 ` Ben Hutchings
2012-06-08 4:19 ` [ 32/82] mm: fix faulty initialization in vmalloc_init() Ben Hutchings
2012-06-08 4:19 ` [ 33/82] [SCSI] fix scsi_wait_scan Ben Hutchings
2012-06-08 4:19 ` [ 34/82] mm: fix vma_resv_map() NULL pointer Ben Hutchings
2012-06-08 4:19 ` [ 35/82] x86, amd, xen: Avoid NULL pointer paravirt references Ben Hutchings
2012-06-08 4:19 ` [ 36/82] slub: fix a memory leak in get_partial_node() Ben Hutchings
2012-06-08 4:19 ` [ 37/82] ext4: force ro mount if ext4_setup_super() fails Ben Hutchings
2012-06-08 4:19 ` [ 38/82] ext4: disallow hard-linked directory in ext4_lookup Ben Hutchings
2012-06-08 4:19 ` [ 39/82] mtd: nand: fix scan_read_raw_oob Ben Hutchings
2012-06-08 4:19 ` [ 40/82] vfs: increment iversion when a file is truncated Ben Hutchings
2012-06-08 4:19 ` [ 41/82] vfs: umount_tree() might be called on subtree that had never made it Ben Hutchings
2012-06-08 4:19 ` [ 42/82] ext4: add missing save_error_info() to ext4_error() Ben Hutchings
2012-06-08 4:19 ` [ 43/82] ALSA: usb-audio: fix rate_list memory leak Ben Hutchings
2012-06-08 4:19 ` [ 44/82] ext4: add ext4_mb_unload_buddy in the error path Ben Hutchings
2012-06-08 4:19 ` [ 45/82] ext4: remove mb_groups before tearing down the buddy_cache Ben Hutchings
2012-06-08 4:19 ` [ 46/82] drm/radeon: fix bank information in tiling config Ben Hutchings
2012-06-08 4:19 ` [ 47/82] drm/radeon: properly program gart on rv740, juniper, cypress, barts, hemlock Ben Hutchings
2012-06-08 4:19 ` [ 48/82] drm/radeon: fix HD6790, HD6570 backend programming Ben Hutchings
2012-06-08 4:19 ` [ 49/82] drm/ttm: Fix spinlock imbalance Ben Hutchings
2012-06-08 4:19 ` [ 50/82] drm/vmwgfx: Fix nasty write past alloced memory area Ben Hutchings
2012-06-08 4:19 ` [ 51/82] mtd: of_parts: fix breakage in Kconfig Ben Hutchings
2012-06-08 4:19 ` [ 52/82] fec_mpc52xx: fix timestamp filtering Ben Hutchings
2012-06-08 4:19 ` [ 53/82] Bluetooth: btusb: Add vendor specific ID (0a5c 21f3) for BCM20702A0 Ben Hutchings
2012-06-08 4:19 ` [ 54/82] Bluetooth: btusb: add support for BCM20702A0 [0a5c:21e6] Ben Hutchings
2012-06-08 4:19 ` [ 55/82] Bluetooth: btusb: Add USB device ID "0a5c 21e8" Ben Hutchings
2012-06-08 4:19 ` [ 56/82] Bluetooth: btusb: typo in Broadcom SoftSailing id Ben Hutchings
2012-06-08 4:19 ` [ 57/82] Bluetooth: btusb: Add vendor specific ID (0489 e042) for BCM20702A0 Ben Hutchings
2012-06-08 4:19 ` [ 58/82] Bluetooth: Add support for Atheros [13d3:3362] Ben Hutchings
2012-06-08 4:19 ` [ 59/82] Bluetooth: Add support for AR3012 [0cf3:e004] Ben Hutchings
2012-06-08 4:19 ` [ 60/82] Add Foxconn / Hon Hai IDs for btusb module Ben Hutchings
2012-06-08 4:19 ` [ 61/82] Bluetooth: Add support for Foxconn/Hon Hai AR5BBU22 0489:E03C Ben Hutchings
2012-06-08 4:19 ` [ 62/82] drm/i915:: Disable FBC on SandyBridge Ben Hutchings
2012-06-08 4:19 ` [ 63/82] ipv4: Do not use dead fib_info entries Ben Hutchings
2012-06-08 4:19 ` [ 64/82] ipv4: fix the rcu race between free_fib_info and ip_route_output_slow Ben Hutchings
2012-06-08 4:19 ` [ 65/82] set fake_rtables dst to NULL to avoid kernel Oops Ben Hutchings
2012-06-08 4:19 ` [ 66/82] ipv6: fix incorrect ipsec fragment Ben Hutchings
2012-06-08 4:19 ` [ 67/82] l2tp: fix oops in L2TP IP sockets for connect() AF_UNSPEC case Ben Hutchings
2012-06-08 4:19 ` [ 68/82] r8169: missing barriers Ben Hutchings
2012-06-08 4:19 ` [ 69/82] r8169: fix early queue wake-up Ben Hutchings
2012-06-08 4:19 ` [ 70/82] r8169: fix unsigned int wraparound with TSO Ben Hutchings
2012-06-08 4:19 ` [ 71/82] Revert "net: maintain namespace isolation between vlan and real device" Ben Hutchings
2012-06-08 4:19 ` [ 72/82] sctp: check cached dst before using it Ben Hutchings
2012-06-08 4:19 ` [ 73/82] skb: avoid unnecessary reallocations in __skb_cow Ben Hutchings
2012-06-08 4:19 ` [ 74/82] xfrm: take net hdr len into account for esp payload size calculation Ben Hutchings
2012-06-08 4:19 ` [ 75/82] ACPI battery: only refresh the sysfs files when pertinent information changes Ben Hutchings
2012-06-08 4:19 ` [ 76/82] target/file: Use O_DSYNC by default for FILEIO backends Ben Hutchings
2012-06-08 4:19 ` [ 77/82] iommu/amd: Cache pdev pointer to root-bridge Ben Hutchings
2012-06-08 4:19 ` [ 78/82] drm/radeon/kms: add new Palm, Sumo PCI ids Ben Hutchings
2012-06-08 4:19 ` [ 79/82] drm/radeon/kms: add new BTC " Ben Hutchings
2012-06-08 4:20 ` [ 80/82] btree: fix tree corruption in btree_get_prev() Ben Hutchings
2012-06-08 4:20 ` [ 81/82] kbuild: install kernel-page-flags.h Ben Hutchings
2012-06-08 4:20 ` [ 82/82] asix: allow full size 8021Q frames to be received Ben Hutchings
2012-06-08 5:09 ` [ 00/82] 3.2.20-stable review Ben Hutchings
2012-06-08 13:42 ` Maarten Lankhorst
2012-06-08 14:04 ` Ben Hutchings
2012-06-08 22:54 ` Ben Hutchings
2012-06-10 16:54 ` Maarten Lankhorst
2012-06-17 14:04 ` Ben Hutchings
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=20120608041843.557206006@decadent.org.uk \
--to=ben@decadent.org.uk \
--cc=JBottomley@Parallels.com \
--cc=akpm@linux-foundation.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=deller@gmx.de \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=torvalds@linux-foundation.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).