Skip to contentSkip to conversation

FAILED: patch "[PATCH] EDAC/altera: Use fast register IO for S10 IRQs" failed to apply to 4.19-stable tree

PATCH [email protected] 2 participants 2 messages Dec 15, 2019

Subsystems (3)
Stable branch EDAC-core Arm/socfpga EDAC support
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 56d9e7bd3fa0f105b6670021d167744bc50ae4fe Mon Sep 17 00:00:00 2001
From: Meng Li <[email protected]>
Date: Thu, 21 Nov 2019 12:30:46 -0600
Subject: [PATCH] EDAC/altera: Use fast register IO for S10 IRQs

When an IRQ occurs, regmap_{read,write,...}() is invoked in atomic context. Regmap must indicate register IO is fast so that a spinlock is used instead of a mutex to avoid sleeping in atomic context:

lock_acquire
__mutex_lock
mutex_lock_nested
regmap_lock_mutex
regmap_write
a10_eccmgr_irq_unmask
unmask_irq.part.0
irq_enable
__irq_startup
irq_startup
__setup_irq
request_threaded_irq
devm_request_threaded_irq
altr_sdram_probe

Mark it so.

[ bp: Massage. ]

Fixes 3dab6bd52687 ("EDAC, altera: Add support for Stratix10 SDRAM EDAC")
Reported-by Meng Li <[email protected]>
Signed-off-by Meng Li <[email protected]>
Signed-off-by Thor Thayer <[email protected]>
Signed-off-by Borislav Petkov <[email protected]>
Cc James Morse <[email protected]>
Cc linux-edac <[email protected]>
Cc Mauro Carvalho Chehab <[email protected]>
Cc Robert Richter <[email protected]>
Cc stable <[email protected]>
Cc Tony Luck <[email protected]>
Link https://lkml.kernel.org/r/[email protected] open here
drivers/edac/altera_edac.c +1 -0
index fbda4b876afd..0be3d1b17f03 100644
@@ -560,6 +560,7 @@ static const struct regmap_config s10_sdram_regmap_cfg = {
 	.reg_write = s10_protected_reg_write,
 	.use_single_read = true,
 	.use_single_write = true,
+	.fast_io = true,
 };
 
 /************** </Stratix10 EDAC Memory Controller Functions> ***********/
maintainer
#1 lore raw
Quoted 40 lines · On Sun, Dec 15, 2019 at 11:53:16AM +0100, [email protected] wrote:

The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 56d9e7bd3fa0f105b6670021d167744bc50ae4fe Mon Sep 17 00:00:00 2001
From: Meng Li <[email protected]>
Date: Thu, 21 Nov 2019 12:30:46 -0600
Subject: [PATCH] EDAC/altera: Use fast register IO for S10 IRQs

When an IRQ occurs, regmap_{read,write,...}() is invoked in atomic context. Regmap must indicate register IO is fast so that a spinlock is used instead of a mutex to avoid sleeping in atomic context:

lock_acquire
__mutex_lock
mutex_lock_nested
regmap_lock_mutex
regmap_write
a10_eccmgr_irq_unmask
unmask_irq.part.0
irq_enable
__irq_startup
irq_startup
__setup_irq
request_threaded_irq
devm_request_threaded_irq
altr_sdram_probe

Mark it so.

[ bp: Massage. ]

Quoted 12 lines
Fixes 3dab6bd52687 ("EDAC, altera: Add support for Stratix10 SDRAM EDAC")
Reported-by Meng Li <[email protected]>
Signed-off-by Meng Li <[email protected]>
Signed-off-by Thor Thayer <[email protected]>
Signed-off-by Borislav Petkov <[email protected]>
Cc James Morse <[email protected]>
Cc linux-edac <[email protected]>
Cc Mauro Carvalho Chehab <[email protected]>
Cc Robert Richter <[email protected]>
Cc stable <[email protected]>
Cc Tony Luck <[email protected]>
Link https://lkml.kernel.org/r/[email protected] open here

Adjusted context and queued for 4.19.

Signature · 2 lines
Thanks,
Sasha