Patch "USB: pl2303: fix baud-rate divisor calculations" has been added to the 4.2-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
USB: pl2303: fix baud-rate divisor calculations
to the 4.2-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
usb-pl2303-fix-baud-rate-divisor-calculations.patch
and it can be found in the queue-4.2 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
49bda21266fdf195142e8b5dea057f09e96ada9fMon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Pecio?= <[email protected]>
Date: Sun, 26 Jul 2015 11:14:34 +0200
Subject: USB: pl2303: fix baud-rate divisor calculations
From: =?UTF-8?q?Micha=C5=82=20Pecio?= <[email protected]>
commit 49bda21266fdf195142e8b5dea057f09e96ada9f upstream.
This commit fixes the following issues:
1. The 9th bit of buf was believed to be the LSB of divisor's exponent, but the hardware interprets it as MSB (9th bit) of the mantissa. The exponent is actually one bit shorter and applies to base 4, not 2 as previously believed.
2. Loop iterations doubled the exponent instead of incrementing.
3. The exponent wasn't checked for overflow.
4. The function returned requested rate instead of actual rate.
Due to issue #2, the old code deviated from the wrong formula described in #1 and actually yielded correct rates when divisor was lower than 4096 by using exponents of 0, 2 or 4 base-2, interpreted as 0, 1, 2 base-4 with the 9th mantissa bit clear. However, at 93.75 kbaud or less the rate turned out too slow due to #2 or too fast due to #2 and #3.
I tested this patch by sending and validating 0x00,0x01,..,0xff to an FTDI dongle at 234, 987, 2401, 9601, 31415, 115199, 250k, 500k, 750k, 1M, 1.5M, 3M+1 baud. All rates passed.
I also used pv to check speed at some rates unsupported by FTDI:
45 (the lowest possible), 2M, 4M, 5M and 6M-1. Looked sane.
rates")
--- drivers/usb/serial/pl2303.c | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-)
drivers/usb/serial/pl2303.c +26 -9
@@ -362,21 +362,38 @@ static speed_t pl2303_encode_baud_rate_dstatic speed_t pl2303_encode_baud_rate_divisor (unsigned char buf[4 ],speed_t baud) { -unsigned int tmp; +unsigned int baseline, mantissa, exponent;/* * Apparently the formula is: -* baudrate = 12M * 32 / (2^buf[1]) / buf[0] +* baudrate = 12M * 32 / (mantissa * 4^exponent) +* where +* mantissa = buf[8:0] +* exponent = buf[11:9] */ - tmp =12000000 *32 / baud; + baseline =12000000 *32 ; + mantissa = baseline / baud; +if (mantissa ==0 ) + mantissa =1 ;/* Avoid dividing by zero if baud > 32*12M. */ + exponent =0 ; +while (mantissa >=512 ) { +if (exponent <7 ) { + mantissa >>=2 ;/* divide by 4 */ + exponent++; + }else { +/* Exponent is maxed. Trim mantissa and leave. */ + mantissa =511 ; +break ; + } + } + buf[3 ] =0x80 ; buf[2 ] =0 ; - buf[1 ] = (tmp >=256 ); -while (tmp >=256 ) { - tmp >>=2 ; - buf[1 ] <<=1 ; - } - buf[0 ] = tmp; + buf[1 ] = exponent <<1 | mantissa >>8 ; + buf[0 ] = mantissa &0xff ; + +/* Calculate and return the exact baud rate. */ + baud = (baseline / mantissa) >> (exponent <<1 );return baud; }
Patches currently in stable-queue which might be from [email protected] are
queue-4.2/usb-pl2303-fix-baud-rate-divisor-calculations.patch