Home Home > GIT Browse > openSUSE-15.0
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2019-07-20 07:12:30 +0200
committerKernel Build Daemon <kbuild@suse.de>2019-07-20 07:12:30 +0200
commita7b81d8e0525c10e8c195d04da2961d2c38cb748 (patch)
tree9cbfa2c55bd6e5072461fefd3a2309a364c3c1d8
parent8920ed66b864f13898fd9ae2ebd8a27d3af9ca01 (diff)
parentdadd843e6780e2a66d737a84682ab06b81f1f4cb (diff)
Merge branch 'SLE15' into openSUSE-15.0openSUSE-15.0
-rw-r--r--patches.arch/mm-nvdimm-add-is_ioremap_addr-and-use-that-to-check-.patch4
-rw-r--r--patches.drivers/ALSA-hda-realtek-Fixed-Headphone-Mic-can-t-record-on.patch40
-rw-r--r--patches.drivers/ALSA-hda-realtek-apply-ALC891-headset-fixup-to-one-D.patch37
-rw-r--r--patches.drivers/ALSA-seq-Break-too-long-mutex-context-in-the-write-l.patch76
-rw-r--r--patches.drivers/clk-qcom-Fix-Wunused-const-variable.patch98
-rw-r--r--patches.drivers/clk-rockchip-Don-t-yell-about-bad-mmc-phases-when-ge.patch52
-rw-r--r--patches.drivers/clk-tegra210-fix-PLLU-and-PLLU_OUT1.patch72
-rw-r--r--patches.drivers/dmaengine-hsu-Revert-set-HSU_CH_MTSR-to-memory-width.patch51
-rw-r--r--patches.drivers/mei-bus-need-to-unlink-client-before-freeing.patch79
-rw-r--r--patches.drivers/mei-me-add-denverton-innovation-engine-device-IDs.patch45
-rw-r--r--patches.drivers/mei-me-add-gemini-lake-devices-id.patch42
-rw-r--r--patches.fixes/crypto-talitos-fix-max-key-size-for-sha384-and-sha51.patch42
-rw-r--r--patches.suse/pkey-indicate-old-mkvp-only-if-old-and-current-mkvp-are-different32
-rw-r--r--series.conf16
14 files changed, 680 insertions, 6 deletions
diff --git a/patches.arch/mm-nvdimm-add-is_ioremap_addr-and-use-that-to-check-.patch b/patches.arch/mm-nvdimm-add-is_ioremap_addr-and-use-that-to-check-.patch
index 1fc3953ec2..4d284a35b7 100644
--- a/patches.arch/mm-nvdimm-add-is_ioremap_addr-and-use-that-to-check-.patch
+++ b/patches.arch/mm-nvdimm-add-is_ioremap_addr-and-use-that-to-check-.patch
@@ -5,9 +5,7 @@ Subject: [PATCH] mm/nvdimm: add is_ioremap_addr and use that to check ioremap
address
References: bsc#1140322 LTC#176270
-Patch-mainline: queued
-Git-repo: git://git.cmpxchg.org/linux-mmots.git
-Git-commit: 5d61685fe1a3cf52269f94b2a28af64c616a0ea9
+Patch-mainline: Submitted, https://patchwork.kernel.org/patch/11026025/
Architectures like powerpc use different address range to map ioremap and
vmalloc range. The memunmap() check used by the nvdimm layer was wrongly
diff --git a/patches.drivers/ALSA-hda-realtek-Fixed-Headphone-Mic-can-t-record-on.patch b/patches.drivers/ALSA-hda-realtek-Fixed-Headphone-Mic-can-t-record-on.patch
new file mode 100644
index 0000000000..b87e2efc55
--- /dev/null
+++ b/patches.drivers/ALSA-hda-realtek-Fixed-Headphone-Mic-can-t-record-on.patch
@@ -0,0 +1,40 @@
+From fbc571290d9f7bfe089c50f4ac4028dd98ebfe98 Mon Sep 17 00:00:00 2001
+From: Kailang Yang <kailang@realtek.com>
+Date: Mon, 15 Jul 2019 10:41:50 +0800
+Subject: [PATCH] ALSA: hda/realtek - Fixed Headphone Mic can't record on Dell platform
+Git-commit: fbc571290d9f7bfe089c50f4ac4028dd98ebfe98
+Patch-mainline: v5.3-rc1
+References: bsc#1051510
+
+It assigned to wrong model. So, The headphone Mic can't work.
+
+Fixes: 3f640970a414 ("ALSA: hda - Fix headset mic detection problem for several Dell laptops")
+Signed-off-by: Kailang Yang <kailang@realtek.com>
+Cc: <stable@vger.kernel.org>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ sound/pci/hda/patch_realtek.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
+index f24a757f8239..1c84c12b39b3 100644
+--- a/sound/pci/hda/patch_realtek.c
++++ b/sound/pci/hda/patch_realtek.c
+@@ -7657,9 +7657,12 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {
+ {0x12, 0x90a60130},
+ {0x17, 0x90170110},
+ {0x21, 0x03211020}),
+- SND_HDA_PIN_QUIRK(0x10ec0295, 0x1028, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE,
++ SND_HDA_PIN_QUIRK(0x10ec0295, 0x1028, "Dell", ALC269_FIXUP_DELL4_MIC_NO_PRESENCE,
+ {0x14, 0x90170110},
+ {0x21, 0x04211020}),
++ SND_HDA_PIN_QUIRK(0x10ec0295, 0x1028, "Dell", ALC269_FIXUP_DELL4_MIC_NO_PRESENCE,
++ {0x14, 0x90170110},
++ {0x21, 0x04211030}),
+ SND_HDA_PIN_QUIRK(0x10ec0295, 0x1028, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE,
+ ALC295_STANDARD_PINS,
+ {0x17, 0x21014020},
+--
+2.16.4
+
diff --git a/patches.drivers/ALSA-hda-realtek-apply-ALC891-headset-fixup-to-one-D.patch b/patches.drivers/ALSA-hda-realtek-apply-ALC891-headset-fixup-to-one-D.patch
new file mode 100644
index 0000000000..30187d84d0
--- /dev/null
+++ b/patches.drivers/ALSA-hda-realtek-apply-ALC891-headset-fixup-to-one-D.patch
@@ -0,0 +1,37 @@
+From 4b4e0e32e4b09274dbc9d173016c1a026f44608c Mon Sep 17 00:00:00 2001
+From: Hui Wang <hui.wang@canonical.com>
+Date: Tue, 16 Jul 2019 15:21:34 +0800
+Subject: [PATCH] ALSA: hda/realtek: apply ALC891 headset fixup to one Dell machine
+Git-commit: 4b4e0e32e4b09274dbc9d173016c1a026f44608c
+Patch-mainline: v5.3-rc1
+References: bsc#1051510
+
+Without this patch, the headset-mic and headphone-mic don't work.
+
+Cc: <stable@vger.kernel.org>
+Signed-off-by: Hui Wang <hui.wang@canonical.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ sound/pci/hda/patch_realtek.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
+index 1c84c12b39b3..de224cbea7a0 100644
+--- a/sound/pci/hda/patch_realtek.c
++++ b/sound/pci/hda/patch_realtek.c
+@@ -8803,6 +8803,11 @@ static const struct snd_hda_pin_quirk alc662_pin_fixup_tbl[] = {
+ {0x18, 0x01a19030},
+ {0x1a, 0x01813040},
+ {0x21, 0x01014020}),
++ SND_HDA_PIN_QUIRK(0x10ec0867, 0x1028, "Dell", ALC891_FIXUP_DELL_MIC_NO_PRESENCE,
++ {0x16, 0x01813030},
++ {0x17, 0x02211010},
++ {0x18, 0x01a19040},
++ {0x21, 0x01014020}),
+ SND_HDA_PIN_QUIRK(0x10ec0662, 0x1028, "Dell", ALC662_FIXUP_DELL_MIC_NO_PRESENCE,
+ {0x14, 0x01014010},
+ {0x18, 0x01a19020},
+--
+2.16.4
+
diff --git a/patches.drivers/ALSA-seq-Break-too-long-mutex-context-in-the-write-l.patch b/patches.drivers/ALSA-seq-Break-too-long-mutex-context-in-the-write-l.patch
new file mode 100644
index 0000000000..123538a072
--- /dev/null
+++ b/patches.drivers/ALSA-seq-Break-too-long-mutex-context-in-the-write-l.patch
@@ -0,0 +1,76 @@
+From ede34f397ddb063b145b9e7d79c6026f819ded13 Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Mon, 15 Jul 2019 22:50:27 +0200
+Subject: [PATCH] ALSA: seq: Break too long mutex context in the write loop
+Git-commit: ede34f397ddb063b145b9e7d79c6026f819ded13
+Patch-mainline: v5.3-rc1
+References: bsc#1051510
+
+The fix for the racy writes and ioctls to sequencer widened the
+application of client->ioctl_mutex to the whole write loop. Although
+it does unlock/relock for the lengthy operation like the event dup,
+the loop keeps the ioctl_mutex for the whole time in other
+situations. This may take quite long time if the user-space would
+give a huge buffer, and this is a likely cause of some weird behavior
+spotted by syzcaller fuzzer.
+
+This patch puts a simple workaround, just adding a mutex break in the
+loop when a large number of events have been processed. This
+shouldn't hit any performance drop because the threshold is set high
+enough for usual operations.
+
+Fixes: 7bd800915677 ("ALSA: seq: More protection for concurrent write and ioctl races")
+Reported-by: syzbot+97aae04ce27e39cbfca9@syzkaller.appspotmail.com
+Reported-by: syzbot+4c595632b98bb8ffcc66@syzkaller.appspotmail.com
+Cc: <stable@vger.kernel.org>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ sound/core/seq/seq_clientmgr.c | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/sound/core/seq/seq_clientmgr.c b/sound/core/seq/seq_clientmgr.c
+index a60e7a17f0b8..7737b2670064 100644
+--- a/sound/core/seq/seq_clientmgr.c
++++ b/sound/core/seq/seq_clientmgr.c
+@@ -1021,7 +1021,7 @@ static ssize_t snd_seq_write(struct file *file, const char __user *buf,
+ {
+ struct snd_seq_client *client = file->private_data;
+ int written = 0, len;
+- int err;
++ int err, handled;
+ struct snd_seq_event event;
+
+ if (!(snd_seq_file_flags(file) & SNDRV_SEQ_LFLG_OUTPUT))
+@@ -1034,6 +1034,8 @@ static ssize_t snd_seq_write(struct file *file, const char __user *buf,
+ if (!client->accept_output || client->pool == NULL)
+ return -ENXIO;
+
++ repeat:
++ handled = 0;
+ /* allocate the pool now if the pool is not allocated yet */
+ mutex_lock(&client->ioctl_mutex);
+ if (client->pool->size > 0 && !snd_seq_write_pool_allocated(client)) {
+@@ -1093,12 +1095,19 @@ static ssize_t snd_seq_write(struct file *file, const char __user *buf,
+ 0, 0, &client->ioctl_mutex);
+ if (err < 0)
+ break;
++ handled++;
+
+ __skip_event:
+ /* Update pointers and counts */
+ count -= len;
+ buf += len;
+ written += len;
++
++ /* let's have a coffee break if too many events are queued */
++ if (++handled >= 200) {
++ mutex_unlock(&client->ioctl_mutex);
++ goto repeat;
++ }
+ }
+
+ out:
+--
+2.16.4
+
diff --git a/patches.drivers/clk-qcom-Fix-Wunused-const-variable.patch b/patches.drivers/clk-qcom-Fix-Wunused-const-variable.patch
new file mode 100644
index 0000000000..3ce29afdd8
--- /dev/null
+++ b/patches.drivers/clk-qcom-Fix-Wunused-const-variable.patch
@@ -0,0 +1,98 @@
+From da642427bd7710ec4f4140f693f59aa8521a358c Mon Sep 17 00:00:00 2001
+From: Nathan Huckleberry <nhuck@google.com>
+Date: Tue, 11 Jun 2019 14:11:34 -0700
+Subject: [PATCH] clk: qcom: Fix -Wunused-const-variable
+Git-commit: da642427bd7710ec4f4140f693f59aa8521a358c
+Patch-mainline: 5.3-rc1
+References: bsc#1051510
+
+Clang produces the following warning
+
+drivers/clk/qcom/gcc-msm8996.c:133:32: warning: unused variable
+'gcc_xo_gpll0_gpll2_gpll3_gpll0_early_div_map' [-Wunused-const-variable]
+static const struct
+parent_map gcc_xo_gpll0_gpll2_gpll3_gpll0_early_div_map[] =
+{ ^drivers/clk/qcom/gcc-msm8996.c:141:27: warning: unused variable
+'gcc_xo_gpll0_gpll2_gpll3_gpll0_early_div' [-Wunused-const-variable] static
+const char * const gcc_xo_gpll0_gpll2_gpll3_gpll0_early_div[] = { ^
+drivers/clk/qcom/gcc-msm8996.c:187:32: warning: unused variable
+'gcc_xo_gpll0_gpll2_gpll3_gpll1_gpll4_gpll0_early_div_map'
+[-Wunused-const-variable] static const struct parent_map
+gcc_xo_gpll0_gpll2_gpll3_gpll1_gpll4_gpll0_early_div_map[] = { ^
+drivers/clk/qcom/gcc-msm8996.c:197:27: warning: unused variable
+'gcc_xo_gpll0_gpll2_gpll3_gpll1_gpll4_gpll0_early_div'
+[-Wunused-const-variable] static const char * const
+gcc_xo_gpll0_gpll2_gpll3_gpll1_gpll4_gpll0_early_div[] = {
+
+It looks like these were never used.
+
+Fixes: b1e010c0730a ("clk: qcom: Add MSM8996 Global Clock Control (GCC) driver")
+Cc: clang-built-linux@googlegroups.com
+Link: https://github.com/ClangBuiltLinux/linux/issues/518
+Suggested-by: Nathan Chancellor <natechancellor@gmail.com>
+Signed-off-by: Nathan Huckleberry <nhuck@google.com>
+Reviewed-by: Nathan Chancellor <natechancellor@gmail.com>
+Signed-off-by: Stephen Boyd <sboyd@kernel.org>
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ drivers/clk/qcom/gcc-msm8996.c | 36 ------------------------------------
+ 1 file changed, 36 deletions(-)
+
+diff --git a/drivers/clk/qcom/gcc-msm8996.c b/drivers/clk/qcom/gcc-msm8996.c
+index 4632b9272b7f..292d7214a226 100644
+--- a/drivers/clk/qcom/gcc-msm8996.c
++++ b/drivers/clk/qcom/gcc-msm8996.c
+@@ -138,22 +138,6 @@ static const char * const gcc_xo_gpll0_gpll4_gpll0_early_div[] = {
+ "gpll0_early_div"
+ };
+
+-static const struct parent_map gcc_xo_gpll0_gpll2_gpll3_gpll0_early_div_map[] = {
+- { P_XO, 0 },
+- { P_GPLL0, 1 },
+- { P_GPLL2, 2 },
+- { P_GPLL3, 3 },
+- { P_GPLL0_EARLY_DIV, 6 }
+-};
+-
+-static const char * const gcc_xo_gpll0_gpll2_gpll3_gpll0_early_div[] = {
+- "xo",
+- "gpll0",
+- "gpll2",
+- "gpll3",
+- "gpll0_early_div"
+-};
+-
+ static const struct parent_map gcc_xo_gpll0_gpll1_early_div_gpll1_gpll4_gpll0_early_div_map[] = {
+ { P_XO, 0 },
+ { P_GPLL0, 1 },
+@@ -192,26 +176,6 @@ static const char * const gcc_xo_gpll0_gpll2_gpll3_gpll1_gpll2_early_gpll0_early
+ "gpll0_early_div"
+ };
+
+-static const struct parent_map gcc_xo_gpll0_gpll2_gpll3_gpll1_gpll4_gpll0_early_div_map[] = {
+- { P_XO, 0 },
+- { P_GPLL0, 1 },
+- { P_GPLL2, 2 },
+- { P_GPLL3, 3 },
+- { P_GPLL1, 4 },
+- { P_GPLL4, 5 },
+- { P_GPLL0_EARLY_DIV, 6 }
+-};
+-
+-static const char * const gcc_xo_gpll0_gpll2_gpll3_gpll1_gpll4_gpll0_early_div[] = {
+- "xo",
+- "gpll0",
+- "gpll2",
+- "gpll3",
+- "gpll1",
+- "gpll4",
+- "gpll0_early_div"
+-};
+-
+ static struct clk_fixed_factor xo = {
+ .mult = 1,
+ .div = 1,
+--
+2.16.4
+
diff --git a/patches.drivers/clk-rockchip-Don-t-yell-about-bad-mmc-phases-when-ge.patch b/patches.drivers/clk-rockchip-Don-t-yell-about-bad-mmc-phases-when-ge.patch
new file mode 100644
index 0000000000..49795603d8
--- /dev/null
+++ b/patches.drivers/clk-rockchip-Don-t-yell-about-bad-mmc-phases-when-ge.patch
@@ -0,0 +1,52 @@
+From 6943b839721ad4a31ad2bacf6e71b21f2dfe3134 Mon Sep 17 00:00:00 2001
+From: Douglas Anderson <dianders@chromium.org>
+Date: Fri, 3 May 2019 14:22:08 -0700
+Subject: [PATCH] clk: rockchip: Don't yell about bad mmc phases when getting
+Git-commit: 6943b839721ad4a31ad2bacf6e71b21f2dfe3134
+Patch-mainline: 5.3-rc1
+References: bsc#1051510
+
+At boot time, my rk3288-veyron devices yell with 8 lines that look
+like this:
+ [ 0.000000] rockchip_mmc_get_phase: invalid clk rate
+
+This is because the clock framework at clk_register() time tries to
+get the phase but we don't have a parent yet.
+
+While the errors appear to be harmless they are still ugly and, in
+general, we don't want yells like this in the log unless they are
+important.
+
+There's no real reason to be yelling here. We can still return
+-EINVAL to indicate that the phase makes no sense without a parent.
+If someone really tries to do tuning and the clock is reported as 0
+then we'll see the yells in rockchip_mmc_set_phase().
+
+Fixes: 4bf59902b500 ("clk: rockchip: Prevent calculating mmc phase if clock rate is zero")
+Signed-off-by: Douglas Anderson <dianders@chromium.org>
+Signed-off-by: Heiko Stuebner <heiko@sntech.de>
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ drivers/clk/rockchip/clk-mmc-phase.c | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/drivers/clk/rockchip/clk-mmc-phase.c b/drivers/clk/rockchip/clk-mmc-phase.c
+index 07526f64dbfd..17662217d1bb 100644
+--- a/drivers/clk/rockchip/clk-mmc-phase.c
++++ b/drivers/clk/rockchip/clk-mmc-phase.c
+@@ -61,10 +61,8 @@ static int rockchip_mmc_get_phase(struct clk_hw *hw)
+ u32 delay_num = 0;
+
+ /* See the comment for rockchip_mmc_set_phase below */
+- if (!rate) {
+- pr_err("%s: invalid clk rate\n", __func__);
++ if (!rate)
+ return -EINVAL;
+- }
+
+ raw_value = readl(mmc_clock->reg) >> (mmc_clock->shift);
+
+--
+2.16.4
+
diff --git a/patches.drivers/clk-tegra210-fix-PLLU-and-PLLU_OUT1.patch b/patches.drivers/clk-tegra210-fix-PLLU-and-PLLU_OUT1.patch
new file mode 100644
index 0000000000..69ac925158
--- /dev/null
+++ b/patches.drivers/clk-tegra210-fix-PLLU-and-PLLU_OUT1.patch
@@ -0,0 +1,72 @@
+From 0d34dfbf3023cf119b83f6470692c0b10c832495 Mon Sep 17 00:00:00 2001
+From: JC Kuo <jckuo@nvidia.com>
+Date: Wed, 12 Jun 2019 11:14:34 +0800
+Subject: [PATCH] clk: tegra210: fix PLLU and PLLU_OUT1
+Git-commit: 0d34dfbf3023cf119b83f6470692c0b10c832495
+Patch-mainline: 5.3-rc1
+References: bsc#1051510
+
+Full-speed and low-speed USB devices do not work with Tegra210
+platforms because of incorrect PLLU/PLLU_OUT1 clock settings.
+
+When full-speed device is connected:
+[ 14.059886] usb 1-3: new full-speed USB device number 2 using tegra-xusb
+[ 14.196295] usb 1-3: device descriptor read/64, error -71
+[ 14.436311] usb 1-3: device descriptor read/64, error -71
+[ 14.675749] usb 1-3: new full-speed USB device number 3 using tegra-xusb
+[ 14.812335] usb 1-3: device descriptor read/64, error -71
+[ 15.052316] usb 1-3: device descriptor read/64, error -71
+[ 15.164799] usb usb1-port3: attempt power cycle
+
+When low-speed device is connected:
+[ 37.610949] usb usb1-port3: Cannot enable. Maybe the USB cable is bad?
+[ 38.557376] usb usb1-port3: Cannot enable. Maybe the USB cable is bad?
+[ 38.564977] usb usb1-port3: attempt power cycle
+
+This commit fixes the issue by:
+ 1. initializing PLLU_OUT1 before initializing XUSB_FS_SRC clock
+ because PLLU_OUT1 is parent of XUSB_FS_SRC.
+ 2. changing PLLU post-divider to /2 (DIVP=1) according to Technical
+ Reference Manual.
+
+Fixes: e745f992cf4b ("clk: tegra: Rework pll_u")
+Signed-off-by: JC Kuo <jckuo@nvidia.com>
+Acked-by: Peter De Schrijver <pdeschrijver@nvidia.com>
+Signed-off-by: Stephen Boyd <sboyd@kernel.org>
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ drivers/clk/tegra/clk-tegra210.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/drivers/clk/tegra/clk-tegra210.c
++++ b/drivers/clk/tegra/clk-tegra210.c
+@@ -2054,9 +2054,9 @@ static struct div_nmp pllu_nmp = {
+ };
+
+ static struct tegra_clk_pll_freq_table pll_u_freq_table[] = {
+- { 12000000, 480000000, 40, 1, 0, 0 },
+- { 13000000, 480000000, 36, 1, 0, 0 }, /* actual: 468.0 MHz */
+- { 38400000, 480000000, 25, 2, 0, 0 },
++ { 12000000, 480000000, 40, 1, 1, 0 },
++ { 13000000, 480000000, 36, 1, 1, 0 }, /* actual: 468.0 MHz */
++ { 38400000, 480000000, 25, 2, 1, 0 },
+ { 0, 0, 0, 0, 0, 0 },
+ };
+
+@@ -2979,6 +2979,7 @@ static struct tegra_clk_init_table init_
+ { TEGRA210_CLK_DFLL_REF, TEGRA210_CLK_PLL_P, 51000000, 1 },
+ { TEGRA210_CLK_SBC4, TEGRA210_CLK_PLL_P, 12000000, 1 },
+ { TEGRA210_CLK_PLL_RE_VCO, TEGRA210_CLK_CLK_MAX, 672000000, 1 },
++ { TEGRA210_CLK_PLL_U_OUT1, TEGRA210_CLK_CLK_MAX, 48000000, 1 },
+ { TEGRA210_CLK_XUSB_GATE, TEGRA210_CLK_CLK_MAX, 0, 1 },
+ { TEGRA210_CLK_XUSB_SS_SRC, TEGRA210_CLK_PLL_U_480M, 120000000, 0 },
+ { TEGRA210_CLK_XUSB_FS_SRC, TEGRA210_CLK_PLL_U_48M, 48000000, 0 },
+@@ -3004,7 +3005,6 @@ static struct tegra_clk_init_table init_
+ { TEGRA210_CLK_PLL_DP, TEGRA210_CLK_CLK_MAX, 270000000, 0 },
+ { TEGRA210_CLK_SOC_THERM, TEGRA210_CLK_PLL_P, 51000000, 0 },
+ { TEGRA210_CLK_CCLK_G, TEGRA210_CLK_CLK_MAX, 0, 1 },
+- { TEGRA210_CLK_PLL_U_OUT1, TEGRA210_CLK_CLK_MAX, 48000000, 1 },
+ { TEGRA210_CLK_PLL_U_OUT2, TEGRA210_CLK_CLK_MAX, 60000000, 1 },
+ /* This MUST be the last entry. */
+ { TEGRA210_CLK_CLK_MAX, TEGRA210_CLK_CLK_MAX, 0, 0 },
diff --git a/patches.drivers/dmaengine-hsu-Revert-set-HSU_CH_MTSR-to-memory-width.patch b/patches.drivers/dmaengine-hsu-Revert-set-HSU_CH_MTSR-to-memory-width.patch
new file mode 100644
index 0000000000..eabef6274a
--- /dev/null
+++ b/patches.drivers/dmaengine-hsu-Revert-set-HSU_CH_MTSR-to-memory-width.patch
@@ -0,0 +1,51 @@
+From c24a5c735f87d0549060de31367c095e8810b895 Mon Sep 17 00:00:00 2001
+From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+Date: Thu, 13 Jun 2019 16:32:32 +0300
+Subject: [PATCH] dmaengine: hsu: Revert "set HSU_CH_MTSR to memory width"
+Git-commit: c24a5c735f87d0549060de31367c095e8810b895
+Patch-mainline: 5.3-rc1
+References: bsc#1051510
+
+The commit
+
+ 080edf75d337 ("dmaengine: hsu: set HSU_CH_MTSR to memory width")
+
+has been mistakenly submitted. The further investigations show that
+the original code does better job since the memory side transfer size
+has never been configured by DMA users.
+
+As per latest revision of documentation: "Channel minimum transfer size
+(CHnMTSR)... For IOSF UART, maximum value that can be programmed is 64 and
+minimum value that can be programmed is 1."
+
+This reverts commit 080edf75d337d35faa6fc3df99342b10d2848d16.
+
+Fixes: 080edf75d337 ("dmaengine: hsu: set HSU_CH_MTSR to memory width")
+Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+Signed-off-by: Vinod Koul <vkoul@kernel.org>
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ drivers/dma/hsu/hsu.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/dma/hsu/hsu.c b/drivers/dma/hsu/hsu.c
+index e06f20272fd7..dfabc64c2ab0 100644
+--- a/drivers/dma/hsu/hsu.c
++++ b/drivers/dma/hsu/hsu.c
+@@ -64,10 +64,10 @@ static void hsu_dma_chan_start(struct hsu_dma_chan *hsuc)
+
+ if (hsuc->direction == DMA_MEM_TO_DEV) {
+ bsr = config->dst_maxburst;
+- mtsr = config->src_addr_width;
++ mtsr = config->dst_addr_width;
+ } else if (hsuc->direction == DMA_DEV_TO_MEM) {
+ bsr = config->src_maxburst;
+- mtsr = config->dst_addr_width;
++ mtsr = config->src_addr_width;
+ }
+
+ hsu_chan_disable(hsuc);
+--
+2.16.4
+
diff --git a/patches.drivers/mei-bus-need-to-unlink-client-before-freeing.patch b/patches.drivers/mei-bus-need-to-unlink-client-before-freeing.patch
new file mode 100644
index 0000000000..dcaf538c99
--- /dev/null
+++ b/patches.drivers/mei-bus-need-to-unlink-client-before-freeing.patch
@@ -0,0 +1,79 @@
+From 34f1166afd67f9f48a08c52f36180048908506a4 Mon Sep 17 00:00:00 2001
+From: Tomas Winkler <tomas.winkler@intel.com>
+Date: Mon, 27 Aug 2018 22:40:16 +0300
+Subject: [PATCH] mei: bus: need to unlink client before freeing
+Mime-version: 1.0
+Content-type: text/plain; charset=UTF-8
+Content-transfer-encoding: 8bit
+Git-commit: 34f1166afd67f9f48a08c52f36180048908506a4
+Patch-mainline: v4.19-rc4
+References: bsc#1051510
+
+In case a client fails to connect in mei_cldev_enable(), the
+caller won't call the mei_cldev_disable leaving the client
+in a linked stated. Upon driver unload the client structure
+will be freed in mei_cl_bus_dev_release(), leaving a stale pointer
+on a fail_list. This will eventually end up in crash
+during power down flow in mei_cl_set_disonnected().
+
+Rip: mei_cl_set_disconnected+0x5/0x260[mei]
+Call trace:
+mei_cl_all_disconnect+0x22/0x30
+mei_reset+0x194/0x250
+__synchronize_hardirq+0x43/0x50
+_cond_resched+0x15/0x30
+mei_me_intr_clear+0x20/0x100
+mei_stop+0x76/0xb0
+mei_me_shutdown+0x3f/0x80
+pci_device_shutdown+0x34/0x60
+kernel_restart+0x0e/0x30
+
+Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=200455
+Fixes: 'c110cdb17148 ("mei: bus: make a client pointer always available")'
+Cc: <stable@vger.kernel.org> 4.10+
+Tested-by: Georg Müller <georgmueller@gmx.net>
+Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ drivers/misc/mei/bus.c | 9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+--- a/drivers/misc/mei/bus.c
++++ b/drivers/misc/mei/bus.c
+@@ -465,17 +465,15 @@ int mei_cldev_enable(struct mei_cl_devic
+
+ cl = cldev->cl;
+
++ mutex_lock(&bus->device_lock);
+ if (cl->state == MEI_FILE_UNINITIALIZED) {
+- mutex_lock(&bus->device_lock);
+ ret = mei_cl_link(cl);
+- mutex_unlock(&bus->device_lock);
+ if (ret)
+- return ret;
++ goto out;
+ /* update pointers */
+ cl->cldev = cldev;
+ }
+
+- mutex_lock(&bus->device_lock);
+ if (mei_cl_is_connected(cl)) {
+ ret = 0;
+ goto out;
+@@ -841,12 +839,13 @@ static void mei_cl_bus_dev_release(struc
+
+ mei_me_cl_put(cldev->me_cl);
+ mei_dev_bus_put(cldev->bus);
++ mei_cl_unlink(cldev->cl);
+ kfree(cldev->cl);
+ kfree(cldev);
+ }
+
+ static struct device_type mei_cl_device_type = {
+- .release = mei_cl_bus_dev_release,
++ .release = mei_cl_bus_dev_release,
+ };
+
+ /**
diff --git a/patches.drivers/mei-me-add-denverton-innovation-engine-device-IDs.patch b/patches.drivers/mei-me-add-denverton-innovation-engine-device-IDs.patch
new file mode 100644
index 0000000000..d6a9450207
--- /dev/null
+++ b/patches.drivers/mei-me-add-denverton-innovation-engine-device-IDs.patch
@@ -0,0 +1,45 @@
+From f7ee8ead151f9d0b8dac6ab6c3ff49bbe809c564 Mon Sep 17 00:00:00 2001
+From: Tomas Winkler <tomas.winkler@intel.com>
+Date: Sun, 13 Jan 2019 14:24:48 +0200
+Subject: [PATCH] mei: me: add denverton innovation engine device IDs
+Git-commit: f7ee8ead151f9d0b8dac6ab6c3ff49bbe809c564
+Patch-mainline: v5.0-rc4
+References: bsc#1051510
+
+Add the Denverton innovation engine (IE) device ids.
+The IE is an ME-like device which provides HW security
+offloading.
+
+Cc: <stable@vger.kernel.org>
+Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
+Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ drivers/misc/mei/hw-me-regs.h | 2 ++
+ drivers/misc/mei/pci-me.c | 2 ++
+ 2 files changed, 4 insertions(+)
+
+--- a/drivers/misc/mei/hw-me-regs.h
++++ b/drivers/misc/mei/hw-me-regs.h
+@@ -127,6 +127,8 @@
+ #define MEI_DEV_ID_BXT_M 0x1A9A /* Broxton M */
+ #define MEI_DEV_ID_APL_I 0x5A9A /* Apollo Lake I */
+
++#define MEI_DEV_ID_DNV_IE 0x19E5 /* Denverton IE */
++
+ #define MEI_DEV_ID_GLK 0x319A /* Gemini Lake */
+
+ #define MEI_DEV_ID_KBP 0xA2BA /* Kaby Point */
+--- a/drivers/misc/mei/pci-me.c
++++ b/drivers/misc/mei/pci-me.c
+@@ -92,6 +92,8 @@ static const struct pci_device_id mei_me
+ {MEI_PCI_DEVICE(MEI_DEV_ID_BXT_M, mei_me_pch8_cfg)},
+ {MEI_PCI_DEVICE(MEI_DEV_ID_APL_I, mei_me_pch8_cfg)},
+
++ {MEI_PCI_DEVICE(MEI_DEV_ID_DNV_IE, mei_me_pch8_cfg)},
++
+ {MEI_PCI_DEVICE(MEI_DEV_ID_GLK, mei_me_pch8_cfg)},
+
+ {MEI_PCI_DEVICE(MEI_DEV_ID_KBP, mei_me_pch8_cfg)},
diff --git a/patches.drivers/mei-me-add-gemini-lake-devices-id.patch b/patches.drivers/mei-me-add-gemini-lake-devices-id.patch
new file mode 100644
index 0000000000..26bfea1fe7
--- /dev/null
+++ b/patches.drivers/mei-me-add-gemini-lake-devices-id.patch
@@ -0,0 +1,42 @@
+From 688cb67839e852740d22cf763e5eafb27d5a6e53 Mon Sep 17 00:00:00 2001
+From: Tomas Winkler <tomas.winkler@intel.com>
+Date: Sun, 24 Sep 2017 11:35:34 +0300
+Subject: [PATCH] mei: me: add gemini lake devices id
+Git-commit: 688cb67839e852740d22cf763e5eafb27d5a6e53
+Patch-mainline: v4.14-rc5
+References: bsc#1051510
+
+Add Gemini Lake (GLK) device id.
+
+Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
+Cc: stable <stable@vger.kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ drivers/misc/mei/hw-me-regs.h | 2 ++
+ drivers/misc/mei/pci-me.c | 2 ++
+ 2 files changed, 4 insertions(+)
+
+--- a/drivers/misc/mei/hw-me-regs.h
++++ b/drivers/misc/mei/hw-me-regs.h
+@@ -127,6 +127,8 @@
+ #define MEI_DEV_ID_BXT_M 0x1A9A /* Broxton M */
+ #define MEI_DEV_ID_APL_I 0x5A9A /* Apollo Lake I */
+
++#define MEI_DEV_ID_GLK 0x319A /* Gemini Lake */
++
+ #define MEI_DEV_ID_KBP 0xA2BA /* Kaby Point */
+ #define MEI_DEV_ID_KBP_2 0xA2BB /* Kaby Point 2 */
+
+--- a/drivers/misc/mei/pci-me.c
++++ b/drivers/misc/mei/pci-me.c
+@@ -92,6 +92,8 @@ static const struct pci_device_id mei_me
+ {MEI_PCI_DEVICE(MEI_DEV_ID_BXT_M, mei_me_pch8_cfg)},
+ {MEI_PCI_DEVICE(MEI_DEV_ID_APL_I, mei_me_pch8_cfg)},
+
++ {MEI_PCI_DEVICE(MEI_DEV_ID_GLK, mei_me_pch8_cfg)},
++
+ {MEI_PCI_DEVICE(MEI_DEV_ID_KBP, mei_me_pch8_cfg)},
+ {MEI_PCI_DEVICE(MEI_DEV_ID_KBP_2, mei_me_pch8_cfg)},
+
diff --git a/patches.fixes/crypto-talitos-fix-max-key-size-for-sha384-and-sha51.patch b/patches.fixes/crypto-talitos-fix-max-key-size-for-sha384-and-sha51.patch
new file mode 100644
index 0000000000..194d4bbf1d
--- /dev/null
+++ b/patches.fixes/crypto-talitos-fix-max-key-size-for-sha384-and-sha51.patch
@@ -0,0 +1,42 @@
+From 192125ed5ce62afba24312d8e7a0314577565b4a Mon Sep 17 00:00:00 2001
+From: Christophe Leroy <christophe.leroy@c-s.fr>
+Date: Wed, 12 Jun 2019 05:49:50 +0000
+Subject: [PATCH] crypto: talitos - fix max key size for sha384 and sha512
+Mime-version: 1.0
+Content-type: text/plain; charset=UTF-8
+Content-transfer-encoding: 8bit
+Git-commit: 192125ed5ce62afba24312d8e7a0314577565b4a
+Patch-mainline: 5.3-rc1
+References: bsc#1051510
+
+Below commit came with a typo in the CONFIG_ symbol, leading
+to a permanently reduced max key size regarless of the driver
+capabilities.
+
+Reported-by: Horia Geantă <horia.geanta@nxp.com>
+Fixes: b8fbdc2bc4e7 ("crypto: talitos - reduce max key size for SEC1")
+Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
+Reviewed-by: Horia Geantă <horia.geanta@nxp.com>
+Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ drivers/crypto/talitos.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c
+index 32a7e747dc5f..c865f5d5eaba 100644
+--- a/drivers/crypto/talitos.c
++++ b/drivers/crypto/talitos.c
+@@ -823,7 +823,7 @@ static void talitos_unregister_rng(struct device *dev)
+ * HMAC_SNOOP_NO_AFEA (HSNA) instead of type IPSEC_ESP
+ */
+ #define TALITOS_CRA_PRIORITY_AEAD_HSNA (TALITOS_CRA_PRIORITY - 1)
+-#ifdef CONFIG_CRYPTO_DEV_TALITOS_SEC2
++#ifdef CONFIG_CRYPTO_DEV_TALITOS2
+ #define TALITOS_MAX_KEY_SIZE (AES_MAX_KEY_SIZE + SHA512_BLOCK_SIZE)
+ #else
+ #define TALITOS_MAX_KEY_SIZE (AES_MAX_KEY_SIZE + SHA256_BLOCK_SIZE)
+--
+2.16.4
+
diff --git a/patches.suse/pkey-indicate-old-mkvp-only-if-old-and-current-mkvp-are-different b/patches.suse/pkey-indicate-old-mkvp-only-if-old-and-current-mkvp-are-different
new file mode 100644
index 0000000000..e93f45c122
--- /dev/null
+++ b/patches.suse/pkey-indicate-old-mkvp-only-if-old-and-current-mkvp-are-different
@@ -0,0 +1,32 @@
+From: Ingo Franzki <ifranzki@linux.ibm.com>
+Date: Wed, 20 Feb 2019 14:01:39 +0100
+Subject: pkey: Indicate old mkvp only if old and current mkvp are different
+Git-commit: ebb7c695d3bc7a4986b92edc8d9ef43491be183e
+Patch-mainline: v5.1-rc1
+References: bsc#1137827 LTC#178090
+
+When the CCA master key is set twice with the same master key,
+then the old and the current master key are the same and thus the
+verification patterns are the same, too. The check to report if a
+secure key is currently wrapped by the old master key erroneously
+reports old mkvp in this case.
+
+Reviewed-by: Harald Freudenberger <freude@linux.ibm.com>
+Signed-off-by: Ingo Franzki <ifranzki@linux.ibm.com>
+Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
+Acked-by: Petr Tesarik <ptesarik@suse.com>
+---
+ drivers/s390/crypto/pkey_api.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/s390/crypto/pkey_api.c
++++ b/drivers/s390/crypto/pkey_api.c
+@@ -1046,7 +1046,7 @@ int pkey_verifykey(const struct pkey_sec
+ rc = mkvp_cache_fetch(cardnr, domain, mkvp);
+ if (rc)
+ goto out;
+- if (t->mkvp == mkvp[1]) {
++ if (t->mkvp == mkvp[1] && t->mkvp != mkvp[0]) {
+ DEBUG_DBG("pkey_verifykey secure key has old mkvp\n");
+ if (pattributes)
+ *pattributes |= PKEY_VERIFY_ATTR_OLD_MKVP;
diff --git a/series.conf b/series.conf
index b173e459d2..6677912dd1 100644
--- a/series.conf
+++ b/series.conf
@@ -7598,6 +7598,7 @@
patches.fixes/0001-USB-serial-console-fix-use-after-free-after-failed-s.patch
patches.fixes/0001-usb-renesas_usbhs-Fix-DMAC-sequence-for-receiving-ze.patch
patches.fixes/0001-usb-usbtest-fix-NULL-pointer-dereference.patch
+ patches.drivers/mei-me-add-gemini-lake-devices-id.patch
patches.suse/msft-hv-1507-Drivers-hv-vmbus-Fix-bugs-in-rescind-handling.patch
patches.drivers/media-dvb-i2c-transfers-over-usb-cannot-be-done-from
patches.drivers/media-s5p-cec-add-NACK-detection-support
@@ -19182,6 +19183,7 @@
patches.drm/drm-i915-overlay-Allocate-physical-registers-from-st.patch
patches.drm/0001-drm-amdgpu-fix-error-handling-in-amdgpu_cs_user_fenc.patch
patches.drivers/mei-ignore-not-found-client-in-the-enumeration.patch
+ patches.drivers/mei-bus-need-to-unlink-client-before-freeing.patch
patches.suse/msft-hv-1753-Tools-hv-Fix-a-bug-in-the-key-delete-code.patch
patches.drivers/misc-hmc6352-fix-potential-Spectre-v1.patch
patches.suse/msft-hv-1754-vmbus-don-t-return-values-for-uninitalized-channels.patch
@@ -21166,6 +21168,7 @@
patches.drivers/staging-rtl8188eu-Add-device-code-for-D-Link-DWA-121.patch
patches.drivers/staging-rtl8723bs-Fix-build-error-with-Clang-when-in.patch
patches.suse/msft-hv-1831-Drivers-hv-vmbus-Check-for-ring-when-getting-debug-i.patch
+ patches.drivers/mei-me-add-denverton-innovation-engine-device-IDs.patch
patches.drivers/char-mwave-fix-potential-Spectre-v1-vulnerability.patch
patches.drivers/mmc-sdhci-iproc-handle-mmc_of_parse-errors-during-pr.patch
patches.drivers/mmc-dw_mmc-bluefield-Fix-the-license-information.patch
@@ -21516,6 +21519,7 @@
patches.fixes/crypto-cavium-zip-fix-collision-with-generic-cra_dri.patch
patches.fixes/crypto-crypto4xx-add-missing-of_node_put-after-of_de.patch
patches.arch/s390-jump_label-Use-jdd-constraint-on-gcc9.patch
+ patches.suse/pkey-indicate-old-mkvp-only-if-old-and-current-mkvp-are-different
patches.drivers/clocksource-drivers-sun5i-Fail-gracefully-when-clock.patch
patches.drivers/clocksource-drivers-exynos_mct-Move-one-shot-check-f.patch
patches.drivers/clocksource-drivers-exynos_mct-Clear-timer-interrupt.patch
@@ -22838,6 +22842,7 @@
patches.fixes/crypto-arm64-sha2-ce-correct-digest-for-empty-data-i.patch
patches.fixes/crypto-ghash-fix-unaligned-memory-access-in-ghash_se.patch
patches.fixes/crypto-chacha20poly1305-fix-atomic-sleep-when-using-.patch
+ patches.fixes/crypto-talitos-fix-max-key-size-for-sha384-and-sha51.patch
patches.fixes/lib-scatterlist-Fix-mapping-iterator-when-sg-offset-.patch
patches.fixes/crypto-ccp-Validate-the-the-error-value-used-to-inde.patch
patches.drivers/pwm-stm32-Use-3-cells-of_xlate.patch
@@ -22944,6 +22949,13 @@
patches.drivers/mfd-intel-lpss-Release-IDA-resources.patch
patches.drivers/PCI-Return-error-if-cannot-probe-VF.patch
patches.drivers/PCI-Always-allow-probing-with-driver_override.patch
+ patches.drivers/dmaengine-hsu-Revert-set-HSU_CH_MTSR-to-memory-width.patch
+ patches.drivers/clk-qcom-Fix-Wunused-const-variable.patch
+ patches.drivers/clk-tegra210-fix-PLLU-and-PLLU_OUT1.patch
+ patches.drivers/clk-rockchip-Don-t-yell-about-bad-mmc-phases-when-ge.patch
+ patches.drivers/ALSA-hda-realtek-Fixed-Headphone-Mic-can-t-record-on.patch
+ patches.drivers/ALSA-hda-realtek-apply-ALC891-headset-fixup-to-one-D.patch
+ patches.drivers/ALSA-seq-Break-too-long-mutex-context-in-the-write-l.patch
# powerpc/linux next
patches.arch/powerpc-pseries-dlpar-Fix-a-missing-check-in-dlpar_p.patch
@@ -22986,10 +22998,8 @@
patches.fixes/drivers-base-introduce-kill_device.patch
patches.fixes/libnvdimm-bus-prevent-duplicate-device_unregister-calls.patch
- # git://git.cmpxchg.org/linux-mmots.git
- patches.arch/mm-nvdimm-add-is_ioremap_addr-and-use-that-to-check-.patch
-
# out-of-tree patches
+ patches.arch/mm-nvdimm-add-is_ioremap_addr-and-use-that-to-check-.patch
patches.suse/nvme-multipath-round-robin-I-O-policy.patch
patches.suse/cifs-fix-set-info.patch
patches.fixes/ch-add-missing-mutex_lock-mutex_unlock-in-ch_release.patch