Skip to content

Commit 5d6c413

Browse files
torvaldstorvalds
committed
Merge tag 'tty-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull tty/serial updates from Greg KH: "Here is the big set of tty and serial driver patches for 5.10-rc1. Lots of little things in here, including: - tasklet_setup api conversions - sysrq support for capital letters - vt and vc cleanups and unwinding the mess some more - serial driver updates and minor tweaks - new device ids - rs485 support for some drivers - serial binding documentation updates - lots of small serial driver changes for reported issues All have been in linux-next for a while with no reported issues" * tag 'tty-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (79 commits) serial: mcf: add sysrq capability serial: fsl_lpuart: add sysrq support when using dma fbcon: remove no-op fbcon_set_origin() tty/sysrq: Extend the sysrq_key_table to cover capital letters serial: max310x: rework RX interrupt handling serial: 8250_dw: Fix clk-notifier/port suspend deadlock serial: 8250: Skip uninitialized TTY port baud rate update serial: 8250: Discard RTS/DTS setting from clock update method tty: serial: imx: disable TXDC IRQ in imx_uart_shutdown() to avoid IRQ storm serial: 8250_fsl: Fix TX interrupt handling condition serial: pl011: Fix lockdep splat when handling magic-sysrq interrupt tty: serial: fsl_lpuart: fix lpuart32_poll_get_char tty: serial: lpuart: fix lpuart32_write usage serial: qcom_geni_serial: To correct QUP Version detection logic serial: mvebu-uart: fix unused variable warning vt_ioctl: make VT_RESIZEX behave like VT_RESIZE serial: mvebu-uart: simplify the return expression of mvebu_uart_probe() tty: serial: imx: fix link error with CONFIG_SERIAL_CORE_CONSOLE=n tty: hvc: fix link error with CONFIG_SERIAL_CORE_CONSOLE=n pch_uart: drop double zeroing ...
2 parents e6037a7 + 4be8760 commit 5d6c413

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+1048
-786
lines changed

‎Documentation/admin-guide/sysrq.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ On all
7979

8080
echo t > /proc/sysrq-trigger
8181

82+
The :kbd:`<command key>` is case sensitive.
83+
8284
What are the 'command' keys?
8385
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
8486

‎Documentation/devicetree/bindings/serial/mtk-uart.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ Required properties:
1919
* "mediatek,mt8135-uart" for MT8135 compatible UARTS
2020
* "mediatek,mt8173-uart" for MT8173 compatible UARTS
2121
* "mediatek,mt8183-uart", "mediatek,mt6577-uart" for MT8183 compatible UARTS
22+
* "mediatek,mt8192-uart", "mediatek,mt6577-uart" for MT8192 compatible UARTS
2223
* "mediatek,mt8516-uart" for MT8516 compatible UARTS
2324
* "mediatek,mt6577-uart" for MT6577 and all of the above
2425

‎Documentation/devicetree/bindings/serial/renesas,hscif.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ properties:
4242
- renesas,hscif-r8a774a1 # RZ/G2M
4343
- renesas,hscif-r8a774b1 # RZ/G2N
4444
- renesas,hscif-r8a774c0 # RZ/G2E
45+
- renesas,hscif-r8a774e1 # RZ/G2H
4546
- renesas,hscif-r8a7795 # R-Car H3
4647
- renesas,hscif-r8a7796 # R-Car M3-W
4748
- renesas,hscif-r8a77961 # R-Car M3-W+

‎Documentation/devicetree/bindings/serial/renesas,scif.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ properties:
5151
- renesas,scif-r8a774a1 # RZ/G2M
5252
- renesas,scif-r8a774b1 # RZ/G2N
5353
- renesas,scif-r8a774c0 # RZ/G2E
54+
- renesas,scif-r8a774e1 # RZ/G2H
5455
- renesas,scif-r8a7795 # R-Car H3
5556
- renesas,scif-r8a7796 # R-Car M3-W
5657
- renesas,scif-r8a77961 # R-Car M3-W+

‎Documentation/devicetree/bindings/timer/mediatek,mtk-timer.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ Required properties:
2222

2323
For those SoCs that use SYST
2424
* "mediatek,mt8183-timer" for MT8183 compatible timers (SYST)
25+
* "mediatek,mt8192-timer" for MT8192 compatible timers (SYST)
2526
* "mediatek,mt7629-timer" for MT7629 compatible timers (SYST)
2627
* "mediatek,mt6765-timer" for MT6765 and all above compatible timers (SYST)
2728

