lkml.org 
[lkml]   [2016]   [Mar]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 023/342] enic: increment devcmd2 result ring in case of timeout
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Sandeep Pillai <sanpilla@cisco.com>

    [ Upstream commit ca7f41a4957b872577807169bd7464b36aae9b9c ]

    Firmware posts the devcmd result in result ring. In case of timeout, driver
    does not increment the current result pointer and firmware could post the
    result after timeout has occurred. During next devcmd, driver would be
    reading the result of previous devcmd.

    Fix this by incrementing result even in case of timeout.

    Fixes: 373fb0873d43 ("enic: add devcmd2")
    Signed-off-by: Sandeep Pillai <sanpilla@cisco.com>
    Signed-off-by: Govindarajulu Varadarajan <_govind@gmx.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/cisco/enic/enic.h | 2 +-
    drivers/net/ethernet/cisco/enic/vnic_dev.c | 19 ++++++++++++-------
    2 files changed, 13 insertions(+), 8 deletions(-)

    --- a/drivers/net/ethernet/cisco/enic/enic.h
    +++ b/drivers/net/ethernet/cisco/enic/enic.h
    @@ -33,7 +33,7 @@

    #define DRV_NAME "enic"
    #define DRV_DESCRIPTION "Cisco VIC Ethernet NIC Driver"
    -#define DRV_VERSION "2.3.0.12"
    +#define DRV_VERSION "2.3.0.20"
    #define DRV_COPYRIGHT "Copyright 2008-2013 Cisco Systems, Inc"

    #define ENIC_BARS_MAX 6
    --- a/drivers/net/ethernet/cisco/enic/vnic_dev.c
    +++ b/drivers/net/ethernet/cisco/enic/vnic_dev.c
    @@ -298,7 +298,8 @@ static int _vnic_dev_cmd2(struct vnic_de
    int wait)
    {
    struct devcmd2_controller *dc2c = vdev->devcmd2;
    - struct devcmd2_result *result = dc2c->result + dc2c->next_result;
    + struct devcmd2_result *result;
    + u8 color;
    unsigned int i;
    int delay, err;
    u32 fetch_index, new_posted;
    @@ -336,13 +337,17 @@ static int _vnic_dev_cmd2(struct vnic_de
    if (dc2c->cmd_ring[posted].flags & DEVCMD2_FNORESULT)
    return 0;

    + result = dc2c->result + dc2c->next_result;
    + color = dc2c->color;
    +
    + dc2c->next_result++;
    + if (dc2c->next_result == dc2c->result_size) {
    + dc2c->next_result = 0;
    + dc2c->color = dc2c->color ? 0 : 1;
    + }
    +
    for (delay = 0; delay < wait; delay++) {
    - if (result->color == dc2c->color) {
    - dc2c->next_result++;
    - if (dc2c->next_result == dc2c->result_size) {
    - dc2c->next_result = 0;
    - dc2c->color = dc2c->color ? 0 : 1;
    - }
    + if (result->color == color) {
    if (result->error) {
    err = result->error;
    if (err != ERR_ECMDUNKNOWN ||
    \
     
     \ /
      Last update: 2016-03-02 01:21    [W:4.056 / U:0.536 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site