serial: st-asc: Fix overflow in baudrate calculation

In the current calculation, if the required baud rate is above 262143,
we get an overflow.

This patch uses a 64bits variable to do the maths.
Also, we remove the '+1' to avoid a divide by zero if the input clock
rate is something unexpected.
Indeed, if the input clock rate is zero, it is preferable to be notified,
since the UART won't work anyway.

Signed-off-by: Maxime Coquelin <maxime.coquelin@st.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/st-asc.c b/drivers/tty/serial/st-asc.c
index 4e9f4f29f3ce627959ab0fee83f442aa05a31f0d..8b2d7356611d7042250bef393d8780fb7056995e 100644 (file)
--- a/drivers/tty/serial/st-asc.c
+++ b/drivers/tty/serial/st-asc.c
@@ -527,12 +527,12 @@ static void asc_set_termios(struct uart_port *port, struct ktermios *termios,
                 * ASCBaudRate =   ------------------------
                 *                          inputclock
                 *
-                * However to keep the maths inside 32bits we divide top and
-                * bottom by 64. The +1 is to avoid a divide by zero if the
-                * input clock rate is something unexpected.
+                * To keep maths inside 64bits, we divide inputclock by 16.
                 */
-               u32 counter = (baud * 16384) / ((port->uartclk / 64) + 1);
-               asc_out(port, ASC_BAUDRATE, counter);
+               u64 dividend = (u64)baud * (1 << 16);
+
+               do_div(dividend, port->uartclk / 16);
+               asc_out(port, ASC_BAUDRATE, dividend);
                ctrl_val |= ASC_CTL_BAUDMODE;
        }