From: Amit Pundir <amit.pundir@linaro.org>
Date: Tue, 15 Nov 2016 12:46:35 +0000 (+0530)
Subject: Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
X-Git-Tag: firefly_0821_release~176^2~102
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=91e63c11a5eb143f5d737cf0380088528e7fa327;p=firefly-linux-kernel-4.4.55.git

Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

Conflicts:
* arch/arm64/include/asm/assembler.h
    Pick changes from AOSP Change-Id: I450594dc311b09b6b832b707a9abb357608cc6e4
    ("UPSTREAM: arm64: include alternative handling in dcache_by_line_op").

* drivers/android/binder.c
    Pick changes from LTS commit 14f09e8e7cd8 ("ANDROID: binder: Add strong ref checks"),
    instead of AOSP Change-Id: I66c15b066808f28bd27bfe50fd0e03ff45a09fca
    ("ANDROID: binder: Add strong ref checks").

* drivers/usb/gadget/function/u_ether.c
    Refactor throttling of highspeed IRQ logic in AOSP by adding
    a check for last queue request as intended by LTS commit
    660c04e8f174 ("usb: gadget: function: u_ether: don't starve tx request queue").
    Fixes AOSP Change-Id: I26515bfd9bbc8f7af38be7835692143f7093118a
    ("USB: gadget: u_ether: Fix data stall issue in RNDIS tethering mode").

Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
---

91e63c11a5eb143f5d737cf0380088528e7fa327
diff --cc drivers/usb/gadget/function/u_ether.c
index 74e9f5b5a45d,b644248f4b8e..e4920e5e1d64
--- a/drivers/usb/gadget/function/u_ether.c
+++ b/drivers/usb/gadget/function/u_ether.c
@@@ -741,19 -594,13 +741,20 @@@ static netdev_tx_t eth_start_xmit(struc
  
  	req->length = length;
  
 -	/* throttle high/super speed IRQ rate back slightly */
 -	if (gadget_is_dualspeed(dev->gadget))
 -		req->no_interrupt = (((dev->gadget->speed == USB_SPEED_HIGH ||
 -				       dev->gadget->speed == USB_SPEED_SUPER)) &&
 -					!list_empty(&dev->tx_reqs))
 -			? ((atomic_read(&dev->tx_qlen) % dev->qmult) != 0)
 -			: 0;
 +	/* throttle highspeed IRQ rate back slightly */
 +	if (gadget_is_dualspeed(dev->gadget) &&
- 			 (dev->gadget->speed == USB_SPEED_HIGH)) {
++			 (dev->gadget->speed == USB_SPEED_HIGH) &&
++			 !list_empty(&dev->tx_reqs)) {
 +		dev->tx_qlen++;
 +		if (dev->tx_qlen == (dev->qmult/2)) {
 +			req->no_interrupt = 0;
 +			dev->tx_qlen = 0;
 +		} else {
 +			req->no_interrupt = 1;
 +		}
 +	} else {
 +		req->no_interrupt = 0;
 +	}
  
  	retval = usb_ep_queue(in, req, GFP_ATOMIC);
  	switch (retval) {