From: Sasha Levin Date: Tue, 17 Dec 2019 16:32:26 +0000 (-0500) Subject: Fix up patch mismatch X-Git-Tag: v5.4.4~1^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b450590bd65f694929cd17ede4ae8ab39fcf4068;p=thirdparty%2Fkernel%2Fstable-queue.git Fix up patch mismatch Signed-off-by: Sasha Levin --- diff --git a/queue-4.19/0001-EDAC-altera-Use-fast-register-IO-for-S10-IRQs.patch b/queue-4.19/0001-EDAC-altera-Use-fast-register-IO-for-S10-IRQs.patch new file mode 100644 index 00000000000..d3d3e89709d --- /dev/null +++ b/queue-4.19/0001-EDAC-altera-Use-fast-register-IO-for-S10-IRQs.patch @@ -0,0 +1,64 @@ +From 4df9920f61f7b5330fa5034953656c6fbc573e41 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 21 Nov 2019 12:30:46 -0600 +Subject: EDAC/altera: Use fast register IO for S10 IRQs + +From: Meng Li + +[ Upstream commit 56d9e7bd3fa0f105b6670021d167744bc50ae4fe ] + +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 +Signed-off-by: Meng Li +Signed-off-by: Thor Thayer +Signed-off-by: Borislav Petkov +Cc: James Morse +Cc: linux-edac +Cc: Mauro Carvalho Chehab +Cc: Robert Richter +Cc: stable +Cc: Tony Luck +Link: https://lkml.kernel.org/r/1574361048-17572-2-git-send-email-thor.thayer@linux.intel.com +Signed-off-by: Sasha Levin +--- + drivers/edac/altera_edac.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/edac/altera_edac.c b/drivers/edac/altera_edac.c +index 56de378ad13dc..c9108906bcdc0 100644 +--- a/drivers/edac/altera_edac.c ++++ b/drivers/edac/altera_edac.c +@@ -600,6 +600,7 @@ static const struct regmap_config s10_sdram_regmap_cfg = { + .reg_read = s10_protected_reg_read, + .reg_write = s10_protected_reg_write, + .use_single_rw = true, ++ .fast_io = true, + }; + + static int altr_s10_sdram_probe(struct platform_device *pdev) +-- +2.20.1 + diff --git a/queue-4.19/iio-ad7949-kill-pointless-readback-handling-code.patch b/queue-4.19/iio-ad7949-kill-pointless-readback-handling-code.patch deleted file mode 100644 index f217b6f92fb..00000000000 --- a/queue-4.19/iio-ad7949-kill-pointless-readback-handling-code.patch +++ /dev/null @@ -1,47 +0,0 @@ -From cf178be2195def6b6aafe97fee3d0d8398ccd316 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 21 Nov 2019 12:30:46 -0600 -Subject: iio: ad7949: kill pointless "readback"-handling code - -From: Meng Li - -[ Upstream commit c270bbf7bb9ddc4e2a51b3c56557c377c9ac79bc ] - -The device could be configured to spit out also the configuration word -while reading the AD result value (in the same SPI xfer) - this is called -"readback" in the device datasheet. - -The driver checks if readback is enabled and it eventually adjusts the SPI -xfer length and it applies proper shifts to still get the data, discarding -the configuration word. - -The readback option is actually never enabled (the driver disables it), so -the said checks do not serve for any purpose. - -Since enabling the readback option seems not to provide any advantage (the -driver entirely sets the configuration word without relying on any default -value), just kill the said, unused, code. - -Signed-off-by: Andrea Merello -Reviewed-by: Alexandru Ardelean -Signed-off-by: Jonathan Cameron -Signed-off-by: Sasha Levin ---- - drivers/edac/altera_edac.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/edac/altera_edac.c b/drivers/edac/altera_edac.c -index 56de378ad13dc..c9108906bcdc0 100644 ---- a/drivers/edac/altera_edac.c -+++ b/drivers/edac/altera_edac.c -@@ -600,6 +600,7 @@ static const struct regmap_config s10_sdram_regmap_cfg = { - .reg_read = s10_protected_reg_read, - .reg_write = s10_protected_reg_write, - .use_single_rw = true, -+ .fast_io = true, - }; - - static int altr_s10_sdram_probe(struct platform_device *pdev) --- -2.20.1 - diff --git a/queue-4.19/series b/queue-4.19/series index 2912981d423..40b5d27e07f 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -103,7 +103,7 @@ scsi-qla2xxx-always-check-the-qla2x00_wait_for_hba_o.patch scsi-qla2xxx-fix-message-indicating-vectors-used-by-.patch scsi-qla2xxx-fix-srb-leak-on-switch-command-timeout.patch xhci-make-sure-interrupts-are-restored-to-correct-st.patch -iio-ad7949-kill-pointless-readback-handling-code.patch +EDAC-altera-Use-fast-register-IO-for-S10-IRQs.patch usb-typec-fix-use-after-free-in-typec_register_port.patch omap-pdata-quirks-remove-openpandora-quirks-for-mmc3.patch scsi-lpfc-cap-npiv-vports-to-256.patch