leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sc16is7xx: Preserve EFR bits on update

Browse Source 
Preserve unaffected bits state when accessing EFR register. This
prevents hardware flow control bits from being cleared on enhanced
functions access.

Signed-off-by: Lech Perczak <l.perczak@camlintechnologies.com>
Signed-off-by: Tomasz Moń <tomasz.mon@camlingroup.com>
Link: https://lore.kernel.org/r/20220221105618.3503470-2-tomasz.mon@camlingroup.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Lech Perczak
2022-02-21 11:56:13 +01:00
committed by Greg Kroah-Hartman
parent 932d596378
commit c112653b89
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/tty/serial/sc16is7xx.c
View File

@@ -289,6 +289,14 @@
* XON1, XON2, XOFF1 and * XON1, XON2, XOFF1 and
* XOFF2 * XOFF2
*/ */
#define SC16IS7XX_EFR_FLOWCTRL_BITS (SC16IS7XX_EFR_AUTORTS_BIT | \
SC16IS7XX_EFR_AUTOCTS_BIT | \
SC16IS7XX_EFR_XOFF2_DETECT_BIT | \
SC16IS7XX_EFR_SWFLOW3_BIT | \
SC16IS7XX_EFR_SWFLOW2_BIT | \
SC16IS7XX_EFR_SWFLOW1_BIT | \
SC16IS7XX_EFR_SWFLOW0_BIT)
/* Misc definitions */ /* Misc definitions */
#define SC16IS7XX_FIFO_SIZE (64) #define SC16IS7XX_FIFO_SIZE (64)
@@ -523,8 +531,10 @@ static int sc16is7xx_set_baud(struct uart_port *port, int baud)
/* Enable enhanced features */ /* Enable enhanced features */
regcache_cache_bypass(s->regmap, true); regcache_cache_bypass(s->regmap, true);
sc16is7xx_port_write(port, SC16IS7XX_EFR_REG, sc16is7xx_port_update(port, SC16IS7XX_EFR_REG,
SC16IS7XX_EFR_ENABLE_BIT,
SC16IS7XX_EFR_ENABLE_BIT); SC16IS7XX_EFR_ENABLE_BIT);
regcache_cache_bypass(s->regmap, false); regcache_cache_bypass(s->regmap, false);
/* Put LCR back to the normal mode */ /* Put LCR back to the normal mode */
@@ -932,7 +942,10 @@ static void sc16is7xx_set_termios(struct uart_port *port,
if (termios->c_iflag & IXOFF) if (termios->c_iflag & IXOFF)
flow |= SC16IS7XX_EFR_SWFLOW1_BIT; flow |= SC16IS7XX_EFR_SWFLOW1_BIT;
sc16is7xx_port_write(port, SC16IS7XX_EFR_REG, flow); sc16is7xx_port_update(port,
SC16IS7XX_EFR_REG,
SC16IS7XX_EFR_FLOWCTRL_BITS,
flow);
regcache_cache_bypass(s->regmap, false); regcache_cache_bypass(s->regmap, false);
/* Update LCR register */ /* Update LCR register */
@@ -1007,7 +1020,8 @@ static int sc16is7xx_startup(struct uart_port *port)
regcache_cache_bypass(s->regmap, true); regcache_cache_bypass(s->regmap, true);
/* Enable write access to enhanced features and internal clock div */ /* Enable write access to enhanced features and internal clock div */
sc16is7xx_port_write(port, SC16IS7XX_EFR_REG, sc16is7xx_port_update(port, SC16IS7XX_EFR_REG,
SC16IS7XX_EFR_ENABLE_BIT,
SC16IS7XX_EFR_ENABLE_BIT); SC16IS7XX_EFR_ENABLE_BIT);
/* Enable TCR/TLR */ /* Enable TCR/TLR */