Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c3a6fea authored by Guang Jian Zeng's avatar Guang Jian Zeng
Browse files

usb: gadget: qdss: Add support for HSIC transport 



This is a new feature to support qdss by using HSIC
transport since previous version only support BAM transport
way. Add a new data struct to support multiple transports.
To save number of resources add debug flag to enable or
disable debug interface.

Change-Id: Ia5401631b2145aaf907d2cdad25d42d22f678349
Signed-off-by: default avatarGuang Jian Zeng <gzeng@codeaurora.org>
parent a32ff686

arch/arm/mach-msm/include/mach/usb_gadget_xport.h

+5 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2011-2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2011-2014, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -92,12 +92,14 @@ static enum transport_type str_to_xport(const char *name) 
enum gadget_type {

	USB_GADGET_SERIAL,

	USB_GADGET_RMNET,

	USB_GADGET_QDSS,

};



#define NUM_QDSS_HSIC_PORTS 1

#define NUM_RMNET_HSIC_PORTS 2

#define NUM_DUN_HSIC_PORTS 2

#define NUM_PORTS (NUM_RMNET_HSIC_PORTS \

	+ NUM_DUN_HSIC_PORTS)

	+ NUM_DUN_HSIC_PORTS \

	+ NUM_QDSS_HSIC_PORTS)



#define NUM_RMNET_HSUART_PORTS 1

#define NUM_DUN_HSUART_PORTS 1

drivers/usb/gadget/android.c

+144 −4
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
 * Gadget Driver for Android

 *

 * Copyright (C) 2008 Google, Inc.

 *.Copyright (c) 2014, The Linux Foundation. All rights reserved.

 * Author: Mike Lockwood <lockwood@android.com>

 *         Benoit Goby <benoit@android.com>

 *
@@ -820,6 +821,15 @@ static char rmnet_transports[MAX_XPORT_STR_LEN]; 
/*rmnet transport name string - "rmnet_hsic[,rmnet_hsusb]" */

static char rmnet_xport_names[MAX_XPORT_STR_LEN];



/*qdss transport string format(per port):"bam [, hsic]" */

static char qdss_transports[MAX_XPORT_STR_LEN];



/*qdss transport name string - "qdss_bam [, qdss_hsic]" */

static char qdss_xport_names[MAX_XPORT_STR_LEN];



/*qdss debug interface setting 0: disable   1:enable */

static bool qdss_debug_intf;



static void rmnet_function_cleanup(struct android_usb_function *f)

{

	frmnet_cleanup();
@@ -1388,23 +1398,153 @@ static void qdss_function_cleanup(struct android_usb_function *f) 
	qdss_cleanup();

}



static int qdss_init_transports(int *portnum)

{

	char *ts_port;

	char *tname = NULL;

	char buf[MAX_XPORT_STR_LEN], *type;

	char xport_name_buf[MAX_XPORT_STR_LEN], *tn;

	int err = 0;



	strlcpy(buf, qdss_transports, sizeof(buf));

	type = strim(buf);



	strlcpy(xport_name_buf, qdss_xport_names,

			sizeof(xport_name_buf));

	tn = strim(xport_name_buf);



	pr_debug("%s: qdss_debug_intf = %d\n",

		__func__, qdss_debug_intf);



	while (type) {

		ts_port = strsep(&type, ",");

		if (ts_port) {

			if (tn)

				tname = strsep(&tn, ",");



			err = qdss_init_port(

				ts_port,

				tname,

				qdss_debug_intf);



			if (err) {

				pr_err("%s: Cannot open transport port:'%s'\n",

					__func__, ts_port);

				return err;

			}

			(*portnum)++;

		}

	}

	return err;

}



static int qdss_function_bind_config(struct android_usb_function *f,

					struct usb_configuration *c)

{

	int  err = -1;

	int i;

	int err = 0;

	static int qdss_initialized = 0, portsnum;



	err = qdss_bind_config(c, "qdss");

	if (err)

		pr_err("qdss: Cannot open channel qdss");

	if (!qdss_initialized) {

		qdss_initialized = 1;



		err = qdss_init_transports(&portsnum);

		if (err) {

			pr_err("qdss: Cannot init transports");

			goto out;

		}



		err = qdss_gport_setup();

		if (err) {

			pr_err("qdss: Cannot setup transports");

			goto out;

		}

	}



	pr_debug("%s: port number is %d\n", __func__, portsnum);



