Commit 6ae6470b authored by Mathias Nyman's avatar Mathias Nyman Committed by Greg Kroah-Hartman
Browse files

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: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20200723144530.9992-26-mathias.nyman@linux.intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4521f161

drivers/usb/host/xhci-dbgcap.c

+6 −11
Original line number Diff line number Diff line
@@ -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;

drivers/usb/host/xhci-dbgcap.h

+6 −2
Original line number Diff line number Diff line
@@ -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);

drivers/usb/host/xhci-dbgtty.c

+9 −2
Original line number Diff line number Diff line
@@ -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;

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE