4.14-stable patches

added patches:
	drm-amd-pp-initialize-result-to-before-or-ing-in-data.patch
	drm-amdgpu-add-another-atpx-quirk-for-topaz.patch
	serial-mvebu-uart-fix-reporting-of-effective-csize-to-userspace.patch

diff --git a/queue-4.14/drm-amd-pp-initialize-result-to-before-or-ing-in-data.patch b/queue-4.14/drm-amd-pp-initialize-result-to-before-or-ing-in-data.patch
new file mode 100644 (file)
index 0000000..141dda0
--- /dev/null
+++ b/queue-4.14/drm-amd-pp-initialize-result-to-before-or-ing-in-data.patch
@@ -0,0 +1,42 @@
+From c4ff91dd40e2253ab6dd028011469c2c694e1e19 Mon Sep 17 00:00:00 2001
+From: Colin Ian King <colin.king@canonical.com>
+Date: Wed, 6 Jun 2018 13:18:31 +0100
+Subject: drm/amd/pp: initialize result to before or'ing in data
+
+From: Colin Ian King <colin.king@canonical.com>
+
+commit c4ff91dd40e2253ab6dd028011469c2c694e1e19 upstream.
+
+The current use of result is or'ing in values and checking for
+a non-zero result, however, result is not initialized to zero
+so it potentially contains garbage to start with. Fix this by
+initializing it to the first return from the call to
+vega10_program_didt_config_registers.
+
+Detected by cppcheck:
+"(error) Uninitialized variable: result"
+
+Fixes: 9b7b8154cdb8 ("drm/amd/powerplay: added didt support for vega10")
+Signed-off-by: Colin Ian King <colin.king@canonical.com>
+Acked-by: Huang Rui <ray.huang@amd.com>
+[Fix the subject as Colin's comment]
+Signed-off-by: Huang Rui <ray.huang@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Cc: stable@vger.kernel.org
+Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c
++++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c
+@@ -1142,7 +1142,7 @@ static int vega10_enable_psm_gc_edc_conf
+       for (count = 0; count < num_se; count++) {
+               data = GRBM_GFX_INDEX__INSTANCE_BROADCAST_WRITES_MASK | GRBM_GFX_INDEX__SH_BROADCAST_WRITES_MASK | ( count << GRBM_GFX_INDEX__SE_INDEX__SHIFT);
+               cgs_write_register(hwmgr->device, reg, data);
+-              result |= vega10_program_didt_config_registers(hwmgr, PSMSEEDCStallPatternConfig_Vega10, VEGA10_CONFIGREG_DIDT);
++              result = vega10_program_didt_config_registers(hwmgr, PSMSEEDCStallPatternConfig_Vega10, VEGA10_CONFIGREG_DIDT);
+               result |= vega10_program_didt_config_registers(hwmgr, PSMSEEDCStallDelayConfig_Vega10, VEGA10_CONFIGREG_DIDT);
+               result |= vega10_program_didt_config_registers(hwmgr, PSMSEEDCCtrlResetConfig_Vega10, VEGA10_CONFIGREG_DIDT);
+               result |= vega10_program_didt_config_registers(hwmgr, PSMSEEDCCtrlConfig_Vega10, VEGA10_CONFIGREG_DIDT);

diff --git a/queue-4.14/drm-amdgpu-add-another-atpx-quirk-for-topaz.patch b/queue-4.14/drm-amdgpu-add-another-atpx-quirk-for-topaz.patch
new file mode 100644 (file)
index 0000000..9655b10
--- /dev/null
+++ b/queue-4.14/drm-amdgpu-add-another-atpx-quirk-for-topaz.patch
@@ -0,0 +1,31 @@
+From b3fc2ab37e27f8d6588a4755382346ba2335a7c7 Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexander.deucher@amd.com>
+Date: Tue, 17 Jul 2018 10:52:29 -0500
+Subject: drm/amdgpu: add another ATPX quirk for TOPAZ
+
+From: Alex Deucher <alexander.deucher@amd.com>
+
+commit b3fc2ab37e27f8d6588a4755382346ba2335a7c7 upstream.
+
+Needs ATPX rather than _PR3.
+
+Bug: https://bugzilla.kernel.org/show_bug.cgi?id=200517
+Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Cc: stable@vger.kernel.org
+Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c
+@@ -569,6 +569,7 @@ static const struct amdgpu_px_quirk amdg
+       { 0x1002, 0x6900, 0x1002, 0x0124, AMDGPU_PX_QUIRK_FORCE_ATPX },
+       { 0x1002, 0x6900, 0x1028, 0x0812, AMDGPU_PX_QUIRK_FORCE_ATPX },
+       { 0x1002, 0x6900, 0x1028, 0x0813, AMDGPU_PX_QUIRK_FORCE_ATPX },
++      { 0x1002, 0x6900, 0x1025, 0x125A, AMDGPU_PX_QUIRK_FORCE_ATPX },
+       { 0x1002, 0x67DF, 0x1028, 0x0774, AMDGPU_PX_QUIRK_FORCE_ATPX },
+       { 0, 0, 0, 0, 0 },
+ };

diff --git a/queue-4.14/serial-mvebu-uart-fix-reporting-of-effective-csize-to-userspace.patch b/queue-4.14/serial-mvebu-uart-fix-reporting-of-effective-csize-to-userspace.patch
new file mode 100644 (file)
index 0000000..9325e40
--- /dev/null
+++ b/queue-4.14/serial-mvebu-uart-fix-reporting-of-effective-csize-to-userspace.patch
@@ -0,0 +1,40 @@
+From e0bf2d4982fe7d9ddaf550dd023803ea286f47fc Mon Sep 17 00:00:00 2001
+From: Jan Kiszka <jan.kiszka@siemens.com>
+Date: Sun, 26 Aug 2018 19:49:32 +0200
+Subject: serial: mvebu-uart: Fix reporting of effective CSIZE to userspace
+
+From: Jan Kiszka <jan.kiszka@siemens.com>
+
+commit e0bf2d4982fe7d9ddaf550dd023803ea286f47fc upstream.
+
+Apparently, this driver (or the hardware) does not support character
+length settings. It's apparently running in 8-bit mode, but it makes
+userspace believe it's in 5-bit mode. That makes tcsetattr with CS8
+incorrectly fail, breaking e.g. getty from busybox, thus the login shell
+on ttyMVx.
+
+Fix by hard-wiring CS8 into c_cflag.
+
+Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
+Fixes: 30530791a7a0 ("serial: mvebu-uart: initial support for Armada-3700 serial port")
+Cc: stable <stable@vger.kernel.org> # 4.6+
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/tty/serial/mvebu-uart.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/drivers/tty/serial/mvebu-uart.c
++++ b/drivers/tty/serial/mvebu-uart.c
+@@ -327,8 +327,10 @@ static void mvebu_uart_set_termios(struc
+       if ((termios->c_cflag & CREAD) == 0)
+               port->ignore_status_mask |= STAT_RX_RDY | STAT_BRK_ERR;
+ 
+-      if (old)
++      if (old) {
+               tty_termios_copy_hw(termios, old);
++              termios->c_cflag |= CS8;
++      }
+ 
+       baud = uart_get_baud_rate(port, termios, old, 0, 460800);
+       uart_update_timeout(port, termios->c_cflag, baud);

diff --git a/queue-4.14/series b/queue-4.14/series
new file mode 100644 (file)
index 0000000..340e4ff
--- /dev/null
+++ b/queue-4.14/series
@@ -0,0 +1,3 @@
+drm-amd-pp-initialize-result-to-before-or-ing-in-data.patch
+drm-amdgpu-add-another-atpx-quirk-for-topaz.patch
+serial-mvebu-uart-fix-reporting-of-effective-csize-to-userspace.patch

diff --git a/queue-4.18/series b/queue-4.18/series
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/queue-4.9/series b/queue-4.9/series
new file mode 100644 (file)
index 0000000..cc2e0b0
--- /dev/null
+++ b/queue-4.9/series
@@ -0,0 +1,2 @@
+serial-mvebu-uart-fix-reporting-of-effective-csize-to-userspace.patch
+time-introduce-jiffies64_to_nsecs.patch