usb: xhci-mtk: update fs bus bandwidth by bw_budget_table
authorChunfeng Yun <chunfeng.yun@mediatek.com>
Tue, 17 Aug 2021 08:36:26 +0000 (16:36 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 26 Aug 2021 11:39:20 +0000 (13:39 +0200)
Use @bw_budget_table[] to update fs bus bandwidth due to
not all microframes consume @bw_cost_per_microframe, see
setup_sch_info().

Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
Link: https://lore.kernel.org/r/1629189389-18779-6-git-send-email-chunfeng.yun@mediatek.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/host/xhci-mtk-sch.c

index 0bb1a62..10c0f0f 100644 (file)
@@ -458,8 +458,8 @@ static int check_fs_bus_bw(struct mu3h_sch_ep_info *sch_ep, int offset)
                 * 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 < sch_ep->num_budget_microframes; j++) {
+                       tmp = tt->fs_bus_bw[base + j] + sch_ep->bw_budget_table[j];
                        if (tmp > FS_PAYLOAD_MAX)
                                return -ESCH_BW_OVERFLOW;
                }
@@ -534,21 +534,18 @@ 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 i, j;
 
        num_esit = XHCI_MTK_MAX_ESIT / sch_ep->esit;
 
-       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 < sch_ep->cs_count; j++)
-                       tt->fs_bus_bw[base + j] += bw_updated;
+               for (j = 0; j < sch_ep->num_budget_microframes; j++)
+                       if (used)
+                               tt->fs_bus_bw[base + j] += sch_ep->bw_budget_table[j];
+                       else
+                               tt->fs_bus_bw[base + j] -= sch_ep->bw_budget_table[j];
        }
 
        if (used)