Char: mxser, ioctl cleanup
Subsystems (3)
PATCH 1/1 Char: mxser, ioctl cleanup
- remove break ctl from ioctl handler, it's never reached, since tty_ops->break_ctl is defined (mxser break handling is done in software)
- mark MOXA_GET_MAJOR as deprecated
- fix TIOCGICOUNT (some retval non-checks of put_user). Use copy_to_user to whole structure instead.
--- drivers/char/mxser.c | 78 ++++++++++++------------------------------------- 1 files changed, 19 insertions(+), 59 deletions(-)
drivers/char/mxser.c +19 -59
@@ -16,7 +16,6 @@* Fed through a cleanup, indent and remove of non 2.6 code by Alan Cox * <[email protected]>. The original 1.8 code is available on www.moxa.com. * - Fixed x86_64 cleanness -* - Fixed sleep with spinlock held in mxser_send_break */ #include <linux/module.h>
@@ -1473,27 +1472,6 @@ static int mxser_get_lsr_info(struct mxser_port *info,return put_user (result, value); } -/* -* This routine sends a break character out the serial port. -*/ -static void mxser_send_break (struct mxser_port *info,int duration) -{ -unsigned long flags; - -if (!info->ioaddr) -return ; -set_current_state (TASK_INTERRUPTIBLE ); -spin_lock_irqsave (&info->slock, flags); -outb (inb (info->ioaddr +UART_LCR ) |UART_LCR_SBC , - info->ioaddr +UART_LCR ); -spin_unlock_irqrestore (&info->slock, flags); -schedule_timeout (duration); -spin_lock_irqsave (&info->slock, flags); -outb (inb (info->ioaddr +UART_LCR ) & ~UART_LCR_SBC , - info->ioaddr +UART_LCR ); -spin_unlock_irqrestore (&info->slock, flags); -} -static int mxser_tiocmget (struct tty_struct *tty,struct file *file) {struct mxser_port *info = tty->driver_data;
@@ -1662,6 +1640,8 @@ static int mxser_ioctl_special(unsigned int cmd, void __user *argp)switch (cmd) {case MOXA_GET_MAJOR : +printk (KERN_WARNING "mxser: '%s' uses deprecated ioctl %x, fix " +"your userspace\n" , current->comm, cmd);return put_user (ttymajor, (int __user *)argp);case MOXA_CHKPORTENABLE :
@@ -1832,7 +1812,6 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file, {struct mxser_port *info = tty->driver_data;struct async_icount cnow; -struct serial_icounter_struct __user *p_cuser;unsigned long flags;void __user *argp = (void __user *)arg;int retval;
@@ -1881,21 +1860,6 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file,return -EIO ;switch (cmd) { -case TCSBRK :/* SVID version: non-zero arg --> no break */ - retval =tty_check_change (tty); -if (retval) -return retval; -tty_wait_until_sent (tty,0 ); -if (!arg) -mxser_send_break (info,HZ /4 );/* 1/4 second */ -return 0 ; -case TCSBRKP :/* support for POSIX tcsendbreak() */ - retval =tty_check_change (tty); -if (retval) -return retval; -tty_wait_until_sent (tty,0 ); -mxser_send_break (info, arg ? arg * (HZ /10 ) :HZ /4 ); -return 0 ;case TIOCGSERIAL :lock_kernel (); retval =mxser_get_serial_info (info, argp);
@@ -1927,30 +1891,26 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file,* NB: both 1->0 and 0->1 transitions are counted except for * RI where only 0->1 is counted. */ -case TIOCGICOUNT : +case TIOCGICOUNT : { +struct serial_icounter_struct icnt = {0 };spin_lock_irqsave (&info->slock, flags); cnow = info->icount;spin_unlock_irqrestore (&info->slock, flags); - p_cuser = argp; -if (put_user (cnow.frame, &p_cuser->frame)) -return -EFAULT ; -if (put_user (cnow.brk, &p_cuser->brk)) -return -EFAULT ; -if (put_user (cnow.overrun, &p_cuser->overrun)) -return -EFAULT ; -if (put_user (cnow.buf_overrun, &p_cuser->buf_overrun)) -return -EFAULT ; -if (put_user (cnow.parity, &p_cuser->parity)) -return -EFAULT ; -if (put_user (cnow.rx, &p_cuser->rx)) -return -EFAULT ; -if (put_user (cnow.tx, &p_cuser->tx)) -return -EFAULT ; -put_user (cnow.cts, &p_cuser->cts); -put_user (cnow.dsr, &p_cuser->dsr); -put_user (cnow.rng, &p_cuser->rng); -put_user (cnow.dcd, &p_cuser->dcd); -return 0 ; + + icnt.frame = cnow.frame; + icnt.brk = cnow.brk; + icnt.overrun = cnow.overrun; + icnt.buf_overrun = cnow.buf_overrun; + icnt.parity = cnow.parity; + icnt.rx = cnow.rx; + icnt.tx = cnow.tx; + icnt.cts = cnow.cts; + icnt.dsr = cnow.dsr; + icnt.rng = cnow.rng; + icnt.dcd = cnow.dcd; + +return copy_to_user (argp, &icnt,sizeof (icnt)) ? -EFAULT :0 ; + }case MOXA_HighSpeedOn:return put_user (info->baud_base !=115200 ?1 :0 , (int __user *)argp);case MOXA_SDS_RSTICOUNTER :
Signature · 1 line
1.5.4.5
PATCH 1/1 Char: mxser, globals cleanup
- remove unused mxvar_diagflag
- move mxser_msr into the only user/function
- GMStatus, hmm, fix race-prone access to it. We need only one instance for real, not MXSER_PORTS. Move it to MOXA_GETMSTATUS ioctl.
- mxser_mon_ext, almost the same, but alloc it on heap, since it has more than 2 kilos.
- fix indexing, i' is not the index value, i * MXSER_PORTS_PER_BOARD + j' is
--- drivers/char/mxser.c | 130 +++++++++++++++++++++----------------------------- 1 files changed, 55 insertions(+), 75 deletions(-)
drivers/char/mxser.c +55 -75
@@ -291,8 +291,6 @@ struct mxser_mstatus {int dcd; }; -static struct mxser_mstatus GMStatus[MXSER_PORTS ]; -static int mxserBoardCAP[MXSER_BOARDS ] = {0 ,0 ,0 ,0 /* 0x180, 0x280, 0x200, 0x320 */
@@ -301,9 +299,6 @@ static int mxserBoardCAP[MXSER_BOARDS] = {static struct mxser_board mxser_boards[MXSER_BOARDS ];static struct tty_driver *mxvar_sdriver;static struct mxser_log mxvar_log; -static int mxvar_diagflag; -static unsigned char mxser_msr[MXSER_PORTS +1 ]; -static struct mxser_mon_ext mon_data_ext;static int mxser_set_baud_method[MXSER_PORTS +1 ];static void mxser_enable_must_enchance_mode (unsigned long baseio)
@@ -547,6 +542,7 @@ static void process_txrx_fifo(struct mxser_port *info)static unsigned char mxser_get_msr (int baseaddr,int mode,int port) { +static unsigned char mxser_msr[MXSER_PORTS +1 ];unsigned char status =0 ; status =inb (baseaddr +UART_MSR );
@@ -1659,62 +1655,60 @@ static int mxser_ioctl_special(unsigned int cmd, void __user *argp) ret = -EFAULT ;unlock_kernel ();return ret; -case MOXA_GETMSTATUS : +case MOXA_GETMSTATUS : { +struct mxser_mstatus ms,__user *msu = argp;lock_kernel ();for (i =0 ; i <MXSER_BOARDS ; i++)for (j =0 ; j <MXSER_PORTS_PER_BOARD ; j++) { port = &mxser_boards[i].ports[j]; +memset (&ms,0 ,sizeof (ms)); - GMStatus[i].ri =0 ; -if (!port->ioaddr) { - GMStatus[i].dcd =0 ; - GMStatus[i].dsr =0 ; - GMStatus[i].cts =0 ; -continue ; - } +if (!port->ioaddr) + goto copy;if (!port->tty || !port->tty->termios) - GMStatus[i].cflag = - port->normal_termios.c_cflag; + ms.cflag = port->normal_termios.c_cflag;else - GMStatus[i].cflag = - port->tty->termios->c_cflag; + ms.cflag = port->tty->termios->c_cflag; status =inb (port->ioaddr +UART_MSR ); -if (status &0x80 /*UART_MSR_DCD */ ) - GMStatus[i].dcd =1 ; -else - GMStatus[i].dcd =0 ; - -if (status &0x20 /*UART_MSR_DSR */ ) - GMStatus[i].dsr =1 ; -else - GMStatus[i].dsr =0 ; - - -if (status &0x10 /*UART_MSR_CTS */ ) - GMStatus[i].cts =1 ; -else - GMStatus[i].cts =0 ; +if (status &UART_MSR_DCD ) + ms.dcd =1 ; +if (status &UART_MSR_DSR ) + ms.dsr =1 ; +if (status &UART_MSR_CTS ) + ms.cts =1 ; + copy: +if (copy_to_user (msu, &ms,sizeof (ms))) { +unlock_kernel (); +return -EFAULT ; + } + msu++; }unlock_kernel (); -if (copy_to_user (argp, GMStatus, -sizeof (struct mxser_mstatus ) *MXSER_PORTS )) -return -EFAULT ;return 0 ; + }case MOXA_ASPP_MON_EXT : { -int p, shiftbit; -unsigned long opmode; -unsigned cflag, iflag; +struct mxser_mon_ext *me;/* it's 2k, stack unfriendly */ +unsigned int cflag, iflag, p; +u8 opmode; + + me =kzalloc (sizeof (*me),GFP_KERNEL ); +if (!me) +return -ENOMEM ;lock_kernel (); -for (i =0 ; i <MXSER_BOARDS ; i++) { -for (j =0 ; j <MXSER_PORTS_PER_BOARD ; j++) { +for (i =0 , p =0 ; i <MXSER_BOARDS ; i++) { +for (j =0 ; j <MXSER_PORTS_PER_BOARD ; j++, p++) { +if (p >=ARRAY_SIZE (me->rx_cnt)) { + i =MXSER_BOARDS ; +break ; + } port = &mxser_boards[i].ports[j];if (!port->ioaddr)continue ; - status =mxser_get_msr (port->ioaddr,0 , i); + status =mxser_get_msr (port->ioaddr,0 , p);if (status &UART_MSR_TERI ) port->icount.rng++;
@@ -1726,16 +1720,13 @@ static int mxser_ioctl_special(unsigned int cmd, void __user *argp) port->icount.cts++; port->mon_data.modem_status = status; - mon_data_ext.rx_cnt[i] = port->mon_data.rxcnt; - mon_data_ext.tx_cnt[i] = port->mon_data.txcnt; - mon_data_ext.up_rxcnt[i] = - port->mon_data.up_rxcnt; - mon_data_ext.up_txcnt[i] = - port->mon_data.up_txcnt; - mon_data_ext.modem_status[i] = + me->rx_cnt[p] = port->mon_data.rxcnt; + me->tx_cnt[p] = port->mon_data.txcnt; + me->up_rxcnt[p] = port->mon_data.up_rxcnt; + me->up_txcnt[p] = port->mon_data.up_txcnt; + me->modem_status[p] = port->mon_data.modem_status; - mon_data_ext.baudrate[i] = -tty_get_baud_rate (port->tty); + me->baudrate[p] =tty_get_baud_rate (port->tty);if (!port->tty || !port->tty->termios) { cflag = port->normal_termios.c_cflag;
@@ -1745,40 +1736,31 @@ static int mxser_ioctl_special(unsigned int cmd, void __user *argp) iflag = port->tty->termios->c_iflag; } - mon_data_ext.databits[i] = cflag &CSIZE ; - - mon_data_ext.stopbits[i] = cflag &CSTOPB ; - - mon_data_ext.parity[i] = - cflag & (PARENB |PARODD |CMSPAR ); - - mon_data_ext.flowctrl[i] =0x00 ; + me->databits[p] = cflag &CSIZE ; + me->stopbits[p] = cflag &CSTOPB ; + me->parity[p] = cflag & (PARENB |PARODD | +CMSPAR );if (cflag &CRTSCTS ) - mon_data_ext.flowctrl[i] |=0x03 ; + me->flowctrl[p] |=0x03 ;if (iflag & (IXON |IXOFF )) - mon_data_ext.flowctrl[i] |=0x0C ; + me->flowctrl[p] |=0x0C ;if (port->type ==PORT_16550A ) - mon_data_ext.fifo[i] =1 ; -else - mon_data_ext.fifo[i] =0 ; + me->fifo[p] =1 ; - p = i %4 ; - shiftbit = p *2 ; - opmode =inb (port->opmode_ioaddr) >> shiftbit; + opmode =inb (port->opmode_ioaddr) >> + ((p %4 ) *2 ); opmode &=OP_MODE_MASK ; - - mon_data_ext.iftype[i] = opmode; - + me->iftype[p] = opmode; } }unlock_kernel (); -if (copy_to_user (argp, &mon_data_ext, -sizeof (mon_data_ext))) -return -EFAULT ; -return 0 ; +if (copy_to_user (argp, me,sizeof (*me))) + ret = -EFAULT ; +kfree (me); +return ret; }default :return -ENOIOCTLCMD ;
@@ -2809,8 +2791,6 @@ static int __init mxser_module_init(void) goto err_put; } - mxvar_diagflag =0 ; - m =0 ;/* Start finding ISA boards here */ for (isaloop =0 ; isaloop <2 ; isaloop++)
Signature · 1 line
1.5.4.5
PATCH 1/1 Char: mxser, add CP-102UF support
In reply to Jiri SlabyAdd support for CP-102UF moxa card (update to 1.12 original driver) and increment this driver version.
--- drivers/char/mxser.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-)
drivers/char/mxser.c +7 -5
@@ -46,7 +46,7 @@#include "mxser.h" -#define MXSER_VERSION "2.0.3"/* 1.11 */ +#define MXSER_VERSION "2.0.4"/* 1.12 */ #define MXSERMAJOR 174#define MXSERCUMAJOR 175
@@ -72,10 +72,11 @@#define PCI_DEVICE_ID_CB108 0x1080#define PCI_DEVICE_ID_CB114 0x1142 -#define PCI_DEVICE_ID_CP114UL 0x1143#define PCI_DEVICE_ID_CB134I 0x1341 -#define PCI_DEVICE_ID_CP138U 0x1380 +#define PCI_DEVICE_ID_CP102UF 0x1023#define PCI_DEVICE_ID_POS104UL 0x1044 +#define PCI_DEVICE_ID_CP114UL 0x1143 +#define PCI_DEVICE_ID_CP138U 0x1380#define C168_ASIC_ID 1
@@ -141,7 +142,8 @@ static const struct mxser_cardinfo mxser_cards[] = { { "CB-134I series", 4, }, { "CP-138U series", 8, }, { "POS-104UL series", 4, }, - { "CP-114UL series", 4, } + { "CP-114UL series", 4, }, +/*30*/ { "CP-102UF series", 2, }, };/* driver_data correspond to the lines in the structure above
@@ -171,6 +173,7 @@ static struct pci_device_id mxser_pcibrds[] = { { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_CP138U), .driver_data = 27 }, { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_POS104UL), .driver_data = 28 }, { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_CP114UL), .driver_data = 29 }, + { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_CP102UF), .driver_data = 30 }, { } };MODULE_DEVICE_TABLE (pci, mxser_pcibrds);
@@ -1418,7 +1421,6 @@ static int mxser_set_serial_info(struct mxser_port *info, info->closing_wait = new_serial.closing_wait *HZ /100 ; info->tty->low_latency = (info->flags &ASYNC_LOW_LATENCY ) ?1 :0 ; - info->tty->low_latency =0 ; if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_CUST && (new_serial.baud_base != info->baud_base || new_serial.custom_divisor !=
Signature · 1 line
1.5.4.5
PATCH 1/1 Char: mxser, update documentation
In reply to Jiri SlabyUpdate Documentation/moxa-smartio to the later document from the mxser package.
--- Documentation/moxa-smartio | 392 ++++++++++++++++++++++++++++---------------- 1 files changed, 252 insertions(+), 140 deletions(-)
Documentation/moxa-smartio +252 -140
@@ -1,14 +1,22 @@ ============================================================================= - - MOXA Smartio Family Device Driver Ver 1.1 Installation Guide - for Linux Kernel 2.2.x and 2.0.3x - Copyright (C) 1999, Moxa Technologies Co, Ltd. + MOXA Smartio/Industio Family Device Driver Installation Guide + for Linux Kernel 2.4.x, 2.6.x + Copyright (C) 2008, Moxa Inc. ============================================================================= +Date: 01/21/2008 + Content 1. Introduction 2. System Requirement 3. Installation + 3.1 Hardware installation + 3.2 Driver files + 3.3 Device naming convention + 3.4 Module driver configuration + 3.5 Static driver configuration for Linux kernel 2.4.x and 2.6.x. + 3.6 Custom configuration + 3.7 Verify driver installation 4. Utilities 5. Setserial 6. Troubleshooting
@@ -16,27 +24,48 @@ Content ----------------------------------------------------------------------------- 1. Introduction - The Smartio family Linux driver, Ver. 1.1, supports following multiport + The Smartio/Industio/UPCI family Linux driver supports following multiport boards. - -C104P/H/HS, C104H/PCI, C104HS/PCI, CI-104J 4 port multiport board. - -C168P/H/HS, C168H/PCI 8 port multiport board. - - This driver has been modified a little and cleaned up from the Moxa - contributed driver code and merged into Linux 2.2.14pre. In particular - official major/minor numbers have been assigned which are different to - those the original Moxa supplied driver used. + - 2 ports multiport board + CP-102U, CP-102UL, CP-102UF + CP-132U-I, CP-132UL, + CP-132, CP-132I, CP132S, CP-132IS, + CI-132, CI-132I, CI-132IS, + (C102H, C102HI, C102HIS, C102P, CP-102, CP-102S) + + - 4 ports multiport board + CP-104EL, + CP-104UL, CP-104JU, + CP-134U, CP-134U-I, + C104H/PCI, C104HS/PCI, + CP-114, CP-114I, CP-114S, CP-114IS, CP-114UL, + C104H, C104HS, + CI-104J, CI-104JS, + CI-134, CI-134I, CI-134IS, + (C114HI, CT-114I, C104P) + POS-104UL, + CB-114, + CB-134I + + - 8 ports multiport board + CP-118EL, CP-168EL, + CP-118U, CP-168U, + C168H/PCI, + C168H, C168HS, + (C168P), + CB-108 This driver and installation procedure have been developed upon Linux Kernel - 2.2.5 and backward compatible to 2.0.3x. This driver supports Intel x86 and - Alpha hardware platform. In order to maintain compatibility, this version - has also been properly tested with RedHat, OpenLinux, TurboLinux and - S.u.S.E Linux. However, if compatibility problem occurs, please contact - Moxa at [email protected]. + 2.4.x and 2.6.x. This driver supports Intel x86 hardware platform. In order + to maintain compatibility, this version has also been properly tested with + RedHat, Mandrake, Fedora and S.u.S.E Linux. However, if compatibility problem + occurs, please contact Moxa at [email protected]. In addition to device driver, useful utilities are also provided in this version. They are - - msdiag Diagnostic program for detecting installed Moxa Smartio boards. + - msdiag Diagnostic program for displaying installed Moxa + Smartio/Industio boards. - msmon Monitor program to observe data count and line status signals. - msterm A simple terminal program which is useful in testing serial ports.
@@ -47,8 +76,7 @@ Content GNU General Public License in this version. Please refer to GNU General Public License announcement in each source code file for more detail. - In Moxa's ftp sites, you may always find latest driver at - ftp://ftp.moxa.com or ftp://ftp.moxa.com.tw. + In Moxa's Web sites, you may always find latest driver at http://web.moxa.com. This version of driver can be installed as Loadable Module (Module driver) or built-in into kernel (Static driver). You may refer to following
@@ -61,8 +89,8 @@ Content ----------------------------------------------------------------------------- 2. System Requirement - - Hardware platform: Intel x86 or Alpha machine - - Kernel version: 2.0.3x or 2.2.x + - Hardware platform: Intel x86 machine + - Kernel version: 2.4.x or 2.6.x - gcc version 2.72 or later - Maximum 4 boards can be installed in combination
@@ -70,9 +98,18 @@ Content 3. Installation 3.1 Hardware installation + 3.2 Driver files + 3.3 Device naming convention + 3.4 Module driver configuration + 3.5 Static driver configuration for Linux kernel 2.4.x, 2.6.x. + 3.6 Custom configuration + 3.7 Verify driver installation + + + 3.1 Hardware installation - There are two types of buses, ISA and PCI, for Smartio family multiport - board. + There are two types of buses, ISA and PCI, for Smartio/Industio + family multiport board. ISA board ---------
@@ -81,47 +118,57 @@ Content installation procedure in User's Manual before proceed any further. Please make sure the JP1 is open after the ISA board is set properly. - PCI board - --------- + PCI/UPCI board + -------------- You may need to adjust IRQ usage in BIOS to avoid from IRQ conflict with other ISA devices. Please refer to hardware installation procedure in User's Manual in advance. - IRQ Sharing + PCI IRQ Sharing ----------- Each port within the same multiport board shares the same IRQ. Up to - 4 Moxa Smartio Family multiport boards can be installed together on - one system and they can share the same IRQ. + 4 Moxa Smartio/Industio PCI Family multiport boards can be installed + together on one system and they can share the same IRQ. + - 3.2 Driver files and device naming convention + 3.2 Driver files The driver file may be obtained from ftp, CD-ROM or floppy disk. The first step, anyway, is to copy driver file "mxser.tgz" into specified directory. e.g. /moxa. The execute commands as below. + # cd / + # mkdir moxa # cd /moxa - # tar xvf /dev/fd0 + # tar xvf /dev/fd0 + or + + # cd / + # mkdir moxa # cd /moxa # cp /mnt/cdrom/<driver directory>/mxser.tgz . # tar xvfz mxser.tgz + + 3.3 Device naming convention + You may find all the driver and utilities files in /moxa/mxser. Following installation procedure depends on the model you'd like to - run the driver. If you prefer module driver, please refer to 3.3. - If static driver is required, please refer to 3.4. + run the driver. If you prefer module driver, please refer to 3.4. + If static driver is required, please refer to 3.5. Dialin and callout port ----------------------- - This driver remains traditional serial device properties. There're + This driver remains traditional serial device properties. There are two special file name for each serial port. One is dial-in port which is named "ttyMxx". For callout port, the naming convention is "cumxx". Device naming when more than 2 boards installed ----------------------------------------------- - Naming convention for each Smartio multiport board is pre-defined - as below. + Naming convention for each Smartio/Industio multiport board is + pre-defined as below. Board Num. Dial-in Port Callout port 1st board ttyM0 - ttyM7 cum0 - cum7
@@ -129,6 +176,12 @@ Content 3rd board ttyM16 - ttyM23 cum16 - cum23 4th board ttyM24 - ttym31 cum24 - cum31 + + !!!!!!!!!!!!!!!!!!!! NOTE !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + Under Kernel 2.6 the cum Device is Obsolete. So use ttyM* + device instead. + !!!!!!!!!!!!!!!!!!!! NOTE !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + Board sequence -------------- This driver will activate ISA boards according to the parameter set
@@ -138,69 +191,131 @@ Content For PCI boards, their sequence will be after ISA boards and C168H/PCI has higher priority than C104H/PCI boards. - 3.3 Module driver configuration + 3.4 Module driver configuration Module driver is easiest way to install. If you prefer static driver installation, please skip this paragraph. - 1. Find "Makefile" in /moxa/mxser, then run - # make install + + ------------- Prepare to use the MOXA driver-------------------- + 3.4.1 Create tty device with correct major number + Before using MOXA driver, your system must have the tty devices + which are created with driver's major number. We offer one shell + script "msmknod" to simplify the procedure. + This step is only needed to be executed once. But you still + need to do this procedure when: + a. You change the driver's major number. Please refer the "3.7" + section. + b. Your total installed MOXA boards number is changed. Maybe you + add/delete one MOXA board. + c. You want to change the tty name. This needs to modify the + shell script "msmknod" + + The procedure is: + # cd /moxa/mxser/driver + # ./msmknod + + This shell script will require the major number for dial-in + device and callout device to create tty device. You also need + to specify the total installed MOXA board number. Default major + numbers for dial-in device and callout device are 30, 35. If + you need to change to other number, please refer section "3.7" + for more detailed procedure. + Msmknod will delete any special files occupying the same device + naming. + + 3.4.2 Build the MOXA driver and utilities + Before using the MOXA driver and utilities, you need compile the + all the source code. This step is only need to be executed once. + But you still re-compile the source code if you modify the source + code. For example, if you change the driver's major number (see + "3.7" section), then you need to do this step again. + + Find "Makefile" in /moxa/mxser, then run + + # make clean; make install + + !!!!!!!!!! NOTE !!!!!!!!!!!!!!!!! + For Red Hat 9, Red Hat Enterprise Linux AS3/ES3/WS3 & Fedora Core1: + # make clean; make installsp1 + + For Red Hat Enterprise Linux AS4/ES4/WS4: + # make clean; make installsp2 + !!!!!!!!!! NOTE !!!!!!!!!!!!!!!!! The driver files "mxser.o" and utilities will be properly compiled - and copied to system directories respectively.Then run + and copied to system directories respectively. - # insmod mxser + ------------- Load MOXA driver-------------------- + 3.4.3 Load the MOXA driver - to activate the modular driver. You may run "lsmod" to check - if "mxser.o" is activated. + # modprobe mxser <argument> - 2. Create special files by executing "msmknod". - # cd /moxa/mxser/driver - # ./msmknod + will activate the module driver. You may run "lsmod" to check + if "mxser" is activated. If the MOXA board is ISA board, the + <argument> is needed. Please refer to section "3.4.5" for more + information. + + + ------------- Load MOXA driver on boot -------------------- + 3.4.4 For the above description, you may manually execute + "modprobe mxser" to activate this driver and run + "rmmod mxser" to remove it. + However, it's better to have a boot time configuration to + eliminate manual operation. Boot time configuration can be + achieved by rc file. We offer one "rc.mxser" file to simplify + the procedure under "moxa/mxser/driver". - Default major numbers for dial-in device and callout device are - 174, 175. Msmknod will delete any special files occupying the same - device naming. + But if you use ISA board, please modify the "modprobe ..." command + to add the argument (see "3.4.5" section). After modifying the + rc.mxser, please try to execute "/moxa/mxser/driver/rc.mxser" + manually to make sure the modification is ok. If any error + encountered, please try to modify again. If the modification is + completed, follow the below step. - 3. Up to now, you may manually execute "insmod mxser" to activate - this driver and run "rmmod mxser" to remove it. However, it's - better to have a boot time configuration to eliminate manual - operation. - Boot time configuration can be achieved by rc file. Run following - command for setting rc files. + Run following command for setting rc files. # cd /moxa/mxser/driver # cp ./rc.mxser /etc/rc.d # cd /etc/rc.d - You may have to modify part of the content in rc.mxser to specify - parameters for ISA board. Please refer to rc.mxser for more detail. - Find "rc.serial". If "rc.serial" doesn't exist, create it by vi. - Add "rc.mxser" in last line. Next, open rc.local by vi - and append following content. + Check "rc.serial" is existed or not. If "rc.serial" doesn't exist, + create it by vi, run "chmod 755 rc.serial" to change the permission. + Add "/etc/rc.d/rc.mxser" in last line, - if [ -f /etc/rc.d/rc.serial ]; then - sh /etc/rc.d/rc.serial - fi + Reboot and check if moxa.o activated by "lsmod" command. - 4. Reboot and check if mxser.o activated by "lsmod" command. - 5. If you'd like to drive Smartio ISA boards in the system, you'll - have to add parameter to specify CAP address of given board while - activating "mxser.o". The format for parameters are as follows. + 3.4.5. If you'd like to drive Smartio/Industio ISA boards in the system, + you'll have to add parameter to specify CAP address of given + board while activating "mxser.o". The format for parameters are + as follows. - insmod mxser ioaddr=0x???,0x???,0x???,0x??? + modprobe mxser ioaddr=0x???,0x???,0x???,0x??? | | | | | | | +- 4th ISA board | | +------ 3rd ISA board | +------------ 2nd ISA board +------------------- 1st ISA board - 3.4 Static driver configuration + 3.5 Static driver configuration for Linux kernel 2.4.x and 2.6.x + + Note: To use static driver, you must install the linux kernel + source package. + + 3.5.1 Backup the built-in driver in the kernel. + # cd /usr/src/linux/drivers/char + # mv mxser.c mxser.c.old + + For Red Hat 7.x user, you need to create link: + # cd /usr/src + # ln -s linux-2.4 linux - 1. Create link + 3.5.2 Create link # cd /usr/src/linux/drivers/char # ln -s /moxa/mxser/driver/mxser.c mxser.c - 2. Add CAP address list for ISA boards + 3.5.3 Add CAP address list for ISA boards. For PCI boards user, + please skip this step. + In module mode, the CAP address for ISA board is given by parameter. In static driver configuration, you'll have to assign it within driver's source code. If you will not
@@ -222,73 +337,55 @@ Content static int mxserBoardCAP[] = {0x280, 0x180, 0x00, 0x00}; - 3. Modify tty_io.c - # cd /usr/src/linux/drivers/char/ - # vi tty_io.c - Find pty_init(), insert "mxser_init()" as + 3.5.4 Setup kernel configuration - pty_init(); - mxser_init(); + Configure the kernel: - 4. Modify tty.h - # cd /usr/src/linux/include/linux - # vi tty.h - Find extern int tty_init(void), insert "mxser_init()" as + # cd /usr/src/linux + # make menuconfig - extern int tty_init(void); - extern int mxser_init(void); - - 5. Modify Makefile - # cd /usr/src/linux/drivers/char - # vi Makefile - Find L_OBJS := tty_io.o ...... random.o, add - "mxser.o" at last of this line as - L_OBJS := tty_io.o ....... mxser.o + You will go into a menu-driven system. Please select [Character + devices][Non-standard serial port support], enable the [Moxa + SmartIO support] driver with "[*]" for built-in (not "[M]"), then + select [Exit] to exit this program. - 6. Rebuild kernel - The following are for Linux kernel rebuilding,for your reference only. + 3.5.5 Rebuild kernel + The following are for Linux kernel rebuilding, for your + reference only. For appropriate details, please refer to the Linux document. - If 'lilo' utility is installed, please use 'make zlilo' to rebuild - kernel. If 'lilo' is not installed, please follow the following steps. - a. cd /usr/src/linux - b. make clean /* take a few minutes */ - c. make bzImage /* take probably 10-20 minutes */ - d. Backup original boot kernel. /* optional step */ - e. cp /usr/src/linux/arch/i386/boot/bzImage /boot/vmlinuz + b. make clean /* take a few minutes */ + c. make dep /* take a few minutes */ + d. make bzImage /* take probably 10-20 minutes */ + e. make install /* copy boot image to correct position */ f. Please make sure the boot kernel (vmlinuz) is in the - correct position. If you use 'lilo' utility, you should - check /etc/lilo.conf 'image' item specified the path - which is the 'vmlinuz' path, or you will load wrong - (or old) boot kernel image (vmlinuz). - g. chmod 400 /vmlinuz - h. lilo - i. rdev -R /vmlinuz 1 - j. sync - - Note that if the result of "make zImage" is ERROR, then you have to - go back to Linux configuration Setup. Type "make config" in directory - /usr/src/linux or "setup". - - Since system include file, /usr/src/linux/include/linux/interrupt.h, - is modified each time the MOXA driver is installed, kernel rebuilding - is inevitable. And it takes about 10 to 20 minutes depends on the - machine. - - 7. Make utility - # cd /moxa/mxser/utility - # make install - - 8. Make special file + correct position. + g. If you use 'lilo' utility, you should check /etc/lilo.conf + 'image' item specified the path which is the 'vmlinuz' path, + or you will load wrong (or old) boot kernel image (vmlinuz). + After checking /etc/lilo.conf, please run "lilo". + + Note that if the result of "make bzImage" is ERROR, then you have to + go back to Linux configuration Setup. Type "make menuconfig" in + directory /usr/src/linux. + + + 3.5.6 Make tty device and special file # cd /moxa/mxser/driver # ./msmknod - 9. Reboot + 3.5.7 Make utility + # cd /moxa/mxser/utility + # make clean; make install + + 3.5.8 Reboot - 3.5 Custom configuration + + + 3.6 Custom configuration Although this driver already provides you default configuration, you - still can change the device name and major number.The instruction to + still can change the device name and major number. The instruction to change these parameters are shown as below. Change Device name
@@ -306,33 +403,37 @@ Content 2 free major numbers for this driver. There are 3 steps to change major numbers. - 1. Find free major numbers + 3.6.1 Find free major numbers In /proc/devices, you may find all the major numbers occupied in the system. Please select 2 major numbers that are available. e.g. 40, 45. - 2. Create special files + 3.6.2 Create special files Run /moxa/mxser/driver/msmknod to create special files with specified major numbers. - 3. Modify driver with new major number + 3.6.3 Modify driver with new major number Run vi to open /moxa/mxser/driver/mxser.c. Locate the line contains "MXSERMAJOR". Change the content as below. #define MXSERMAJOR 40 #define MXSERCUMAJOR 45 - 4. Run # make install in /moxa/mxser/driver. + 3.6.4 Run "make clean; make install" in /moxa/mxser/driver. - 3.6 Verify driver installation + 3.7 Verify driver installation You may refer to /var/log/messages to check the latest status log reported by this driver whenever it's activated. + ----------------------------------------------------------------------------- 4. Utilities There are 3 utilities contained in this driver. They are msdiag, msmon and msterm. These 3 utilities are released in form of source code. They should be compiled into executable file and copied into /usr/bin. + Before using these utilities, please load driver (refer 3.4 & 3.5) and + make sure you had run the "msmknod" utility. + msdiag - Diagnostic -------------------- - This utility provides the function to detect what Moxa Smartio multiport - board exists in the system. + This utility provides the function to display what Moxa Smartio/Industio + board found by driver in the system. msmon - Port Monitoring -----------------------
@@ -353,12 +454,13 @@ Content application, for example, sending AT command to a modem connected to the port or used as a terminal for login purpose. Note that this is only a dumb terminal emulation without handling full screen operation. + ----------------------------------------------------------------------------- 5. Setserial Supported Setserial parameters are listed as below. - uart set UART type(16450-->disable FIFO, 16550A-->enable FIFO) + uart set UART type(16450-->disable FIFO, 16550A-->enable FIFO) close_delay set the amount of time(in 1/100 of a second) that DTR should be kept low while being closed. closing_wait set the amount of time(in 1/100 of a second) that the
@@ -366,7 +468,13 @@ Content being closed, before the receiver is disable. spd_hi Use 57.6kb when the application requests 38.4kb. spd_vhi Use 115.2kb when the application requests 38.4kb. + spd_shi Use 230.4kb when the application requests 38.4kb. + spd_warp Use 460.8kb when the application requests 38.4kb. spd_normal Use 38.4kb when the application requests 38.4kb. + spd_cust Use the custom divisor to set the speed when the + application requests 38.4kb. + divisor This option set the custom divison. + baud_base This option set the base baud rate. ----------------------------------------------------------------------------- 6. Troubleshooting
@@ -375,8 +483,9 @@ Content possible. If all the possible solutions fail, please contact our technical support team to get more help. - Error msg: More than 4 Moxa Smartio family boards found. Fifth board and - after are ignored. + + Error msg: More than 4 Moxa Smartio/Industio family boards found. Fifth board + and after are ignored. Solution: To avoid this problem, please unplug fifth and after board, because Moxa driver supports up to 4 boards.
@@ -384,7 +493,7 @@ Content Error msg: Request_irq fail, IRQ(?) may be conflict with another device. Solution: Other PCI or ISA devices occupy the assigned IRQ. If you are not sure - which device causes the situation,please check /proc/interrupts to find + which device causes the situation, please check /proc/interrupts to find free IRQ and simply change another free IRQ for Moxa board. Error msg: Board #: C1xx Series(CAP=xxx) interrupt number invalid.
@@ -397,15 +506,18 @@ Content Moxa ISA board needs an interrupt vector.Please refer to user's manual "Hardware Installation" chapter to set interrupt vector. - Error msg: Couldn't install MOXA Smartio family driver! + Error msg: Couldn't install MOXA Smartio/Industio family driver! Solution: Load Moxa driver fail, the major number may conflict with other devices. - Please refer to previous section 3.5 to change a free major number for + Please refer to previous section 3.7 to change a free major number for Moxa driver. - Error msg: Couldn't install MOXA Smartio family callout driver! + Error msg: Couldn't install MOXA Smartio/Industio family callout driver! Solution: Load Moxa callout driver fail, the callout device major number may - conflict with other devices. Please refer to previous section 3.5 to + conflict with other devices. Please refer to previous section 3.7 to change a free callout device major number for Moxa driver. + + ----------------------------------------------------------------------------- +
Signature · 1 line
1.5.4.5
PATCH 1/1 Char: mxser, prints cleanup
In reply to Jiri Slaby- use dev_* for printing in pci probe function
- move ISA p[rints directly into isa find function, do not postpone it. Remove macros bound to it then.
- prepend some prints by "mxser: " to know what it belongs to
--- drivers/char/mxser.c | 80 +++++++++++++++++++++++--------------------------- 1 files changed, 37 insertions(+), 43 deletions(-)
drivers/char/mxser.c +37 -43
@@ -55,11 +55,6 @@#define MXSER_PORTS (MXSER_BOARDS * MXSER_PORTS_PER_BOARD)#define MXSER_ISR_PASS_LIMIT 100 -#define MXSER_ERR_IOADDR -1 -#define MXSER_ERR_IRQ -2 -#define MXSER_ERR_IRQ_CONFLIT -3 -#define MXSER_ERR_VECTOR -4 -/*CheckIsMoxaMust return value*/ #define MOXA_OTHER_UART 0x00#define MOXA_MUST_MU150_HWID 0x01
@@ -2490,7 +2485,8 @@ static int __devinit mxser_initbrd(struct mxser_board *brd,unsigned int i;int retval; -printk (KERN_INFO "max. baud rate = %d bps.\n" , brd->ports[0 ].max_baud); +printk (KERN_INFO "mxser: max. baud rate = %d bps\n" , + brd->ports[0 ].max_baud);for (i =0 ; i < brd->info->nports; i++) { info = &brd->ports[i];
@@ -2573,28 +2569,32 @@ static int __init mxser_get_ISA_conf(int cap, struct mxser_board *brd) irq = regs[9 ] &0xF000 ; irq = irq | (irq >>4 );if (irq != (regs[9 ] &0xFF00 )) -return MXSER_ERR_IRQ_CONFLIT ; + goto err_irqconflict; }else if (brd->info->nports ==4 ) { irq = regs[9 ] &0xF000 ; irq = irq | (irq >>4 ); irq = irq | (irq >>8 );if (irq != regs[9 ]) -return MXSER_ERR_IRQ_CONFLIT ; + goto err_irqconflict; }else if (brd->info->nports ==8 ) { irq = regs[9 ] &0xF000 ; irq = irq | (irq >>4 ); irq = irq | (irq >>8 );if ((irq != regs[9 ]) || (irq != regs[10 ])) -return MXSER_ERR_IRQ_CONFLIT ; + goto err_irqconflict; } -if (!irq) -return MXSER_ERR_IRQ ; +if (!irq) { +printk (KERN_ERR "mxser: interrupt number unset\n" ); +return -EIO ; + } brd->irq = ((int )(irq &0xF000 ) >>12 );for (i =0 ; i <8 ; i++) brd->ports[i].ioaddr = (int ) regs[i +1 ] &0xFFF8 ; -if ((regs[12 ] &0x80 ) ==0 ) -return MXSER_ERR_VECTOR ; +if ((regs[12 ] &0x80 ) ==0 ) { +printk (KERN_ERR "mxser: invalid interrupt vector\n" ); +return -EIO ; + } brd->vector = (int )regs[11 ];/* interrupt vector */ if (id ==1 ) brd->vector_mask =0x00FF ;
@@ -2621,13 +2621,26 @@ static int __init mxser_get_ISA_conf(int cap, struct mxser_board *brd)else brd->uart_type =PORT_16450 ;if (!request_region (brd->ports[0 ].ioaddr,8 * brd->info->nports, -"mxser(IO)" )) -return MXSER_ERR_IOADDR ; +"mxser(IO)" )) { +printk (KERN_ERR "mxser: can't request ports I/O region: " +"0x%.8lx-0x%.8lx\n" , + brd->ports[0 ].ioaddr, brd->ports[0 ].ioaddr + +8 * brd->info->nports -1 ); +return -EIO ; + }if (!request_region (brd->vector,1 ,"mxser(vector)" )) {release_region (brd->ports[0 ].ioaddr,8 * brd->info->nports); -return MXSER_ERR_VECTOR ; +printk (KERN_ERR "mxser: can't request interrupt vector region: " +"0x%.8lx-0x%.8lx\n" , + brd->ports[0 ].ioaddr, brd->ports[0 ].ioaddr + +8 * brd->info->nports -1 ); +return -EIO ; }return brd->info->nports; + +err_irqconflict: +printk (KERN_ERR "mxser: invalid interrupt number\n" ); +return -EIO ; } static int __devinit mxser_probe(struct pci_dev *pdev,
@@ -2644,20 +2657,20 @@ static int __devinit mxser_probe(struct pci_dev *pdev,break ;if (i >=MXSER_BOARDS ) { -printk (KERN_ERR "Too many Smartio/Industio family boards found " -"(maximum %d), board not configured\n" ,MXSER_BOARDS ); +dev_err (&pdev->dev,"too many boards found (maximum %d), board " +"not configured\n" ,MXSER_BOARDS ); goto err; } brd = &mxser_boards[i]; brd->idx = i *MXSER_PORTS_PER_BOARD ; -printk (KERN_INFO "Found MOXA %s board (BusNo=%d, DevNo=%d)\n" , +dev_info (&pdev->dev,"found MOXA %s board (BusNo=%d, DevNo=%d)\n" , mxser_cards[ent->driver_data].name, pdev->bus->number,PCI_SLOT (pdev->devfn)); retval =pci_enable_device (pdev);if (retval) { -printk (KERN_ERR "Moxa SmartI/O PCI enable fail !\n" ); +dev_err (&pdev->dev,"PCI enable failed\n" ); goto err; }
@@ -2807,33 +2820,14 @@ static int __init mxser_module_init(void) brd = &mxser_boards[m]; retval =mxser_get_ISA_conf (cap, brd); - -if (retval !=0 ) -printk (KERN_INFO "Found MOXA %s board " -"(CAP=0x%x)\n" , - brd->info->name, ioaddr[b]); -if (retval <=0 ) { -if (retval ==MXSER_ERR_IRQ ) -printk (KERN_ERR "Invalid interrupt " -"number, board not " -"configured\n" ); -else if (retval ==MXSER_ERR_IRQ_CONFLIT ) -printk (KERN_ERR "Invalid interrupt " -"number, board not " -"configured\n" ); -else if (retval ==MXSER_ERR_VECTOR ) -printk (KERN_ERR "Invalid interrupt " -"vector, board not " -"configured\n" ); -else if (retval ==MXSER_ERR_IOADDR ) -printk (KERN_ERR "Invalid I/O address, " -"board not configured\n" ); - brd->info =NULL ;continue ; } +printk (KERN_INFO "mxser: found MOXA %s board " +"(CAP=0x%x)\n" , brd->info->name, ioaddr[b]); +/* mxser_initbrd will hook ISR. */ if (mxser_initbrd (brd,NULL ) <0 ) { brd->info =NULL ;
@@ -2850,7 +2844,7 @@ static int __init mxser_module_init(void) retval =pci_register_driver (&mxser_driver);if (retval) { -printk (KERN_ERR "Can't register pci driver\n" ); +printk (KERN_ERR "mxser: can't register pci driver\n" );if (!m) { retval = -ENODEV ; goto err_unr;
Signature · 1 line
1.5.4.5
PATCH 1/1 Char: mxser, remove predefined isa support
In reply to Jiri SlabyRemove a support of ISA addresses predefined on the compile time. It is unused (filled by zeroes) and prolongs the code. Don't initialize global array and add `ioaddr' module param description.
--- drivers/char/mxser.c | 67 ++++++++++++++++++++----------------------------- 1 files changed, 27 insertions(+), 40 deletions(-)
drivers/char/mxser.c +27 -40
@@ -173,14 +173,15 @@ static struct pci_device_id mxser_pcibrds[] = { };MODULE_DEVICE_TABLE (pci, mxser_pcibrds); -static int ioaddr[MXSER_BOARDS ] = {0 ,0 ,0 ,0 }; +static unsigned long ioaddr[MXSER_BOARDS ];static int ttymajor =MXSERMAJOR ;/* Variables for insmod */ MODULE_AUTHOR ("Casper Yang" );MODULE_DESCRIPTION ("MOXA Smartio/Industio Family Multiport Board Device Driver" ); -module_param_array (ioaddr, int,NULL ,0 ); +module_param_array (ioaddr, ulong,NULL ,0 ); +MODULE_PARM_DESC (ioaddr,"ISA io addresses to look for a moxa board" );module_param (ttymajor, int,0 );MODULE_LICENSE ("GPL" );
@@ -289,11 +290,6 @@ struct mxser_mstatus {int dcd; }; -static int mxserBoardCAP[MXSER_BOARDS ] = { -0 ,0 ,0 ,0 -/* 0x180, 0x280, 0x200, 0x320 */ -}; -static struct mxser_board mxser_boards[MXSER_BOARDS ];static struct tty_driver *mxvar_sdriver;static struct mxser_log mxvar_log;
@@ -2772,9 +2768,8 @@ static struct pci_driver mxser_driver = {static int __init mxser_module_init (void ) {struct mxser_board *brd; -unsigned long cap; -unsigned int i, m, isaloop; -int retval, b; +unsigned int b, i, m; +int retval;pr_debug ("Loading module mxser ...\n" );
@@ -2806,41 +2801,33 @@ static int __init mxser_module_init(void) goto err_put; } - m =0 ;/* Start finding ISA boards here */ -for (isaloop =0 ; isaloop <2 ; isaloop++) -for (b =0 ; b <MXSER_BOARDS && m <MXSER_BOARDS ; b++) { -if (!isaloop) - cap = mxserBoardCAP[b];/* predefined */ -else - cap = ioaddr[b];/* module param */ - -if (!cap) -continue ; - - brd = &mxser_boards[m]; - retval =mxser_get_ISA_conf (cap, brd); -if (retval <=0 ) { - brd->info =NULL ; -continue ; - } +for (m =0 , b =0 ; b <MXSER_BOARDS ; b++) { +if (!ioaddr[b]) +continue ; + + brd = &mxser_boards[m]; + retval =mxser_get_ISA_conf (!ioaddr[b], brd); +if (retval <=0 ) { + brd->info =NULL ; +continue ; + } -printk (KERN_INFO "mxser: found MOXA %s board " -"(CAP=0x%x)\n" , brd->info->name, ioaddr[b]); +printk (KERN_INFO "mxser: found MOXA %s board (CAP=0x%lx)\n" , + brd->info->name, ioaddr[b]); -/* mxser_initbrd will hook ISR. */ -if (mxser_initbrd (brd,NULL ) <0 ) { - brd->info =NULL ; -continue ; - } +/* mxser_initbrd will hook ISR. */ +if (mxser_initbrd (brd,NULL ) <0 ) { + brd->info =NULL ; +continue ; + } - brd->idx = m *MXSER_PORTS_PER_BOARD ; -for (i =0 ; i < brd->info->nports; i++) -tty_register_device (mxvar_sdriver, brd->idx + i, -NULL ); + brd->idx = m *MXSER_PORTS_PER_BOARD ; +for (i =0 ; i < brd->info->nports; i++) +tty_register_device (mxvar_sdriver, brd->idx + i,NULL ); - m++; - } + m++; + } retval =pci_register_driver (&mxser_driver);if (retval) {
Signature · 1 line
1.5.4.5
PATCH 1/1 Char: mxser, various cleanups
In reply to Jiri Slaby- remove unused macro
- some whitespace cleanup
- useless debug prints removal
--- drivers/char/mxser.c | 24 ++++-------------------- 1 files changed, 4 insertions(+), 20 deletions(-)
drivers/char/mxser.c +4 -20
@@ -48,7 +48,6 @@#define MXSER_VERSION "2.0.4"/* 1.12 */ #define MXSERMAJOR 174 -#define MXSERCUMAJOR 175#define MXSER_BOARDS 4/* Max. boards */ #define MXSER_PORTS_PER_BOARD 8/* Max. ports per board */
@@ -191,7 +190,6 @@ struct mxser_log {unsigned long txcnt[MXSER_PORTS ]; }; -struct mxser_mon {unsigned long rxcnt;unsigned long txcnt;
@@ -1314,13 +1312,9 @@ static void mxser_flush_chars(struct tty_struct *tty)struct mxser_port *info = tty->driver_data;unsigned long flags; -if (info->xmit_cnt <=0 || - tty->stopped || - !info->xmit_buf || - (tty->hw_stopped && - (info->type !=PORT_16550A ) && - (!info->board->chip_flag) - )) +if (info->xmit_cnt <=0 || tty->stopped || !info->xmit_buf || + (tty->hw_stopped && info->type !=PORT_16550A && + !info->board->chip_flag))return ;spin_lock_irqsave (&info->slock, flags);
@@ -1338,9 +1332,7 @@ static int mxser_write_room(struct tty_struct *tty)int ret; ret =SERIAL_XMIT_SIZE - info->xmit_cnt -1 ; -if (ret <0 ) - ret =0 ; -return ret; +return ret <0 ?0 : ret; }static int mxser_chars_in_buffer (struct tty_struct *tty)
@@ -2771,8 +2763,6 @@ static int __init mxser_module_init(void)unsigned int b, i, m;int retval; -pr_debug ("Loading module mxser ...\n" ); - mxvar_sdriver =alloc_tty_driver (MXSER_PORTS +1 );if (!mxvar_sdriver)return -ENOMEM ;
@@ -2838,8 +2828,6 @@ static int __init mxser_module_init(void) }/* else: we have some ISA cards under control */ } -pr_debug ("Done.\n" ); -return 0 ; err_unr:tty_unregister_driver (mxvar_sdriver);
@@ -2852,8 +2840,6 @@ static void __exit mxser_module_exit(void) {unsigned int i, j; -pr_debug ("Unloading module mxser ...\n" ); -pci_unregister_driver (&mxser_driver);for (i =0 ; i <MXSER_BOARDS ; i++)/* ISA remains */
@@ -2867,8 +2853,6 @@ static void __exit mxser_module_exit(void)for (i =0 ; i <MXSER_BOARDS ; i++)if (mxser_boards[i].info !=NULL )mxser_release_res (&mxser_boards[i],NULL ,1 ); - -pr_debug ("Done.\n" ); }module_init (mxser_module_init);
Signature · 1 line
1.5.4.5
Re: [PATCH] Char: mxser, various cleanups
Quoted 5 lines · On Mon, 9 Jun 2008 12:08:32 +0200 Jiri Slaby <[email protected]> wrote:
- remove unused macro
- some whitespace cleanup
- useless debug prints removalSigned-off-by Jiri Slaby <[email protected]>
And rest of series
drivers/char/mxser.c static int mxser_ioctl_special(unsigned int cmd, void __user *argp) · line 1644
Quoted 3 lines
drivers/char/mxser.c +2
-0case MOXA_GET_MAJOR : +printk (KERN_WARNING "mxser: '%s' uses deprecated ioctl %x, fix " +"your userspace\n" , current->comm, cmd);
Should be rate limited...
Rest looks good, break change is definitely what is needed.
PATCH v2 1/1 Char: mxser, ioctl cleanup
- remove break ctl from ioctl handler, it's never reached, since tty_ops->break_ctl is defined (mxser break handling is done in software)
- mark MOXA_GET_MAJOR as deprecated
- fix TIOCGICOUNT (some retval non-checks of put_user). Use copy_to_user to whole structure instead.
--- drivers/char/mxser.c | 80 +++++++++++++------------------------------------ 1 files changed, 21 insertions(+), 59 deletions(-)
drivers/char/mxser.c +21 -59
@@ -16,7 +16,6 @@* Fed through a cleanup, indent and remove of non 2.6 code by Alan Cox * <[email protected]>. The original 1.8 code is available on www.moxa.com. * - Fixed x86_64 cleanness -* - Fixed sleep with spinlock held in mxser_send_break */ #include <linux/module.h>
@@ -1473,27 +1472,6 @@ static int mxser_get_lsr_info(struct mxser_port *info,return put_user (result, value); } -/* -* This routine sends a break character out the serial port. -*/ -static void mxser_send_break (struct mxser_port *info,int duration) -{ -unsigned long flags; - -if (!info->ioaddr) -return ; -set_current_state (TASK_INTERRUPTIBLE ); -spin_lock_irqsave (&info->slock, flags); -outb (inb (info->ioaddr +UART_LCR ) |UART_LCR_SBC , - info->ioaddr +UART_LCR ); -spin_unlock_irqrestore (&info->slock, flags); -schedule_timeout (duration); -spin_lock_irqsave (&info->slock, flags); -outb (inb (info->ioaddr +UART_LCR ) & ~UART_LCR_SBC , - info->ioaddr +UART_LCR ); -spin_unlock_irqrestore (&info->slock, flags); -} -static int mxser_tiocmget (struct tty_struct *tty,struct file *file) {struct mxser_port *info = tty->driver_data;
@@ -1662,6 +1640,10 @@ static int mxser_ioctl_special(unsigned int cmd, void __user *argp)switch (cmd) {case MOXA_GET_MAJOR : +if (printk_ratelimit ()) +printk (KERN_WARNING "mxser: '%s' uses deprecated " +"ioctl %x, fix your userspace\n" , + current->comm, cmd);return put_user (ttymajor, (int __user *)argp);case MOXA_CHKPORTENABLE :
@@ -1832,7 +1814,6 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file, {struct mxser_port *info = tty->driver_data;struct async_icount cnow; -struct serial_icounter_struct __user *p_cuser;unsigned long flags;void __user *argp = (void __user *)arg;int retval;
@@ -1881,21 +1862,6 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file,return -EIO ;switch (cmd) { -case TCSBRK :/* SVID version: non-zero arg --> no break */ - retval =tty_check_change (tty); -if (retval) -return retval; -tty_wait_until_sent (tty,0 ); -if (!arg) -mxser_send_break (info,HZ /4 );/* 1/4 second */ -return 0 ; -case TCSBRKP :/* support for POSIX tcsendbreak() */ - retval =tty_check_change (tty); -if (retval) -return retval; -tty_wait_until_sent (tty,0 ); -mxser_send_break (info, arg ? arg * (HZ /10 ) :HZ /4 ); -return 0 ;case TIOCGSERIAL :lock_kernel (); retval =mxser_get_serial_info (info, argp);
@@ -1927,30 +1893,26 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file,* NB: both 1->0 and 0->1 transitions are counted except for * RI where only 0->1 is counted. */ -case TIOCGICOUNT : +case TIOCGICOUNT : { +struct serial_icounter_struct icnt = {0 };spin_lock_irqsave (&info->slock, flags); cnow = info->icount;spin_unlock_irqrestore (&info->slock, flags); - p_cuser = argp; -if (put_user (cnow.frame, &p_cuser->frame)) -return -EFAULT ; -if (put_user (cnow.brk, &p_cuser->brk)) -return -EFAULT ; -if (put_user (cnow.overrun, &p_cuser->overrun)) -return -EFAULT ; -if (put_user (cnow.buf_overrun, &p_cuser->buf_overrun)) -return -EFAULT ; -if (put_user (cnow.parity, &p_cuser->parity)) -return -EFAULT ; -if (put_user (cnow.rx, &p_cuser->rx)) -return -EFAULT ; -if (put_user (cnow.tx, &p_cuser->tx)) -return -EFAULT ; -put_user (cnow.cts, &p_cuser->cts); -put_user (cnow.dsr, &p_cuser->dsr); -put_user (cnow.rng, &p_cuser->rng); -put_user (cnow.dcd, &p_cuser->dcd); -return 0 ; + + icnt.frame = cnow.frame; + icnt.brk = cnow.brk; + icnt.overrun = cnow.overrun; + icnt.buf_overrun = cnow.buf_overrun; + icnt.parity = cnow.parity; + icnt.rx = cnow.rx; + icnt.tx = cnow.tx; + icnt.cts = cnow.cts; + icnt.dsr = cnow.dsr; + icnt.rng = cnow.rng; + icnt.dcd = cnow.dcd; + +return copy_to_user (argp, &icnt,sizeof (icnt)) ? -EFAULT :0 ; + }case MOXA_HighSpeedOn:return put_user (info->baud_base !=115200 ?1 :0 , (int __user *)argp);case MOXA_SDS_RSTICOUNTER :
Signature · 1 line
1.5.4.5