MOXA PCIe boards have 4 serial interfaces and don't require additional
stuff to switch between interfaces:
- RS232
- RS422
- RS485_2W (half-duplex)
- RS485_4W (full-duplex)
By using ioctl command "TIOCRS485", it can switch between default
interface and RS485 if supported.
That means, for RS422/RS485 board, it can switch between RS422 and
RS485 by setting the flags within struct serial_rs485.
However, for the RS232/RS422/RS485 board, it can only switch between
RS232 and RS485, there's no flag for switching interface into RS422.
This patch adds a flag call "SER_RS422_ENALBED" in serial.h and modifies
serial_core.c to make it possible to switch interface between RS232,
RS422 and RS485.
Signed-off-by: Crescent CY Hsieh <[email protected]>
---
drivers/tty/serial/8250/8250_pci.c | 41 ++++++++++++++++++++++++++++++
drivers/tty/serial/serial_core.c | 20 ++++++++++++---
include/uapi/linux/serial.h | 4 +++
3 files changed, 61 insertions(+), 4 deletions(-)
diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c
index 31bfe5381000..86dce37f08c0 100644
--- a/drivers/tty/serial/8250/8250_pci.c
+++ b/drivers/tty/serial/8250/8250_pci.c
@@ -1898,6 +1898,10 @@ pci_sunix_setup(struct serial_private *priv,
#define MOXA_GPIO_SET_ALL_OUTPUT 0x0F
+static const struct serial_rs485 pci_moxa_rs485_supported = {
+ .flags = SER_RS485_ENABLED | SER_RS485_RX_DURING_TX | SER_RS422_ENABLED,
+};
+
static int pci_moxa_set_interface(struct pci_dev *dev,
unsigned int port_idx,
unsigned char mode)
@@ -1921,6 +1925,30 @@ static int pci_moxa_set_interface(struct pci_dev *dev,
return 0;
}
+static int pci_moxa_rs485_config(struct uart_port *port,
+ struct ktermios *termios,
+ struct serial_rs485 *rs485)
+{
+ struct pci_dev *dev = to_pci_dev(port->dev);
+ unsigned short device = dev->device;
+ unsigned char mode = MOXA_RS232;
+
+ if (rs485->flags & SER_RS485_ENABLED) {
+ if (rs485->flags & SER_RS485_RX_DURING_TX)
+ mode = MOXA_RS485_4W;
+ else
+ mode = MOXA_RS485_2W;
+ } else if (rs485->flags & SER_RS422_ENABLED) {
+ mode = MOXA_RS422;
+ } else {
+ if ((device & 0x0F00) == 0x0300) {
+ pci_warn(dev, "RS232 interface is not supported.");
+ return -EINVAL;
+ }
+ }
+ return pci_moxa_set_interface(dev, port->line, mode);
+}
+
static int pci_moxa_init(struct pci_dev *dev)
{
unsigned short device = dev->device;
@@ -1965,9 +1993,22 @@ static int pci_moxa_setup(struct serial_private *priv,
struct uart_8250_port *port,
int idx)
{
+ struct pci_dev *dev = priv->dev;
+ unsigned short device = dev->device;
unsigned int bar = FL_GET_BASE(board->flags);
int offset;
+ /*
+ * For the device IDs of MOXA PCIe boards match the pattern 0x*3** and 0x*1**,
+ * these boards support switching interface between RS422/RS485 using TIOCSRS485.
+ */
+ if ((device & 0x0F00) == 0x0100 || (device & 0x0F00) == 0x0300) {
+ port->port.rs485_config = pci_moxa_rs485_config;
+ port->port.rs485_supported = pci_moxa_rs485_supported;
+
+ if ((device & 0x0F00) == 0x0300)
+ port->port.rs485.flags = SER_RE422_ENABLED;
+ }
if (board->num_ports == 4 && idx == 3)
offset = 7 * board->uart_offset;
else
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index 7bdc21d5e13b..f316d9705809 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -1299,7 +1299,7 @@ static int uart_get_icount(struct tty_struct *tty,
#define SER_RS485_LEGACY_FLAGS (SER_RS485_ENABLED | SER_RS485_RTS_ON_SEND | \
SER_RS485_RTS_AFTER_SEND | SER_RS485_RX_DURING_TX | \
- SER_RS485_TERMINATE_BUS)
+ SER_RS485_TERMINATE_BUS | SER_RS422_ENALBED)
static int uart_check_rs485_flags(struct uart_port *port, struct serial_rs485 *rs485)
{
@@ -1365,11 +1365,23 @@ static void uart_sanitize_serial_rs485(struct uart_port *port, struct serial_rs4
{
u32 supported_flags = port->rs485_supported.flags;
- if (!(rs485->flags & SER_RS485_ENABLED)) {
+ if (!(rs485->flags & SER_RS485_ENABLED) && !(rs485->flags & SER_RS422_ENABLED)) {
memset(rs485, 0, sizeof(*rs485));
return;
}
-
+ /* Pick sane setting if the user enables both interfaces */
+ if (rs485->flags & SER_RS485_ENABLED && rs485->flags & SER_RS422_ENABLED) {
+ dev_warn_ratelimited(port->dev,
+ "%s (%d): Invalid serial interface setting, using RS485 instead\n",
+ port->name, port->line);
+ rs485->flags &= ~(SER_RS422_ENABLED);
+ }
+ /* Clear other bits and return if enalbe RS422 */
+ if (rs485->flags & SER_RS422_ENABLED) {
+ memset(rs485, 0, sizeof(*rs485));
+ rs485->flags |= SER_RS422_ENABLED;
+ return;
+ }
/* Pick sane settings if the user hasn't */
if ((supported_flags & (SER_RS485_RTS_ON_SEND|SER_RS485_RTS_AFTER_SEND)) &&
!(rs485->flags & SER_RS485_RTS_ON_SEND) ==
@@ -1394,7 +1406,7 @@ static void uart_sanitize_serial_rs485(struct uart_port *port, struct serial_rs4
static void uart_set_rs485_termination(struct uart_port *port,
const struct serial_rs485 *rs485)
{
- if (!(rs485->flags & SER_RS485_ENABLED))
+ if (!(rs485->flags & SER_RS485_ENABLED) && !(rs485->flags & SER_RS422_ENABLED))
return;
gpiod_set_value_cansleep(port->rs485_term_gpio,
diff --git a/include/uapi/linux/serial.h b/include/uapi/linux/serial.h
index 53bc1af67a41..427609fd52cb 100644
--- a/include/uapi/linux/serial.h
+++ b/include/uapi/linux/serial.h
@@ -137,6 +137,8 @@ struct serial_icounter_struct {
* * %SER_RS485_ADDRB - Enable RS485 addressing mode.
* * %SER_RS485_ADDR_RECV - Receive address filter (enables @addr_recv). Requires %SER_RS485_ADDRB.
* * %SER_RS485_ADDR_DEST - Destination address (enables @addr_dest). Requires %SER_RS485_ADDRB.
+ *
+ * * %SER_RS422_ENABLED - RS422 enabled.
*/
struct serial_rs485 {
__u32 flags;
@@ -149,6 +151,8 @@ struct serial_rs485 {
#define SER_RS485_ADDR_RECV (1 << 7)
#define SER_RS485_ADDR_DEST (1 << 8)
+#define SER_RS422_ENABLED (1 << 9)
+
__u32 delay_rts_before_send;
__u32 delay_rts_after_send;
--
2.34.1
On 02. 10. 23, 3:57, Crescent CY Hsieh wrote:
> MOXA PCIe boards have 4 serial interfaces and don't require additional
> stuff to switch between interfaces:
>
> - RS232
> - RS422
> - RS485_2W (half-duplex)
> - RS485_4W (full-duplex)
>
> By using ioctl command "TIOCRS485", it can switch between default
> interface and RS485 if supported.
>
> That means, for RS422/RS485 board, it can switch between RS422 and
> RS485 by setting the flags within struct serial_rs485.
>
> However, for the RS232/RS422/RS485 board, it can only switch between
> RS232 and RS485, there's no flag for switching interface into RS422.
>
> This patch adds a flag call "SER_RS422_ENALBED" in serial.h and modifies
Hopefully not SER_RS422_ENALBED.
> serial_core.c to make it possible to switch interface between RS232,
> RS422 and RS485.
>
> Signed-off-by: Crescent CY Hsieh <[email protected]>
> ---
> drivers/tty/serial/8250/8250_pci.c | 41 ++++++++++++++++++++++++++++++
> drivers/tty/serial/serial_core.c | 20 ++++++++++++---
> include/uapi/linux/serial.h | 4 +++
> 3 files changed, 61 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c
> index 31bfe5381000..86dce37f08c0 100644
> --- a/drivers/tty/serial/8250/8250_pci.c
> +++ b/drivers/tty/serial/8250/8250_pci.c
> @@ -1898,6 +1898,10 @@ pci_sunix_setup(struct serial_private *priv,
>
> #define MOXA_GPIO_SET_ALL_OUTPUT 0x0F
>
> +static const struct serial_rs485 pci_moxa_rs485_supported = {
> + .flags = SER_RS485_ENABLED | SER_RS485_RX_DURING_TX | SER_RS422_ENABLED,
> +};
> +
> static int pci_moxa_set_interface(struct pci_dev *dev,
> unsigned int port_idx,
> unsigned char mode)
> @@ -1921,6 +1925,30 @@ static int pci_moxa_set_interface(struct pci_dev *dev,
> return 0;
> }
>
> +static int pci_moxa_rs485_config(struct uart_port *port,
> + struct ktermios *termios,
> + struct serial_rs485 *rs485)
> +{
> + struct pci_dev *dev = to_pci_dev(port->dev);
> + unsigned short device = dev->device;
> + unsigned char mode = MOXA_RS232;
u8
> +
> + if (rs485->flags & SER_RS485_ENABLED) {
> + if (rs485->flags & SER_RS485_RX_DURING_TX)
> + mode = MOXA_RS485_4W;
> + else
> + mode = MOXA_RS485_2W;
> + } else if (rs485->flags & SER_RS422_ENABLED) {
> + mode = MOXA_RS422;
> + } else {
> + if ((device & 0x0F00) == 0x0300) {
This is the second time you test this. Introduce a function.
> + pci_warn(dev, "RS232 interface is not supported.");
Don't spam the logs.
> + return -EINVAL;
> + }
> + }
add \n here
> + return pci_moxa_set_interface(dev, port->line, mode);
> +}
> +
> static int pci_moxa_init(struct pci_dev *dev)
> {
> unsigned short device = dev->device;
> @@ -1965,9 +1993,22 @@ static int pci_moxa_setup(struct serial_private *priv,
> struct uart_8250_port *port,
> int idx)
> {
> + struct pci_dev *dev = priv->dev;
> + unsigned short device = dev->device;
> unsigned int bar = FL_GET_BASE(board->flags);
> int offset;
>
> + /*
> + * For the device IDs of MOXA PCIe boards match the pattern 0x*3** and 0x*1**,
> + * these boards support switching interface between RS422/RS485 using TIOCSRS485.
> + */
> + if ((device & 0x0F00) == 0x0100 || (device & 0x0F00) == 0x0300) {
Use helpers.
> + port->port.rs485_config = pci_moxa_rs485_config;
> + port->port.rs485_supported = pci_moxa_rs485_supported;
> +
> + if ((device & 0x0F00) == 0x0300)
> + port->port.rs485.flags = SER_RE422_ENABLED;
> + }
> if (board->num_ports == 4 && idx == 3)
> offset = 7 * board->uart_offset;
> else
> diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
> index 7bdc21d5e13b..f316d9705809 100644
> --- a/drivers/tty/serial/serial_core.c
> +++ b/drivers/tty/serial/serial_core.c
> @@ -1299,7 +1299,7 @@ static int uart_get_icount(struct tty_struct *tty,
>
> #define SER_RS485_LEGACY_FLAGS (SER_RS485_ENABLED | SER_RS485_RTS_ON_SEND | \
> SER_RS485_RTS_AFTER_SEND | SER_RS485_RX_DURING_TX | \
> - SER_RS485_TERMINATE_BUS)
> + SER_RS485_TERMINATE_BUS | SER_RS422_ENALBED)
So have you tested this at all?
> @@ -1365,11 +1365,23 @@ static void uart_sanitize_serial_rs485(struct uart_port *port, struct serial_rs4
> {
> u32 supported_flags = port->rs485_supported.flags;
>
> - if (!(rs485->flags & SER_RS485_ENABLED)) {
> + if (!(rs485->flags & SER_RS485_ENABLED) && !(rs485->flags & SER_RS422_ENABLED)) {
> memset(rs485, 0, sizeof(*rs485));
> return;
> }
> -
> + /* Pick sane setting if the user enables both interfaces */
> + if (rs485->flags & SER_RS485_ENABLED && rs485->flags & SER_RS422_ENABLED) {
> + dev_warn_ratelimited(port->dev,
> + "%s (%d): Invalid serial interface setting, using RS485 instead\n",
> + port->name, port->line);
> + rs485->flags &= ~(SER_RS422_ENABLED);
No need for parens.
> + }
> + /* Clear other bits and return if enalbe RS422 */
enable
> + if (rs485->flags & SER_RS422_ENABLED) {
> + memset(rs485, 0, sizeof(*rs485));
> + rs485->flags |= SER_RS422_ENABLED;
> + return;
> + }
> /* Pick sane settings if the user hasn't */
> if ((supported_flags & (SER_RS485_RTS_ON_SEND|SER_RS485_RTS_AFTER_SEND)) &&
> !(rs485->flags & SER_RS485_RTS_ON_SEND) ==
> @@ -1394,7 +1406,7 @@ static void uart_sanitize_serial_rs485(struct uart_port *port, struct serial_rs4
> static void uart_set_rs485_termination(struct uart_port *port,
> const struct serial_rs485 *rs485)
> {
> - if (!(rs485->flags & SER_RS485_ENABLED))
> + if (!(rs485->flags & SER_RS485_ENABLED) && !(rs485->flags & SER_RS422_ENABLED))
> return;
>
> gpiod_set_value_cansleep(port->rs485_term_gpio,
> diff --git a/include/uapi/linux/serial.h b/include/uapi/linux/serial.h
> index 53bc1af67a41..427609fd52cb 100644
> --- a/include/uapi/linux/serial.h
> +++ b/include/uapi/linux/serial.h
> @@ -137,6 +137,8 @@ struct serial_icounter_struct {
> * * %SER_RS485_ADDRB - Enable RS485 addressing mode.
> * * %SER_RS485_ADDR_RECV - Receive address filter (enables @addr_recv). Requires %SER_RS485_ADDRB.
> * * %SER_RS485_ADDR_DEST - Destination address (enables @addr_dest). Requires %SER_RS485_ADDRB.
> + *
> + * * %SER_RS422_ENABLED - RS422 enabled.
> */
> struct serial_rs485 {
> __u32 flags;
> @@ -149,6 +151,8 @@ struct serial_rs485 {
> #define SER_RS485_ADDR_RECV (1 << 7)
> #define SER_RS485_ADDR_DEST (1 << 8)
>
> +#define SER_RS422_ENABLED (1 << 9)
> +
> __u32 delay_rts_before_send;
> __u32 delay_rts_after_send;
>
thanks,
--
js
suse labs
Hi Crescent,
kernel test robot noticed the following build errors:
[auto build test ERROR on tty/tty-testing]
[also build test ERROR on tty/tty-next tty/tty-linus usb/usb-testing usb/usb-next usb/usb-linus linus/master v6.6-rc4 next-20230929]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Crescent-CY-Hsieh/tty-serial-8250-Cleanup-MOXA-configurations-in-8250_pci-c/20231002-095945
base: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty-testing
patch link: https://lore.kernel.org/r/20231002015702.30509-5-crescentcy.hsieh%40moxa.com
patch subject: [PATCH 4/4] tty: serial: 8250: Add support for MOXA PCIe boards to switch interface between RS422/RS485
config: sparc-allnoconfig (https://download.01.org/0day-ci/archive/20231002/[email protected]/config)
compiler: sparc-linux-gcc (GCC) 13.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20231002/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
drivers/tty/serial/serial_core.c: In function 'uart_check_rs485_flags':
>> drivers/tty/serial/serial_core.c:1302:60: error: 'SER_RS422_ENALBED' undeclared (first use in this function); did you mean 'SER_RS422_ENABLED'?
1302 | SER_RS485_TERMINATE_BUS | SER_RS422_ENALBED)
| ^~~~~~~~~~~~~~~~~
drivers/tty/serial/serial_core.c:1309:19: note: in expansion of macro 'SER_RS485_LEGACY_FLAGS'
1309 | flags &= ~SER_RS485_LEGACY_FLAGS;
| ^~~~~~~~~~~~~~~~~~~~~~
drivers/tty/serial/serial_core.c:1302:60: note: each undeclared identifier is reported only once for each function it appears in
1302 | SER_RS485_TERMINATE_BUS | SER_RS422_ENALBED)
| ^~~~~~~~~~~~~~~~~
drivers/tty/serial/serial_core.c:1309:19: note: in expansion of macro 'SER_RS485_LEGACY_FLAGS'
1309 | flags &= ~SER_RS485_LEGACY_FLAGS;
| ^~~~~~~~~~~~~~~~~~~~~~
vim +1302 drivers/tty/serial/serial_core.c
1299
1300 #define SER_RS485_LEGACY_FLAGS (SER_RS485_ENABLED | SER_RS485_RTS_ON_SEND | \
1301 SER_RS485_RTS_AFTER_SEND | SER_RS485_RX_DURING_TX | \
> 1302 SER_RS485_TERMINATE_BUS | SER_RS422_ENALBED)
1303
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
Hi Crescent,
kernel test robot noticed the following build errors:
[auto build test ERROR on tty/tty-testing]
[also build test ERROR on tty/tty-next tty/tty-linus usb/usb-testing usb/usb-next usb/usb-linus linus/master v6.6-rc4 next-20230929]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Crescent-CY-Hsieh/tty-serial-8250-Cleanup-MOXA-configurations-in-8250_pci-c/20231002-095945
base: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty-testing
patch link: https://lore.kernel.org/r/20231002015702.30509-5-crescentcy.hsieh%40moxa.com
patch subject: [PATCH 4/4] tty: serial: 8250: Add support for MOXA PCIe boards to switch interface between RS422/RS485
config: alpha-defconfig (https://download.01.org/0day-ci/archive/20231002/[email protected]/config)
compiler: alpha-linux-gcc (GCC) 13.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20231002/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
drivers/tty/serial/8250/8250_pci.c: In function 'pci_moxa_setup':
>> drivers/tty/serial/8250/8250_pci.c:2010:50: error: 'SER_RE422_ENABLED' undeclared (first use in this function); did you mean 'SER_RS422_ENABLED'?
2010 | port->port.rs485.flags = SER_RE422_ENABLED;
| ^~~~~~~~~~~~~~~~~
| SER_RS422_ENABLED
drivers/tty/serial/8250/8250_pci.c:2010:50: note: each undeclared identifier is reported only once for each function it appears in
vim +2010 drivers/tty/serial/8250/8250_pci.c
1990
1991 static int pci_moxa_setup(struct serial_private *priv,
1992 const struct pciserial_board *board,
1993 struct uart_8250_port *port,
1994 int idx)
1995 {
1996 struct pci_dev *dev = priv->dev;
1997 unsigned short device = dev->device;
1998 unsigned int bar = FL_GET_BASE(board->flags);
1999 int offset;
2000
2001 /*
2002 * For the device IDs of MOXA PCIe boards match the pattern 0x*3** and 0x*1**,
2003 * these boards support switching interface between RS422/RS485 using TIOCSRS485.
2004 */
2005 if ((device & 0x0F00) == 0x0100 || (device & 0x0F00) == 0x0300) {
2006 port->port.rs485_config = pci_moxa_rs485_config;
2007 port->port.rs485_supported = pci_moxa_rs485_supported;
2008
2009 if ((device & 0x0F00) == 0x0300)
> 2010 port->port.rs485.flags = SER_RE422_ENABLED;
2011 }
2012 if (board->num_ports == 4 && idx == 3)
2013 offset = 7 * board->uart_offset;
2014 else
2015 offset = idx * board->uart_offset;
2016
2017 return setup_port(priv, port, bar, offset, 0);
2018 }
2019
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
On Mon, Oct 02, 2023 at 09:19:26AM +0200, Jiri Slaby wrote:
> On 02. 10. 23, 3:57, Crescent CY Hsieh wrote:
> > MOXA PCIe boards have 4 serial interfaces and don't require additional
> > stuff to switch between interfaces:
> >
> > - RS232
> > - RS422
> > - RS485_2W (half-duplex)
> > - RS485_4W (full-duplex)
> >
> > By using ioctl command "TIOCRS485", it can switch between default
> > interface and RS485 if supported.
> >
> > That means, for RS422/RS485 board, it can switch between RS422 and
> > RS485 by setting the flags within struct serial_rs485.
> >
> > However, for the RS232/RS422/RS485 board, it can only switch between
> > RS232 and RS485, there's no flag for switching interface into RS422.
> >
> > This patch adds a flag call "SER_RS422_ENALBED" in serial.h and modifies
>
> Hopefully not SER_RS422_ENALBED.
What if I use an existing flag within struct serial_rs485 to represent
RS422 as a workaround solution?
> > @@ -1299,7 +1299,7 @@ static int uart_get_icount(struct tty_struct *tty,
> > #define SER_RS485_LEGACY_FLAGS (SER_RS485_ENABLED | SER_RS485_RTS_ON_SEND | \
> > SER_RS485_RTS_AFTER_SEND | SER_RS485_RX_DURING_TX | \
> > - SER_RS485_TERMINATE_BUS)
> > + SER_RS485_TERMINATE_BUS | SER_RS422_ENALBED)
>
> So have you tested this at all?
I have tested it by switching the serial interface using TIOCSRS485
ioctl command, but it seems that I send the wrong patch which mistyping
SER_RS422_ENABLED.
---
Sincerely,
Crescent CY Hsieh