igc: Set Qbv start_time and end_time to end_time if not being configured in GCL
authorTan Tee Min <tee.min.tan@linux.intel.com>
Fri, 9 Dec 2022 04:15:22 +0000 (12:15 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 31 Dec 2022 12:32:54 +0000 (13:32 +0100)
[ Upstream commit 72abeedd83982c1bc6023f631e412db78374d9b4 ]

The default setting of end_time minus start_time is whole 1 second.
Thus, if it's not being configured in any GCL entry then it will be
staying at original 1 second.

This patch is changing the start_time and end_time to be end_time as
if setting zero will be having weird HW behavior where the gate will
not be fully closed.

Fixes: ec50a9d437f0 ("igc: Add support for taprio offloading")
Signed-off-by: Tan Tee Min <tee.min.tan@linux.intel.com>
Signed-off-by: Muhammad Husaini Zulkifli <muhammad.husaini.zulkifli@intel.com>
Tested-by: Naama Meir <naamax.meir@linux.intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/ethernet/intel/igc/igc_main.c

index 06c22ff..34db1c0 100644 (file)
@@ -6036,6 +6036,7 @@ static int igc_save_qbv_schedule(struct igc_adapter *adapter,
        bool queue_configured[IGC_MAX_TX_QUEUES] = { };
        u32 start_time = 0, end_time = 0;
        size_t n;
+       int i;
 
        adapter->qbv_enable = qopt->enable;
 
@@ -6056,7 +6057,6 @@ static int igc_save_qbv_schedule(struct igc_adapter *adapter,
 
        for (n = 0; n < qopt->num_entries; n++) {
                struct tc_taprio_sched_entry *e = &qopt->entries[n];
-               int i;
 
                end_time += e->interval;
 
@@ -6095,6 +6095,18 @@ static int igc_save_qbv_schedule(struct igc_adapter *adapter,
                start_time += e->interval;
        }
 
+       /* Check whether a queue gets configured.
+        * If not, set the start and end time to be end time.
+        */
+       for (i = 0; i < adapter->num_tx_queues; i++) {
+               if (!queue_configured[i]) {
+                       struct igc_ring *ring = adapter->tx_ring[i];
+
+                       ring->start_time = end_time;
+                       ring->end_time = end_time;
+               }
+       }
+
        return 0;
 }