* [PATCH] ARM: LPAE: catch pending imprecise abort on unmask
@ 2016-09-02 11:16 Alexander Sverdlin
0 siblings, 0 replies; 3+ messages in thread
From: Alexander Sverdlin @ 2016-09-02 11:16 UTC (permalink / raw)
To: linux-arm-kernel
Asynchronous external abort is coded differently in DFSR with LPAE enabled.
Fixes: 9254970c "ARM: 8447/1: catch pending imprecise abort on unmask".
Signed-off-by: Alexander Sverdlin <alexander.sverdlin@nokia.com>
---
arch/arm/mm/fault.c | 4 ++--
arch/arm/mm/fault.h | 4 ++++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
index 3a2e678..0122ad1 100644
--- a/arch/arm/mm/fault.c
+++ b/arch/arm/mm/fault.c
@@ -610,9 +610,9 @@ static int __init early_abort_handler(unsigned long addr, unsigned int fsr,
void __init early_abt_enable(void)
{
- fsr_info[22].fn = early_abort_handler;
+ fsr_info[FSR_FS_AEA].fn = early_abort_handler;
local_abt_enable();
- fsr_info[22].fn = do_bad;
+ fsr_info[FSR_FS_AEA].fn = do_bad;
}
#ifndef CONFIG_ARM_LPAE
diff --git a/arch/arm/mm/fault.h b/arch/arm/mm/fault.h
index 05ec5e0..7883065 100644
--- a/arch/arm/mm/fault.h
+++ b/arch/arm/mm/fault.h
@@ -11,11 +11,15 @@
#define FSR_FS5_0 (0x3f)
#ifdef CONFIG_ARM_LPAE
+#define FSR_FS_AEA 17
+
static inline int fsr_fs(unsigned int fsr)
{
return fsr & FSR_FS5_0;
}
#else
+#define FSR_FS_AEA 22
+
static inline int fsr_fs(unsigned int fsr)
{
return (fsr & FSR_FS3_0) | (fsr & FSR_FS4) >> 6;
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] ARM: LPAE: catch pending imprecise abort on unmask
@ 2017-01-17 17:42 Alexander Sverdlin
2017-01-17 18:04 ` Russell King - ARM Linux
0 siblings, 1 reply; 3+ messages in thread
From: Alexander Sverdlin @ 2017-01-17 17:42 UTC (permalink / raw)
To: linux-arm-kernel
Asynchronous external abort is coded differently in DFSR with LPAE enabled.
Fixes: 9254970c "ARM: 8447/1: catch pending imprecise abort on unmask".
Signed-off-by: Alexander Sverdlin <alexander.sverdlin@nokia.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-arm-kernel at lists.infradead.org
---
arch/arm/mm/fault.c | 4 ++--
arch/arm/mm/fault.h | 4 ++++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
index 3a2e678b8d30..0122ad1a6027 100644
--- a/arch/arm/mm/fault.c
+++ b/arch/arm/mm/fault.c
@@ -610,9 +610,9 @@ static int __init early_abort_handler(unsigned long addr, unsigned int fsr,
void __init early_abt_enable(void)
{
- fsr_info[22].fn = early_abort_handler;
+ fsr_info[FSR_FS_AEA].fn = early_abort_handler;
local_abt_enable();
- fsr_info[22].fn = do_bad;
+ fsr_info[FSR_FS_AEA].fn = do_bad;
}
#ifndef CONFIG_ARM_LPAE
diff --git a/arch/arm/mm/fault.h b/arch/arm/mm/fault.h
index 67532f242271..afc1f84e763b 100644
--- a/arch/arm/mm/fault.h
+++ b/arch/arm/mm/fault.h
@@ -11,11 +11,15 @@
#define FSR_FS5_0 (0x3f)
#ifdef CONFIG_ARM_LPAE
+#define FSR_FS_AEA 17
+
static inline int fsr_fs(unsigned int fsr)
{
return fsr & FSR_FS5_0;
}
#else
+#define FSR_FS_AEA 22
+
static inline int fsr_fs(unsigned int fsr)
{
return (fsr & FSR_FS3_0) | (fsr & FSR_FS4) >> 6;
--
2.11.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] ARM: LPAE: catch pending imprecise abort on unmask
2017-01-17 17:42 [PATCH] ARM: LPAE: catch pending imprecise abort on unmask Alexander Sverdlin
@ 2017-01-17 18:04 ` Russell King - ARM Linux
0 siblings, 0 replies; 3+ messages in thread
From: Russell King - ARM Linux @ 2017-01-17 18:04 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Jan 17, 2017 at 06:42:10PM +0100, Alexander Sverdlin wrote:
> Asynchronous external abort is coded differently in DFSR with LPAE enabled.
>
> Fixes: 9254970c "ARM: 8447/1: catch pending imprecise abort on unmask".
Please drop it into the patch system, thanks.
>
> Signed-off-by: Alexander Sverdlin <alexander.sverdlin@nokia.com>
> Cc: Russell King <linux@armlinux.org.uk>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Cc: linux-arm-kernel at lists.infradead.org
> ---
> arch/arm/mm/fault.c | 4 ++--
> arch/arm/mm/fault.h | 4 ++++
> 2 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
> index 3a2e678b8d30..0122ad1a6027 100644
> --- a/arch/arm/mm/fault.c
> +++ b/arch/arm/mm/fault.c
> @@ -610,9 +610,9 @@ static int __init early_abort_handler(unsigned long addr, unsigned int fsr,
>
> void __init early_abt_enable(void)
> {
> - fsr_info[22].fn = early_abort_handler;
> + fsr_info[FSR_FS_AEA].fn = early_abort_handler;
> local_abt_enable();
> - fsr_info[22].fn = do_bad;
> + fsr_info[FSR_FS_AEA].fn = do_bad;
> }
>
> #ifndef CONFIG_ARM_LPAE
> diff --git a/arch/arm/mm/fault.h b/arch/arm/mm/fault.h
> index 67532f242271..afc1f84e763b 100644
> --- a/arch/arm/mm/fault.h
> +++ b/arch/arm/mm/fault.h
> @@ -11,11 +11,15 @@
> #define FSR_FS5_0 (0x3f)
>
> #ifdef CONFIG_ARM_LPAE
> +#define FSR_FS_AEA 17
> +
> static inline int fsr_fs(unsigned int fsr)
> {
> return fsr & FSR_FS5_0;
> }
> #else
> +#define FSR_FS_AEA 22
> +
> static inline int fsr_fs(unsigned int fsr)
> {
> return (fsr & FSR_FS3_0) | (fsr & FSR_FS4) >> 6;
> --
> 2.11.0
>
--
RMK's Patch system: http://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up
according to speedtest.net.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-01-17 18:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-17 17:42 [PATCH] ARM: LPAE: catch pending imprecise abort on unmask Alexander Sverdlin
2017-01-17 18:04 ` Russell King - ARM Linux
-- strict thread matches above, loose matches on Subject: below --
2016-09-02 11:16 Alexander Sverdlin
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).