From af2615a7a8d2e32ed3a2551d3718f55247180ca4 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 3 May 2018 09:03:50 -0700 Subject: [PATCH] drop some 3.18 patches --- ...the-rclk-rate-is-properly-determined.patch | 53 --------------- ...-raid5-avoid-string-overflow-warning.patch | 66 ------------------- queue-3.18/series | 3 - ...-on-the-boot-cpu-if-noapic-specified.patch | 58 ---------------- 4 files changed, 180 deletions(-) delete mode 100644 queue-3.18/asoc-samsung-i2s-ensure-the-rclk-rate-is-properly-determined.patch delete mode 100644 queue-3.18/md-raid5-avoid-string-overflow-warning.patch delete mode 100644 queue-3.18/x86-apic-set-up-through-local-apic-mode-on-the-boot-cpu-if-noapic-specified.patch diff --git a/queue-3.18/asoc-samsung-i2s-ensure-the-rclk-rate-is-properly-determined.patch b/queue-3.18/asoc-samsung-i2s-ensure-the-rclk-rate-is-properly-determined.patch deleted file mode 100644 index a65c63e6664..00000000000 --- a/queue-3.18/asoc-samsung-i2s-ensure-the-rclk-rate-is-properly-determined.patch +++ /dev/null @@ -1,53 +0,0 @@ -From foo@baz Wed May 2 13:21:44 PDT 2018 -From: Sylwester Nawrocki -Date: Mon, 5 Feb 2018 16:43:56 +0100 -Subject: ASoC: samsung: i2s: Ensure the RCLK rate is properly determined - -From: Sylwester Nawrocki - -[ Upstream commit 647d04f8e07afc7c3b7a42b3ee01a8b28db29631 ] - -If the RCLK mux clock configuration is specified in DT and no set_sysclk() -callback is used in the sound card driver the sclk_srcrate field will remain -set to 0, leading to an incorrect PSR divider setting. -To fix this the frequency value is retrieved from the CLK_I2S_RCLK_SRC clock, -so the actual RCLK mux selection is taken into account. - -Signed-off-by: Sylwester Nawrocki -Acked-by: Krzysztof Kozlowski -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - sound/soc/samsung/i2s.c | 13 +++++++++++-- - 1 file changed, 11 insertions(+), 2 deletions(-) - ---- a/sound/soc/samsung/i2s.c -+++ b/sound/soc/samsung/i2s.c -@@ -608,8 +608,12 @@ static int i2s_set_fmt(struct snd_soc_da - tmp |= MOD_SLAVE; - break; - case SND_SOC_DAIFMT_CBS_CFS: -- /* Set default source clock in Master mode */ -- if (i2s->rclk_srcrate == 0) -+ /* -+ * Set default source clock in Master mode, only when the -+ * CLK_I2S_RCLK_SRC clock is not exposed so we ensure any -+ * clock configuration assigned in DT is not overwritten. -+ */ -+ if (i2s->rclk_srcrate == 0 && i2s->clk_data.clks == NULL) - i2s_set_sysclk(dai, SAMSUNG_I2S_RCLKSRC_0, - 0, SND_SOC_CLOCK_IN); - break; -@@ -827,6 +831,11 @@ static int config_setup(struct i2s_dai * - return 0; - - if (!(i2s->quirks & QUIRK_NO_MUXPSR)) { -+ struct clk *rclksrc = i2s->clk_table[CLK_I2S_RCLK_SRC]; -+ -+ if (i2s->rclk_srcrate == 0 && rclksrc && !IS_ERR(rclksrc)) -+ i2s->rclk_srcrate = clk_get_rate(rclksrc); -+ - psr = i2s->rclk_srcrate / i2s->frmclk / rfs; - writel(((psr - 1) << 8) | PSR_PSREN, i2s->addr + I2SPSR); - dev_dbg(&i2s->pdev->dev, diff --git a/queue-3.18/md-raid5-avoid-string-overflow-warning.patch b/queue-3.18/md-raid5-avoid-string-overflow-warning.patch deleted file mode 100644 index a82b0f9dd3c..00000000000 --- a/queue-3.18/md-raid5-avoid-string-overflow-warning.patch +++ /dev/null @@ -1,66 +0,0 @@ -From foo@baz Wed May 2 13:21:43 PDT 2018 -From: Arnd Bergmann -Date: Tue, 20 Feb 2018 14:09:11 +0100 -Subject: md: raid5: avoid string overflow warning - -From: Arnd Bergmann - -[ Upstream commit 53b8d89ddbdbb0e4625a46d2cdbb6f106c52f801 ] - -gcc warns about a possible overflow of the kmem_cache string, when adding -four characters to a string of the same length: - -drivers/md/raid5.c: In function 'setup_conf': -drivers/md/raid5.c:2207:34: error: '-alt' directive writing 4 bytes into a region of size between 1 and 32 [-Werror=format-overflow=] - sprintf(conf->cache_name[1], "%s-alt", conf->cache_name[0]); - ^~~~ -drivers/md/raid5.c:2207:2: note: 'sprintf' output between 5 and 36 bytes into a destination of size 32 - sprintf(conf->cache_name[1], "%s-alt", conf->cache_name[0]); - ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -If I'm counting correctly, we need 11 characters for the fixed part -of the string and 18 characters for a 64-bit pointer (when no gendisk -is used), so that leaves three characters for conf->level, which should -always be sufficient. - -This makes the code use snprintf() with the correct length, to -make the code more robust against changes, and to get the compiler -to shut up. - -In commit f4be6b43f1ac ("md/raid5: ensure we create a unique name for -kmem_cache when mddev has no gendisk") from 2010, Neil said that -the pointer could be removed "shortly" once devices without gendisk -are disallowed. I have no idea if that happened, but if it did, that -should probably be changed as well. - -Signed-off-by: Arnd Bergmann -Signed-off-by: Shaohua Li -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - drivers/md/raid5.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - ---- a/drivers/md/raid5.c -+++ b/drivers/md/raid5.c -@@ -1736,16 +1736,17 @@ static int grow_one_stripe(struct r5conf - static int grow_stripes(struct r5conf *conf, int num) - { - struct kmem_cache *sc; -+ size_t namelen = sizeof(conf->cache_name[0]); - int devs = max(conf->raid_disks, conf->previous_raid_disks); - int hash; - - if (conf->mddev->gendisk) -- sprintf(conf->cache_name[0], -+ snprintf(conf->cache_name[0], namelen, - "raid%d-%s", conf->level, mdname(conf->mddev)); - else -- sprintf(conf->cache_name[0], -+ snprintf(conf->cache_name[0], namelen, - "raid%d-%p", conf->level, conf->mddev); -- sprintf(conf->cache_name[1], "%s-alt", conf->cache_name[0]); -+ snprintf(conf->cache_name[1], namelen, "%.27s-alt", conf->cache_name[0]); - - conf->active_name = 0; - sc = kmem_cache_create(conf->cache_name[conf->active_name], diff --git a/queue-3.18/series b/queue-3.18/series index 0e41cafa80b..b67b652fc7e 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -53,7 +53,6 @@ md-raid10-fix-null-deference-in-handle_write_completed.patch drm-exynos-fix-comparison-to-bitshift-when-dealing-with-a-mask.patch drm-exynos-g2d-delete-an-error-message-for-a-failed-memory-allocation-in-two-functions.patch locking-xchg-alpha-add-unconditional-memory-barrier-to-cmpxchg.patch -md-raid5-avoid-string-overflow-warning.patch kernel-relay.c-limit-kmalloc-size-to-kmalloc_max_size.patch s390-cio-fix-return-code-after-missing-interrupt.patch s390-cio-clear-timer-when-terminating-driver-i-o.patch @@ -178,12 +177,10 @@ clk-samsung-exynos5260-fix-pll-rates.patch clk-samsung-exynos5250-fix-pll-rates.patch clk-samsung-exynos3250-fix-pll-rates.patch audit-return-on-memory-error-to-avoid-null-pointer-dereference.patch -x86-apic-set-up-through-local-apic-mode-on-the-boot-cpu-if-noapic-specified.patch netlabel-if-pf_inet6-check-sk_buff-ip-header-version.patch scsi-lpfc-fix-issue_lip-if-link-is-disabled.patch scsi-lpfc-fix-soft-lockup-in-lpfc-worker-thread-during-lip-testing.patch scsi-lpfc-fix-frequency-of-release-wqe-cqes.patch regulator-of-add-a-missing-of_node_put-in-an-error-handling-path-of-of_regulator_match.patch -asoc-samsung-i2s-ensure-the-rclk-rate-is-properly-determined.patch kdb-make-mdr-command-repeat.patch perf-session-fix-undeclared-oe.patch diff --git a/queue-3.18/x86-apic-set-up-through-local-apic-mode-on-the-boot-cpu-if-noapic-specified.patch b/queue-3.18/x86-apic-set-up-through-local-apic-mode-on-the-boot-cpu-if-noapic-specified.patch deleted file mode 100644 index f6a25b30d2f..00000000000 --- a/queue-3.18/x86-apic-set-up-through-local-apic-mode-on-the-boot-cpu-if-noapic-specified.patch +++ /dev/null @@ -1,58 +0,0 @@ -From foo@baz Wed May 2 13:21:44 PDT 2018 -From: Baoquan He -Date: Wed, 14 Feb 2018 13:46:56 +0800 -Subject: x86/apic: Set up through-local-APIC mode on the boot CPU if 'noapic' specified - -From: Baoquan He - -[ Upstream commit bee3204ec3c49f6f53add9c3962c9012a5c036fa ] - -Currently the kdump kernel becomes very slow if 'noapic' is specified. -Normal kernel doesn't have this bug. - -Kernel parameter 'noapic' is used to disable IO-APIC in system for -testing or special purpose. Here the root cause is that in kdump -kernel LAPIC is disabled since commit: - - 522e664644 ("x86/apic: Disable I/O APIC before shutdown of the local APIC") - -In this case we need set up through-local-APIC on boot CPU in -setup_local_APIC(). - -In normal kernel the legacy irq mode is enabled by the BIOS. If -it is virtual wire mode, the local-APIC has been enabled and set as -through-local-APIC. - -Though we fixed the regression introduced by commit 522e664644, -to further improve robustness set up the through-local-APIC mode -explicitly, do not rely on the default boot IRQ mode. - -Signed-off-by: Baoquan He -Reviewed-by: Eric W. Biederman -Cc: Linus Torvalds -Cc: Peter Zijlstra -Cc: Thomas Gleixner -Cc: douly.fnst@cn.fujitsu.com -Cc: joro@8bytes.org -Cc: prarit@redhat.com -Cc: uobergfe@redhat.com -Link: http://lkml.kernel.org/r/20180214054656.3780-7-bhe@redhat.com -[ Rewrote the changelog. ] -Signed-off-by: Ingo Molnar -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - arch/x86/kernel/apic/apic.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/arch/x86/kernel/apic/apic.c -+++ b/arch/x86/kernel/apic/apic.c -@@ -1455,7 +1455,7 @@ void setup_local_APIC(void) - * TODO: set up through-local-APIC from through-I/O-APIC? --macro - */ - value = apic_read(APIC_LVT0) & APIC_LVT_MASKED; -- if (!cpu && (pic_mode || !value)) { -+ if (!cpu && (pic_mode || !value || skip_ioapic_setup)) { - value = APIC_DM_EXTINT; - apic_printk(APIC_VERBOSE, "enabled ExtINT on CPU#%d\n", cpu); - } else { -- 2.47.3