kernel: bump 4.14 to 4.14.229
[openwrt/openwrt.git] / target / linux / mediatek / patches-4.14 / 0127-usb-xhci-mtk-use-ports-count-from-xhci-in-xhci_mtk_s.patch
1 From f97aa71fe34135e7fc8da6231e61ee06f79d739d Mon Sep 17 00:00:00 2001
2 From: Chunfeng Yun <chunfeng.yun@mediatek.com>
3 Date: Fri, 13 Oct 2017 16:26:34 +0800
4 Subject: [PATCH 127/224] usb: xhci-mtk: use ports count from xhci in
5 xhci_mtk_sch_init()
6
7 Make use of ports count from xhci but not from ippc in
8 xhci_mtk_sch_init()
9
10 Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
11 Acked-by: Mathias Nyman <mathias.nyman@linux.intel.com>
12 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
13 ---
14 drivers/usb/host/xhci-mtk-sch.c | 3 ++-
15 drivers/usb/host/xhci-mtk.c | 3 ---
16 2 files changed, 2 insertions(+), 4 deletions(-)
17
18 --- a/drivers/usb/host/xhci-mtk-sch.c
19 +++ b/drivers/usb/host/xhci-mtk-sch.c
20 @@ -293,12 +293,13 @@ static bool need_bw_sch(struct usb_host_
21
22 int xhci_mtk_sch_init(struct xhci_hcd_mtk *mtk)
23 {
24 + struct xhci_hcd *xhci = hcd_to_xhci(mtk->hcd);
25 struct mu3h_sch_bw_info *sch_array;
26 int num_usb_bus;
27 int i;
28
29 /* ss IN and OUT are separated */
30 - num_usb_bus = mtk->num_u3_ports * 2 + mtk->num_u2_ports;
31 + num_usb_bus = xhci->num_usb3_ports * 2 + xhci->num_usb2_ports;
32
33 sch_array = kcalloc(num_usb_bus, sizeof(*sch_array), GFP_KERNEL);
34 if (sch_array == NULL)
35 --- a/drivers/usb/host/xhci-mtk.c
36 +++ b/drivers/usb/host/xhci-mtk.c
37 @@ -499,7 +499,6 @@ static void xhci_mtk_quirks(struct devic
38 /* called during probe() after chip reset completes */
39 static int xhci_mtk_setup(struct usb_hcd *hcd)
40 {
41 - struct xhci_hcd *xhci = hcd_to_xhci(hcd);
42 struct xhci_hcd_mtk *mtk = hcd_to_mtk(hcd);
43 int ret;
44
45 @@ -514,8 +513,6 @@ static int xhci_mtk_setup(struct usb_hcd
46 return ret;
47
48 if (usb_hcd_is_primary_hcd(hcd)) {
49 - mtk->num_u3_ports = xhci->num_usb3_ports;
50 - mtk->num_u2_ports = xhci->num_usb2_ports;
51 ret = xhci_mtk_sch_init(mtk);
52 if (ret)
53 return ret;