> > diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
> > b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
> > index b41f0be..5a35fdb 100644
> > --- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
> > +++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
> > @@ -1901,14 +1901,29 @@ static int
> i40e_get_per_queue_coalesce(struct
> > net_device *netdev, int queue,
> > return __i40e_get_coalesce(netdev, ec, queue); }
> >
> > -static int i40e_set_coalesce(struct net_device *netdev,
> > - struct ethtool_coalesce *ec)
> > +static void i40e_set_itr_for_queue(struct i40e_vsi *vsi, int queue,
> > +u16
> > vector)
> > {
> > - struct i40e_netdev_priv *np = netdev_priv(netdev);
> > struct i40e_q_vector *q_vector;
> > - struct i40e_vsi *vsi = np->vsi;
> > struct i40e_pf *pf = vsi->back;
> > struct i40e_hw *hw = &pf->hw;
> > + u16 intrl = INTRL_USEC_TO_REG(vsi->int_rate_limit);
> > +
> > + q_vector = vsi->q_vectors[queue];
>
> Again, the problem here is that there can be more queues than vectors, so
> you'll need to check the requested queue number against vsi-
> >num_queue_pairs for the max queue check, then look at vsi-
> >tx_rings[queue].q_vector and/or vsi->rx_rings[queue].q_vector to find
> the actual q_vector for the requested queue.
>
> Also, this means that it would be possible for the user to try to assign
> different values to queues on the same vector. How do you want to
> handle that? My first inclination is to not do anything and just let the last
> value assigned win.
>
Hi sln,
Thanks for the comments. I will fix it in V2.
Could you please check if the following code can find and set/get vector
correctly?
Get rx_usecs and tx_usecs per queue
+ if (queue > 0) {
+ if (queue >= vsi->num_queue_pairs) {
+ netif_info(pf, drv, netdev, "Invalid queue number\n");
+ return -EINVAL;
+ }
+
+ q_vector = vsi->rx_rings[queue]->q_vector;
+ vector = vsi->base_vector + q_vector->v_idx;
+ ec->rx_coalesce_usecs = ITR_REG_TO_USEC(rd32(hw,
I40E_PFINT_ITRN(0, vector - 1)));
+
+ q_vector = vsi->tx_rings[queue]->q_vector;
+ vector = vsi->base_vector + q_vector->v_idx;
+ ec->tx_coalesce_usecs = ITR_REG_TO_USEC(rd32(hw,
I40E_PFINT_ITRN(1, vector - 1)));
+ }
Set rx_usecs and tx_usecs per queue
+ if (queue >= vsi->num_queue_pairs) {
+ netif_info(pf, drv, netdev, "Invalid queue value, queue
range is 0 - %d\n", vsi->num_queue_pairs - 1);
+ return -EINVAL;
+ }
+ intrl = INTRL_USEC_TO_REG(vsi->int_rate_limit);
- q_vector = vsi->q_vectors[i];
+ q_vector = vsi->rx_rings[queue]->q_vector;
+ vector = vsi->base_vector + q_vector->v_idx;
q_vector->rx.itr = ITR_TO_REG(vsi->rx_itr_setting);
wr32(hw, I40E_PFINT_ITRN(0, vector - 1), q_vector->rx.itr);
+
+ q_vector = vsi->tx_rings[queue]->q_vector;
+ vector = vsi->base_vector + q_vector->v_idx;
q_vector->tx.itr = ITR_TO_REG(vsi->tx_itr_setting);
wr32(hw, I40E_PFINT_ITRN(1, vector - 1), q_vector->tx.itr);
+
wr32(hw, I40E_PFINT_RATEN(vector - 1), intrl);
i40e_flush(hw);
Thanks,
Kan
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
