> On Wed, Jul 03, 2019 at 12:24:35AM -0700, jeyentam wrote:
> > Add support for NI-Serial PXIe-RS232, PXI-RS485 and PXIe-RS485 devices.
> >
> > Signed-off-by: jeyentam <je.yen.tam@xxxxxx>
>
> I need a "full" name here please.
Ok, will do so.
>
> Also, this patch breaks the build, which is not allowed, and makes me wonder how
> you tested it :(
I've tested my changes with the steps as follows, it did not break.
1. Clone the Linux repo, check out the source and work on my project.
2. Compile the kernel source with "make j4".
3. Build the kernel modules with "make modules_install".
4. Install the kernel with "make install".
5. Reboot into the newly built kernel.
6. The kernel worked well and able to fit my needs.
Noted that my source is checked out from the latest Linux kernel 5.2.0-rc6.
Also, I checked my patch using checkpatch.pl, it did not show any errors and
warnings too.
May I know what do you mean by breaking the build?
>
> Please fix up properly and resend.
>
> Also, some comments below:
>
> > ---
> > drivers/tty/serial/8250/8250_pci.c | 293
> > ++++++++++++++++++++++++++++-
> > 1 file changed, 289 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/tty/serial/8250/8250_pci.c
> > b/drivers/tty/serial/8250/8250_pci.c
> > index df41397de478..ac8138adea9c 100644
> > --- a/drivers/tty/serial/8250/8250_pci.c
> > +++ b/drivers/tty/serial/8250/8250_pci.c
> > @@ -730,8 +730,16 @@ static int pci_ni8430_init(struct pci_dev *dev)
> > }
> >
> > /* UART Port Control Register */
> > -#define NI8430_PORTCON 0x0f
> > -#define NI8430_PORTCON_TXVR_ENABLE (1 << 3)
>
> Why are you renaming these #defines?
NI8430 device is using standard 16550 UART chip so I standardize all the 16550
UART related #defines to UART chip specific name rather than device specific.
>
> > +#define NI16550_PCR_OFFSET 0x0f
> > +#define NI16550_PCR_RS422 0x00
> > +#define NI16550_PCR_ECHO_RS485 0x01
> > +#define NI16550_PCR_DTR_RS485 0x02
> > +#define NI16550_PCR_AUTO_RS485 0x03
> > +#define NI16550_PCR_WIRE_MODE_MASK 0x03
> > +#define NI16550_PCR_TXVR_ENABLE_BIT (1 << 3)
>
> BIT(3)?
Ok, will change to this style.
>
> > +#define NI16550_PCR_RS485_TERMINATION_BIT (1 << 6)
>
> BIT(6)?
Also, will change this.
>
> > +#define NI16550_ACR_DTR_AUTO_DTR (0x2 << 3)
> > +#define NI16550_ACR_DTR_MANUAL_DTR (0x0 << 3)
> >
> > static int
> > pci_ni8430_setup(struct serial_private *priv, @@ -753,14 +761,127 @@
> > pci_ni8430_setup(struct serial_private *priv,
> > return -ENOMEM;
> >
> > /* enable the transceiver */
> > - writeb(readb(p + offset + NI8430_PORTCON) |
> NI8430_PORTCON_TXVR_ENABLE,
> > - p + offset + NI8430_PORTCON);
> > + writeb(readb(p + offset + NI16550_PCR_OFFSET) |
> > + NI16550_PCR_TXVR_ENABLE_BIT,
> > + p + offset + NI16550_PCR_OFFSET);
>
> Why indent like this? Please follow the indentation that used to be there.
I moved the indentation because it complained this line exceeded 80 characters
when I check the patch. I will change back to original indentation.
>
> >
> > iounmap(p);
> >
> > return setup_port(priv, port, bar, offset, board->reg_shift); }
> >
> > +static int pci_ni8431_config_rs485(struct uart_port *port,
> > + struct serial_rs485 *rs485)
> > +{
> > + u8 pcr, acr;
> > +
> > + struct uart_8250_port *up;
> > +
> > + up = container_of(port, struct uart_8250_port, port);
> > +
> > + acr = up->acr;
> > +
> > + dev_dbg(port->dev, "ni16550_config_rs485\n");
>
> No need for debugging lines like this, use ftrace please.
Ok, will update this.
>
> > +
> > + /* "rs485" should be given to us non-NULL. */
> > + WARN_ON(rs485 == NULL);
>
> Don't crash people's machines, if this can never happen, then no need for this line. If
> it can happen, test and properly return an error.
This is more like a fail safe approach, it should never happen, will remove this line.
>
> > +
> > + pcr = port->serial_in(port, NI16550_PCR_OFFSET);
> > + pcr &= ~NI16550_PCR_WIRE_MODE_MASK;
> > +
> > + if (rs485->flags & SER_RS485_ENABLED) {
> > + /* RS-485 */
> > + if ((rs485->flags & SER_RS485_RX_DURING_TX) &&
> > + (rs485->flags & SER_RS485_RTS_ON_SEND)) {
> > + dev_dbg(port->dev, "Invalid 2-wire mode\n");
> > + return -EINVAL;
> > + }
> > +
> > + if (rs485->flags & SER_RS485_RX_DURING_TX) {
> > + /* Echo */
> > + dev_vdbg(port->dev, "2-wire DTR with echo\n");
> > + pcr |= NI16550_PCR_ECHO_RS485;
> > + acr |= NI16550_ACR_DTR_MANUAL_DTR;
> > + } else {
> > + /* Auto or DTR */
> > + if (rs485->flags & SER_RS485_RTS_ON_SEND) {
> > + /* Auto */
> > + dev_vdbg(port->dev, "2-wire Auto\n");
> > + pcr |= NI16550_PCR_AUTO_RS485;
> > + acr |= NI16550_ACR_DTR_AUTO_DTR;
> > + } else {
> > + /* DTR-controlled */
> > + /* No Echo */
> > + dev_vdbg(port->dev, "2-wire DTR no echo\n");
> > + pcr |= NI16550_PCR_DTR_RS485;
> > + acr |= NI16550_ACR_DTR_MANUAL_DTR;
> > + }
> > + }
> > + } else {
> > + /* RS-422 */
> > + dev_vdbg(port->dev, "4-wire\n");
> > + pcr |= NI16550_PCR_RS422;
> > + acr |= NI16550_ACR_DTR_MANUAL_DTR;
> > + }
> > +
> > + dev_dbg(port->dev, "write pcr: 0x%08x\n", pcr);
> > + port->serial_out(port, NI16550_PCR_OFFSET, pcr);
> > +
> > + up->acr = acr;
> > + port->serial_out(port, UART_SCR, UART_ACR);
> > + port->serial_out(port, UART_ICR, up->acr);
> > +
> > + /* Update the cache. */
> > + port->rs485 = *rs485;
> > +
> > + dev_dbg(port->dev, "ni16550_config_rs485\n");
>
> Again, use ftrace, not dev_dbg() for stuff like this.
Will do so.
>
> thanks,
>
> greg k-h
Thank you.
Regards,
Je Yen Tam
Staff Software Engineer
National Instruments
o 604-3776397
e je.yen.tam@xxxxxx
