From: Greg Kroah-Hartman Date: Wed, 13 Sep 2023 19:21:52 +0000 (+0200) Subject: 4.14-stable patches X-Git-Tag: v5.10.195~61 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b527b046093d9c449911391c04f32d25259b7bf7;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: clk-qcom-gcc-mdm9615-use-proper-parent-for-pll0_vote-clock.patch drm-ast-fix-dram-init-on-ast2200.patch fbdev-ep93xx-fb-do-not-assign-to-struct-fb_info.dev.patch nfsv4-pnfs-minor-fix-for-cleanup-path-in-nfs4_get_device_info.patch parisc-led-fix-lan-receive-and-transmit-leds.patch parisc-led-reduce-cpu-overhead-for-disk-lan-led-computation.patch --- diff --git a/queue-4.14/clk-qcom-gcc-mdm9615-use-proper-parent-for-pll0_vote-clock.patch b/queue-4.14/clk-qcom-gcc-mdm9615-use-proper-parent-for-pll0_vote-clock.patch new file mode 100644 index 00000000000..549c3af682a --- /dev/null +++ b/queue-4.14/clk-qcom-gcc-mdm9615-use-proper-parent-for-pll0_vote-clock.patch @@ -0,0 +1,35 @@ +From 1583694bb4eaf186f17131dbc1b83d6057d2749b Mon Sep 17 00:00:00 2001 +From: Dmitry Baryshkov +Date: Sat, 13 May 2023 00:17:23 +0300 +Subject: clk: qcom: gcc-mdm9615: use proper parent for pll0_vote clock + +From: Dmitry Baryshkov + +commit 1583694bb4eaf186f17131dbc1b83d6057d2749b upstream. + +The pll0_vote clock definitely should have pll0 as a parent (instead of +pll8). + +Fixes: 7792a8d6713c ("clk: mdm9615: Add support for MDM9615 Clock Controllers") +Cc: stable@kernel.org +Reviewed-by: Neil Armstrong +Signed-off-by: Dmitry Baryshkov +Reviewed-by: Konrad Dybcio +Link: https://lore.kernel.org/r/20230512211727.3445575-7-dmitry.baryshkov@linaro.org +Signed-off-by: Bjorn Andersson +Signed-off-by: Greg Kroah-Hartman +--- + drivers/clk/qcom/gcc-mdm9615.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/clk/qcom/gcc-mdm9615.c ++++ b/drivers/clk/qcom/gcc-mdm9615.c +@@ -66,7 +66,7 @@ static struct clk_regmap pll0_vote = { + .enable_mask = BIT(0), + .hw.init = &(struct clk_init_data){ + .name = "pll0_vote", +- .parent_names = (const char *[]){ "pll8" }, ++ .parent_names = (const char *[]){ "pll0" }, + .num_parents = 1, + .ops = &clk_pll_vote_ops, + }, diff --git a/queue-4.14/drm-ast-fix-dram-init-on-ast2200.patch b/queue-4.14/drm-ast-fix-dram-init-on-ast2200.patch new file mode 100644 index 00000000000..4fa04c62e53 --- /dev/null +++ b/queue-4.14/drm-ast-fix-dram-init-on-ast2200.patch @@ -0,0 +1,41 @@ +From 4cfe75f0f14f044dae66ad0e6eea812d038465d9 Mon Sep 17 00:00:00 2001 +From: Thomas Zimmermann +Date: Wed, 21 Jun 2023 14:53:35 +0200 +Subject: drm/ast: Fix DRAM init on AST2200 + +From: Thomas Zimmermann + +commit 4cfe75f0f14f044dae66ad0e6eea812d038465d9 upstream. + +Fix the test for the AST2200 in the DRAM initialization. The value +in ast->chip has to be compared against an enum constant instead of +a numerical value. + +This bug got introduced when the driver was first imported into the +kernel. + +Signed-off-by: Thomas Zimmermann +Fixes: 312fec1405dd ("drm: Initial KMS driver for AST (ASpeed Technologies) 2000 series (v2)") +Cc: Dave Airlie +Cc: dri-devel@lists.freedesktop.org +Cc: # v3.5+ +Reviewed-by: Sui Jingfeng +Reviewed-by: Jocelyn Falempe +Tested-by: Jocelyn Falempe # AST2600 +Link: https://patchwork.freedesktop.org/patch/msgid/20230621130032.3568-2-tzimmermann@suse.de +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/ast/ast_post.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/gpu/drm/ast/ast_post.c ++++ b/drivers/gpu/drm/ast/ast_post.c +@@ -291,7 +291,7 @@ static void ast_init_dram_reg(struct drm + ; + } while (ast_read32(ast, 0x10100) != 0xa8); + } else {/* AST2100/1100 */ +- if (ast->chip == AST2100 || ast->chip == 2200) ++ if (ast->chip == AST2100 || ast->chip == AST2200) + dram_reg_info = ast2100_dram_table_data; + else + dram_reg_info = ast1100_dram_table_data; diff --git a/queue-4.14/fbdev-ep93xx-fb-do-not-assign-to-struct-fb_info.dev.patch b/queue-4.14/fbdev-ep93xx-fb-do-not-assign-to-struct-fb_info.dev.patch new file mode 100644 index 00000000000..737b219695d --- /dev/null +++ b/queue-4.14/fbdev-ep93xx-fb-do-not-assign-to-struct-fb_info.dev.patch @@ -0,0 +1,40 @@ +From f90a0e5265b60cdd3c77990e8105f79aa2fac994 Mon Sep 17 00:00:00 2001 +From: Thomas Zimmermann +Date: Tue, 13 Jun 2023 13:06:49 +0200 +Subject: fbdev/ep93xx-fb: Do not assign to struct fb_info.dev + +From: Thomas Zimmermann + +commit f90a0e5265b60cdd3c77990e8105f79aa2fac994 upstream. + +Do not assing the Linux device to struct fb_info.dev. The call to +register_framebuffer() initializes the field to the fbdev device. +Drivers should not override its value. + +Fixes a bug where the driver incorrectly decreases the hardware +device's reference counter and leaks the fbdev device. + +v2: + * add Fixes tag (Dan) + +Signed-off-by: Thomas Zimmermann +Fixes: 88017bda96a5 ("ep93xx video driver") +Cc: # v2.6.32+ +Reviewed-by: Javier Martinez Canillas +Reviewed-by: Sam Ravnborg +Link: https://patchwork.freedesktop.org/patch/msgid/20230613110953.24176-15-tzimmermann@suse.de +Signed-off-by: Greg Kroah-Hartman +--- + drivers/video/fbdev/ep93xx-fb.c | 1 - + 1 file changed, 1 deletion(-) + +--- a/drivers/video/fbdev/ep93xx-fb.c ++++ b/drivers/video/fbdev/ep93xx-fb.c +@@ -478,7 +478,6 @@ static int ep93xxfb_probe(struct platfor + if (!info) + return -ENOMEM; + +- info->dev = &pdev->dev; + platform_set_drvdata(pdev, info); + fbi = info->par; + fbi->mach_info = mach_info; diff --git a/queue-4.14/nfsv4-pnfs-minor-fix-for-cleanup-path-in-nfs4_get_device_info.patch b/queue-4.14/nfsv4-pnfs-minor-fix-for-cleanup-path-in-nfs4_get_device_info.patch new file mode 100644 index 00000000000..d7c5f04cd99 --- /dev/null +++ b/queue-4.14/nfsv4-pnfs-minor-fix-for-cleanup-path-in-nfs4_get_device_info.patch @@ -0,0 +1,35 @@ +From 96562c45af5c31b89a197af28f79bfa838fb8391 Mon Sep 17 00:00:00 2001 +From: Fedor Pchelkin +Date: Thu, 20 Jul 2023 18:37:51 +0300 +Subject: NFSv4/pnfs: minor fix for cleanup path in nfs4_get_device_info + +From: Fedor Pchelkin + +commit 96562c45af5c31b89a197af28f79bfa838fb8391 upstream. + +It is an almost improbable error case but when page allocating loop in +nfs4_get_device_info() fails then we should only free the already +allocated pages, as __free_page() can't deal with NULL arguments. + +Found by Linux Verification Center (linuxtesting.org). + +Cc: stable@vger.kernel.org +Signed-off-by: Fedor Pchelkin +Reviewed-by: Benjamin Coddington +Signed-off-by: Anna Schumaker +Signed-off-by: Greg Kroah-Hartman +--- + fs/nfs/pnfs_dev.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/fs/nfs/pnfs_dev.c ++++ b/fs/nfs/pnfs_dev.c +@@ -153,7 +153,7 @@ nfs4_get_device_info(struct nfs_server * + set_bit(NFS_DEVICEID_NOCACHE, &d->flags); + + out_free_pages: +- for (i = 0; i < max_pages; i++) ++ while (--i >= 0) + __free_page(pages[i]); + kfree(pages); + out_free_pdev: diff --git a/queue-4.14/parisc-led-fix-lan-receive-and-transmit-leds.patch b/queue-4.14/parisc-led-fix-lan-receive-and-transmit-leds.patch new file mode 100644 index 00000000000..79cffe05820 --- /dev/null +++ b/queue-4.14/parisc-led-fix-lan-receive-and-transmit-leds.patch @@ -0,0 +1,32 @@ +From 4db89524b084f712a887256391fc19d9f66c8e55 Mon Sep 17 00:00:00 2001 +From: Helge Deller +Date: Sun, 27 Aug 2023 13:46:11 +0200 +Subject: parisc: led: Fix LAN receive and transmit LEDs + +From: Helge Deller + +commit 4db89524b084f712a887256391fc19d9f66c8e55 upstream. + +Fix the LAN receive and LAN transmit LEDs, which where swapped +up to now. + +Signed-off-by: Helge Deller +Cc: +Signed-off-by: Greg Kroah-Hartman +--- + arch/parisc/include/asm/led.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/arch/parisc/include/asm/led.h ++++ b/arch/parisc/include/asm/led.h +@@ -11,8 +11,8 @@ + #define LED1 0x02 + #define LED0 0x01 /* bottom (or furthest left) LED */ + +-#define LED_LAN_TX LED0 /* for LAN transmit activity */ +-#define LED_LAN_RCV LED1 /* for LAN receive activity */ ++#define LED_LAN_RCV LED0 /* for LAN receive activity */ ++#define LED_LAN_TX LED1 /* for LAN transmit activity */ + #define LED_DISK_IO LED2 /* for disk activity */ + #define LED_HEARTBEAT LED3 /* heartbeat */ + diff --git a/queue-4.14/parisc-led-reduce-cpu-overhead-for-disk-lan-led-computation.patch b/queue-4.14/parisc-led-reduce-cpu-overhead-for-disk-lan-led-computation.patch new file mode 100644 index 00000000000..b94845a0b2c --- /dev/null +++ b/queue-4.14/parisc-led-reduce-cpu-overhead-for-disk-lan-led-computation.patch @@ -0,0 +1,38 @@ +From 358ad816e52d4253b38c2f312e6b1cbd89e0dbf7 Mon Sep 17 00:00:00 2001 +From: Helge Deller +Date: Fri, 25 Aug 2023 17:46:39 +0200 +Subject: parisc: led: Reduce CPU overhead for disk & lan LED computation + +From: Helge Deller + +commit 358ad816e52d4253b38c2f312e6b1cbd89e0dbf7 upstream. + +Older PA-RISC machines have LEDs which show the disk- and LAN-activity. +The computation is done in software and takes quite some time, e.g. on a +J6500 this may take up to 60% time of one CPU if the machine is loaded +via network traffic. + +Since most people don't care about the LEDs, start with LEDs disabled and +just show a CPU heartbeat LED. The disk and LAN LEDs can be turned on +manually via /proc/pdc/led. + +Signed-off-by: Helge Deller +Cc: +Signed-off-by: Greg Kroah-Hartman +--- + drivers/parisc/led.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/parisc/led.c ++++ b/drivers/parisc/led.c +@@ -60,8 +60,8 @@ + static int led_type __read_mostly = -1; + static unsigned char lastleds; /* LED state from most recent update */ + static unsigned int led_heartbeat __read_mostly = 1; +-static unsigned int led_diskio __read_mostly = 1; +-static unsigned int led_lanrxtx __read_mostly = 1; ++static unsigned int led_diskio __read_mostly; ++static unsigned int led_lanrxtx __read_mostly; + static char lcd_text[32] __read_mostly; + static char lcd_text_default[32] __read_mostly; + static int lcd_no_led_support __read_mostly = 0; /* KittyHawk doesn't support LED on its LCD */ diff --git a/queue-4.14/series b/queue-4.14/series index 85e084d4dda..f20e845a31e 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -119,3 +119,9 @@ pstore-ram-check-start-of-empty-przs-during-init.patch crypto-stm32-fix-loop-iterating-through-scatterlist-for-dma.patch scsi-qla2xxx-fix-inconsistent-tmf-timeout.patch scsi-qla2xxx-turn-off-noisy-message-log.patch +fbdev-ep93xx-fb-do-not-assign-to-struct-fb_info.dev.patch +drm-ast-fix-dram-init-on-ast2200.patch +parisc-led-fix-lan-receive-and-transmit-leds.patch +parisc-led-reduce-cpu-overhead-for-disk-lan-led-computation.patch +clk-qcom-gcc-mdm9615-use-proper-parent-for-pll0_vote-clock.patch +nfsv4-pnfs-minor-fix-for-cleanup-path-in-nfs4_get_device_info.patch