GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-08 07:38:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

tty: n_gsm: Fix waking up upper tty layer when room available

Browse source 
Warn the upper layer when n_gms is ready to receive data
again. Without this the associated virtual tty remains blocked
indefinitely.

Fixes: e1eaea46bb ("tty: n_gsm line discipline")
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
Link: https://lore.kernel.org/r/20200512115323.1447922-4-gregory.clement@bootlin.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Gregory CLEMENT 2020-05-12 13:53:23 +02:00 • committed by Greg Kroah-Hartman
parent 84d6f81c1f
commit 01dbb362f0
1 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
drivers/tty/n_gsm.c
View file

@ -663,7 +663,7 @@ static struct gsm_msg *gsm_data_alloc(struct gsm_mux *gsm, u8 addr, int len,
* FIXME: lock against link layer control transmissions * FIXME: lock against link layer control transmissions
*/ */
static void gsm_data_kick(struct gsm_mux *gsm) static void gsm_data_kick(struct gsm_mux *gsm, struct gsm_dlci *dlci)
{ {
struct gsm_msg *msg, *nmsg; struct gsm_msg *msg, *nmsg;
int len; int len;
@ -695,6 +695,24 @@ static void gsm_data_kick(struct gsm_mux *gsm)
list_del(&msg->list); list_del(&msg->list);
kfree(msg); kfree(msg);
if (dlci) {
tty_port_tty_wakeup(&dlci->port);
} else {
int i = 0;
for (i = 0; i < NUM_DLCI; i++) {
struct gsm_dlci *dlci;
dlci = gsm->dlci[i];
if (dlci == NULL) {
i++;
continue;
}
tty_port_tty_wakeup(&dlci->port);
}
}
} }
} }
@ -746,7 +764,7 @@ static void __gsm_data_queue(struct gsm_dlci *dlci, struct gsm_msg *msg)
/* Add to the actual output queue */ /* Add to the actual output queue */
list_add_tail(&msg->list, &gsm->tx_list); list_add_tail(&msg->list, &gsm->tx_list);
gsm->tx_bytes += msg->len; gsm->tx_bytes += msg->len;
gsm_data_kick(gsm); gsm_data_kick(gsm, dlci);
} }
/** /**
@ -1207,7 +1225,7 @@ static void gsm_control_message(struct gsm_mux *gsm, unsigned int command,
gsm_control_reply(gsm, CMD_FCON, NULL, 0); gsm_control_reply(gsm, CMD_FCON, NULL, 0);
/* Kick the link in case it is idling */ /* Kick the link in case it is idling */
spin_lock_irqsave(&gsm->tx_lock, flags); spin_lock_irqsave(&gsm->tx_lock, flags);
gsm_data_kick(gsm); gsm_data_kick(gsm, NULL);
spin_unlock_irqrestore(&gsm->tx_lock, flags); spin_unlock_irqrestore(&gsm->tx_lock, flags);
break; break;
case CMD_FCOFF: case CMD_FCOFF:
@ -2529,7 +2547,7 @@ static void gsmld_write_wakeup(struct tty_struct *tty)
/* Queue poll */ /* Queue poll */
clear_bit(TTY_DO_WRITE_WAKEUP, &tty->flags); clear_bit(TTY_DO_WRITE_WAKEUP, &tty->flags);
spin_lock_irqsave(&gsm->tx_lock, flags); spin_lock_irqsave(&gsm->tx_lock, flags);
gsm_data_kick(gsm); gsm_data_kick(gsm, NULL);
if (gsm->tx_bytes < TX_THRESH_LO) { if (gsm->tx_bytes < TX_THRESH_LO) {
gsm_dlci_data_sweep(gsm); gsm_dlci_data_sweep(gsm);
} }