Patch "enic: increment devcmd2 result ring in case of timeout" has been added to the 4.4-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
enic: increment devcmd2 result ring in case of timeout
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
enic-increment-devcmd2-result-ring-in-case-of-timeout.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Mon Feb 29 14:33:50 PST 2016
From: Sandeep Pillai <[email protected]>
Date: Wed, 3 Feb 2016 14:40:44 +0530
Subject: enic: increment devcmd2 result ring in case of timeout
From: Sandeep Pillai <[email protected]>
[ 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.
--- drivers/net/ethernet/cisco/enic/enic.h | 2 +- drivers/net/ethernet/cisco/enic/vnic_dev.c | 19 ++++++++++++------- 2 files changed, 13 insertions(+), 8 deletions(-)
drivers/net/ethernet/cisco/enic/enic.h +1 -1
@@ -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
drivers/net/ethernet/cisco/enic/vnic_dev.c +12 -7
@@ -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_deif (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 ||
Patches currently in stable-queue which might be from [email protected] are
queue-4.4/enic-increment-devcmd2-result-ring-in-case-of-timeout.patch