From: Scot Doyle <lkml14@scotdoyle.com>
To: Tomi Valkeinen <tomi.valkeinen@ti.com>,
Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
Cc: David Daney <david.daney@cavium.com>,
Ming Lei <ming.lei@canonical.com>,
Dann Frazier <dann.frazier@canonical.com>,
Jeremy Kerr <jk@ozlabs.org>,
Peter Hurley <peter@hurleysoftware.com>,
Pavel Machek <pavel@ucw.cz>, Jonathan Liu <net147@gmail.com>,
Alistair Popple <alistair@popple.id.au>,
Jean-Philippe Brucker <jean-philippe.brucker@arm.com>,
"Chintakuntla, Radha" <Radha.Chintakuntla@caviumnetworks.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Jiri Slaby <jslaby@suse.com>, David Airlie <airlied@linux.ie>,
ddaney.cavm@gmail.com, Scot Doyle <lkml14@scotdoyle.com>,
dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org,
linux-kernel@vger.kernel.org, stable@vger.kernel.org
Subject: [PATCH] fbcon: warn on invalid cursor blink intervals
Date: Thu, 19 May 2016 17:31:26 -0500 (CDT) [thread overview]
Message-ID: <alpine.DEB.2.10.1605191726030.15478@laptop> (raw)
In-Reply-To: <alpine.DEB.2.10.1605191708400.15396@laptop>
Two systems are locking on boot [1] because ops->cur_blink_jiffies
is set to zero from vc->vc_cur_blink_ms.
Ignore such invalid intervals and log a warning.
[1] https://bugs.launchpad.net/bugs/1574814
Suggested-by: David Daney <david.daney@cavium.com>
Signed-off-by: Scot Doyle <lkml14@scotdoyle.com>
Cc: <stable@vger.kernel.org> [v4.2]
---
drivers/video/console/fbcon.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 6e92917..fad5b89 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -1095,7 +1095,13 @@ 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);
+
+ if (vc->vc_cur_blink_ms >= 50)
+ ops->cur_blink_jiffies =
+ msecs_to_jiffies(vc->vc_cur_blink_ms);
+ else
+ WARN_ONCE(1, "blink interval < 50 ms");
+
p->con_rotate = initial_rotation;
set_blitting_type(vc, info);
@@ -1309,7 +1315,11 @@ static void fbcon_cursor(struct vc_data *vc, int mode)
int y;
int c = scr_readw((u16 *) vc->vc_pos);
- ops->cur_blink_jiffies = msecs_to_jiffies(vc->vc_cur_blink_ms);
+ if (vc->vc_cur_blink_ms >= 50)
+ ops->cur_blink_jiffies =
+ msecs_to_jiffies(vc->vc_cur_blink_ms);
+ else
+ WARN_ONCE(1, "blink interval < 50 ms");
if (fbcon_is_inactive(vc, info) || vc->vc_deccm != 1)
return;
--
2.1.4
next prev parent reply other threads:[~2016-05-19 22:31 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-17 18:41 [PATCH] tty: vt: Fix soft lockup in fbcon cursor blink timer David Daney
2016-05-17 20:49 ` Pavel Machek
2016-05-18 0:42 ` Ming Lei
2016-05-18 20:24 ` Scot Doyle
2016-05-18 20:38 ` David Daney
2016-05-19 4:21 ` [PATCH] fbcon: use default if cursor blink interval is not valid Scot Doyle
2016-05-19 7:25 ` Jeremy Kerr
2016-05-19 8:29 ` Ming Lei
2016-05-19 9:01 ` Pavel Machek
2016-05-19 14:22 ` Scot Doyle
2016-05-19 15:31 ` Ming Lei
2016-05-19 15:59 ` David Daney
2016-05-19 22:25 ` Scot Doyle
2016-05-19 22:31 ` Scot Doyle [this message]
2016-05-19 22:50 ` [PATCH] fbcon: warn on invalid cursor blink intervals David Daney
2016-05-20 1:21 ` Jeremy Kerr
2016-05-20 2:17 ` Ming Lei
2016-05-20 2:26 ` Jeremy Kerr
2016-05-20 2:48 ` Ming Lei
2016-05-20 5:04 ` Jeremy Kerr
2016-05-20 16:27 ` Scot Doyle
2016-05-24 1:19 ` Scot Doyle
2016-05-28 11:48 ` Henrique de Moraes Holschuh
2016-06-12 5:05 ` Chintakuntla, Radha
2016-05-28 11:45 ` Henrique de Moraes Holschuh
2016-05-19 0:27 ` [PATCH] tty: vt: Fix soft lockup in fbcon cursor blink timer Ming Lei
2016-05-19 7:08 ` Pavel Machek
2016-05-19 22:35 ` Scot Doyle
2016-05-28 11:44 ` Henrique de Moraes Holschuh
2016-06-14 16:22 ` Ping: " David Daney
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.DEB.2.10.1605191726030.15478@laptop \
--to=lkml14@scotdoyle.com \
--cc=Radha.Chintakuntla@caviumnetworks.com \
--cc=airlied@linux.ie \
--cc=alistair@popple.id.au \
--cc=dann.frazier@canonical.com \
--cc=david.daney@cavium.com \
--cc=ddaney.cavm@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=gregkh@linuxfoundation.org \
--cc=jean-philippe.brucker@arm.com \
--cc=jk@ozlabs.org \
--cc=jslaby@suse.com \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ming.lei@canonical.com \
--cc=net147@gmail.com \
--cc=pavel@ucw.cz \
--cc=peter@hurleysoftware.com \
--cc=plagnioj@jcrosoft.com \
--cc=stable@vger.kernel.org \
--cc=tomi.valkeinen@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).