From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,UNPARSEABLE_RELAY,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3EB28C433F4 for ; Wed, 29 Aug 2018 02:55:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DF3B82083B for ; Wed, 29 Aug 2018 02:55:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DF3B82083B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727655AbeH2GuO (ORCPT ); Wed, 29 Aug 2018 02:50:14 -0400 Received: from Mailgw01.mediatek.com ([1.203.163.78]:15917 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1727426AbeH2GuN (ORCPT ); Wed, 29 Aug 2018 02:50:13 -0400 X-UUID: 646716a2f34e42eea56c38e61d2ed0c4-20180829 Received: from mtkcas34.mediatek.inc [(172.27.4.250)] by mailgw01.mediatek.com (envelope-from ) (mailgw01.mediatek.com ESMTP with TLS) with ESMTP id 2035301709; Wed, 29 Aug 2018 10:55:25 +0800 Received: from mtkcas09.mediatek.inc (172.21.101.178) by MTKMBS31N2.mediatek.inc (172.27.4.87) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Wed, 29 Aug 2018 10:55:24 +0800 Received: from localhost.localdomain (10.17.3.153) by mtkcas09.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1210.3 via Frontend Transport; Wed, 29 Aug 2018 10:55:23 +0800 From: Chunfeng Yun To: Mathias Nyman CC: Greg Kroah-Hartman , Felipe Balbi , Matthias Brugger , Alan Stern , Chunfeng Yun , , , , , Subject: [PATCH 4/6] usb: xhci-mtk: improve bandwidth scheduling Date: Wed, 29 Aug 2018 10:55:16 +0800 Message-ID: X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <3bcc220aa54bfebc39cea54cd736388ad37ee0c5.1535510898.git.chunfeng.yun@mediatek.com> References: <3bcc220aa54bfebc39cea54cd736388ad37ee0c5.1535510898.git.chunfeng.yun@mediatek.com> MIME-Version: 1.0 Content-Type: text/plain X-MTK: N Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Mainly improve SuperSpeed ISOC bandwidth in last microframe, and LowSpeed/FullSpeed IN INT/ISOC bandwidth in split and idle microframes by introduing a bandwidth budget table; Signed-off-by: Chunfeng Yun --- drivers/usb/host/xhci-mtk-sch.c | 162 +++++++++++++++++++++++++--------------- drivers/usb/host/xhci-mtk.h | 2 + 2 files changed, 104 insertions(+), 60 deletions(-) diff --git a/drivers/usb/host/xhci-mtk-sch.c b/drivers/usb/host/xhci-mtk-sch.c index 057f453..7efd890 100644 --- a/drivers/usb/host/xhci-mtk-sch.c +++ b/drivers/usb/host/xhci-mtk-sch.c @@ -18,6 +18,11 @@ #define HS_BW_BOUNDARY 6144 /* usb2 spec section11.18.1: at most 188 FS bytes per microframe */ #define FS_PAYLOAD_MAX 188 +/* + * max number of microframes for split transfer, + * for fs isoc in : 1 ss + 1 idle + 7 cs + */ +#define TT_MICROFRAMES_MAX 9 /* mtk scheduler bitmasks */ #define EP_BPKTS(p) ((p) & 0x3f) @@ -64,20 +69,57 @@ static int get_bw_index(struct xhci_hcd *xhci, struct usb_device *udev, return bw_index; } +static u32 get_esit(struct xhci_ep_ctx *ep_ctx) +{ + u32 esit; + + esit = 1 << CTX_TO_EP_INTERVAL(le32_to_cpu(ep_ctx->ep_info)); + if (esit > XHCI_MTK_MAX_ESIT) + esit = XHCI_MTK_MAX_ESIT; + + return esit; +} + +static struct mu3h_sch_ep_info *create_sch_ep(struct usb_device *udev, + struct usb_host_endpoint *ep, struct xhci_ep_ctx *ep_ctx) +{ + struct mu3h_sch_ep_info *sch_ep; + u32 len_bw_budget_table; + size_t mem_size; + + if (is_fs_or_ls(udev->speed)) + len_bw_budget_table = TT_MICROFRAMES_MAX; + else if ((udev->speed == USB_SPEED_SUPER) + && usb_endpoint_xfer_isoc(&ep->desc)) + len_bw_budget_table = get_esit(ep_ctx); + else + len_bw_budget_table = 1; + + mem_size = sizeof(struct mu3h_sch_ep_info) + + len_bw_budget_table * sizeof(u32); + sch_ep = kzalloc(mem_size, GFP_KERNEL); + if (!sch_ep) + return ERR_PTR(-ENOMEM); + + sch_ep->ep = ep; + + return sch_ep; +} + static void setup_sch_info(struct usb_device *udev, struct xhci_ep_ctx *ep_ctx, struct mu3h_sch_ep_info *sch_ep) { u32 ep_type; - u32 ep_interval; - u32 max_packet_size; + u32 maxpkt; u32 max_burst; u32 mult; u32 esit_pkts; u32 max_esit_payload; + u32 *bwb_table = sch_ep->bw_budget_table; + int i; ep_type = CTX_TO_EP_TYPE(le32_to_cpu(ep_ctx->ep_info2)); - ep_interval = CTX_TO_EP_INTERVAL(le32_to_cpu(ep_ctx->ep_info)); - max_packet_size = MAX_PACKET_DECODED(le32_to_cpu(ep_ctx->ep_info2)); + maxpkt = MAX_PACKET_DECODED(le32_to_cpu(ep_ctx->ep_info2)); max_burst = CTX_TO_MAX_BURST(le32_to_cpu(ep_ctx->ep_info2)); mult = CTX_TO_EP_MULT(le32_to_cpu(ep_ctx->ep_info)); max_esit_payload = @@ -85,9 +127,10 @@ static void setup_sch_info(struct usb_device *udev, le32_to_cpu(ep_ctx->ep_info)) << 16) | CTX_TO_MAX_ESIT_PAYLOAD(le32_to_cpu(ep_ctx->tx_info)); - sch_ep->esit = 1 << ep_interval; + sch_ep->esit = get_esit(ep_ctx); sch_ep->offset = 0; sch_ep->burst_mode = 0; + sch_ep->repeat = 0; if (udev->speed == USB_SPEED_HIGH) { sch_ep->cs_count = 0; @@ -98,7 +141,6 @@ static void setup_sch_info(struct usb_device *udev, * in a interval */ sch_ep->num_budget_microframes = 1; - sch_ep->repeat = 0; /* * xHCI spec section6.2.3.4 @@ -106,26 +148,30 @@ static void setup_sch_info(struct usb_device *udev, * opportunities per microframe */ sch_ep->pkts = max_burst + 1; - sch_ep->bw_cost_per_microframe = max_packet_size * sch_ep->pkts; + sch_ep->bw_cost_per_microframe = maxpkt * sch_ep->pkts; + bwb_table[0] = sch_ep->bw_cost_per_microframe; } else if (udev->speed == USB_SPEED_SUPER) { /* usb3_r1 spec section4.4.7 & 4.4.8 */ sch_ep->cs_count = 0; + sch_ep->burst_mode = 1; /* * some device's (d)wBytesPerInterval is set as 0, * then max_esit_payload is 0, so evaluate esit_pkts from * mult and burst */ - esit_pkts = DIV_ROUND_UP(max_esit_payload, max_packet_size); + esit_pkts = DIV_ROUND_UP(max_esit_payload, maxpkt); if (esit_pkts == 0) esit_pkts = (mult + 1) * (max_burst + 1); if (ep_type == INT_IN_EP || ep_type == INT_OUT_EP) { sch_ep->pkts = esit_pkts; sch_ep->num_budget_microframes = 1; - sch_ep->repeat = 0; + bwb_table[0] = maxpkt * sch_ep->pkts; } if (ep_type == ISOC_IN_EP || ep_type == ISOC_OUT_EP) { + u32 remainder; + if (sch_ep->esit == 1) sch_ep->pkts = esit_pkts; else if (esit_pkts <= sch_ep->esit) @@ -137,43 +183,37 @@ static void setup_sch_info(struct usb_device *udev, sch_ep->num_budget_microframes = DIV_ROUND_UP(esit_pkts, sch_ep->pkts); - if (sch_ep->num_budget_microframes > 1) - sch_ep->repeat = 1; - else - sch_ep->repeat = 0; + sch_ep->repeat = !!(sch_ep->num_budget_microframes > 1); + sch_ep->bw_cost_per_microframe = maxpkt * sch_ep->pkts; + + remainder = sch_ep->bw_cost_per_microframe; + remainder *= sch_ep->num_budget_microframes; + remainder -= (maxpkt * esit_pkts); + for (i = 0; i < sch_ep->num_budget_microframes - 1; i++) + bwb_table[i] = sch_ep->bw_cost_per_microframe; + + /* last one <= bw_cost_per_microframe */ + bwb_table[i] = remainder; } - sch_ep->bw_cost_per_microframe = max_packet_size * sch_ep->pkts; } else if (is_fs_or_ls(udev->speed)) { - - /* - * usb_20 spec section11.18.4 - * assume worst cases - */ - sch_ep->repeat = 0; sch_ep->pkts = 1; /* at most one packet for each microframe */ - if (ep_type == INT_IN_EP || ep_type == INT_OUT_EP) { - sch_ep->cs_count = 3; /* at most need 3 CS*/ - /* one for SS and one for budgeted transaction */ - sch_ep->num_budget_microframes = sch_ep->cs_count + 2; - sch_ep->bw_cost_per_microframe = max_packet_size; - } - if (ep_type == ISOC_OUT_EP) { + sch_ep->cs_count = DIV_ROUND_UP(maxpkt, FS_PAYLOAD_MAX); + sch_ep->num_budget_microframes = sch_ep->cs_count + 2; + sch_ep->bw_cost_per_microframe = + (maxpkt < FS_PAYLOAD_MAX) ? maxpkt : FS_PAYLOAD_MAX; - /* - * the best case FS budget assumes that 188 FS bytes - * occur in each microframe - */ - sch_ep->num_budget_microframes = DIV_ROUND_UP( - max_packet_size, FS_PAYLOAD_MAX); - sch_ep->bw_cost_per_microframe = FS_PAYLOAD_MAX; - sch_ep->cs_count = sch_ep->num_budget_microframes; - } - if (ep_type == ISOC_IN_EP) { - /* at most need additional two CS. */ - sch_ep->cs_count = DIV_ROUND_UP( - max_packet_size, FS_PAYLOAD_MAX) + 2; - sch_ep->num_budget_microframes = sch_ep->cs_count + 2; - sch_ep->bw_cost_per_microframe = FS_PAYLOAD_MAX; + /* init budget table */ + if (ep_type == ISOC_OUT_EP) { + for (i = 0; i < sch_ep->num_budget_microframes; i++) + bwb_table[i] = sch_ep->bw_cost_per_microframe; + } else if (ep_type == INT_OUT_EP) { + /* only first one consumes bandwidth, others as zero */ + bwb_table[0] = sch_ep->bw_cost_per_microframe; + } else { /* INT_IN_EP or ISOC_IN_EP */ + bwb_table[0] = 0; /* start split */ + bwb_table[1] = 0; /* idle */ + for (i = 2; i < sch_ep->num_budget_microframes; i++) + bwb_table[i] = sch_ep->bw_cost_per_microframe; } } } @@ -184,6 +224,7 @@ static u32 get_max_bw(struct mu3h_sch_bw_info *sch_bw, { u32 num_esit; u32 max_bw = 0; + u32 bw; int i; int j; @@ -192,15 +233,17 @@ static u32 get_max_bw(struct mu3h_sch_bw_info *sch_bw, u32 base = offset + i * sch_ep->esit; for (j = 0; j < sch_ep->num_budget_microframes; j++) { - if (sch_bw->bus_bw[base + j] > max_bw) - max_bw = sch_bw->bus_bw[base + j]; + bw = sch_bw->bus_bw[base + j] + + sch_ep->bw_budget_table[j]; + if (bw > max_bw) + max_bw = bw; } } return max_bw; } static void update_bus_bw(struct mu3h_sch_bw_info *sch_bw, - struct mu3h_sch_ep_info *sch_ep, int bw_cost) + struct mu3h_sch_ep_info *sch_ep, bool used) { u32 num_esit; u32 base; @@ -210,8 +253,14 @@ static void update_bus_bw(struct mu3h_sch_bw_info *sch_bw, num_esit = XHCI_MTK_MAX_ESIT / sch_ep->esit; for (i = 0; i < num_esit; i++) { base = sch_ep->offset + i * sch_ep->esit; - for (j = 0; j < sch_ep->num_budget_microframes; j++) - sch_bw->bus_bw[base + j] += bw_cost; + for (j = 0; j < sch_ep->num_budget_microframes; j++) { + if (used) + sch_bw->bus_bw[base + j] += + sch_ep->bw_budget_table[j]; + else + sch_bw->bus_bw[base + j] -= + sch_ep->bw_budget_table[j]; + } } } @@ -220,17 +269,12 @@ static int check_sch_bw(struct usb_device *udev, { u32 offset; u32 esit; - u32 num_budget_microframes; u32 min_bw; u32 min_index; u32 worst_bw; u32 bw_boundary; - if (sch_ep->esit > XHCI_MTK_MAX_ESIT) - sch_ep->esit = XHCI_MTK_MAX_ESIT; - esit = sch_ep->esit; - num_budget_microframes = sch_ep->num_budget_microframes; /* * Search through all possible schedule microframes. @@ -239,7 +283,7 @@ static int check_sch_bw(struct usb_device *udev, min_bw = ~0; min_index = 0; for (offset = 0; offset < esit; offset++) { - if ((offset + num_budget_microframes) > sch_ep->esit) + if ((offset + sch_ep->num_budget_microframes) > sch_ep->esit) break; /* @@ -263,11 +307,11 @@ static int check_sch_bw(struct usb_device *udev, ? SS_BW_BOUNDARY : HS_BW_BOUNDARY; /* check bandwidth */ - if (min_bw + sch_ep->bw_cost_per_microframe > bw_boundary) + if (min_bw > bw_boundary) return -ERANGE; /* update bus bandwidth info */ - update_bus_bw(sch_bw, sch_ep, sch_ep->bw_cost_per_microframe); + update_bus_bw(sch_bw, sch_ep, 1); return 0; } @@ -362,8 +406,8 @@ int xhci_mtk_add_ep_quirk(struct usb_hcd *hcd, struct usb_device *udev, bw_index = get_bw_index(xhci, udev, ep); sch_bw = &sch_array[bw_index]; - sch_ep = kzalloc(sizeof(struct mu3h_sch_ep_info), GFP_NOIO); - if (!sch_ep) + sch_ep = create_sch_ep(udev, ep, ep_ctx); + if (IS_ERR_OR_NULL(sch_ep)) return -ENOMEM; setup_sch_info(udev, ep_ctx, sch_ep); @@ -376,7 +420,6 @@ int xhci_mtk_add_ep_quirk(struct usb_hcd *hcd, struct usb_device *udev, } list_add_tail(&sch_ep->endpoint, &sch_bw->bw_ep_list); - sch_ep->ep = ep; ep_ctx->reserved[0] |= cpu_to_le32(EP_BPKTS(sch_ep->pkts) | EP_BCSCOUNT(sch_ep->cs_count) | EP_BBM(sch_ep->burst_mode)); @@ -421,8 +464,7 @@ void xhci_mtk_drop_ep_quirk(struct usb_hcd *hcd, struct usb_device *udev, list_for_each_entry(sch_ep, &sch_bw->bw_ep_list, endpoint) { if (sch_ep->ep == ep) { - update_bus_bw(sch_bw, sch_ep, - -sch_ep->bw_cost_per_microframe); + update_bus_bw(sch_bw, sch_ep, 0); list_del(&sch_ep->endpoint); kfree(sch_ep); break; diff --git a/drivers/usb/host/xhci-mtk.h b/drivers/usb/host/xhci-mtk.h index cc59d80..f8864fc 100644 --- a/drivers/usb/host/xhci-mtk.h +++ b/drivers/usb/host/xhci-mtk.h @@ -57,6 +57,7 @@ struct mu3h_sch_bw_info { * times; 1: distribute the (bMaxBurst+1)*(Mult+1) packets * according to @pkts and @repeat. normal mode is used by * default + * @bw_budget_table: table to record bandwidth budget per microframe */ struct mu3h_sch_ep_info { u32 esit; @@ -73,6 +74,7 @@ struct mu3h_sch_ep_info { u32 pkts; u32 cs_count; u32 burst_mode; + u32 bw_budget_table[0]; }; #define MU3C_U3_PORT_MAX 4 -- 1.9.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chunfeng Yun Subject: [PATCH 4/6] usb: xhci-mtk: improve bandwidth scheduling Date: Wed, 29 Aug 2018 10:55:16 +0800 Message-ID: References: <3bcc220aa54bfebc39cea54cd736388ad37ee0c5.1535510898.git.chunfeng.yun@mediatek.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: In-Reply-To: <3bcc220aa54bfebc39cea54cd736388ad37ee0c5.1535510898.git.chunfeng.yun@mediatek.com> Sender: linux-kernel-owner@vger.kernel.org To: Mathias Nyman Cc: Greg Kroah-Hartman , Felipe Balbi , Matthias Brugger , Alan Stern , Chunfeng Yun , linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org List-Id: devicetree@vger.kernel.org Mainly improve SuperSpeed ISOC bandwidth in last microframe, and LowSpeed/FullSpeed IN INT/ISOC bandwidth in split and idle microframes by introduing a bandwidth budget table; Signed-off-by: Chunfeng Yun --- drivers/usb/host/xhci-mtk-sch.c | 162 +++++++++++++++++++++++++--------------- drivers/usb/host/xhci-mtk.h | 2 + 2 files changed, 104 insertions(+), 60 deletions(-) diff --git a/drivers/usb/host/xhci-mtk-sch.c b/drivers/usb/host/xhci-mtk-sch.c index 057f453..7efd890 100644 --- a/drivers/usb/host/xhci-mtk-sch.c +++ b/drivers/usb/host/xhci-mtk-sch.c @@ -18,6 +18,11 @@ #define HS_BW_BOUNDARY 6144 /* usb2 spec section11.18.1: at most 188 FS bytes per microframe */ #define FS_PAYLOAD_MAX 188 +/* + * max number of microframes for split transfer, + * for fs isoc in : 1 ss + 1 idle + 7 cs + */ +#define TT_MICROFRAMES_MAX 9 /* mtk scheduler bitmasks */ #define EP_BPKTS(p) ((p) & 0x3f) @@ -64,20 +69,57 @@ static int get_bw_index(struct xhci_hcd *xhci, struct usb_device *udev, return bw_index; } +static u32 get_esit(struct xhci_ep_ctx *ep_ctx) +{ + u32 esit; + + esit = 1 << CTX_TO_EP_INTERVAL(le32_to_cpu(ep_ctx->ep_info)); + if (esit > XHCI_MTK_MAX_ESIT) + esit = XHCI_MTK_MAX_ESIT; + + return esit; +} + +static struct mu3h_sch_ep_info *create_sch_ep(struct usb_device *udev, + struct usb_host_endpoint *ep, struct xhci_ep_ctx *ep_ctx) +{ + struct mu3h_sch_ep_info *sch_ep; + u32 len_bw_budget_table; + size_t mem_size; + + if (is_fs_or_ls(udev->speed)) + len_bw_budget_table = TT_MICROFRAMES_MAX; + else if ((udev->speed == USB_SPEED_SUPER) + && usb_endpoint_xfer_isoc(&ep->desc)) + len_bw_budget_table = get_esit(ep_ctx); + else + len_bw_budget_table = 1; + + mem_size = sizeof(struct mu3h_sch_ep_info) + + len_bw_budget_table * sizeof(u32); + sch_ep = kzalloc(mem_size, GFP_KERNEL); + if (!sch_ep) + return ERR_PTR(-ENOMEM); + + sch_ep->ep = ep; + + return sch_ep; +} + static void setup_sch_info(struct usb_device *udev, struct xhci_ep_ctx *ep_ctx, struct mu3h_sch_ep_info *sch_ep) { u32 ep_type; - u32 ep_interval; - u32 max_packet_size; + u32 maxpkt; u32 max_burst; u32 mult; u32 esit_pkts; u32 max_esit_payload; + u32 *bwb_table = sch_ep->bw_budget_table; + int i; ep_type = CTX_TO_EP_TYPE(le32_to_cpu(ep_ctx->ep_info2)); - ep_interval = CTX_TO_EP_INTERVAL(le32_to_cpu(ep_ctx->ep_info)); - max_packet_size = MAX_PACKET_DECODED(le32_to_cpu(ep_ctx->ep_info2)); + maxpkt = MAX_PACKET_DECODED(le32_to_cpu(ep_ctx->ep_info2)); max_burst = CTX_TO_MAX_BURST(le32_to_cpu(ep_ctx->ep_info2)); mult = CTX_TO_EP_MULT(le32_to_cpu(ep_ctx->ep_info)); max_esit_payload = @@ -85,9 +127,10 @@ static void setup_sch_info(struct usb_device *udev, le32_to_cpu(ep_ctx->ep_info)) << 16) | CTX_TO_MAX_ESIT_PAYLOAD(le32_to_cpu(ep_ctx->tx_info)); - sch_ep->esit = 1 << ep_interval; + sch_ep->esit = get_esit(ep_ctx); sch_ep->offset = 0; sch_ep->burst_mode = 0; + sch_ep->repeat = 0; if (udev->speed == USB_SPEED_HIGH) { sch_ep->cs_count = 0; @@ -98,7 +141,6 @@ static void setup_sch_info(struct usb_device *udev, * in a interval */ sch_ep->num_budget_microframes = 1; - sch_ep->repeat = 0; /* * xHCI spec section6.2.3.4 @@ -106,26 +148,30 @@ static void setup_sch_info(struct usb_device *udev, * opportunities per microframe */ sch_ep->pkts = max_burst + 1; - sch_ep->bw_cost_per_microframe = max_packet_size * sch_ep->pkts; + sch_ep->bw_cost_per_microframe = maxpkt * sch_ep->pkts; + bwb_table[0] = sch_ep->bw_cost_per_microframe; } else if (udev->speed == USB_SPEED_SUPER) { /* usb3_r1 spec section4.4.7 & 4.4.8 */ sch_ep->cs_count = 0; + sch_ep->burst_mode = 1; /* * some device's (d)wBytesPerInterval is set as 0, * then max_esit_payload is 0, so evaluate esit_pkts from * mult and burst */ - esit_pkts = DIV_ROUND_UP(max_esit_payload, max_packet_size); + esit_pkts = DIV_ROUND_UP(max_esit_payload, maxpkt); if (esit_pkts == 0) esit_pkts = (mult + 1) * (max_burst + 1); if (ep_type == INT_IN_EP || ep_type == INT_OUT_EP) { sch_ep->pkts = esit_pkts; sch_ep->num_budget_microframes = 1; - sch_ep->repeat = 0; + bwb_table[0] = maxpkt * sch_ep->pkts; } if (ep_type == ISOC_IN_EP || ep_type == ISOC_OUT_EP) { + u32 remainder; + if (sch_ep->esit == 1) sch_ep->pkts = esit_pkts; else if (esit_pkts <= sch_ep->esit) @@ -137,43 +183,37 @@ static void setup_sch_info(struct usb_device *udev, sch_ep->num_budget_microframes = DIV_ROUND_UP(esit_pkts, sch_ep->pkts); - if (sch_ep->num_budget_microframes > 1) - sch_ep->repeat = 1; - else - sch_ep->repeat = 0; + sch_ep->repeat = !!(sch_ep->num_budget_microframes > 1); + sch_ep->bw_cost_per_microframe = maxpkt * sch_ep->pkts; + + remainder = sch_ep->bw_cost_per_microframe; + remainder *= sch_ep->num_budget_microframes; + remainder -= (maxpkt * esit_pkts); + for (i = 0; i < sch_ep->num_budget_microframes - 1; i++) + bwb_table[i] = sch_ep->bw_cost_per_microframe; + + /* last one <= bw_cost_per_microframe */ + bwb_table[i] = remainder; } - sch_ep->bw_cost_per_microframe = max_packet_size * sch_ep->pkts; } else if (is_fs_or_ls(udev->speed)) { - - /* - * usb_20 spec section11.18.4 - * assume worst cases - */ - sch_ep->repeat = 0; sch_ep->pkts = 1; /* at most one packet for each microframe */ - if (ep_type == INT_IN_EP || ep_type == INT_OUT_EP) { - sch_ep->cs_count = 3; /* at most need 3 CS*/ - /* one for SS and one for budgeted transaction */ - sch_ep->num_budget_microframes = sch_ep->cs_count + 2; - sch_ep->bw_cost_per_microframe = max_packet_size; - } - if (ep_type == ISOC_OUT_EP) { + sch_ep->cs_count = DIV_ROUND_UP(maxpkt, FS_PAYLOAD_MAX); + sch_ep->num_budget_microframes = sch_ep->cs_count + 2; + sch_ep->bw_cost_per_microframe = + (maxpkt < FS_PAYLOAD_MAX) ? maxpkt : FS_PAYLOAD_MAX; - /* - * the best case FS budget assumes that 188 FS bytes - * occur in each microframe - */ - sch_ep->num_budget_microframes = DIV_ROUND_UP( - max_packet_size, FS_PAYLOAD_MAX); - sch_ep->bw_cost_per_microframe = FS_PAYLOAD_MAX; - sch_ep->cs_count = sch_ep->num_budget_microframes; - } - if (ep_type == ISOC_IN_EP) { - /* at most need additional two CS. */ - sch_ep->cs_count = DIV_ROUND_UP( - max_packet_size, FS_PAYLOAD_MAX) + 2; - sch_ep->num_budget_microframes = sch_ep->cs_count + 2; - sch_ep->bw_cost_per_microframe = FS_PAYLOAD_MAX; + /* init budget table */ + if (ep_type == ISOC_OUT_EP) { + for (i = 0; i < sch_ep->num_budget_microframes; i++) + bwb_table[i] = sch_ep->bw_cost_per_microframe; + } else if (ep_type == INT_OUT_EP) { + /* only first one consumes bandwidth, others as zero */ + bwb_table[0] = sch_ep->bw_cost_per_microframe; + } else { /* INT_IN_EP or ISOC_IN_EP */ + bwb_table[0] = 0; /* start split */ + bwb_table[1] = 0; /* idle */ + for (i = 2; i < sch_ep->num_budget_microframes; i++) + bwb_table[i] = sch_ep->bw_cost_per_microframe; } } } @@ -184,6 +224,7 @@ static u32 get_max_bw(struct mu3h_sch_bw_info *sch_bw, { u32 num_esit; u32 max_bw = 0; + u32 bw; int i; int j; @@ -192,15 +233,17 @@ static u32 get_max_bw(struct mu3h_sch_bw_info *sch_bw, u32 base = offset + i * sch_ep->esit; for (j = 0; j < sch_ep->num_budget_microframes; j++) { - if (sch_bw->bus_bw[base + j] > max_bw) - max_bw = sch_bw->bus_bw[base + j]; + bw = sch_bw->bus_bw[base + j] + + sch_ep->bw_budget_table[j]; + if (bw > max_bw) + max_bw = bw; } } return max_bw; } static void update_bus_bw(struct mu3h_sch_bw_info *sch_bw, - struct mu3h_sch_ep_info *sch_ep, int bw_cost) + struct mu3h_sch_ep_info *sch_ep, bool used) { u32 num_esit; u32 base; @@ -210,8 +253,14 @@ static void update_bus_bw(struct mu3h_sch_bw_info *sch_bw, num_esit = XHCI_MTK_MAX_ESIT / sch_ep->esit; for (i = 0; i < num_esit; i++) { base = sch_ep->offset + i * sch_ep->esit; - for (j = 0; j < sch_ep->num_budget_microframes; j++) - sch_bw->bus_bw[base + j] += bw_cost; + for (j = 0; j < sch_ep->num_budget_microframes; j++) { + if (used) + sch_bw->bus_bw[base + j] += + sch_ep->bw_budget_table[j]; + else + sch_bw->bus_bw[base + j] -= + sch_ep->bw_budget_table[j]; + } } } @@ -220,17 +269,12 @@ static int check_sch_bw(struct usb_device *udev, { u32 offset; u32 esit; - u32 num_budget_microframes; u32 min_bw; u32 min_index; u32 worst_bw; u32 bw_boundary; - if (sch_ep->esit > XHCI_MTK_MAX_ESIT) - sch_ep->esit = XHCI_MTK_MAX_ESIT; - esit = sch_ep->esit; - num_budget_microframes = sch_ep->num_budget_microframes; /* * Search through all possible schedule microframes. @@ -239,7 +283,7 @@ static int check_sch_bw(struct usb_device *udev, min_bw = ~0; min_index = 0; for (offset = 0; offset < esit; offset++) { - if ((offset + num_budget_microframes) > sch_ep->esit) + if ((offset + sch_ep->num_budget_microframes) > sch_ep->esit) break; /* @@ -263,11 +307,11 @@ static int check_sch_bw(struct usb_device *udev, ? SS_BW_BOUNDARY : HS_BW_BOUNDARY; /* check bandwidth */ - if (min_bw + sch_ep->bw_cost_per_microframe > bw_boundary) + if (min_bw > bw_boundary) return -ERANGE; /* update bus bandwidth info */ - update_bus_bw(sch_bw, sch_ep, sch_ep->bw_cost_per_microframe); + update_bus_bw(sch_bw, sch_ep, 1); return 0; } @@ -362,8 +406,8 @@ int xhci_mtk_add_ep_quirk(struct usb_hcd *hcd, struct usb_device *udev, bw_index = get_bw_index(xhci, udev, ep); sch_bw = &sch_array[bw_index]; - sch_ep = kzalloc(sizeof(struct mu3h_sch_ep_info), GFP_NOIO); - if (!sch_ep) + sch_ep = create_sch_ep(udev, ep, ep_ctx); + if (IS_ERR_OR_NULL(sch_ep)) return -ENOMEM; setup_sch_info(udev, ep_ctx, sch_ep); @@ -376,7 +420,6 @@ int xhci_mtk_add_ep_quirk(struct usb_hcd *hcd, struct usb_device *udev, } list_add_tail(&sch_ep->endpoint, &sch_bw->bw_ep_list); - sch_ep->ep = ep; ep_ctx->reserved[0] |= cpu_to_le32(EP_BPKTS(sch_ep->pkts) | EP_BCSCOUNT(sch_ep->cs_count) | EP_BBM(sch_ep->burst_mode)); @@ -421,8 +464,7 @@ void xhci_mtk_drop_ep_quirk(struct usb_hcd *hcd, struct usb_device *udev, list_for_each_entry(sch_ep, &sch_bw->bw_ep_list, endpoint) { if (sch_ep->ep == ep) { - update_bus_bw(sch_bw, sch_ep, - -sch_ep->bw_cost_per_microframe); + update_bus_bw(sch_bw, sch_ep, 0); list_del(&sch_ep->endpoint); kfree(sch_ep); break; diff --git a/drivers/usb/host/xhci-mtk.h b/drivers/usb/host/xhci-mtk.h index cc59d80..f8864fc 100644 --- a/drivers/usb/host/xhci-mtk.h +++ b/drivers/usb/host/xhci-mtk.h @@ -57,6 +57,7 @@ struct mu3h_sch_bw_info { * times; 1: distribute the (bMaxBurst+1)*(Mult+1) packets * according to @pkts and @repeat. normal mode is used by * default + * @bw_budget_table: table to record bandwidth budget per microframe */ struct mu3h_sch_ep_info { u32 esit; @@ -73,6 +74,7 @@ struct mu3h_sch_ep_info { u32 pkts; u32 cs_count; u32 burst_mode; + u32 bw_budget_table[0]; }; #define MU3C_U3_PORT_MAX 4 -- 1.9.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [4/6] usb: xhci-mtk: improve bandwidth scheduling From: Chunfeng Yun Message-Id: Date: Wed, 29 Aug 2018 10:55:16 +0800 To: Mathias Nyman Cc: Greg Kroah-Hartman , Felipe Balbi , Matthias Brugger , Alan Stern , Chunfeng Yun , linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org List-ID: TWFpbmx5IGltcHJvdmUgU3VwZXJTcGVlZCBJU09DIGJhbmR3aWR0aCBpbiBsYXN0IG1pY3JvZnJh bWUsCmFuZCBMb3dTcGVlZC9GdWxsU3BlZWQgSU4gSU5UL0lTT0MgYmFuZHdpZHRoIGluIHNwbGl0 IGFuZAppZGxlIG1pY3JvZnJhbWVzIGJ5IGludHJvZHVpbmcgYSBiYW5kd2lkdGggYnVkZ2V0IHRh YmxlOwoKU2lnbmVkLW9mZi1ieTogQ2h1bmZlbmcgWXVuIDxjaHVuZmVuZy55dW5AbWVkaWF0ZWsu Y29tPgotLS0KIGRyaXZlcnMvdXNiL2hvc3QveGhjaS1tdGstc2NoLmMgfCAxNjIgKysrKysrKysr KysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy91c2IvaG9zdC94aGNpLW10 ay5oICAgICB8ICAgMiArCiAyIGZpbGVzIGNoYW5nZWQsIDEwNCBpbnNlcnRpb25zKCspLCA2MCBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL3VzYi9ob3N0L3hoY2ktbXRrLXNjaC5j IGIvZHJpdmVycy91c2IvaG9zdC94aGNpLW10ay1zY2guYwppbmRleCAwNTdmNDUzLi43ZWZkODkw IDEwMDY0NAotLS0gYS9kcml2ZXJzL3VzYi9ob3N0L3hoY2ktbXRrLXNjaC5jCisrKyBiL2RyaXZl cnMvdXNiL2hvc3QveGhjaS1tdGstc2NoLmMKQEAgLTE4LDYgKzE4LDExIEBACiAjZGVmaW5lIEhT X0JXX0JPVU5EQVJZCTYxNDQKIC8qIHVzYjIgc3BlYyBzZWN0aW9uMTEuMTguMTogYXQgbW9zdCAx ODggRlMgYnl0ZXMgcGVyIG1pY3JvZnJhbWUgKi8KICNkZWZpbmUgRlNfUEFZTE9BRF9NQVggMTg4 CisvKgorICogbWF4IG51bWJlciBvZiBtaWNyb2ZyYW1lcyBmb3Igc3BsaXQgdHJhbnNmZXIsCisg KiBmb3IgZnMgaXNvYyBpbiA6IDEgc3MgKyAxIGlkbGUgKyA3IGNzCisgKi8KKyNkZWZpbmUgVFRf TUlDUk9GUkFNRVNfTUFYIDkKIAogLyogbXRrIHNjaGVkdWxlciBiaXRtYXNrcyAqLwogI2RlZmlu ZSBFUF9CUEtUUyhwKQkoKHApICYgMHgzZikKQEAgLTY0LDIwICs2OSw1NyBAQCBzdGF0aWMgaW50 IGdldF9id19pbmRleChzdHJ1Y3QgeGhjaV9oY2QgKnhoY2ksIHN0cnVjdCB1c2JfZGV2aWNlICp1 ZGV2LAogCXJldHVybiBid19pbmRleDsKIH0KIAorc3RhdGljIHUzMiBnZXRfZXNpdChzdHJ1Y3Qg eGhjaV9lcF9jdHggKmVwX2N0eCkKK3sKKwl1MzIgZXNpdDsKKworCWVzaXQgPSAxIDw8IENUWF9U T19FUF9JTlRFUlZBTChsZTMyX3RvX2NwdShlcF9jdHgtPmVwX2luZm8pKTsKKwlpZiAoZXNpdCA+ IFhIQ0lfTVRLX01BWF9FU0lUKQorCQllc2l0ID0gWEhDSV9NVEtfTUFYX0VTSVQ7CisKKwlyZXR1 cm4gZXNpdDsKK30KKworc3RhdGljIHN0cnVjdCBtdTNoX3NjaF9lcF9pbmZvICpjcmVhdGVfc2No X2VwKHN0cnVjdCB1c2JfZGV2aWNlICp1ZGV2LAorCXN0cnVjdCB1c2JfaG9zdF9lbmRwb2ludCAq ZXAsIHN0cnVjdCB4aGNpX2VwX2N0eCAqZXBfY3R4KQoreworCXN0cnVjdCBtdTNoX3NjaF9lcF9p bmZvICpzY2hfZXA7CisJdTMyIGxlbl9id19idWRnZXRfdGFibGU7CisJc2l6ZV90IG1lbV9zaXpl OworCisJaWYgKGlzX2ZzX29yX2xzKHVkZXYtPnNwZWVkKSkKKwkJbGVuX2J3X2J1ZGdldF90YWJs ZSA9IFRUX01JQ1JPRlJBTUVTX01BWDsKKwllbHNlIGlmICgodWRldi0+c3BlZWQgPT0gVVNCX1NQ RUVEX1NVUEVSKQorCQkJJiYgdXNiX2VuZHBvaW50X3hmZXJfaXNvYygmZXAtPmRlc2MpKQorCQls ZW5fYndfYnVkZ2V0X3RhYmxlID0gZ2V0X2VzaXQoZXBfY3R4KTsKKwllbHNlCisJCWxlbl9id19i dWRnZXRfdGFibGUgPSAxOworCisJbWVtX3NpemUgPSBzaXplb2Yoc3RydWN0IG11M2hfc2NoX2Vw X2luZm8pICsKKwkJCWxlbl9id19idWRnZXRfdGFibGUgKiBzaXplb2YodTMyKTsKKwlzY2hfZXAg PSBremFsbG9jKG1lbV9zaXplLCBHRlBfS0VSTkVMKTsKKwlpZiAoIXNjaF9lcCkKKwkJcmV0dXJu IEVSUl9QVFIoLUVOT01FTSk7CisKKwlzY2hfZXAtPmVwID0gZXA7CisKKwlyZXR1cm4gc2NoX2Vw OworfQorCiBzdGF0aWMgdm9pZCBzZXR1cF9zY2hfaW5mbyhzdHJ1Y3QgdXNiX2RldmljZSAqdWRl diwKIAkJc3RydWN0IHhoY2lfZXBfY3R4ICplcF9jdHgsIHN0cnVjdCBtdTNoX3NjaF9lcF9pbmZv ICpzY2hfZXApCiB7CiAJdTMyIGVwX3R5cGU7Ci0JdTMyIGVwX2ludGVydmFsOwotCXUzMiBtYXhf cGFja2V0X3NpemU7CisJdTMyIG1heHBrdDsKIAl1MzIgbWF4X2J1cnN0OwogCXUzMiBtdWx0Owog CXUzMiBlc2l0X3BrdHM7CiAJdTMyIG1heF9lc2l0X3BheWxvYWQ7CisJdTMyICpid2JfdGFibGUg PSBzY2hfZXAtPmJ3X2J1ZGdldF90YWJsZTsKKwlpbnQgaTsKIAogCWVwX3R5cGUgPSBDVFhfVE9f RVBfVFlQRShsZTMyX3RvX2NwdShlcF9jdHgtPmVwX2luZm8yKSk7Ci0JZXBfaW50ZXJ2YWwgPSBD VFhfVE9fRVBfSU5URVJWQUwobGUzMl90b19jcHUoZXBfY3R4LT5lcF9pbmZvKSk7Ci0JbWF4X3Bh Y2tldF9zaXplID0gTUFYX1BBQ0tFVF9ERUNPREVEKGxlMzJfdG9fY3B1KGVwX2N0eC0+ZXBfaW5m bzIpKTsKKwltYXhwa3QgPSBNQVhfUEFDS0VUX0RFQ09ERUQobGUzMl90b19jcHUoZXBfY3R4LT5l cF9pbmZvMikpOwogCW1heF9idXJzdCA9IENUWF9UT19NQVhfQlVSU1QobGUzMl90b19jcHUoZXBf Y3R4LT5lcF9pbmZvMikpOwogCW11bHQgPSBDVFhfVE9fRVBfTVVMVChsZTMyX3RvX2NwdShlcF9j dHgtPmVwX2luZm8pKTsKIAltYXhfZXNpdF9wYXlsb2FkID0KQEAgLTg1LDkgKzEyNywxMCBAQCBz dGF0aWMgdm9pZCBzZXR1cF9zY2hfaW5mbyhzdHJ1Y3QgdXNiX2RldmljZSAqdWRldiwKIAkJCWxl MzJfdG9fY3B1KGVwX2N0eC0+ZXBfaW5mbykpIDw8IDE2KSB8CiAJCSBDVFhfVE9fTUFYX0VTSVRf UEFZTE9BRChsZTMyX3RvX2NwdShlcF9jdHgtPnR4X2luZm8pKTsKIAotCXNjaF9lcC0+ZXNpdCA9 IDEgPDwgZXBfaW50ZXJ2YWw7CisJc2NoX2VwLT5lc2l0ID0gZ2V0X2VzaXQoZXBfY3R4KTsKIAlz Y2hfZXAtPm9mZnNldCA9IDA7CiAJc2NoX2VwLT5idXJzdF9tb2RlID0gMDsKKwlzY2hfZXAtPnJl cGVhdCA9IDA7CiAKIAlpZiAodWRldi0+c3BlZWQgPT0gVVNCX1NQRUVEX0hJR0gpIHsKIAkJc2No X2VwLT5jc19jb3VudCA9IDA7CkBAIC05OCw3ICsxNDEsNiBAQCBzdGF0aWMgdm9pZCBzZXR1cF9z Y2hfaW5mbyhzdHJ1Y3QgdXNiX2RldmljZSAqdWRldiwKIAkJICogaW4gYSBpbnRlcnZhbAogCQkg Ki8KIAkJc2NoX2VwLT5udW1fYnVkZ2V0X21pY3JvZnJhbWVzID0gMTsKLQkJc2NoX2VwLT5yZXBl YXQgPSAwOwogCiAJCS8qCiAJCSAqIHhIQ0kgc3BlYyBzZWN0aW9uNi4yLjMuNApAQCAtMTA2LDI2 ICsxNDgsMzAgQEAgc3RhdGljIHZvaWQgc2V0dXBfc2NoX2luZm8oc3RydWN0IHVzYl9kZXZpY2Ug KnVkZXYsCiAJCSAqIG9wcG9ydHVuaXRpZXMgcGVyIG1pY3JvZnJhbWUKIAkJICovCiAJCXNjaF9l cC0+cGt0cyA9IG1heF9idXJzdCArIDE7Ci0JCXNjaF9lcC0+YndfY29zdF9wZXJfbWljcm9mcmFt ZSA9IG1heF9wYWNrZXRfc2l6ZSAqIHNjaF9lcC0+cGt0czsKKwkJc2NoX2VwLT5id19jb3N0X3Bl cl9taWNyb2ZyYW1lID0gbWF4cGt0ICogc2NoX2VwLT5wa3RzOworCQlid2JfdGFibGVbMF0gPSBz Y2hfZXAtPmJ3X2Nvc3RfcGVyX21pY3JvZnJhbWU7CiAJfSBlbHNlIGlmICh1ZGV2LT5zcGVlZCA9 PSBVU0JfU1BFRURfU1VQRVIpIHsKIAkJLyogdXNiM19yMSBzcGVjIHNlY3Rpb240LjQuNyAmIDQu NC44ICovCiAJCXNjaF9lcC0+Y3NfY291bnQgPSAwOworCQlzY2hfZXAtPmJ1cnN0X21vZGUgPSAx OwogCQkvKgogCQkgKiBzb21lIGRldmljZSdzIChkKXdCeXRlc1BlckludGVydmFsIGlzIHNldCBh cyAwLAogCQkgKiB0aGVuIG1heF9lc2l0X3BheWxvYWQgaXMgMCwgc28gZXZhbHVhdGUgZXNpdF9w a3RzIGZyb20KIAkJICogbXVsdCBhbmQgYnVyc3QKIAkJICovCi0JCWVzaXRfcGt0cyA9IERJVl9S T1VORF9VUChtYXhfZXNpdF9wYXlsb2FkLCBtYXhfcGFja2V0X3NpemUpOworCQllc2l0X3BrdHMg PSBESVZfUk9VTkRfVVAobWF4X2VzaXRfcGF5bG9hZCwgbWF4cGt0KTsKIAkJaWYgKGVzaXRfcGt0 cyA9PSAwKQogCQkJZXNpdF9wa3RzID0gKG11bHQgKyAxKSAqIChtYXhfYnVyc3QgKyAxKTsKIAog CQlpZiAoZXBfdHlwZSA9PSBJTlRfSU5fRVAgfHwgZXBfdHlwZSA9PSBJTlRfT1VUX0VQKSB7CiAJ CQlzY2hfZXAtPnBrdHMgPSBlc2l0X3BrdHM7CiAJCQlzY2hfZXAtPm51bV9idWRnZXRfbWljcm9m cmFtZXMgPSAxOwotCQkJc2NoX2VwLT5yZXBlYXQgPSAwOworCQkJYndiX3RhYmxlWzBdID0gbWF4 cGt0ICogc2NoX2VwLT5wa3RzOwogCQl9CiAKIAkJaWYgKGVwX3R5cGUgPT0gSVNPQ19JTl9FUCB8 fCBlcF90eXBlID09IElTT0NfT1VUX0VQKSB7CisJCQl1MzIgcmVtYWluZGVyOworCiAJCQlpZiAo c2NoX2VwLT5lc2l0ID09IDEpCiAJCQkJc2NoX2VwLT5wa3RzID0gZXNpdF9wa3RzOwogCQkJZWxz ZSBpZiAoZXNpdF9wa3RzIDw9IHNjaF9lcC0+ZXNpdCkKQEAgLTEzNyw0MyArMTgzLDM3IEBAIHN0 YXRpYyB2b2lkIHNldHVwX3NjaF9pbmZvKHN0cnVjdCB1c2JfZGV2aWNlICp1ZGV2LAogCQkJc2No X2VwLT5udW1fYnVkZ2V0X21pY3JvZnJhbWVzID0KIAkJCQlESVZfUk9VTkRfVVAoZXNpdF9wa3Rz LCBzY2hfZXAtPnBrdHMpOwogCi0JCQlpZiAoc2NoX2VwLT5udW1fYnVkZ2V0X21pY3JvZnJhbWVz ID4gMSkKLQkJCQlzY2hfZXAtPnJlcGVhdCA9IDE7Ci0JCQllbHNlCi0JCQkJc2NoX2VwLT5yZXBl YXQgPSAwOworCQkJc2NoX2VwLT5yZXBlYXQgPSAhIShzY2hfZXAtPm51bV9idWRnZXRfbWljcm9m cmFtZXMgPiAxKTsKKwkJCXNjaF9lcC0+YndfY29zdF9wZXJfbWljcm9mcmFtZSA9IG1heHBrdCAq IHNjaF9lcC0+cGt0czsKKworCQkJcmVtYWluZGVyID0gc2NoX2VwLT5id19jb3N0X3Blcl9taWNy b2ZyYW1lOworCQkJcmVtYWluZGVyICo9IHNjaF9lcC0+bnVtX2J1ZGdldF9taWNyb2ZyYW1lczsK KwkJCXJlbWFpbmRlciAtPSAobWF4cGt0ICogZXNpdF9wa3RzKTsKKwkJCWZvciAoaSA9IDA7IGkg PCBzY2hfZXAtPm51bV9idWRnZXRfbWljcm9mcmFtZXMgLSAxOyBpKyspCisJCQkJYndiX3RhYmxl W2ldID0gc2NoX2VwLT5id19jb3N0X3Blcl9taWNyb2ZyYW1lOworCisJCQkvKiBsYXN0IG9uZSA8 PSBid19jb3N0X3Blcl9taWNyb2ZyYW1lICovCisJCQlid2JfdGFibGVbaV0gPSByZW1haW5kZXI7 CiAJCX0KLQkJc2NoX2VwLT5id19jb3N0X3Blcl9taWNyb2ZyYW1lID0gbWF4X3BhY2tldF9zaXpl ICogc2NoX2VwLT5wa3RzOwogCX0gZWxzZSBpZiAoaXNfZnNfb3JfbHModWRldi0+c3BlZWQpKSB7 Ci0KLQkJLyoKLQkJICogdXNiXzIwIHNwZWMgc2VjdGlvbjExLjE4LjQKLQkJICogYXNzdW1lIHdv cnN0IGNhc2VzCi0JCSAqLwotCQlzY2hfZXAtPnJlcGVhdCA9IDA7CiAJCXNjaF9lcC0+cGt0cyA9 IDE7IC8qIGF0IG1vc3Qgb25lIHBhY2tldCBmb3IgZWFjaCBtaWNyb2ZyYW1lICovCi0JCWlmIChl cF90eXBlID09IElOVF9JTl9FUCB8fCBlcF90eXBlID09IElOVF9PVVRfRVApIHsKLQkJCXNjaF9l cC0+Y3NfY291bnQgPSAzOyAvKiBhdCBtb3N0IG5lZWQgMyBDUyovCi0JCQkvKiBvbmUgZm9yIFNT IGFuZCBvbmUgZm9yIGJ1ZGdldGVkIHRyYW5zYWN0aW9uICovCi0JCQlzY2hfZXAtPm51bV9idWRn ZXRfbWljcm9mcmFtZXMgPSBzY2hfZXAtPmNzX2NvdW50ICsgMjsKLQkJCXNjaF9lcC0+YndfY29z dF9wZXJfbWljcm9mcmFtZSA9IG1heF9wYWNrZXRfc2l6ZTsKLQkJfQotCQlpZiAoZXBfdHlwZSA9 PSBJU09DX09VVF9FUCkgeworCQlzY2hfZXAtPmNzX2NvdW50ID0gRElWX1JPVU5EX1VQKG1heHBr dCwgRlNfUEFZTE9BRF9NQVgpOworCQlzY2hfZXAtPm51bV9idWRnZXRfbWljcm9mcmFtZXMgPSBz Y2hfZXAtPmNzX2NvdW50ICsgMjsKKwkJc2NoX2VwLT5id19jb3N0X3Blcl9taWNyb2ZyYW1lID0K KwkJCShtYXhwa3QgPCBGU19QQVlMT0FEX01BWCkgPyBtYXhwa3QgOiBGU19QQVlMT0FEX01BWDsK IAotCQkJLyoKLQkJCSAqIHRoZSBiZXN0IGNhc2UgRlMgYnVkZ2V0IGFzc3VtZXMgdGhhdCAxODgg RlMgYnl0ZXMKLQkJCSAqIG9jY3VyIGluIGVhY2ggbWljcm9mcmFtZQotCQkJICovCi0JCQlzY2hf ZXAtPm51bV9idWRnZXRfbWljcm9mcmFtZXMgPSBESVZfUk9VTkRfVVAoCi0JCQkJbWF4X3BhY2tl dF9zaXplLCBGU19QQVlMT0FEX01BWCk7Ci0JCQlzY2hfZXAtPmJ3X2Nvc3RfcGVyX21pY3JvZnJh bWUgPSBGU19QQVlMT0FEX01BWDsKLQkJCXNjaF9lcC0+Y3NfY291bnQgPSBzY2hfZXAtPm51bV9i dWRnZXRfbWljcm9mcmFtZXM7Ci0JCX0KLQkJaWYgKGVwX3R5cGUgPT0gSVNPQ19JTl9FUCkgewot CQkJLyogYXQgbW9zdCBuZWVkIGFkZGl0aW9uYWwgdHdvIENTLiAqLwotCQkJc2NoX2VwLT5jc19j b3VudCA9IERJVl9ST1VORF9VUCgKLQkJCQltYXhfcGFja2V0X3NpemUsIEZTX1BBWUxPQURfTUFY KSArIDI7Ci0JCQlzY2hfZXAtPm51bV9idWRnZXRfbWljcm9mcmFtZXMgPSBzY2hfZXAtPmNzX2Nv dW50ICsgMjsKLQkJCXNjaF9lcC0+YndfY29zdF9wZXJfbWljcm9mcmFtZSA9IEZTX1BBWUxPQURf TUFYOworCQkvKiBpbml0IGJ1ZGdldCB0YWJsZSAqLworCQlpZiAoZXBfdHlwZSA9PSBJU09DX09V VF9FUCkgeworCQkJZm9yIChpID0gMDsgaSA8IHNjaF9lcC0+bnVtX2J1ZGdldF9taWNyb2ZyYW1l czsgaSsrKQorCQkJCWJ3Yl90YWJsZVtpXSA9CXNjaF9lcC0+YndfY29zdF9wZXJfbWljcm9mcmFt ZTsKKwkJfSBlbHNlIGlmIChlcF90eXBlID09IElOVF9PVVRfRVApIHsKKwkJCS8qIG9ubHkgZmly c3Qgb25lIGNvbnN1bWVzIGJhbmR3aWR0aCwgb3RoZXJzIGFzIHplcm8gKi8KKwkJCWJ3Yl90YWJs ZVswXSA9IHNjaF9lcC0+YndfY29zdF9wZXJfbWljcm9mcmFtZTsKKwkJfSBlbHNlIHsgLyogSU5U X0lOX0VQIG9yIElTT0NfSU5fRVAgKi8KKwkJCWJ3Yl90YWJsZVswXSA9IDA7IC8qIHN0YXJ0IHNw bGl0ICovCisJCQlid2JfdGFibGVbMV0gPSAwOyAvKiBpZGxlICovCisJCQlmb3IgKGkgPSAyOyBp IDwgc2NoX2VwLT5udW1fYnVkZ2V0X21pY3JvZnJhbWVzOyBpKyspCisJCQkJYndiX3RhYmxlW2ld ID0Jc2NoX2VwLT5id19jb3N0X3Blcl9taWNyb2ZyYW1lOwogCQl9CiAJfQogfQpAQCAtMTg0LDYg KzIyNCw3IEBAIHN0YXRpYyB1MzIgZ2V0X21heF9idyhzdHJ1Y3QgbXUzaF9zY2hfYndfaW5mbyAq c2NoX2J3LAogewogCXUzMiBudW1fZXNpdDsKIAl1MzIgbWF4X2J3ID0gMDsKKwl1MzIgYnc7CiAJ aW50IGk7CiAJaW50IGo7CiAKQEAgLTE5MiwxNSArMjMzLDE3IEBAIHN0YXRpYyB1MzIgZ2V0X21h eF9idyhzdHJ1Y3QgbXUzaF9zY2hfYndfaW5mbyAqc2NoX2J3LAogCQl1MzIgYmFzZSA9IG9mZnNl dCArIGkgKiBzY2hfZXAtPmVzaXQ7CiAKIAkJZm9yIChqID0gMDsgaiA8IHNjaF9lcC0+bnVtX2J1 ZGdldF9taWNyb2ZyYW1lczsgaisrKSB7Ci0JCQlpZiAoc2NoX2J3LT5idXNfYndbYmFzZSArIGpd ID4gbWF4X2J3KQotCQkJCW1heF9idyA9IHNjaF9idy0+YnVzX2J3W2Jhc2UgKyBqXTsKKwkJCWJ3 ID0gc2NoX2J3LT5idXNfYndbYmFzZSArIGpdICsKKwkJCQkJc2NoX2VwLT5id19idWRnZXRfdGFi bGVbal07CisJCQlpZiAoYncgPiBtYXhfYncpCisJCQkJbWF4X2J3ID0gYnc7CiAJCX0KIAl9CiAJ cmV0dXJuIG1heF9idzsKIH0KIAogc3RhdGljIHZvaWQgdXBkYXRlX2J1c19idyhzdHJ1Y3QgbXUz aF9zY2hfYndfaW5mbyAqc2NoX2J3LAotCXN0cnVjdCBtdTNoX3NjaF9lcF9pbmZvICpzY2hfZXAs IGludCBid19jb3N0KQorCXN0cnVjdCBtdTNoX3NjaF9lcF9pbmZvICpzY2hfZXAsIGJvb2wgdXNl ZCkKIHsKIAl1MzIgbnVtX2VzaXQ7CiAJdTMyIGJhc2U7CkBAIC0yMTAsOCArMjUzLDE0IEBAIHN0 YXRpYyB2b2lkIHVwZGF0ZV9idXNfYncoc3RydWN0IG11M2hfc2NoX2J3X2luZm8gKnNjaF9idywK IAludW1fZXNpdCA9IFhIQ0lfTVRLX01BWF9FU0lUIC8gc2NoX2VwLT5lc2l0OwogCWZvciAoaSA9 IDA7IGkgPCBudW1fZXNpdDsgaSsrKSB7CiAJCWJhc2UgPSBzY2hfZXAtPm9mZnNldCArIGkgKiBz Y2hfZXAtPmVzaXQ7Ci0JCWZvciAoaiA9IDA7IGogPCBzY2hfZXAtPm51bV9idWRnZXRfbWljcm9m cmFtZXM7IGorKykKLQkJCXNjaF9idy0+YnVzX2J3W2Jhc2UgKyBqXSArPSBid19jb3N0OworCQlm b3IgKGogPSAwOyBqIDwgc2NoX2VwLT5udW1fYnVkZ2V0X21pY3JvZnJhbWVzOyBqKyspIHsKKwkJ CWlmICh1c2VkKQorCQkJCXNjaF9idy0+YnVzX2J3W2Jhc2UgKyBqXSArPQorCQkJCQlzY2hfZXAt PmJ3X2J1ZGdldF90YWJsZVtqXTsKKwkJCWVsc2UKKwkJCQlzY2hfYnctPmJ1c19id1tiYXNlICsg al0gLT0KKwkJCQkJc2NoX2VwLT5id19idWRnZXRfdGFibGVbal07CisJCX0KIAl9CiB9CiAKQEAg LTIyMCwxNyArMjY5LDEyIEBAIHN0YXRpYyBpbnQgY2hlY2tfc2NoX2J3KHN0cnVjdCB1c2JfZGV2 aWNlICp1ZGV2LAogewogCXUzMiBvZmZzZXQ7CiAJdTMyIGVzaXQ7Ci0JdTMyIG51bV9idWRnZXRf bWljcm9mcmFtZXM7CiAJdTMyIG1pbl9idzsKIAl1MzIgbWluX2luZGV4OwogCXUzMiB3b3JzdF9i dzsKIAl1MzIgYndfYm91bmRhcnk7CiAKLQlpZiAoc2NoX2VwLT5lc2l0ID4gWEhDSV9NVEtfTUFY X0VTSVQpCi0JCXNjaF9lcC0+ZXNpdCA9IFhIQ0lfTVRLX01BWF9FU0lUOwotCiAJZXNpdCA9IHNj aF9lcC0+ZXNpdDsKLQludW1fYnVkZ2V0X21pY3JvZnJhbWVzID0gc2NoX2VwLT5udW1fYnVkZ2V0 X21pY3JvZnJhbWVzOwogCiAJLyoKIAkgKiBTZWFyY2ggdGhyb3VnaCBhbGwgcG9zc2libGUgc2No ZWR1bGUgbWljcm9mcmFtZXMuCkBAIC0yMzksNyArMjgzLDcgQEAgc3RhdGljIGludCBjaGVja19z Y2hfYncoc3RydWN0IHVzYl9kZXZpY2UgKnVkZXYsCiAJbWluX2J3ID0gfjA7CiAJbWluX2luZGV4 ID0gMDsKIAlmb3IgKG9mZnNldCA9IDA7IG9mZnNldCA8IGVzaXQ7IG9mZnNldCsrKSB7Ci0JCWlm ICgob2Zmc2V0ICsgbnVtX2J1ZGdldF9taWNyb2ZyYW1lcykgPiBzY2hfZXAtPmVzaXQpCisJCWlm ICgob2Zmc2V0ICsgc2NoX2VwLT5udW1fYnVkZ2V0X21pY3JvZnJhbWVzKSA+IHNjaF9lcC0+ZXNp dCkKIAkJCWJyZWFrOwogCiAJCS8qCkBAIC0yNjMsMTEgKzMwNywxMSBAQCBzdGF0aWMgaW50IGNo ZWNrX3NjaF9idyhzdHJ1Y3QgdXNiX2RldmljZSAqdWRldiwKIAkJCQk/IFNTX0JXX0JPVU5EQVJZ IDogSFNfQldfQk9VTkRBUlk7CiAKIAkvKiBjaGVjayBiYW5kd2lkdGggKi8KLQlpZiAobWluX2J3 ICsgc2NoX2VwLT5id19jb3N0X3Blcl9taWNyb2ZyYW1lID4gYndfYm91bmRhcnkpCisJaWYgKG1p bl9idyA+IGJ3X2JvdW5kYXJ5KQogCQlyZXR1cm4gLUVSQU5HRTsKIAogCS8qIHVwZGF0ZSBidXMg YmFuZHdpZHRoIGluZm8gKi8KLQl1cGRhdGVfYnVzX2J3KHNjaF9idywgc2NoX2VwLCBzY2hfZXAt PmJ3X2Nvc3RfcGVyX21pY3JvZnJhbWUpOworCXVwZGF0ZV9idXNfYncoc2NoX2J3LCBzY2hfZXAs IDEpOwogCiAJcmV0dXJuIDA7CiB9CkBAIC0zNjIsOCArNDA2LDggQEAgaW50IHhoY2lfbXRrX2Fk ZF9lcF9xdWlyayhzdHJ1Y3QgdXNiX2hjZCAqaGNkLCBzdHJ1Y3QgdXNiX2RldmljZSAqdWRldiwK IAlid19pbmRleCA9IGdldF9id19pbmRleCh4aGNpLCB1ZGV2LCBlcCk7CiAJc2NoX2J3ID0gJnNj aF9hcnJheVtid19pbmRleF07CiAKLQlzY2hfZXAgPSBremFsbG9jKHNpemVvZihzdHJ1Y3QgbXUz aF9zY2hfZXBfaW5mbyksIEdGUF9OT0lPKTsKLQlpZiAoIXNjaF9lcCkKKwlzY2hfZXAgPSBjcmVh dGVfc2NoX2VwKHVkZXYsIGVwLCBlcF9jdHgpOworCWlmIChJU19FUlJfT1JfTlVMTChzY2hfZXAp KQogCQlyZXR1cm4gLUVOT01FTTsKIAogCXNldHVwX3NjaF9pbmZvKHVkZXYsIGVwX2N0eCwgc2No X2VwKTsKQEAgLTM3Niw3ICs0MjAsNiBAQCBpbnQgeGhjaV9tdGtfYWRkX2VwX3F1aXJrKHN0cnVj dCB1c2JfaGNkICpoY2QsIHN0cnVjdCB1c2JfZGV2aWNlICp1ZGV2LAogCX0KIAogCWxpc3RfYWRk X3RhaWwoJnNjaF9lcC0+ZW5kcG9pbnQsICZzY2hfYnctPmJ3X2VwX2xpc3QpOwotCXNjaF9lcC0+ ZXAgPSBlcDsKIAogCWVwX2N0eC0+cmVzZXJ2ZWRbMF0gfD0gY3B1X3RvX2xlMzIoRVBfQlBLVFMo c2NoX2VwLT5wa3RzKQogCQl8IEVQX0JDU0NPVU5UKHNjaF9lcC0+Y3NfY291bnQpIHwgRVBfQkJN KHNjaF9lcC0+YnVyc3RfbW9kZSkpOwpAQCAtNDIxLDggKzQ2NCw3IEBAIHZvaWQgeGhjaV9tdGtf ZHJvcF9lcF9xdWlyayhzdHJ1Y3QgdXNiX2hjZCAqaGNkLCBzdHJ1Y3QgdXNiX2RldmljZSAqdWRl diwKIAogCWxpc3RfZm9yX2VhY2hfZW50cnkoc2NoX2VwLCAmc2NoX2J3LT5id19lcF9saXN0LCBl bmRwb2ludCkgewogCQlpZiAoc2NoX2VwLT5lcCA9PSBlcCkgewotCQkJdXBkYXRlX2J1c19idyhz Y2hfYncsIHNjaF9lcCwKLQkJCQktc2NoX2VwLT5id19jb3N0X3Blcl9taWNyb2ZyYW1lKTsKKwkJ CXVwZGF0ZV9idXNfYncoc2NoX2J3LCBzY2hfZXAsIDApOwogCQkJbGlzdF9kZWwoJnNjaF9lcC0+ ZW5kcG9pbnQpOwogCQkJa2ZyZWUoc2NoX2VwKTsKIAkJCWJyZWFrOwpkaWZmIC0tZ2l0IGEvZHJp dmVycy91c2IvaG9zdC94aGNpLW10ay5oIGIvZHJpdmVycy91c2IvaG9zdC94aGNpLW10ay5oCmlu ZGV4IGNjNTlkODAuLmY4ODY0ZmMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvdXNiL2hvc3QveGhjaS1t dGsuaAorKysgYi9kcml2ZXJzL3VzYi9ob3N0L3hoY2ktbXRrLmgKQEAgLTU3LDYgKzU3LDcgQEAg c3RydWN0IG11M2hfc2NoX2J3X2luZm8gewogICoJCXRpbWVzOyAxOiBkaXN0cmlidXRlIHRoZSAo Yk1heEJ1cnN0KzEpKihNdWx0KzEpIHBhY2tldHMKICAqCQlhY2NvcmRpbmcgdG8gQHBrdHMgYW5k IEByZXBlYXQuIG5vcm1hbCBtb2RlIGlzIHVzZWQgYnkKICAqCQlkZWZhdWx0CisgKiBAYndfYnVk Z2V0X3RhYmxlOiB0YWJsZSB0byByZWNvcmQgYmFuZHdpZHRoIGJ1ZGdldCBwZXIgbWljcm9mcmFt ZQogICovCiBzdHJ1Y3QgbXUzaF9zY2hfZXBfaW5mbyB7CiAJdTMyIGVzaXQ7CkBAIC03Myw2ICs3 NCw3IEBAIHN0cnVjdCBtdTNoX3NjaF9lcF9pbmZvIHsKIAl1MzIgcGt0czsKIAl1MzIgY3NfY291 bnQ7CiAJdTMyIGJ1cnN0X21vZGU7CisJdTMyIGJ3X2J1ZGdldF90YWJsZVswXTsKIH07CiAKICNk ZWZpbmUgTVUzQ19VM19QT1JUX01BWCA0Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: chunfeng.yun@mediatek.com (Chunfeng Yun) Date: Wed, 29 Aug 2018 10:55:16 +0800 Subject: [PATCH 4/6] usb: xhci-mtk: improve bandwidth scheduling In-Reply-To: <3bcc220aa54bfebc39cea54cd736388ad37ee0c5.1535510898.git.chunfeng.yun@mediatek.com> References: <3bcc220aa54bfebc39cea54cd736388ad37ee0c5.1535510898.git.chunfeng.yun@mediatek.com> Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Mainly improve SuperSpeed ISOC bandwidth in last microframe, and LowSpeed/FullSpeed IN INT/ISOC bandwidth in split and idle microframes by introduing a bandwidth budget table; Signed-off-by: Chunfeng Yun --- drivers/usb/host/xhci-mtk-sch.c | 162 +++++++++++++++++++++++++--------------- drivers/usb/host/xhci-mtk.h | 2 + 2 files changed, 104 insertions(+), 60 deletions(-) diff --git a/drivers/usb/host/xhci-mtk-sch.c b/drivers/usb/host/xhci-mtk-sch.c index 057f453..7efd890 100644 --- a/drivers/usb/host/xhci-mtk-sch.c +++ b/drivers/usb/host/xhci-mtk-sch.c @@ -18,6 +18,11 @@ #define HS_BW_BOUNDARY 6144 /* usb2 spec section11.18.1: at most 188 FS bytes per microframe */ #define FS_PAYLOAD_MAX 188 +/* + * max number of microframes for split transfer, + * for fs isoc in : 1 ss + 1 idle + 7 cs + */ +#define TT_MICROFRAMES_MAX 9 /* mtk scheduler bitmasks */ #define EP_BPKTS(p) ((p) & 0x3f) @@ -64,20 +69,57 @@ static int get_bw_index(struct xhci_hcd *xhci, struct usb_device *udev, return bw_index; } +static u32 get_esit(struct xhci_ep_ctx *ep_ctx) +{ + u32 esit; + + esit = 1 << CTX_TO_EP_INTERVAL(le32_to_cpu(ep_ctx->ep_info)); + if (esit > XHCI_MTK_MAX_ESIT) + esit = XHCI_MTK_MAX_ESIT; + + return esit; +} + +static struct mu3h_sch_ep_info *create_sch_ep(struct usb_device *udev, + struct usb_host_endpoint *ep, struct xhci_ep_ctx *ep_ctx) +{ + struct mu3h_sch_ep_info *sch_ep; + u32 len_bw_budget_table; + size_t mem_size; + + if (is_fs_or_ls(udev->speed)) + len_bw_budget_table = TT_MICROFRAMES_MAX; + else if ((udev->speed == USB_SPEED_SUPER) + && usb_endpoint_xfer_isoc(&ep->desc)) + len_bw_budget_table = get_esit(ep_ctx); + else + len_bw_budget_table = 1; + + mem_size = sizeof(struct mu3h_sch_ep_info) + + len_bw_budget_table * sizeof(u32); + sch_ep = kzalloc(mem_size, GFP_KERNEL); + if (!sch_ep) + return ERR_PTR(-ENOMEM); + + sch_ep->ep = ep; + + return sch_ep; +} + static void setup_sch_info(struct usb_device *udev, struct xhci_ep_ctx *ep_ctx, struct mu3h_sch_ep_info *sch_ep) { u32 ep_type; - u32 ep_interval; - u32 max_packet_size; + u32 maxpkt; u32 max_burst; u32 mult; u32 esit_pkts; u32 max_esit_payload; + u32 *bwb_table = sch_ep->bw_budget_table; + int i; ep_type = CTX_TO_EP_TYPE(le32_to_cpu(ep_ctx->ep_info2)); - ep_interval = CTX_TO_EP_INTERVAL(le32_to_cpu(ep_ctx->ep_info)); - max_packet_size = MAX_PACKET_DECODED(le32_to_cpu(ep_ctx->ep_info2)); + maxpkt = MAX_PACKET_DECODED(le32_to_cpu(ep_ctx->ep_info2)); max_burst = CTX_TO_MAX_BURST(le32_to_cpu(ep_ctx->ep_info2)); mult = CTX_TO_EP_MULT(le32_to_cpu(ep_ctx->ep_info)); max_esit_payload = @@ -85,9 +127,10 @@ static void setup_sch_info(struct usb_device *udev, le32_to_cpu(ep_ctx->ep_info)) << 16) | CTX_TO_MAX_ESIT_PAYLOAD(le32_to_cpu(ep_ctx->tx_info)); - sch_ep->esit = 1 << ep_interval; + sch_ep->esit = get_esit(ep_ctx); sch_ep->offset = 0; sch_ep->burst_mode = 0; + sch_ep->repeat = 0; if (udev->speed == USB_SPEED_HIGH) { sch_ep->cs_count = 0; @@ -98,7 +141,6 @@ static void setup_sch_info(struct usb_device *udev, * in a interval */ sch_ep->num_budget_microframes = 1; - sch_ep->repeat = 0; /* * xHCI spec section6.2.3.4 @@ -106,26 +148,30 @@ static void setup_sch_info(struct usb_device *udev, * opportunities per microframe */ sch_ep->pkts = max_burst + 1; - sch_ep->bw_cost_per_microframe = max_packet_size * sch_ep->pkts; + sch_ep->bw_cost_per_microframe = maxpkt * sch_ep->pkts; + bwb_table[0] = sch_ep->bw_cost_per_microframe; } else if (udev->speed == USB_SPEED_SUPER) { /* usb3_r1 spec section4.4.7 & 4.4.8 */ sch_ep->cs_count = 0; + sch_ep->burst_mode = 1; /* * some device's (d)wBytesPerInterval is set as 0, * then max_esit_payload is 0, so evaluate esit_pkts from * mult and burst */ - esit_pkts = DIV_ROUND_UP(max_esit_payload, max_packet_size); + esit_pkts = DIV_ROUND_UP(max_esit_payload, maxpkt); if (esit_pkts == 0) esit_pkts = (mult + 1) * (max_burst + 1); if (ep_type == INT_IN_EP || ep_type == INT_OUT_EP) { sch_ep->pkts = esit_pkts; sch_ep->num_budget_microframes = 1; - sch_ep->repeat = 0; + bwb_table[0] = maxpkt * sch_ep->pkts; } if (ep_type == ISOC_IN_EP || ep_type == ISOC_OUT_EP) { + u32 remainder; + if (sch_ep->esit == 1) sch_ep->pkts = esit_pkts; else if (esit_pkts <= sch_ep->esit) @@ -137,43 +183,37 @@ static void setup_sch_info(struct usb_device *udev, sch_ep->num_budget_microframes = DIV_ROUND_UP(esit_pkts, sch_ep->pkts); - if (sch_ep->num_budget_microframes > 1) - sch_ep->repeat = 1; - else - sch_ep->repeat = 0; + sch_ep->repeat = !!(sch_ep->num_budget_microframes > 1); + sch_ep->bw_cost_per_microframe = maxpkt * sch_ep->pkts; + + remainder = sch_ep->bw_cost_per_microframe; + remainder *= sch_ep->num_budget_microframes; + remainder -= (maxpkt * esit_pkts); + for (i = 0; i < sch_ep->num_budget_microframes - 1; i++) + bwb_table[i] = sch_ep->bw_cost_per_microframe; + + /* last one <= bw_cost_per_microframe */ + bwb_table[i] = remainder; } - sch_ep->bw_cost_per_microframe = max_packet_size * sch_ep->pkts; } else if (is_fs_or_ls(udev->speed)) { - - /* - * usb_20 spec section11.18.4 - * assume worst cases - */ - sch_ep->repeat = 0; sch_ep->pkts = 1; /* at most one packet for each microframe */ - if (ep_type == INT_IN_EP || ep_type == INT_OUT_EP) { - sch_ep->cs_count = 3; /* at most need 3 CS*/ - /* one for SS and one for budgeted transaction */ - sch_ep->num_budget_microframes = sch_ep->cs_count + 2; - sch_ep->bw_cost_per_microframe = max_packet_size; - } - if (ep_type == ISOC_OUT_EP) { + sch_ep->cs_count = DIV_ROUND_UP(maxpkt, FS_PAYLOAD_MAX); + sch_ep->num_budget_microframes = sch_ep->cs_count + 2; + sch_ep->bw_cost_per_microframe = + (maxpkt < FS_PAYLOAD_MAX) ? maxpkt : FS_PAYLOAD_MAX; - /* - * the best case FS budget assumes that 188 FS bytes - * occur in each microframe - */ - sch_ep->num_budget_microframes = DIV_ROUND_UP( - max_packet_size, FS_PAYLOAD_MAX); - sch_ep->bw_cost_per_microframe = FS_PAYLOAD_MAX; - sch_ep->cs_count = sch_ep->num_budget_microframes; - } - if (ep_type == ISOC_IN_EP) { - /* at most need additional two CS. */ - sch_ep->cs_count = DIV_ROUND_UP( - max_packet_size, FS_PAYLOAD_MAX) + 2; - sch_ep->num_budget_microframes = sch_ep->cs_count + 2; - sch_ep->bw_cost_per_microframe = FS_PAYLOAD_MAX; + /* init budget table */ + if (ep_type == ISOC_OUT_EP) { + for (i = 0; i < sch_ep->num_budget_microframes; i++) + bwb_table[i] = sch_ep->bw_cost_per_microframe; + } else if (ep_type == INT_OUT_EP) { + /* only first one consumes bandwidth, others as zero */ + bwb_table[0] = sch_ep->bw_cost_per_microframe; + } else { /* INT_IN_EP or ISOC_IN_EP */ + bwb_table[0] = 0; /* start split */ + bwb_table[1] = 0; /* idle */ + for (i = 2; i < sch_ep->num_budget_microframes; i++) + bwb_table[i] = sch_ep->bw_cost_per_microframe; } } } @@ -184,6 +224,7 @@ static u32 get_max_bw(struct mu3h_sch_bw_info *sch_bw, { u32 num_esit; u32 max_bw = 0; + u32 bw; int i; int j; @@ -192,15 +233,17 @@ static u32 get_max_bw(struct mu3h_sch_bw_info *sch_bw, u32 base = offset + i * sch_ep->esit; for (j = 0; j < sch_ep->num_budget_microframes; j++) { - if (sch_bw->bus_bw[base + j] > max_bw) - max_bw = sch_bw->bus_bw[base + j]; + bw = sch_bw->bus_bw[base + j] + + sch_ep->bw_budget_table[j]; + if (bw > max_bw) + max_bw = bw; } } return max_bw; } static void update_bus_bw(struct mu3h_sch_bw_info *sch_bw, - struct mu3h_sch_ep_info *sch_ep, int bw_cost) + struct mu3h_sch_ep_info *sch_ep, bool used) { u32 num_esit; u32 base; @@ -210,8 +253,14 @@ static void update_bus_bw(struct mu3h_sch_bw_info *sch_bw, num_esit = XHCI_MTK_MAX_ESIT / sch_ep->esit; for (i = 0; i < num_esit; i++) { base = sch_ep->offset + i * sch_ep->esit; - for (j = 0; j < sch_ep->num_budget_microframes; j++) - sch_bw->bus_bw[base + j] += bw_cost; + for (j = 0; j < sch_ep->num_budget_microframes; j++) { + if (used) + sch_bw->bus_bw[base + j] += + sch_ep->bw_budget_table[j]; + else + sch_bw->bus_bw[base + j] -= + sch_ep->bw_budget_table[j]; + } } } @@ -220,17 +269,12 @@ static int check_sch_bw(struct usb_device *udev, { u32 offset; u32 esit; - u32 num_budget_microframes; u32 min_bw; u32 min_index; u32 worst_bw; u32 bw_boundary; - if (sch_ep->esit > XHCI_MTK_MAX_ESIT) - sch_ep->esit = XHCI_MTK_MAX_ESIT; - esit = sch_ep->esit; - num_budget_microframes = sch_ep->num_budget_microframes; /* * Search through all possible schedule microframes. @@ -239,7 +283,7 @@ static int check_sch_bw(struct usb_device *udev, min_bw = ~0; min_index = 0; for (offset = 0; offset < esit; offset++) { - if ((offset + num_budget_microframes) > sch_ep->esit) + if ((offset + sch_ep->num_budget_microframes) > sch_ep->esit) break; /* @@ -263,11 +307,11 @@ static int check_sch_bw(struct usb_device *udev, ? SS_BW_BOUNDARY : HS_BW_BOUNDARY; /* check bandwidth */ - if (min_bw + sch_ep->bw_cost_per_microframe > bw_boundary) + if (min_bw > bw_boundary) return -ERANGE; /* update bus bandwidth info */ - update_bus_bw(sch_bw, sch_ep, sch_ep->bw_cost_per_microframe); + update_bus_bw(sch_bw, sch_ep, 1); return 0; } @@ -362,8 +406,8 @@ int xhci_mtk_add_ep_quirk(struct usb_hcd *hcd, struct usb_device *udev, bw_index = get_bw_index(xhci, udev, ep); sch_bw = &sch_array[bw_index]; - sch_ep = kzalloc(sizeof(struct mu3h_sch_ep_info), GFP_NOIO); - if (!sch_ep) + sch_ep = create_sch_ep(udev, ep, ep_ctx); + if (IS_ERR_OR_NULL(sch_ep)) return -ENOMEM; setup_sch_info(udev, ep_ctx, sch_ep); @@ -376,7 +420,6 @@ int xhci_mtk_add_ep_quirk(struct usb_hcd *hcd, struct usb_device *udev, } list_add_tail(&sch_ep->endpoint, &sch_bw->bw_ep_list); - sch_ep->ep = ep; ep_ctx->reserved[0] |= cpu_to_le32(EP_BPKTS(sch_ep->pkts) | EP_BCSCOUNT(sch_ep->cs_count) | EP_BBM(sch_ep->burst_mode)); @@ -421,8 +464,7 @@ void xhci_mtk_drop_ep_quirk(struct usb_hcd *hcd, struct usb_device *udev, list_for_each_entry(sch_ep, &sch_bw->bw_ep_list, endpoint) { if (sch_ep->ep == ep) { - update_bus_bw(sch_bw, sch_ep, - -sch_ep->bw_cost_per_microframe); + update_bus_bw(sch_bw, sch_ep, 0); list_del(&sch_ep->endpoint); kfree(sch_ep); break; diff --git a/drivers/usb/host/xhci-mtk.h b/drivers/usb/host/xhci-mtk.h index cc59d80..f8864fc 100644 --- a/drivers/usb/host/xhci-mtk.h +++ b/drivers/usb/host/xhci-mtk.h @@ -57,6 +57,7 @@ struct mu3h_sch_bw_info { * times; 1: distribute the (bMaxBurst+1)*(Mult+1) packets * according to @pkts and @repeat. normal mode is used by * default + * @bw_budget_table: table to record bandwidth budget per microframe */ struct mu3h_sch_ep_info { u32 esit; @@ -73,6 +74,7 @@ struct mu3h_sch_ep_info { u32 pkts; u32 cs_count; u32 burst_mode; + u32 bw_budget_table[0]; }; #define MU3C_U3_PORT_MAX 4 -- 1.9.1