	for (i = 0; i < portsnum; i++) {

		err = qdss_bind_config(c, i);

		if (err) {

			pr_err("Could not bind qdss%u config\n", i);

			break;

		}

	}

out:

	return err;

}



static ssize_t qdss_transports_show(struct device *dev,

		struct device_attribute *attr, char *buf)

{

	return snprintf(buf, PAGE_SIZE, "%s\n", qdss_transports);

}



static ssize_t qdss_transports_store(

		struct device *device, struct device_attribute *attr,

		const char *buff, size_t size)

{

	strlcpy(qdss_transports, buff, sizeof(qdss_transports));



	return size;

}



static ssize_t qdss_xport_names_show(struct device *dev,

		struct device_attribute *attr, char *buf)

{

	return snprintf(buf, PAGE_SIZE, "%s\n", qdss_xport_names);

}



static ssize_t qdss_xport_names_store(

		struct device *device, struct device_attribute *attr,

		const char *buff, size_t size)

{

	strlcpy(qdss_xport_names, buff, sizeof(qdss_xport_names));

	return size;

}



static ssize_t qdss_debug_intf_store(

		struct device *device, struct device_attribute *attr,

		const char *buff, size_t size)

{

	strtobool(buff, &qdss_debug_intf);

	return size;

}



static ssize_t qdss_debug_intf_show(struct device *dev,

		struct device_attribute *attr, char *buf)

{

	return snprintf(buf, PAGE_SIZE, "%d\n", qdss_debug_intf);

}



static struct device_attribute dev_attr_qdss_transports =

					__ATTR(transports, S_IRUGO | S_IWUSR,

						qdss_transports_show,

						qdss_transports_store);



static struct device_attribute dev_attr_qdss_xport_names =

				__ATTR(transport_names, S_IRUGO | S_IWUSR,

				qdss_xport_names_show,

				qdss_xport_names_store);



/* 1(enable)/0(disable) the qdss debug interface */

static struct device_attribute dev_attr_qdss_debug_intf =

				__ATTR(debug_intf, S_IRUGO | S_IWUSR,

				qdss_debug_intf_show,

				qdss_debug_intf_store);



static struct device_attribute *qdss_function_attributes[] = {

					&dev_attr_qdss_transports,

					&dev_attr_qdss_xport_names,

					&dev_attr_qdss_debug_intf,

					NULL };



static struct android_usb_function qdss_function = {

	.name		= "qdss",

	.init		= qdss_function_init,

	.cleanup	= qdss_function_cleanup,

	.bind_config	= qdss_function_bind_config,

	.attributes	= qdss_function_attributes,

};



/* SERIAL */

drivers/usb/gadget/f_qdss.c

+361 −131

File changed.

Preview size limit exceeded, changes collapsed.

drivers/usb/gadget/f_qdss.h

+14 −6
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.

 * Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.



 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -18,17 +18,26 @@ 
#include <linux/usb/ch9.h>

#include <linux/usb/gadget.h>



#define NR_QDSS_PORTS 4



struct gqdss {

	struct usb_function function;

	struct usb_ep *ctrl_out;

	struct usb_ep *ctrl_in;

	struct usb_ep *data;

};



/* struct f_qdss - USB qdss function driver private structure */

struct f_qdss {

	struct usb_function function;



	struct gqdss port;

	struct usb_composite_dev *cdev;

	u8 port_num;

	u8 ctrl_iface_id;

	u8 data_iface_id;

	int usb_connected;

	bool debug_inface_enabled;

	struct usb_request *endless_req;

	struct usb_ep *ctrl_out;

	struct usb_ep *ctrl_in;

	struct usb_ep *data;

	struct usb_qdss_ch ch;

	struct list_head ctrl_read_pool;

	struct list_head ctrl_write_pool;
@@ -42,4 +51,3 @@ struct f_qdss { 
};



#endif

drivers/usb/gadget/u_ctrl_hsic.c

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2011, 2013 The Linux Foundation. All rights reserved.

/* Copyright (c) 2011, 2013-2014, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -183,7 +183,7 @@ static void ghsic_ctrl_connect_w(struct work_struct *w) 
	if (!port || !test_bit(CH_READY, &port->bridge_sts))

		return;



	pr_debug("%s: port:%p\n", __func__, port);

	pr_debug("%s: port:%p port type =%u\n", __func__, port, port->gtype);



	retval = ctrl_bridge_open(&port->brdg);

	if (retval) {