X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fchar%2Fmxser.c;h=367f12d6ce7b9386a26a6b3d4bebd2eaba9621c6;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=d4ba62a29ea9d0db80e2c35d065208db7c64d93e;hpb=9bf4aaab3e101692164d49b7ca357651eb691cb6;p=linux-2.6.git diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c index d4ba62a29..367f12d6c 100644 --- a/drivers/char/mxser.c +++ b/drivers/char/mxser.c @@ -1,8 +1,7 @@ -/*****************************************************************************/ /* - * mxser.c -- MOXA Smartio family multiport serial driver. + * mxser.c -- MOXA Smartio/Industio family multiport serial driver. * - * Copyright (C) 1999-2000 Moxa Technologies (support@moxa.com.tw). + * Copyright (C) 1999-2001 Moxa Technologies (support@moxa.com.tw). * * This code is loosely based on the Linux serial driver, written by * Linus Torvalds, Theodore T'so and others. @@ -10,7 +9,7 @@ * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. +* (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,27 +19,27 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -/* - * MOXA Smartio Family Serial Driver * - * Copyright (C) 1999,2000 Moxa Technologies Co., LTD. + * Original release 10/26/00 * - * for : LINUX 2.0.X, 2.2.X, 2.4.X - * date : 2001/05/01 - * version : 1.2 - * - * Fixes for C104H/PCI by Tim Hockin - * Added support for: C102, CI-132, CI-134, CP-132, CP-114, CT-114 cards - * by Damian Wrobel + * 02/06/01 Support MOXA Industio family boards. + * 02/06/01 Support TIOCGICOUNT. + * 02/06/01 Fix the problem for connecting to serial mouse. + * 02/06/01 Fix the problem for H/W flow control. + * 02/06/01 Fix the compling warning when CONFIG_PCI + * don't be defined. * - * Added support for serial card CP104 - * by James Nelson Provident Solutions + * Fed through a cleanup, indent and remove of non 2.6 code by Alan Cox + * . 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 #include +#include +#include #include #include #include @@ -54,182 +53,235 @@ #include #include #include +#include #include #include #include +#include #include -#include #include #include #include +#include #include #include -#define MXSER_VERSION "1.2.1" - -#define MXSERMAJOR 174 -#define MXSERCUMAJOR 175 +#include "mxser.h" +#define MXSER_VERSION "1.8" +#define MXSERMAJOR 174 +#define MXSERCUMAJOR 175 #define MXSER_EVENT_TXLOW 1 #define MXSER_EVENT_HANGUP 2 +#define MXSER_BOARDS 4 /* Max. boards */ +#define MXSER_PORTS 32 /* Max. ports */ +#define MXSER_PORTS_PER_BOARD 8 /* Max. ports per board */ +#define MXSER_ISR_PASS_LIMIT 256 -#define SERIAL_DO_RESTART - -#define MXSER_BOARDS 4 /* Max. boards */ -#define MXSER_PORTS 32 /* Max. ports */ -#define MXSER_PORTS_PER_BOARD 8 /* Max. ports per board */ -#define MXSER_ISR_PASS_LIMIT 256 - -#define MXSER_ERR_IOADDR -1 -#define MXSER_ERR_IRQ -2 -#define MXSER_ERR_IRQ_CONFLIT -3 -#define MXSER_ERR_VECTOR -4 - -#define SERIAL_TYPE_NORMAL 1 +#define MXSER_ERR_IOADDR -1 +#define MXSER_ERR_IRQ -2 +#define MXSER_ERR_IRQ_CONFLIT -3 +#define MXSER_ERR_VECTOR -4 -#define WAKEUP_CHARS 256 +#define SERIAL_TYPE_NORMAL 1 +#define SERIAL_TYPE_CALLOUT 2 -#define UART_MCR_AFE 0x20 -#define UART_LSR_SPECIAL 0x1E +#define WAKEUP_CHARS 256 -#define PORTNO(x) ((x)->index) +#define UART_MCR_AFE 0x20 +#define UART_LSR_SPECIAL 0x1E -#define RELEVANT_IFLAG(iflag) (iflag & (IGNBRK|BRKINT|IGNPAR|PARMRK|INPCK)) +#define RELEVANT_IFLAG(iflag) (iflag & (IGNBRK|BRKINT|IGNPAR|PARMRK|INPCK|IXON|IXOFF)) #define IRQ_T(info) ((info->flags & ASYNC_SHARE_IRQ) ? SA_SHIRQ : SA_INTERRUPT) -#ifndef MIN -#define MIN(a,b) ((a) < (b) ? (a) : (b)) -#endif - -/* - * Define the Moxa PCI vendor and device IDs. - */ - -#ifndef PCI_VENDOR_ID_MOXA -#define PCI_VENDOR_ID_MOXA 0x1393 -#endif -#ifndef PCI_DEVICE_ID_C168 -#define PCI_DEVICE_ID_C168 0x1680 -#endif -#ifndef PCI_DEVICE_ID_C104 -#define PCI_DEVICE_ID_C104 0x1040 -#endif -#ifndef PCI_DEVICE_ID_CP104 -#define PCI_DEVICE_ID_CP104 0x1041 -#endif -#ifndef PCI_DEVICE_ID_CP132 -#define PCI_DEVICE_ID_CP132 0x1320 -#endif -#ifndef PCI_DEVICE_ID_CP114 -#define PCI_DEVICE_ID_CP114 0x1141 -#endif -#ifndef PCI_DEVICE_ID_CT114 -#define PCI_DEVICE_ID_CT114 0x1140 -#endif - #define C168_ASIC_ID 1 #define C104_ASIC_ID 2 -#define CI134_ASIC_ID 3 -#define CI132_ASIC_ID 4 -#define CI104J_ASIC_ID 5 #define C102_ASIC_ID 0xB +#define CI132_ASIC_ID 4 +#define CI134_ASIC_ID 3 +#define CI104J_ASIC_ID 5 enum { - MXSER_BOARD_C168_ISA = 0, + MXSER_BOARD_C168_ISA = 1, MXSER_BOARD_C104_ISA, MXSER_BOARD_CI104J, MXSER_BOARD_C168_PCI, MXSER_BOARD_C104_PCI, - MXSER_BOARD_CP104_PCI, MXSER_BOARD_C102_ISA, MXSER_BOARD_CI132, MXSER_BOARD_CI134, - MXSER_BOARD_CP132_PCI, - MXSER_BOARD_CP114_PCI, - MXSER_BOARD_CT114_PCI + MXSER_BOARD_CP132, + MXSER_BOARD_CP114, + MXSER_BOARD_CT114, + MXSER_BOARD_CP102, + MXSER_BOARD_CP104U, + MXSER_BOARD_CP168U, + MXSER_BOARD_CP132U, + MXSER_BOARD_CP134U, + MXSER_BOARD_CP104JU, + MXSER_BOARD_RC7000, + MXSER_BOARD_CP118U, + MXSER_BOARD_CP102UL, + MXSER_BOARD_CP102U, }; -static char *mxser_brdname[] = -{ +static char *mxser_brdname[] = { "C168 series", "C104 series", "CI-104J series", "C168H/PCI series", "C104H/PCI series", - "CP104/PCI series", "C102 series", "CI-132 series", "CI-134 series", "CP-132 series", "CP-114 series", - "CT-114 series" + "CT-114 series", + "CP-102 series", + "CP-104U series", + "CP-168U series", + "CP-132U series", + "CP-134U series", + "CP-104JU series", + "Moxa UC7000 Serial", + "CP-118U series", + "CP-102UL series", + "CP-102U series", }; -static int mxser_numports[] = -{ - 8, - 4, - 4, - 8, - 4, - 4, - 2, - 2, - 4, - 2, - 4, - 4 +static int mxser_numports[] = { + 8, // C168-ISA + 4, // C104-ISA + 4, // CI104J + 8, // C168-PCI + 4, // C104-PCI + 2, // C102-ISA + 2, // CI132 + 4, // CI134 + 2, // CP132 + 4, // CP114 + 4, // CT114 + 2, // CP102 + 4, // CP104U + 8, // CP168U + 2, // CP132U + 4, // CP134U + 4, // CP104JU + 8, // RC7000 + 8, // CP118U + 2, // CP102UL + 2, // CP102U +}; + +#define UART_TYPE_NUM 2 + +unsigned int Gmoxa_uart_id[UART_TYPE_NUM] = { + MOXA_MUST_MU150_HWID, + MOXA_MUST_MU860_HWID +}; + +// This is only for PCI +#define UART_INFO_NUM 3 +struct mxpciuart_info { + int type; + int tx_fifo; + int rx_fifo; + int xmit_fifo_size; + int rx_high_water; + int rx_trigger; + int rx_low_water; + long max_baud; +}; + +struct mxpciuart_info Gpci_uart_info[UART_INFO_NUM] = { + {MOXA_OTHER_UART, 16, 16, 16, 14, 14, 1, 921600L}, + {MOXA_MUST_MU150_HWID, 64, 64, 64, 48, 48, 16, 230400L}, + {MOXA_MUST_MU860_HWID, 128, 128, 128, 96, 96, 32, 921600L} }; -/* - * MOXA ioctls - */ -#define MOXA 0x400 -#define MOXA_GETDATACOUNT (MOXA + 23) -#define MOXA_GET_CONF (MOXA + 35) -#define MOXA_DIAGNOSE (MOXA + 50) -#define MOXA_CHKPORTENABLE (MOXA + 60) -#define MOXA_HighSpeedOn (MOXA + 61) -#define MOXA_GET_MAJOR (MOXA + 63) -#define MOXA_GET_CUMAJOR (MOXA + 64) -#define MOXA_GETMSTATUS (MOXA + 65) #ifdef CONFIG_PCI + static struct pci_device_id mxser_pcibrds[] = { - { PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_C168, PCI_ANY_ID, PCI_ANY_ID, 0, 0, - MXSER_BOARD_C168_PCI }, - { PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_C104, PCI_ANY_ID, PCI_ANY_ID, 0, 0, - MXSER_BOARD_C104_PCI }, - { PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_CP104, PCI_ANY_ID, PCI_ANY_ID, 0, 0, - MXSER_BOARD_CP104_PCI }, - { PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_CP132, PCI_ANY_ID, PCI_ANY_ID, 0, 0, - MXSER_BOARD_CP132_PCI }, - { PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_CP114, PCI_ANY_ID, PCI_ANY_ID, 0, 0, - MXSER_BOARD_CP114_PCI }, - { PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_CT114, PCI_ANY_ID, PCI_ANY_ID, 0, 0, - MXSER_BOARD_CT114_PCI }, - { 0 } + {PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_C168, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MXSER_BOARD_C168_PCI}, + {PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_C104, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MXSER_BOARD_C104_PCI}, + {PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP132, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MXSER_BOARD_CP132}, + {PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP114, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MXSER_BOARD_CP114}, + {PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CT114, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MXSER_BOARD_CT114}, + {PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP102, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MXSER_BOARD_CP102}, + {PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP104U, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MXSER_BOARD_CP104U}, + {PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP168U, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MXSER_BOARD_CP168U}, + {PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP132U, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MXSER_BOARD_CP132U}, + {PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP134U, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MXSER_BOARD_CP134U}, + {PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP104JU, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MXSER_BOARD_CP104JU}, + {PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_RC7000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MXSER_BOARD_RC7000}, + {PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP118U, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MXSER_BOARD_CP118U}, + {PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP102UL, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MXSER_BOARD_CP102UL}, + {PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP102U, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MXSER_BOARD_CP102U}, + {0} }; + MODULE_DEVICE_TABLE(pci, mxser_pcibrds); -#endif /* CONFIG_PCI */ -static int ioaddr[MXSER_BOARDS]; + +#endif + +typedef struct _moxa_pci_info { + unsigned short busNum; + unsigned short devNum; + struct pci_dev *pdev; // add by Victor Yu. 06-23-2003 +} moxa_pci_info; + +static int ioaddr[MXSER_BOARDS] = { 0, 0, 0, 0 }; static int ttymajor = MXSERMAJOR; -static int verbose; +static int calloutmajor = MXSERCUMAJOR; +static int verbose = 0; /* Variables for insmod */ -MODULE_AUTHOR("William Chen"); -MODULE_DESCRIPTION("MOXA Smartio Family Multiport Board Device Driver"); -MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Casper Yang"); +MODULE_DESCRIPTION("MOXA Smartio/Industio Family Multiport Board Device Driver"); MODULE_PARM(ioaddr, "1-4i"); MODULE_PARM(ttymajor, "i"); +MODULE_PARM(calloutmajor, "i"); MODULE_PARM(verbose, "i"); +MODULE_LICENSE("GPL"); + +struct mxser_log { + int tick; + unsigned long rxcnt[MXSER_PORTS]; + unsigned long txcnt[MXSER_PORTS]; +}; + +struct mxser_mon { + unsigned long rxcnt; + unsigned long txcnt; + unsigned long up_rxcnt; + unsigned long up_txcnt; + int modem_status; + unsigned char hold_reason; +}; + +struct mxser_mon_ext { + unsigned long rx_cnt[32]; + unsigned long tx_cnt[32]; + unsigned long up_rxcnt[32]; + unsigned long up_txcnt[32]; + int modem_status[32]; + + long baudrate[32]; + int databits[32]; + int stopbits[32]; + int parity[32]; + int flowctrl[32]; + int fifo[32]; + int iftype[32]; +}; struct mxser_hwconf { int board_type; int ports; @@ -239,7 +291,10 @@ struct mxser_hwconf { int uart_type; int ioaddr[MXSER_PORTS_PER_BOARD]; int baud_base[MXSER_PORTS_PER_BOARD]; - struct pci_dev *pdev; + moxa_pci_info pciInfo; + int IsMoxaMustChipFlag; // add by Victor Yu. 08-30-2002 + int MaxCanSetBaudRate[MXSER_PORTS_PER_BOARD]; // add by Victor Yu. 09-04-2002 + int opmode_ioaddr[MXSER_PORTS_PER_BOARD]; // add by Victor Yu. 01-05-2004 }; struct mxser_struct { @@ -248,7 +303,9 @@ struct mxser_struct { int irq; /* port using irq no. */ int vector; /* port irq vector */ int vectormask; /* port vector mask */ + int rx_high_water; int rx_trigger; /* Rx fifo trigger level */ + int rx_low_water; int baud_base; /* max. speed */ int flags; /* defined in tty.h */ int type; /* UART type */ @@ -265,23 +322,31 @@ struct mxser_struct { unsigned long event; int count; /* # of fd on device */ int blocked_open; /* # of blocked opens */ + long session; /* Session of opening process */ + long pgrp; /* pgrp of opening process */ unsigned char *xmit_buf; int xmit_head; int xmit_tail; int xmit_cnt; struct work_struct tqueue; - int cflag; + struct termios normal_termios; + struct termios callout_termios; wait_queue_head_t open_wait; wait_queue_head_t close_wait; wait_queue_head_t delta_msr_wait; struct async_icount icount; /* kernel counters for the 4 input interrupts */ + int timeout; + int IsMoxaMustChipFlag; // add by Victor Yu. 08-30-2002 + int MaxCanSetBaudRate; // add by Victor Yu. 09-04-2002 + int opmode_ioaddr; // add by Victor Yu. 01-05-2004 + unsigned char stop_rx; + unsigned char ldisc_stop_rx; + long realbaud; + struct mxser_mon mon_data; + unsigned char err_shadow; + spinlock_t slock; }; -struct mxser_log { - int tick; - int rxcnt[MXSER_PORTS]; - int txcnt[MXSER_PORTS]; -}; struct mxser_mstatus { tcflag_t cflag; @@ -293,66 +358,61 @@ struct mxser_mstatus { static struct mxser_mstatus GMStatus[MXSER_PORTS]; -static int mxserBoardCAP[MXSER_BOARDS] = -{ +static int mxserBoardCAP[MXSER_BOARDS] = { 0, 0, 0, 0 - /* 0x180, 0x280, 0x200, 0x320 */ + /* 0x180, 0x280, 0x200, 0x320 */ }; - static struct tty_driver *mxvar_sdriver; static struct mxser_struct mxvar_table[MXSER_PORTS]; +static struct tty_struct *mxvar_tty[MXSER_PORTS + 1]; +static struct termios *mxvar_termios[MXSER_PORTS + 1]; +static struct termios *mxvar_termios_locked[MXSER_PORTS + 1]; static struct mxser_log mxvar_log; static int mxvar_diagflag; -/* - * mxvar_tmp_buf is used as a temporary buffer by serial_write. We need - * to lock it in case the memcpy_fromfs blocks while swapping in a page, - * and some other program tries to do a serial write at the same time. - * Since the lock will only come under contention when the system is - * swapping and available memory is low, it makes sense to share one - * buffer across all the serial ports, since it significantly saves - * memory if large numbers of serial ports are open. - */ -static unsigned char *mxvar_tmp_buf; -static struct semaphore mxvar_tmp_buf_sem; +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 spinlock_t gm_lock; /* * This is used to figure out the divisor speeds and the timeouts */ -static int mxvar_baud_table[] = -{ - 0, 50, 75, 110, 134, 150, 200, 300, 600, 1200, 1800, 2400, 4800, - 9600, 19200, 38400, 57600, 115200, 230400, 460800, 921600, 0}; -struct mxser_hwconf mxsercfg[MXSER_BOARDS]; +static struct mxser_hwconf mxsercfg[MXSER_BOARDS]; /* * static functions: */ static void mxser_getcfg(int board, struct mxser_hwconf *hwconf); +static int mxser_init(void); + +//static void mxser_poll(unsigned long); static int mxser_get_ISA_conf(int, struct mxser_hwconf *); +static int mxser_get_PCI_conf(int, int, int, struct mxser_hwconf *); static void mxser_do_softint(void *); static int mxser_open(struct tty_struct *, struct file *); static void mxser_close(struct tty_struct *, struct file *); -static int mxser_write(struct tty_struct *, int, const unsigned char *, int); +static int mxser_write(struct tty_struct *, const unsigned char *, int); static int mxser_write_room(struct tty_struct *); static void mxser_flush_buffer(struct tty_struct *); static int mxser_chars_in_buffer(struct tty_struct *); static void mxser_flush_chars(struct tty_struct *); static void mxser_put_char(struct tty_struct *, unsigned char); static int mxser_ioctl(struct tty_struct *, struct file *, uint, ulong); -static int mxser_ioctl_special(unsigned int, unsigned long); +static int mxser_ioctl_special(unsigned int, void __user *); static void mxser_throttle(struct tty_struct *); static void mxser_unthrottle(struct tty_struct *); static void mxser_set_termios(struct tty_struct *, struct termios *); static void mxser_stop(struct tty_struct *); static void mxser_start(struct tty_struct *); static void mxser_hangup(struct tty_struct *); +static void mxser_rs_break(struct tty_struct *, int); static irqreturn_t mxser_interrupt(int, void *, struct pt_regs *); -static inline void mxser_receive_chars(struct mxser_struct *, int *); -static inline void mxser_transmit_chars(struct mxser_struct *); -static inline void mxser_check_modem_status(struct mxser_struct *, int); +static void mxser_receive_chars(struct mxser_struct *, int *); +static void mxser_transmit_chars(struct mxser_struct *); +static void mxser_check_modem_status(struct mxser_struct *, int); static int mxser_block_til_ready(struct tty_struct *, struct file *, struct mxser_struct *); static int mxser_startup(struct mxser_struct *); static void mxser_shutdown(struct mxser_struct *); @@ -363,96 +423,198 @@ static int mxser_get_lsr_info(struct mxser_struct *, unsigned int __user *); static void mxser_send_break(struct mxser_struct *, int); static int mxser_tiocmget(struct tty_struct *, struct file *); static int mxser_tiocmset(struct tty_struct *, struct file *, unsigned int, unsigned int); +static int mxser_set_baud(struct mxser_struct *info, long newspd); +static void mxser_wait_until_sent(struct tty_struct *tty, int timeout); + +static void mxser_startrx(struct tty_struct *tty); +static void mxser_stoprx(struct tty_struct *tty); + + +static int CheckIsMoxaMust(int io) +{ + u8 oldmcr, hwid; + int i; + + outb(0, io + UART_LCR); + DISABLE_MOXA_MUST_ENCHANCE_MODE(io); + oldmcr = inb(io + UART_MCR); + outb(0, io + UART_MCR); + SET_MOXA_MUST_XON1_VALUE(io, 0x11); + if ((hwid = inb(io + UART_MCR)) != 0) { + outb(oldmcr, io + UART_MCR); + return (MOXA_OTHER_UART); + } + + GET_MOXA_MUST_HARDWARE_ID(io, &hwid); + for (i = 0; i < UART_TYPE_NUM; i++) { + if (hwid == Gmoxa_uart_id[i]) + return (int) hwid; + } + return MOXA_OTHER_UART; +} + +// above is modified by Victor Yu. 08-15-2002 + +static struct tty_operations mxser_ops = { + .open = mxser_open, + .close = mxser_close, + .write = mxser_write, + .put_char = mxser_put_char, + .flush_chars = mxser_flush_chars, + .write_room = mxser_write_room, + .chars_in_buffer = mxser_chars_in_buffer, + .flush_buffer = mxser_flush_buffer, + .ioctl = mxser_ioctl, + .throttle = mxser_throttle, + .unthrottle = mxser_unthrottle, + .set_termios = mxser_set_termios, + .stop = mxser_stop, + .start = mxser_start, + .hangup = mxser_hangup, + .tiocmget = mxser_tiocmget, + .tiocmset = mxser_tiocmset, +}; /* - * The MOXA C168/C104 serial driver boot-time initialization code! + * The MOXA Smartio/Industio serial driver boot-time initialization code! */ +static int __init mxser_module_init(void) +{ + int ret; + + if (verbose) + printk(KERN_DEBUG "Loading module mxser ...\n"); + ret = mxser_init(); + if (verbose) + printk(KERN_DEBUG "Done.\n"); + return ret; +} + static void __exit mxser_module_exit(void) { int i, err = 0; - if (verbose) - printk("Unloading module mxser ...\n"); + printk(KERN_DEBUG "Unloading module mxser ...\n"); + if ((err |= tty_unregister_driver(mxvar_sdriver))) - printk("Couldn't unregister MOXA Smartio family serial driver\n"); - put_tty_driver(mxvar_sdriver); + printk(KERN_ERR "Couldn't unregister MOXA Smartio/Industio family serial driver\n"); for (i = 0; i < MXSER_BOARDS; i++) { + struct pci_dev *pdev; + if (mxsercfg[i].board_type == -1) continue; else { + pdev = mxsercfg[i].pciInfo.pdev; free_irq(mxsercfg[i].irq, &mxvar_table[i * MXSER_PORTS_PER_BOARD]); + if (pdev != NULL) { //PCI + release_region(pci_resource_start(pdev, 2), pci_resource_len(pdev, 2)); + release_region(pci_resource_start(pdev, 3), pci_resource_len(pdev, 3)); + } else { + release_region(mxsercfg[i].ioaddr[0], 8 * mxsercfg[i].ports); + release_region(mxsercfg[i].vector, 1); + } } } - if (verbose) - printk("Done.\n"); + printk(KERN_DEBUG "Done.\n"); + +} +static void process_txrx_fifo(struct mxser_struct *info) +{ + int i; + + if ((info->type == PORT_16450) || (info->type == PORT_8250)) { + info->rx_trigger = 1; + info->rx_high_water = 1; + info->rx_low_water = 1; + info->xmit_fifo_size = 1; + } else { + for (i = 0; i < UART_INFO_NUM; i++) { + if (info->IsMoxaMustChipFlag == Gpci_uart_info[i].type) { + info->rx_trigger = Gpci_uart_info[i].rx_trigger; + info->rx_low_water = Gpci_uart_info[i].rx_low_water; + info->rx_high_water = Gpci_uart_info[i].rx_high_water; + info->xmit_fifo_size = Gpci_uart_info[i].xmit_fifo_size; + break; + } + } + } } -int mxser_initbrd(int board, struct mxser_hwconf *hwconf) +static int mxser_initbrd(int board, struct mxser_hwconf *hwconf) { struct mxser_struct *info; unsigned long flags; int retval; int i, n; - init_MUTEX(&mxvar_tmp_buf_sem); - n = board * MXSER_PORTS_PER_BOARD; info = &mxvar_table[n]; + /*if (verbose) */ { + printk(KERN_DEBUG " ttyM%d - ttyM%d ", n, n + hwconf->ports - 1); + printk(" max. baud rate = %d bps.\n", hwconf->MaxCanSetBaudRate[0]); + } + for (i = 0; i < hwconf->ports; i++, n++, info++) { - if (verbose) { - printk(" ttyM%d/cum%d at 0x%04x ", n, n, hwconf->ioaddr[i]); - if (hwconf->baud_base[i] == 115200) - printk(" max. baud rate up to 115200 bps.\n"); - else - printk(" max. baud rate up to 921600 bps.\n"); - } info->port = n; info->base = hwconf->ioaddr[i]; info->irq = hwconf->irq; info->vector = hwconf->vector; info->vectormask = hwconf->vector_mask; - info->rx_trigger = 14; - info->baud_base = hwconf->baud_base[i]; + info->opmode_ioaddr = hwconf->opmode_ioaddr[i]; // add by Victor Yu. 01-05-2004 + info->stop_rx = 0; + info->ldisc_stop_rx = 0; + + info->IsMoxaMustChipFlag = hwconf->IsMoxaMustChipFlag; + //Enhance mode enabled here + if (info->IsMoxaMustChipFlag != MOXA_OTHER_UART) { + ENABLE_MOXA_MUST_ENCHANCE_MODE(info->base); + } + info->flags = ASYNC_SHARE_IRQ; info->type = hwconf->uart_type; - if ((info->type == PORT_16450) || (info->type == PORT_8250)) - info->xmit_fifo_size = 1; - else - info->xmit_fifo_size = 16; + info->baud_base = hwconf->baud_base[i]; + + info->MaxCanSetBaudRate = hwconf->MaxCanSetBaudRate[i]; + + process_txrx_fifo(info); + + info->custom_divisor = hwconf->baud_base[i] * 16; info->close_delay = 5 * HZ / 10; info->closing_wait = 30 * HZ; INIT_WORK(&info->tqueue, mxser_do_softint, info); - info->cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL; + info->normal_termios = mxvar_sdriver->init_termios; init_waitqueue_head(&info->open_wait); init_waitqueue_head(&info->close_wait); init_waitqueue_head(&info->delta_msr_wait); + memset(&info->mon_data, 0, sizeof(struct mxser_mon)); + info->err_shadow = 0; + spin_lock_init(&info->slock); } - /* * Allocate the IRQ if necessary */ - save_flags(flags); + + + /* before set INT ISR, disable all int */ + for (i = 0; i < hwconf->ports; i++) { + outb(inb(hwconf->ioaddr[i] + UART_IER) & 0xf0, hwconf->ioaddr[i] + UART_IER); + } n = board * MXSER_PORTS_PER_BOARD; info = &mxvar_table[n]; - cli(); - retval = request_irq(hwconf->irq, mxser_interrupt, IRQ_T(info), - "mxser", info); + retval = request_irq(hwconf->irq, mxser_interrupt, IRQ_T(info), "mxser", info); if (retval) { - restore_flags(flags); - printk("Board %d: %s", board, mxser_brdname[hwconf->board_type]); + printk(KERN_ERR "Board %d: %s", board, mxser_brdname[hwconf->board_type - 1]); printk(" Request irq fail,IRQ (%d) may be conflit with another device.\n", info->irq); - return (retval); + return retval; } - restore_flags(flags); - return 0; } @@ -463,82 +625,131 @@ static void mxser_getcfg(int board, struct mxser_hwconf *hwconf) } #ifdef CONFIG_PCI -static int mxser_get_PCI_conf(struct pci_dev *pdev, int board_type, struct mxser_hwconf *hwconf) +static int mxser_get_PCI_conf(int busnum, int devnum, int board_type, struct mxser_hwconf *hwconf) { - int i; + int i, j; +// unsigned int val; unsigned int ioaddress; + struct pci_dev *pdev = hwconf->pciInfo.pdev; + //io address hwconf->board_type = board_type; - hwconf->ports = mxser_numports[board_type]; - ioaddress = pci_resource_start (pdev, 2); - for (i = 0; i < hwconf->ports; i++) + hwconf->ports = mxser_numports[board_type - 1]; + ioaddress = pci_resource_start(pdev, 2); + request_region(pci_resource_start(pdev, 2), pci_resource_len(pdev, 2), "mxser(IO)"); + + for (i = 0; i < hwconf->ports; i++) { hwconf->ioaddr[i] = ioaddress + 8 * i; + } - ioaddress = pci_resource_start (pdev, 3); + //vector + ioaddress = pci_resource_start(pdev, 3); + request_region(pci_resource_start(pdev, 3), pci_resource_len(pdev, 3), "mxser(vector)"); hwconf->vector = ioaddress; - hwconf->irq = pdev->irq; + //irq + hwconf->irq = hwconf->pciInfo.pdev->irq; + hwconf->IsMoxaMustChipFlag = CheckIsMoxaMust(hwconf->ioaddr[0]); hwconf->uart_type = PORT_16550A; hwconf->vector_mask = 0; + + + for (i = 0; i < hwconf->ports; i++) { + for (j = 0; j < UART_INFO_NUM; j++) { + if (Gpci_uart_info[j].type == hwconf->IsMoxaMustChipFlag) { + hwconf->MaxCanSetBaudRate[i] = Gpci_uart_info[j].max_baud; + + //exception....CP-102 + if (board_type == MXSER_BOARD_CP102) + hwconf->MaxCanSetBaudRate[i] = 921600; + break; + } + } + } + + if (hwconf->IsMoxaMustChipFlag == MOXA_MUST_MU860_HWID) { + for (i = 0; i < hwconf->ports; i++) { + if (i < 4) + hwconf->opmode_ioaddr[i] = ioaddress + 4; + else + hwconf->opmode_ioaddr[i] = ioaddress + 0x0c; + } + outb(0, ioaddress + 4); // default set to RS232 mode + outb(0, ioaddress + 0x0c); //default set to RS232 mode + } + for (i = 0; i < hwconf->ports; i++) { hwconf->vector_mask |= (1 << i); hwconf->baud_base[i] = 921600; } return (0); } -#endif /* CONFIG_PCI */ - -static struct tty_operations mxser_ops = { - .open = mxser_open, - .close = mxser_close, - .write = mxser_write, - .put_char = mxser_put_char, - .flush_chars = mxser_flush_chars, - .write_room = mxser_write_room, - .chars_in_buffer = mxser_chars_in_buffer, - .flush_buffer = mxser_flush_buffer, - .ioctl = mxser_ioctl, - .throttle = mxser_throttle, - .unthrottle = mxser_unthrottle, - .set_termios = mxser_set_termios, - .stop = mxser_stop, - .start = mxser_start, - .hangup = mxser_hangup, - .tiocmget = mxser_tiocmget, - .tiocmset = mxser_tiocmset, -}; +#endif -static int __init mxser_module_init(void) +static int mxser_init(void) { - int i, m, retval, b; + int i, m, retval, b, n; + int ret1; + struct pci_dev *pdev = NULL; + int index; + unsigned char busnum, devnum; struct mxser_hwconf hwconf; mxvar_sdriver = alloc_tty_driver(MXSER_PORTS + 1); if (!mxvar_sdriver) return -ENOMEM; + spin_lock_init(&gm_lock); + + for (i = 0; i < MXSER_BOARDS; i++) { + mxsercfg[i].board_type = -1; + } - printk("MOXA Smartio family driver version %s\n", MXSER_VERSION); + printk(KERN_INFO "MOXA Smartio/Industio family driver version %s\n", MXSER_VERSION); /* Initialize the tty_driver structure */ - - mxvar_sdriver->owner = THIS_MODULE; + memset(mxvar_sdriver, 0, sizeof(struct tty_driver)); + mxvar_sdriver->magic = TTY_DRIVER_MAGIC; mxvar_sdriver->name = "ttyM"; - mxvar_sdriver->devfs_name = "tts/M"; mxvar_sdriver->major = ttymajor; mxvar_sdriver->minor_start = 0; + mxvar_sdriver->num = MXSER_PORTS + 1; mxvar_sdriver->type = TTY_DRIVER_TYPE_SERIAL; mxvar_sdriver->subtype = SERIAL_TYPE_NORMAL; mxvar_sdriver->init_termios = tty_std_termios; mxvar_sdriver->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL; mxvar_sdriver->flags = TTY_DRIVER_REAL_RAW; tty_set_operations(mxvar_sdriver, &mxser_ops); - printk("Tty devices major number = %d\n", ttymajor); + mxvar_sdriver->ttys = mxvar_tty; + mxvar_sdriver->termios = mxvar_termios; + mxvar_sdriver->termios_locked = mxvar_termios_locked; + + mxvar_sdriver->open = mxser_open; + mxvar_sdriver->close = mxser_close; + mxvar_sdriver->write = mxser_write; + mxvar_sdriver->put_char = mxser_put_char; + mxvar_sdriver->flush_chars = mxser_flush_chars; + mxvar_sdriver->write_room = mxser_write_room; + mxvar_sdriver->chars_in_buffer = mxser_chars_in_buffer; + mxvar_sdriver->flush_buffer = mxser_flush_buffer; + mxvar_sdriver->ioctl = mxser_ioctl; + mxvar_sdriver->throttle = mxser_throttle; + mxvar_sdriver->unthrottle = mxser_unthrottle; + mxvar_sdriver->set_termios = mxser_set_termios; + mxvar_sdriver->stop = mxser_stop; + mxvar_sdriver->start = mxser_start; + mxvar_sdriver->hangup = mxser_hangup; + mxvar_sdriver->break_ctl = mxser_rs_break; + mxvar_sdriver->wait_until_sent = mxser_wait_until_sent; mxvar_diagflag = 0; memset(mxvar_table, 0, MXSER_PORTS * sizeof(struct mxser_struct)); memset(&mxvar_log, 0, sizeof(struct mxser_log)); + memset(&mxser_msr, 0, sizeof(unsigned char) * (MXSER_PORTS + 1)); + memset(&mon_data_ext, 0, sizeof(struct mxser_mon_ext)); + memset(&mxser_set_baud_method, 0, sizeof(int) * (MXSER_PORTS + 1)); + memset(&hwconf, 0, sizeof(struct mxser_hwconf)); m = 0; /* Start finding ISA boards here */ @@ -550,28 +761,31 @@ static int __init mxser_module_init(void) retval = mxser_get_ISA_conf(cap, &hwconf); if (retval != 0) - printk("Found MOXA %s board (CAP=0x%x)\n", - mxser_brdname[hwconf.board_type], - ioaddr[b]); + printk(KERN_INFO "Found MOXA %s board (CAP=0x%x)\n", mxser_brdname[hwconf.board_type - 1], ioaddr[b]); if (retval <= 0) { if (retval == MXSER_ERR_IRQ) - printk("Invalid interrupt number,board not configured\n"); + printk(KERN_ERR "Invalid interrupt number,board not configured\n"); else if (retval == MXSER_ERR_IRQ_CONFLIT) - printk("Invalid interrupt number,board not configured\n"); + printk(KERN_ERR "Invalid interrupt number,board not configured\n"); else if (retval == MXSER_ERR_VECTOR) - printk("Invalid interrupt vector,board not configured\n"); + printk(KERN_ERR "Invalid interrupt vector,board not configured\n"); else if (retval == MXSER_ERR_IOADDR) - printk("Invalid I/O address,board not configured\n"); + printk(KERN_ERR "Invalid I/O address,board not configured\n"); continue; } - hwconf.pdev = NULL; + hwconf.pciInfo.busNum = 0; + hwconf.pciInfo.devNum = 0; + hwconf.pciInfo.pdev = NULL; + + mxser_getcfg(m, &hwconf); + //init mxsercfg first, or mxsercfg data is not correct on ISR. + //mxser_initbrd will hook ISR. if (mxser_initbrd(m, &hwconf) < 0) continue; - mxser_getcfg(m, &hwconf); m++; } @@ -585,89 +799,99 @@ static int __init mxser_module_init(void) retval = mxser_get_ISA_conf(cap, &hwconf); if (retval != 0) - printk("Found MOXA %s board (CAP=0x%x)\n", - mxser_brdname[hwconf.board_type], - ioaddr[b]); + printk(KERN_INFO "Found MOXA %s board (CAP=0x%x)\n", mxser_brdname[hwconf.board_type - 1], ioaddr[b]); if (retval <= 0) { if (retval == MXSER_ERR_IRQ) - printk("Invalid interrupt number,board not configured\n"); + printk(KERN_ERR "Invalid interrupt number,board not configured\n"); else if (retval == MXSER_ERR_IRQ_CONFLIT) - printk("Invalid interrupt number,board not configured\n"); + printk(KERN_ERR "Invalid interrupt number,board not configured\n"); else if (retval == MXSER_ERR_VECTOR) - printk("Invalid interrupt vector,board not configured\n"); + printk(KERN_ERR "Invalid interrupt vector,board not configured\n"); else if (retval == MXSER_ERR_IOADDR) - printk("Invalid I/O address,board not configured\n"); + printk(KERN_ERR "Invalid I/O address,board not configured\n"); continue; } - hwconf.pdev = NULL; - if (mxser_initbrd(m, &hwconf) < 0) - continue; + hwconf.pciInfo.busNum = 0; + hwconf.pciInfo.devNum = 0; + hwconf.pciInfo.pdev = NULL; mxser_getcfg(m, &hwconf); + //init mxsercfg first, or mxsercfg data is not correct on ISR. + //mxser_initbrd will hook ISR. + if (mxser_initbrd(m, &hwconf) < 0) + continue; m++; } /* start finding PCI board here */ - #ifdef CONFIG_PCI - { - struct pci_dev *pdev = NULL; - int n = (sizeof(mxser_pcibrds) / sizeof(mxser_pcibrds[0])) - 1; - for (b = 0; b < n; b++) { - while ((pdev = pci_find_device(mxser_pcibrds[b].vendor, mxser_pcibrds[b].device, pdev))) - { - if (pci_enable_device(pdev)) - continue; - hwconf.pdev = pdev; - printk("Found MOXA %s board(BusNo=%d,DevNo=%d)\n", - mxser_brdname[mxser_pcibrds[b].driver_data], - pdev->bus->number, PCI_SLOT(pdev->devfn)); - if (m >= MXSER_BOARDS) { - printk("Too many Smartio family boards found (maximum %d),board not configured\n", MXSER_BOARDS); - } else { - retval = mxser_get_PCI_conf(pdev, mxser_pcibrds[b].driver_data, &hwconf); - if (retval < 0) { - if (retval == MXSER_ERR_IRQ) - printk("Invalid interrupt number,board not configured\n"); - else if (retval == MXSER_ERR_IRQ_CONFLIT) - printk("Invalid interrupt number,board not configured\n"); - else if (retval == MXSER_ERR_VECTOR) - printk("Invalid interrupt vector,board not configured\n"); - else if (retval == MXSER_ERR_IOADDR) - printk("Invalid I/O address,board not configured\n"); - continue; - } - if (mxser_initbrd(m, &hwconf) < 0) - continue; - mxser_getcfg(m, &hwconf); - m++; - } + n = (sizeof(mxser_pcibrds) / sizeof(mxser_pcibrds[0])) - 1; + index = 0; + b = 0; + while (b < n) { + pdev = pci_find_device(mxser_pcibrds[b].vendor, mxser_pcibrds[b].device, pdev); + if (pdev == NULL) { + b++; + continue; + } + hwconf.pciInfo.busNum = busnum = pdev->bus->number; + hwconf.pciInfo.devNum = devnum = PCI_SLOT(pdev->devfn) << 3; + hwconf.pciInfo.pdev = pdev; + printk(KERN_INFO "Found MOXA %s board(BusNo=%d,DevNo=%d)\n", mxser_brdname[(int) (mxser_pcibrds[b].driver_data) - 1], busnum, devnum >> 3); + index++; + if (m >= MXSER_BOARDS) { + printk(KERN_ERR "Too many Smartio/Industio family boards find (maximum %d),board not configured\n", MXSER_BOARDS); + } else { + if (pci_enable_device(pdev)) { + printk(KERN_ERR "Moxa SmartI/O PCI enable fail !\n"); + continue; + } + retval = mxser_get_PCI_conf(busnum, devnum, (int) mxser_pcibrds[b].driver_data, &hwconf); + 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"); + continue; } + mxser_getcfg(m, &hwconf); + //init mxsercfg first, or mxsercfg data is not correct on ISR. + //mxser_initbrd will hook ISR. + if (mxser_initbrd(m, &hwconf) < 0) + continue; + m++; } } #endif - for (i = m; i < MXSER_BOARDS; i++) { - mxsercfg[i].board_type = -1; - } - - - if (!tty_register_driver(mxvar_sdriver)) + ret1 = 0; + if (!(ret1 = tty_register_driver(mxvar_sdriver))) { return 0; + } else + printk(KERN_ERR "Couldn't install MOXA Smartio/Industio family driver !\n"); - put_tty_driver(mxvar_sdriver); - printk("Couldn't install MOXA Smartio family driver !\n"); - for (i = 0; i < MXSER_BOARDS; i++) { - if (mxsercfg[i].board_type == -1) - continue; - free_irq(mxsercfg[i].irq, &mxvar_table[i * MXSER_PORTS_PER_BOARD]); + if (ret1) { + for (i = 0; i < MXSER_BOARDS; i++) { + if (mxsercfg[i].board_type == -1) + continue; + else { + free_irq(mxsercfg[i].irq, &mxvar_table[i * MXSER_PORTS_PER_BOARD]); + //todo: release io, vector + } + } + return -1; } - return -1; + + return (0); } static void mxser_do_softint(void *private_) @@ -676,54 +900,52 @@ static void mxser_do_softint(void *private_) struct tty_struct *tty; tty = info->tty; + if (tty) { - if (test_and_clear_bit(MXSER_EVENT_TXLOW, &info->event)) { - if ((tty->flags & (1 << TTY_DO_WRITE_WAKEUP)) && - tty->ldisc.write_wakeup) - (tty->ldisc.write_wakeup) (tty); - wake_up_interruptible(&tty->write_wait); - } - if (test_and_clear_bit(MXSER_EVENT_HANGUP, &info->event)) { - tty_hangup(tty); /* FIXME: module removal race here - AKPM */ - } + if (test_and_clear_bit(MXSER_EVENT_TXLOW, &info->event)) + tty_wakeup(tty); + if (test_and_clear_bit(MXSER_EVENT_HANGUP, &info->event)) + tty_hangup(tty); } } +static unsigned char mxser_get_msr(int baseaddr, int mode, int port, struct mxser_struct *info) +{ + unsigned char status = 0; + + status = inb(baseaddr + UART_MSR); + + mxser_msr[port] &= 0x0F; + mxser_msr[port] |= status; + status = mxser_msr[port]; + if (mode) + mxser_msr[port] = 0; + + return status; +} + /* * This routine is called whenever a serial port is opened. It * enables interrupts for a serial port, linking in its async structure into * the IRQ chain. It also performs the serial-specific * initialization for the tty structure. */ - static int mxser_open(struct tty_struct *tty, struct file *filp) { struct mxser_struct *info; int retval, line; - unsigned long page; - line = PORTNO(tty); + line = tty->index; if (line == MXSER_PORTS) - return (0); - if ((line < 0) || (line > MXSER_PORTS)) - return (-ENODEV); + return 0; + if (line < 0 || line > MXSER_PORTS) + return -ENODEV; info = mxvar_table + line; if (!info->base) return (-ENODEV); - info->count++; tty->driver_data = info; info->tty = tty; - - if (!mxvar_tmp_buf) { - page = get_zeroed_page(GFP_KERNEL); - if (!page) - return (-ENOMEM); - if (mxvar_tmp_buf) - free_page(page); - else - mxvar_tmp_buf = (unsigned char *) page; - } /* * Start up serial port */ @@ -731,7 +953,31 @@ static int mxser_open(struct tty_struct *tty, struct file *filp) if (retval) return (retval); - return mxser_block_til_ready(tty, filp, info); + retval = mxser_block_til_ready(tty, filp, info); + if (retval) + return (retval); + + info->count++; + + if ((info->count == 1) && (info->flags & ASYNC_SPLIT_TERMIOS)) { + if (tty->driver->subtype == SERIAL_TYPE_NORMAL) + *tty->termios = info->normal_termios; + else + *tty->termios = info->callout_termios; + mxser_change_speed(info, NULL); + } + + info->session = current->signal->session; + info->pgrp = process_group(current); + clear_bit(TTY_DONT_FLIP, &tty->flags); + + //status = mxser_get_msr(info->base, 0, info->port); + //mxser_check_modem_status(info, status); + +/* unmark here for very high baud rate (ex. 921600 bps) used +*/ + tty->low_latency = 1; + return 0; } /* @@ -740,48 +986,52 @@ static int mxser_open(struct tty_struct *tty, struct file *filp) * async structure from the interrupt chain if necessary, and we free * that IRQ if nothing is left in the chain. */ - static void mxser_close(struct tty_struct *tty, struct file *filp) { struct mxser_struct *info = (struct mxser_struct *) tty->driver_data; - unsigned long flags; + unsigned long timeout; + unsigned long flags; + struct tty_ldisc *ld; - if (PORTNO(tty) == MXSER_PORTS) + if (tty->index == MXSER_PORTS) return; if (!info) - return; + BUG(); - save_flags(flags); - cli(); + spin_lock_irqsave(&info->slock, flags); if (tty_hung_up_p(filp)) { - restore_flags(flags); + spin_unlock_irqrestore(&info->slock, flags); return; } if ((tty->count == 1) && (info->count != 1)) { /* - * Uh, oh. tty->count is 1, which means that the tty + * Uh, oh. tty->count is 1, which means that the tty * structure will be freed. Info->count should always * be one in these conditions. If it's greater than * one, we've got real problems, since it means the * serial port won't be shutdown. */ - printk("mxser_close: bad serial port count; tty->count is 1, " - "info->count is %d\n", info->count); + printk(KERN_ERR "mxser_close: bad serial port count; tty->count is 1, " "info->count is %d\n", info->count); info->count = 1; } if (--info->count < 0) { - printk("mxser_close: bad serial port count for ttys%d: %d\n", - info->port, info->count); + printk(KERN_ERR "mxser_close: bad serial port count for ttys%d: %d\n", info->port, info->count); info->count = 0; } if (info->count) { - restore_flags(flags); + spin_unlock_irqrestore(&info->slock, flags); return; } info->flags |= ASYNC_CLOSING; - info->cflag = tty->termios->c_cflag; + spin_unlock_irqrestore(&info->slock, flags); + /* + * Save the termios structure, since this port may have + * separate termios for callout and dialin. + */ + if (info->flags & ASYNC_NORMAL_ACTIVE) + info->normal_termios = *tty->termios; /* * Now we wait for the transmit buffer to clear; and we notify * the line discipline to only process XON/XOFF characters. @@ -796,9 +1046,11 @@ static void mxser_close(struct tty_struct *tty, struct file *filp) * line status register. */ info->IER &= ~UART_IER_RLSI; - /* by William - info->read_status_mask &= ~UART_LSR_DR; - */ + if (info->IsMoxaMustChipFlag) + info->IER &= ~MOXA_MUST_RECV_ISR; +/* by William + info->read_status_mask &= ~UART_LSR_DR; +*/ if (info->flags & ASYNC_INITIALIZED) { outb(info->IER, info->base + UART_IER); /* @@ -815,10 +1067,17 @@ static void mxser_close(struct tty_struct *tty, struct file *filp) } } mxser_shutdown(info); + if (tty->driver->flush_buffer) tty->driver->flush_buffer(tty); - if (tty->ldisc.flush_buffer) - tty->ldisc.flush_buffer(tty); + + ld = tty_ldisc_ref(tty); + if (ld) { + if(ld->flush_buffer) + ld->flush_buffer(tty); + tty_ldisc_deref(ld); + } + tty->closing = 0; info->event = 0; info->tty = NULL; @@ -829,80 +1088,47 @@ static void mxser_close(struct tty_struct *tty, struct file *filp) } wake_up_interruptible(&info->open_wait); } + info->flags &= ~(ASYNC_NORMAL_ACTIVE | ASYNC_CLOSING); wake_up_interruptible(&info->close_wait); - restore_flags(flags); } -static int mxser_write(struct tty_struct *tty, int from_user, - const unsigned char *buf, int count) +static int mxser_write(struct tty_struct *tty, const unsigned char *buf, int count) { int c, total = 0; struct mxser_struct *info = (struct mxser_struct *) tty->driver_data; unsigned long flags; - if (!tty || !info->xmit_buf || !mxvar_tmp_buf) + if (!tty || !info->xmit_buf) return (0); - save_flags(flags); - if (from_user) { - down(&mxvar_tmp_buf_sem); - while (1) { - c = MIN(count, MIN(SERIAL_XMIT_SIZE - info->xmit_cnt - 1, - SERIAL_XMIT_SIZE - info->xmit_head)); - if (c <= 0) - break; - - c -= copy_from_user(mxvar_tmp_buf, buf, c); - if (!c) { - if (!total) - total = -EFAULT; - break; - } + while (1) { + c = min_t(int, count, min(SERIAL_XMIT_SIZE - info->xmit_cnt - 1, SERIAL_XMIT_SIZE - info->xmit_head)); + if (c <= 0) + break; - cli(); - c = MIN(c, MIN(SERIAL_XMIT_SIZE - info->xmit_cnt - 1, - SERIAL_XMIT_SIZE - info->xmit_head)); - memcpy(info->xmit_buf + info->xmit_head, mxvar_tmp_buf, c); - info->xmit_head = (info->xmit_head + c) & (SERIAL_XMIT_SIZE - 1); - info->xmit_cnt += c; - restore_flags(flags); - - buf += c; - count -= c; - total += c; - } - up(&mxvar_tmp_buf_sem); - } else { - while (1) { - cli(); - c = MIN(count, MIN(SERIAL_XMIT_SIZE - info->xmit_cnt - 1, - SERIAL_XMIT_SIZE - info->xmit_head)); - if (c <= 0) { - restore_flags(flags); - break; - } + memcpy(info->xmit_buf + info->xmit_head, buf, c); + spin_lock_irqsave(&info->slock, flags); + info->xmit_head = (info->xmit_head + c) & (SERIAL_XMIT_SIZE - 1); + info->xmit_cnt += c; + spin_unlock_irqrestore(&info->slock, flags); - memcpy(info->xmit_buf + info->xmit_head, buf, c); - info->xmit_head = (info->xmit_head + c) & (SERIAL_XMIT_SIZE - 1); - info->xmit_cnt += c; - restore_flags(flags); + buf += c; + count -= c; + total += c; - buf += c; - count -= c; - total += c; - } } - cli(); - if (info->xmit_cnt && !tty->stopped && !tty->hw_stopped && - !(info->IER & UART_IER_THRI)) { - info->IER |= UART_IER_THRI; - outb(info->IER, info->base + UART_IER); + if (info->xmit_cnt && !tty->stopped && !(info->IER & UART_IER_THRI)) { + if (!tty->hw_stopped || (info->type == PORT_16550A) || (info->IsMoxaMustChipFlag)) { + spin_lock_irqsave(&info->slock, flags); + info->IER |= UART_IER_THRI; + outb(info->IER, info->base + UART_IER); + spin_unlock_irqrestore(&info->slock, flags); + } } - restore_flags(flags); - return (total); + return total; } static void mxser_put_char(struct tty_struct *tty, unsigned char ch) @@ -913,39 +1139,39 @@ static void mxser_put_char(struct tty_struct *tty, unsigned char ch) if (!tty || !info->xmit_buf) return; - save_flags(flags); - cli(); - if (info->xmit_cnt >= SERIAL_XMIT_SIZE - 1) { - restore_flags(flags); + if (info->xmit_cnt >= SERIAL_XMIT_SIZE - 1) return; - } + + spin_lock_irqsave(&info->slock, flags); info->xmit_buf[info->xmit_head++] = ch; info->xmit_head &= SERIAL_XMIT_SIZE - 1; info->xmit_cnt++; - /********************************************** why ??? *********** - if ( !tty->stopped && !tty->hw_stopped && - !(info->IER & UART_IER_THRI) ) { - info->IER |= UART_IER_THRI; - outb(info->IER, info->base + UART_IER); - } - *****************************************************************/ - restore_flags(flags); + spin_unlock_irqrestore(&info->slock, flags); + if (!tty->stopped && !(info->IER & UART_IER_THRI)) { + if (!tty->hw_stopped || (info->type == PORT_16550A) || info->IsMoxaMustChipFlag) { + spin_lock_irqsave(&info->slock, flags); + info->IER |= UART_IER_THRI; + outb(info->IER, info->base + UART_IER); + spin_unlock_irqrestore(&info->slock, flags); + } + } } + static void mxser_flush_chars(struct tty_struct *tty) { struct mxser_struct *info = (struct mxser_struct *) tty->driver_data; unsigned long flags; - if (info->xmit_cnt <= 0 || tty->stopped || tty->hw_stopped || - !info->xmit_buf) + if (info->xmit_cnt <= 0 || tty->stopped || !info->xmit_buf || (tty->hw_stopped && (info->type != PORT_16550A) && (!info->IsMoxaMustChipFlag))) return; - save_flags(flags); - cli(); + spin_lock_irqsave(&info->slock, flags); + info->IER |= UART_IER_THRI; outb(info->IER, info->base + UART_IER); - restore_flags(flags); + + spin_unlock_irqrestore(&info->slock, flags); } static int mxser_write_room(struct tty_struct *tty) @@ -962,40 +1188,76 @@ static int mxser_write_room(struct tty_struct *tty) static int mxser_chars_in_buffer(struct tty_struct *tty) { struct mxser_struct *info = (struct mxser_struct *) tty->driver_data; - - return (info->xmit_cnt); + return info->xmit_cnt; } static void mxser_flush_buffer(struct tty_struct *tty) { struct mxser_struct *info = (struct mxser_struct *) tty->driver_data; + char fcr; unsigned long flags; - save_flags(flags); - cli(); + + spin_lock_irqsave(&info->slock, flags); info->xmit_cnt = info->xmit_head = info->xmit_tail = 0; - restore_flags(flags); + + /* below added by shinhay */ + fcr = inb(info->base + UART_FCR); + outb((fcr | UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT), info->base + UART_FCR); + outb(fcr, info->base + UART_FCR); + + spin_unlock_irqrestore(&info->slock, flags); + /* above added by shinhay */ + wake_up_interruptible(&tty->write_wait); - if ((tty->flags & (1 << TTY_DO_WRITE_WAKEUP)) && - tty->ldisc.write_wakeup) + if ((tty->flags & (1 << TTY_DO_WRITE_WAKEUP)) && tty->ldisc.write_wakeup) (tty->ldisc.write_wakeup) (tty); } -static int mxser_ioctl(struct tty_struct *tty, struct file *file, - unsigned int cmd, unsigned long arg) +static int mxser_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd, unsigned long arg) { - unsigned long flags; struct mxser_struct *info = (struct mxser_struct *) tty->driver_data; int retval; struct async_icount cprev, cnow; /* kernel counter temps */ struct serial_icounter_struct __user *p_cuser; unsigned long templ; + unsigned long flags; void __user *argp = (void __user *)arg; - if (PORTNO(tty) == MXSER_PORTS) - return (mxser_ioctl_special(cmd, arg)); - if ((cmd != TIOCGSERIAL) && (cmd != TIOCMIWAIT) && - (cmd != TIOCGICOUNT)) { + if (tty->index == MXSER_PORTS) + return (mxser_ioctl_special(cmd, argp)); + + // following add by Victor Yu. 01-05-2004 + if (cmd == MOXA_SET_OP_MODE || cmd == MOXA_GET_OP_MODE) { + int opmode, p; + static unsigned char ModeMask[] = { 0xfc, 0xf3, 0xcf, 0x3f }; + int shiftbit; + unsigned char val, mask; + + p = info->port % 4; + if (cmd == MOXA_SET_OP_MODE) { + if (get_user(opmode, (int __user *) argp)) + return -EFAULT; + if (opmode != RS232_MODE && opmode != RS485_2WIRE_MODE && opmode != RS422_MODE && opmode != RS485_4WIRE_MODE) + return -EFAULT; + mask = ModeMask[p]; + shiftbit = p * 2; + val = inb(info->opmode_ioaddr); + val &= mask; + val |= (opmode << shiftbit); + outb(val, info->opmode_ioaddr); + } else { + shiftbit = p * 2; + opmode = inb(info->opmode_ioaddr) >> shiftbit; + opmode &= OP_MODE_MASK; + if (copy_to_user(argp, &opmode, sizeof(int))) + return -EFAULT; + } + return 0; + } + // above add by Victor Yu. 01-05-2004 + + if ((cmd != TIOCGSERIAL) && (cmd != TIOCMIWAIT) && (cmd != TIOCGICOUNT)) { if (tty->flags & (1 << TTY_IO_ERROR)) return (-EIO); } @@ -1006,7 +1268,7 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file, return (retval); tty_wait_until_sent(tty, 0); if (!arg) - mxser_send_break(info, HZ / 4); /* 1/4 second */ + mxser_send_break(info, HZ / 4); /* 1/4 second */ return (0); case TCSBRKP: /* support for POSIX tcsendbreak() */ retval = tty_check_change(tty); @@ -1016,13 +1278,12 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file, mxser_send_break(info, arg ? arg * (HZ / 10) : HZ / 4); return (0); case TIOCGSOFTCAR: - return put_user(C_CLOCAL(tty) ? 1 : 0, (unsigned long __user *)argp); + return put_user(C_CLOCAL(tty) ? 1 : 0, (unsigned long __user *) argp); case TIOCSSOFTCAR: - if(get_user(templ, (unsigned long __user *) arg)) + if (get_user(templ, (unsigned long __user *) argp)) return -EFAULT; arg = templ; - tty->termios->c_cflag = ((tty->termios->c_cflag & ~CLOCAL) | - (arg ? CLOCAL : 0)); + tty->termios->c_cflag = ((tty->termios->c_cflag & ~CLOCAL) | (arg ? CLOCAL : 0)); return (0); case TIOCGSERIAL: return mxser_get_serial_info(info, argp); @@ -1036,30 +1297,34 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file, * (use |'ed TIOCM_RNG/DSR/CD/CTS for masking) * Caller should use TIOCGICOUNT to see which one it was */ - case TIOCMIWAIT: - save_flags(flags); - cli(); - cprev = info->icount; /* note the counters on entry */ - restore_flags(flags); - while (1) { - interruptible_sleep_on(&info->delta_msr_wait); - /* see if a signal did it */ - if (signal_pending(current)) - return (-ERESTARTSYS); - save_flags(flags); - cli(); - cnow = info->icount; /* atomic copy */ - restore_flags(flags); - if (cnow.rng == cprev.rng && cnow.dsr == cprev.dsr && - cnow.dcd == cprev.dcd && cnow.cts == cprev.cts) - return (-EIO); /* no change => error */ - if (((arg & TIOCM_RNG) && (cnow.rng != cprev.rng)) || - ((arg & TIOCM_DSR) && (cnow.dsr != cprev.dsr)) || - ((arg & TIOCM_CD) && (cnow.dcd != cprev.dcd)) || - ((arg & TIOCM_CTS) && (cnow.cts != cprev.cts))) { - return (0); + case TIOCMIWAIT:{ + DECLARE_WAITQUEUE(wait, current); + int ret; + spin_lock_irqsave(&info->slock, flags); + cprev = info->icount; /* note the counters on entry */ + spin_unlock_irqrestore(&info->slock, flags); + + add_wait_queue(&info->delta_msr_wait, &wait); + while (1) { + spin_lock_irqsave(&info->slock, flags); + cnow = info->icount; /* atomic copy */ + spin_unlock_irqrestore(&info->slock, flags); + + set_current_state(TASK_INTERRUPTIBLE); + if (((arg & TIOCM_RNG) && (cnow.rng != cprev.rng)) || ((arg & TIOCM_DSR) && (cnow.dsr != cprev.dsr)) || ((arg & TIOCM_CD) && (cnow.dcd != cprev.dcd)) || ((arg & TIOCM_CTS) && (cnow.cts != cprev.cts))) { + ret = 0; + break; + } + /* see if a signal did it */ + if (signal_pending(current)) { + ret = -ERESTARTSYS; + break; + } + cprev = cnow; } - cprev = cnow; + current->state = TASK_RUNNING; + remove_wait_queue(&info->delta_msr_wait, &wait); + break; } /* NOTREACHED */ /* @@ -1069,45 +1334,143 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file, * RI where only 0->1 is counted. */ case TIOCGICOUNT: - save_flags(flags); - cli(); + spin_lock_irqsave(&info->slock, flags); cnow = info->icount; - restore_flags(flags); + spin_unlock_irqrestore(&info->slock, flags); p_cuser = argp; - if(put_user(cnow.cts, &p_cuser->cts)) + /* modified by casper 1/11/2000 */ + 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.dsr, &p_cuser->dsr)) + if (put_user(cnow.buf_overrun, &p_cuser->buf_overrun)) return -EFAULT; - if(put_user(cnow.rng, &p_cuser->rng)) + if (put_user(cnow.parity, &p_cuser->parity)) return -EFAULT; - return put_user(cnow.dcd, &p_cuser->dcd); + 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; case MOXA_HighSpeedOn: - return put_user(info->baud_base != 115200 ? 1 : 0, (int __user *)argp); + return put_user(info->baud_base != 115200 ? 1 : 0, (int __user *) argp); + + case MOXA_SDS_RSTICOUNTER:{ + info->mon_data.rxcnt = 0; + info->mon_data.txcnt = 0; + return 0; + } +// (above) added by James. + case MOXA_ASPP_SETBAUD:{ + long baud; + if (get_user(baud, (long __user *) argp)) + return -EFAULT; + mxser_set_baud(info, baud); + return 0; + } + case MOXA_ASPP_GETBAUD: + if (copy_to_user(argp, &info->realbaud, sizeof(long))) + return -EFAULT; + + return 0; + + case MOXA_ASPP_OQUEUE:{ + int len, lsr; + + len = mxser_chars_in_buffer(tty); + + lsr = inb(info->base + UART_LSR) & UART_LSR_TEMT; + + len += (lsr ? 0 : 1); + + if (copy_to_user(argp, &len, sizeof(int))) + return -EFAULT; + + return 0; + } + case MOXA_ASPP_MON:{ + int mcr, status; +// info->mon_data.ser_param = tty->termios->c_cflag; + + status = mxser_get_msr(info->base, 1, info->port, info); + mxser_check_modem_status(info, status); + + mcr = inb(info->base + UART_MCR); + if (mcr & MOXA_MUST_MCR_XON_FLAG) + info->mon_data.hold_reason &= ~NPPI_NOTIFY_XOFFHOLD; + else + info->mon_data.hold_reason |= NPPI_NOTIFY_XOFFHOLD; + + if (mcr & MOXA_MUST_MCR_TX_XON) + info->mon_data.hold_reason &= ~NPPI_NOTIFY_XOFFXENT; + else + info->mon_data.hold_reason |= NPPI_NOTIFY_XOFFXENT; + + if (info->tty->hw_stopped) + info->mon_data.hold_reason |= NPPI_NOTIFY_CTSHOLD; + else + info->mon_data.hold_reason &= ~NPPI_NOTIFY_CTSHOLD; + + + if (copy_to_user(argp, &info->mon_data, sizeof(struct mxser_mon))) + return -EFAULT; + + return 0; + + } + + case MOXA_ASPP_LSTATUS:{ + if (copy_to_user(argp, &info->err_shadow, sizeof(unsigned char))) + return -EFAULT; + + info->err_shadow = 0; + return 0; + + } + case MOXA_SET_BAUD_METHOD:{ + int method; + if (get_user(method, (int __user *) argp)) + return -EFAULT; + mxser_set_baud_method[info->port] = method; + if (copy_to_user(argp, &method, sizeof(int))) + return -EFAULT; + + return 0; + } default: - return (-ENOIOCTLCMD); + return -ENOIOCTLCMD; } - return (0); + return 0; } -static int mxser_ioctl_special(unsigned int cmd, unsigned long arg) +#ifndef CMSPAR +#define CMSPAR 010000000000 +#endif + +static int mxser_ioctl_special(unsigned int cmd, void __user *argp) { int i, result, status; - void __user *argp = (void __user *)arg; switch (cmd) { case MOXA_GET_CONF: - if(copy_to_user(argp, mxsercfg, - sizeof(struct mxser_hwconf) * 4)) - return -EFAULT; + if (copy_to_user(argp, mxsercfg, sizeof(struct mxser_hwconf) * 4)) + return -EFAULT; return 0; case MOXA_GET_MAJOR: - if(copy_to_user(argp, &ttymajor, sizeof(int))) + if (copy_to_user(argp, &ttymajor, sizeof(int))) return -EFAULT; return 0; case MOXA_GET_CUMAJOR: - result = 0; - if(copy_to_user(argp, &result, sizeof(int))) + if (copy_to_user(argp, &calloutmajor, sizeof(int))) return -EFAULT; return 0; @@ -1131,8 +1494,9 @@ static int mxser_ioctl_special(unsigned int cmd, unsigned long arg) GMStatus[i].cts = 0; continue; } + if (!mxvar_table[i].tty || !mxvar_table[i].tty->termios) - GMStatus[i].cflag = mxvar_table[i].cflag; + GMStatus[i].cflag = mxvar_table[i].normal_termios.c_cflag; else GMStatus[i].cflag = mxvar_table[i].tty->termios->c_cflag; @@ -1153,105 +1517,207 @@ static int mxser_ioctl_special(unsigned int cmd, unsigned long arg) else GMStatus[i].cts = 0; } - if(copy_to_user(argp, GMStatus, - sizeof(struct mxser_mstatus) * MXSER_PORTS)) + if (copy_to_user(argp, GMStatus, sizeof(struct mxser_mstatus) * MXSER_PORTS)) return -EFAULT; return 0; + case MOXA_ASPP_MON_EXT:{ + int status; + int opmode, p; + int shiftbit; + unsigned cflag, iflag; + + for (i = 0; i < MXSER_PORTS; i++) { + + if (!mxvar_table[i].base) + continue; + + status = mxser_get_msr(mxvar_table[i].base, 0, i, &(mxvar_table[i])); +// mxser_check_modem_status(&mxvar_table[i], status); + if (status & UART_MSR_TERI) + mxvar_table[i].icount.rng++; + if (status & UART_MSR_DDSR) + mxvar_table[i].icount.dsr++; + if (status & UART_MSR_DDCD) + mxvar_table[i].icount.dcd++; + if (status & UART_MSR_DCTS) + mxvar_table[i].icount.cts++; + + mxvar_table[i].mon_data.modem_status = status; + mon_data_ext.rx_cnt[i] = mxvar_table[i].mon_data.rxcnt; + mon_data_ext.tx_cnt[i] = mxvar_table[i].mon_data.txcnt; + mon_data_ext.up_rxcnt[i] = mxvar_table[i].mon_data.up_rxcnt; + mon_data_ext.up_txcnt[i] = mxvar_table[i].mon_data.up_txcnt; + mon_data_ext.modem_status[i] = mxvar_table[i].mon_data.modem_status; + mon_data_ext.baudrate[i] = mxvar_table[i].realbaud; + + if (!mxvar_table[i].tty || !mxvar_table[i].tty->termios) { + cflag = mxvar_table[i].normal_termios.c_cflag; + iflag = mxvar_table[i].normal_termios.c_iflag; + } else { + cflag = mxvar_table[i].tty->termios->c_cflag; + iflag = mxvar_table[i].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; + + if (cflag & CRTSCTS) + mon_data_ext.flowctrl[i] |= 0x03; + + if (iflag & (IXON | IXOFF)) + mon_data_ext.flowctrl[i] |= 0x0C; + + if (mxvar_table[i].type == PORT_16550A) + mon_data_ext.fifo[i] = 1; + else + mon_data_ext.fifo[i] = 0; + + p = i % 4; + shiftbit = p * 2; + opmode = inb(mxvar_table[i].opmode_ioaddr) >> shiftbit; + opmode &= OP_MODE_MASK; + + mon_data_ext.iftype[i] = opmode; + + } + if (copy_to_user(argp, &mon_data_ext, sizeof(struct mxser_mon_ext))) + return -EFAULT; + + return 0; + + } default: - return (-ENOIOCTLCMD); + return -ENOIOCTLCMD; } - return (0); + return 0; } -/* - * This routine is called by the upper-layer tty layer to signal that - * incoming characters should be throttled. - */ -static void mxser_throttle(struct tty_struct *tty) + +static void mxser_stoprx(struct tty_struct *tty) { struct mxser_struct *info = (struct mxser_struct *) tty->driver_data; - unsigned long flags; + //unsigned long flags; + + info->ldisc_stop_rx = 1; if (I_IXOFF(tty)) { - info->x_char = STOP_CHAR(tty); - save_flags(flags); - cli(); - outb(info->IER, 0); - info->IER |= UART_IER_THRI; - outb(info->IER, info->base + UART_IER); /* force Tx interrupt */ - restore_flags(flags); + + //MX_LOCK(&info->slock); + // following add by Victor Yu. 09-02-2002 + if (info->IsMoxaMustChipFlag) { + info->IER &= ~MOXA_MUST_RECV_ISR; + outb(info->IER, info->base + UART_IER); + } else { + // above add by Victor Yu. 09-02-2002 + + info->x_char = STOP_CHAR(tty); + // outb(info->IER, 0); // mask by Victor Yu. 09-02-2002 + outb(0, info->base + UART_IER); + info->IER |= UART_IER_THRI; + outb(info->IER, info->base + UART_IER); /* force Tx interrupt */ + } // add by Victor Yu. 09-02-2002 + //MX_UNLOCK(&info->slock); } + if (info->tty->termios->c_cflag & CRTSCTS) { + //MX_LOCK(&info->slock); info->MCR &= ~UART_MCR_RTS; - save_flags(flags); - cli(); outb(info->MCR, info->base + UART_MCR); - restore_flags(flags); + //MX_UNLOCK(&info->slock); } } -static void mxser_unthrottle(struct tty_struct *tty) +static void mxser_startrx(struct tty_struct *tty) { struct mxser_struct *info = (struct mxser_struct *) tty->driver_data; - unsigned long flags; + //unsigned long flags; + info->ldisc_stop_rx = 0; if (I_IXOFF(tty)) { if (info->x_char) info->x_char = 0; else { - info->x_char = START_CHAR(tty); - save_flags(flags); - cli(); - outb(info->IER, 0); - info->IER |= UART_IER_THRI; /* force Tx interrupt */ - outb(info->IER, info->base + UART_IER); - restore_flags(flags); + //MX_LOCK(&info->slock); + + // following add by Victor Yu. 09-02-2002 + if (info->IsMoxaMustChipFlag) { + info->IER |= MOXA_MUST_RECV_ISR; + outb(info->IER, info->base + UART_IER); + } else { + // above add by Victor Yu. 09-02-2002 + + info->x_char = START_CHAR(tty); + // outb(info->IER, 0); // mask by Victor Yu. 09-02-2002 + outb(0, info->base + UART_IER); // add by Victor Yu. 09-02-2002 + info->IER |= UART_IER_THRI; /* force Tx interrupt */ + outb(info->IER, info->base + UART_IER); + } // add by Victor Yu. 09-02-2002 + //MX_UNLOCK(&info->slock); } } + if (info->tty->termios->c_cflag & CRTSCTS) { + //MX_LOCK(&info->slock); info->MCR |= UART_MCR_RTS; - save_flags(flags); - cli(); outb(info->MCR, info->base + UART_MCR); - restore_flags(flags); + //MX_UNLOCK(&info->slock); } } -static void mxser_set_termios(struct tty_struct *tty, - struct termios *old_termios) +/* + * This routine is called by the upper-layer tty layer to signal that + * incoming characters should be throttled. + */ +static void mxser_throttle(struct tty_struct *tty) +{ + //struct mxser_struct *info = (struct mxser_struct *)tty->driver_data; + //unsigned long flags; + //MX_LOCK(&info->slock); + mxser_stoprx(tty); + //MX_UNLOCK(&info->slock); +} + +static void mxser_unthrottle(struct tty_struct *tty) +{ + //struct mxser_struct *info = (struct mxser_struct *)tty->driver_data; + //unsigned long flags; + //MX_LOCK(&info->slock); + mxser_startrx(tty); + //MX_UNLOCK(&info->slock); +} + +static void mxser_set_termios(struct tty_struct *tty, struct termios *old_termios) { struct mxser_struct *info = (struct mxser_struct *) tty->driver_data; + unsigned long flags; -/* 8-2-99 by William - if ( (tty->termios->c_cflag == old_termios->c_cflag) && - (RELEVANT_IFLAG(tty->termios->c_iflag) == - RELEVANT_IFLAG(old_termios->c_iflag)) ) - return; - - mxser_change_speed(info, old_termios); - - if ( (old_termios->c_cflag & CRTSCTS) && - !(tty->termios->c_cflag & CRTSCTS) ) { - tty->hw_stopped = 0; - mxser_start(tty); - } - */ - if ((tty->termios->c_cflag != old_termios->c_cflag) || - (RELEVANT_IFLAG(tty->termios->c_iflag) != - RELEVANT_IFLAG(old_termios->c_iflag))) { + if ((tty->termios->c_cflag != old_termios->c_cflag) || (RELEVANT_IFLAG(tty->termios->c_iflag) != RELEVANT_IFLAG(old_termios->c_iflag))) { mxser_change_speed(info, old_termios); - if ((old_termios->c_cflag & CRTSCTS) && - !(tty->termios->c_cflag & CRTSCTS)) { + if ((old_termios->c_cflag & CRTSCTS) && !(tty->termios->c_cflag & CRTSCTS)) { tty->hw_stopped = 0; mxser_start(tty); } } + /* Handle sw stopped */ - if ((old_termios->c_iflag & IXON) && - !(tty->termios->c_iflag & IXON)) { + if ((old_termios->c_iflag & IXON) && !(tty->termios->c_iflag & IXON)) { tty->stopped = 0; + + // following add by Victor Yu. 09-02-2002 + if (info->IsMoxaMustChipFlag) { + spin_lock_irqsave(&info->slock, flags); + DISABLE_MOXA_MUST_RX_SOFTWARE_FLOW_CONTROL(info->base); + spin_unlock_irqrestore(&info->slock, flags); + } + // above add by Victor Yu. 09-02-2002 + mxser_start(tty); } } @@ -1267,13 +1733,12 @@ static void mxser_stop(struct tty_struct *tty) struct mxser_struct *info = (struct mxser_struct *) tty->driver_data; unsigned long flags; - save_flags(flags); - cli(); + spin_lock_irqsave(&info->slock, flags); if (info->IER & UART_IER_THRI) { info->IER &= ~UART_IER_THRI; outb(info->IER, info->base + UART_IER); } - restore_flags(flags); + spin_unlock_irqrestore(&info->slock, flags); } static void mxser_start(struct tty_struct *tty) @@ -1281,16 +1746,78 @@ static void mxser_start(struct tty_struct *tty) struct mxser_struct *info = (struct mxser_struct *) tty->driver_data; unsigned long flags; - save_flags(flags); - cli(); - if (info->xmit_cnt && info->xmit_buf && - !(info->IER & UART_IER_THRI)) { + spin_lock_irqsave(&info->slock, flags); + if (info->xmit_cnt && info->xmit_buf && !(info->IER & UART_IER_THRI)) { info->IER |= UART_IER_THRI; outb(info->IER, info->base + UART_IER); } - restore_flags(flags); + spin_unlock_irqrestore(&info->slock, flags); +} + +/* + * mxser_wait_until_sent() --- wait until the transmitter is empty + */ +static void mxser_wait_until_sent(struct tty_struct *tty, int timeout) +{ + struct mxser_struct *info = (struct mxser_struct *) tty->driver_data; + unsigned long orig_jiffies, char_time; + int lsr; + + if (info->type == PORT_UNKNOWN) + return; + + if (info->xmit_fifo_size == 0) + return; /* Just in case.... */ + + orig_jiffies = jiffies; + /* + * Set the check interval to be 1/5 of the estimated time to + * send a single character, and make it at least 1. The check + * interval should also be less than the timeout. + * + * Note: we have to use pretty tight timings here to satisfy + * the NIST-PCTS. + */ + char_time = (info->timeout - HZ / 50) / info->xmit_fifo_size; + char_time = char_time / 5; + if (char_time == 0) + char_time = 1; + if (timeout && timeout < char_time) + char_time = timeout; + /* + * If the transmitter hasn't cleared in twice the approximate + * amount of time to send the entire FIFO, it probably won't + * ever clear. This assumes the UART isn't doing flow + * control, which is currently the case. Hence, if it ever + * takes longer than info->timeout, this is probably due to a + * UART bug of some kind. So, we clamp the timeout parameter at + * 2*info->timeout. + */ + if (!timeout || timeout > 2 * info->timeout) + timeout = 2 * info->timeout; +#ifdef SERIAL_DEBUG_RS_WAIT_UNTIL_SENT + printk(KERN_DEBUG "In rs_wait_until_sent(%d) check=%lu...", timeout, char_time); + printk("jiff=%lu...", jiffies); +#endif + while (!((lsr = inb(info->base + UART_LSR)) & UART_LSR_TEMT)) { +#ifdef SERIAL_DEBUG_RS_WAIT_UNTIL_SENT + printk("lsr = %d (jiff=%lu)...", lsr, jiffies); +#endif + set_current_state(TASK_INTERRUPTIBLE); + schedule_timeout(char_time); + if (signal_pending(current)) + break; + if (timeout && time_after(jiffies, orig_jiffies + timeout)) + break; + } + set_current_state(TASK_RUNNING); + +#ifdef SERIAL_DEBUG_RS_WAIT_UNTIL_SENT + printk("lsr = %d (jiff=%lu)...done\n", lsr, jiffies); +#endif } + /* * This routine is called by tty_hangup() when a hangup is signaled. */ @@ -1307,19 +1834,42 @@ void mxser_hangup(struct tty_struct *tty) wake_up_interruptible(&info->open_wait); } + +// added by James 03-12-2004. +/* + * mxser_rs_break() --- routine which turns the break handling on or off + */ +static void mxser_rs_break(struct tty_struct *tty, int break_state) +{ + struct mxser_struct *info = (struct mxser_struct *) tty->driver_data; + unsigned long flags; + + spin_lock_irqsave(&info->slock, flags); + if (break_state == -1) + outb(inb(info->base + UART_LCR) | UART_LCR_SBC, info->base + UART_LCR); + else + outb(inb(info->base + UART_LCR) & ~UART_LCR_SBC, info->base + UART_LCR); + spin_unlock_irqrestore(&info->slock, flags); +} + +// (above) added by James. + + /* * This is the serial driver's generic interrupt routine */ static irqreturn_t mxser_interrupt(int irq, void *dev_id, struct pt_regs *regs) { - int status, i; + int status, iir, i; struct mxser_struct *info; struct mxser_struct *port; int max, irqbits, bits, msr; int pass_counter = 0; - int handled = 0; + int handled = IRQ_NONE; port = NULL; + //spin_lock(&gm_lock); + for (i = 0; i < MXSER_BOARDS; i++) { if (dev_id == &(mxvar_table[i * MXSER_PORTS_PER_BOARD])) { port = dev_id; @@ -1327,107 +1877,305 @@ static irqreturn_t mxser_interrupt(int irq, void *dev_id, struct pt_regs *regs) } } - if (i == MXSER_BOARDS) - return IRQ_NONE; - if (port == 0) - return IRQ_NONE; - max = mxser_numports[mxsercfg[i].board_type]; - + if (i == MXSER_BOARDS) { + goto irq_stop; + } + if (port == 0) { + goto irq_stop; + } + max = mxser_numports[mxsercfg[i].board_type - 1]; while (1) { irqbits = inb(port->vector) & port->vectormask; - if (irqbits == port->vectormask) + if (irqbits == port->vectormask) { break; - handled = 1; + } + + handled = IRQ_HANDLED; for (i = 0, bits = 1; i < max; i++, irqbits |= bits, bits <<= 1) { - if (irqbits == port->vectormask) + if (irqbits == port->vectormask) { break; + } if (bits & irqbits) continue; info = port + i; - if (!info->tty || - (inb(info->base + UART_IIR) & UART_IIR_NO_INT)) + + // following add by Victor Yu. 09-13-2002 + iir = inb(info->base + UART_IIR); + if (iir & UART_IIR_NO_INT) + continue; + iir &= MOXA_MUST_IIR_MASK; + if (!info->tty) { + status = inb(info->base + UART_LSR); + outb(0x27, info->base + UART_FCR); + inb(info->base + UART_MSR); continue; - status = inb(info->base + UART_LSR) & info->read_status_mask; - if (status & UART_LSR_DR) - mxser_receive_chars(info, &status); + } + // above add by Victor Yu. 09-13-2002 + /* + if ( info->tty->flip.count < TTY_FLIPBUF_SIZE/4 ){ + info->IER |= MOXA_MUST_RECV_ISR; + outb(info->IER, info->base + UART_IER); + } + */ + + + /* mask by Victor Yu. 09-13-2002 + if ( !info->tty || + (inb(info->base + UART_IIR) & UART_IIR_NO_INT) ) + continue; + */ + /* mask by Victor Yu. 09-02-2002 + status = inb(info->base + UART_LSR) & info->read_status_mask; + */ + + // following add by Victor Yu. 09-02-2002 + status = inb(info->base + UART_LSR); + + if (status & UART_LSR_PE) { + info->err_shadow |= NPPI_NOTIFY_PARITY; + } + if (status & UART_LSR_FE) { + info->err_shadow |= NPPI_NOTIFY_FRAMING; + } + if (status & UART_LSR_OE) { + info->err_shadow |= NPPI_NOTIFY_HW_OVERRUN; + } + if (status & UART_LSR_BI) + info->err_shadow |= NPPI_NOTIFY_BREAK; + + if (info->IsMoxaMustChipFlag) { + /* + if ( (status & 0x02) && !(status & 0x01) ) { + outb(info->base+UART_FCR, 0x23); + continue; + } + */ + if (iir == MOXA_MUST_IIR_GDA || iir == MOXA_MUST_IIR_RDA || iir == MOXA_MUST_IIR_RTO || iir == MOXA_MUST_IIR_LSR) + mxser_receive_chars(info, &status); + + } else { + // above add by Victor Yu. 09-02-2002 + + status &= info->read_status_mask; + if (status & UART_LSR_DR) + mxser_receive_chars(info, &status); + } msr = inb(info->base + UART_MSR); - if (msr & UART_MSR_ANY_DELTA) + if (msr & UART_MSR_ANY_DELTA) { mxser_check_modem_status(info, msr); - if (status & UART_LSR_THRE) { + } + // following add by Victor Yu. 09-13-2002 + if (info->IsMoxaMustChipFlag) { + if ((iir == 0x02) && (status & UART_LSR_THRE)) { + mxser_transmit_chars(info); + } + } else { + // above add by Victor Yu. 09-13-2002 + + if (status & UART_LSR_THRE) { /* 8-2-99 by William - if ( info->x_char || (info->xmit_cnt > 0) ) - */ - mxser_transmit_chars(info); + if ( info->x_char || (info->xmit_cnt > 0) ) +*/ + mxser_transmit_chars(info); + } } } if (pass_counter++ > MXSER_ISR_PASS_LIMIT) { -#if 0 - printk("MOXA Smartio/Indusrtio family driver interrupt loop break\n"); -#endif break; /* Prevent infinite loops */ } } - return IRQ_RETVAL(handled); + + irq_stop: + //spin_unlock(&gm_lock); + return handled; } -static inline void mxser_receive_chars(struct mxser_struct *info, - int *status) +static void mxser_receive_chars(struct mxser_struct *info, int *status) { struct tty_struct *tty = info->tty; - unsigned char ch; + unsigned char ch, gdl; int ignored = 0; int cnt = 0; + unsigned char *cp; + char *fp; + int count; + int recv_room; + int max = 256; + unsigned long flags; + + spin_lock_irqsave(&info->slock, flags); + + recv_room = tty->ldisc.receive_room(tty); + if ((recv_room == 0) && (!info->ldisc_stop_rx)) { + //mxser_throttle(tty); + mxser_stoprx(tty); + //return; + } + + cp = tty->flip.char_buf; + fp = tty->flip.flag_buf; + count = 0; + + // following add by Victor Yu. 09-02-2002 + if (info->IsMoxaMustChipFlag != MOXA_OTHER_UART) { + + if (*status & UART_LSR_SPECIAL) { + goto intr_old; + } + // following add by Victor Yu. 02-11-2004 + if (info->IsMoxaMustChipFlag == MOXA_MUST_MU860_HWID && (*status & MOXA_MUST_LSR_RERR)) + goto intr_old; + // above add by Victor Yu. 02-14-2004 + if (*status & MOXA_MUST_LSR_RERR) + goto intr_old; + + gdl = inb(info->base + MOXA_MUST_GDL_REGISTER); + + if (info->IsMoxaMustChipFlag == MOXA_MUST_MU150_HWID) // add by Victor Yu. 02-11-2004 + gdl &= MOXA_MUST_GDL_MASK; + if (gdl >= recv_room) { + if (!info->ldisc_stop_rx) { + //mxser_throttle(tty); + mxser_stoprx(tty); + } + //return; + } + while (gdl--) { + ch = inb(info->base + UART_RX); + count++; + *cp++ = ch; + *fp++ = 0; + cnt++; + /* + if((count>=HI_WATER) && (info->stop_rx==0)){ + mxser_stoprx(tty); + info->stop_rx=1; + break; + } */ + } + goto end_intr; + } +intr_old: + // above add by Victor Yu. 09-02-2002 do { + if (max-- < 0) + break; + /* + if((count>=HI_WATER) && (info->stop_rx==0)){ + mxser_stoprx(tty); + info->stop_rx=1; + break; + } + */ + ch = inb(info->base + UART_RX); + // following add by Victor Yu. 09-02-2002 + if (info->IsMoxaMustChipFlag && (*status & UART_LSR_OE) /*&& !(*status&UART_LSR_DR) */ ) + outb(0x23, info->base + UART_FCR); + *status &= info->read_status_mask; + // above add by Victor Yu. 09-02-2002 if (*status & info->ignore_status_mask) { if (++ignored > 100) break; } else { - if (tty->flip.count >= TTY_FLIPBUF_SIZE) - break; - tty->flip.count++; + count++; if (*status & UART_LSR_SPECIAL) { if (*status & UART_LSR_BI) { - *tty->flip.flag_buf_ptr++ = TTY_BREAK; + *fp++ = TTY_BREAK; +/* added by casper 1/11/2000 */ + info->icount.brk++; + +/* */ if (info->flags & ASYNC_SAK) do_SAK(tty); } else if (*status & UART_LSR_PE) { - *tty->flip.flag_buf_ptr++ = TTY_PARITY; + *fp++ = TTY_PARITY; +/* added by casper 1/11/2000 */ + info->icount.parity++; +/* */ } else if (*status & UART_LSR_FE) { - *tty->flip.flag_buf_ptr++ = TTY_FRAME; + *fp++ = TTY_FRAME; +/* added by casper 1/11/2000 */ + info->icount.frame++; +/* */ } else if (*status & UART_LSR_OE) { - *tty->flip.flag_buf_ptr++ = TTY_OVERRUN; + *fp++ = TTY_OVERRUN; +/* added by casper 1/11/2000 */ + info->icount.overrun++; +/* */ } else - *tty->flip.flag_buf_ptr++ = 0; + *fp++ = 0; } else - *tty->flip.flag_buf_ptr++ = 0; - *tty->flip.char_buf_ptr++ = ch; + *fp++ = 0; + *cp++ = ch; cnt++; + if (cnt >= recv_room) { + if (!info->ldisc_stop_rx) { + //mxser_throttle(tty); + mxser_stoprx(tty); + } + break; + } + } - *status = inb(info->base + UART_LSR) & info->read_status_mask; + + // following add by Victor Yu. 09-02-2002 + if (info->IsMoxaMustChipFlag) + break; + // above add by Victor Yu. 09-02-2002 + + /* mask by Victor Yu. 09-02-2002 + *status = inb(info->base + UART_LSR) & info->read_status_mask; + */ + // following add by Victor Yu. 09-02-2002 + *status = inb(info->base + UART_LSR); + // above add by Victor Yu. 09-02-2002 } while (*status & UART_LSR_DR); - mxvar_log.rxcnt[info->port] += cnt; - schedule_delayed_work(&tty->flip.work, 1); + end_intr: // add by Victor Yu. 09-02-2002 + + mxvar_log.rxcnt[info->port] += cnt; + info->mon_data.rxcnt += cnt; + info->mon_data.up_rxcnt += cnt; + spin_unlock_irqrestore(&info->slock, flags); + + tty_flip_buffer_push(tty); } -static inline void mxser_transmit_chars(struct mxser_struct *info) +static void mxser_transmit_chars(struct mxser_struct *info) { int count, cnt; + unsigned long flags; + + spin_lock_irqsave(&info->slock, flags); if (info->x_char) { outb(info->x_char, info->base + UART_TX); info->x_char = 0; mxvar_log.txcnt[info->port]++; + info->mon_data.txcnt++; + info->mon_data.up_txcnt++; + +/* added by casper 1/11/2000 */ + info->icount.tx++; +/* */ + spin_unlock_irqrestore(&info->slock, flags); return; } - if ((info->xmit_cnt <= 0) || info->tty->stopped || - info->tty->hw_stopped) { + + if (info->xmit_buf == 0) { + spin_unlock_irqrestore(&info->slock, flags); + return; + } + + if ((info->xmit_cnt <= 0) || info->tty->stopped || (info->tty->hw_stopped && (info->type != PORT_16550A) && (!info->IsMoxaMustChipFlag))) { info->IER &= ~UART_IER_THRI; outb(info->IER, info->base + UART_IER); + spin_unlock_irqrestore(&info->slock, flags); return; } + cnt = info->xmit_cnt; count = info->xmit_fifo_size; do { @@ -1438,6 +2186,15 @@ static inline void mxser_transmit_chars(struct mxser_struct *info) } while (--count > 0); mxvar_log.txcnt[info->port] += (cnt - info->xmit_cnt); +// added by James 03-12-2004. + info->mon_data.txcnt += (cnt - info->xmit_cnt); + info->mon_data.up_txcnt += (cnt - info->xmit_cnt); +// (above) added by James. + +/* added by casper 1/11/2000 */ + info->icount.tx += (cnt - info->xmit_cnt); +/* */ + if (info->xmit_cnt < WAKEUP_CHARS) { set_bit(MXSER_EVENT_TXLOW, &info->event); schedule_work(&info->tqueue); @@ -1446,12 +2203,11 @@ static inline void mxser_transmit_chars(struct mxser_struct *info) info->IER &= ~UART_IER_THRI; outb(info->IER, info->base + UART_IER); } + spin_unlock_irqrestore(&info->slock, flags); } -static inline void mxser_check_modem_status(struct mxser_struct *info, - int status) +static void mxser_check_modem_status(struct mxser_struct *info, int status) { - /* update input line counters */ if (status & UART_MSR_TERI) info->icount.rng++; @@ -1461,68 +2217,55 @@ static inline void mxser_check_modem_status(struct mxser_struct *info, info->icount.dcd++; if (status & UART_MSR_DCTS) info->icount.cts++; + info->mon_data.modem_status = status; wake_up_interruptible(&info->delta_msr_wait); + if ((info->flags & ASYNC_CHECK_CD) && (status & UART_MSR_DDCD)) { if (status & UART_MSR_DCD) wake_up_interruptible(&info->open_wait); - else - set_bit(MXSER_EVENT_HANGUP, &info->event); schedule_work(&info->tqueue); } + if (info->flags & ASYNC_CTS_FLOW) { if (info->tty->hw_stopped) { if (status & UART_MSR_CTS) { info->tty->hw_stopped = 0; - info->IER |= UART_IER_THRI; - outb(info->IER, info->base + UART_IER); + if ((info->type != PORT_16550A) && (!info->IsMoxaMustChipFlag)) { + info->IER |= UART_IER_THRI; + outb(info->IER, info->base + UART_IER); + } set_bit(MXSER_EVENT_TXLOW, &info->event); - schedule_work(&info->tqueue); - } + schedule_work(&info->tqueue); } } else { if (!(status & UART_MSR_CTS)) { info->tty->hw_stopped = 1; - info->IER &= ~UART_IER_THRI; - outb(info->IER, info->base + UART_IER); + if ((info->type != PORT_16550A) && (!info->IsMoxaMustChipFlag)) { + info->IER &= ~UART_IER_THRI; + outb(info->IER, info->base + UART_IER); + } } } } } -static int mxser_block_til_ready(struct tty_struct *tty, struct file *filp, - struct mxser_struct *info) +static int mxser_block_til_ready(struct tty_struct *tty, struct file *filp, struct mxser_struct *info) { DECLARE_WAITQUEUE(wait, current); - unsigned long flags; int retval; int do_clocal = 0; + unsigned long flags; - /* - * If the device is in the middle of being closed, then block - * until it's done, and then try again. - */ - if (tty_hung_up_p(filp) || (info->flags & ASYNC_CLOSING)) { - if (info->flags & ASYNC_CLOSING) - interruptible_sleep_on(&info->close_wait); -#ifdef SERIAL_DO_RESTART - if (info->flags & ASYNC_HUP_NOTIFY) - return (-EAGAIN); - else - return (-ERESTARTSYS); -#else - return (-EAGAIN); -#endif - } /* * If non-blocking mode is set, or the port is not enabled, * then make the check up front and then exit. */ - if ((filp->f_flags & O_NONBLOCK) || - (tty->flags & (1 << TTY_IO_ERROR))) { + if ((filp->f_flags & O_NONBLOCK) || (tty->flags & (1 << TTY_IO_ERROR))) { info->flags |= ASYNC_NORMAL_ACTIVE; return (0); } + if (tty->termios->c_cflag & CLOCAL) do_clocal = 1; @@ -1535,32 +2278,25 @@ static int mxser_block_til_ready(struct tty_struct *tty, struct file *filp, */ retval = 0; add_wait_queue(&info->open_wait, &wait); - save_flags(flags); - cli(); + + spin_lock_irqsave(&info->slock, flags); if (!tty_hung_up_p(filp)) info->count--; - restore_flags(flags); + spin_unlock_irqrestore(&info->slock, flags); info->blocked_open++; while (1) { - save_flags(flags); - cli(); - outb(inb(info->base + UART_MCR) | UART_MCR_DTR | UART_MCR_RTS, - info->base + UART_MCR); - restore_flags(flags); + spin_lock_irqsave(&info->slock, flags); + outb(inb(info->base + UART_MCR) | UART_MCR_DTR | UART_MCR_RTS, info->base + UART_MCR); + spin_unlock_irqrestore(&info->slock, flags); set_current_state(TASK_INTERRUPTIBLE); if (tty_hung_up_p(filp) || !(info->flags & ASYNC_INITIALIZED)) { -#ifdef SERIAL_DO_RESTART if (info->flags & ASYNC_HUP_NOTIFY) retval = -EAGAIN; else retval = -ERESTARTSYS; -#else - retval = -EAGAIN; -#endif break; } - if (!(info->flags & ASYNC_CLOSING) && - (do_clocal || (inb(info->base + UART_MSR) & UART_MSR_DCD))) + if (!(info->flags & ASYNC_CLOSING) && (do_clocal || (inb(info->base + UART_MSR) & UART_MSR_DCD))) break; if (signal_pending(current)) { retval = -ERESTARTSYS; @@ -1581,26 +2317,27 @@ static int mxser_block_til_ready(struct tty_struct *tty, struct file *filp, static int mxser_startup(struct mxser_struct *info) { - unsigned long flags; + unsigned long page; + unsigned long flags; - page = get_zeroed_page(GFP_KERNEL); + page = __get_free_page(GFP_KERNEL); if (!page) return (-ENOMEM); - save_flags(flags); - cli(); + spin_lock_irqsave(&info->slock, flags); if (info->flags & ASYNC_INITIALIZED) { free_page(page); - restore_flags(flags); + spin_unlock_irqrestore(&info->slock, flags); return (0); } + if (!info->base || !info->type) { if (info->tty) set_bit(TTY_IO_ERROR, &info->tty->flags); free_page(page); - restore_flags(flags); + spin_unlock_irqrestore(&info->slock, flags); return (0); } if (info->xmit_buf) @@ -1612,9 +2349,10 @@ static int mxser_startup(struct mxser_struct *info) * Clear the FIFO buffers and disable them * (they will be reenabled in mxser_change_speed()) */ - if (info->xmit_fifo_size == 16) - outb((UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT), - info->base + UART_FCR); + if (info->IsMoxaMustChipFlag) + outb((UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT | MOXA_MUST_FCR_GDA_MODE_ENABLE), info->base + UART_FCR); + else + outb((UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT), info->base + UART_FCR); /* * At this point there's no way the LSR could still be 0xFF; @@ -1622,7 +2360,7 @@ static int mxser_startup(struct mxser_struct *info) * here. */ if (inb(info->base + UART_LSR) == 0xff) { - restore_flags(flags); + spin_unlock_irqrestore(&info->slock, flags); if (capable(CAP_SYS_ADMIN)) { if (info->tty) set_bit(TTY_IO_ERROR, &info->tty->flags); @@ -1630,6 +2368,7 @@ static int mxser_startup(struct mxser_struct *info) } else return (-ENODEV); } + /* * Clear the interrupt registers. */ @@ -1649,7 +2388,13 @@ static int mxser_startup(struct mxser_struct *info) * Finally, enable interrupts */ info->IER = UART_IER_MSI | UART_IER_RLSI | UART_IER_RDI; - outb(info->IER, info->base + UART_IER); /* enable interrupts */ +// info->IER = UART_IER_RLSI | UART_IER_RDI; + + // following add by Victor Yu. 08-30-2002 + if (info->IsMoxaMustChipFlag) + info->IER |= MOXA_MUST_IER_EGDAI; + // above add by Victor Yu. 08-30-2002 + outb(info->IER, info->base + UART_IER); /* enable interrupts */ /* * And clear the interrupt registers again for luck. @@ -1660,17 +2405,16 @@ static int mxser_startup(struct mxser_struct *info) (void) inb(info->base + UART_MSR); if (info->tty) - test_and_clear_bit(TTY_IO_ERROR, &info->tty->flags); - + clear_bit(TTY_IO_ERROR, &info->tty->flags); info->xmit_cnt = info->xmit_head = info->xmit_tail = 0; /* * and set the speed of the serial port */ + spin_unlock_irqrestore(&info->slock, flags); mxser_change_speed(info, NULL); info->flags |= ASYNC_INITIALIZED; - restore_flags(flags); return (0); } @@ -1685,8 +2429,7 @@ static void mxser_shutdown(struct mxser_struct *info) if (!(info->flags & ASYNC_INITIALIZED)) return; - save_flags(flags); - cli(); /* Disable interrupts */ + spin_lock_irqsave(&info->slock, flags); /* * clear delta_msr_wait queue to avoid mem leaks: we may free the irq @@ -1701,15 +2444,22 @@ static void mxser_shutdown(struct mxser_struct *info) free_page((unsigned long) info->xmit_buf); info->xmit_buf = NULL; } + info->IER = 0; - outb(0x00, info->base + UART_IER); /* disable all intrs */ + outb(0x00, info->base + UART_IER); if (!info->tty || (info->tty->termios->c_cflag & HUPCL)) info->MCR &= ~(UART_MCR_DTR | UART_MCR_RTS); outb(info->MCR, info->base + UART_MCR); /* clear Rx/Tx FIFO's */ - outb((UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT), info->base + UART_FCR); + // following add by Victor Yu. 08-30-2002 + if (info->IsMoxaMustChipFlag) + outb((UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT | MOXA_MUST_FCR_GDA_MODE_ENABLE), info->base + UART_FCR); + else + // above add by Victor Yu. 08-30-2002 + outb((UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT), info->base + UART_FCR); + /* read data port to reset things */ (void) inb(info->base + UART_RX); @@ -1717,229 +2467,108 @@ static void mxser_shutdown(struct mxser_struct *info) set_bit(TTY_IO_ERROR, &info->tty->flags); info->flags &= ~ASYNC_INITIALIZED; - restore_flags(flags); + + // following add by Victor Yu. 09-23-2002 + if (info->IsMoxaMustChipFlag) { + SET_MOXA_MUST_NO_SOFTWARE_FLOW_CONTROL(info->base); + } + // above add by Victor Yu. 09-23-2002 + + spin_unlock_irqrestore(&info->slock, flags); } /* * This routine is called to set the UART divisor registers to match * the specified baud rate for a serial port. */ -static int mxser_change_speed(struct mxser_struct *info, - struct termios *old_termios) +static int mxser_change_speed(struct mxser_struct *info, struct termios *old_termios) { - int quot = 0; unsigned cflag, cval, fcr; - int i; int ret = 0; + unsigned char status; + long baud; unsigned long flags; + if (!info->tty || !info->tty->termios) return ret; cflag = info->tty->termios->c_cflag; if (!(info->base)) return ret; + #ifndef B921600 #define B921600 (B460800 +1) #endif - switch (cflag & (CBAUD | CBAUDEX)) { - case B921600: - i = 20; - break; - case B460800: - i = 19; - break; - case B230400: - i = 18; - break; - case B115200: - i = 17; - break; - case B57600: - i = 16; - break; - case B38400: - i = 15; - break; - case B19200: - i = 14; - break; - case B9600: - i = 13; - break; - case B4800: - i = 12; - break; - case B2400: - i = 11; - break; - case B1800: - i = 10; - break; - case B1200: - i = 9; - break; - case B600: - i = 8; - break; - case B300: - i = 7; - break; - case B200: - i = 6; - break; - case B150: - i = 5; - break; - case B134: - i = 4; - break; - case B110: - i = 3; - break; - case B75: - i = 2; - break; - case B50: - i = 1; - break; - default: - i = 0; - break; - } - - if (i == 15) { - if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI) - i = 16; /* 57600 bps */ - if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI) - i = 17; /* 115200 bps */ - -#ifdef ASYNC_SPD_SHI - if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_SHI) - i = 18; -#endif - -#ifdef ASYNC_SPD_WARP - if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_WARP) - i = 19; -#endif - } - if (mxvar_baud_table[i] == 134) { - quot = (2 * info->baud_base / 269); - } else if (mxvar_baud_table[i]) { - quot = info->baud_base / mxvar_baud_table[i]; - if (!quot && old_termios) { - /* re-calculate */ - info->tty->termios->c_cflag &= ~CBAUD; - info->tty->termios->c_cflag |= (old_termios->c_cflag & CBAUD); - switch (info->tty->termios->c_cflag & (CBAUD | CBAUDEX)) { - case B921600: - i = 20; - break; - case B460800: - i = 19; - break; - case B230400: - i = 18; - break; - case B115200: - i = 17; - break; - case B57600: - i = 16; - break; - case B38400: - i = 15; - break; - case B19200: - i = 14; - break; - case B9600: - i = 13; - break; - case B4800: - i = 12; - break; - case B2400: - i = 11; - break; - case B1800: - i = 10; - break; - case B1200: - i = 9; - break; - case B600: - i = 8; - break; - case B300: - i = 7; - break; - case B200: - i = 6; - break; - case B150: - i = 5; - break; - case B134: - i = 4; - break; - case B110: - i = 3; - break; - case B75: - i = 2; - break; - case B50: - i = 1; - break; - default: - i = 0; - break; - } - if (i == 15) { - if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI) - i = 16; /* 57600 bps */ - if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI) - i = 17; /* 115200 bps */ -#ifdef ASYNC_SPD_SHI - if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_SHI) - i = 18; -#endif -#ifdef ASYNC_SPD_WARP - if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_WARP) - i = 19; -#endif - } - if (mxvar_baud_table[i] == 134) { - quot = (2 * info->baud_base / 269); - } else if (mxvar_baud_table[i]) { - quot = info->baud_base / mxvar_baud_table[i]; - if (quot == 0) - quot = 1; - } else { - quot = 0; - } - } else if (quot == 0) - quot = 1; - } else { - quot = 0; + if (mxser_set_baud_method[info->port] == 0) { + switch (cflag & (CBAUD | CBAUDEX)) { + case B921600: + baud = 921600; + break; + case B460800: + baud = 460800; + break; + case B230400: + baud = 230400; + break; + case B115200: + baud = 115200; + break; + case B57600: + baud = 57600; + break; + case B38400: + baud = 38400; + break; + case B19200: + baud = 19200; + break; + case B9600: + baud = 9600; + break; + case B4800: + baud = 4800; + break; + case B2400: + baud = 2400; + break; + case B1800: + baud = 1800; + break; + case B1200: + baud = 1200; + break; + case B600: + baud = 600; + break; + case B300: + baud = 300; + break; + case B200: + baud = 200; + break; + case B150: + baud = 150; + break; + case B134: + baud = 134; + break; + case B110: + baud = 110; + break; + case B75: + baud = 75; + break; + case B50: + baud = 50; + break; + default: + baud = 0; + break; + } + mxser_set_baud(info, baud); } - if (quot) { - info->MCR |= UART_MCR_DTR; - save_flags(flags); - cli(); - outb(info->MCR, info->base + UART_MCR); - restore_flags(flags); - } else { - info->MCR &= ~UART_MCR_DTR; - save_flags(flags); - cli(); - outb(info->MCR, info->base + UART_MCR); - restore_flags(flags); - return ret; - } /* byte size and parity */ switch (cflag & CSIZE) { case CS5: @@ -1962,24 +2591,42 @@ static int mxser_change_speed(struct mxser_struct *info, cval |= 0x04; if (cflag & PARENB) cval |= UART_LCR_PARITY; - if (!(cflag & PARODD)) + if (!(cflag & PARODD)) { cval |= UART_LCR_EPAR; + } + if (cflag & CMSPAR) + cval |= UART_LCR_SPAR; + if ((info->type == PORT_8250) || (info->type == PORT_16450)) { - fcr = 0; + if (info->IsMoxaMustChipFlag) { + fcr = UART_FCR_ENABLE_FIFO; + fcr |= MOXA_MUST_FCR_GDA_MODE_ENABLE; + SET_MOXA_MUST_FIFO_VALUE(info); + } else + fcr = 0; } else { fcr = UART_FCR_ENABLE_FIFO; - switch (info->rx_trigger) { - case 1: - fcr |= UART_FCR_TRIGGER_1; - break; - case 4: - fcr |= UART_FCR_TRIGGER_4; - break; - case 8: - fcr |= UART_FCR_TRIGGER_8; - break; - default: - fcr |= UART_FCR_TRIGGER_14; + // following add by Victor Yu. 08-30-2002 + if (info->IsMoxaMustChipFlag) { + fcr |= MOXA_MUST_FCR_GDA_MODE_ENABLE; + SET_MOXA_MUST_FIFO_VALUE(info); + } else { + // above add by Victor Yu. 08-30-2002 + + switch (info->rx_trigger) { + case 1: + fcr |= UART_FCR_TRIGGER_1; + break; + case 4: + fcr |= UART_FCR_TRIGGER_4; + break; + case 8: + fcr |= UART_FCR_TRIGGER_8; + break; + default: + fcr |= UART_FCR_TRIGGER_14; + break; + } } } @@ -1989,15 +2636,46 @@ static int mxser_change_speed(struct mxser_struct *info, if (cflag & CRTSCTS) { info->flags |= ASYNC_CTS_FLOW; info->IER |= UART_IER_MSI; - if (info->type == PORT_16550A) + if ((info->type == PORT_16550A) || (info->IsMoxaMustChipFlag)) { info->MCR |= UART_MCR_AFE; + //status = mxser_get_msr(info->base, 0, info->port); +/* save_flags(flags); + cli(); + status = inb(baseaddr + UART_MSR); + restore_flags(flags);*/ + //mxser_check_modem_status(info, status); + } else { + //status = mxser_get_msr(info->base, 0, info->port); + + //MX_LOCK(&info->slock); + status = inb(info->base + UART_MSR); + //MX_UNLOCK(&info->slock); + if (info->tty->hw_stopped) { + if (status & UART_MSR_CTS) { + info->tty->hw_stopped = 0; + if ((info->type != PORT_16550A) && (!info->IsMoxaMustChipFlag)) { + info->IER |= UART_IER_THRI; + outb(info->IER, info->base + UART_IER); + } + set_bit(MXSER_EVENT_TXLOW, &info->event); + schedule_work(&info->tqueue); } + } else { + if (!(status & UART_MSR_CTS)) { + info->tty->hw_stopped = 1; + if ((info->type != PORT_16550A) && (!info->IsMoxaMustChipFlag)) { + info->IER &= ~UART_IER_THRI; + outb(info->IER, info->base + UART_IER); + } + } + } + } } else { info->flags &= ~ASYNC_CTS_FLOW; } outb(info->MCR, info->base + UART_MCR); - if (cflag & CLOCAL) + if (cflag & CLOCAL) { info->flags &= ~ASYNC_CHECK_CD; - else { + } else { info->flags |= ASYNC_CHECK_CD; info->IER |= UART_IER_MSI; } @@ -2013,13 +2691,7 @@ static int mxser_change_speed(struct mxser_struct *info, info->read_status_mask |= UART_LSR_BI; info->ignore_status_mask = 0; -#if 0 - /* This should be safe, but for some broken bits of hardware... */ - if (I_IGNPAR(info->tty)) { - info->ignore_status_mask |= UART_LSR_PE | UART_LSR_FE; - info->read_status_mask |= UART_LSR_PE | UART_LSR_FE; - } -#endif + if (I_IGNBRK(info->tty)) { info->ignore_status_mask |= UART_LSR_BI; info->read_status_mask |= UART_LSR_BI; @@ -2032,25 +2704,107 @@ static int mxser_change_speed(struct mxser_struct *info, info->read_status_mask |= UART_LSR_OE | UART_LSR_PE | UART_LSR_FE; } } - save_flags(flags); - cli(); + // following add by Victor Yu. 09-02-2002 + if (info->IsMoxaMustChipFlag) { + spin_lock_irqsave(&info->slock, flags); + SET_MOXA_MUST_XON1_VALUE(info->base, START_CHAR(info->tty)); + SET_MOXA_MUST_XOFF1_VALUE(info->base, STOP_CHAR(info->tty)); + if (I_IXON(info->tty)) { + ENABLE_MOXA_MUST_RX_SOFTWARE_FLOW_CONTROL(info->base); + } else { + DISABLE_MOXA_MUST_RX_SOFTWARE_FLOW_CONTROL(info->base); + } + if (I_IXOFF(info->tty)) { + ENABLE_MOXA_MUST_TX_SOFTWARE_FLOW_CONTROL(info->base); + } else { + DISABLE_MOXA_MUST_TX_SOFTWARE_FLOW_CONTROL(info->base); + } + /* + if ( I_IXANY(info->tty) ) { + info->MCR |= MOXA_MUST_MCR_XON_ANY; + ENABLE_MOXA_MUST_XON_ANY_FLOW_CONTROL(info->base); + } else { + info->MCR &= ~MOXA_MUST_MCR_XON_ANY; + DISABLE_MOXA_MUST_XON_ANY_FLOW_CONTROL(info->base); + } + */ + spin_unlock_irqrestore(&info->slock, flags); + } + // above add by Victor Yu. 09-02-2002 + + + outb(fcr, info->base + UART_FCR); /* set fcr */ + outb(cval, info->base + UART_LCR); + + return ret; +} + + +static int mxser_set_baud(struct mxser_struct *info, long newspd) +{ + int quot = 0; + unsigned char cval; + int ret = 0; + unsigned long flags; + + if (!info->tty || !info->tty->termios) + return ret; + + if (!(info->base)) + return ret; + + if (newspd > info->MaxCanSetBaudRate) + return 0; + + info->realbaud = newspd; + if (newspd == 134) { + quot = (2 * info->baud_base / 269); + } else if (newspd) { + quot = info->baud_base / newspd; + + if (quot == 0) + quot = 1; + + } else { + quot = 0; + } + + info->timeout = ((info->xmit_fifo_size * HZ * 10 * quot) / info->baud_base); + info->timeout += HZ / 50; /* Add .02 seconds of slop */ + + if (quot) { + spin_lock_irqsave(&info->slock, flags); + info->MCR |= UART_MCR_DTR; + outb(info->MCR, info->base + UART_MCR); + spin_unlock_irqrestore(&info->slock, flags); + } else { + spin_lock_irqsave(&info->slock, flags); + info->MCR &= ~UART_MCR_DTR; + outb(info->MCR, info->base + UART_MCR); + spin_unlock_irqrestore(&info->slock, flags); + return ret; + } + + cval = inb(info->base + UART_LCR); + outb(cval | UART_LCR_DLAB, info->base + UART_LCR); /* set DLAB */ + outb(quot & 0xff, info->base + UART_DLL); /* LS of divisor */ - outb(quot >> 8, info->base + UART_DLM); /* MS of divisor */ + outb(quot >> 8, info->base + UART_DLM); /* MS of divisor */ outb(cval, info->base + UART_LCR); /* reset DLAB */ - outb(fcr, info->base + UART_FCR); /* set fcr */ - restore_flags(flags); + return ret; } + + /* * ------------------------------------------------------------ * friends of mxser_ioctl() * ------------------------------------------------------------ */ -static int mxser_get_serial_info(struct mxser_struct *info, - struct serial_struct __user *retinfo) +static int mxser_get_serial_info(struct mxser_struct *info, struct serial_struct __user *retinfo) { struct serial_struct tmp; @@ -2067,11 +2821,12 @@ static int mxser_get_serial_info(struct mxser_struct *info, tmp.closing_wait = info->closing_wait; tmp.custom_divisor = info->custom_divisor; tmp.hub6 = 0; - return copy_to_user(retinfo, &tmp, sizeof(*retinfo)) ? -EFAULT : 0; + if (copy_to_user(retinfo, &tmp, sizeof(*retinfo))) + return -EFAULT; + return (0); } -static int mxser_set_serial_info(struct mxser_struct *info, - struct serial_struct __user *new_info) +static int mxser_set_serial_info(struct mxser_struct *info, struct serial_struct __user *new_info) { struct serial_struct new_serial; unsigned int flags; @@ -2082,40 +2837,40 @@ static int mxser_set_serial_info(struct mxser_struct *info, if (copy_from_user(&new_serial, new_info, sizeof(new_serial))) return -EFAULT; - if ((new_serial.irq != info->irq) || - (new_serial.port != info->base) || - (new_serial.type != info->type) || - (new_serial.custom_divisor != info->custom_divisor) || - (new_serial.baud_base != info->baud_base)) + if ((new_serial.irq != info->irq) || (new_serial.port != info->base) || (new_serial.custom_divisor != info->custom_divisor) || (new_serial.baud_base != info->baud_base)) return (-EPERM); flags = info->flags & ASYNC_SPD_MASK; if (!capable(CAP_SYS_ADMIN)) { - if ((new_serial.baud_base != info->baud_base) || - (new_serial.close_delay != info->close_delay) || - ((new_serial.flags & ~ASYNC_USR_MASK) != - (info->flags & ~ASYNC_USR_MASK))) + if ((new_serial.baud_base != info->baud_base) || (new_serial.close_delay != info->close_delay) || ((new_serial.flags & ~ASYNC_USR_MASK) != (info->flags & ~ASYNC_USR_MASK))) return (-EPERM); - info->flags = ((info->flags & ~ASYNC_USR_MASK) | - (new_serial.flags & ASYNC_USR_MASK)); + info->flags = ((info->flags & ~ASYNC_USR_MASK) | (new_serial.flags & ASYNC_USR_MASK)); } else { /* * OK, past this point, all the error checking has been done. * At this point, we start making changes..... */ - info->flags = ((info->flags & ~ASYNC_FLAGS) | - (new_serial.flags & ASYNC_FLAGS)); + info->flags = ((info->flags & ~ASYNC_FLAGS) | (new_serial.flags & ASYNC_FLAGS)); info->close_delay = new_serial.close_delay * HZ / 100; 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; //(info->flags & ASYNC_LOW_LATENCY) ? 1 : 0; } + /* added by casper, 3/17/2000, for mouse */ + info->type = new_serial.type; + + process_txrx_fifo(info); + + /* */ if (info->flags & ASYNC_INITIALIZED) { if (flags != (info->flags & ASYNC_SPD_MASK)) { mxser_change_speed(info, NULL); } - } else + } else { retval = mxser_startup(info); + } return (retval); } @@ -2123,11 +2878,11 @@ static int mxser_set_serial_info(struct mxser_struct *info, * mxser_get_lsr_info - get line status register info * * Purpose: Let user call ioctl() to get info when the UART physically - * is emptied. On bus types like RS485, the transmitter must - * release the bus after transmitting. This must be done when - * the transmit shift register is empty, not be done when the - * transmit holding register is empty. This functionality - * allows an RS485 driver to be written in user space. + * is emptied. On bus types like RS485, the transmitter must + * release the bus after transmitting. This must be done when + * the transmit shift register is empty, not be done when the + * transmit holding register is empty. This functionality + * allows an RS485 driver to be written in user space. */ static int mxser_get_lsr_info(struct mxser_struct *info, unsigned int __user *value) { @@ -2135,10 +2890,9 @@ static int mxser_get_lsr_info(struct mxser_struct *info, unsigned int __user *va unsigned int result; unsigned long flags; - save_flags(flags); - cli(); + spin_lock_irqsave(&info->slock, flags); status = inb(info->base + UART_LSR); - restore_flags(flags); + spin_unlock_irqrestore(&info->slock, flags); result = ((status & UART_LSR_TEMT) ? TIOCSER_TEMT : 0); return put_user(result, value); } @@ -2149,15 +2903,17 @@ static int mxser_get_lsr_info(struct mxser_struct *info, unsigned int __user *va static void mxser_send_break(struct mxser_struct *info, int duration) { unsigned long flags; + if (!info->base) return; set_current_state(TASK_INTERRUPTIBLE); - save_flags(flags); - cli(); + spin_lock_irqsave(&info->slock, flags); outb(inb(info->base + UART_LCR) | UART_LCR_SBC, info->base + UART_LCR); + spin_unlock_irqrestore(&info->slock, flags); schedule_timeout(duration); + spin_lock_irqsave(&info->slock, flags); outb(inb(info->base + UART_LCR) & ~UART_LCR_SBC, info->base + UART_LCR); - restore_flags(flags); + spin_unlock_irqrestore(&info->slock, flags); } static int mxser_tiocmget(struct tty_struct *tty, struct file *file) @@ -2166,39 +2922,36 @@ static int mxser_tiocmget(struct tty_struct *tty, struct file *file) unsigned char control, status; unsigned long flags; - if (PORTNO(tty) == MXSER_PORTS) + + if (tty->index == MXSER_PORTS) return (-ENOIOCTLCMD); if (tty->flags & (1 << TTY_IO_ERROR)) return (-EIO); control = info->MCR; - save_flags(flags); - cli(); + + spin_lock_irqsave(&info->slock, flags); status = inb(info->base + UART_MSR); if (status & UART_MSR_ANY_DELTA) mxser_check_modem_status(info, status); - restore_flags(flags); + spin_unlock_irqrestore(&info->slock, flags); return ((control & UART_MCR_RTS) ? TIOCM_RTS : 0) | - ((control & UART_MCR_DTR) ? TIOCM_DTR : 0) | - ((status & UART_MSR_DCD) ? TIOCM_CAR : 0) | - ((status & UART_MSR_RI) ? TIOCM_RNG : 0) | - ((status & UART_MSR_DSR) ? TIOCM_DSR : 0) | - ((status & UART_MSR_CTS) ? TIOCM_CTS : 0); + ((control & UART_MCR_DTR) ? TIOCM_DTR : 0) | ((status & UART_MSR_DCD) ? TIOCM_CAR : 0) | ((status & UART_MSR_RI) ? TIOCM_RNG : 0) | ((status & UART_MSR_DSR) ? TIOCM_DSR : 0) | ((status & UART_MSR_CTS) ? TIOCM_CTS : 0); } -static int mxser_tiocmset(struct tty_struct *tty, struct file *file, - unsigned int set, unsigned int clear) +static int mxser_tiocmset(struct tty_struct *tty, struct file *file, unsigned int set, unsigned int clear) { struct mxser_struct *info = (struct mxser_struct *) tty->driver_data; unsigned long flags; - if (PORTNO(tty) == MXSER_PORTS) - return (-ENOIOCTLCMD); + + if (tty->index == MXSER_PORTS) + return -ENOIOCTLCMD; if (tty->flags & (1 << TTY_IO_ERROR)) - return (-EIO); + return -EIO; + + spin_lock_irqsave(&info->slock, flags); - save_flags(flags); - cli(); if (set & TIOCM_RTS) info->MCR |= UART_MCR_RTS; if (set & TIOCM_DTR) @@ -2210,10 +2963,11 @@ static int mxser_tiocmset(struct tty_struct *tty, struct file *file, info->MCR &= ~UART_MCR_DTR; outb(info->MCR, info->base + UART_MCR); - restore_flags(flags); - return (0); + spin_unlock_irqrestore(&info->slock, flags); + return 0; } + static int mxser_read_register(int, unsigned short *); static int mxser_program_mode(int); static void mxser_normal_mode(int); @@ -2224,33 +2978,56 @@ static int mxser_get_ISA_conf(int cap, struct mxser_hwconf *hwconf) unsigned short regs[16], irq; unsigned char scratch, scratch2; + hwconf->IsMoxaMustChipFlag = MOXA_OTHER_UART; + id = mxser_read_register(cap, regs); - if (id == C168_ASIC_ID) + if (id == C168_ASIC_ID) { hwconf->board_type = MXSER_BOARD_C168_ISA; - else if (id == C104_ASIC_ID) + hwconf->ports = 8; + } else if (id == C104_ASIC_ID) { hwconf->board_type = MXSER_BOARD_C104_ISA; - else if (id == C102_ASIC_ID) + hwconf->ports = 4; + } else if (id == C102_ASIC_ID) { hwconf->board_type = MXSER_BOARD_C102_ISA; - else if (id == CI132_ASIC_ID) + hwconf->ports = 2; + } else if (id == CI132_ASIC_ID) { hwconf->board_type = MXSER_BOARD_CI132; - else if (id == CI134_ASIC_ID) + hwconf->ports = 2; + } else if (id == CI134_ASIC_ID) { hwconf->board_type = MXSER_BOARD_CI134; - else if (id == CI104J_ASIC_ID) + hwconf->ports = 4; + } else if (id == CI104J_ASIC_ID) { hwconf->board_type = MXSER_BOARD_CI104J; - else + hwconf->ports = 4; + } else return (0); - irq = regs[9] & 0x0F; - irq = irq | (irq << 4); - irq = irq | (irq << 8); - if ((irq != regs[9]) || ((id == 1) && (irq != regs[10]))) { - return (MXSER_ERR_IRQ_CONFLIT); + + irq = 0; + if (hwconf->ports == 2) { + irq = regs[9] & 0xF000; + irq = irq | (irq >> 4); + if (irq != (regs[9] & 0xFF00)) + return (MXSER_ERR_IRQ_CONFLIT); + } else if (hwconf->ports == 4) { + irq = regs[9] & 0xF000; + irq = irq | (irq >> 4); + irq = irq | (irq >> 8); + if (irq != regs[9]) + return (MXSER_ERR_IRQ_CONFLIT); + } else if (hwconf->ports == 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); } + if (!irq) { return (MXSER_ERR_IRQ); } + hwconf->irq = ((int) (irq & 0xF000) >> 12); for (i = 0; i < 8; i++) hwconf->ioaddr[i] = (int) regs[i + 1] & 0xFFF8; - hwconf->irq = (int) (irq & 0x0F); if ((regs[12] & 0x80) == 0) { return (MXSER_ERR_VECTOR); } @@ -2260,10 +3037,13 @@ static int mxser_get_ISA_conf(int cap, struct mxser_hwconf *hwconf) else hwconf->vector_mask = 0x000F; for (i = 7, bits = 0x0100; i >= 0; i--, bits <<= 1) { - if (regs[12] & bits) + if (regs[12] & bits) { hwconf->baud_base[i] = 921600; - else + hwconf->MaxCanSetBaudRate[i] = 921600; // add by Victor Yu. 09-04-2002 + } else { hwconf->baud_base[i] = 115200; + hwconf->MaxCanSetBaudRate[i] = 115200; // add by Victor Yu. 09-04-2002 + } } scratch2 = inb(cap + UART_LCR) & (~UART_LCR_DLAB); outb(scratch2 | UART_LCR_DLAB, cap + UART_LCR); @@ -2271,6 +3051,7 @@ static int mxser_get_ISA_conf(int cap, struct mxser_hwconf *hwconf) outb(scratch2, cap + UART_LCR); outb(UART_FCR_ENABLE_FIFO, cap + UART_FCR); scratch = inb(cap + UART_IIR); + if (scratch & 0xC0) hwconf->uart_type = PORT_16550A; else @@ -2279,6 +3060,8 @@ static int mxser_get_ISA_conf(int cap, struct mxser_hwconf *hwconf) hwconf->ports = 8; else hwconf->ports = 4; + request_region(hwconf->ioaddr[0], 8 * hwconf->ports, "mxser(IO)"); + request_region(hwconf->vector, 1, "mxser(vector)"); return (hwconf->ports); } @@ -2333,10 +3116,9 @@ static int mxser_read_register(int port, unsigned short *regs) static int mxser_program_mode(int port) { int id, i, j, n; - unsigned long flags; + //unsigned long flags; - save_flags(flags); - cli(); + spin_lock(&gm_lock); outb(0, port); outb(0, port); outb(0, port); @@ -2344,10 +3126,11 @@ static int mxser_program_mode(int port) (void) inb(port); outb(0, port); (void) inb(port); - restore_flags(flags); + //restore_flags(flags); + spin_unlock(&gm_lock); + id = inb(port + 1) & 0x1F; - if ((id != C168_ASIC_ID) && (id != C104_ASIC_ID) && (id != CI104J_ASIC_ID) && - (id != C102_ASIC_ID) && (id != CI132_ASIC_ID) && (id != CI134_ASIC_ID)) + if ((id != C168_ASIC_ID) && (id != C104_ASIC_ID) && (id != C102_ASIC_ID) && (id != CI132_ASIC_ID) && (id != CI134_ASIC_ID) && (id != CI104J_ASIC_ID)) return (-1); for (i = 0, j = 0; i < 4; i++) { n = inb(port + 2); @@ -2384,5 +3167,22 @@ static void mxser_normal_mode(int port) outb(0x00, port + 4); } +// added by James 03-05-2004. +// for secure device server: +// stat = 1, the port8 DTR is set to ON. +// stat = 0, the port8 DTR is set to OFF. +void SDS_PORT8_DTR(int stat) +{ + int _sds_oldmcr; + _sds_oldmcr = inb(mxvar_table[7].base + UART_MCR); // get old MCR + if (stat == 1) { + outb(_sds_oldmcr | 0x01, mxvar_table[7].base + UART_MCR); // set DTR ON + } + if (stat == 0) { + outb(_sds_oldmcr & 0xfe, mxvar_table[7].base + UART_MCR); // set DTR OFF + } + return; +} + module_init(mxser_module_init); module_exit(mxser_module_exit);