Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
misc
/
ti-st
/
st_core.c
diff --git
a/kernel/drivers/misc/ti-st/st_core.c
b/kernel/drivers/misc/ti-st/st_core.c
index
c8c6a36
..
6e3af8b
100644
(file)
--- a/
kernel/drivers/misc/ti-st/st_core.c
+++ b/
kernel/drivers/misc/ti-st/st_core.c
@@
-460,6
+460,13
@@
static void st_int_enqueue(struct st_data_s *st_gdata, struct sk_buff *skb)
* - TTY layer when write's finished
* - st_write (in context of the protocol stack)
*/
* - TTY layer when write's finished
* - st_write (in context of the protocol stack)
*/
+static void work_fn_write_wakeup(struct work_struct *work)
+{
+ struct st_data_s *st_gdata = container_of(work, struct st_data_s,
+ work_write_wakeup);
+
+ st_tx_wakeup((void *)st_gdata);
+}
void st_tx_wakeup(struct st_data_s *st_data)
{
struct sk_buff *skb;
void st_tx_wakeup(struct st_data_s *st_data)
{
struct sk_buff *skb;
@@
-812,8
+819,12
@@
static void st_tty_wakeup(struct tty_struct *tty)
/* don't do an wakeup for now */
clear_bit(TTY_DO_WRITE_WAKEUP, &tty->flags);
/* don't do an wakeup for now */
clear_bit(TTY_DO_WRITE_WAKEUP, &tty->flags);
- /* call our internal wakeup */
- st_tx_wakeup((void *)st_gdata);
+ /*
+ * schedule the internal wakeup instead of calling directly to
+ * avoid lockup (port->lock needed in tty->ops->write is
+ * already taken here
+ */
+ schedule_work(&st_gdata->work_write_wakeup);
}
static void st_tty_flush_buffer(struct tty_struct *tty)
}
static void st_tty_flush_buffer(struct tty_struct *tty)
@@
-881,6
+892,9
@@
int st_core_init(struct st_data_s **core_data)
pr_err("unable to un-register ldisc");
return err;
}
pr_err("unable to un-register ldisc");
return err;
}
+
+ INIT_WORK(&st_gdata->work_write_wakeup, work_fn_write_wakeup);
+
*core_data = st_gdata;
return 0;
}
*core_data = st_gdata;
return 0;
}