| Message ID | 1383709546-17544-1-git-send-email-jesse.sung@canonical.com |
|---|---|
| State | New |
| Headers | show |
On Wed, Nov 06, 2013 at 11:45:46AM +0800, Wen-chien Jesse Sung wrote: > From: Vasundhara Volam <vasundhara.volam@emulex.com> > > BugLink: https://launchpad.net/bugs/1234019 > > It is a required field for all TX_CREATE cmd versions > 0. > This fixes a driver initialization failure, caused by recent SH-R Firmwares > (versions > 10.0.639.0) failing the TX_CREATE cmd when if_id field is > not passed. > > Signed-off-by: Sathya Perla <sathya.perla@emulex.com> > Signed-off-by: David S. Miller <davem@davemloft.net> > (cherry picked from commit 0fb88d61bc60779dde88b0fc268da17eb81d0412) > Signed-off-by: Wen-chien Jesse Sung <jesse.sung@canonical.com> Seems fine, though it also looks appropriate for upstream stable. Have you submitted it there? Acked-by: Seth Forshee <seth.forshee@canonical.com>
Yes. The patch has been pulled into stable by greg. See mail below: ---------------------> From: gregkh@linuxfoundation.org [mailto:gregkh@linuxfoundation.org] Sent: Friday, October 25, 2013 11:42 AM To: Vasundhara Volam; davem@davemloft.net; gregkh@linuxfoundation.org; Sathya Perla Cc: stable@vger.kernel.org; stable-commits@vger.kernel.org Subject: Patch "be2net: pass if_id for v1 and V2 versions of TX_CREATE cmd" has been added to the 3.11-stable tree This is a note to let you know that I've just added the patch titled be2net: pass if_id for v1 and V2 versions of TX_CREATE cmd to the 3.11-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: be2net-pass-if_id-for-v1-and-v2-versions-of-tx_create-cmd.patch and it can be found in the queue-3.11 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@vger.kernel.org> know about it. -------------------------------------> -----Original Message----- From: Seth Forshee [mailto:seth.forshee@canonical.com] Sent: Wednesday, November 06, 2013 10:59 PM To: Wen-chien Jesse Sung Cc: kernel-team@lists.ubuntu.com; Vasundhara Volam; Sathya Perla; Sarveshwar Bandi; YK Subject: Re: [Raring/Saucy][PATCH] be2net: pass if_id for v1 and V2 versions of TX_CREATE cmd On Wed, Nov 06, 2013 at 11:45:46AM +0800, Wen-chien Jesse Sung wrote: > From: Vasundhara Volam <vasundhara.volam@emulex.com> > > BugLink: https://launchpad.net/bugs/1234019 > > It is a required field for all TX_CREATE cmd versions > 0. > This fixes a driver initialization failure, caused by recent SH-R > Firmwares (versions > 10.0.639.0) failing the TX_CREATE cmd when if_id > field is not passed. > > Signed-off-by: Sathya Perla <sathya.perla@emulex.com> > Signed-off-by: David S. Miller <davem@davemloft.net> (cherry picked > from commit 0fb88d61bc60779dde88b0fc268da17eb81d0412) > Signed-off-by: Wen-chien Jesse Sung <jesse.sung@canonical.com> Seems fine, though it also looks appropriate for upstream stable. Have you submitted it there? Acked-by: Seth Forshee <seth.forshee@canonical.com>
On Wed, Nov 06, 2013 at 05:32:56PM +0000, Sarveshwar Bandi wrote:
> Yes. The patch has been pulled into stable by greg. See mail below:
Great, thanks. Has Kamal also picked it up for 3.8 stable?
On Wed, Nov 06, 2013 at 11:45:46AM +0800, Wen-chien Jesse Sung wrote: > From: Vasundhara Volam <vasundhara.volam@emulex.com> > > BugLink: https://launchpad.net/bugs/1234019 > > It is a required field for all TX_CREATE cmd versions > 0. > This fixes a driver initialization failure, caused by recent SH-R Firmwares > (versions > 10.0.639.0) failing the TX_CREATE cmd when if_id field is > not passed. > > Signed-off-by: Sathya Perla <sathya.perla@emulex.com> > Signed-off-by: David S. Miller <davem@davemloft.net> > (cherry picked from commit 0fb88d61bc60779dde88b0fc268da17eb81d0412) > Signed-off-by: Wen-chien Jesse Sung <jesse.sung@canonical.com> > --- > drivers/net/ethernet/emulex/benet/be_cmds.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c > index 8ec5d74..13ac104 100644 > --- a/drivers/net/ethernet/emulex/benet/be_cmds.c > +++ b/drivers/net/ethernet/emulex/benet/be_cmds.c > @@ -1150,7 +1150,6 @@ int be_cmd_txq_create(struct be_adapter *adapter, struct be_tx_obj *txo) > > if (lancer_chip(adapter)) { > req->hdr.version = 1; > - req->if_id = cpu_to_le16(adapter->if_handle); > } else if (BEx_chip(adapter)) { > if (adapter->function_caps & BE_FUNCTION_CAPS_SUPER_NIC) > req->hdr.version = 2; > @@ -1158,6 +1157,8 @@ int be_cmd_txq_create(struct be_adapter *adapter, struct be_tx_obj *txo) > req->hdr.version = 2; > } > > + if (req->hdr.version > 0) > + req->if_id = cpu_to_le16(adapter->if_handle); > req->num_pages = PAGES_4K_SPANNED(q_mem->va, q_mem->size); > req->ulp_num = BE_ULP1_NUM; > req->type = BE_ETH_TX_RING_TYPE_STANDARD; Looks to do what is claimed. Therefore: Acked-by: Andy Whitcroft <apw@canonical.com> -apw
Applied to Raring and Saucy. -apw
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c index 8ec5d74..13ac104 100644 --- a/drivers/net/ethernet/emulex/benet/be_cmds.c +++ b/drivers/net/ethernet/emulex/benet/be_cmds.c @@ -1150,7 +1150,6 @@ int be_cmd_txq_create(struct be_adapter *adapter, struct be_tx_obj *txo) if (lancer_chip(adapter)) { req->hdr.version = 1; - req->if_id = cpu_to_le16(adapter->if_handle); } else if (BEx_chip(adapter)) { if (adapter->function_caps & BE_FUNCTION_CAPS_SUPER_NIC) req->hdr.version = 2; @@ -1158,6 +1157,8 @@ int be_cmd_txq_create(struct be_adapter *adapter, struct be_tx_obj *txo) req->hdr.version = 2; } + if (req->hdr.version > 0) + req->if_id = cpu_to_le16(adapter->if_handle); req->num_pages = PAGES_4K_SPANNED(q_mem->va, q_mem->size); req->ulp_num = BE_ULP1_NUM; req->type = BE_ETH_TX_RING_TYPE_STANDARD;