From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> To: Jason Cooper <jason@lakedaemon.net>, Andrew Lunn <andrew@lunn.ch>, Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>, Gregory Clement <gregory.clement@free-electrons.com> Cc: linux-arm-kernel@lists.infradead.org, Tawfik Bayouk <tawfik@marvell.com>, Nadav Haklai <nadavh@marvell.com>, Lior Amsalem <alior@marvell.com>, Ezequiel Garcia <ezequiel.garcia@free-electrons.com>, devicetree@vger.kernel.org, Russell King <linux@arm.linux.org.uk>, stable@vger.kernel.org, Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Subject: [PATCH 02/17] ARM: mvebu: enable strex backoff delay Date: Fri, 24 Oct 2014 13:59:15 +0200 [thread overview] Message-ID: <1414151970-6626-3-git-send-email-thomas.petazzoni@free-electrons.com> (raw) In-Reply-To: <1414151970-6626-1-git-send-email-thomas.petazzoni@free-electrons.com> From: Nadav Haklai <nadavh@marvell.com> Under extremely rare conditions, in an MPCore node consisting of at least 3 CPUs, two CPUs trying to perform a STREX to data on the same shared cache line can enter a livelock situation. This patch enables the HW mechanism that overcomes the bug. This fixes the incorrect setup of the STREX backoff delay bit due to a wrong description in the specification. Note that enabling the STREX backoff delay mechanism is done by leaving the bit *cleared*, while the bit was currently being set by the proc-v7.S code. [Thomas: adapt to latest mainline, slightly reword the commit log, add stable markers.] Cc: Russell King <linux@arm.linux.org.uk> Cc: <stable@vger.kernel.org> # v3.8+ Fixes: de4901933f6d ("arm: mm: Add support for PJ4B cpu and init routines") Signed-off-by: Nadav Haklai <nadavh@marvell.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- This patch is submitted as part of the suspend/resume work, because the suspend/resume path is triggering this rare bug in a very reproducible fashion. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- arch/arm/mm/proc-v7.S | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S index b3a9478..22ac2a6 100644 --- a/arch/arm/mm/proc-v7.S +++ b/arch/arm/mm/proc-v7.S @@ -270,7 +270,6 @@ __v7_pj4b_setup: /* Auxiliary Debug Modes Control 1 Register */ #define PJ4B_STATIC_BP (1 << 2) /* Enable Static BP */ #define PJ4B_INTER_PARITY (1 << 8) /* Disable Internal Parity Handling */ -#define PJ4B_BCK_OFF_STREX (1 << 5) /* Enable the back off of STREX instr */ #define PJ4B_CLEAN_LINE (1 << 16) /* Disable data transfer for clean line */ /* Auxiliary Debug Modes Control 2 Register */ @@ -293,7 +292,6 @@ __v7_pj4b_setup: /* Auxiliary Debug Modes Control 1 Register */ mrc p15, 1, r0, c15, c1, 1 orr r0, r0, #PJ4B_CLEAN_LINE - orr r0, r0, #PJ4B_BCK_OFF_STREX orr r0, r0, #PJ4B_INTER_PARITY bic r0, r0, #PJ4B_STATIC_BP mcr p15, 1, r0, c15, c1, 1 -- 2.0.0
WARNING: multiple messages have this Message-ID (diff)
From: thomas.petazzoni@free-electrons.com (Thomas Petazzoni) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 02/17] ARM: mvebu: enable strex backoff delay Date: Fri, 24 Oct 2014 13:59:15 +0200 [thread overview] Message-ID: <1414151970-6626-3-git-send-email-thomas.petazzoni@free-electrons.com> (raw) In-Reply-To: <1414151970-6626-1-git-send-email-thomas.petazzoni@free-electrons.com> From: Nadav Haklai <nadavh@marvell.com> Under extremely rare conditions, in an MPCore node consisting of at least 3 CPUs, two CPUs trying to perform a STREX to data on the same shared cache line can enter a livelock situation. This patch enables the HW mechanism that overcomes the bug. This fixes the incorrect setup of the STREX backoff delay bit due to a wrong description in the specification. Note that enabling the STREX backoff delay mechanism is done by leaving the bit *cleared*, while the bit was currently being set by the proc-v7.S code. [Thomas: adapt to latest mainline, slightly reword the commit log, add stable markers.] Cc: Russell King <linux@arm.linux.org.uk> Cc: <stable@vger.kernel.org> # v3.8+ Fixes: de4901933f6d ("arm: mm: Add support for PJ4B cpu and init routines") Signed-off-by: Nadav Haklai <nadavh@marvell.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- This patch is submitted as part of the suspend/resume work, because the suspend/resume path is triggering this rare bug in a very reproducible fashion. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- arch/arm/mm/proc-v7.S | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S index b3a9478..22ac2a6 100644 --- a/arch/arm/mm/proc-v7.S +++ b/arch/arm/mm/proc-v7.S @@ -270,7 +270,6 @@ __v7_pj4b_setup: /* Auxiliary Debug Modes Control 1 Register */ #define PJ4B_STATIC_BP (1 << 2) /* Enable Static BP */ #define PJ4B_INTER_PARITY (1 << 8) /* Disable Internal Parity Handling */ -#define PJ4B_BCK_OFF_STREX (1 << 5) /* Enable the back off of STREX instr */ #define PJ4B_CLEAN_LINE (1 << 16) /* Disable data transfer for clean line */ /* Auxiliary Debug Modes Control 2 Register */ @@ -293,7 +292,6 @@ __v7_pj4b_setup: /* Auxiliary Debug Modes Control 1 Register */ mrc p15, 1, r0, c15, c1, 1 orr r0, r0, #PJ4B_CLEAN_LINE - orr r0, r0, #PJ4B_BCK_OFF_STREX orr r0, r0, #PJ4B_INTER_PARITY bic r0, r0, #PJ4B_STATIC_BP mcr p15, 1, r0, c15, c1, 1 -- 2.0.0
next prev parent reply other threads:[~2014-10-24 11:59 UTC|newest] Thread overview: 120+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-10-24 11:59 [PATCH 00/17] Suspend to RAM support for Armada XP Thomas Petazzoni 2014-10-24 11:59 ` Thomas Petazzoni 2014-10-24 11:59 ` [PATCH 01/17] Documentation: dt-bindings: minimal documentation for MVEBU SDRAM controller Thomas Petazzoni 2014-10-24 11:59 ` Thomas Petazzoni [not found] ` <1414151970-6626-2-git-send-email-thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> 2014-11-03 17:05 ` Gregory CLEMENT 2014-11-03 17:05 ` Gregory CLEMENT 2014-10-24 11:59 ` Thomas Petazzoni [this message] 2014-10-24 11:59 ` [PATCH 02/17] ARM: mvebu: enable strex backoff delay Thomas Petazzoni 2014-11-03 17:08 ` Gregory CLEMENT 2014-11-03 17:08 ` Gregory CLEMENT 2014-10-24 11:59 ` [PATCH 03/17] irqchip: irq-armada-370-xp: use proper return value for ->set_affinity() Thomas Petazzoni 2014-10-24 11:59 ` Thomas Petazzoni 2014-11-03 17:20 ` Gregory CLEMENT 2014-11-03 17:20 ` Gregory CLEMENT 2014-11-07 4:09 ` Jason Cooper 2014-11-07 4:09 ` Jason Cooper 2014-11-07 4:09 ` Jason Cooper 2014-10-24 11:59 ` [PATCH 04/17] irqchip: irq-armada-370-xp: suspend/resume support Thomas Petazzoni 2014-10-24 11:59 ` Thomas Petazzoni 2014-10-24 11:59 ` Thomas Petazzoni 2014-11-03 17:38 ` Gregory CLEMENT 2014-11-03 17:38 ` Gregory CLEMENT 2014-11-13 16:32 ` Thomas Petazzoni 2014-11-13 16:32 ` Thomas Petazzoni 2014-10-24 11:59 ` [PATCH 05/17] clocksource: time-armada-370-xp: add " Thomas Petazzoni 2014-10-24 11:59 ` Thomas Petazzoni 2014-11-03 17:45 ` Gregory CLEMENT 2014-11-03 17:45 ` Gregory CLEMENT 2014-11-03 17:45 ` Gregory CLEMENT 2014-10-24 11:59 ` [PATCH 06/17] gpio: mvebu: " Thomas Petazzoni 2014-10-24 11:59 ` Thomas Petazzoni 2014-10-24 16:30 ` David Cohen 2014-10-24 16:30 ` David Cohen 2014-10-24 20:45 ` Andrew Lunn 2014-10-24 20:45 ` Andrew Lunn 2014-10-27 5:27 ` Alexandre Courbot 2014-10-27 5:27 ` Alexandre Courbot 2014-10-27 17:45 ` David Cohen 2014-10-27 17:45 ` David Cohen 2014-10-31 7:00 ` Linus Walleij 2014-10-31 7:00 ` Linus Walleij 2014-10-31 7:52 ` Gregory CLEMENT 2014-10-31 7:52 ` Gregory CLEMENT 2014-10-31 8:14 ` Thomas Petazzoni 2014-10-31 8:14 ` Thomas Petazzoni 2014-11-03 13:26 ` Linus Walleij 2014-11-03 13:26 ` Linus Walleij 2014-11-03 13:29 ` Linus Walleij 2014-11-03 13:29 ` Linus Walleij 2014-11-03 17:53 ` Gregory CLEMENT 2014-11-03 17:53 ` Gregory CLEMENT 2014-11-03 21:21 ` Thomas Petazzoni 2014-11-03 21:21 ` Thomas Petazzoni [not found] ` <1414151970-6626-1-git-send-email-thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> 2014-10-24 11:59 ` [PATCH 07/17] bus: mvebu-mbus: " Thomas Petazzoni 2014-10-24 11:59 ` Thomas Petazzoni [not found] ` <1414151970-6626-8-git-send-email-thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> 2014-11-03 18:08 ` Gregory CLEMENT 2014-11-03 18:08 ` Gregory CLEMENT [not found] ` <5457C495.7080403-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> 2014-11-03 21:20 ` Thomas Petazzoni 2014-11-03 21:20 ` Thomas Petazzoni 2014-10-24 11:59 ` [PATCH 08/17] bus: mvebu-mbus: provide a mechanism to save SDRAM window configuration Thomas Petazzoni 2014-10-24 11:59 ` Thomas Petazzoni [not found] ` <1414151970-6626-9-git-send-email-thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> 2014-11-04 9:17 ` Gregory CLEMENT 2014-11-04 9:17 ` Gregory CLEMENT 2014-10-24 11:59 ` [PATCH 10/17] ARM: mvebu: implement suspend/resume support for Armada XP Thomas Petazzoni 2014-10-24 11:59 ` Thomas Petazzoni [not found] ` <1414151970-6626-11-git-send-email-thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> 2014-11-04 10:00 ` Gregory CLEMENT 2014-11-04 10:00 ` Gregory CLEMENT [not found] ` <5458A3CE.70900-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> 2014-11-13 17:00 ` Thomas Petazzoni 2014-11-13 17:00 ` Thomas Petazzoni 2014-10-24 11:59 ` [PATCH 11/17] ARM: mvebu: reserve the first 10 KB of each memory bank for suspend/resume Thomas Petazzoni 2014-10-24 11:59 ` Thomas Petazzoni [not found] ` <1414151970-6626-12-git-send-email-thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> 2014-11-04 10:09 ` Gregory CLEMENT 2014-11-04 10:09 ` Gregory CLEMENT 2014-10-24 11:59 ` [PATCH 12/17] ARM: mvebu: Armada XP GP specific suspend/resume code Thomas Petazzoni 2014-10-24 11:59 ` Thomas Petazzoni [not found] ` <1414151970-6626-13-git-send-email-thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> 2014-10-24 14:20 ` Andrew Lunn 2014-10-24 14:20 ` Andrew Lunn [not found] ` <20141024142044.GB3142-g2DYL2Zd6BY@public.gmane.org> 2014-10-24 14:28 ` Thomas Petazzoni 2014-10-24 14:28 ` Thomas Petazzoni [not found] ` <20141024162824.67f9ce3d-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> 2014-10-24 14:51 ` Andrew Lunn 2014-10-24 14:51 ` Andrew Lunn [not found] ` <20141024145119.GD3142-g2DYL2Zd6BY@public.gmane.org> 2014-10-27 12:51 ` Thomas Petazzoni 2014-10-27 12:51 ` Thomas Petazzoni [not found] ` <20141027135129.292bd882-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> 2014-10-27 14:19 ` Andrew Lunn 2014-10-27 14:19 ` Andrew Lunn [not found] ` <20141027141958.GB12627-g2DYL2Zd6BY@public.gmane.org> 2014-10-27 14:40 ` Thomas Petazzoni 2014-10-27 14:40 ` Thomas Petazzoni [not found] ` <20141027154049.583e4cd2-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> 2014-10-27 14:59 ` Andrew Lunn 2014-10-27 14:59 ` Andrew Lunn [not found] ` <20141027145939.GD12627-g2DYL2Zd6BY@public.gmane.org> 2014-10-27 15:12 ` Thomas Petazzoni 2014-10-27 15:12 ` Thomas Petazzoni [not found] ` <20141027161226.199cca96-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> 2014-10-27 15:15 ` Andrew Lunn 2014-10-27 15:15 ` Andrew Lunn 2014-11-10 13:53 ` Gregory CLEMENT 2014-11-10 13:53 ` Gregory CLEMENT 2014-10-24 11:59 ` [PATCH 13/17] ARM: mvebu: make sure MMU is disabled in armada_370_xp_cpu_resume Thomas Petazzoni 2014-10-24 11:59 ` Thomas Petazzoni [not found] ` <1414151970-6626-14-git-send-email-thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> 2014-11-10 14:05 ` Gregory CLEMENT 2014-11-10 14:05 ` Gregory CLEMENT 2014-10-24 11:59 ` [PATCH 14/17] ARM: mvebu: synchronize secondary CPU clocks on resume Thomas Petazzoni 2014-10-24 11:59 ` Thomas Petazzoni [not found] ` <1414151970-6626-15-git-send-email-thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> 2014-11-10 14:12 ` Gregory CLEMENT 2014-11-10 14:12 ` Gregory CLEMENT 2014-10-24 11:59 ` [PATCH 15/17] ARM: mvebu: add suspend/resume DT information for Armada XP GP Thomas Petazzoni 2014-10-24 11:59 ` Thomas Petazzoni [not found] ` <1414151970-6626-16-git-send-email-thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> 2014-11-10 14:14 ` Gregory CLEMENT 2014-11-10 14:14 ` Gregory CLEMENT 2014-10-24 11:59 ` [PATCH 16/17] ARM: mvebu: adjust mbus controller description on Armada 370/XP Thomas Petazzoni 2014-10-24 11:59 ` Thomas Petazzoni [not found] ` <1414151970-6626-17-git-send-email-thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> 2014-11-10 14:15 ` Gregory CLEMENT 2014-11-10 14:15 ` Gregory CLEMENT 2014-10-24 11:59 ` [PATCH 17/17] ARM: mvebu: add SDRAM controller description for Armada XP Thomas Petazzoni 2014-10-24 11:59 ` Thomas Petazzoni [not found] ` <1414151970-6626-18-git-send-email-thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> 2014-11-10 14:25 ` Gregory CLEMENT 2014-11-10 14:25 ` Gregory CLEMENT 2014-10-24 11:59 ` [PATCH 09/17] clk: mvebu: add suspend/resume for gatable clocks Thomas Petazzoni 2014-10-24 11:59 ` Thomas Petazzoni 2014-11-04 9:32 ` Gregory CLEMENT 2014-11-04 9:32 ` Gregory CLEMENT 2014-11-04 9:32 ` Gregory CLEMENT
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=1414151970-6626-3-git-send-email-thomas.petazzoni@free-electrons.com \ --to=thomas.petazzoni@free-electrons.com \ --cc=alior@marvell.com \ --cc=andrew@lunn.ch \ --cc=devicetree@vger.kernel.org \ --cc=ezequiel.garcia@free-electrons.com \ --cc=gregory.clement@free-electrons.com \ --cc=jason@lakedaemon.net \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux@arm.linux.org.uk \ --cc=nadavh@marvell.com \ --cc=sebastian.hesselbarth@gmail.com \ --cc=stable@vger.kernel.org \ --cc=tawfik@marvell.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.