Commit ae50bb27 authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by Greg Kroah-Hartman
Browse files

serial: take termios_rwsem for ->rs485_config() & pass termios as param 



To be able to alter ADDRB within ->rs485_config(), take termios_rwsem
before calling ->rs485_config() and pass termios.

Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/r/20220624204210.11112-5-ilpo.jarvinen@linux.intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 79b3e69f

drivers/tty/serial/8250/8250.h

+2 −1
Original line number Diff line number Diff line
@@ -203,7 +203,8 @@ void serial8250_rpm_put(struct uart_8250_port *p); 
void serial8250_rpm_get_tx(struct uart_8250_port *p);

void serial8250_rpm_put_tx(struct uart_8250_port *p);



int serial8250_em485_config(struct uart_port *port, struct serial_rs485 *rs485);

int serial8250_em485_config(struct uart_port *port, struct ktermios *termios,

			    struct serial_rs485 *rs485);

void serial8250_em485_start_tx(struct uart_8250_port *p);

void serial8250_em485_stop_tx(struct uart_8250_port *p);

void serial8250_em485_destroy(struct uart_8250_port *p);

drivers/tty/serial/8250/8250_dwlib.c

+2 −1
Original line number Diff line number Diff line
@@ -85,7 +85,8 @@ void dw8250_do_set_termios(struct uart_port *p, struct ktermios *termios, struct 
}

EXPORT_SYMBOL_GPL(dw8250_do_set_termios);



static int dw8250_rs485_config(struct uart_port *p, struct serial_rs485 *rs485)

static int dw8250_rs485_config(struct uart_port *p, struct ktermios *termios,

			       struct serial_rs485 *rs485)

{

	u32 tcr;

drivers/tty/serial/8250/8250_exar.c

+5 −4
Original line number Diff line number Diff line
@@ -112,7 +112,8 @@ 
struct exar8250;



struct exar8250_platform {

	int (*rs485_config)(struct uart_port *, struct serial_rs485 *);

	int (*rs485_config)(struct uart_port *port, struct ktermios *termios,

			    struct serial_rs485 *rs485);

	const struct serial_rs485 *rs485_supported;

	int (*register_gpio)(struct pci_dev *, struct uart_8250_port *);

	void (*unregister_gpio)(struct uart_8250_port *);
@@ -409,7 +410,7 @@ static void xr17v35x_unregister_gpio(struct uart_8250_port *port) 
	port->port.private_data = NULL;

}



static int generic_rs485_config(struct uart_port *port,

static int generic_rs485_config(struct uart_port *port, struct ktermios *termios,

				struct serial_rs485 *rs485)

{

	bool is_rs485 = !!(rs485->flags & SER_RS485_ENABLED);
@@ -441,7 +442,7 @@ static const struct exar8250_platform exar8250_default_platform = { 
	.rs485_supported = &generic_rs485_supported,

};



static int iot2040_rs485_config(struct uart_port *port,

static int iot2040_rs485_config(struct uart_port *port, struct ktermios *termios,

				struct serial_rs485 *rs485)

{

	bool is_rs485 = !!(rs485->flags & SER_RS485_ENABLED);
@@ -471,7 +472,7 @@ static int iot2040_rs485_config(struct uart_port *port, 
	value |= mode;

	writeb(value, p + UART_EXAR_MPIOLVL_7_0);



	return generic_rs485_config(port, rs485);

	return generic_rs485_config(port, termios, rs485);

}



static const struct serial_rs485 iot2040_rs485_supported = {

drivers/tty/serial/8250/8250_fintek.c

+1 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ static int fintek_8250_get_ldn_range(struct fintek_8250 *pdata, int *min, 
	return -ENODEV;

}



static int fintek_8250_rs485_config(struct uart_port *port,

static int fintek_8250_rs485_config(struct uart_port *port, struct ktermios *termios,

			      struct serial_rs485 *rs485)

{

	uint8_t config = 0;

drivers/tty/serial/8250/8250_lpc18xx.c

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ struct lpc18xx_uart_data { 
	int line;

};



static int lpc18xx_rs485_config(struct uart_port *port,

static int lpc18xx_rs485_config(struct uart_port *port, struct ktermios *termios,

				struct serial_rs485 *rs485)

{

	struct uart_8250_port *up = up_to_u8250p(port);