* [PATCH v9 0/3] add support for EXAR XR20M1172 UART
@ 2024-04-25 18:32 Konstantin Pugin
2024-04-25 18:32 ` [PATCH v9 1/3] serial: sc16is7xx: announce support of SER_RS485_RTS_ON_SEND Konstantin Pugin
` (2 more replies)
0 siblings, 3 replies; 10+ messages in thread
From: Konstantin Pugin @ 2024-04-25 18:32 UTC (permalink / raw)
Cc: krzk, conor, lkp, vz, robh, jcmvbkbc, nicolas.ferre,
manikanta.guntupalli, corbet, ychuang3, u.kleine-koenig,
Maarten.Brock, Konstantin Pugin, Greg Kroah-Hartman, Jiri Slaby,
Paul Walmsley, Samuel Holland, Hugo Villeneuve, Andy Shevchenko,
Lech Perczak, Ilpo Järvinen, Konstantin Pugin, linux-kernel,
linux-serial, linux-riscv
EXAR XR20M1172 UART is mostly SC16IS762-compatible, but
it has additional register which can change UART multiplier
to 4x and 8x, similar to UPF_MAGIC_MULTIPLIER does. So, I used this
flag to guard access to its specific DLD register. It seems than
other EXAR SPI UART modules also have this register, but I tested
only XR20M1172.
Yes, in datasheet this register is called "DLD - Divisor Fractional"
or "DLD - Divisor Fractional Register", calling depends on datasheet
version.
I am sorry about too many submissions and top post reply. About second -
I do not know how to reply properly to this ML from GMail phone app. About first - I just
get very good feedback from Andy Shevchenko, and want to fix his review picks ASAP.
Hugo, I am sorry, I fixes a bug, but forgot to amend a fix(
Log from v9 compilation:
```
CC [M] drivers/tty/serial/omap-serial.o
CC [M] drivers/tty/serial/owl-uart.o
CC [M] drivers/tty/serial/pch_uart.o
CC [M] drivers/tty/serial/qcom_geni_serial.o
CC [M] drivers/tty/serial/ucc_uart.o
CC [M] drivers/tty/serial/rp2.o
CC [M] drivers/tty/serial/samsung_tty.o
CC [M] drivers/tty/serial/sccnxp.o
CC [M] drivers/tty/serial/sc16is7xx.o
CC [M] drivers/tty/serial/sc16is7xx_spi.o
CC [M] drivers/tty/serial/sc16is7xx_i2c.o
CC [M] drivers/tty/serial/sh-sci.o
CC [M] drivers/tty/serial/sifive.o
CC [M] drivers/tty/serial/sprd_serial.o
CC [M] drivers/tty/serial/st-asc.o
CC [M] drivers/tty/serial/stm32-usart.o
```
Changes in v2:
- use full name in git authorship
Changes in v3:
- change formatting of commit messages to unify width
- rework commit messages according to code review
- add XR20M117X namespace for EXAR-specific register
- do not use UPF_MAGIC_MULTIPLIER for checking EXAR chip,
use s->devtype directly
- replace while loop to fls function and expanded check
- sort compatibles
- reformat multiline comment.
Changes in v4:
- rebase onto tty-next branch
- added Kconfig mention of the chip
- used rounddown_power_of_two instead of fls and manual shift
- used FIELD_PREP instead of custom macro
- removed has_dld bit from common struct, replaced by check function,
which checks directly by s->devtype
- fixed tab count
- properly apply Vladimir Zapolskiy's tag to patch 2 only
Changes in v5:
- fixes for tty-next branch
- address a new code review picks
- send properly to all participants
- added Ack tag
Changes in v6:
- KConfig fixes
- New code review fixes
Changes in v7:
- Added missed tag
- Added missed v5 fixes
Changes in v8:
- Fixed semicolon
- Added missed tags
- Fixed commit messages
Changes in v9:
- Really fixed compilation (checked by git reset --hard && make allmodconfig && make)
- Implemented Hugo and Andy's messages
Konstantin Pugin (3):
serial: sc16is7xx: announce support of SER_RS485_RTS_ON_SEND
dt-bindings: sc16is7xx: Add compatible line for XR20M1172 UART
serial: sc16is7xx: add support for EXAR XR20M1172 UART
.../bindings/serial/nxp,sc16is7xx.yaml | 1 +
drivers/tty/serial/Kconfig | 3 +-
drivers/tty/serial/sc16is7xx.c | 63 +++++++++++++++++--
drivers/tty/serial/sc16is7xx.h | 1 +
drivers/tty/serial/sc16is7xx_i2c.c | 1 +
drivers/tty/serial/sc16is7xx_spi.c | 1 +
6 files changed, 64 insertions(+), 6 deletions(-)
base-commit: 660a708098569a66a47d0abdad998e29e1259de6
--
2.44.0
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH v9 1/3] serial: sc16is7xx: announce support of SER_RS485_RTS_ON_SEND 2024-04-25 18:32 [PATCH v9 0/3] add support for EXAR XR20M1172 UART Konstantin Pugin @ 2024-04-25 18:32 ` Konstantin Pugin 2024-04-26 14:32 ` Andy Shevchenko 2024-04-25 18:32 ` [PATCH v9 2/3] dt-bindings: sc16is7xx: Add compatible line for XR20M1172 UART Konstantin Pugin 2024-04-25 18:32 ` [PATCH v9 3/3] serial: sc16is7xx: add support for EXAR " Konstantin Pugin 2 siblings, 1 reply; 10+ messages in thread From: Konstantin Pugin @ 2024-04-25 18:32 UTC (permalink / raw) Cc: krzk, conor, lkp, vz, robh, jcmvbkbc, nicolas.ferre, manikanta.guntupalli, corbet, ychuang3, u.kleine-koenig, Maarten.Brock, Konstantin Pugin, Hugo Villeneuve, Andy Shevchenko, Greg Kroah-Hartman, Jiri Slaby, Lech Perczak, Ilpo Järvinen, linux-kernel, linux-serial From: Konstantin Pugin <ria.freelander@gmail.com> When specifying flag SER_RS485_RTS_ON_SEND in RS485 configuration, we get the following warning after commit 4afeced55baa ("serial: core: fix sanitizing check for RTS settings"): invalid RTS setting, using RTS_AFTER_SEND instead This results in SER_RS485_RTS_AFTER_SEND being set and the driver always write to the register field SC16IS7XX_EFCR_RTS_INVERT_BIT, which breaks some hardware using these chips. The hardware supports both RTS_ON_SEND and RTS_AFTER_SEND modes, so fix this by announcing support for RTS_ON_SEND. Fixes: 267913ecf737 ("serial: sc16is7xx: Fill in rs485_supported") Tested-by: Hugo Villeneuve <hvilleneuve@dimonoff.com> Reviewed-by: Andy Shevchenko <andy@kernel.org> Signed-off-by: Konstantin Pugin <ria.freelander@gmail.com> --- drivers/tty/serial/sc16is7xx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c index 03cf30e20b75..dfcc804f558f 100644 --- a/drivers/tty/serial/sc16is7xx.c +++ b/drivers/tty/serial/sc16is7xx.c @@ -1449,7 +1449,7 @@ static int sc16is7xx_setup_mctrl_ports(struct sc16is7xx_port *s, } static const struct serial_rs485 sc16is7xx_rs485_supported = { - .flags = SER_RS485_ENABLED | SER_RS485_RTS_AFTER_SEND, + .flags = SER_RS485_ENABLED | SER_RS485_RTS_ON_SEND | SER_RS485_RTS_AFTER_SEND, .delay_rts_before_send = 1, .delay_rts_after_send = 1, /* Not supported but keep returning -EINVAL */ }; -- 2.44.0 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v9 1/3] serial: sc16is7xx: announce support of SER_RS485_RTS_ON_SEND 2024-04-25 18:32 ` [PATCH v9 1/3] serial: sc16is7xx: announce support of SER_RS485_RTS_ON_SEND Konstantin Pugin @ 2024-04-26 14:32 ` Andy Shevchenko 2024-04-26 15:02 ` Konstantin P. 0 siblings, 1 reply; 10+ messages in thread From: Andy Shevchenko @ 2024-04-26 14:32 UTC (permalink / raw) To: Konstantin Pugin Cc: krzk, conor, lkp, vz, robh, jcmvbkbc, nicolas.ferre, manikanta.guntupalli, corbet, ychuang3, u.kleine-koenig, Maarten.Brock, Konstantin Pugin, Hugo Villeneuve, Greg Kroah-Hartman, Jiri Slaby, Lech Perczak, Ilpo Järvinen, linux-kernel, linux-serial On Thu, Apr 25, 2024 at 09:32:33PM +0300, Konstantin Pugin wrote: > From: Konstantin Pugin <ria.freelander@gmail.com> > > When specifying flag SER_RS485_RTS_ON_SEND in RS485 configuration, > we get the following warning after commit 4afeced55baa ("serial: core: > fix sanitizing check for RTS settings"): > > invalid RTS setting, using RTS_AFTER_SEND instead > > This results in SER_RS485_RTS_AFTER_SEND being set and the > driver always write to the register field SC16IS7XX_EFCR_RTS_INVERT_BIT, > which breaks some hardware using these chips. > > The hardware supports both RTS_ON_SEND and RTS_AFTER_SEND modes, so fix > this by announcing support for RTS_ON_SEND. Greg KH, who is maintainer of TTY/serial subsystem, usually asks to separate fixes from new features. So, sending this patch separately may not only help him, but let's move forward with your stuff. -- With Best Regards, Andy Shevchenko ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v9 1/3] serial: sc16is7xx: announce support of SER_RS485_RTS_ON_SEND 2024-04-26 14:32 ` Andy Shevchenko @ 2024-04-26 15:02 ` Konstantin P. 2024-04-26 15:06 ` Andy Shevchenko 0 siblings, 1 reply; 10+ messages in thread From: Konstantin P. @ 2024-04-26 15:02 UTC (permalink / raw) To: Andy Shevchenko Cc: Konstantin Pugin, krzk, conor, lkp, vz, robh, jcmvbkbc, nicolas.ferre, manikanta.guntupalli, corbet, ychuang3, u.kleine-koenig, Maarten.Brock, Hugo Villeneuve, Greg Kroah-Hartman, Jiri Slaby, Lech Perczak, Ilpo Järvinen, linux-kernel, linux-serial On Fri, Apr 26, 2024 at 5:36 PM Andy Shevchenko <andy@kernel.org> wrote: > > On Thu, Apr 25, 2024 at 09:32:33PM +0300, Konstantin Pugin wrote: > > From: Konstantin Pugin <ria.freelander@gmail.com> > > > > When specifying flag SER_RS485_RTS_ON_SEND in RS485 configuration, > > we get the following warning after commit 4afeced55baa ("serial: core: > > fix sanitizing check for RTS settings"): > > > > invalid RTS setting, using RTS_AFTER_SEND instead > > > > This results in SER_RS485_RTS_AFTER_SEND being set and the > > driver always write to the register field SC16IS7XX_EFCR_RTS_INVERT_BIT, > > which breaks some hardware using these chips. > > > > The hardware supports both RTS_ON_SEND and RTS_AFTER_SEND modes, so fix > > this by announcing support for RTS_ON_SEND. > > Greg KH, who is maintainer of TTY/serial subsystem, usually asks to separate > fixes from new features. So, sending this patch separately may not only help > him, but let's move forward with your stuff. > Do I need to increase the version number in split send? And if I need to do so, then how I should do it? Only on new driver? Or only on fix? Should I CC linux-stable in fix patch? > -- > With Best Regards, > Andy Shevchenko > > ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v9 1/3] serial: sc16is7xx: announce support of SER_RS485_RTS_ON_SEND 2024-04-26 15:02 ` Konstantin P. @ 2024-04-26 15:06 ` Andy Shevchenko 2024-04-26 15:10 ` Andy Shevchenko 0 siblings, 1 reply; 10+ messages in thread From: Andy Shevchenko @ 2024-04-26 15:06 UTC (permalink / raw) To: Konstantin P. Cc: Andy Shevchenko, Konstantin Pugin, krzk, conor, lkp, vz, robh, jcmvbkbc, nicolas.ferre, manikanta.guntupalli, corbet, ychuang3, u.kleine-koenig, Maarten.Brock, Hugo Villeneuve, Greg Kroah-Hartman, Jiri Slaby, Lech Perczak, Ilpo Järvinen, linux-kernel, linux-serial On Fri, Apr 26, 2024 at 6:00 PM Konstantin P. <ria.freelander@gmail.com> wrote: > On Fri, Apr 26, 2024 at 5:36 PM Andy Shevchenko <andy@kernel.org> wrote: > > On Thu, Apr 25, 2024 at 09:32:33PM +0300, Konstantin Pugin wrote: ... > > Greg KH, who is maintainer of TTY/serial subsystem, usually asks to separate > > fixes from new features. So, sending this patch separately may not only help > > him, but let's move forward with your stuff. > > Do I need to increase the version number in split send? Nope, the opposite, i.e. drop it to v1 (and mention in the comments area, that's after the cutter '---' line, that it's a split from this series). > And if I need > to do so, then how I should do it? Only on new driver? Or only on fix? > Should I CC linux-stable in fix patch? Everything else is documented: https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html -- With Best Regards, Andy Shevchenko ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v9 1/3] serial: sc16is7xx: announce support of SER_RS485_RTS_ON_SEND 2024-04-26 15:06 ` Andy Shevchenko @ 2024-04-26 15:10 ` Andy Shevchenko 0 siblings, 0 replies; 10+ messages in thread From: Andy Shevchenko @ 2024-04-26 15:10 UTC (permalink / raw) To: Konstantin P. Cc: Andy Shevchenko, Konstantin Pugin, krzk, conor, lkp, vz, robh, jcmvbkbc, nicolas.ferre, manikanta.guntupalli, corbet, ychuang3, u.kleine-koenig, Maarten.Brock, Hugo Villeneuve, Greg Kroah-Hartman, Jiri Slaby, Lech Perczak, Ilpo Järvinen, linux-kernel, linux-serial On Fri, Apr 26, 2024 at 6:06 PM Andy Shevchenko <andy.shevchenko@gmail.com> wrote: > On Fri, Apr 26, 2024 at 6:00 PM Konstantin P. <ria.freelander@gmail.com> wrote: > > On Fri, Apr 26, 2024 at 5:36 PM Andy Shevchenko <andy@kernel.org> wrote: > > > On Thu, Apr 25, 2024 at 09:32:33PM +0300, Konstantin Pugin wrote: ... > > > Greg KH, who is maintainer of TTY/serial subsystem, usually asks to separate > > > fixes from new features. So, sending this patch separately may not only help > > > him, but let's move forward with your stuff. > > > > Do I need to increase the version number in split send? > > Nope, the opposite, i.e. drop it to v1 (and mention in the comments > area, that's after the cutter '---' line, that it's a split from this > series). > > > And if I need > > to do so, then how I should do it? Only on new driver? Or only on fix? > > Should I CC linux-stable in fix patch? > > Everything else is documented: > https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html Just to be crystal clear: - the split of the fix goes as v1 - the rest as v10 (or what is the number of the next revision?) after you address all review comments, confirmed testing, etc. -- With Best Regards, Andy Shevchenko ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v9 2/3] dt-bindings: sc16is7xx: Add compatible line for XR20M1172 UART 2024-04-25 18:32 [PATCH v9 0/3] add support for EXAR XR20M1172 UART Konstantin Pugin 2024-04-25 18:32 ` [PATCH v9 1/3] serial: sc16is7xx: announce support of SER_RS485_RTS_ON_SEND Konstantin Pugin @ 2024-04-25 18:32 ` Konstantin Pugin 2024-04-25 18:32 ` [PATCH v9 3/3] serial: sc16is7xx: add support for EXAR " Konstantin Pugin 2 siblings, 0 replies; 10+ messages in thread From: Konstantin Pugin @ 2024-04-25 18:32 UTC (permalink / raw) Cc: krzk, conor, lkp, vz, robh, jcmvbkbc, nicolas.ferre, manikanta.guntupalli, corbet, ychuang3, u.kleine-koenig, Maarten.Brock, Konstantin Pugin, Krzysztof Kozlowski, Greg Kroah-Hartman, Jiri Slaby, Krzysztof Kozlowski, Conor Dooley, Hugo Villeneuve, Andy Shevchenko, Lech Perczak, Ilpo Järvinen, linux-kernel, linux-serial, devicetree From: Konstantin Pugin <ria.freelander@gmail.com> EXAR XR20M1172 UART is mostly register-compatible with NXP SPI UARTs. It will be handled by same driver, so, it makes sense to add DT definition for these block into driver's documentation. Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Reviewed-by: Vladimir Zapolskiy <vz@mleia.com> Signed-off-by: Konstantin Pugin <ria.freelander@gmail.com> --- Documentation/devicetree/bindings/serial/nxp,sc16is7xx.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/serial/nxp,sc16is7xx.yaml b/Documentation/devicetree/bindings/serial/nxp,sc16is7xx.yaml index 5dec15b7e7c3..c4bedf23368b 100644 --- a/Documentation/devicetree/bindings/serial/nxp,sc16is7xx.yaml +++ b/Documentation/devicetree/bindings/serial/nxp,sc16is7xx.yaml @@ -12,6 +12,7 @@ maintainers: properties: compatible: enum: + - exar,xr20m1172 - nxp,sc16is740 - nxp,sc16is741 - nxp,sc16is750 -- 2.44.0 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v9 3/3] serial: sc16is7xx: add support for EXAR XR20M1172 UART 2024-04-25 18:32 [PATCH v9 0/3] add support for EXAR XR20M1172 UART Konstantin Pugin 2024-04-25 18:32 ` [PATCH v9 1/3] serial: sc16is7xx: announce support of SER_RS485_RTS_ON_SEND Konstantin Pugin 2024-04-25 18:32 ` [PATCH v9 2/3] dt-bindings: sc16is7xx: Add compatible line for XR20M1172 UART Konstantin Pugin @ 2024-04-25 18:32 ` Konstantin Pugin 2024-04-25 21:19 ` Hugo Villeneuve 2 siblings, 1 reply; 10+ messages in thread From: Konstantin Pugin @ 2024-04-25 18:32 UTC (permalink / raw) Cc: krzk, conor, lkp, vz, robh, jcmvbkbc, nicolas.ferre, manikanta.guntupalli, corbet, ychuang3, u.kleine-koenig, Maarten.Brock, Konstantin Pugin, Andy Shevchenko, Greg Kroah-Hartman, Jiri Slaby, Andy Shevchenko, Herve Codina, Ilpo Järvinen, Anup Patel, Hugo Villeneuve, Lech Perczak, linux-kernel, linux-serial From: Konstantin Pugin <ria.freelander@gmail.com> XR20M1172 register set is mostly compatible with SC16IS762, but it supports for additional division rates with special DLD register. Reviewed-by: Andy Shevchenko <andy@kernel.org> Signed-off-by: Konstantin Pugin <ria.freelander@gmail.com> --- drivers/tty/serial/Kconfig | 3 +- drivers/tty/serial/sc16is7xx.c | 61 ++++++++++++++++++++++++++++-- drivers/tty/serial/sc16is7xx.h | 1 + drivers/tty/serial/sc16is7xx_i2c.c | 1 + drivers/tty/serial/sc16is7xx_spi.c | 1 + 5 files changed, 62 insertions(+), 5 deletions(-) diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig index 4fdd7857ef4d..9d0438cfe147 100644 --- a/drivers/tty/serial/Kconfig +++ b/drivers/tty/serial/Kconfig @@ -1029,7 +1029,7 @@ config SERIAL_SC16IS7XX_CORE select SERIAL_SC16IS7XX_SPI if SPI_MASTER select SERIAL_SC16IS7XX_I2C if I2C help - Core driver for NXP SC16IS7xx UARTs. + Core driver for NXP SC16IS7xx and compatible UARTs. Supported ICs are: SC16IS740 @@ -1038,6 +1038,7 @@ config SERIAL_SC16IS7XX_CORE SC16IS752 SC16IS760 SC16IS762 + XR20M1172 (Exar) The driver supports both I2C and SPI interfaces. diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c index dfcc804f558f..2b40600243a9 100644 --- a/drivers/tty/serial/sc16is7xx.c +++ b/drivers/tty/serial/sc16is7xx.c @@ -10,6 +10,7 @@ #undef DEFAULT_SYMBOL_NAMESPACE #define DEFAULT_SYMBOL_NAMESPACE SERIAL_NXP_SC16IS7XX +#include <linux/bitfield.h> #include <linux/clk.h> #include <linux/delay.h> #include <linux/device.h> @@ -68,6 +69,7 @@ /* Special Register set: Only if ((LCR[7] == 1) && (LCR != 0xBF)) */ #define SC16IS7XX_DLL_REG (0x00) /* Divisor Latch Low */ #define SC16IS7XX_DLH_REG (0x01) /* Divisor Latch High */ +#define XR20M117X_DLD_REG (0x02) /* Divisor Fractional (requires EFR[4] = 1) */ /* Enhanced Register set: Only if (LCR == 0xBF) */ #define SC16IS7XX_EFR_REG (0x02) /* Enhanced Features */ @@ -221,6 +223,20 @@ #define SC16IS7XX_TCR_RX_HALT(words) ((((words) / 4) & 0x0f) << 0) #define SC16IS7XX_TCR_RX_RESUME(words) ((((words) / 4) & 0x0f) << 4) +/* + * Divisor Fractional Register bits (EXAR extension). + * EXAR hardware is mostly compatible with SC16IS7XX, but supports additional feature: + * 4x and 8x divisor, instead of default 16x. It has a special register to program it. + * Bits 0 to 3 is fractional divisor, it used to set value of last 16 bits of + * uartclk * (16 / divisor) / baud, in case of default it will be uartclk / baud. + * Bits 4 and 5 used as switches, and should not be set to 1 simultaneously. + */ + +#define XR20M117X_DLD_16X 0 +#define XR20M117X_DLD_DIV_MASK GENMASK(3, 0) +#define XR20M117X_DLD_8X BIT(4) +#define XR20M117X_DLD_4X BIT(5) + /* * TLR register bits * If TLR[3:0] or TLR[7:4] are logical 0, the selectable trigger levels via the @@ -523,6 +539,13 @@ const struct sc16is7xx_devtype sc16is762_devtype = { }; EXPORT_SYMBOL_GPL(sc16is762_devtype); +const struct sc16is7xx_devtype xr20m1172_devtype = { + .name = "XR20M1172", + .nr_gpio = 8, + .nr_uart = 2, +}; +EXPORT_SYMBOL_GPL(xr20m1172_devtype); + static bool sc16is7xx_regmap_volatile(struct device *dev, unsigned int reg) { switch (reg) { @@ -555,18 +578,43 @@ static bool sc16is7xx_regmap_noinc(struct device *dev, unsigned int reg) return reg == SC16IS7XX_RHR_REG; } +static bool sc16is7xx_has_dld(struct device *dev) +{ + struct sc16is7xx_port *s = dev_get_drvdata(dev); + + if (s->devtype == &xr20m1172_devtype) + return true; + return false; +} + static int sc16is7xx_set_baud(struct uart_port *port, int baud) { struct sc16is7xx_one *one = to_sc16is7xx_one(port, port); - u8 lcr; + unsigned long clk = port->uartclk, div, div16; + bool has_dld = sc16is7xx_has_dld(port->dev); + u8 dld_mode = XR20M117X_DLD_16X; u8 prescaler = 0; - unsigned long clk = port->uartclk, div = clk / 16 / baud; + u8 divisor = 16; + u8 lcr; + + if (has_dld && DIV_ROUND_CLOSEST(clk, baud) < 16) + divisor = rounddown_pow_of_two(DIV_ROUND_CLOSEST(clk, baud)); + + div16 = (clk * 16) / divisor / baud; + div = div16 / 16; if (div >= BIT(16)) { prescaler = SC16IS7XX_MCR_CLKSEL_BIT; div /= 4; } + /* Count additional divisor for EXAR devices */ + if (divisor == 8) + dld_mode = XR20M117X_DLD_8X; + if (divisor == 4) + dld_mode = XR20M117X_DLD_4X; + dld_mode |= FIELD_PREP(XR20M117X_DLD_DIV_MASK, div16); + /* Enable enhanced features */ sc16is7xx_efr_lock(port); sc16is7xx_port_update(port, SC16IS7XX_EFR_REG, @@ -587,12 +635,14 @@ static int sc16is7xx_set_baud(struct uart_port *port, int baud) regcache_cache_bypass(one->regmap, true); sc16is7xx_port_write(port, SC16IS7XX_DLH_REG, div / 256); sc16is7xx_port_write(port, SC16IS7XX_DLL_REG, div % 256); + if (has_dld) + sc16is7xx_port_write(port, XR20M117X_DLD_REG, dld_mode); regcache_cache_bypass(one->regmap, false); /* Restore LCR and access to general register set */ sc16is7xx_port_write(port, SC16IS7XX_LCR_REG, lcr); - return DIV_ROUND_CLOSEST(clk / 16, div); + return DIV_ROUND_CLOSEST(clk / divisor, div); } static void sc16is7xx_handle_rx(struct uart_port *port, unsigned int rxlen, @@ -1002,6 +1052,8 @@ static void sc16is7xx_set_termios(struct uart_port *port, const struct ktermios *old) { struct sc16is7xx_one *one = to_sc16is7xx_one(port, port); + bool has_dld = sc16is7xx_has_dld(port->dev); + u8 divisor = has_dld ? 4 : 16; unsigned int lcr, flow = 0; int baud; unsigned long flags; @@ -1084,7 +1136,7 @@ static void sc16is7xx_set_termios(struct uart_port *port, /* Get baud rate generator configuration */ baud = uart_get_baud_rate(port, termios, old, port->uartclk / 16 / 4 / 0xffff, - port->uartclk / 16); + port->uartclk / divisor); /* Setup baudrate generator */ baud = sc16is7xx_set_baud(port, baud); @@ -1684,6 +1736,7 @@ void sc16is7xx_remove(struct device *dev) EXPORT_SYMBOL_GPL(sc16is7xx_remove); const struct of_device_id __maybe_unused sc16is7xx_dt_ids[] = { + { .compatible = "exar,xr20m1172", .data = &xr20m1172_devtype, }, { .compatible = "nxp,sc16is740", .data = &sc16is74x_devtype, }, { .compatible = "nxp,sc16is741", .data = &sc16is74x_devtype, }, { .compatible = "nxp,sc16is750", .data = &sc16is750_devtype, }, diff --git a/drivers/tty/serial/sc16is7xx.h b/drivers/tty/serial/sc16is7xx.h index afb784eaee45..eb2e3bc86f15 100644 --- a/drivers/tty/serial/sc16is7xx.h +++ b/drivers/tty/serial/sc16is7xx.h @@ -28,6 +28,7 @@ extern const struct sc16is7xx_devtype sc16is750_devtype; extern const struct sc16is7xx_devtype sc16is752_devtype; extern const struct sc16is7xx_devtype sc16is760_devtype; extern const struct sc16is7xx_devtype sc16is762_devtype; +extern const struct sc16is7xx_devtype xr20m1172_devtype; const char *sc16is7xx_regmap_name(u8 port_id); diff --git a/drivers/tty/serial/sc16is7xx_i2c.c b/drivers/tty/serial/sc16is7xx_i2c.c index 3ed47c306d85..839de902821b 100644 --- a/drivers/tty/serial/sc16is7xx_i2c.c +++ b/drivers/tty/serial/sc16is7xx_i2c.c @@ -46,6 +46,7 @@ static const struct i2c_device_id sc16is7xx_i2c_id_table[] = { { "sc16is752", (kernel_ulong_t)&sc16is752_devtype, }, { "sc16is760", (kernel_ulong_t)&sc16is760_devtype, }, { "sc16is762", (kernel_ulong_t)&sc16is762_devtype, }, + { "xr20m1172", (kernel_ulong_t)&xr20m1172_devtype, }, { } }; MODULE_DEVICE_TABLE(i2c, sc16is7xx_i2c_id_table); diff --git a/drivers/tty/serial/sc16is7xx_spi.c b/drivers/tty/serial/sc16is7xx_spi.c index 73df36f8a7fd..2b278282dbd0 100644 --- a/drivers/tty/serial/sc16is7xx_spi.c +++ b/drivers/tty/serial/sc16is7xx_spi.c @@ -69,6 +69,7 @@ static const struct spi_device_id sc16is7xx_spi_id_table[] = { { "sc16is752", (kernel_ulong_t)&sc16is752_devtype, }, { "sc16is760", (kernel_ulong_t)&sc16is760_devtype, }, { "sc16is762", (kernel_ulong_t)&sc16is762_devtype, }, + { "xr20m1172", (kernel_ulong_t)&xr20m1172_devtype, }, { } }; MODULE_DEVICE_TABLE(spi, sc16is7xx_spi_id_table); -- 2.44.0 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v9 3/3] serial: sc16is7xx: add support for EXAR XR20M1172 UART 2024-04-25 18:32 ` [PATCH v9 3/3] serial: sc16is7xx: add support for EXAR " Konstantin Pugin @ 2024-04-25 21:19 ` Hugo Villeneuve 2024-04-26 6:58 ` Konstantin P. 0 siblings, 1 reply; 10+ messages in thread From: Hugo Villeneuve @ 2024-04-25 21:19 UTC (permalink / raw) To: Konstantin Pugin Cc: krzk, conor, lkp, vz, robh, jcmvbkbc, nicolas.ferre, manikanta.guntupalli, corbet, ychuang3, u.kleine-koenig, Maarten.Brock, Konstantin Pugin, Andy Shevchenko, Greg Kroah-Hartman, Jiri Slaby, Andy Shevchenko, Herve Codina, Ilpo Järvinen, Anup Patel, Hugo Villeneuve, Lech Perczak, linux-kernel, linux-serial On Thu, 25 Apr 2024 21:32:35 +0300 Konstantin Pugin <rilian.la.te@ya.ru> wrote: > From: Konstantin Pugin <ria.freelander@gmail.com> > > XR20M1172 register set is mostly compatible with SC16IS762, but it > supports for additional division rates with special DLD register. > > Reviewed-by: Andy Shevchenko <andy@kernel.org> > Signed-off-by: Konstantin Pugin <ria.freelander@gmail.com> > --- > drivers/tty/serial/Kconfig | 3 +- > drivers/tty/serial/sc16is7xx.c | 61 ++++++++++++++++++++++++++++-- > drivers/tty/serial/sc16is7xx.h | 1 + > drivers/tty/serial/sc16is7xx_i2c.c | 1 + > drivers/tty/serial/sc16is7xx_spi.c | 1 + > 5 files changed, 62 insertions(+), 5 deletions(-) > > diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig > index 4fdd7857ef4d..9d0438cfe147 100644 > --- a/drivers/tty/serial/Kconfig > +++ b/drivers/tty/serial/Kconfig > @@ -1029,7 +1029,7 @@ config SERIAL_SC16IS7XX_CORE > select SERIAL_SC16IS7XX_SPI if SPI_MASTER > select SERIAL_SC16IS7XX_I2C if I2C > help > - Core driver for NXP SC16IS7xx UARTs. > + Core driver for NXP SC16IS7xx and compatible UARTs. > Supported ICs are: > > SC16IS740 > @@ -1038,6 +1038,7 @@ config SERIAL_SC16IS7XX_CORE > SC16IS752 > SC16IS760 > SC16IS762 > + XR20M1172 (Exar) > > The driver supports both I2C and SPI interfaces. > > diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c > index dfcc804f558f..2b40600243a9 100644 > --- a/drivers/tty/serial/sc16is7xx.c > +++ b/drivers/tty/serial/sc16is7xx.c > @@ -10,6 +10,7 @@ > #undef DEFAULT_SYMBOL_NAMESPACE > #define DEFAULT_SYMBOL_NAMESPACE SERIAL_NXP_SC16IS7XX > > +#include <linux/bitfield.h> > #include <linux/clk.h> > #include <linux/delay.h> > #include <linux/device.h> > @@ -68,6 +69,7 @@ > /* Special Register set: Only if ((LCR[7] == 1) && (LCR != 0xBF)) */ > #define SC16IS7XX_DLL_REG (0x00) /* Divisor Latch Low */ > #define SC16IS7XX_DLH_REG (0x01) /* Divisor Latch High */ > +#define XR20M117X_DLD_REG (0x02) /* Divisor Fractional (requires EFR[4] = 1) */ > > /* Enhanced Register set: Only if (LCR == 0xBF) */ > #define SC16IS7XX_EFR_REG (0x02) /* Enhanced Features */ > @@ -221,6 +223,20 @@ > #define SC16IS7XX_TCR_RX_HALT(words) ((((words) / 4) & 0x0f) << 0) > #define SC16IS7XX_TCR_RX_RESUME(words) ((((words) / 4) & 0x0f) << 4) > > +/* > + * Divisor Fractional Register bits (EXAR extension). > + * EXAR hardware is mostly compatible with SC16IS7XX, but supports additional feature: > + * 4x and 8x divisor, instead of default 16x. It has a special register to program it. > + * Bits 0 to 3 is fractional divisor, it used to set value of last 16 bits of > + * uartclk * (16 / divisor) / baud, in case of default it will be uartclk / baud. > + * Bits 4 and 5 used as switches, and should not be set to 1 simultaneously. > + */ > + > +#define XR20M117X_DLD_16X 0 > +#define XR20M117X_DLD_DIV_MASK GENMASK(3, 0) > +#define XR20M117X_DLD_8X BIT(4) > +#define XR20M117X_DLD_4X BIT(5) > + > /* > * TLR register bits > * If TLR[3:0] or TLR[7:4] are logical 0, the selectable trigger levels via the > @@ -523,6 +539,13 @@ const struct sc16is7xx_devtype sc16is762_devtype = { > }; > EXPORT_SYMBOL_GPL(sc16is762_devtype); > > +const struct sc16is7xx_devtype xr20m1172_devtype = { > + .name = "XR20M1172", > + .nr_gpio = 8, > + .nr_uart = 2, > +}; > +EXPORT_SYMBOL_GPL(xr20m1172_devtype); > + > static bool sc16is7xx_regmap_volatile(struct device *dev, unsigned int reg) > { > switch (reg) { > @@ -555,18 +578,43 @@ static bool sc16is7xx_regmap_noinc(struct device *dev, unsigned int reg) > return reg == SC16IS7XX_RHR_REG; > } > > +static bool sc16is7xx_has_dld(struct device *dev) > +{ > + struct sc16is7xx_port *s = dev_get_drvdata(dev); > + > + if (s->devtype == &xr20m1172_devtype) > + return true; > + return false; > +} > + > static int sc16is7xx_set_baud(struct uart_port *port, int baud) > { > struct sc16is7xx_one *one = to_sc16is7xx_one(port, port); > - u8 lcr; > + unsigned long clk = port->uartclk, div, div16; > + bool has_dld = sc16is7xx_has_dld(port->dev); > + u8 dld_mode = XR20M117X_DLD_16X; > u8 prescaler = 0; > - unsigned long clk = port->uartclk, div = clk / 16 / baud; > + u8 divisor = 16; > + u8 lcr; > + > + if (has_dld && DIV_ROUND_CLOSEST(clk, baud) < 16) > + divisor = rounddown_pow_of_two(DIV_ROUND_CLOSEST(clk, baud)); > + > + div16 = (clk * 16) / divisor / baud; > + div = div16 / 16; > > if (div >= BIT(16)) { > prescaler = SC16IS7XX_MCR_CLKSEL_BIT; > div /= 4; > } > > + /* Count additional divisor for EXAR devices */ > + if (divisor == 8) > + dld_mode = XR20M117X_DLD_8X; > + if (divisor == 4) > + dld_mode = XR20M117X_DLD_4X; > + dld_mode |= FIELD_PREP(XR20M117X_DLD_DIV_MASK, div16); > + > /* Enable enhanced features */ > sc16is7xx_efr_lock(port); > sc16is7xx_port_update(port, SC16IS7XX_EFR_REG, > @@ -587,12 +635,14 @@ static int sc16is7xx_set_baud(struct uart_port *port, int baud) > regcache_cache_bypass(one->regmap, true); > sc16is7xx_port_write(port, SC16IS7XX_DLH_REG, div / 256); > sc16is7xx_port_write(port, SC16IS7XX_DLL_REG, div % 256); > + if (has_dld) > + sc16is7xx_port_write(port, XR20M117X_DLD_REG, dld_mode); > regcache_cache_bypass(one->regmap, false); > > /* Restore LCR and access to general register set */ > sc16is7xx_port_write(port, SC16IS7XX_LCR_REG, lcr); > > - return DIV_ROUND_CLOSEST(clk / 16, div); > + return DIV_ROUND_CLOSEST(clk / divisor, div); While trying to review your code, it made me realize there is a bug with the current return value. I will send a patch to fix it, and you will be able to rebase your patchset on it after that. Hugo. > } > > static void sc16is7xx_handle_rx(struct uart_port *port, unsigned int rxlen, > @@ -1002,6 +1052,8 @@ static void sc16is7xx_set_termios(struct uart_port *port, > const struct ktermios *old) > { > struct sc16is7xx_one *one = to_sc16is7xx_one(port, port); > + bool has_dld = sc16is7xx_has_dld(port->dev); > + u8 divisor = has_dld ? 4 : 16; > unsigned int lcr, flow = 0; > int baud; > unsigned long flags; > @@ -1084,7 +1136,7 @@ static void sc16is7xx_set_termios(struct uart_port *port, > /* Get baud rate generator configuration */ > baud = uart_get_baud_rate(port, termios, old, > port->uartclk / 16 / 4 / 0xffff, > - port->uartclk / 16); > + port->uartclk / divisor); > > /* Setup baudrate generator */ > baud = sc16is7xx_set_baud(port, baud); > @@ -1684,6 +1736,7 @@ void sc16is7xx_remove(struct device *dev) > EXPORT_SYMBOL_GPL(sc16is7xx_remove); > > const struct of_device_id __maybe_unused sc16is7xx_dt_ids[] = { > + { .compatible = "exar,xr20m1172", .data = &xr20m1172_devtype, }, > { .compatible = "nxp,sc16is740", .data = &sc16is74x_devtype, }, > { .compatible = "nxp,sc16is741", .data = &sc16is74x_devtype, }, > { .compatible = "nxp,sc16is750", .data = &sc16is750_devtype, }, > diff --git a/drivers/tty/serial/sc16is7xx.h b/drivers/tty/serial/sc16is7xx.h > index afb784eaee45..eb2e3bc86f15 100644 > --- a/drivers/tty/serial/sc16is7xx.h > +++ b/drivers/tty/serial/sc16is7xx.h > @@ -28,6 +28,7 @@ extern const struct sc16is7xx_devtype sc16is750_devtype; > extern const struct sc16is7xx_devtype sc16is752_devtype; > extern const struct sc16is7xx_devtype sc16is760_devtype; > extern const struct sc16is7xx_devtype sc16is762_devtype; > +extern const struct sc16is7xx_devtype xr20m1172_devtype; > > const char *sc16is7xx_regmap_name(u8 port_id); > > diff --git a/drivers/tty/serial/sc16is7xx_i2c.c b/drivers/tty/serial/sc16is7xx_i2c.c > index 3ed47c306d85..839de902821b 100644 > --- a/drivers/tty/serial/sc16is7xx_i2c.c > +++ b/drivers/tty/serial/sc16is7xx_i2c.c > @@ -46,6 +46,7 @@ static const struct i2c_device_id sc16is7xx_i2c_id_table[] = { > { "sc16is752", (kernel_ulong_t)&sc16is752_devtype, }, > { "sc16is760", (kernel_ulong_t)&sc16is760_devtype, }, > { "sc16is762", (kernel_ulong_t)&sc16is762_devtype, }, > + { "xr20m1172", (kernel_ulong_t)&xr20m1172_devtype, }, > { } > }; > MODULE_DEVICE_TABLE(i2c, sc16is7xx_i2c_id_table); > diff --git a/drivers/tty/serial/sc16is7xx_spi.c b/drivers/tty/serial/sc16is7xx_spi.c > index 73df36f8a7fd..2b278282dbd0 100644 > --- a/drivers/tty/serial/sc16is7xx_spi.c > +++ b/drivers/tty/serial/sc16is7xx_spi.c > @@ -69,6 +69,7 @@ static const struct spi_device_id sc16is7xx_spi_id_table[] = { > { "sc16is752", (kernel_ulong_t)&sc16is752_devtype, }, > { "sc16is760", (kernel_ulong_t)&sc16is760_devtype, }, > { "sc16is762", (kernel_ulong_t)&sc16is762_devtype, }, > + { "xr20m1172", (kernel_ulong_t)&xr20m1172_devtype, }, > { } > }; > MODULE_DEVICE_TABLE(spi, sc16is7xx_spi_id_table); > -- > 2.44.0 > > > -- Hugo Villeneuve ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v9 3/3] serial: sc16is7xx: add support for EXAR XR20M1172 UART 2024-04-25 21:19 ` Hugo Villeneuve @ 2024-04-26 6:58 ` Konstantin P. 0 siblings, 0 replies; 10+ messages in thread From: Konstantin P. @ 2024-04-26 6:58 UTC (permalink / raw) To: Hugo Villeneuve Cc: Konstantin Pugin, krzk, conor, lkp, vz, robh, jcmvbkbc, nicolas.ferre, manikanta.guntupalli, corbet, ychuang3, u.kleine-koenig, Maarten.Brock, Andy Shevchenko, Greg Kroah-Hartman, Jiri Slaby, Andy Shevchenko, Herve Codina, Ilpo Järvinen, Anup Patel, Hugo Villeneuve, Lech Perczak, linux-kernel, linux-serial On Fri, Apr 26, 2024 at 12:19 AM Hugo Villeneuve <hugo@hugovil.com> wrote: > > On Thu, 25 Apr 2024 21:32:35 +0300 > Konstantin Pugin <rilian.la.te@ya.ru> wrote: > > > From: Konstantin Pugin <ria.freelander@gmail.com> > > > > XR20M1172 register set is mostly compatible with SC16IS762, but it > > supports for additional division rates with special DLD register. > > > > Reviewed-by: Andy Shevchenko <andy@kernel.org> > > Signed-off-by: Konstantin Pugin <ria.freelander@gmail.com> > > --- > > drivers/tty/serial/Kconfig | 3 +- > > drivers/tty/serial/sc16is7xx.c | 61 ++++++++++++++++++++++++++++-- > > drivers/tty/serial/sc16is7xx.h | 1 + > > drivers/tty/serial/sc16is7xx_i2c.c | 1 + > > drivers/tty/serial/sc16is7xx_spi.c | 1 + > > 5 files changed, 62 insertions(+), 5 deletions(-) > > > > diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig > > index 4fdd7857ef4d..9d0438cfe147 100644 > > --- a/drivers/tty/serial/Kconfig > > +++ b/drivers/tty/serial/Kconfig > > @@ -1029,7 +1029,7 @@ config SERIAL_SC16IS7XX_CORE > > select SERIAL_SC16IS7XX_SPI if SPI_MASTER > > select SERIAL_SC16IS7XX_I2C if I2C > > help > > - Core driver for NXP SC16IS7xx UARTs. > > + Core driver for NXP SC16IS7xx and compatible UARTs. > > Supported ICs are: > > > > SC16IS740 > > @@ -1038,6 +1038,7 @@ config SERIAL_SC16IS7XX_CORE > > SC16IS752 > > SC16IS760 > > SC16IS762 > > + XR20M1172 (Exar) > > > > The driver supports both I2C and SPI interfaces. > > > > diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c > > index dfcc804f558f..2b40600243a9 100644 > > --- a/drivers/tty/serial/sc16is7xx.c > > +++ b/drivers/tty/serial/sc16is7xx.c > > @@ -10,6 +10,7 @@ > > #undef DEFAULT_SYMBOL_NAMESPACE > > #define DEFAULT_SYMBOL_NAMESPACE SERIAL_NXP_SC16IS7XX > > > > +#include <linux/bitfield.h> > > #include <linux/clk.h> > > #include <linux/delay.h> > > #include <linux/device.h> > > @@ -68,6 +69,7 @@ > > /* Special Register set: Only if ((LCR[7] == 1) && (LCR != 0xBF)) */ > > #define SC16IS7XX_DLL_REG (0x00) /* Divisor Latch Low */ > > #define SC16IS7XX_DLH_REG (0x01) /* Divisor Latch High */ > > +#define XR20M117X_DLD_REG (0x02) /* Divisor Fractional (requires EFR[4] = 1) */ > > > > /* Enhanced Register set: Only if (LCR == 0xBF) */ > > #define SC16IS7XX_EFR_REG (0x02) /* Enhanced Features */ > > @@ -221,6 +223,20 @@ > > #define SC16IS7XX_TCR_RX_HALT(words) ((((words) / 4) & 0x0f) << 0) > > #define SC16IS7XX_TCR_RX_RESUME(words) ((((words) / 4) & 0x0f) << 4) > > > > +/* > > + * Divisor Fractional Register bits (EXAR extension). > > + * EXAR hardware is mostly compatible with SC16IS7XX, but supports additional feature: > > + * 4x and 8x divisor, instead of default 16x. It has a special register to program it. > > + * Bits 0 to 3 is fractional divisor, it used to set value of last 16 bits of > > + * uartclk * (16 / divisor) / baud, in case of default it will be uartclk / baud. > > + * Bits 4 and 5 used as switches, and should not be set to 1 simultaneously. > > + */ > > + > > +#define XR20M117X_DLD_16X 0 > > +#define XR20M117X_DLD_DIV_MASK GENMASK(3, 0) > > +#define XR20M117X_DLD_8X BIT(4) > > +#define XR20M117X_DLD_4X BIT(5) > > + > > /* > > * TLR register bits > > * If TLR[3:0] or TLR[7:4] are logical 0, the selectable trigger levels via the > > @@ -523,6 +539,13 @@ const struct sc16is7xx_devtype sc16is762_devtype = { > > }; > > EXPORT_SYMBOL_GPL(sc16is762_devtype); > > > > +const struct sc16is7xx_devtype xr20m1172_devtype = { > > + .name = "XR20M1172", > > + .nr_gpio = 8, > > + .nr_uart = 2, > > +}; > > +EXPORT_SYMBOL_GPL(xr20m1172_devtype); > > + > > static bool sc16is7xx_regmap_volatile(struct device *dev, unsigned int reg) > > { > > switch (reg) { > > @@ -555,18 +578,43 @@ static bool sc16is7xx_regmap_noinc(struct device *dev, unsigned int reg) > > return reg == SC16IS7XX_RHR_REG; > > } > > > > +static bool sc16is7xx_has_dld(struct device *dev) > > +{ > > + struct sc16is7xx_port *s = dev_get_drvdata(dev); > > + > > + if (s->devtype == &xr20m1172_devtype) > > + return true; > > + return false; > > +} > > + > > static int sc16is7xx_set_baud(struct uart_port *port, int baud) > > { > > struct sc16is7xx_one *one = to_sc16is7xx_one(port, port); > > - u8 lcr; > > + unsigned long clk = port->uartclk, div, div16; > > + bool has_dld = sc16is7xx_has_dld(port->dev); > > + u8 dld_mode = XR20M117X_DLD_16X; > > u8 prescaler = 0; > > - unsigned long clk = port->uartclk, div = clk / 16 / baud; > > + u8 divisor = 16; > > + u8 lcr; > > + > > + if (has_dld && DIV_ROUND_CLOSEST(clk, baud) < 16) > > + divisor = rounddown_pow_of_two(DIV_ROUND_CLOSEST(clk, baud)); > > + > > + div16 = (clk * 16) / divisor / baud; > > + div = div16 / 16; > > > > if (div >= BIT(16)) { > > prescaler = SC16IS7XX_MCR_CLKSEL_BIT; > > div /= 4; > > } > > > > + /* Count additional divisor for EXAR devices */ > > + if (divisor == 8) > > + dld_mode = XR20M117X_DLD_8X; > > + if (divisor == 4) > > + dld_mode = XR20M117X_DLD_4X; > > + dld_mode |= FIELD_PREP(XR20M117X_DLD_DIV_MASK, div16); > > + > > /* Enable enhanced features */ > > sc16is7xx_efr_lock(port); > > sc16is7xx_port_update(port, SC16IS7XX_EFR_REG, > > @@ -587,12 +635,14 @@ static int sc16is7xx_set_baud(struct uart_port *port, int baud) > > regcache_cache_bypass(one->regmap, true); > > sc16is7xx_port_write(port, SC16IS7XX_DLH_REG, div / 256); > > sc16is7xx_port_write(port, SC16IS7XX_DLL_REG, div % 256); > > + if (has_dld) > > + sc16is7xx_port_write(port, XR20M117X_DLD_REG, dld_mode); > > regcache_cache_bypass(one->regmap, false); > > > > /* Restore LCR and access to general register set */ > > sc16is7xx_port_write(port, SC16IS7XX_LCR_REG, lcr); > > > > - return DIV_ROUND_CLOSEST(clk / 16, div); > > + return DIV_ROUND_CLOSEST(clk / divisor, div); > > While trying to review your code, it made me realize there is a bug > with the current return value. I will send a patch to fix it, and you > will be able to rebase your patchset on it after that. It is good. What bug are you observed? > Hugo. > > > > } > > > > static void sc16is7xx_handle_rx(struct uart_port *port, unsigned int rxlen, > > @@ -1002,6 +1052,8 @@ static void sc16is7xx_set_termios(struct uart_port *port, > > const struct ktermios *old) > > { > > struct sc16is7xx_one *one = to_sc16is7xx_one(port, port); > > + bool has_dld = sc16is7xx_has_dld(port->dev); > > + u8 divisor = has_dld ? 4 : 16; > > unsigned int lcr, flow = 0; > > int baud; > > unsigned long flags; > > @@ -1084,7 +1136,7 @@ static void sc16is7xx_set_termios(struct uart_port *port, > > /* Get baud rate generator configuration */ > > baud = uart_get_baud_rate(port, termios, old, > > port->uartclk / 16 / 4 / 0xffff, > > - port->uartclk / 16); > > + port->uartclk / divisor); > > > > /* Setup baudrate generator */ > > baud = sc16is7xx_set_baud(port, baud); > > @@ -1684,6 +1736,7 @@ void sc16is7xx_remove(struct device *dev) > > EXPORT_SYMBOL_GPL(sc16is7xx_remove); > > > > const struct of_device_id __maybe_unused sc16is7xx_dt_ids[] = { > > + { .compatible = "exar,xr20m1172", .data = &xr20m1172_devtype, }, > > { .compatible = "nxp,sc16is740", .data = &sc16is74x_devtype, }, > > { .compatible = "nxp,sc16is741", .data = &sc16is74x_devtype, }, > > { .compatible = "nxp,sc16is750", .data = &sc16is750_devtype, }, > > diff --git a/drivers/tty/serial/sc16is7xx.h b/drivers/tty/serial/sc16is7xx.h > > index afb784eaee45..eb2e3bc86f15 100644 > > --- a/drivers/tty/serial/sc16is7xx.h > > +++ b/drivers/tty/serial/sc16is7xx.h > > @@ -28,6 +28,7 @@ extern const struct sc16is7xx_devtype sc16is750_devtype; > > extern const struct sc16is7xx_devtype sc16is752_devtype; > > extern const struct sc16is7xx_devtype sc16is760_devtype; > > extern const struct sc16is7xx_devtype sc16is762_devtype; > > +extern const struct sc16is7xx_devtype xr20m1172_devtype; > > > > const char *sc16is7xx_regmap_name(u8 port_id); > > > > diff --git a/drivers/tty/serial/sc16is7xx_i2c.c b/drivers/tty/serial/sc16is7xx_i2c.c > > index 3ed47c306d85..839de902821b 100644 > > --- a/drivers/tty/serial/sc16is7xx_i2c.c > > +++ b/drivers/tty/serial/sc16is7xx_i2c.c > > @@ -46,6 +46,7 @@ static const struct i2c_device_id sc16is7xx_i2c_id_table[] = { > > { "sc16is752", (kernel_ulong_t)&sc16is752_devtype, }, > > { "sc16is760", (kernel_ulong_t)&sc16is760_devtype, }, > > { "sc16is762", (kernel_ulong_t)&sc16is762_devtype, }, > > + { "xr20m1172", (kernel_ulong_t)&xr20m1172_devtype, }, > > { } > > }; > > MODULE_DEVICE_TABLE(i2c, sc16is7xx_i2c_id_table); > > diff --git a/drivers/tty/serial/sc16is7xx_spi.c b/drivers/tty/serial/sc16is7xx_spi.c > > index 73df36f8a7fd..2b278282dbd0 100644 > > --- a/drivers/tty/serial/sc16is7xx_spi.c > > +++ b/drivers/tty/serial/sc16is7xx_spi.c > > @@ -69,6 +69,7 @@ static const struct spi_device_id sc16is7xx_spi_id_table[] = { > > { "sc16is752", (kernel_ulong_t)&sc16is752_devtype, }, > > { "sc16is760", (kernel_ulong_t)&sc16is760_devtype, }, > > { "sc16is762", (kernel_ulong_t)&sc16is762_devtype, }, > > + { "xr20m1172", (kernel_ulong_t)&xr20m1172_devtype, }, > > { } > > }; > > MODULE_DEVICE_TABLE(spi, sc16is7xx_spi_id_table); > > -- > > 2.44.0 > > > > > > > > > -- > Hugo Villeneuve ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2024-04-26 15:10 UTC | newest] Thread overview: 10+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2024-04-25 18:32 [PATCH v9 0/3] add support for EXAR XR20M1172 UART Konstantin Pugin 2024-04-25 18:32 ` [PATCH v9 1/3] serial: sc16is7xx: announce support of SER_RS485_RTS_ON_SEND Konstantin Pugin 2024-04-26 14:32 ` Andy Shevchenko 2024-04-26 15:02 ` Konstantin P. 2024-04-26 15:06 ` Andy Shevchenko 2024-04-26 15:10 ` Andy Shevchenko 2024-04-25 18:32 ` [PATCH v9 2/3] dt-bindings: sc16is7xx: Add compatible line for XR20M1172 UART Konstantin Pugin 2024-04-25 18:32 ` [PATCH v9 3/3] serial: sc16is7xx: add support for EXAR " Konstantin Pugin 2024-04-25 21:19 ` Hugo Villeneuve 2024-04-26 6:58 ` Konstantin P.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox