Commit 1d1b4c63 authored by Muhammad Husaini Zulkifli's avatar Muhammad Husaini Zulkifli Committed by Tony Nguyen

igc: Remove reset adapter task for i226 during disable tsn config

I225 have limitation when programming the BaseTime register which required
a power cycle of the controller. This limitation already lifted in I226.
This patch removes the restriction so that when user configure/remove any
TSN mode, it would not go into power cycle reset adapter.

How to test:

Schedule any gate control list configuration or delete it.

Example:

1)

BASE_TIME=$(date +%s%N)
tc qdisc replace dev $interface_name parent root handle 100 taprio \
    num_tc 4 \
    map 3 1 0 2 3 3 3 3 3 3 3 3 3 3 3 3 \
    queues 1@0 1@1 1@2 1@3 \
    base-time $BASE_TIME \
    sched-entry S 0F 1000000 \
    flags 0x2

2) tc qdisc del dev $intername_name root
Signed-off-by: default avatarMuhammad Husaini Zulkifli <muhammad.husaini.zulkifli@intel.com>
Tested-by: default avatarNaama Meir <naamax.meir@linux.intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 5ac1231a
...@@ -6020,7 +6020,7 @@ static int igc_tsn_enable_launchtime(struct igc_adapter *adapter, ...@@ -6020,7 +6020,7 @@ static int igc_tsn_enable_launchtime(struct igc_adapter *adapter,
if (err) if (err)
return err; return err;
return igc_tsn_offload_apply(adapter, qopt->enable); return igc_tsn_offload_apply(adapter);
} }
static int igc_tsn_clear_schedule(struct igc_adapter *adapter) static int igc_tsn_clear_schedule(struct igc_adapter *adapter)
...@@ -6134,7 +6134,7 @@ static int igc_tsn_enable_qbv_scheduling(struct igc_adapter *adapter, ...@@ -6134,7 +6134,7 @@ static int igc_tsn_enable_qbv_scheduling(struct igc_adapter *adapter,
if (err) if (err)
return err; return err;
return igc_tsn_offload_apply(adapter, qopt->enable); return igc_tsn_offload_apply(adapter);
} }
static int igc_save_cbs_params(struct igc_adapter *adapter, int queue, static int igc_save_cbs_params(struct igc_adapter *adapter, int queue,
...@@ -6202,7 +6202,7 @@ static int igc_tsn_enable_cbs(struct igc_adapter *adapter, ...@@ -6202,7 +6202,7 @@ static int igc_tsn_enable_cbs(struct igc_adapter *adapter,
if (err) if (err)
return err; return err;
return igc_tsn_offload_apply(adapter, qopt->enable); return igc_tsn_offload_apply(adapter);
} }
static int igc_setup_tc(struct net_device *dev, enum tc_setup_type type, static int igc_setup_tc(struct net_device *dev, enum tc_setup_type type,
......
...@@ -289,21 +289,16 @@ int igc_tsn_reset(struct igc_adapter *adapter) ...@@ -289,21 +289,16 @@ int igc_tsn_reset(struct igc_adapter *adapter)
return err; return err;
} }
int igc_tsn_offload_apply(struct igc_adapter *adapter, bool enable) int igc_tsn_offload_apply(struct igc_adapter *adapter)
{ {
struct igc_hw *hw = &adapter->hw; struct igc_hw *hw = &adapter->hw;
int err;
if (netif_running(adapter->netdev) && if (netif_running(adapter->netdev) && igc_is_device_id_i225(hw)) {
(igc_is_device_id_i225(hw) || !enable)) {
schedule_work(&adapter->reset_task); schedule_work(&adapter->reset_task);
return 0; return 0;
} }
err = igc_tsn_enable_offload(adapter); igc_tsn_reset(adapter);
if (err < 0)
return err;
adapter->flags = igc_tsn_new_flags(adapter);
return 0; return 0;
} }
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
#ifndef _IGC_TSN_H_ #ifndef _IGC_TSN_H_
#define _IGC_TSN_H_ #define _IGC_TSN_H_
int igc_tsn_offload_apply(struct igc_adapter *adapter, bool enable); int igc_tsn_offload_apply(struct igc_adapter *adapter);
int igc_tsn_reset(struct igc_adapter *adapter); int igc_tsn_reset(struct igc_adapter *adapter);
void igc_tsn_adjust_txtime_offset(struct igc_adapter *adapter); void igc_tsn_adjust_txtime_offset(struct igc_adapter *adapter);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment