iavf: add iavf_schedule_aq_request() helper

orosp · anguy11 · commit ed4cad33df9e · 2023-09-15T09:09:08.000-07:00
Add helper for set iavf aq request AVF_FLAG_AQ_* and immediately
schedule watchdog_task. Helper will be used in cases where it is
necessary to run aq requests asap

Signed-off-by: Petr Oros &lt;poros@redhat.com&gt;
Co-developed-by: Michal Schmidt &lt;mschmidt@redhat.com&gt;
Signed-off-by: Michal Schmidt &lt;mschmidt@redhat.com&gt;
Co-developed-by: Ivan Vecera &lt;ivecera@redhat.com&gt;
Signed-off-by: Ivan Vecera &lt;ivecera@redhat.com&gt;
Reviewed-by: Simon Horman &lt;horms@kernel.org&gt;
Tested-by: Rafal Romanowski &lt;rafal.romanowski@intel.com&gt;
Signed-off-by: Tony Nguyen &lt;anthony.l.nguyen@intel.com&gt;
diff --git a/drivers/net/ethernet/intel/iavf/iavf.h b/drivers/net/ethernet/intel/iavf/iavf.h
@@ -521,7 +521,7 @@ void iavf_down(struct iavf_adapter *adapter);
 int iavf_process_config(struct iavf_adapter *adapter);
 int iavf_parse_vf_resource_msg(struct iavf_adapter *adapter);
 void iavf_schedule_reset(struct iavf_adapter *adapter, u64 flags);
-void iavf_schedule_request_stats(struct iavf_adapter *adapter);
+void iavf_schedule_aq_request(struct iavf_adapter *adapter, u64 flags);
 void iavf_schedule_finish_config(struct iavf_adapter *adapter);
 void iavf_reset(struct iavf_adapter *adapter);
 void iavf_set_ethtool_ops(struct net_device *netdev);
diff --git a/drivers/net/ethernet/intel/iavf/iavf_ethtool.c b/drivers/net/ethernet/intel/iavf/iavf_ethtool.c
@@ -362,7 +362,7 @@ static void iavf_get_ethtool_stats(struct net_device *netdev,
 	unsigned int i;
 
 	/* Explicitly request stats refresh */
-	iavf_schedule_request_stats(adapter);
+	iavf_schedule_aq_request(adapter, IAVF_FLAG_AQ_REQUEST_STATS);
 
 	iavf_add_ethtool_stats(&data, adapter, iavf_gstrings_stats);
 
diff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c b/drivers/net/ethernet/intel/iavf/iavf_main.c
@@ -314,15 +314,13 @@ void iavf_schedule_reset(struct iavf_adapter *adapter, u64 flags)
 }
 
 /**
- * iavf_schedule_request_stats - Set the flags and schedule statistics request
+ * iavf_schedule_aq_request - Set the flags and schedule aq request
  * @adapter: board private structure
- *
- * Sets IAVF_FLAG_AQ_REQUEST_STATS flag so iavf_watchdog_task() will explicitly
- * request and refresh ethtool stats
+ * @flags: requested aq flags
  **/
-void iavf_schedule_request_stats(struct iavf_adapter *adapter)
+void iavf_schedule_aq_request(struct iavf_adapter *adapter, u64 flags)
 {
-	adapter->aq_required |= IAVF_FLAG_AQ_REQUEST_STATS;
+	adapter->aq_required |= flags;
 	mod_delayed_work(adapter->wq, &adapter->watchdog_task, 0);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -314,15 +314,13 @@ void iavf_schedule_reset(struct iavf_adapter *adapter, u64 flags)`
`314`	`314`	`}`
`315`	`315`
`316`	`316`	`/**`
`317`		`- * iavf_schedule_request_stats - Set the flags and schedule statistics request`
	`317`	`+ * iavf_schedule_aq_request - Set the flags and schedule aq request`
`318`	`318`	`* @adapter: board private structure`
`319`		`- *`
`320`		`- * Sets IAVF_FLAG_AQ_REQUEST_STATS flag so iavf_watchdog_task() will explicitly`
`321`		`- * request and refresh ethtool stats`
	`319`	`+ * @flags: requested aq flags`
`322`	`320`	`**/`
`323`		`-void iavf_schedule_request_stats(struct iavf_adapter *adapter)`
	`321`	`+void iavf_schedule_aq_request(struct iavf_adapter *adapter, u64 flags)`
`324`	`322`	`{`
`325`		`- adapter->aq_required \|= IAVF_FLAG_AQ_REQUEST_STATS;`
	`323`	`+ adapter->aq_required \|= flags;`
`326`	`324`	`mod_delayed_work(adapter->wq, &adapter->watchdog_task, 0);`
`327`	`325`	`}`
`328`	`326`