Commit bbd3cab9 authored by Johan Hovold's avatar Johan Hovold Committed by Wen Zhiwei
Browse files

serial: qcom-geni: fix polled console initialisation 

stable inclusion
from stable-v6.6.58
commit 90e3f819e6aacfcf5b297d4769744f42b5a749c8
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IB3BSC

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=90e3f819e6aacfcf5b297d4769744f42b5a749c8



--------------------------------

commit 4bef7c6f299910f19876ad8e7f5897514855f1d2 upstream.

The polled console (KGDB/KDB) implementation must not call port setup
unconditionally as the port may already be in use by the console or a
getty.

Only make sure that the receiver is enabled, but do not enable any
device interrupts.

Fixes: d8851a96 ("tty: serial: qcom-geni-serial: Add a poll_init() function")
Cc: stable@vger.kernel.org	# 6.4
Cc: Douglas Anderson <dianders@chromium.org>
Signed-off-by: default avatarJohan Hovold <johan+linaro@kernel.org>
Reviewed-by: default avatarDouglas Anderson <dianders@chromium.org>
Link: https://lore.kernel.org/r/20241009145110.16847-2-johan+linaro@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent a4b8796d

drivers/tty/serial/qcom_geni_serial.c

+20 −1
Original line number Diff line number Diff line
@@ -144,6 +144,8 @@ static const struct uart_ops qcom_geni_uart_pops; 
static struct uart_driver qcom_geni_console_driver;

static struct uart_driver qcom_geni_uart_driver;



static int qcom_geni_serial_port_setup(struct uart_port *uport);



static inline struct qcom_geni_serial_port *to_dev_port(struct uart_port *uport)

{

	return container_of(uport, struct qcom_geni_serial_port, uport);
@@ -385,6 +387,23 @@ static void qcom_geni_serial_poll_put_char(struct uart_port *uport, 
	writel(M_TX_FIFO_WATERMARK_EN, uport->membase + SE_GENI_M_IRQ_CLEAR);

	qcom_geni_serial_poll_tx_done(uport);

}



static int qcom_geni_serial_poll_init(struct uart_port *uport)

{

	struct qcom_geni_serial_port *port = to_dev_port(uport);

	int ret;



	if (!port->setup) {

		ret = qcom_geni_serial_port_setup(uport);

		if (ret)

			return ret;

	}



	if (!qcom_geni_serial_secondary_active(uport))

		geni_se_setup_s_cmd(&port->se, UART_START_READ, 0);



	return 0;

}

#endif



#ifdef CONFIG_SERIAL_QCOM_GENI_CONSOLE
@@ -1544,7 +1563,7 @@ static const struct uart_ops qcom_geni_console_pops = { 
#ifdef CONFIG_CONSOLE_POLL

	.poll_get_char	= qcom_geni_serial_get_char,

	.poll_put_char	= qcom_geni_serial_poll_put_char,

	.poll_init = qcom_geni_serial_port_setup,

	.poll_init = qcom_geni_serial_poll_init,

#endif

	.pm = qcom_geni_serial_pm,

};