linux: Release v4.4.17-openpower1
Upstream 4.4.17 stable release.
Aslo adds a patch from Mamatha for changing the VGA ownership register
value to fix slow BMC SOL. Note that it is unclear as to why this patch
fixes the issue. However, it has been requested that we include it so
here it is.
Signed-off-by: Joel Stanley <joel@jms.id.au>
diff --git a/openpower/configs/barreleye_defconfig b/openpower/configs/barreleye_defconfig
index 7c0bbb8..1da2231 100644
--- a/openpower/configs/barreleye_defconfig
+++ b/openpower/configs/barreleye_defconfig
@@ -42,7 +42,7 @@
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.16"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.17"
BR2_KERNEL_HEADERS_4_4=y
BR2_BINUTILS_VERSION_2_26_X=y
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL)/linux"
diff --git a/openpower/configs/firenze_defconfig b/openpower/configs/firenze_defconfig
index dcf6d70..6b8d0e8 100644
--- a/openpower/configs/firenze_defconfig
+++ b/openpower/configs/firenze_defconfig
@@ -35,7 +35,7 @@
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firenze-firmware-whitelist"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.16"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.17"
BR2_KERNEL_HEADERS_4_4=y
BR2_BINUTILS_VERSION_2_26_X=y
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL)/linux"
diff --git a/openpower/configs/firestone_defconfig b/openpower/configs/firestone_defconfig
index 8a8dbc9..acc6807 100644
--- a/openpower/configs/firestone_defconfig
+++ b/openpower/configs/firestone_defconfig
@@ -42,7 +42,7 @@
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.16"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.17"
BR2_KERNEL_HEADERS_4_4=y
BR2_BINUTILS_VERSION_2_26_X=y
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL)/linux"
diff --git a/openpower/configs/garrison_defconfig b/openpower/configs/garrison_defconfig
index f79f78e..9b98739 100644
--- a/openpower/configs/garrison_defconfig
+++ b/openpower/configs/garrison_defconfig
@@ -42,7 +42,7 @@
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.16"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.17"
BR2_KERNEL_HEADERS_4_4=y
BR2_BINUTILS_VERSION_2_26_X=y
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL)/linux"
diff --git a/openpower/configs/habanero_defconfig b/openpower/configs/habanero_defconfig
index 6da169e..78fe88e 100644
--- a/openpower/configs/habanero_defconfig
+++ b/openpower/configs/habanero_defconfig
@@ -42,7 +42,7 @@
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.16"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.17"
BR2_KERNEL_HEADERS_4_4=y
BR2_BINUTILS_VERSION_2_26_X=y
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL)/linux"
diff --git a/openpower/configs/openpower_mambo_defconfig b/openpower/configs/openpower_mambo_defconfig
index 52de2e4..a129c27 100644
--- a/openpower/configs/openpower_mambo_defconfig
+++ b/openpower/configs/openpower_mambo_defconfig
@@ -31,7 +31,7 @@
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.16"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.17"
BR2_KERNEL_HEADERS_4_4=y
BR2_BINUTILS_VERSION_2_26_X=y
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL)/linux"
diff --git a/openpower/configs/palmetto_defconfig b/openpower/configs/palmetto_defconfig
index 1c7fe2a..c7049d9 100644
--- a/openpower/configs/palmetto_defconfig
+++ b/openpower/configs/palmetto_defconfig
@@ -40,7 +40,7 @@
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.16"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.17"
BR2_KERNEL_HEADERS_4_4=y
BR2_BINUTILS_VERSION_2_26_X=y
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL)/linux"
diff --git a/openpower/linux/0001-xhci-Use-xhci_pci_remove-for-xhci-device-shutdown.patch b/openpower/linux/0001-xhci-Use-xhci_pci_remove-for-xhci-device-shutdown.patch
index ca5c240..4b4fcca 100644
--- a/openpower/linux/0001-xhci-Use-xhci_pci_remove-for-xhci-device-shutdown.patch
+++ b/openpower/linux/0001-xhci-Use-xhci_pci_remove-for-xhci-device-shutdown.patch
@@ -1,7 +1,7 @@
-From 4b30502e3137f771b947da627ac7d14286f57b1c Mon Sep 17 00:00:00 2001
+From a1efb073ccd93965f1a81802e42e188ee4156fc9 Mon Sep 17 00:00:00 2001
From: Thadeu Lima De Souza Cascardo <thadeul@br.ibm.com>
Date: Tue, 25 Mar 2014 10:45:16 -0400
-Subject: [PATCH 01/10] xhci: Use xhci_pci_remove for xhci device shutdown
+Subject: [PATCH 01/11] xhci: Use xhci_pci_remove for xhci device shutdown
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Signed-off-by: Joel Stanley <joel@jms.id.au>
diff --git a/openpower/linux/0002-drivers-drm-ast-Switch-SCU-to-VGA-output-on-POST.patch b/openpower/linux/0002-drivers-drm-ast-Switch-SCU-to-VGA-output-on-POST.patch
index bb42caa..dde51c0 100644
--- a/openpower/linux/0002-drivers-drm-ast-Switch-SCU-to-VGA-output-on-POST.patch
+++ b/openpower/linux/0002-drivers-drm-ast-Switch-SCU-to-VGA-output-on-POST.patch
@@ -1,7 +1,7 @@
-From 1a148c6eb2c728b2063f1d114d06932abcb1d710 Mon Sep 17 00:00:00 2001
+From 575e0185aec226044c9608750eec1b80a4bbac5c Mon Sep 17 00:00:00 2001
From: Jeremy Kerr <jk@ozlabs.org>
Date: Wed, 2 Mar 2016 11:25:47 +0800
-Subject: [PATCH 02/10] drivers/drm/ast: Switch SCU to VGA output on POST
+Subject: [PATCH 02/11] drivers/drm/ast: Switch SCU to VGA output on POST
On AST BMC platforms, the BMC may be using the VGA device for UART
mirroring. In this case, we need to switch the DAC output to
diff --git a/openpower/linux/0003-scsi-ignore-errors-from-scsi_dh_add_device.patch b/openpower/linux/0003-scsi-ignore-errors-from-scsi_dh_add_device.patch
index 19e9e3d..56ff762 100644
--- a/openpower/linux/0003-scsi-ignore-errors-from-scsi_dh_add_device.patch
+++ b/openpower/linux/0003-scsi-ignore-errors-from-scsi_dh_add_device.patch
@@ -1,7 +1,7 @@
-From 69f5346b57b03d0809e45e331afca7cb09ee17f5 Mon Sep 17 00:00:00 2001
+From 797cbcb8807688e465283dcc9551bc0cc02ada53 Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <hare@suse.de>
Date: Tue, 1 Mar 2016 13:57:59 +1100
-Subject: [PATCH 03/10] scsi: ignore errors from scsi_dh_add_device()
+Subject: [PATCH 03/11] scsi: ignore errors from scsi_dh_add_device()
device handler initialisation might fail due to a number of
reasons. But as device_handlers are optional this shouldn't
diff --git a/openpower/linux/0004-net-mlx4_core-Set-UAR-page-size-to-4KB-regardless-of.patch b/openpower/linux/0004-net-mlx4_core-Set-UAR-page-size-to-4KB-regardless-of.patch
index b21736c..5fded8e 100644
--- a/openpower/linux/0004-net-mlx4_core-Set-UAR-page-size-to-4KB-regardless-of.patch
+++ b/openpower/linux/0004-net-mlx4_core-Set-UAR-page-size-to-4KB-regardless-of.patch
@@ -1,7 +1,7 @@
-From 5671fd1faf1b9185ad846db4e134f05a1b109ca3 Mon Sep 17 00:00:00 2001
+From c19d3884d4d7ba338a2becfc67e90fa8fa2e8077 Mon Sep 17 00:00:00 2001
From: Huy Nguyen <huyn@mellanox.com>
Date: Wed, 17 Feb 2016 17:24:26 +0200
-Subject: [PATCH 04/10] net/mlx4_core: Set UAR page size to 4KB regardless of
+Subject: [PATCH 04/11] net/mlx4_core: Set UAR page size to 4KB regardless of
system page size
problem description:
diff --git a/openpower/linux/0005-xhci-do-not-halt-the-secondary-HCD.patch b/openpower/linux/0005-xhci-do-not-halt-the-secondary-HCD.patch
index 2345b11..b6050f6 100644
--- a/openpower/linux/0005-xhci-do-not-halt-the-secondary-HCD.patch
+++ b/openpower/linux/0005-xhci-do-not-halt-the-secondary-HCD.patch
@@ -1,7 +1,7 @@
-From 6bd20334f0036becdbc6e6fb04f2cca0a26862c7 Mon Sep 17 00:00:00 2001
+From 1fa191317a34d5178377c84fd89fb3737566bab1 Mon Sep 17 00:00:00 2001
From: Joel Stanley <joel@jms.id.au>
Date: Tue, 19 Jul 2016 22:43:26 +0930
-Subject: [PATCH 05/10] xhci: do not halt the secondary HCD
+Subject: [PATCH 05/11] xhci: do not halt the secondary HCD
We can't halt the secondary HCD, because it's also the primary HCD,
which will cause problems if we have devices attached to the primary
diff --git a/openpower/linux/0006-net-mlx5-Add-pci-shutdown-callback.patch b/openpower/linux/0006-net-mlx5-Add-pci-shutdown-callback.patch
index 8c900ee..db146ee 100644
--- a/openpower/linux/0006-net-mlx5-Add-pci-shutdown-callback.patch
+++ b/openpower/linux/0006-net-mlx5-Add-pci-shutdown-callback.patch
@@ -1,7 +1,7 @@
-From e5debfe251a2aee37b54f768855aac11593c0e2e Mon Sep 17 00:00:00 2001
+From fc97456e71acaac19280241efd7937796cf88d5d Mon Sep 17 00:00:00 2001
From: Carol L Soto <clsoto@linux.vnet.ibm.com>
Date: Tue, 12 Jul 2016 17:04:07 -0500
-Subject: [PATCH 06/10] net/mlx5: Add pci shutdown callback
+Subject: [PATCH 06/11] net/mlx5: Add pci shutdown callback
Backport of commit 5fc7197d3a256 ("net/mlx5: Add pci shutdown callback")
so we can use for the OpenPower kernel.
diff --git a/openpower/linux/0007-powerpc-boot-Add-OPAL-console-to-epapr-wrappers.patch b/openpower/linux/0007-powerpc-boot-Add-OPAL-console-to-epapr-wrappers.patch
index 4705841..f5d44c5 100644
--- a/openpower/linux/0007-powerpc-boot-Add-OPAL-console-to-epapr-wrappers.patch
+++ b/openpower/linux/0007-powerpc-boot-Add-OPAL-console-to-epapr-wrappers.patch
@@ -1,7 +1,7 @@
-From fb2735117c60dbaa22da54bec8615b2682b66cb9 Mon Sep 17 00:00:00 2001
+From 1b982e3ba5646e5aad2399e72d34b7fde9b36fad Mon Sep 17 00:00:00 2001
From: Oliver O'Halloran <oohall@gmail.com>
Date: Fri, 24 Jun 2016 17:28:43 +1000
-Subject: [PATCH 07/10] powerpc/boot: Add OPAL console to epapr wrappers
+Subject: [PATCH 07/11] powerpc/boot: Add OPAL console to epapr wrappers
This patch adds an OPAL console backend to the powerpc boot wrapper so
that decompression failures inside the wrapper can be reported to the
diff --git a/openpower/linux/0008-tty-hvc-Use-opal-irqchip-interface-if-available.patch b/openpower/linux/0008-tty-hvc-Use-opal-irqchip-interface-if-available.patch
index e4efe68..1336ab5 100644
--- a/openpower/linux/0008-tty-hvc-Use-opal-irqchip-interface-if-available.patch
+++ b/openpower/linux/0008-tty-hvc-Use-opal-irqchip-interface-if-available.patch
@@ -1,7 +1,7 @@
-From 02f5c9908edd9066788c53a0175ba9d3d217248c Mon Sep 17 00:00:00 2001
+From f3d7e34f7b36b2e800a7fc93ecc292cec19319aa Mon Sep 17 00:00:00 2001
From: Samuel Mendoza-Jonas <sam@mendozajonas.com>
Date: Wed, 13 Jul 2016 11:15:42 +1000
-Subject: [PATCH 08/10] tty/hvc: Use opal irqchip interface if available
+Subject: [PATCH 08/11] tty/hvc: Use opal irqchip interface if available
Update the hvc driver to use the OPAL irqchip if made available by the
running firmware. If it is not present, the driver falls back to the
diff --git a/openpower/linux/0009-tty-hvc-Use-IRQF_SHARED-for-OPAL-hvc-consoles.patch b/openpower/linux/0009-tty-hvc-Use-IRQF_SHARED-for-OPAL-hvc-consoles.patch
index dc67554..7312e4e 100644
--- a/openpower/linux/0009-tty-hvc-Use-IRQF_SHARED-for-OPAL-hvc-consoles.patch
+++ b/openpower/linux/0009-tty-hvc-Use-IRQF_SHARED-for-OPAL-hvc-consoles.patch
@@ -1,7 +1,7 @@
-From 42474bf9816cd3f7498e606494050ac30cf803e8 Mon Sep 17 00:00:00 2001
+From 3b4ea30def24c57500e1564c788b263d70308210 Mon Sep 17 00:00:00 2001
From: Samuel Mendoza-Jonas <sam@mendozajonas.com>
Date: Wed, 13 Jul 2016 11:15:41 +1000
-Subject: [PATCH 09/10] tty/hvc: Use IRQF_SHARED for OPAL hvc consoles
+Subject: [PATCH 09/11] tty/hvc: Use IRQF_SHARED for OPAL hvc consoles
Commit 2def86a7200c
("hvc: Convert to using interrupts instead of opal events")
diff --git a/openpower/linux/0010-drivers-drm-ast-Update-VGA-Ownership-register-value.patch b/openpower/linux/0010-drivers-drm-ast-Update-VGA-Ownership-register-value.patch
new file mode 100644
index 0000000..2056550
--- /dev/null
+++ b/openpower/linux/0010-drivers-drm-ast-Update-VGA-Ownership-register-value.patch
@@ -0,0 +1,61 @@
+From 26588c9a9f21292cd78e0aabeb3c0fbba0c8b1b0 Mon Sep 17 00:00:00 2001
+From: Mamatha Inamdar <mamatha4@linux.vnet.ibm.com>
+Date: Tue, 28 Jun 2016 00:31:48 +0530
+Subject: [PATCH 10/11] drivers/drm/ast: Update VGA Ownership register value
+
+Problem Description:
+Right now SCU2C: Control Register values are not set correctly to enable
+VGA mode. SCU2C register value is set to 0x00041080, where bit 18, 17,
+16 and bit 7 are set to 1 which is CRT mode.
+
+Fix:
+To enable VGA mode we have to set all register bit values to default
+values ie VGA mode.
+
+1) bit 18 in SCU2C register is to select the DVO source for display output,
+ by default it is VGA mode but it was set to 1(CRT mode).
+
+ 18 RW Select the DVO source for display output
+ 0: VGA mode (default)
+ 1: Graphics CRT mode
+
+2) bit 17 and 16 in SCU2C register is to select the DAC source for
+ display output, by default it is VGA mode but it was set to 1(CRT mode).
+ 00: VGA mode
+ 01: Grafics CRT mode
+ 1X: pass-through DVO mode
+
+2) second issue is bit 7 in SCU2C register is to Enable 2D CRT Mode
+ function as below and it was set to 1 as CRT mode.
+
+ 7 Enable 2D CRT Mode function
+ 0: VGA mode (default)
+ 1: CRT mode
+
+The new value of SCU2C register is updated with mask value ~0x70080,
+which will enable VGA mode by resetting bits 18,17,16 and 7 in SCU2C
+control register.
+
+Signed-off-by: Mamatha Inamdar <mamatha4@linux.vnet.ibm.com>
+Acked-By: Jeremy Kerr <jk@ozlabs.org>
+Signed-off-by: Joel Stanley <joel@jms.id.au>
+---
+ drivers/gpu/drm/ast/ast_post.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/ast/ast_post.c b/drivers/gpu/drm/ast/ast_post.c
+index 703dba2ba84b..00ebe4fa0381 100644
+--- a/drivers/gpu/drm/ast/ast_post.c
++++ b/drivers/gpu/drm/ast/ast_post.c
+@@ -1681,7 +1681,7 @@ static void ast_init_output_control(struct drm_device *dev)
+ break;
+ default:
+ /* VGA only: enable DAC output */
+- val &= ~0x30000;
++ val &= ~0x70080;
+ break;
+ }
+
+--
+2.8.1
+
diff --git a/openpower/linux/0010-Release-4.4.16-openpower1.patch b/openpower/linux/0011-Release-4.4.17-openpower1.patch
similarity index 70%
rename from openpower/linux/0010-Release-4.4.16-openpower1.patch
rename to openpower/linux/0011-Release-4.4.17-openpower1.patch
index d633d26..d6effe5 100644
--- a/openpower/linux/0010-Release-4.4.16-openpower1.patch
+++ b/openpower/linux/0011-Release-4.4.17-openpower1.patch
@@ -1,7 +1,7 @@
-From e27e36de137244ab337ed6a098d9777e6754d806 Mon Sep 17 00:00:00 2001
+From 8a7cfa5f840ca9174dc2b4b3effb4121ecd4748a Mon Sep 17 00:00:00 2001
From: Joel Stanley <joel@jms.id.au>
Date: Thu, 14 Apr 2016 21:40:26 +0930
-Subject: [PATCH 10/10] Release 4.4.16-openpower1
+Subject: [PATCH 11/11] Release 4.4.17-openpower1
Signed-off-by: Joel Stanley <joel@jms.id.au>
---
@@ -9,13 +9,13 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
-index da7621cadc8e..0207133997ad 100644
+index 76d34f763a41..eaf063f19799 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 4
PATCHLEVEL = 4
- SUBLEVEL = 16
+ SUBLEVEL = 17
-EXTRAVERSION =
+EXTRAVERSION = -openpower1
NAME = Blurry Fish Butt