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 37B2EC433F4 for ; Wed, 29 Aug 2018 02:55:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ED9272083B for ; Wed, 29 Aug 2018 02:55:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org ED9272083B 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 S1727589AbeH2GuJ (ORCPT ); Wed, 29 Aug 2018 02:50:09 -0400 Received: from Mailgw01.mediatek.com ([1.203.163.78]:40039 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1727067AbeH2GuJ (ORCPT ); Wed, 29 Aug 2018 02:50:09 -0400 X-UUID: 3264ebb230f14bafa9934d6a3c8d4f3f-20180829 Received: from mtkcas35.mediatek.inc [(172.27.4.250)] by mailgw01.mediatek.com (envelope-from ) (mailgw01.mediatek.com ESMTP with TLS) with ESMTP id 178765800; Wed, 29 Aug 2018 10:55:23 +0800 Received: from mtkcas09.mediatek.inc (172.21.101.178) by MTKMBS31N1.mediatek.inc (172.27.4.69) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Wed, 29 Aug 2018 10:55:21 +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:20 +0800 From: Chunfeng Yun To: Mathias Nyman CC: Greg Kroah-Hartman , Felipe Balbi , Matthias Brugger , Alan Stern , Chunfeng Yun , , , , , Subject: [PATCH 2/6] usb: xhci-mtk: use maximum ESIT payload of endpiont context Date: Wed, 29 Aug 2018 10:55:14 +0800 Message-ID: <19a0f3e20ba5314112c08307ee39cca603ddf819.1535510898.git.chunfeng.yun@mediatek.com> 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 Make use of maximum ESIT payload of endpoint context to calculate the number of packets to send in each ESIT Signed-off-by: Chunfeng Yun --- drivers/usb/host/xhci-mtk-sch.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/usb/host/xhci-mtk-sch.c b/drivers/usb/host/xhci-mtk-sch.c index fa33d6e..46fe0a2 100644 --- a/drivers/usb/host/xhci-mtk-sch.c +++ b/drivers/usb/host/xhci-mtk-sch.c @@ -73,12 +73,17 @@ static void setup_sch_info(struct usb_device *udev, u32 max_burst; u32 mult; u32 esit_pkts; + u32 max_esit_payload; 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)); 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 = + (CTX_TO_MAX_ESIT_PAYLOAD_HI( + 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->offset = 0; @@ -105,7 +110,15 @@ static void setup_sch_info(struct usb_device *udev, } else if (udev->speed == USB_SPEED_SUPER) { /* usb3_r1 spec section4.4.7 & 4.4.8 */ sch_ep->cs_count = 0; - esit_pkts = (mult + 1) * (max_burst + 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); + 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; -- 1.9.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chunfeng Yun Subject: [PATCH 2/6] usb: xhci-mtk: use maximum ESIT payload of endpiont context Date: Wed, 29 Aug 2018 10:55:14 +0800 Message-ID: <19a0f3e20ba5314112c08307ee39cca603ddf819.1535510898.git.chunfeng.yun@mediatek.com> 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 Make use of maximum ESIT payload of endpoint context to calculate the number of packets to send in each ESIT Signed-off-by: Chunfeng Yun --- drivers/usb/host/xhci-mtk-sch.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/usb/host/xhci-mtk-sch.c b/drivers/usb/host/xhci-mtk-sch.c index fa33d6e..46fe0a2 100644 --- a/drivers/usb/host/xhci-mtk-sch.c +++ b/drivers/usb/host/xhci-mtk-sch.c @@ -73,12 +73,17 @@ static void setup_sch_info(struct usb_device *udev, u32 max_burst; u32 mult; u32 esit_pkts; + u32 max_esit_payload; 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)); 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 = + (CTX_TO_MAX_ESIT_PAYLOAD_HI( + 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->offset = 0; @@ -105,7 +110,15 @@ static void setup_sch_info(struct usb_device *udev, } else if (udev->speed == USB_SPEED_SUPER) { /* usb3_r1 spec section4.4.7 & 4.4.8 */ sch_ep->cs_count = 0; - esit_pkts = (mult + 1) * (max_burst + 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); + 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; -- 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: [2/6] usb: xhci-mtk: use maximum ESIT payload of endpiont context From: Chunfeng Yun Message-Id: <19a0f3e20ba5314112c08307ee39cca603ddf819.1535510898.git.chunfeng.yun@mediatek.com> Date: Wed, 29 Aug 2018 10:55:14 +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: TWFrZSB1c2Ugb2YgbWF4aW11bSBFU0lUIHBheWxvYWQgb2YgZW5kcG9pbnQgY29udGV4dCB0byBj YWxjdWxhdGUKdGhlIG51bWJlciBvZiBwYWNrZXRzIHRvIHNlbmQgaW4gZWFjaCBFU0lUCgpTaWdu ZWQtb2ZmLWJ5OiBDaHVuZmVuZyBZdW4gPGNodW5mZW5nLnl1bkBtZWRpYXRlay5jb20+Ci0tLQog ZHJpdmVycy91c2IvaG9zdC94aGNpLW10ay1zY2guYyB8IDE1ICsrKysrKysrKysrKysrLQogMSBm aWxlIGNoYW5nZWQsIDE0IGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkKCmRpZmYgLS1naXQg YS9kcml2ZXJzL3VzYi9ob3N0L3hoY2ktbXRrLXNjaC5jIGIvZHJpdmVycy91c2IvaG9zdC94aGNp LW10ay1zY2guYwppbmRleCBmYTMzZDZlLi40NmZlMGEyIDEwMDY0NAotLS0gYS9kcml2ZXJzL3Vz Yi9ob3N0L3hoY2ktbXRrLXNjaC5jCisrKyBiL2RyaXZlcnMvdXNiL2hvc3QveGhjaS1tdGstc2No LmMKQEAgLTczLDEyICs3MywxNyBAQCBzdGF0aWMgdm9pZCBzZXR1cF9zY2hfaW5mbyhzdHJ1Y3Qg dXNiX2RldmljZSAqdWRldiwKIAl1MzIgbWF4X2J1cnN0OwogCXUzMiBtdWx0OwogCXUzMiBlc2l0 X3BrdHM7CisJdTMyIG1heF9lc2l0X3BheWxvYWQ7CiAKIAllcF90eXBlID0gQ1RYX1RPX0VQX1RZ UEUobGUzMl90b19jcHUoZXBfY3R4LT5lcF9pbmZvMikpOwogCWVwX2ludGVydmFsID0gQ1RYX1RP X0VQX0lOVEVSVkFMKGxlMzJfdG9fY3B1KGVwX2N0eC0+ZXBfaW5mbykpOwogCW1heF9wYWNrZXRf c2l6ZSA9IE1BWF9QQUNLRVRfREVDT0RFRChsZTMyX3RvX2NwdShlcF9jdHgtPmVwX2luZm8yKSk7 CiAJbWF4X2J1cnN0ID0gQ1RYX1RPX01BWF9CVVJTVChsZTMyX3RvX2NwdShlcF9jdHgtPmVwX2lu Zm8yKSk7CiAJbXVsdCA9IENUWF9UT19FUF9NVUxUKGxlMzJfdG9fY3B1KGVwX2N0eC0+ZXBfaW5m bykpOworCW1heF9lc2l0X3BheWxvYWQgPQorCQkoQ1RYX1RPX01BWF9FU0lUX1BBWUxPQURfSEko CisJCQlsZTMyX3RvX2NwdShlcF9jdHgtPmVwX2luZm8pKSA8PCAxNikgfAorCQkgQ1RYX1RPX01B WF9FU0lUX1BBWUxPQUQobGUzMl90b19jcHUoZXBfY3R4LT50eF9pbmZvKSk7CiAKIAlzY2hfZXAt PmVzaXQgPSAxIDw8IGVwX2ludGVydmFsOwogCXNjaF9lcC0+b2Zmc2V0ID0gMDsKQEAgLTEwNSw3 ICsxMTAsMTUgQEAgc3RhdGljIHZvaWQgc2V0dXBfc2NoX2luZm8oc3RydWN0IHVzYl9kZXZpY2Ug KnVkZXYsCiAJfSBlbHNlIGlmICh1ZGV2LT5zcGVlZCA9PSBVU0JfU1BFRURfU1VQRVIpIHsKIAkJ LyogdXNiM19yMSBzcGVjIHNlY3Rpb240LjQuNyAmIDQuNC44ICovCiAJCXNjaF9lcC0+Y3NfY291 bnQgPSAwOwotCQllc2l0X3BrdHMgPSAobXVsdCArIDEpICogKG1heF9idXJzdCArIDEpOworCQkv KgorCQkgKiBzb21lIGRldmljZSdzIChkKXdCeXRlc1BlckludGVydmFsIGlzIHNldCBhcyAwLAor CQkgKiB0aGVuIG1heF9lc2l0X3BheWxvYWQgaXMgMCwgc28gZXZhbHVhdGUgZXNpdF9wa3RzIGZy b20KKwkJICogbXVsdCBhbmQgYnVyc3QKKwkJICovCisJCWVzaXRfcGt0cyA9IERJVl9ST1VORF9V UChtYXhfZXNpdF9wYXlsb2FkLCBtYXhfcGFja2V0X3NpemUpOworCQlpZiAoZXNpdF9wa3RzID09 IDApCisJCQllc2l0X3BrdHMgPSAobXVsdCArIDEpICogKG1heF9idXJzdCArIDEpOworCiAJCWlm IChlcF90eXBlID09IElOVF9JTl9FUCB8fCBlcF90eXBlID09IElOVF9PVVRfRVApIHsKIAkJCXNj aF9lcC0+cGt0cyA9IGVzaXRfcGt0czsKIAkJCXNjaF9lcC0+bnVtX2J1ZGdldF9taWNyb2ZyYW1l cyA9IDE7Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: chunfeng.yun@mediatek.com (Chunfeng Yun) Date: Wed, 29 Aug 2018 10:55:14 +0800 Subject: [PATCH 2/6] usb: xhci-mtk: use maximum ESIT payload of endpiont context In-Reply-To: <3bcc220aa54bfebc39cea54cd736388ad37ee0c5.1535510898.git.chunfeng.yun@mediatek.com> References: <3bcc220aa54bfebc39cea54cd736388ad37ee0c5.1535510898.git.chunfeng.yun@mediatek.com> Message-ID: <19a0f3e20ba5314112c08307ee39cca603ddf819.1535510898.git.chunfeng.yun@mediatek.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Make use of maximum ESIT payload of endpoint context to calculate the number of packets to send in each ESIT Signed-off-by: Chunfeng Yun --- drivers/usb/host/xhci-mtk-sch.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/usb/host/xhci-mtk-sch.c b/drivers/usb/host/xhci-mtk-sch.c index fa33d6e..46fe0a2 100644 --- a/drivers/usb/host/xhci-mtk-sch.c +++ b/drivers/usb/host/xhci-mtk-sch.c @@ -73,12 +73,17 @@ static void setup_sch_info(struct usb_device *udev, u32 max_burst; u32 mult; u32 esit_pkts; + u32 max_esit_payload; 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)); 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 = + (CTX_TO_MAX_ESIT_PAYLOAD_HI( + 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->offset = 0; @@ -105,7 +110,15 @@ static void setup_sch_info(struct usb_device *udev, } else if (udev->speed == USB_SPEED_SUPER) { /* usb3_r1 spec section4.4.7 & 4.4.8 */ sch_ep->cs_count = 0; - esit_pkts = (mult + 1) * (max_burst + 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); + 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; -- 1.9.1