From: Faizal Rahim <faizal.abdul.rahim@linux.intel.com>
To: "David S . Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Jesse Brandeburg <jesse.brandeburg@intel.com>,
Tony Nguyen <anthony.l.nguyen@intel.com>,
Vinicius Costa Gomes <vinicius.gomes@intel.com>
Cc: intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, stable@vger.kernel.org,
Faizal Rahim <faizal.abdul.rahim@linux.intel.com>
Subject: [PATCH iwl-net v1 3/4] igc: Remove unused qbv_count
Date: Tue, 2 Jul 2024 00:09:25 -0400 [thread overview]
Message-ID: <20240702040926.3327530-4-faizal.abdul.rahim@linux.intel.com> (raw)
In-Reply-To: <20240702040926.3327530-1-faizal.abdul.rahim@linux.intel.com>
Removing qbv_count which is now obsolete after these 2 patches:
"igc: Fix reset adapter logics when tx mode change"
"igc: Fix qbv_config_change_errors logics"
The variable qbv_count serves to indicate whether Taprio is active or if
the tx mode is in TSN (IGC_TQAVCTRL_TRANSMIT_MODE_TSN). This is due to its
unconditional increment within igc_tsn_enable_offload(), which both runs
Taprio and sets the tx mode to TSN.
Signed-off-by: Faizal Rahim <faizal.abdul.rahim@linux.intel.com>
---
drivers/net/ethernet/intel/igc/igc.h | 1 -
drivers/net/ethernet/intel/igc/igc_main.c | 1 -
drivers/net/ethernet/intel/igc/igc_tsn.c | 2 --
3 files changed, 4 deletions(-)
diff --git a/drivers/net/ethernet/intel/igc/igc.h b/drivers/net/ethernet/intel/igc/igc.h
index 8b14c029eda1..5fd0d85f83ac 100644
--- a/drivers/net/ethernet/intel/igc/igc.h
+++ b/drivers/net/ethernet/intel/igc/igc.h
@@ -254,7 +254,6 @@ struct igc_adapter {
bool taprio_offload_enable;
u32 qbv_config_change_errors;
bool qbv_transition;
- unsigned int qbv_count;
/* Access to oper_gate_closed, admin_gate_closed and qbv_transition
* are protected by the qbv_tx_lock.
*/
diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c
index 0f8a5ad940ec..e7664bd81505 100644
--- a/drivers/net/ethernet/intel/igc/igc_main.c
+++ b/drivers/net/ethernet/intel/igc/igc_main.c
@@ -6246,7 +6246,6 @@ static int igc_qbv_clear_schedule(struct igc_adapter *adapter)
adapter->cycle_time = NSEC_PER_SEC;
adapter->taprio_offload_enable = false;
adapter->qbv_config_change_errors = 0;
- adapter->qbv_count = 0;
for (i = 0; i < adapter->num_tx_queues; i++) {
struct igc_ring *ring = adapter->tx_ring[i];
diff --git a/drivers/net/ethernet/intel/igc/igc_tsn.c b/drivers/net/ethernet/intel/igc/igc_tsn.c
index 61f047ebf34d..26dbe3442ad1 100644
--- a/drivers/net/ethernet/intel/igc/igc_tsn.c
+++ b/drivers/net/ethernet/intel/igc/igc_tsn.c
@@ -267,8 +267,6 @@ static int igc_tsn_enable_offload(struct igc_adapter *adapter)
tqavctrl |= IGC_TQAVCTRL_TRANSMIT_MODE_TSN | IGC_TQAVCTRL_ENHANCED_QAV;
- adapter->qbv_count++;
-
cycle = adapter->cycle_time;
base_time = adapter->base_time;
--
2.25.1
next prev parent reply other threads:[~2024-07-02 4:11 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-02 4:09 [PATCH iwl-net v1 0/4] igc bug fixes related to qbv_count usage Faizal Rahim
2024-07-02 4:09 ` [PATCH iwl-net v1 1/4] igc: Fix qbv_config_change_errors logics Faizal Rahim
2024-07-03 15:08 ` Simon Horman
2024-07-05 16:58 ` Abdul Rahim, Faizal
2024-07-02 4:09 ` [PATCH iwl-net v1 2/4] igc: Fix reset adapter logics when tx mode change Faizal Rahim
2024-07-03 15:03 ` Simon Horman
2024-07-05 16:52 ` Abdul Rahim, Faizal
2024-07-02 4:09 ` Faizal Rahim [this message]
2024-07-03 15:10 ` [PATCH iwl-net v1 3/4] igc: Remove unused qbv_count Simon Horman
2024-07-05 16:47 ` Abdul Rahim, Faizal
2024-07-02 4:09 ` [PATCH iwl-net v1 4/4] igc: Fix qbv tx latency by setting gtxoffset Faizal Rahim
2024-07-03 15:10 ` Simon Horman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240702040926.3327530-4-faizal.abdul.rahim@linux.intel.com \
--to=faizal.abdul.rahim@linux.intel.com \
--cc=anthony.l.nguyen@intel.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=jesse.brandeburg@intel.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=stable@vger.kernel.org \
--cc=vinicius.gomes@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®