Message ID | 20200122152138.41585-7-anthony.l.nguyen@intel.com |
---|---|
State | Accepted |
Delegated to: | Jeff Kirsher |
Headers | show |
Series | [S38,01/15] ice: Add initial support for QinQ | expand |
> -----Original Message----- > From: Intel-wired-lan [mailto:intel-wired-lan-bounces@osuosl.org] On > Behalf Of Tony Nguyen > Sent: Wednesday, January 22, 2020 7:22 AM > To: intel-wired-lan@lists.osuosl.org > Subject: [Intel-wired-lan] [PATCH S38 07/15] ice: Fix implicit queue mapping > mode in ice_vsi_get_qs > > From: Brett Creeley <brett.creeley@intel.com> > > Currently in ice_vsi_get_qs() we set the mapping_mode for Tx and Rx to > vsi->[tx|rx]_mapping_mode, but the problem is vsi- > >[tx|rx]_mapping_mode > have not been set yet. This was working because ICE_VSI_MAP_CONTIG is > defined to 0. Fix this by being explicit with our mapping mode by initializing > the Tx and Rx structure's mapping_mode to ICE_VSI_MAP_CONTIG and then > setting the vsi->[tx|rx]_mapping_mode to the > [tx|rx]_qs_cfg.mapping_mode values. > > Also, only assign the vsi->[tx|rx]_mapping_mode when the queues are > successfully mapped to the VSI. With this change there was no longer a need > to initialize the ret variable to 0 so remove that. > > Signed-off-by: Brett Creeley <brett.creeley@intel.com> > --- > drivers/net/ethernet/intel/ice/ice_lib.c | 21 ++++++++++++--------- > 1 file changed, 12 insertions(+), 9 deletions(-) Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
diff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c index 7e927576fcf0..cea664da9b94 100644 --- a/drivers/net/ethernet/intel/ice/ice_lib.c +++ b/drivers/net/ethernet/intel/ice/ice_lib.c @@ -443,7 +443,7 @@ static int ice_vsi_get_qs(struct ice_vsi *vsi) .scatter_count = ICE_MAX_SCATTER_TXQS, .vsi_map = vsi->txq_map, .vsi_map_offset = 0, - .mapping_mode = vsi->tx_mapping_mode + .mapping_mode = ICE_VSI_MAP_CONTIG }; struct ice_qs_cfg rx_qs_cfg = { .qs_mutex = &pf->avail_q_mutex, @@ -453,18 +453,21 @@ static int ice_vsi_get_qs(struct ice_vsi *vsi) .scatter_count = ICE_MAX_SCATTER_RXQS, .vsi_map = vsi->rxq_map, .vsi_map_offset = 0, - .mapping_mode = vsi->rx_mapping_mode + .mapping_mode = ICE_VSI_MAP_CONTIG }; - int ret = 0; - - vsi->tx_mapping_mode = ICE_VSI_MAP_CONTIG; - vsi->rx_mapping_mode = ICE_VSI_MAP_CONTIG; + int ret; ret = __ice_vsi_get_qs(&tx_qs_cfg); - if (!ret) - ret = __ice_vsi_get_qs(&rx_qs_cfg); + if (ret) + return ret; + vsi->tx_mapping_mode = tx_qs_cfg.mapping_mode; - return ret; + ret = __ice_vsi_get_qs(&rx_qs_cfg); + if (ret) + return ret; + vsi->rx_mapping_mode = rx_qs_cfg.mapping_mode; + + return 0; } /**