‎drivers/accessibility/speakup/main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ static struct notifier_block vt_notifier_block = {
257257

258258
static unsigned char get_attributes(struct vc_data *vc, u16 *pos)
259259
{
260-
pos = screen_pos(vc, pos - (u16 *)vc->vc_origin, 1);
260+
pos = screen_pos(vc, pos - (u16 *)vc->vc_origin, true);
261261
return (scr_readw(pos) & ~vc->vc_hi_font_mask) >> 8;
262262
}
263263

@@ -465,7 +465,7 @@ static u16 get_char(struct vc_data *vc, u16 *pos, u_char *attribs)
465465
u16 w;
466466
u16 c;
467467

468-
pos = screen_pos(vc, pos - (u16 *)vc->vc_origin, 1);
468+
pos = screen_pos(vc, pos - (u16 *)vc->vc_origin, true);
469469
w = scr_readw(pos);
470470
c = w & 0xff;
471471

‎drivers/gpu/drm/drm_fb_helper.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ static void drm_fb_helper_sysrq(int dummy1)
325325

326326
static const struct sysrq_key_op sysrq_drm_fb_helper_restore_op = {
327327
.handler = drm_fb_helper_sysrq,
328-
.help_msg = "force-fb(V)",
328+
.help_msg = "force-fb(v)",
329329
.action_msg = "Restore framebuffer console",
330330
};
331331
#else

‎drivers/tty/hvc/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ config HVC_DCC
8181
bool "ARM JTAG DCC console"
8282
depends on ARM || ARM64
8383
select HVC_DRIVER
84+
select SERIAL_CORE_CONSOLE
8485
help
8586
This console uses the JTAG DCC on ARM to create a console under the HVC
8687
driver. This console is used through a JTAG only on ARM. If you don't have

‎drivers/tty/hvc/hvcs.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1216,13 +1216,6 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
12161216

12171217
tty_wait_until_sent(tty, HVCS_CLOSE_WAIT);
12181218

1219-
/*
1220-
* This line is important because it tells hvcs_open that this
1221-
* device needs to be re-configured the next time hvcs_open is
1222-
* called.
1223-
*/
1224-
tty->driver_data = NULL;
1225-
12261219
free_irq(irq, hvcsd);
12271220
return;
12281221
} else if (hvcsd->port.count < 0) {
@@ -1237,6 +1230,13 @@ static void hvcs_cleanup(struct tty_struct * tty)
12371230
{
12381231
struct hvcs_struct *hvcsd = tty->driver_data;
12391232

1233+
/*
1234+
* This line is important because it tells hvcs_open that this
1235+
* device needs to be re-configured the next time hvcs_open is
1236+
* called.
1237+
*/
1238+
tty->driver_data = NULL;
1239+
12401240
tty_port_put(&hvcsd->port);
12411241
}
12421242

‎drivers/tty/ipwireless/hardware.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1006,9 +1006,9 @@ static int send_pending_packet(struct ipw_hardware *hw, int priority_limit)
10061006
/*
10071007
* Send and receive all queued packets.
10081008
*/
1009-
static void ipwireless_do_tasklet(unsigned long hw_)
1009+
static void ipwireless_do_tasklet(struct tasklet_struct *t)
10101010
{
1011-
struct ipw_hardware *hw = (struct ipw_hardware *) hw_;
1011+
struct ipw_hardware *hw = from_tasklet(hw, t, tasklet);
10121012
unsigned long flags;
10131013

10141014
spin_lock_irqsave(&hw->lock, flags);
@@ -1635,7 +1635,7 @@ struct ipw_hardware *ipwireless_hardware_create(void)
16351635
INIT_LIST_HEAD(&hw->rx_queue);
16361636
INIT_LIST_HEAD(&hw->rx_pool);
16371637
spin_lock_init(&hw->lock);
1638-
tasklet_init(&hw->tasklet, ipwireless_do_tasklet, (unsigned long) hw);
1638+
tasklet_setup(&hw->tasklet, ipwireless_do_tasklet);
16391639
INIT_WORK(&hw->work_rx, ipw_receive_data_work);
16401640
timer_setup(&hw->setup_timer, ipwireless_setup_timer, 0);
16411641

0 commit comments

Comments
 (0)