linux: update to v4.2.4-openpower1
- Rebased on upstream stable release v4.2.4
- Upstream commit "8c24d6d7b09d usb: xhci: stop everything on the first
call to xhci_stop" means that our patch "xhci: do not halt the
secondary HCD" is no longer required
Signed-off-by: Joel Stanley <joel@jms.id.au>
diff --git a/openpower/linux/linux-0016-fbcon-initialize-blink-interval-before-calling-fb_se.patch b/openpower/linux/linux-0016-fbcon-initialize-blink-interval-before-calling-fb_se.patch
new file mode 100644
index 0000000..27b52e8
--- /dev/null
+++ b/openpower/linux/linux-0016-fbcon-initialize-blink-interval-before-calling-fb_se.patch
@@ -0,0 +1,37 @@
+From fe9b91cd685ce61484091b8f1c36e19b65cda96b Mon Sep 17 00:00:00 2001
+From: Scot Doyle <lkml14@scotdoyle.com>
+Date: Fri, 9 Oct 2015 15:08:10 +0000
+Subject: [PATCH 16/17] fbcon: initialize blink interval before calling
+ fb_set_par
+
+Since commit 27a4c827c34ac4256a190cc9d24607f953c1c459
+ fbcon: use the cursor blink interval provided by vt
+
+a PPC64LE kernel fails to boot when fbcon_add_cursor_timer uses an
+uninitialized ops->cur_blink_jiffies. Prevent by initializing
+in fbcon_init before the call to info->fbops->fb_set_par.
+
+Reported-and-tested-by: Alistair Popple <alistair@popple.id.au>
+Signed-off-by: Scot Doyle <lkml14@scotdoyle.com>
+Cc: <stable@vger.kernel.org> [v4.2]
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Joel Stanley <joel@jms.id.au>
+---
+ drivers/video/console/fbcon.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
+index 1aaf893..92f3949 100644
+--- a/drivers/video/console/fbcon.c
++++ b/drivers/video/console/fbcon.c
+@@ -1093,6 +1093,7 @@ static void fbcon_init(struct vc_data *vc, int init)
+ con_copy_unimap(vc, svc);
+
+ ops = info->fbcon_par;
++ ops->cur_blink_jiffies = msecs_to_jiffies(vc->vc_cur_blink_ms);
+ p->con_rotate = initial_rotation;
+ set_blitting_type(vc, info);
+
+--
+2.5.0
+