mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-04-18 12:19:11 +08:00
tty: moxa: carve out special ioctls and extra tty_port
These ioctls are undocumented and not exposed -- they are defined locally. Given they need a special tty_port just for them, this is very ugly. So drop this whole functionality. It is barely used for something real. (And if it is, we'd need a common functionality to all drivers.) Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org> Link: https://lore.kernel.org/r/20250317070046.24386-21-jirislaby@kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jiri Slaby (SUSE)
committed by
Greg Kroah-Hartman
Greg Kroah-Hartman
parent
eed0d31176
commit
794d7b2721
@@ -43,15 +43,6 @@
|
||||
#include <linux/ratelimit.h>
|
||||
|
||||
#include <asm/io.h>
|
||||
#include <linux/uaccess.h>
|
||||
|
||||
#define MOXA 0x400
|
||||
#define MOXA_GET_IQUEUE (MOXA + 1) /* get input buffered count */
|
||||
#define MOXA_GET_OQUEUE (MOXA + 2) /* get output buffered count */
|
||||
#define MOXA_GETDATACOUNT (MOXA + 23)
|
||||
#define MOXA_GET_IOQUEUE (MOXA + 27)
|
||||
#define MOXA_FLUSH_QUEUE (MOXA + 28)
|
||||
#define MOXA_GETMSTATUS (MOXA + 65)
|
||||
|
||||
/*
|
||||
* System Configuration
|
||||
@@ -397,19 +388,6 @@ static struct moxa_board_conf {
|
||||
void __iomem *intTable;
|
||||
} moxa_boards[MAX_BOARDS];
|
||||
|
||||
struct mxser_mstatus {
|
||||
tcflag_t cflag;
|
||||
int cts;
|
||||
int dsr;
|
||||
int ri;
|
||||
int dcd;
|
||||
};
|
||||
|
||||
struct moxaq_str {
|
||||
int inq;
|
||||
int outq;
|
||||
};
|
||||
|
||||
struct moxa_port {
|
||||
struct tty_port port;
|
||||
struct moxa_board_conf *board;
|
||||
@@ -424,12 +402,6 @@ struct moxa_port {
|
||||
u8 lowChkFlag;
|
||||
};
|
||||
|
||||
struct mon_str {
|
||||
int tick;
|
||||
int rxcnt[MAX_PORTS];
|
||||
int txcnt[MAX_PORTS];
|
||||
};
|
||||
|
||||
/* statusflags */
|
||||
#define TXSTOPPED 1
|
||||
#define LOWWAIT 2
|
||||
@@ -439,14 +411,11 @@ struct mon_str {
|
||||
#define WAKEUP_CHARS 256
|
||||
|
||||
static int ttymajor = MOXAMAJOR;
|
||||
static struct mon_str moxaLog;
|
||||
static unsigned int moxaFuncTout = HZ / 2;
|
||||
static unsigned int moxaLowWaterChk;
|
||||
static DEFINE_MUTEX(moxa_openlock);
|
||||
static DEFINE_SPINLOCK(moxa_lock);
|
||||
|
||||
static struct tty_port moxa_service_port;
|
||||
|
||||
MODULE_AUTHOR("William Chen");
|
||||
MODULE_DESCRIPTION("MOXA Intellio Family Multiport Board Device Driver");
|
||||
MODULE_LICENSE("GPL");
|
||||
@@ -557,104 +526,6 @@ static void moxa_low_water_check(void __iomem *ofsAddr)
|
||||
* TTY operations
|
||||
*/
|
||||
|
||||
static int moxa_ioctl(struct tty_struct *tty,
|
||||
unsigned int cmd, unsigned long arg)
|
||||
{
|
||||
struct moxa_port *ch = tty->driver_data;
|
||||
void __user *argp = (void __user *)arg;
|
||||
int status, ret = 0;
|
||||
|
||||
if (tty->index == MAX_PORTS) {
|
||||
if (cmd != MOXA_GETDATACOUNT && cmd != MOXA_GET_IOQUEUE &&
|
||||
cmd != MOXA_GETMSTATUS)
|
||||
return -EINVAL;
|
||||
} else if (!ch)
|
||||
return -ENODEV;
|
||||
|
||||
switch (cmd) {
|
||||
case MOXA_GETDATACOUNT:
|
||||
moxaLog.tick = jiffies;
|
||||
if (copy_to_user(argp, &moxaLog, sizeof(moxaLog)))
|
||||
ret = -EFAULT;
|
||||
break;
|
||||
case MOXA_FLUSH_QUEUE:
|
||||
MoxaPortFlushData(ch, arg);
|
||||
break;
|
||||
case MOXA_GET_IOQUEUE: {
|
||||
struct moxaq_str __user *argm = argp;
|
||||
struct moxaq_str tmp;
|
||||
struct moxa_port *p;
|
||||
unsigned int i, j;
|
||||
|
||||
for (i = 0; i < MAX_BOARDS; i++) {
|
||||
p = moxa_boards[i].ports;
|
||||
for (j = 0; j < MAX_PORTS_PER_BOARD; j++, p++, argm++) {
|
||||
memset(&tmp, 0, sizeof(tmp));
|
||||
spin_lock_bh(&moxa_lock);
|
||||
if (moxa_boards[i].ready) {
|
||||
tmp.inq = MoxaPortRxQueue(p);
|
||||
tmp.outq = MoxaPortTxQueue(p);
|
||||
}
|
||||
spin_unlock_bh(&moxa_lock);
|
||||
if (copy_to_user(argm, &tmp, sizeof(tmp)))
|
||||
return -EFAULT;
|
||||
}
|
||||
}
|
||||
break;
|
||||
} case MOXA_GET_OQUEUE:
|
||||
status = MoxaPortTxQueue(ch);
|
||||
ret = put_user(status, (unsigned long __user *)argp);
|
||||
break;
|
||||
case MOXA_GET_IQUEUE:
|
||||
status = MoxaPortRxQueue(ch);
|
||||
ret = put_user(status, (unsigned long __user *)argp);
|
||||
break;
|
||||
case MOXA_GETMSTATUS: {
|
||||
struct mxser_mstatus __user *argm = argp;
|
||||
struct mxser_mstatus tmp;
|
||||
struct moxa_port *p;
|
||||
unsigned int i, j;
|
||||
|
||||
for (i = 0; i < MAX_BOARDS; i++) {
|
||||
p = moxa_boards[i].ports;
|
||||
for (j = 0; j < MAX_PORTS_PER_BOARD; j++, p++, argm++) {
|
||||
struct tty_struct *ttyp;
|
||||
memset(&tmp, 0, sizeof(tmp));
|
||||
spin_lock_bh(&moxa_lock);
|
||||
if (!moxa_boards[i].ready) {
|
||||
spin_unlock_bh(&moxa_lock);
|
||||
goto copy;
|
||||
}
|
||||
|
||||
status = MoxaPortLineStatus(p);
|
||||
spin_unlock_bh(&moxa_lock);
|
||||
|
||||
if (status & 1)
|
||||
tmp.cts = 1;
|
||||
if (status & 2)
|
||||
tmp.dsr = 1;
|
||||
if (status & 4)
|
||||
tmp.dcd = 1;
|
||||
|
||||
ttyp = tty_port_tty_get(&p->port);
|
||||
if (!ttyp)
|
||||
tmp.cflag = p->cflag;
|
||||
else
|
||||
tmp.cflag = ttyp->termios.c_cflag;
|
||||
tty_kref_put(ttyp);
|
||||
copy:
|
||||
if (copy_to_user(argm, &tmp, sizeof(tmp)))
|
||||
return -EFAULT;
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
default:
|
||||
ret = -ENOIOCTLCMD;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int moxa_break_ctl(struct tty_struct *tty, int state)
|
||||
{
|
||||
struct moxa_port *port = tty->driver_data;
|
||||
@@ -671,7 +542,6 @@ static const struct tty_operations moxa_ops = {
|
||||
.write_room = moxa_write_room,
|
||||
.flush_buffer = moxa_flush_buffer,
|
||||
.chars_in_buffer = moxa_chars_in_buffer,
|
||||
.ioctl = moxa_ioctl,
|
||||
.set_termios = moxa_set_termios,
|
||||
.stop = moxa_stop,
|
||||
.start = moxa_start,
|
||||
@@ -1283,9 +1153,7 @@ static int __init moxa_init(void)
|
||||
{
|
||||
int retval = 0;
|
||||
|
||||
tty_port_init(&moxa_service_port);
|
||||
|
||||
moxaDriver = tty_alloc_driver(MAX_PORTS + 1,
|
||||
moxaDriver = tty_alloc_driver(MAX_PORTS,
|
||||
TTY_DRIVER_REAL_RAW |
|
||||
TTY_DRIVER_DYNAMIC_DEV);
|
||||
if (IS_ERR(moxaDriver))
|
||||
@@ -1301,8 +1169,6 @@ static int __init moxa_init(void)
|
||||
moxaDriver->init_termios.c_ispeed = 9600;
|
||||
moxaDriver->init_termios.c_ospeed = 9600;
|
||||
tty_set_operations(moxaDriver, &moxa_ops);
|
||||
/* Having one more port only for ioctls is ugly */
|
||||
tty_port_link_device(&moxa_service_port, moxaDriver, MAX_PORTS);
|
||||
|
||||
if (tty_register_driver(moxaDriver)) {
|
||||
printk(KERN_ERR "can't register MOXA Smartio tty driver!\n");
|
||||
@@ -1362,9 +1228,6 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
|
||||
int port;
|
||||
|
||||
port = tty->index;
|
||||
if (port == MAX_PORTS) {
|
||||
return capable(CAP_SYS_ADMIN) ? 0 : -EPERM;
|
||||
}
|
||||
if (mutex_lock_interruptible(&moxa_openlock))
|
||||
return -ERESTARTSYS;
|
||||
brd = &moxa_boards[port / MAX_PORTS_PER_BOARD];
|
||||
@@ -2087,7 +1950,6 @@ static ssize_t MoxaPortWriteData(struct tty_struct *tty, const u8 *buffer,
|
||||
c = (head > tail) ? (head - tail - 1) : (head - tail + tx_mask);
|
||||
if (c > len)
|
||||
c = len;
|
||||
moxaLog.txcnt[port->port.tty->index] += c;
|
||||
total = c;
|
||||
if (spage == epage) {
|
||||
bufhead = readw(ofsAddr + Ofs_txb);
|
||||
@@ -2129,7 +1991,6 @@ static ssize_t MoxaPortWriteData(struct tty_struct *tty, const u8 *buffer,
|
||||
|
||||
static int MoxaPortReadData(struct moxa_port *port)
|
||||
{
|
||||
struct tty_struct *tty = port->port.tty;
|
||||
void __iomem *baseAddr, *ofsAddr, *ofs;
|
||||
u8 *dst;
|
||||
unsigned int count, len, total;
|
||||
@@ -2148,7 +2009,6 @@ static int MoxaPortReadData(struct moxa_port *port)
|
||||
return 0;
|
||||
|
||||
total = count;
|
||||
moxaLog.rxcnt[tty->index] += total;
|
||||
if (spage == epage) {
|
||||
bufhead = readw(ofsAddr + Ofs_rxb);
|
||||
writew(spage, baseAddr + Control_reg);
|
||||
@@ -2236,8 +2096,6 @@ static int moxa_get_serial_info(struct tty_struct *tty,
|
||||
{
|
||||
struct moxa_port *info = tty->driver_data;
|
||||
|
||||
if (tty->index == MAX_PORTS)
|
||||
return -EINVAL;
|
||||
if (!info)
|
||||
return -ENODEV;
|
||||
mutex_lock(&info->port.mutex);
|
||||
@@ -2257,8 +2115,6 @@ static int moxa_set_serial_info(struct tty_struct *tty,
|
||||
struct moxa_port *info = tty->driver_data;
|
||||
unsigned int close_delay;
|
||||
|
||||
if (tty->index == MAX_PORTS)
|
||||
return -EINVAL;
|
||||
if (!info)
|
||||
return -ENODEV;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user