serdev: Add interface serdev_device_ioctl
Subsystems (3)
PATCH 1/3 serdev: Add interface serdev_device_ioctl
From: Zijun Hu <[email protected]>
For serdev_device which is mounted at virtual tty port, tty ioctl() maybe be used to make serdev_device ready to talk with tty port, so add interface serdev_device_ioctl().
--- drivers/tty/serdev/core.c | 13 +++++++++++++ drivers/tty/serdev/serdev-ttyport.c | 12 ++++++++++++ include/linux/serdev.h | 9 +++++++++ 3 files changed, 34 insertions(+)
drivers/tty/serdev/core.c +13 -0
@@ -405,6 +405,19 @@ int serdev_device_set_tiocm(struct serdev_device *serdev, int set, int clear) }EXPORT_SYMBOL_GPL (serdev_device_set_tiocm); +int serdev_device_ioctl (struct serdev_device *serdev,unsigned int cmd,unsigned long arg) +{ +struct serdev_controller *ctrl = serdev->ctrl; + +if (!ctrl) +return -ENOTTY ; +else if (!ctrl->ops->ioctl) +return -ENOSYS ; +else +return ctrl->ops->ioctl (ctrl, cmd, arg); +} +EXPORT_SYMBOL_GPL (serdev_device_ioctl); +static int serdev_drv_probe (struct device *dev) {const struct serdev_device_driver *sdrv =to_serdev_device_driver (dev->driver);
drivers/tty/serdev/serdev-ttyport.c +12 -0
@@ -247,6 +247,17 @@ static int ttyport_set_tiocm(struct serdev_controller *ctrl, unsigned int set, ureturn tty->ops->tiocmset (tty, set, clear); } +static int ttyport_ioctl (struct serdev_controller *ctrl,unsigned int cmd,unsigned long arg) +{ +struct serport *serport =serdev_controller_get_drvdata (ctrl); +struct tty_struct *tty = serport->tty; + +if (!tty->ops->ioctl) +return -ENOSYS ; + +return tty->ops->ioctl (tty, cmd, arg); +} +static const struct serdev_controller_ops ctrl_ops = { .write_buf = ttyport_write_buf, .write_flush = ttyport_write_flush,
@@ -259,6 +270,7 @@ static const struct serdev_controller_ops ctrl_ops = { .wait_until_sent = ttyport_wait_until_sent, .get_tiocm = ttyport_get_tiocm, .set_tiocm = ttyport_set_tiocm, + .ioctl = ttyport_ioctl, }; struct device *serdev_tty_port_register(struct tty_port *port,
include/linux/serdev.h +9 -0
@@ -91,6 +91,7 @@ struct serdev_controller_ops {void (*wait_until_sent)(struct serdev_controller *,long );int (*get_tiocm)(struct serdev_controller *);int (*set_tiocm)(struct serdev_controller *,unsigned int ,unsigned int ); +int (*ioctl)(struct serdev_controller *ctrl,unsigned int cmd,unsigned long arg); };/**
@@ -201,6 +202,7 @@ int serdev_device_write_buf(struct serdev_device *, const unsigned char *, size_void serdev_device_wait_until_sent (struct serdev_device *,long );int serdev_device_get_tiocm (struct serdev_device *);int serdev_device_set_tiocm (struct serdev_device *,int ,int ); +int serdev_device_ioctl (struct serdev_device *serdev,unsigned int cmd,unsigned long arg);void serdev_device_write_wakeup (struct serdev_device *);int serdev_device_write (struct serdev_device *,const unsigned char *,size_t ,long );void serdev_device_write_flush (struct serdev_device *);
@@ -254,6 +256,13 @@ static inline int serdev_device_set_tiocm(struct serdev_device *serdev, int set, {return -ENOTSUPP ; } + +static inline int serdev_device_ioctl (struct serdev_device *serdev, +unsigned int cmd,unsigned long arg) +{ +return -ENOSYS ; +} +static inline int serdev_device_write (struct serdev_device *sdev,const unsigned char *buf,size_t count,unsigned long timeout) {
Signature · 1 line
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Marcel Holtmann
maintainerHi Zijun,
Quoted 70 lines
For
serdev_devicewhich is mounted at virtual tty port, ttyioctl()maybe be used to makeserdev_deviceready to talk with tty port, so add interfaceserdev_device_ioctl().Signed-off-by Zijun Hu <[email protected]>---
drivers/tty/serdev/core.c | 13 +++++++++++++ drivers/tty/serdev/serdev-ttyport.c | 12 ++++++++++++ include/linux/serdev.h | 9 +++++++++ 3 files changed, 34 insertions(+)drivers/tty/serdev/core.c +13
-0@@ -405,6 +405,19 @@ int serdev_device_set_tiocm(struct serdev_device *serdev, int set, int clear) }EXPORT_SYMBOL_GPL (serdev_device_set_tiocm); +int serdev_device_ioctl (struct serdev_device *serdev,unsigned int cmd,unsigned long arg) +{ +struct serdev_controller *ctrl = serdev->ctrl; + +if (!ctrl) +return -ENOTTY ; +else if (!ctrl->ops->ioctl) +return -ENOSYS ; +else +return ctrl->ops->ioctl (ctrl, cmd, arg); +} +EXPORT_SYMBOL_GPL (serdev_device_ioctl); +static int serdev_drv_probe (struct device *dev) {const struct serdev_device_driver *sdrv =to_serdev_device_driver (dev->driver);drivers/tty/serdev/serdev-ttyport.c +12
-0@@ -247,6 +247,17 @@ static int ttyport_set_tiocm(struct serdev_controller *ctrl, unsigned int set, ureturn tty->ops->tiocmset (tty, set, clear); } +static int ttyport_ioctl (struct serdev_controller *ctrl,unsigned int cmd,unsigned long arg) +{ +struct serport *serport =serdev_controller_get_drvdata (ctrl); +struct tty_struct *tty = serport->tty; + +if (!tty->ops->ioctl) +return -ENOSYS ; + +return tty->ops->ioctl (tty, cmd, arg); +} +static const struct serdev_controller_ops ctrl_ops = { .write_buf = ttyport_write_buf, .write_flush = ttyport_write_flush,@@ -259,6 +270,7 @@ static const struct serdev_controller_ops ctrl_ops = { .wait_until_sent = ttyport_wait_until_sent, .get_tiocm = ttyport_get_tiocm, .set_tiocm = ttyport_set_tiocm, + .ioctl = ttyport_ioctl, }; struct device *serdev_tty_port_register(struct tty_port *port,include/linux/serdev.h +0
-0
include/linux/serdev.h struct serdev_controller_ops { · line 95
Quoted 5 lines
include/linux/serdev.h +1
-0@@ -91,6 +91,7 @@ struct serdev_controller_ops {void (*wait_until_sent)(struct serdev_controller *,long );int (*get_tiocm)(struct serdev_controller *);int (*set_tiocm)(struct serdev_controller *,unsigned int ,unsigned int ); +int (*ioctl)(struct serdev_controller *ctrl,unsigned int cmd,unsigned long arg); };
I thought the conclusion was not do this and instead have a proper Bluetooth driver. So please drop this patch.
Regards
Marcel
Greg KH
maintainerQuoted 6 lines · Zijun Hu
From: Zijun Hu <[email protected]>
For
serdev_devicewhich is mounted at virtual tty port, ttyioctl()maybe be used to makeserdev_deviceready to talk with tty port, so add interfaceserdev_device_ioctl().
Quoted 6 lines
Signed-off-by Zijun Hu <[email protected]>--- drivers/tty/serdev/core.c | 13 +++++++++++++ drivers/tty/serdev/serdev-ttyport.c | 12 ++++++++++++ include/linux/serdev.h | 9 +++++++++ 3 files changed, 34 insertions(+)
Why did I only recieve patch 1/3 here? Where are the rest of them?
And as Marcel said, I though we stated that this change was NOT needed at all. What driver needs special ioctls for bluetooth that is not already handled by the bluetooth layer?
thanks,
greg k-h