| Message ID | 20180410174959.18757-3-vinicius.gomes@intel.com |
|---|---|
| State | Accepted |
| Delegated to: | Jeff Kirsher |
| Headers | show |
| Series | igb: offloading of receive filters | expand |
> From: Intel-wired-lan [mailto:intel-wired-lan-bounces@osuosl.org] On > Behalf Of Vinicius Costa Gomes > Sent: Tuesday, April 10, 2018 10:50 AM > To: intel-wired-lan@lists.osuosl.org > Cc: netdev@vger.kernel.org; Sanchez-Palencia, Jesus <jesus.sanchez- > palencia@intel.com> > Subject: [Intel-wired-lan] [next-queue PATCH v7 02/10] igb: Fix queue > selection on MAC filters on i210 > > On the RAH registers there are semantic differences on the meaning of > the "queue" parameter for traffic steering depending on the controller > model: there is the 82575 meaning, which "queue" means a RX Hardware > Queue, and the i350 meaning, where it is a reception pool. > > The previous behaviour was having no effect for i210 based controllers > because the QSEL bit of the RAH register wasn't being set. > > This patch separates the condition in discrete cases, so the different > handling is clearer. > > Fixes: 83c21335c876 ("igb: improve MAC filter handling") > Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@intel.com> > --- > drivers/net/ethernet/intel/igb/igb_main.c | 13 +++++++++---- > 1 file changed, 9 insertions(+), 4 deletions(-) > Tested by: Aaron Brown <aaron.f.brown@intel.com>
> From: Brown, Aaron F > Sent: Friday, April 13, 2018 7:18 PM > To: 'Vinicius Costa Gomes' <vinicius.gomes@intel.com>; intel-wired- > lan@lists.osuosl.org > Cc: netdev@vger.kernel.org; Sanchez-Palencia, Jesus <jesus.sanchez- > palencia@intel.com> > Subject: RE: [Intel-wired-lan] [next-queue PATCH v7 02/10] igb: Fix queue > selection on MAC filters on i210 > > > From: Intel-wired-lan [mailto:intel-wired-lan-bounces@osuosl.org] On > > Behalf Of Vinicius Costa Gomes > > Sent: Tuesday, April 10, 2018 10:50 AM > > To: intel-wired-lan@lists.osuosl.org > > Cc: netdev@vger.kernel.org; Sanchez-Palencia, Jesus <jesus.sanchez- > > palencia@intel.com> > > Subject: [Intel-wired-lan] [next-queue PATCH v7 02/10] igb: Fix queue > > selection on MAC filters on i210 > > > > On the RAH registers there are semantic differences on the meaning of > > the "queue" parameter for traffic steering depending on the controller > > model: there is the 82575 meaning, which "queue" means a RX Hardware > > Queue, and the i350 meaning, where it is a reception pool. > > > > The previous behaviour was having no effect for i210 based controllers > > because the QSEL bit of the RAH register wasn't being set. > > > > This patch separates the condition in discrete cases, so the different > > handling is clearer. > > > > Fixes: 83c21335c876 ("igb: improve MAC filter handling") > > Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@intel.com> > > --- > > drivers/net/ethernet/intel/igb/igb_main.c | 13 +++++++++---- > > 1 file changed, 9 insertions(+), 4 deletions(-) > > > > Tested by: Aaron Brown <aaron.f.brown@intel.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com>
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index c1c0bc30a16d..0a79fef3c4fb 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -8748,12 +8748,17 @@ static void igb_rar_set_index(struct igb_adapter *adapter, u32 index) if (is_valid_ether_addr(addr)) rar_high |= E1000_RAH_AV; - if (hw->mac.type == e1000_82575) + switch (hw->mac.type) { + case e1000_82575: + case e1000_i210: rar_high |= E1000_RAH_POOL_1 * - adapter->mac_table[index].queue; - else + adapter->mac_table[index].queue; + break; + default: rar_high |= E1000_RAH_POOL_1 << - adapter->mac_table[index].queue; + adapter->mac_table[index].queue; + break; + } } wr32(E1000_RAL(index), rar_low);
On the RAH registers there are semantic differences on the meaning of the "queue" parameter for traffic steering depending on the controller model: there is the 82575 meaning, which "queue" means a RX Hardware Queue, and the i350 meaning, where it is a reception pool. The previous behaviour was having no effect for i210 based controllers because the QSEL bit of the RAH register wasn't being set. This patch separates the condition in discrete cases, so the different handling is clearer. Fixes: 83c21335c876 ("igb: improve MAC filter handling") Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@intel.com> --- drivers/net/ethernet/intel/igb/igb_main.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)