| Message ID | 20220426122448.38997-6-ilpo.jarvinen@linux.intel.com (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | None | expand |
On Tue, Apr 26, 2022 at 03:24:43PM +0300, Ilpo Järvinen wrote: > Add ADDRB to termbits to indicate 9th bit addressing mode. This change > is necessary for supporting devices with RS485 multipoint addressing > [*]. A later patch in the patch series adds support for Synopsys > Designware UART capable for 9th bit addressing mode. In this mode, 9th > bit is used to indicate an address (byte) within the communication > line. The 9th bit addressing mode is selected using ADDRB introduced by > an earlier patch. > > [*] Technically, RS485 is just an electronic spec and does not itself > specify the 9th bit addressing mode but 9th bit seems at least > "semi-standard" way to do addressing with RS485. > > Cc: linux-api@vger.kernel.org > Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru> > Cc: Matt Turner <mattst88@gmail.com> > Cc: linux-alpha@vger.kernel.org > Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de> > Cc: linux-mips@vger.kernel.org > Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com> > Cc: Helge Deller <deller@gmx.de> > Cc: linux-parisc@vger.kernel.org > Cc: Michael Ellerman <mpe@ellerman.id.au> > Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> > Cc: Paul Mackerras <paulus@samba.org> > Cc: linuxppc-dev@lists.ozlabs.org > Cc: "David S. Miller" <davem@davemloft.net> > Cc: sparclinux@vger.kernel.org > Cc: Arnd Bergmann <arnd@arndb.de> > Cc: linux-arch@vger.kernel.org > Cc: linux-usb@vger.kernel.org > Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> > --- > arch/alpha/include/uapi/asm/termbits.h | 1 + > arch/mips/include/uapi/asm/termbits.h | 1 + > arch/parisc/include/uapi/asm/termbits.h | 1 + > arch/powerpc/include/uapi/asm/termbits.h | 1 + > arch/sparc/include/uapi/asm/termbits.h | 1 + > drivers/char/pcmcia/synclink_cs.c | 2 ++ > drivers/ipack/devices/ipoctal.c | 2 ++ > drivers/mmc/core/sdio_uart.c | 2 ++ > drivers/net/usb/hso.c | 3 ++- > drivers/s390/char/tty3270.c | 3 +++ > drivers/staging/greybus/uart.c | 2 ++ > drivers/tty/amiserial.c | 6 +++++- > drivers/tty/moxa.c | 1 + > drivers/tty/mxser.c | 1 + > drivers/tty/serial/serial_core.c | 2 ++ > drivers/tty/synclink_gt.c | 2 ++ > drivers/tty/tty_ioctl.c | 2 ++ > drivers/usb/class/cdc-acm.c | 2 ++ > drivers/usb/serial/usb-serial.c | 6 ++++-- > include/uapi/asm-generic/termbits.h | 1 + > net/bluetooth/rfcomm/tty.c | 2 ++ > 21 files changed, 40 insertions(+), 4 deletions(-) > > diff --git a/arch/alpha/include/uapi/asm/termbits.h b/arch/alpha/include/uapi/asm/termbits.h > index 4575ba34a0ea..0c123e715486 100644 > --- a/arch/alpha/include/uapi/asm/termbits.h > +++ b/arch/alpha/include/uapi/asm/termbits.h > @@ -180,6 +180,7 @@ struct ktermios { > #define HUPCL 00040000 > > #define CLOCAL 00100000 > +#define ADDRB 004000000000 /* address bit */ > #define CMSPAR 010000000000 /* mark or space (stick) parity */ > #define CRTSCTS 020000000000 /* flow control */ > > diff --git a/arch/mips/include/uapi/asm/termbits.h b/arch/mips/include/uapi/asm/termbits.h > index dfeffba729b7..4732d31b0e4e 100644 > --- a/arch/mips/include/uapi/asm/termbits.h > +++ b/arch/mips/include/uapi/asm/termbits.h > @@ -182,6 +182,7 @@ struct ktermios { > #define B3500000 0010016 > #define B4000000 0010017 > #define CIBAUD 002003600000 /* input baud rate */ > +#define ADDRB 004000000000 /* address bit */ > #define CMSPAR 010000000000 /* mark or space (stick) parity */ > #define CRTSCTS 020000000000 /* flow control */ > > diff --git a/arch/parisc/include/uapi/asm/termbits.h b/arch/parisc/include/uapi/asm/termbits.h > index 40e920f8d683..d6bbd10d92ba 100644 > --- a/arch/parisc/include/uapi/asm/termbits.h > +++ b/arch/parisc/include/uapi/asm/termbits.h > @@ -159,6 +159,7 @@ struct ktermios { > #define B3500000 0010016 > #define B4000000 0010017 > #define CIBAUD 002003600000 /* input baud rate */ > +#define ADDRB 004000000000 /* address bit */ tabs where the rest were not? > #define CMSPAR 010000000000 /* mark or space (stick) parity */ > #define CRTSCTS 020000000000 /* flow control */ > > diff --git a/arch/powerpc/include/uapi/asm/termbits.h b/arch/powerpc/include/uapi/asm/termbits.h > index ed18bc61f63d..c6a033732f39 100644 > --- a/arch/powerpc/include/uapi/asm/termbits.h > +++ b/arch/powerpc/include/uapi/asm/termbits.h > @@ -171,6 +171,7 @@ struct ktermios { > #define HUPCL 00040000 > > #define CLOCAL 00100000 > +#define ADDRB 004000000000 /* address bit */ > #define CMSPAR 010000000000 /* mark or space (stick) parity */ > #define CRTSCTS 020000000000 /* flow control */ > > diff --git a/arch/sparc/include/uapi/asm/termbits.h b/arch/sparc/include/uapi/asm/termbits.h > index ce5ad5d0f105..5eb1d547b5c4 100644 > --- a/arch/sparc/include/uapi/asm/termbits.h > +++ b/arch/sparc/include/uapi/asm/termbits.h > @@ -201,6 +201,7 @@ struct ktermios { > #define B3500000 0x00001012 > #define B4000000 0x00001013 */ > #define CIBAUD 0x100f0000 /* input baud rate (not used) */ > +#define ADDRB 0x20000000 /* address bit */ > #define CMSPAR 0x40000000 /* mark or space (stick) parity */ > #define CRTSCTS 0x80000000 /* flow control */ Why all the different values? Can't we pick one and use it for all arches? Having these be different in different arches and userspace should not be a thing for new fields, right? > diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c > index 78baba55a8b5..d179b9b57a25 100644 > --- a/drivers/char/pcmcia/synclink_cs.c > +++ b/drivers/char/pcmcia/synclink_cs.c > @@ -2287,6 +2287,8 @@ static void mgslpc_set_termios(struct tty_struct *tty, struct ktermios *old_term > == RELEVANT_IFLAG(old_termios->c_iflag))) > return; > > + tty->termios.c_cflag &= ~ADDRB; Having to do this for all drivers feels wrong. It isn't needed for any other flag, right? That makes me really not like this change as it feels very ackward and yet-another-thing-a-serial-driver-has-to-remember. And as you are wanting to pass this bit to userspace, where is that documented? thanks, greg k-h
On Tue, 26 Apr 2022, Greg KH wrote: > On Tue, Apr 26, 2022 at 03:24:43PM +0300, Ilpo Järvinen wrote: > > Add ADDRB to termbits to indicate 9th bit addressing mode. This change > > is necessary for supporting devices with RS485 multipoint addressing > > [*]. A later patch in the patch series adds support for Synopsys > > Designware UART capable for 9th bit addressing mode. In this mode, 9th > > bit is used to indicate an address (byte) within the communication > > line. The 9th bit addressing mode is selected using ADDRB introduced by > > an earlier patch. > > > > [*] Technically, RS485 is just an electronic spec and does not itself > > specify the 9th bit addressing mode but 9th bit seems at least > > "semi-standard" way to do addressing with RS485. > > > > Cc: linux-api@vger.kernel.org > > Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru> > > Cc: Matt Turner <mattst88@gmail.com> > > Cc: linux-alpha@vger.kernel.org > > Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de> > > Cc: linux-mips@vger.kernel.org > > Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com> > > Cc: Helge Deller <deller@gmx.de> > > Cc: linux-parisc@vger.kernel.org > > Cc: Michael Ellerman <mpe@ellerman.id.au> > > Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> > > Cc: Paul Mackerras <paulus@samba.org> > > Cc: linuxppc-dev@lists.ozlabs.org > > Cc: "David S. Miller" <davem@davemloft.net> > > Cc: sparclinux@vger.kernel.org > > Cc: Arnd Bergmann <arnd@arndb.de> > > Cc: linux-arch@vger.kernel.org > > Cc: linux-usb@vger.kernel.org > > Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> > > --- > > arch/alpha/include/uapi/asm/termbits.h | 1 + > > arch/mips/include/uapi/asm/termbits.h | 1 + > > arch/parisc/include/uapi/asm/termbits.h | 1 + > > arch/powerpc/include/uapi/asm/termbits.h | 1 + > > arch/sparc/include/uapi/asm/termbits.h | 1 + > > drivers/char/pcmcia/synclink_cs.c | 2 ++ > > drivers/ipack/devices/ipoctal.c | 2 ++ > > drivers/mmc/core/sdio_uart.c | 2 ++ > > drivers/net/usb/hso.c | 3 ++- > > drivers/s390/char/tty3270.c | 3 +++ > > drivers/staging/greybus/uart.c | 2 ++ > > drivers/tty/amiserial.c | 6 +++++- > > drivers/tty/moxa.c | 1 + > > drivers/tty/mxser.c | 1 + > > drivers/tty/serial/serial_core.c | 2 ++ > > drivers/tty/synclink_gt.c | 2 ++ > > drivers/tty/tty_ioctl.c | 2 ++ > > drivers/usb/class/cdc-acm.c | 2 ++ > > drivers/usb/serial/usb-serial.c | 6 ++++-- > > include/uapi/asm-generic/termbits.h | 1 + > > net/bluetooth/rfcomm/tty.c | 2 ++ > > 21 files changed, 40 insertions(+), 4 deletions(-) > > > > diff --git a/arch/alpha/include/uapi/asm/termbits.h b/arch/alpha/include/uapi/asm/termbits.h > > index 4575ba34a0ea..0c123e715486 100644 > > --- a/arch/alpha/include/uapi/asm/termbits.h > > +++ b/arch/alpha/include/uapi/asm/termbits.h > > @@ -180,6 +180,7 @@ struct ktermios { > > #define HUPCL 00040000 > > > > #define CLOCAL 00100000 > > +#define ADDRB 004000000000 /* address bit */ > > #define CMSPAR 010000000000 /* mark or space (stick) parity */ > > #define CRTSCTS 020000000000 /* flow control */ > > > > diff --git a/arch/mips/include/uapi/asm/termbits.h b/arch/mips/include/uapi/asm/termbits.h > > index dfeffba729b7..4732d31b0e4e 100644 > > --- a/arch/mips/include/uapi/asm/termbits.h > > +++ b/arch/mips/include/uapi/asm/termbits.h > > @@ -182,6 +182,7 @@ struct ktermios { > > #define B3500000 0010016 > > #define B4000000 0010017 > > #define CIBAUD 002003600000 /* input baud rate */ > > +#define ADDRB 004000000000 /* address bit */ > > #define CMSPAR 010000000000 /* mark or space (stick) parity */ > > #define CRTSCTS 020000000000 /* flow control */ > > > > diff --git a/arch/parisc/include/uapi/asm/termbits.h b/arch/parisc/include/uapi/asm/termbits.h > > index 40e920f8d683..d6bbd10d92ba 100644 > > --- a/arch/parisc/include/uapi/asm/termbits.h > > +++ b/arch/parisc/include/uapi/asm/termbits.h > > @@ -159,6 +159,7 @@ struct ktermios { > > #define B3500000 0010016 > > #define B4000000 0010017 > > #define CIBAUD 002003600000 /* input baud rate */ > > +#define ADDRB 004000000000 /* address bit */ > > tabs where the rest were not? > > > #define CMSPAR 010000000000 /* mark or space (stick) parity */ > > #define CRTSCTS 020000000000 /* flow control */ > > > > diff --git a/arch/powerpc/include/uapi/asm/termbits.h b/arch/powerpc/include/uapi/asm/termbits.h > > index ed18bc61f63d..c6a033732f39 100644 > > --- a/arch/powerpc/include/uapi/asm/termbits.h > > +++ b/arch/powerpc/include/uapi/asm/termbits.h > > @@ -171,6 +171,7 @@ struct ktermios { > > #define HUPCL 00040000 > > > > #define CLOCAL 00100000 > > +#define ADDRB 004000000000 /* address bit */ > > #define CMSPAR 010000000000 /* mark or space (stick) parity */ > > #define CRTSCTS 020000000000 /* flow control */ > > > > diff --git a/arch/sparc/include/uapi/asm/termbits.h b/arch/sparc/include/uapi/asm/termbits.h > > index ce5ad5d0f105..5eb1d547b5c4 100644 > > --- a/arch/sparc/include/uapi/asm/termbits.h > > +++ b/arch/sparc/include/uapi/asm/termbits.h > > @@ -201,6 +201,7 @@ struct ktermios { > > #define B3500000 0x00001012 > > #define B4000000 0x00001013 */ > > #define CIBAUD 0x100f0000 /* input baud rate (not used) */ > > +#define ADDRB 0x20000000 /* address bit */ > > #define CMSPAR 0x40000000 /* mark or space (stick) parity */ > > #define CRTSCTS 0x80000000 /* flow control */ > > Why all the different values? Can't we pick one and use it for all > arches? Having these be different in different arches and userspace > should not be a thing for new fields, right? > > > diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c > > index 78baba55a8b5..d179b9b57a25 100644 > > --- a/drivers/char/pcmcia/synclink_cs.c > > +++ b/drivers/char/pcmcia/synclink_cs.c > > @@ -2287,6 +2287,8 @@ static void mgslpc_set_termios(struct tty_struct *tty, struct ktermios *old_term > > == RELEVANT_IFLAG(old_termios->c_iflag))) > > return; > > > > + tty->termios.c_cflag &= ~ADDRB; > > Having to do this for all drivers feels wrong. It isn't needed for any > other flag, right? My understanding is that it would be needed for other flags too, it's just that many drivers probably haven't cared enough. Some drivers certainly clear a few flags they don't support while others don't clear any but it's also challenging to determine it which flags which driver supports. How bad the impact is per flag varies. > That makes me really not like this change as it > feels very ackward and > yet-another-thing-a-serial-driver-has-to-remember. It would be nice to have some mask for supported bits per driver. But it will be challenging to add at this point and I'm far from sure I could get them right per driver even if carefully trying to. > And as you are wanting to pass this bit to userspace, where is that > documented? Ah, I probably should add it to driver-api/serial/driver.rst too but ADDRB is certainly mentioned alongside with other addressing mode documentation I wrote for the later changes in this series.
One additional thing below I missed on the first read. On Tue, 26 Apr 2022, Ilpo Järvinen wrote: > On Tue, 26 Apr 2022, Greg KH wrote: > > > On Tue, Apr 26, 2022 at 03:24:43PM +0300, Ilpo Järvinen wrote: > > > Add ADDRB to termbits to indicate 9th bit addressing mode. This change > > > is necessary for supporting devices with RS485 multipoint addressing > > > [*]. A later patch in the patch series adds support for Synopsys > > > Designware UART capable for 9th bit addressing mode. In this mode, 9th > > > bit is used to indicate an address (byte) within the communication > > > line. The 9th bit addressing mode is selected using ADDRB introduced by > > > an earlier patch. > > > > > > [*] Technically, RS485 is just an electronic spec and does not itself > > > specify the 9th bit addressing mode but 9th bit seems at least > > > "semi-standard" way to do addressing with RS485. > > > > > > Cc: linux-api@vger.kernel.org > > > Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru> > > > Cc: Matt Turner <mattst88@gmail.com> > > > Cc: linux-alpha@vger.kernel.org > > > Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de> > > > Cc: linux-mips@vger.kernel.org > > > Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com> > > > Cc: Helge Deller <deller@gmx.de> > > > Cc: linux-parisc@vger.kernel.org > > > Cc: Michael Ellerman <mpe@ellerman.id.au> > > > Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> > > > Cc: Paul Mackerras <paulus@samba.org> > > > Cc: linuxppc-dev@lists.ozlabs.org > > > Cc: "David S. Miller" <davem@davemloft.net> > > > Cc: sparclinux@vger.kernel.org > > > Cc: Arnd Bergmann <arnd@arndb.de> > > > Cc: linux-arch@vger.kernel.org > > > Cc: linux-usb@vger.kernel.org > > > Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> > > > --- > > > #define CMSPAR 010000000000 /* mark or space (stick) parity */ > > > #define CRTSCTS 020000000000 /* flow control */ > > > > > > diff --git a/arch/powerpc/include/uapi/asm/termbits.h b/arch/powerpc/include/uapi/asm/termbits.h > > > index ed18bc61f63d..c6a033732f39 100644 > > > --- a/arch/powerpc/include/uapi/asm/termbits.h > > > +++ b/arch/powerpc/include/uapi/asm/termbits.h > > > @@ -171,6 +171,7 @@ struct ktermios { > > > #define HUPCL 00040000 > > > > > > #define CLOCAL 00100000 > > > +#define ADDRB 004000000000 /* address bit */ > > > #define CMSPAR 010000000000 /* mark or space (stick) parity */ > > > #define CRTSCTS 020000000000 /* flow control */ > > > > > > diff --git a/arch/sparc/include/uapi/asm/termbits.h b/arch/sparc/include/uapi/asm/termbits.h > > > index ce5ad5d0f105..5eb1d547b5c4 100644 > > > --- a/arch/sparc/include/uapi/asm/termbits.h > > > +++ b/arch/sparc/include/uapi/asm/termbits.h > > > @@ -201,6 +201,7 @@ struct ktermios { > > > #define B3500000 0x00001012 > > > #define B4000000 0x00001013 */ > > > #define CIBAUD 0x100f0000 /* input baud rate (not used) */ > > > +#define ADDRB 0x20000000 /* address bit */ > > > #define CMSPAR 0x40000000 /* mark or space (stick) parity */ > > > #define CRTSCTS 0x80000000 /* flow control */ > > > > Why all the different values? Can't we pick one and use it for all > > arches? Having these be different in different arches and userspace > > should not be a thing for new fields, right? ADDRB value is the same for all archs (it's just this octal vs hex notation I've followed as per the nearby defines within the same file which makes them look different). Should I perhaps add to my cleanup list conversion of all those octal ones to hex? > > > diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c > > > index 78baba55a8b5..d179b9b57a25 100644 > > > --- a/drivers/char/pcmcia/synclink_cs.c > > > +++ b/drivers/char/pcmcia/synclink_cs.c > > > @@ -2287,6 +2287,8 @@ static void mgslpc_set_termios(struct tty_struct *tty, struct ktermios *old_term > > > == RELEVANT_IFLAG(old_termios->c_iflag))) > > > return; > > > > > > + tty->termios.c_cflag &= ~ADDRB; > > > > Having to do this for all drivers feels wrong. It isn't needed for any > > other flag, right? > > My understanding is that it would be needed for other flags too, it's just > that many drivers probably haven't cared enough. Some drivers certainly > clear a few flags they don't support while others don't clear any but > it's also challenging to determine it which flags which driver supports. > How bad the impact is per flag varies. > > > That makes me really not like this change as it > > feels very ackward and > > yet-another-thing-a-serial-driver-has-to-remember. > > It would be nice to have some mask for supported bits per driver. But it > will be challenging to add at this point and I'm far from sure I could get > them right per driver even if carefully trying to. > > > And as you are wanting to pass this bit to userspace, where is that > > documented? > > Ah, I probably should add it to driver-api/serial/driver.rst too but ADDRB > is certainly mentioned alongside with other addressing mode documentation > I wrote for the later changes in this series.
On Tue, Apr 26, 2022 at 05:01:31PM +0300, Ilpo Järvinen wrote: > One additional thing below I missed on the first read. > > On Tue, 26 Apr 2022, Ilpo Järvinen wrote: > > On Tue, 26 Apr 2022, Greg KH wrote: > > > > > On Tue, Apr 26, 2022 at 03:24:43PM +0300, Ilpo Järvinen wrote: > > > > Add ADDRB to termbits to indicate 9th bit addressing mode. This change > > > > is necessary for supporting devices with RS485 multipoint addressing > > > > [*]. A later patch in the patch series adds support for Synopsys > > > > Designware UART capable for 9th bit addressing mode. In this mode, 9th > > > > bit is used to indicate an address (byte) within the communication > > > > line. The 9th bit addressing mode is selected using ADDRB introduced by > > > > an earlier patch. > > > > > > > > [*] Technically, RS485 is just an electronic spec and does not itself > > > > specify the 9th bit addressing mode but 9th bit seems at least > > > > "semi-standard" way to do addressing with RS485. > > > > > > > > Cc: linux-api@vger.kernel.org > > > > Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru> > > > > Cc: Matt Turner <mattst88@gmail.com> > > > > Cc: linux-alpha@vger.kernel.org > > > > Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de> > > > > Cc: linux-mips@vger.kernel.org > > > > Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com> > > > > Cc: Helge Deller <deller@gmx.de> > > > > Cc: linux-parisc@vger.kernel.org > > > > Cc: Michael Ellerman <mpe@ellerman.id.au> > > > > Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> > > > > Cc: Paul Mackerras <paulus@samba.org> > > > > Cc: linuxppc-dev@lists.ozlabs.org > > > > Cc: "David S. Miller" <davem@davemloft.net> > > > > Cc: sparclinux@vger.kernel.org > > > > Cc: Arnd Bergmann <arnd@arndb.de> > > > > Cc: linux-arch@vger.kernel.org > > > > Cc: linux-usb@vger.kernel.org > > > > Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> > > > > --- > > > > > #define CMSPAR 010000000000 /* mark or space (stick) parity */ > > > > #define CRTSCTS 020000000000 /* flow control */ > > > > > > > > diff --git a/arch/powerpc/include/uapi/asm/termbits.h b/arch/powerpc/include/uapi/asm/termbits.h > > > > index ed18bc61f63d..c6a033732f39 100644 > > > > --- a/arch/powerpc/include/uapi/asm/termbits.h > > > > +++ b/arch/powerpc/include/uapi/asm/termbits.h > > > > @@ -171,6 +171,7 @@ struct ktermios { > > > > #define HUPCL 00040000 > > > > > > > > #define CLOCAL 00100000 > > > > +#define ADDRB 004000000000 /* address bit */ > > > > #define CMSPAR 010000000000 /* mark or space (stick) parity */ > > > > #define CRTSCTS 020000000000 /* flow control */ > > > > > > > > diff --git a/arch/sparc/include/uapi/asm/termbits.h b/arch/sparc/include/uapi/asm/termbits.h > > > > index ce5ad5d0f105..5eb1d547b5c4 100644 > > > > --- a/arch/sparc/include/uapi/asm/termbits.h > > > > +++ b/arch/sparc/include/uapi/asm/termbits.h > > > > @@ -201,6 +201,7 @@ struct ktermios { > > > > #define B3500000 0x00001012 > > > > #define B4000000 0x00001013 */ > > > > #define CIBAUD 0x100f0000 /* input baud rate (not used) */ > > > > +#define ADDRB 0x20000000 /* address bit */ > > > > #define CMSPAR 0x40000000 /* mark or space (stick) parity */ > > > > #define CRTSCTS 0x80000000 /* flow control */ > > > > > > Why all the different values? Can't we pick one and use it for all > > > arches? Having these be different in different arches and userspace > > > should not be a thing for new fields, right? > > ADDRB value is the same for all archs (it's just this octal vs hex > notation I've followed as per the nearby defines within the same file > which makes them look different). > > Should I perhaps add to my cleanup list conversion of all those octal ones > to hex? Argh, yes, please, let's do that now, I totally missed that. Will let us see how to unify them as well. thanks, greg k-h
On Tue, 26 Apr 2022, Greg KH wrote: > On Tue, Apr 26, 2022 at 05:01:31PM +0300, Ilpo Järvinen wrote: > > > > ADDRB value is the same for all archs (it's just this octal vs hex > > notation I've followed as per the nearby defines within the same file > > which makes them look different). > > > > Should I perhaps add to my cleanup list conversion of all those octal ones > > to hex? > > Argh, yes, please, let's do that now, I totally missed that. Will let > us see how to unify them as well. Unifying them might turn out impractical, here's a rough idea now many copies ... | uniq -c finds for the defines (based on more aggressively cleaned up lines than the patch will have): 89 1 74 2 14 3 58 4 11 5 54 6 There just tends to be 1 or 2 archs which are different from the others. ...I'll send the actual octal-to-hex patch once the arch builds complete.
diff --git a/arch/alpha/include/uapi/asm/termbits.h b/arch/alpha/include/uapi/asm/termbits.h index 4575ba34a0ea..0c123e715486 100644 --- a/arch/alpha/include/uapi/asm/termbits.h +++ b/arch/alpha/include/uapi/asm/termbits.h @@ -180,6 +180,7 @@ struct ktermios { #define HUPCL 00040000 #define CLOCAL 00100000 +#define ADDRB 004000000000 /* address bit */ #define CMSPAR 010000000000 /* mark or space (stick) parity */ #define CRTSCTS 020000000000 /* flow control */ diff --git a/arch/mips/include/uapi/asm/termbits.h b/arch/mips/include/uapi/asm/termbits.h index dfeffba729b7..4732d31b0e4e 100644 --- a/arch/mips/include/uapi/asm/termbits.h +++ b/arch/mips/include/uapi/asm/termbits.h @@ -182,6 +182,7 @@ struct ktermios { #define B3500000 0010016 #define B4000000 0010017 #define CIBAUD 002003600000 /* input baud rate */ +#define ADDRB 004000000000 /* address bit */ #define CMSPAR 010000000000 /* mark or space (stick) parity */ #define CRTSCTS 020000000000 /* flow control */ diff --git a/arch/parisc/include/uapi/asm/termbits.h b/arch/parisc/include/uapi/asm/termbits.h index 40e920f8d683..d6bbd10d92ba 100644 --- a/arch/parisc/include/uapi/asm/termbits.h +++ b/arch/parisc/include/uapi/asm/termbits.h @@ -159,6 +159,7 @@ struct ktermios { #define B3500000 0010016 #define B4000000 0010017 #define CIBAUD 002003600000 /* input baud rate */ +#define ADDRB 004000000000 /* address bit */ #define CMSPAR 010000000000 /* mark or space (stick) parity */ #define CRTSCTS 020000000000 /* flow control */ diff --git a/arch/powerpc/include/uapi/asm/termbits.h b/arch/powerpc/include/uapi/asm/termbits.h index ed18bc61f63d..c6a033732f39 100644 --- a/arch/powerpc/include/uapi/asm/termbits.h +++ b/arch/powerpc/include/uapi/asm/termbits.h @@ -171,6 +171,7 @@ struct ktermios { #define HUPCL 00040000 #define CLOCAL 00100000 +#define ADDRB 004000000000 /* address bit */ #define CMSPAR 010000000000 /* mark or space (stick) parity */ #define CRTSCTS 020000000000 /* flow control */ diff --git a/arch/sparc/include/uapi/asm/termbits.h b/arch/sparc/include/uapi/asm/termbits.h index ce5ad5d0f105..5eb1d547b5c4 100644 --- a/arch/sparc/include/uapi/asm/termbits.h +++ b/arch/sparc/include/uapi/asm/termbits.h @@ -201,6 +201,7 @@ struct ktermios { #define B3500000 0x00001012 #define B4000000 0x00001013 */ #define CIBAUD 0x100f0000 /* input baud rate (not used) */ +#define ADDRB 0x20000000 /* address bit */ #define CMSPAR 0x40000000 /* mark or space (stick) parity */ #define CRTSCTS 0x80000000 /* flow control */ diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c index 78baba55a8b5..d179b9b57a25 100644 --- a/drivers/char/pcmcia/synclink_cs.c +++ b/drivers/char/pcmcia/synclink_cs.c @@ -2287,6 +2287,8 @@ static void mgslpc_set_termios(struct tty_struct *tty, struct ktermios *old_term == RELEVANT_IFLAG(old_termios->c_iflag))) return; + tty->termios.c_cflag &= ~ADDRB; + mgslpc_change_params(info, tty); /* Handle transition to B0 status */ diff --git a/drivers/ipack/devices/ipoctal.c b/drivers/ipack/devices/ipoctal.c index 20d2b9ec1227..d66cc9683ebc 100644 --- a/drivers/ipack/devices/ipoctal.c +++ b/drivers/ipack/devices/ipoctal.c @@ -506,6 +506,8 @@ static void ipoctal_set_termios(struct tty_struct *tty, struct ipoctal_channel *channel = tty->driver_data; speed_t baud; + tty->termios.c_cflag &= ~ADDRB; + cflag = tty->termios.c_cflag; /* Disable and reset everything before change the setup */ diff --git a/drivers/mmc/core/sdio_uart.c b/drivers/mmc/core/sdio_uart.c index 414aa82abc39..f28075952f3e 100644 --- a/drivers/mmc/core/sdio_uart.c +++ b/drivers/mmc/core/sdio_uart.c @@ -867,6 +867,8 @@ static void sdio_uart_set_termios(struct tty_struct *tty, if (sdio_uart_claim_func(port) != 0) return; + tty->termios.c_cflag &= ~ADDRB; + sdio_uart_change_speed(port, &tty->termios, old_termios); /* Handle transition to B0 status */ diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c index f8221a7acf62..056352618804 100644 --- a/drivers/net/usb/hso.c +++ b/drivers/net/usb/hso.c @@ -1099,7 +1099,8 @@ static void _hso_serial_set_termios(struct tty_struct *tty) ~(CSIZE /* no size */ | PARENB /* disable parity bit */ | CBAUD /* clear current baud rate */ - | CBAUDEX); /* clear current buad rate */ + | CBAUDEX /* clear current baud rate */ + | ADDRB); /* disable 9th (addr) bit */ tty->termios.c_cflag |= CS8; /* character size 8 bits */ diff --git a/drivers/s390/char/tty3270.c b/drivers/s390/char/tty3270.c index 5c83f71c1d0e..253d2997a1d3 100644 --- a/drivers/s390/char/tty3270.c +++ b/drivers/s390/char/tty3270.c @@ -1768,6 +1768,9 @@ tty3270_set_termios(struct tty_struct *tty, struct ktermios *old) tp = tty->driver_data; if (!tp) return; + + tty->termios.c_cflag &= ~ADDRB; + spin_lock_bh(&tp->view.lock); if (L_ICANON(tty)) { new = L_ECHO(tty) ? TF_INPUT: TF_INPUTN; diff --git a/drivers/staging/greybus/uart.c b/drivers/staging/greybus/uart.c index dc4ed0ff1ae2..83e73aefde0f 100644 --- a/drivers/staging/greybus/uart.c +++ b/drivers/staging/greybus/uart.c @@ -487,6 +487,8 @@ static void gb_tty_set_termios(struct tty_struct *tty, struct ktermios *termios = &tty->termios; u8 newctrl = gb_tty->ctrlout; + termios->c_cflag &= ~ADDRB; + newline.rate = cpu_to_le32(tty_get_baud_rate(tty)); newline.format = termios->c_cflag & CSTOPB ? GB_SERIAL_2_STOP_BITS : GB_SERIAL_1_STOP_BITS; diff --git a/drivers/tty/amiserial.c b/drivers/tty/amiserial.c index 533d02b38e02..3ca97007bd6e 100644 --- a/drivers/tty/amiserial.c +++ b/drivers/tty/amiserial.c @@ -1175,7 +1175,11 @@ static void rs_set_termios(struct tty_struct *tty, struct ktermios *old_termios) { struct serial_state *info = tty->driver_data; unsigned long flags; - unsigned int cflag = tty->termios.c_cflag; + unsigned int cflag; + + tty->termios.c_cflag &= ~ADDRB; + + cflag = tty->termios.c_cflag; change_speed(tty, info, old_termios); diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c index f3c72ab1476c..07cd88152d58 100644 --- a/drivers/tty/moxa.c +++ b/drivers/tty/moxa.c @@ -2050,6 +2050,7 @@ static int MoxaPortSetTermio(struct moxa_port *port, struct ktermios *termio, ofsAddr = port->tableAddr; + termio->c_cflag &= ~ADDRB; mode = termio->c_cflag & CSIZE; if (mode == CS5) mode = MX_CS5; diff --git a/drivers/tty/mxser.c b/drivers/tty/mxser.c index 6ebd3e4ed859..79c542aca1c3 100644 --- a/drivers/tty/mxser.c +++ b/drivers/tty/mxser.c @@ -577,6 +577,7 @@ static void mxser_change_speed(struct tty_struct *tty, struct ktermios *old_term struct mxser_port *info = tty->driver_data; unsigned cflag, cval; + tty->termios.c_cflag &= ~ADDRB; cflag = tty->termios.c_cflag; if (mxser_set_baud(tty, tty_get_baud_rate(tty))) { diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c index 82a1770dd808..0f397e67eeb0 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c @@ -1540,6 +1540,8 @@ static void uart_set_termios(struct tty_struct *tty, goto out; } + tty->termios.c_cflag &= ~ADDRB; + uart_change_speed(tty, state, old_termios); /* reload cflag from termios; port driver may have overridden flags */ cflag = tty->termios.c_cflag; diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c index 9bc2a9265277..180f38f0f57a 100644 --- a/drivers/tty/synclink_gt.c +++ b/drivers/tty/synclink_gt.c @@ -714,6 +714,8 @@ static void set_termios(struct tty_struct *tty, struct ktermios *old_termios) DBGINFO(("%s set_termios\n", tty->driver->name)); + tty->termios.c_cflag &= ~ADDRB; + change_params(info); /* Handle transition to B0 status */ diff --git a/drivers/tty/tty_ioctl.c b/drivers/tty/tty_ioctl.c index 63181925ec1a..934037d78868 100644 --- a/drivers/tty/tty_ioctl.c +++ b/drivers/tty/tty_ioctl.c @@ -319,6 +319,8 @@ unsigned char tty_get_frame_size(unsigned int cflag) bits++; if (cflag & PARENB) bits++; + if (cflag & ADDRB) + bits++; return bits; } diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index 9b9aea24d58c..fd246ec70da8 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c @@ -1056,6 +1056,8 @@ static void acm_tty_set_termios(struct tty_struct *tty, struct usb_cdc_line_coding newline; int newctrl = acm->ctrlout; + termios->c_cflag &= ~ADDRB; + newline.dwDTERate = cpu_to_le32(tty_get_baud_rate(tty)); newline.bCharFormat = termios->c_cflag & CSTOPB ? 2 : 0; newline.bParityType = termios->c_cflag & PARENB ? diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c index 24101bd7fcad..8d1d170eb7e6 100644 --- a/drivers/usb/serial/usb-serial.c +++ b/drivers/usb/serial/usb-serial.c @@ -525,10 +525,12 @@ static void serial_set_termios(struct tty_struct *tty, struct ktermios *old) dev_dbg(&port->dev, "%s\n", __func__); - if (port->serial->type->set_termios) + if (port->serial->type->set_termios) { + tty->termios.c_cflag &= ~ADDRB; port->serial->type->set_termios(tty, port, old); - else + } else { tty_termios_copy_hw(&tty->termios, old); + } } static int serial_break(struct tty_struct *tty, int break_state) diff --git a/include/uapi/asm-generic/termbits.h b/include/uapi/asm-generic/termbits.h index 2fbaf9ae89dd..e06eaa9cf8be 100644 --- a/include/uapi/asm-generic/termbits.h +++ b/include/uapi/asm-generic/termbits.h @@ -158,6 +158,7 @@ struct ktermios { #define B3500000 0010016 #define B4000000 0010017 #define CIBAUD 002003600000 /* input baud rate */ +#define ADDRB 004000000000 /* address bit */ #define CMSPAR 010000000000 /* mark or space (stick) parity */ #define CRTSCTS 020000000000 /* flow control */ diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c index ebd78fdbd6e8..832e725f23ab 100644 --- a/net/bluetooth/rfcomm/tty.c +++ b/net/bluetooth/rfcomm/tty.c @@ -871,6 +871,8 @@ static void rfcomm_tty_set_termios(struct tty_struct *tty, struct ktermios *old) if (!dev || !dev->dlc || !dev->dlc->session) return; + new->c_cflag &= ~ADDRB; + /* Handle turning off CRTSCTS */ if ((old->c_cflag & CRTSCTS) && !(new->c_cflag & CRTSCTS)) BT_DBG("Turning off CRTSCTS unsupported");
Add ADDRB to termbits to indicate 9th bit addressing mode. This change is necessary for supporting devices with RS485 multipoint addressing [*]. A later patch in the patch series adds support for Synopsys Designware UART capable for 9th bit addressing mode. In this mode, 9th bit is used to indicate an address (byte) within the communication line. The 9th bit addressing mode is selected using ADDRB introduced by an earlier patch. [*] Technically, RS485 is just an electronic spec and does not itself specify the 9th bit addressing mode but 9th bit seems at least "semi-standard" way to do addressing with RS485. Cc: linux-api@vger.kernel.org Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Cc: Matt Turner <mattst88@gmail.com> Cc: linux-alpha@vger.kernel.org Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Cc: linux-mips@vger.kernel.org Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com> Cc: Helge Deller <deller@gmx.de> Cc: linux-parisc@vger.kernel.org Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org> Cc: linuxppc-dev@lists.ozlabs.org Cc: "David S. Miller" <davem@davemloft.net> Cc: sparclinux@vger.kernel.org Cc: Arnd Bergmann <arnd@arndb.de> Cc: linux-arch@vger.kernel.org Cc: linux-usb@vger.kernel.org Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> --- arch/alpha/include/uapi/asm/termbits.h | 1 + arch/mips/include/uapi/asm/termbits.h | 1 + arch/parisc/include/uapi/asm/termbits.h | 1 + arch/powerpc/include/uapi/asm/termbits.h | 1 + arch/sparc/include/uapi/asm/termbits.h | 1 + drivers/char/pcmcia/synclink_cs.c | 2 ++ drivers/ipack/devices/ipoctal.c | 2 ++ drivers/mmc/core/sdio_uart.c | 2 ++ drivers/net/usb/hso.c | 3 ++- drivers/s390/char/tty3270.c | 3 +++ drivers/staging/greybus/uart.c | 2 ++ drivers/tty/amiserial.c | 6 +++++- drivers/tty/moxa.c | 1 + drivers/tty/mxser.c | 1 + drivers/tty/serial/serial_core.c | 2 ++ drivers/tty/synclink_gt.c | 2 ++ drivers/tty/tty_ioctl.c | 2 ++ drivers/usb/class/cdc-acm.c | 2 ++ drivers/usb/serial/usb-serial.c | 6 ++++-- include/uapi/asm-generic/termbits.h | 1 + net/bluetooth/rfcomm/tty.c | 2 ++ 21 files changed, 40 insertions(+), 4 deletions(-)