lkml.org 
[lkml]   [2019]   [Dec]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 132/177] ice: delay less
    Date
    From: Mitch Williams <mitch.a.williams@intel.com>

    [ Upstream commit 88bb432a55de8ae62106305083a8bfbb23b01ad2 ]

    Shorten the delay for SQ responses, but increase the number of loops.
    Max delay time is unchanged, but some operations complete much more
    quickly.

    In the process, add a new define to make the delay count and delay time
    more explicit. Add comments to make things more explicit.

    This fixes a problem with VF resets failing on with many VFs.

    Signed-off-by: Mitch Williams <mitch.a.williams@intel.com>
    Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
    Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/intel/ice/ice_controlq.c | 2 +-
    drivers/net/ethernet/intel/ice/ice_controlq.h | 5 +++--
    2 files changed, 4 insertions(+), 3 deletions(-)

    diff --git a/drivers/net/ethernet/intel/ice/ice_controlq.c b/drivers/net/ethernet/intel/ice/ice_controlq.c
    index 89f18fe18fe36..921cc0c9a30d7 100644
    --- a/drivers/net/ethernet/intel/ice/ice_controlq.c
    +++ b/drivers/net/ethernet/intel/ice/ice_controlq.c
    @@ -911,7 +911,7 @@ ice_sq_send_cmd(struct ice_hw *hw, struct ice_ctl_q_info *cq,
    if (ice_sq_done(hw, cq))
    break;

    - mdelay(1);
    + udelay(ICE_CTL_Q_SQ_CMD_USEC);
    total_delay++;
    } while (total_delay < cq->sq_cmd_timeout);

    diff --git a/drivers/net/ethernet/intel/ice/ice_controlq.h b/drivers/net/ethernet/intel/ice/ice_controlq.h
    index ea02b89243e2c..0f2cdb06e6efa 100644
    --- a/drivers/net/ethernet/intel/ice/ice_controlq.h
    +++ b/drivers/net/ethernet/intel/ice/ice_controlq.h
    @@ -30,8 +30,9 @@ enum ice_ctl_q {
    ICE_CTL_Q_ADMIN,
    };

    -/* Control Queue default settings */
    -#define ICE_CTL_Q_SQ_CMD_TIMEOUT 250 /* msecs */
    +/* Control Queue timeout settings - max delay 250ms */
    +#define ICE_CTL_Q_SQ_CMD_TIMEOUT 2500 /* Count 2500 times */
    +#define ICE_CTL_Q_SQ_CMD_USEC 100 /* Check every 100usec */

    struct ice_ctl_q_ring {
    void *dma_head; /* Virtual address to dma head */
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-12-10 22:39    [W:2.758 / U:0.496 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site