From patchwork Tue Mar 30 08:06:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ikjoon Jang X-Patchwork-Id: 12171957 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=-16.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable 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 4E992C433DB for ; Tue, 30 Mar 2021 08:09:12 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DC24561982 for ; Tue, 30 Mar 2021 08:09:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DC24561982 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=wOCJLClZkRYdkks9pfT2/2nyJoRIuhgg8pM1YgGZ+P8=; b=F+Qwea9NuN5uDfH/x6Ew0y3C/ BOMkn12i7KaeDECYehn2Ql0HeGERP+JdgoejSljkhog0ECRcW57qAQqI/i/HoKmL5rcCJ/X0FTXX+ sSVJ/xAIxk02XemOOXhKFqYWp6UO0f2DU3mQF8ttpmhtUxSI40i9x2s9UVs28H6gXAjmHMblVgClx NmD74Fj3qgXaNLipOP320POyTsMIvOuNOaXLtIeCKm8xTV3LUTWRXJxAnWcECUwIxmnwRg95v7nSy uKKVS+Xz/6/5fB1VoDXSNW6dMT27Nn8PiBzwrga/Frt5j9xtXVGh/DEVfx8Xz3bwAfd3X1ANkwl3t F9n+ysMFw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lR9Op-002yCv-GZ; Tue, 30 Mar 2021 08:06:55 +0000 Received: from mail-pf1-x434.google.com ([2607:f8b0:4864:20::434]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lR9OR-002y9c-3e for linux-arm-kernel@lists.infradead.org; Tue, 30 Mar 2021 08:06:33 +0000 Received: by mail-pf1-x434.google.com with SMTP id m11so11593297pfc.11 for ; Tue, 30 Mar 2021 01:06:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=omYb2z/SxeccNVlBPetfsj1e/P6RhqbnacO8PchLVZY=; b=nFTABc/J7yBKCfkL84+8tT1dkIPuXZR3YssrNm/LsQ1ZgHjiz+5CYmQtvoCyKXA69T YUtTTw68+mM1DvHyQ9HKL3hU1ZjujV0l8FHLLbcy+/cuVzCcecHTpARqUQB8fh9mWEDs 9nN/yZMvg33SdK6FrusNp57t0RfZcJoPdGtvM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=omYb2z/SxeccNVlBPetfsj1e/P6RhqbnacO8PchLVZY=; b=cXWV7NdRph8SNDZM8wZQ4yyHBPppMgCUzI8u4iu7G3gMNwxi9xJgXQ0uisP4DpzoZg XEofIW0vEhC5HQr4RAuWSbpid+C6McCYuD1LPa/cz/91j7+Legn8FXmZMLuPNVwDTzi+ 65t59mcrQIH8vqtKKWdRBdHNK49AZys7P0fDTz/qF+ehtqxe1SUdhxTVb6jgPt4wCc35 dSZSPHjpltGkMdHu19XE9RW1m2n5WztDuMC6S9SI3XgN/NewnguacgK/b0y7FKf6dj1t OmCm6GDYRatoEvtzTHDJ/sN4El/nuDMddqRkFOsUkS8jxXXm+lwHN0jPJTg5WqH6Eekm ocpA== X-Gm-Message-State: AOAM532rg+Og8Y6OJ6G/qNl6kq+hg851sFwhcU55O9aYDZ7P4BvCmhiW y9dnRMykdahTT5japEE5dQxoZdIMweHXYA== X-Google-Smtp-Source: ABdhPJxeGsARwOmu0kpuzHXfaqLI91H5qK/dwMnsn/LcD/lal1cqTKXlS1D5HNZSxQ4+b4mKsMcR/Q== X-Received: by 2002:aa7:8145:0:b029:20f:58e6:9c17 with SMTP id d5-20020aa781450000b029020f58e69c17mr28921254pfn.52.1617091585565; Tue, 30 Mar 2021 01:06:25 -0700 (PDT) Received: from ikjn-p920.tpe.corp.google.com ([2401:fa00:1:b:49fb:d79d:bee6:d970]) by smtp.gmail.com with ESMTPSA id f23sm19118913pfa.85.2021.03.30.01.06.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Mar 2021 01:06:25 -0700 (PDT) From: Ikjoon Jang To: linux-usb@vger.kernel.org Cc: Ikjoon Jang , Chunfeng Yun , Greg Kroah-Hartman , Mathias Nyman , Matthias Brugger , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org Subject: [PATCH 1/2] usb: xhci-mtk: remove unnecessary assignments in periodic TT scheduler Date: Tue, 30 Mar 2021 16:06:16 +0800 Message-Id: <20210330160508.1.I797d214790033d0402d19ff6b47a34aff60d3062@changeid> X-Mailer: git-send-email 2.31.0.291.g576ba9dcdaf-goog In-Reply-To: <20210330080617.3746932-1-ikjn@chromium.org> References: <20210330080617.3746932-1-ikjn@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210330_090632_153792_4A2D578F X-CRM114-Status: GOOD ( 16.19 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Remove unnecessary variables in check_sch_bw(). No functional changes, just for better readability. Signed-off-by: Ikjoon Jang --- drivers/usb/host/xhci-mtk-sch.c | 52 +++++++++++++-------------------- 1 file changed, 21 insertions(+), 31 deletions(-) diff --git a/drivers/usb/host/xhci-mtk-sch.c b/drivers/usb/host/xhci-mtk-sch.c index a59d1f6d4744..0cb41007ec65 100644 --- a/drivers/usb/host/xhci-mtk-sch.c +++ b/drivers/usb/host/xhci-mtk-sch.c @@ -479,6 +479,9 @@ static int check_sch_tt(struct mu3h_sch_ep_info *sch_ep, u32 offset) u32 start_cs, last_cs; int i; + if (!sch_ep->sch_tt) + return 0; + start_ss = offset % 8; if (sch_ep->ep_type == ISOC_OUT_EP) { @@ -606,54 +609,41 @@ static u32 get_esit_boundary(struct mu3h_sch_ep_info *sch_ep) static int check_sch_bw(struct mu3h_sch_bw_info *sch_bw, struct mu3h_sch_ep_info *sch_ep) { - u32 offset; - u32 min_bw; - u32 min_index; - u32 worst_bw; - u32 bw_boundary; - u32 esit_boundary; - u32 min_num_budget; - u32 min_cs_count; - int ret = 0; + int i, found = -1; + const u32 esit_boundary = get_esit_boundary(sch_ep); + const u32 bw_boundary = get_bw_boundary(sch_ep->speed); + u32 min_bw = ~0; /* * Search through all possible schedule microframes. * and find a microframe where its worst bandwidth is minimum. */ - min_bw = ~0; - min_index = 0; - min_cs_count = sch_ep->cs_count; - min_num_budget = sch_ep->num_budget_microframes; - esit_boundary = get_esit_boundary(sch_ep); - for (offset = 0; offset < sch_ep->esit; offset++) { - if (sch_ep->sch_tt) { - ret = check_sch_tt(sch_ep, offset); - if (ret) - continue; - } + for (i = 0; i < sch_ep->esit; i++) { + u32 worst_bw; - if ((offset + sch_ep->num_budget_microframes) > esit_boundary) + if ((i + sch_ep->num_budget_microframes) > esit_boundary) break; - worst_bw = get_max_bw(sch_bw, sch_ep, offset); + if (check_sch_tt(sch_ep, i)) + continue; + + worst_bw = get_max_bw(sch_bw, sch_ep, i); + if (worst_bw > bw_boundary) + continue; + if (min_bw > worst_bw) { min_bw = worst_bw; - min_index = offset; - min_cs_count = sch_ep->cs_count; - min_num_budget = sch_ep->num_budget_microframes; + found = i; } if (min_bw == 0) break; } - bw_boundary = get_bw_boundary(sch_ep->speed); /* check bandwidth */ - if (min_bw > bw_boundary) - return ret ? ret : -ESCH_BW_OVERFLOW; + if (found < 0) + return -ESCH_BW_OVERFLOW; - sch_ep->offset = min_index; - sch_ep->cs_count = min_cs_count; - sch_ep->num_budget_microframes = min_num_budget; + sch_ep->offset = found; return load_ep_bw(sch_bw, sch_ep, true); } From patchwork Tue Mar 30 08:06:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ikjoon Jang X-Patchwork-Id: 12171959 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=-16.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable 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 DD32BC433C1 for ; Tue, 30 Mar 2021 08:09:13 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 69AB761982 for ; Tue, 30 Mar 2021 08:09:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 69AB761982 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=/1hJzFXDXhhk0uA/kHp/6eCcKvn7pusb3TTRcPUgxIc=; b=djfFuNEgasPofpBnXXBg3t0fz dVX7x9WzcPjkigdvkPBxssFTFZ7rm3VdkUTwGKp+AeR3j/mHs/xZoA8t4VjC2L4TOvwwyNyoCwL2U Whv0/agqXN/jEcq/lRb61Q5qSKLIjj11HVyUEhTlnP1cDqWe+TqkGp6iJ1MTJdgvGbsqIx6utggHz 4bXAYUn8soTcklJp4swMwzpMSvgT3fAAxkqCeBUsOT1HCn1WmT8zkjzo2BUBNw8gp1+Vi0lk4xSHS cJRWkUd6LOVM3B5maOrHoBR/otuDHJv6fOSa10GEU9ykbsRXXPPZC6IKYLAnP2HJ7pFMWm21y36Xe I3NzTgcEg==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lR9P7-002yFO-B9; Tue, 30 Mar 2021 08:07:13 +0000 Received: from mail-pg1-x52e.google.com ([2607:f8b0:4864:20::52e]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lR9OR-002y9e-GP for linux-arm-kernel@lists.infradead.org; Tue, 30 Mar 2021 08:06:35 +0000 Received: by mail-pg1-x52e.google.com with SMTP id h25so11172715pgm.3 for ; Tue, 30 Mar 2021 01:06:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rWrsfCjkBFwgPVNkUe2iG5Bi9zKj6TMZ1uqalXdYp0o=; b=mlov7D7i3VZ2SRWpFLPFbSYhmbePgjV5r5yCM1t0pcdt3T7Xhr0pTS/KQz24RjrtNf gFc4Li1DBth+brP8xqj2rOEniBhGhregxhnQYGnZibbiDK/ZFpQQwWXP9Q+FhoM/cL9j VC/1d1JoUFUU3V1RHoE14R9/UZ4DAhqtQoa54= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rWrsfCjkBFwgPVNkUe2iG5Bi9zKj6TMZ1uqalXdYp0o=; b=J+0cj4XsBCKv7qDWd4I7KFnu8t37OUUXivM1DSeuAo2wdCC6ZbJNQozmuAo6NXWvID 5gMyEVZ9j1LroHp/K7mcQdnW8rtuB/V7wMHSYXyAwuyTV3yZL5NhVN6nH/Hg4qE/HEVX u2od8pqMKKL+8AaEn1g7vWuFKJCbh4Raqeo0S3o3BajALDWGxMvUpaT7601kplHRWR6o VDHFcpWRyQazZHVF/ppd60j2fcummHioNJxDrM2XPmkvIPo2T1F6o793iXKQp516vEME ahTQ9AcL23pjYrgsDUOcjkKHndDwYBEqx7nqTNm4La31OC7BSPE/HftHkkIzVnRtJZ6E DmmQ== X-Gm-Message-State: AOAM533II2pfpP/ehOeD8SZsf01JTRKgB373AoR/pJrG87V/xgIN2acG iNVR4CTPR7iHb3Vhz90wsr5P8Q== X-Google-Smtp-Source: ABdhPJwXDtLXsIlMtVt4P2ZGc9syxpbvMO/GTjwikKMZ1SgMPOeVk2n9UhNehnMFmXIlAYmqRh5J3Q== X-Received: by 2002:a62:68c4:0:b029:226:5dc5:4082 with SMTP id d187-20020a6268c40000b02902265dc54082mr13107032pfc.48.1617091587509; Tue, 30 Mar 2021 01:06:27 -0700 (PDT) Received: from ikjn-p920.tpe.corp.google.com ([2401:fa00:1:b:49fb:d79d:bee6:d970]) by smtp.gmail.com with ESMTPSA id f23sm19118913pfa.85.2021.03.30.01.06.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Mar 2021 01:06:27 -0700 (PDT) From: Ikjoon Jang To: linux-usb@vger.kernel.org Cc: Ikjoon Jang , Chunfeng Yun , Greg Kroah-Hartman , Mathias Nyman , Matthias Brugger , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org Subject: [PATCH 2/2] usb: xhci-mtk: relax periodic TT bandwidth checking Date: Tue, 30 Mar 2021 16:06:17 +0800 Message-Id: <20210330160508.2.I75d28cfec05010524ccef5132c8e39adb1bf6651@changeid> X-Mailer: git-send-email 2.31.0.291.g576ba9dcdaf-goog In-Reply-To: <20210330080617.3746932-1-ikjn@chromium.org> References: <20210330080617.3746932-1-ikjn@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210330_090632_154504_40BAB3EE X-CRM114-Status: GOOD ( 24.32 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Software bandwidth checking logics used by xhci-mtk puts a quite heavy constraints to TT periodic endpoint allocations. This patch provides a relaxed bandwidth calculation by - Allowing multiple periodic transactions in a same microframe for a device with multiple interrupt endpoints. - Using best case budget instead of maximum number of complete-split when calculating byte budgets on lower speed bus Without this patch, a typical full speed audio headset with 3 periodic endpoints (audio isoc-in/out, input int-in) cannot be configured with xhci-mtk. Signed-off-by: Ikjoon Jang --- drivers/usb/host/xhci-mtk-sch.c | 68 ++++++++++----------------------- drivers/usb/host/xhci-mtk.h | 2 - 2 files changed, 20 insertions(+), 50 deletions(-) diff --git a/drivers/usb/host/xhci-mtk-sch.c b/drivers/usb/host/xhci-mtk-sch.c index 0cb41007ec65..76827e48049a 100644 --- a/drivers/usb/host/xhci-mtk-sch.c +++ b/drivers/usb/host/xhci-mtk-sch.c @@ -388,13 +388,17 @@ static void setup_sch_info(struct xhci_ep_ctx *ep_ctx, } else { /* INT_IN_EP or ISOC_IN_EP */ bwb_table[0] = 0; /* start split */ bwb_table[1] = 0; /* idle */ + + sch_ep->num_budget_microframes += 2; + if (sch_ep->num_budget_microframes > sch_ep->esit) + sch_ep->num_budget_microframes = sch_ep->esit; /* * due to cs_count will be updated according to cs * position, assign all remainder budget array * elements as @bw_cost_per_microframe, but only first * @num_budget_microframes elements will be used later */ - for (i = 2; i < TT_MICROFRAMES_MAX; i++) + for (i = 2; i < sch_ep->num_budget_microframes; i++) bwb_table[i] = sch_ep->bw_cost_per_microframe; } } @@ -449,20 +453,17 @@ static void update_bus_bw(struct mu3h_sch_bw_info *sch_bw, static int check_fs_bus_bw(struct mu3h_sch_ep_info *sch_ep, int offset) { struct mu3h_sch_tt *tt = sch_ep->sch_tt; - u32 num_esit, tmp; - int base; int i, j; + const int nr_lower_uframes = + DIV_ROUND_UP(sch_ep->maxpkt, FS_PAYLOAD_MAX); - num_esit = XHCI_MTK_MAX_ESIT / sch_ep->esit; - for (i = 0; i < num_esit; i++) { - base = offset + i * sch_ep->esit; - + for (i = offset; i < XHCI_MTK_MAX_ESIT; i += sch_ep->esit) { /* * Compared with hs bus, no matter what ep type, * the hub will always delay one uframe to send data */ - for (j = 0; j < sch_ep->cs_count; j++) { - tmp = tt->fs_bus_bw[base + j] + sch_ep->bw_cost_per_microframe; + for (j = 0; j < nr_lower_uframes; j++) { + u32 tmp = tt->fs_bus_bw[i + j + 1] + sch_ep->bw_cost_per_microframe; if (tmp > FS_PAYLOAD_MAX) return -ESCH_BW_OVERFLOW; } @@ -473,11 +474,9 @@ static int check_fs_bus_bw(struct mu3h_sch_ep_info *sch_ep, int offset) static int check_sch_tt(struct mu3h_sch_ep_info *sch_ep, u32 offset) { - struct mu3h_sch_tt *tt = sch_ep->sch_tt; u32 extra_cs_count; u32 start_ss, last_ss; u32 start_cs, last_cs; - int i; if (!sch_ep->sch_tt) return 0; @@ -494,10 +493,6 @@ static int check_sch_tt(struct mu3h_sch_ep_info *sch_ep, u32 offset) if (!(start_ss == 7 || last_ss < 6)) return -ESCH_SS_Y6; - for (i = 0; i < sch_ep->cs_count; i++) - if (test_bit(offset + i, tt->ss_bit_map)) - return -ESCH_SS_OVERLAP; - } else { u32 cs_count = DIV_ROUND_UP(sch_ep->maxpkt, FS_PAYLOAD_MAX); @@ -524,19 +519,7 @@ static int check_sch_tt(struct mu3h_sch_ep_info *sch_ep, u32 offset) if (cs_count > 7) cs_count = 7; /* HW limit */ - if (test_bit(offset, tt->ss_bit_map)) - return -ESCH_SS_OVERLAP; - sch_ep->cs_count = cs_count; - /* one for ss, the other for idle */ - sch_ep->num_budget_microframes = cs_count + 2; - - /* - * if interval=1, maxp >752, num_budge_micoframe is larger - * than sch_ep->esit, will overstep boundary - */ - if (sch_ep->num_budget_microframes > sch_ep->esit) - sch_ep->num_budget_microframes = sch_ep->esit; } return check_fs_bus_bw(sch_ep, offset); @@ -545,31 +528,18 @@ static int check_sch_tt(struct mu3h_sch_ep_info *sch_ep, u32 offset) static void update_sch_tt(struct mu3h_sch_ep_info *sch_ep, bool used) { struct mu3h_sch_tt *tt = sch_ep->sch_tt; - u32 base, num_esit; - int bw_updated; - int bits; - int i, j; - - num_esit = XHCI_MTK_MAX_ESIT / sch_ep->esit; - bits = (sch_ep->ep_type == ISOC_OUT_EP) ? sch_ep->cs_count : 1; + int i, j, bw_updated; + const int nr_lower_uframes = + DIV_ROUND_UP(sch_ep->maxpkt, FS_PAYLOAD_MAX); if (used) bw_updated = sch_ep->bw_cost_per_microframe; else bw_updated = -sch_ep->bw_cost_per_microframe; - for (i = 0; i < num_esit; i++) { - base = sch_ep->offset + i * sch_ep->esit; - - for (j = 0; j < bits; j++) { - if (used) - set_bit(base + j, tt->ss_bit_map); - else - clear_bit(base + j, tt->ss_bit_map); - } - - for (j = 0; j < sch_ep->cs_count; j++) - tt->fs_bus_bw[base + j] += bw_updated; + for (i = sch_ep->offset; i < XHCI_MTK_MAX_ESIT; i += sch_ep->esit) { + for (j = 0; j < nr_lower_uframes; j++) + tt->fs_bus_bw[i+ j + 1] += bw_updated; } if (used) @@ -634,9 +604,11 @@ static int check_sch_bw(struct mu3h_sch_bw_info *sch_bw, if (min_bw > worst_bw) { min_bw = worst_bw; found = i; + /* fastpath: bandwidth contributions to host is low + * when it's fs/ls */ + if (sch_ep->sch_tt || min_bw == 0) + break; } - if (min_bw == 0) - break; } /* check bandwidth */ diff --git a/drivers/usb/host/xhci-mtk.h b/drivers/usb/host/xhci-mtk.h index 621ec1a85009..8a879f99ae1c 100644 --- a/drivers/usb/host/xhci-mtk.h +++ b/drivers/usb/host/xhci-mtk.h @@ -20,12 +20,10 @@ #define XHCI_MTK_MAX_ESIT 64 /** - * @ss_bit_map: used to avoid start split microframes overlay * @fs_bus_bw: array to keep track of bandwidth already used for FS * @ep_list: Endpoints using this TT */ struct mu3h_sch_tt { - DECLARE_BITMAP(ss_bit_map, XHCI_MTK_MAX_ESIT); u32 fs_bus_bw[XHCI_MTK_MAX_ESIT]; struct list_head ep_list; };