Commit 032a725c authored by Tudor Ambarus's avatar Tudor Ambarus Committed by Greg Kroah-Hartman
Browse files

tty: serial: samsung: use u32 for register interactions 



All registers of the IP have 32 bits. Use u32 variables when reading
or writing from/to the registers. The purpose of those variables becomes
clearer.

Reviewed-by: default avatarSam Protsenko <semen.protsenko@linaro.org>
Signed-off-by: default avatarTudor Ambarus <tudor.ambarus@linaro.org>
Link: https://lore.kernel.org/r/20240119104526.1221243-9-tudor.ambarus@linaro.org


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

drivers/tty/serial/samsung_tty.c

+39 −40
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ static void wr_reg(const struct uart_port *port, u32 reg, u32 val) 
/* Byte-order aware bit setting/clearing functions. */



static inline void s3c24xx_set_bit(const struct uart_port *port, int idx,

				   unsigned int reg)

				   u32 reg)

{

	unsigned long flags;

	u32 val;
@@ -212,7 +212,7 @@ static inline void s3c24xx_set_bit(const struct uart_port *port, int idx, 
}



static inline void s3c24xx_clear_bit(const struct uart_port *port, int idx,

				     unsigned int reg)

				     u32 reg)

{

	unsigned long flags;

	u32 val;
@@ -245,8 +245,8 @@ static void s3c24xx_serial_rx_enable(struct uart_port *port) 
{

	struct s3c24xx_uart_port *ourport = to_ourport(port);

	unsigned long flags;

	unsigned int ucon, ufcon;

	int count = 10000;

	u32 ucon, ufcon;



	uart_port_lock_irqsave(port, &flags);
@@ -269,7 +269,7 @@ static void s3c24xx_serial_rx_disable(struct uart_port *port) 
{

	struct s3c24xx_uart_port *ourport = to_ourport(port);

	unsigned long flags;

	unsigned int ucon;

	u32 ucon;



	uart_port_lock_irqsave(port, &flags);
@@ -591,7 +591,7 @@ static inline const struct s3c2410_uartcfg 
}



static int s3c24xx_serial_rx_fifocnt(const struct s3c24xx_uart_port *ourport,

				     unsigned long ufstat)

				     u32 ufstat)

{

	const struct s3c24xx_uart_info *info = ourport->info;
@@ -663,7 +663,7 @@ static void s3c64xx_start_rx_dma(struct s3c24xx_uart_port *ourport) 
static void enable_rx_dma(struct s3c24xx_uart_port *ourport)

{

	struct uart_port *port = &ourport->port;

	unsigned int ucon;

	u32 ucon;



	/* set Rx mode to DMA mode */

	ucon = rd_regl(port, S3C2410_UCON);
@@ -686,7 +686,7 @@ static void enable_rx_dma(struct s3c24xx_uart_port *ourport) 
static void enable_rx_pio(struct s3c24xx_uart_port *ourport)

{

	struct uart_port *port = &ourport->port;

	unsigned int ucon;

	u32 ucon;



	/* set Rx mode to DMA mode */

	ucon = rd_regl(port, S3C2410_UCON);
@@ -711,13 +711,14 @@ static void s3c24xx_serial_rx_drain_fifo(struct s3c24xx_uart_port *ourport); 


static irqreturn_t s3c24xx_serial_rx_chars_dma(void *dev_id)

{

	unsigned int utrstat, received;

	struct s3c24xx_uart_port *ourport = dev_id;

	struct uart_port *port = &ourport->port;

	struct s3c24xx_uart_dma *dma = ourport->dma;

	struct tty_struct *tty = tty_port_tty_get(&ourport->port.state->port);

	struct tty_port *t = &port->state->port;

	struct dma_tx_state state;

	unsigned int received;

	u32 utrstat;



	utrstat = rd_regl(port, S3C2410_UTRSTAT);

	rd_regl(port, S3C2410_UFSTAT);
@@ -759,9 +760,9 @@ static irqreturn_t s3c24xx_serial_rx_chars_dma(void *dev_id) 
static void s3c24xx_serial_rx_drain_fifo(struct s3c24xx_uart_port *ourport)

{

	struct uart_port *port = &ourport->port;

	unsigned int ufcon, ufstat, uerstat;

	unsigned int fifocnt = 0;

	int max_count = port->fifosize;

	u32 ufcon, ufstat, uerstat;

	u8 ch, flag;



	while (max_count-- > 0) {
@@ -945,7 +946,7 @@ static irqreturn_t s3c64xx_serial_handle_irq(int irq, void *id) 
{

	const struct s3c24xx_uart_port *ourport = id;

	const struct uart_port *port = &ourport->port;

	unsigned int pend = rd_regl(port, S3C64XX_UINTP);

	u32 pend = rd_regl(port, S3C64XX_UINTP);

	irqreturn_t ret = IRQ_HANDLED;



	if (pend & S3C64XX_UINTM_RXD_MSK) {
@@ -964,7 +965,7 @@ static irqreturn_t apple_serial_handle_irq(int irq, void *id) 
{

	const struct s3c24xx_uart_port *ourport = id;

	const struct uart_port *port = &ourport->port;

	unsigned int pend = rd_regl(port, S3C2410_UTRSTAT);

	u32 pend = rd_regl(port, S3C2410_UTRSTAT);

	irqreturn_t ret = IRQ_NONE;



	if (pend & (APPLE_S5L_UTRSTAT_RXTHRESH | APPLE_S5L_UTRSTAT_RXTO)) {
@@ -983,8 +984,8 @@ static irqreturn_t apple_serial_handle_irq(int irq, void *id) 
static unsigned int s3c24xx_serial_tx_empty(struct uart_port *port)

{

	const struct s3c24xx_uart_info *info = s3c24xx_port_to_info(port);

	unsigned long ufstat = rd_regl(port, S3C2410_UFSTAT);

	unsigned long ufcon = rd_regl(port, S3C2410_UFCON);

	u32 ufstat = rd_regl(port, S3C2410_UFSTAT);

	u32 ufcon = rd_regl(port, S3C2410_UFCON);



	if (ufcon & S3C2410_UFCON_FIFOMODE) {

		if ((ufstat & info->tx_fifomask) != 0 ||
@@ -999,7 +1000,7 @@ static unsigned int s3c24xx_serial_tx_empty(struct uart_port *port) 
/* no modem control lines */

static unsigned int s3c24xx_serial_get_mctrl(struct uart_port *port)

{

	unsigned int umstat = rd_reg(port, S3C2410_UMSTAT);

	u32 umstat = rd_reg(port, S3C2410_UMSTAT);



	if (umstat & S3C2410_UMSTAT_CTS)

		return TIOCM_CAR | TIOCM_DSR | TIOCM_CTS;
@@ -1009,8 +1010,8 @@ static unsigned int s3c24xx_serial_get_mctrl(struct uart_port *port) 


static void s3c24xx_serial_set_mctrl(struct uart_port *port, unsigned int mctrl)

{

	unsigned int umcon = rd_regl(port, S3C2410_UMCON);

	unsigned int ucon = rd_regl(port, S3C2410_UCON);

	u32 umcon = rd_regl(port, S3C2410_UMCON);

	u32 ucon = rd_regl(port, S3C2410_UCON);



	if (mctrl & TIOCM_RTS)

		umcon |= S3C2410_UMCOM_RTS_LOW;
@@ -1030,7 +1031,7 @@ static void s3c24xx_serial_set_mctrl(struct uart_port *port, unsigned int mctrl) 
static void s3c24xx_serial_break_ctl(struct uart_port *port, int break_state)

{

	unsigned long flags;

	unsigned int ucon;

	u32 ucon;



	uart_port_lock_irqsave(port, &flags);
@@ -1188,7 +1189,7 @@ static void apple_s5l_serial_shutdown(struct uart_port *port) 
{

	struct s3c24xx_uart_port *ourport = to_ourport(port);



	unsigned int ucon;

	u32 ucon;



	ucon = rd_regl(port, S3C2410_UCON);

	ucon &= ~(APPLE_S5L_UCON_TXTHRESH_ENA_MSK |
@@ -1214,7 +1215,7 @@ static int s3c64xx_serial_startup(struct uart_port *port) 
{

	struct s3c24xx_uart_port *ourport = to_ourport(port);

	unsigned long flags;

	unsigned int ufcon;

	u32 ufcon;

	int ret;



	wr_regl(port, S3C64XX_UINTM, 0xf);
@@ -1259,7 +1260,7 @@ static int apple_s5l_serial_startup(struct uart_port *port) 
{

	struct s3c24xx_uart_port *ourport = to_ourport(port);

	unsigned long flags;

	unsigned int ufcon;

	u32 ufcon;

	int ret;



	wr_regl(port, S3C2410_UTRSTAT, APPLE_S5L_UTRSTAT_ALL_FLAGS);
@@ -1344,7 +1345,7 @@ static void s3c24xx_serial_pm(struct uart_port *port, unsigned int level, 
static inline int s3c24xx_serial_getsource(struct uart_port *port)

{

	const struct s3c24xx_uart_info *info = s3c24xx_port_to_info(port);

	unsigned int ucon;

	u32 ucon;



	if (info->num_clks == 1)

		return 0;
@@ -1358,7 +1359,7 @@ static void s3c24xx_serial_setsource(struct uart_port *port, 
			unsigned int clk_sel)

{

	const struct s3c24xx_uart_info *info = s3c24xx_port_to_info(port);

	unsigned int ucon;

	u32 ucon;



	if (info->num_clks == 1)

		return;
@@ -1475,9 +1476,8 @@ static void s3c24xx_serial_set_termios(struct uart_port *port, 
	struct clk *clk = ERR_PTR(-EINVAL);

	unsigned long flags;

	unsigned int baud, quot, clk_sel = 0;

	unsigned int ulcon;

	unsigned int umcon;

	unsigned int udivslot = 0;

	u32 ulcon, umcon;



	/*

	 * We don't support modem control lines.
@@ -1759,7 +1759,7 @@ static void s3c24xx_serial_resetport(struct uart_port *port, 
				     const struct s3c2410_uartcfg *cfg)

{

	const struct s3c24xx_uart_info *info = s3c24xx_port_to_info(port);

	unsigned long ucon = rd_regl(port, S3C2410_UCON);

	u32 ucon = rd_regl(port, S3C2410_UCON);



	ucon &= (info->clksel_mask | info->ucon_mask);

	wr_regl(port, S3C2410_UCON, ucon | cfg->ucon);
@@ -1905,7 +1905,7 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport, 
		wr_regl(port, S3C64XX_UINTSP, 0xf);

		break;

	case TYPE_APPLE_S5L: {

		unsigned int ucon;

		u32 ucon;



		ucon = rd_regl(port, S3C2410_UCON);

		ucon &= ~(APPLE_S5L_UCON_TXTHRESH_ENA_MSK |
@@ -2109,7 +2109,7 @@ static int s3c24xx_serial_resume_noirq(struct device *dev) 
		/* restore IRQ mask */

		switch (ourport->info->type) {

		case TYPE_S3C6400: {

			unsigned int uintm = 0xf;

			u32 uintm = 0xf;



			if (ourport->tx_enabled)

				uintm &= ~S3C64XX_UINTM_TXD_MSK;
@@ -2125,7 +2125,7 @@ static int s3c24xx_serial_resume_noirq(struct device *dev) 
			break;

		}

		case TYPE_APPLE_S5L: {

			unsigned int ucon;

			u32 ucon;

			int ret;



			ret = clk_prepare_enable(ourport->clk);
@@ -2187,10 +2187,10 @@ static const struct dev_pm_ops s3c24xx_serial_pm_ops = { 
static struct uart_port *cons_uart;



static int

s3c24xx_serial_console_txrdy(struct uart_port *port, unsigned int ufcon)

s3c24xx_serial_console_txrdy(struct uart_port *port, u32 ufcon)

{

	const struct s3c24xx_uart_info *info = s3c24xx_port_to_info(port);

	unsigned long ufstat, utrstat;

	u32 ufstat, utrstat;



	if (ufcon & S3C2410_UFCON_FIFOMODE) {

		/* fifo mode - check amount of data in fifo registers... */
@@ -2206,7 +2206,7 @@ s3c24xx_serial_console_txrdy(struct uart_port *port, unsigned int ufcon) 
}



static bool

s3c24xx_port_configured(unsigned int ucon)

s3c24xx_port_configured(u32 ucon)

{

	/* consider the serial port configured if the tx/rx mode set */

	return (ucon & 0xf) != 0;
@@ -2221,7 +2221,7 @@ s3c24xx_port_configured(unsigned int ucon) 
static int s3c24xx_serial_get_poll_char(struct uart_port *port)

{

	const struct s3c24xx_uart_port *ourport = to_ourport(port);

	unsigned int ufstat;

	u32 ufstat;



	ufstat = rd_regl(port, S3C2410_UFSTAT);

	if (s3c24xx_serial_rx_fifocnt(ourport, ufstat) == 0)
@@ -2233,8 +2233,8 @@ static int s3c24xx_serial_get_poll_char(struct uart_port *port) 
static void s3c24xx_serial_put_poll_char(struct uart_port *port,

		unsigned char c)

{

	unsigned int ufcon = rd_regl(port, S3C2410_UFCON);

	unsigned int ucon = rd_regl(port, S3C2410_UCON);

	u32 ufcon = rd_regl(port, S3C2410_UFCON);

	u32 ucon = rd_regl(port, S3C2410_UCON);



	/* not possible to xmit on unconfigured port */

	if (!s3c24xx_port_configured(ucon))
@@ -2250,7 +2250,7 @@ static void s3c24xx_serial_put_poll_char(struct uart_port *port, 
static void

s3c24xx_serial_console_putchar(struct uart_port *port, unsigned char ch)

{

	unsigned int ufcon = rd_regl(port, S3C2410_UFCON);

	u32 ufcon = rd_regl(port, S3C2410_UFCON);



	while (!s3c24xx_serial_console_txrdy(port, ufcon))

		cpu_relax();
@@ -2261,7 +2261,7 @@ static void 
s3c24xx_serial_console_write(struct console *co, const char *s,

			     unsigned int count)

{

	unsigned int ucon = rd_regl(cons_uart, S3C2410_UCON);

	u32 ucon = rd_regl(cons_uart, S3C2410_UCON);

	unsigned long flags;

	bool locked = true;
@@ -2288,11 +2288,9 @@ s3c24xx_serial_get_options(struct uart_port *port, int *baud, 
			   int *parity, int *bits)

{

	struct clk *clk;

	unsigned int ulcon;

	unsigned int ucon;

	unsigned int ubrdiv;

	unsigned long rate;

	unsigned int clk_sel;

	u32 ulcon, ucon, ubrdiv;

	char clk_name[MAX_CLK_NAME_LENGTH];



	ulcon  = rd_regl(port, S3C2410_ULCON);
@@ -2742,7 +2740,8 @@ static int samsung_early_read(struct console *con, char *s, unsigned int n) 
{

	struct earlycon_device *dev = con->data;

	const struct samsung_early_console_data *data = dev->port.private_data;

	int ch, ufstat, num_read = 0;

	int num_read = 0;

	u32 ch, ufstat;



	while (num_read < n) {

		ufstat = rd_regl(&dev->port, S3C2410_UFSTAT);