evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ANDROID: usb: gadget: f_accessory: Increase buffer size and max burst

Browse source 
Requests begin with large buffers for performance, and
the buffers are halved if allocation fails.

Bug: 67683483
Change-Id: I63d9f18385ca8e86894fd75d80c1702ee3e4e25f
Signed-off-by: Jerry Zhang <zhangjerry@google.com>
This commit is contained in:
Jerry Zhang 2017-10-11 11:26:43 -07:00 • committed by Timi
parent f634019867
commit 4b0f74a70e
1 changed files with 31 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
drivers/usb/gadget/function/f_accessory.c
View file

@ -44,6 +44,7 @@
#define MAX_INST_NAME_LEN 40 #define MAX_INST_NAME_LEN 40
#define BULK_BUFFER_SIZE 16384 #define BULK_BUFFER_SIZE 16384
#define BULK_BUFFER_INIT_SIZE 131072
#define ACC_STRING_SIZE 256 #define ACC_STRING_SIZE 256
#define PROTOCOL_VERSION 2 #define PROTOCOL_VERSION 2
@ -55,6 +56,9 @@
#define TX_REQ_MAX 4 #define TX_REQ_MAX 4
#define RX_REQ_MAX 2 #define RX_REQ_MAX 2
unsigned int acc_rx_req_len = BULK_BUFFER_INIT_SIZE;
unsigned int acc_tx_req_len = BULK_BUFFER_INIT_SIZE;
struct acc_hid_dev { struct acc_hid_dev {
struct list_head list; struct list_head list;
struct hid_device *hid; struct hid_device *hid;
@ -153,7 +157,7 @@ static struct usb_ss_ep_comp_descriptor acc_superspeed_in_comp_desc = {
.bDescriptorType = USB_DT_SS_ENDPOINT_COMP, .bDescriptorType = USB_DT_SS_ENDPOINT_COMP,
/* the following 2 values can be tweaked if necessary */ /* the following 2 values can be tweaked if necessary */
/* .bMaxBurst = 0, */ .bMaxBurst = 8,
/* .bmAttributes = 0, */ /* .bmAttributes = 0, */
}; };
@ -170,7 +174,7 @@ static struct usb_ss_ep_comp_descriptor acc_superspeed_out_comp_desc = {
.bDescriptorType = USB_DT_SS_ENDPOINT_COMP, .bDescriptorType = USB_DT_SS_ENDPOINT_COMP,
/* the following 2 values can be tweaked if necessary */ /* the following 2 values can be tweaked if necessary */
/* .bMaxBurst = 0, */ .bMaxBurst = 8,
/* .bmAttributes = 0, */ /* .bmAttributes = 0, */
}; };
@ -584,18 +588,33 @@ static int create_bulk_endpoints(struct acc_dev *dev,
ep->driver_data = dev; /* claim the endpoint */ ep->driver_data = dev; /* claim the endpoint */
dev->ep_out = ep; dev->ep_out = ep;
retry_tx_alloc:
/* now allocate requests for our endpoints */ /* now allocate requests for our endpoints */
for (i = 0; i < TX_REQ_MAX; i++) { for (i = 0; i < TX_REQ_MAX; i++) {
req = acc_request_new(dev->ep_in, BULK_BUFFER_SIZE); req = acc_request_new(dev->ep_in, acc_tx_req_len);
if (!req) if (!req) {
goto fail; if (acc_tx_req_len <= BULK_BUFFER_SIZE)
goto fail;
while ((req = req_get(dev, &dev->tx_idle)))
acc_request_free(req, dev->ep_in);
acc_tx_req_len /= 2;
goto retry_tx_alloc;
}
req->complete = acc_complete_in; req->complete = acc_complete_in;
req_put(dev, &dev->tx_idle, req); req_put(dev, &dev->tx_idle, req);
} }
retry_rx_alloc:
for (i = 0; i < RX_REQ_MAX; i++) { for (i = 0; i < RX_REQ_MAX; i++) {
req = acc_request_new(dev->ep_out, BULK_BUFFER_SIZE); req = acc_request_new(dev->ep_out, acc_rx_req_len);
if (!req) if (!req) {
goto fail; if (acc_rx_req_len <= BULK_BUFFER_SIZE)
goto fail;
for (i = 0; i < RX_REQ_MAX; i++)
acc_request_free(dev->rx_req[i], dev->ep_out);
acc_rx_req_len /= 2;
goto retry_rx_alloc;
}
req->complete = acc_complete_out; req->complete = acc_complete_out;
dev->rx_req[i] = req; dev->rx_req[i] = req;
} }
@ -626,8 +645,8 @@ static ssize_t acc_read(struct file *fp, char __user *buf,
return -ENODEV; return -ENODEV;
} }
if (count > BULK_BUFFER_SIZE) if (count > acc_rx_req_len)
count = BULK_BUFFER_SIZE; count = acc_rx_req_len;
/* we will block until we're online */ /* we will block until we're online */
pr_debug("acc_read: waiting for online\n"); pr_debug("acc_read: waiting for online\n");
@ -723,8 +742,8 @@ static ssize_t acc_write(struct file *fp, const char __user *buf,
break; break;
} }
if (count > BULK_BUFFER_SIZE) { if (count > acc_tx_req_len) {
xfer = BULK_BUFFER_SIZE; xfer = acc_tx_req_len;
/* ZLP, They will be more TX requests so not yet. */ /* ZLP, They will be more TX requests so not yet. */
req->zero = 0; req->zero = 0;
} else { } else {