From 6ae6470bfa330d0b8892e02888bf5dac2272c28d Mon Sep 17 00:00:00 2001 From: Mathias Nyman Date: Thu, 23 Jul 2020 17:45:28 +0300 Subject: [PATCH] xhci: dbc: Add a operations structure to access driver functions Don't call dbctty driver functions directly from dbc core code. Introduce a new dbc_driver structure that contains function pointers for disconnect and configure operations. The driver (ttydbc) must provide these opeations when creating a dbc. Name the structure dbc_driver instead of dbc_ops as we plan to add more driver configureable values here, such as vid and pid. Decouples dbc and dbctty. Signed-off-by: Mathias Nyman Link: https://lore.kernel.org/r/20200723144530.9992-26-mathias.nyman@linux.intel.com Signed-off-by: Greg Kroah-Hartman --- drivers/usb/host/xhci-dbgcap.c | 17 ++++++----------- drivers/usb/host/xhci-dbgcap.h | 8 ++++++-- drivers/usb/host/xhci-dbgtty.c | 11 +++++++++-- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/drivers/usb/host/xhci-dbgcap.c b/drivers/usb/host/xhci-dbgcap.c index 99f0b42..47090bc 100644 --- a/drivers/usb/host/xhci-dbgcap.c +++ b/drivers/usb/host/xhci-dbgcap.c @@ -636,8 +636,8 @@ static void xhci_dbc_stop(struct xhci_dbc *dbc) cancel_delayed_work_sync(&dbc->event_work); - if (port->registered) - xhci_dbc_tty_unregister_device(dbc); + if (port->registered && dbc->driver->disconnect) + dbc->driver->disconnect(dbc); spin_lock_irqsave(&dbc->lock, flags); ret = xhci_do_dbc_stop(dbc); @@ -877,7 +877,6 @@ static enum evtreturn xhci_dbc_do_handle_events(struct xhci_dbc *dbc) static void xhci_dbc_handle_events(struct work_struct *work) { - int ret; enum evtreturn evtr; struct xhci_dbc *dbc; unsigned long flags; @@ -890,16 +889,12 @@ static void xhci_dbc_handle_events(struct work_struct *work) switch (evtr) { case EVT_GSER: - ret = xhci_dbc_tty_register_device(dbc); - if (ret) { - dev_err(dbc->dev, "failed to alloc tty device\n"); - break; - } - - dev_info(dbc->dev, "DbC now attached to /dev/ttyDBC0\n"); + if (dbc->driver->configure) + dbc->driver->configure(dbc); break; case EVT_DISC: - xhci_dbc_tty_unregister_device(dbc); + if (dbc->driver->disconnect) + dbc->driver->disconnect(dbc); break; case EVT_DONE: break; diff --git a/drivers/usb/host/xhci-dbgcap.h b/drivers/usb/host/xhci-dbgcap.h index e4c7c92..5018b32 100644 --- a/drivers/usb/host/xhci-dbgcap.h +++ b/drivers/usb/host/xhci-dbgcap.h @@ -112,6 +112,11 @@ struct dbc_port { bool registered; }; +struct dbc_driver { + int (*configure)(struct xhci_dbc *dbc); + void (*disconnect)(struct xhci_dbc *dbc); +}; + struct xhci_dbc { spinlock_t lock; /* device access */ struct device *dev; @@ -133,6 +138,7 @@ struct xhci_dbc { struct dbc_ep eps[2]; struct dbc_port port; + const struct dbc_driver *driver; }; struct dbc_request { @@ -192,8 +198,6 @@ int xhci_dbc_init(struct xhci_hcd *xhci); void xhci_dbc_exit(struct xhci_hcd *xhci); int xhci_dbc_tty_probe(struct xhci_hcd *xhci); void xhci_dbc_tty_remove(struct xhci_dbc *dbc); -int xhci_dbc_tty_register_device(struct xhci_dbc *dbc); -void xhci_dbc_tty_unregister_device(struct xhci_dbc *dbc); struct dbc_request *dbc_alloc_request(struct xhci_dbc *dbc, unsigned int direction, gfp_t flags); diff --git a/drivers/usb/host/xhci-dbgtty.c b/drivers/usb/host/xhci-dbgtty.c index 9acf1ef..3231cec7 100644 --- a/drivers/usb/host/xhci-dbgtty.c +++ b/drivers/usb/host/xhci-dbgtty.c @@ -455,6 +455,11 @@ void xhci_dbc_tty_unregister_device(struct xhci_dbc *dbc) xhci_dbc_free_requests(&port->write_pool); } +static const struct dbc_driver dbc_driver = { + .configure = xhci_dbc_tty_register_device, + .disconnect = xhci_dbc_tty_unregister_device, +}; + int xhci_dbc_tty_probe(struct xhci_hcd *xhci) { struct xhci_dbc *dbc = xhci->dbc; @@ -465,6 +470,8 @@ int xhci_dbc_tty_probe(struct xhci_hcd *xhci) if (status) return status; + dbc->driver = &dbc_driver; + dbc_tty_driver->driver_state = &dbc->port; return 0; @@ -481,6 +488,8 @@ out: */ void xhci_dbc_tty_remove(struct xhci_dbc *dbc) { + dbc->driver = NULL; + /* dbc_tty_exit will be called by module_exit() in the future */ dbc_tty_exit(); } @@ -523,5 +532,3 @@ static void dbc_tty_exit(void) dbc_tty_driver = NULL; } } - - -- 2.7.4