Revert "usb: xhci-mtk: relax TT periodic bandwidth allocation"

As discussed in following patch:
https://patchwork.kernel.org/patch/12420339

No need calculate number of uframes again, but should use value
form check_sch_tt(), if we plan to remove extra CS, also can do
it in check_sch_tt(). So revert this patch, and prepare to send
new patch for it.

This reverts commit 548011957d1d72e0b662300c8b32b81d593b796e.

Cc: Ikjoon Jang <ikjn@chromium.org>
Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
Link: https://lore.kernel.org/r/20210820065913.64490-1-chunfeng.yun@mediatek.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/host/xhci-mtk-sch.c b/drivers/usb/host/xhci-mtk-sch.c
index 46cbf5d..f9b4d27 100644 (file)
--- a/drivers/usb/host/xhci-mtk-sch.c
+++ b/drivers/usb/host/xhci-mtk-sch.c
@@ -459,17 +459,16 @@ static int check_fs_bus_bw(struct mu3h_sch_ep_info *sch_ep, int offset)
        u32 num_esit, tmp;
        int base;
        int i, j;
-       u8 uframes = DIV_ROUND_UP(sch_ep->maxpkt, FS_PAYLOAD_MAX);
 
        num_esit = XHCI_MTK_MAX_ESIT / sch_ep->esit;
-
-       if (sch_ep->ep_type == INT_IN_EP || sch_ep->ep_type == ISOC_IN_EP)
-               offset++;
-
        for (i = 0; i < num_esit; i++) {
                base = offset + i * sch_ep->esit;
 
-               for (j = 0; j < uframes; j++) {
+               /*
+                * 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;
                        if (tmp > FS_PAYLOAD_MAX)
                                return -ESCH_BW_OVERFLOW;
@@ -547,8 +546,6 @@ static void update_sch_tt(struct mu3h_sch_ep_info *sch_ep, bool used)
        u32 base, num_esit;
        int bw_updated;
        int i, j;
-       int offset = sch_ep->offset;
-       u8 uframes = DIV_ROUND_UP(sch_ep->maxpkt, FS_PAYLOAD_MAX);
 
        num_esit = XHCI_MTK_MAX_ESIT / sch_ep->esit;
 
@@ -557,13 +554,10 @@ static void update_sch_tt(struct mu3h_sch_ep_info *sch_ep, bool used)
        else
                bw_updated = -sch_ep->bw_cost_per_microframe;
 
-       if (sch_ep->ep_type == INT_IN_EP || sch_ep->ep_type == ISOC_IN_EP)
-               offset++;
-
        for (i = 0; i < num_esit; i++) {
-               base = offset + i * sch_ep->esit;
+               base = sch_ep->offset + i * sch_ep->esit;
 
-               for (j = 0; j < uframes; j++)
+               for (j = 0; j < sch_ep->cs_count; j++)
                        tt->fs_bus_bw[base + j] += bw_updated;
        }