From: Jesus Sanchez-Palencia <jesus.sanchez-palencia@intel.com> To: netdev@vger.kernel.org Cc: jhs@mojatatu.com, xiyou.wangcong@gmail.com, jiri@resnulli.us, vinicius.gomes@intel.com, richardcochran@gmail.com, intel-wired-lan@lists.osuosl.org, anna-maria@linutronix.de, henrik@austad.us, tglx@linutronix.de, john.stultz@linaro.org, levi.pearson@harman.com, edumazet@google.com, willemb@google.com, mlichvar@redhat.com, Jesus Sanchez-Palencia <jesus.sanchez-palencia@intel.com> Subject: [RFC v3 net-next 16/18] igb: Only change Tx arbitration when CBS is on Date: Tue, 6 Mar 2018 17:12:28 -0800 [thread overview] Message-ID: <20180307011230.24001-17-jesus.sanchez-palencia@intel.com> (raw) In-Reply-To: <20180307011230.24001-1-jesus.sanchez-palencia@intel.com> Currently the data transmission arbitration algorithm - DataTranARB field on TQAVCTRL reg - is always set to CBS when the Tx mode is changed from legacy to 'Qav' mode. Make that configuration a bit more granular in preparation for the upcoming Launchtime enabling patches, since CBS and Launchtime can be enabled separately. That is achieved by moving the DataTranARB setup to igb_config_tx_modes() instead. Similarly, when disabling CBS we must check if it has been disabled for all queues, and clear the DataTranARB accordingly. Signed-off-by: Jesus Sanchez-Palencia <jesus.sanchez-palencia@intel.com> --- drivers/net/ethernet/intel/igb/igb_main.c | 49 +++++++++++++++++++++---------- 1 file changed, 33 insertions(+), 16 deletions(-) diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index 49cfbe4fd2b1..9c33f2d18d8c 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -1672,6 +1672,18 @@ static void set_queue_mode(struct e1000_hw *hw, int queue, enum queue_mode mode) wr32(E1000_I210_TQAVCC(queue), val); } +static bool is_any_cbs_enabled(struct igb_adapter *adapter) +{ + int i; + + for (i = 0; i < adapter->num_tx_queues; i++) { + if (adapter->tx_ring[i]->cbs_enable) + return true; + } + + return false; +} + /** * igb_config_tx_modes - Configure "Qav Tx mode" features on igb * @adapter: pointer to adapter struct @@ -1686,7 +1698,7 @@ static void igb_config_tx_modes(struct igb_adapter *adapter, int queue) struct igb_ring *ring = adapter->tx_ring[queue]; struct net_device *netdev = adapter->netdev; struct e1000_hw *hw = &adapter->hw; - u32 tqavcc; + u32 tqavcc, tqavctrl; u16 value; WARN_ON(hw->mac.type != e1000_i210); @@ -1696,6 +1708,14 @@ static void igb_config_tx_modes(struct igb_adapter *adapter, int queue) set_tx_desc_fetch_prio(hw, queue, TX_QUEUE_PRIO_HIGH); set_queue_mode(hw, queue, QUEUE_MODE_STREAM_RESERVATION); + /* Always set data transfer arbitration to credit-based + * shaper algorithm on TQAVCTRL if CBS is enabled for any of + * the queues. + */ + tqavctrl = rd32(E1000_I210_TQAVCTRL); + tqavctrl |= E1000_TQAVCTRL_DATATRANARB; + wr32(E1000_I210_TQAVCTRL, tqavctrl); + /* According to i210 datasheet section 7.2.7.7, we should set * the 'idleSlope' field from TQAVCC register following the * equation: @@ -1773,6 +1793,16 @@ static void igb_config_tx_modes(struct igb_adapter *adapter, int queue) /* Set hiCredit to zero. */ wr32(E1000_I210_TQAVHC(queue), 0); + + /* If CBS is not enabled for any queues anymore, then return to + * the default state of Data Transmission Arbitration on + * TQAVCTRL. + */ + if (!is_any_cbs_enabled(adapter)) { + tqavctrl = rd32(E1000_I210_TQAVCTRL); + tqavctrl &= ~E1000_TQAVCTRL_DATATRANARB; + wr32(E1000_I210_TQAVCTRL, tqavctrl); + } } /* XXX: In i210 controller the sendSlope and loCredit parameters from @@ -1806,18 +1836,6 @@ static int igb_save_cbs_params(struct igb_adapter *adapter, int queue, return 0; } -static bool is_any_cbs_enabled(struct igb_adapter *adapter) -{ - int i; - - for (i = 0; i < adapter->num_tx_queues; i++) { - if (adapter->tx_ring[i]->cbs_enable) - return true; - } - - return false; -} - /** * igb_setup_tx_mode - Switch to/from Qav Tx mode when applicable * @adapter: pointer to adapter struct @@ -1841,11 +1859,10 @@ static void igb_setup_tx_mode(struct igb_adapter *adapter) int i, max_queue; /* Configure TQAVCTRL register: set transmit mode to 'Qav', - * set data fetch arbitration to 'round robin' and set data - * transfer arbitration to 'credit shaper algorithm. + * set data fetch arbitration to 'round robin'. */ val = rd32(E1000_I210_TQAVCTRL); - val |= E1000_TQAVCTRL_XMIT_MODE | E1000_TQAVCTRL_DATATRANARB; + val |= E1000_TQAVCTRL_XMIT_MODE; val &= ~E1000_TQAVCTRL_DATAFETCHARB; wr32(E1000_I210_TQAVCTRL, val); -- 2.16.2
WARNING: multiple messages have this Message-ID (diff)
From: Jesus Sanchez-Palencia <jesus.sanchez-palencia@intel.com> To: intel-wired-lan@osuosl.org Subject: [Intel-wired-lan] [RFC v3 net-next 16/18] igb: Only change Tx arbitration when CBS is on Date: Tue, 6 Mar 2018 17:12:28 -0800 [thread overview] Message-ID: <20180307011230.24001-17-jesus.sanchez-palencia@intel.com> (raw) In-Reply-To: <20180307011230.24001-1-jesus.sanchez-palencia@intel.com> Currently the data transmission arbitration algorithm - DataTranARB field on TQAVCTRL reg - is always set to CBS when the Tx mode is changed from legacy to 'Qav' mode. Make that configuration a bit more granular in preparation for the upcoming Launchtime enabling patches, since CBS and Launchtime can be enabled separately. That is achieved by moving the DataTranARB setup to igb_config_tx_modes() instead. Similarly, when disabling CBS we must check if it has been disabled for all queues, and clear the DataTranARB accordingly. Signed-off-by: Jesus Sanchez-Palencia <jesus.sanchez-palencia@intel.com> --- drivers/net/ethernet/intel/igb/igb_main.c | 49 +++++++++++++++++++++---------- 1 file changed, 33 insertions(+), 16 deletions(-) diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index 49cfbe4fd2b1..9c33f2d18d8c 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -1672,6 +1672,18 @@ static void set_queue_mode(struct e1000_hw *hw, int queue, enum queue_mode mode) wr32(E1000_I210_TQAVCC(queue), val); } +static bool is_any_cbs_enabled(struct igb_adapter *adapter) +{ + int i; + + for (i = 0; i < adapter->num_tx_queues; i++) { + if (adapter->tx_ring[i]->cbs_enable) + return true; + } + + return false; +} + /** * igb_config_tx_modes - Configure "Qav Tx mode" features on igb * @adapter: pointer to adapter struct @@ -1686,7 +1698,7 @@ static void igb_config_tx_modes(struct igb_adapter *adapter, int queue) struct igb_ring *ring = adapter->tx_ring[queue]; struct net_device *netdev = adapter->netdev; struct e1000_hw *hw = &adapter->hw; - u32 tqavcc; + u32 tqavcc, tqavctrl; u16 value; WARN_ON(hw->mac.type != e1000_i210); @@ -1696,6 +1708,14 @@ static void igb_config_tx_modes(struct igb_adapter *adapter, int queue) set_tx_desc_fetch_prio(hw, queue, TX_QUEUE_PRIO_HIGH); set_queue_mode(hw, queue, QUEUE_MODE_STREAM_RESERVATION); + /* Always set data transfer arbitration to credit-based + * shaper algorithm on TQAVCTRL if CBS is enabled for any of + * the queues. + */ + tqavctrl = rd32(E1000_I210_TQAVCTRL); + tqavctrl |= E1000_TQAVCTRL_DATATRANARB; + wr32(E1000_I210_TQAVCTRL, tqavctrl); + /* According to i210 datasheet section 7.2.7.7, we should set * the 'idleSlope' field from TQAVCC register following the * equation: @@ -1773,6 +1793,16 @@ static void igb_config_tx_modes(struct igb_adapter *adapter, int queue) /* Set hiCredit to zero. */ wr32(E1000_I210_TQAVHC(queue), 0); + + /* If CBS is not enabled for any queues anymore, then return to + * the default state of Data Transmission Arbitration on + * TQAVCTRL. + */ + if (!is_any_cbs_enabled(adapter)) { + tqavctrl = rd32(E1000_I210_TQAVCTRL); + tqavctrl &= ~E1000_TQAVCTRL_DATATRANARB; + wr32(E1000_I210_TQAVCTRL, tqavctrl); + } } /* XXX: In i210 controller the sendSlope and loCredit parameters from @@ -1806,18 +1836,6 @@ static int igb_save_cbs_params(struct igb_adapter *adapter, int queue, return 0; } -static bool is_any_cbs_enabled(struct igb_adapter *adapter) -{ - int i; - - for (i = 0; i < adapter->num_tx_queues; i++) { - if (adapter->tx_ring[i]->cbs_enable) - return true; - } - - return false; -} - /** * igb_setup_tx_mode - Switch to/from Qav Tx mode when applicable * @adapter: pointer to adapter struct @@ -1841,11 +1859,10 @@ static void igb_setup_tx_mode(struct igb_adapter *adapter) int i, max_queue; /* Configure TQAVCTRL register: set transmit mode to 'Qav', - * set data fetch arbitration to 'round robin' and set data - * transfer arbitration to 'credit shaper algorithm. + * set data fetch arbitration to 'round robin'. */ val = rd32(E1000_I210_TQAVCTRL); - val |= E1000_TQAVCTRL_XMIT_MODE | E1000_TQAVCTRL_DATATRANARB; + val |= E1000_TQAVCTRL_XMIT_MODE; val &= ~E1000_TQAVCTRL_DATAFETCHARB; wr32(E1000_I210_TQAVCTRL, val); -- 2.16.2
next prev parent reply other threads:[~2018-03-07 1:15 UTC|newest] Thread overview: 129+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-03-07 1:12 [RFC v3 net-next 00/18] Time based packet transmission Jesus Sanchez-Palencia 2018-03-07 1:12 ` [Intel-wired-lan] " Jesus Sanchez-Palencia 2018-03-07 1:12 ` [RFC v3 net-next 01/18] sock: Fix SO_ZEROCOPY switch case Jesus Sanchez-Palencia 2018-03-07 1:12 ` [Intel-wired-lan] " Jesus Sanchez-Palencia 2018-03-07 16:58 ` Willem de Bruijn 2018-03-07 16:58 ` [Intel-wired-lan] " Willem de Bruijn 2018-03-07 1:12 ` [RFC v3 net-next 02/18] net: Clear skb->tstamp only on the forwarding path Jesus Sanchez-Palencia 2018-03-07 1:12 ` [Intel-wired-lan] " Jesus Sanchez-Palencia 2018-03-07 16:59 ` Willem de Bruijn 2018-03-07 16:59 ` [Intel-wired-lan] " Willem de Bruijn 2018-03-07 22:03 ` Jesus Sanchez-Palencia 2018-03-07 22:03 ` [Intel-wired-lan] " Jesus Sanchez-Palencia 2018-03-07 1:12 ` [RFC v3 net-next 03/18] posix-timers: Add CLOCKID_INVALID mask Jesus Sanchez-Palencia 2018-03-07 1:12 ` [Intel-wired-lan] " Jesus Sanchez-Palencia 2018-03-07 1:12 ` [RFC v3 net-next 04/18] net: Add a new socket option for a future transmit time Jesus Sanchez-Palencia 2018-03-07 1:12 ` [Intel-wired-lan] " Jesus Sanchez-Palencia 2018-03-07 1:12 ` [RFC v3 net-next 05/18] net: ipv4: raw: Hook into time based transmission Jesus Sanchez-Palencia 2018-03-07 1:12 ` [Intel-wired-lan] " Jesus Sanchez-Palencia 2018-03-07 17:00 ` Willem de Bruijn 2018-03-07 17:00 ` [Intel-wired-lan] " Willem de Bruijn 2018-03-07 1:12 ` [RFC v3 net-next 06/18] net: ipv4: udp: " Jesus Sanchez-Palencia 2018-03-07 1:12 ` [Intel-wired-lan] " Jesus Sanchez-Palencia 2018-03-07 17:00 ` Willem de Bruijn 2018-03-07 17:00 ` [Intel-wired-lan] " Willem de Bruijn 2018-03-07 1:12 ` [RFC v3 net-next 07/18] net: packet: " Jesus Sanchez-Palencia 2018-03-07 1:12 ` [Intel-wired-lan] " Jesus Sanchez-Palencia 2018-03-07 1:12 ` [RFC v3 net-next 08/18] net: SO_TXTIME: Add clockid and drop_if_late params Jesus Sanchez-Palencia 2018-03-07 1:12 ` [Intel-wired-lan] " Jesus Sanchez-Palencia 2018-03-07 2:53 ` Eric Dumazet 2018-03-07 2:53 ` [Intel-wired-lan] " Eric Dumazet 2018-03-07 5:24 ` Richard Cochran 2018-03-07 5:24 ` [Intel-wired-lan] " Richard Cochran 2018-03-07 17:01 ` Willem de Bruijn 2018-03-07 17:01 ` [Intel-wired-lan] " Willem de Bruijn 2018-03-07 17:35 ` Richard Cochran 2018-03-07 17:35 ` [Intel-wired-lan] " Richard Cochran 2018-03-07 17:37 ` Richard Cochran 2018-03-07 17:37 ` [Intel-wired-lan] " Richard Cochran 2018-03-07 17:47 ` Eric Dumazet 2018-03-07 17:47 ` [Intel-wired-lan] " Eric Dumazet 2018-03-08 16:44 ` Richard Cochran 2018-03-08 16:44 ` [Intel-wired-lan] " Richard Cochran 2018-03-08 17:56 ` Jesus Sanchez-Palencia 2018-03-08 17:56 ` [Intel-wired-lan] " Jesus Sanchez-Palencia 2018-03-21 12:58 ` Thomas Gleixner 2018-03-21 12:58 ` [Intel-wired-lan] " Thomas Gleixner 2018-03-21 14:59 ` Richard Cochran 2018-03-21 14:59 ` [Intel-wired-lan] " Richard Cochran 2018-03-21 15:11 ` Thomas Gleixner 2018-03-07 21:52 ` Jesus Sanchez-Palencia 2018-03-07 21:52 ` [Intel-wired-lan] " Jesus Sanchez-Palencia 2018-03-07 22:45 ` Eric Dumazet 2018-03-07 22:45 ` [Intel-wired-lan] " Eric Dumazet 2018-03-07 23:03 ` David Miller 2018-03-07 23:03 ` [Intel-wired-lan] " David Miller 2018-03-08 11:37 ` Miroslav Lichvar 2018-03-08 11:37 ` [Intel-wired-lan] " Miroslav Lichvar 2018-03-08 16:25 ` David Miller 2018-03-08 16:25 ` [Intel-wired-lan] " David Miller 2018-03-07 1:12 ` [RFC v3 net-next 09/18] net: ipv4: raw: Handle remaining txtime parameters Jesus Sanchez-Palencia 2018-03-07 1:12 ` [Intel-wired-lan] " Jesus Sanchez-Palencia 2018-03-07 1:12 ` [RFC v3 net-next 10/18] net: ipv4: udp: " Jesus Sanchez-Palencia 2018-03-07 1:12 ` [Intel-wired-lan] " Jesus Sanchez-Palencia 2018-03-07 1:12 ` [RFC v3 net-next 11/18] net: packet: " Jesus Sanchez-Palencia 2018-03-07 1:12 ` [Intel-wired-lan] " Jesus Sanchez-Palencia 2018-03-07 1:12 ` [RFC v3 net-next 12/18] net/sched: Allow creating a Qdisc watchdog with other clocks Jesus Sanchez-Palencia 2018-03-07 1:12 ` [Intel-wired-lan] " Jesus Sanchez-Palencia 2018-03-07 1:12 ` [RFC v3 net-next 13/18] net/sched: Introduce the TBS Qdisc Jesus Sanchez-Palencia 2018-03-07 1:12 ` [Intel-wired-lan] " Jesus Sanchez-Palencia 2018-03-21 13:46 ` Thomas Gleixner 2018-03-21 13:46 ` [Intel-wired-lan] " Thomas Gleixner 2018-03-21 22:29 ` Thomas Gleixner 2018-03-22 20:25 ` Jesus Sanchez-Palencia 2018-03-22 22:52 ` Thomas Gleixner 2018-03-24 0:34 ` Jesus Sanchez-Palencia 2018-03-25 11:46 ` Thomas Gleixner 2018-03-27 23:26 ` Jesus Sanchez-Palencia 2018-03-28 7:48 ` Thomas Gleixner 2018-03-28 13:07 ` Henrik Austad 2018-04-09 16:36 ` Jesus Sanchez-Palencia 2018-04-10 12:37 ` Thomas Gleixner 2018-04-10 21:24 ` Jesus Sanchez-Palencia 2018-04-11 20:16 ` Thomas Gleixner 2018-04-11 20:31 ` Ivan Briano 2018-04-11 23:38 ` Jesus Sanchez-Palencia 2018-04-12 15:03 ` Richard Cochran 2018-04-12 15:19 ` Miroslav Lichvar 2018-04-19 10:03 ` Thomas Gleixner 2018-03-22 20:29 ` Jesus Sanchez-Palencia 2018-03-22 22:11 ` Thomas Gleixner 2018-03-22 23:26 ` Jesus Sanchez-Palencia 2018-03-23 8:49 ` Thomas Gleixner 2018-03-23 23:34 ` Jesus Sanchez-Palencia 2018-04-23 18:21 ` Jesus Sanchez-Palencia 2018-04-23 18:21 ` [Intel-wired-lan] " Jesus Sanchez-Palencia 2018-04-24 8:50 ` Thomas Gleixner 2018-04-24 8:50 ` [Intel-wired-lan] " Thomas Gleixner 2018-04-24 13:50 ` David Miller 2018-04-24 13:50 ` [Intel-wired-lan] " David Miller 2018-03-07 1:12 ` [RFC v3 net-next 14/18] net/sched: Add HW offloading capability to TBS Jesus Sanchez-Palencia 2018-03-07 1:12 ` [Intel-wired-lan] " Jesus Sanchez-Palencia 2018-03-21 14:22 ` Thomas Gleixner 2018-03-21 14:22 ` [Intel-wired-lan] " Thomas Gleixner 2018-03-21 15:03 ` Richard Cochran 2018-03-21 15:03 ` [Intel-wired-lan] " Richard Cochran 2018-03-21 16:18 ` Thomas Gleixner 2018-03-22 22:01 ` Jesus Sanchez-Palencia 2018-03-22 23:15 ` Jesus Sanchez-Palencia 2018-03-22 23:15 ` [Intel-wired-lan] " Jesus Sanchez-Palencia 2018-03-23 8:51 ` Thomas Gleixner 2018-03-23 8:51 ` [Intel-wired-lan] " Thomas Gleixner 2018-03-07 1:12 ` [RFC v3 net-next 15/18] igb: Refactor igb_configure_cbs() Jesus Sanchez-Palencia 2018-03-07 1:12 ` [Intel-wired-lan] " Jesus Sanchez-Palencia 2018-03-07 1:12 ` Jesus Sanchez-Palencia [this message] 2018-03-07 1:12 ` [Intel-wired-lan] [RFC v3 net-next 16/18] igb: Only change Tx arbitration when CBS is on Jesus Sanchez-Palencia 2018-03-07 1:12 ` [RFC v3 net-next 17/18] igb: Refactor igb_offload_cbs() Jesus Sanchez-Palencia 2018-03-07 1:12 ` [Intel-wired-lan] " Jesus Sanchez-Palencia 2018-03-07 1:12 ` [RFC v3 net-next 18/18] igb: Add support for TBS offload Jesus Sanchez-Palencia 2018-03-07 1:12 ` [Intel-wired-lan] " Jesus Sanchez-Palencia 2018-03-07 5:28 ` [RFC v3 net-next 00/18] Time based packet transmission Richard Cochran 2018-03-07 5:28 ` [Intel-wired-lan] " Richard Cochran 2018-03-08 14:09 ` Henrik Austad 2018-03-08 14:09 ` [Intel-wired-lan] " Henrik Austad 2018-03-08 18:06 ` Jesus Sanchez-Palencia 2018-03-08 18:06 ` [Intel-wired-lan] " Jesus Sanchez-Palencia 2018-03-08 22:54 ` Henrik Austad 2018-03-08 22:54 ` [Intel-wired-lan] " Henrik Austad 2018-03-08 23:58 ` Jesus Sanchez-Palencia 2018-03-08 23:58 ` [Intel-wired-lan] " Jesus Sanchez-Palencia
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=20180307011230.24001-17-jesus.sanchez-palencia@intel.com \ --to=jesus.sanchez-palencia@intel.com \ --cc=anna-maria@linutronix.de \ --cc=edumazet@google.com \ --cc=henrik@austad.us \ --cc=intel-wired-lan@lists.osuosl.org \ --cc=jhs@mojatatu.com \ --cc=jiri@resnulli.us \ --cc=john.stultz@linaro.org \ --cc=levi.pearson@harman.com \ --cc=mlichvar@redhat.com \ --cc=netdev@vger.kernel.org \ --cc=richardcochran@gmail.com \ --cc=tglx@linutronix.de \ --cc=vinicius.gomes@intel.com \ --cc=willemb@google.com \ --cc=xiyou.wangcong@gmail.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.