From patchwork Wed Sep 26 12:39:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vipul Pandya X-Patchwork-Id: 187076 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 948A82C008F for ; Wed, 26 Sep 2012 22:43:42 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756198Ab2IZMnf (ORCPT ); Wed, 26 Sep 2012 08:43:35 -0400 Received: from stargate.chelsio.com ([67.207.112.58]:9552 "EHLO stargate.chelsio.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755984Ab2IZMnb (ORCPT ); Wed, 26 Sep 2012 08:43:31 -0400 Received: from maui.asicdesigners.com (maui.asicdesigners.com [10.192.180.15]) by stargate.chelsio.com (8.13.1/8.13.1) with SMTP id q8QChU6T022962; Wed, 26 Sep 2012 05:43:30 -0700 Received: from strawberry ([10.193.185.96]) by maui.asicdesigners.com with Microsoft SMTPSVC(6.0.3790.4675); Wed, 26 Sep 2012 05:43:29 -0700 From: Vipul Pandya To: netdev@vger.kernel.org Cc: davem@davemloft.net, divy@chelsio.com, dm@chelsio.com, swise@opengridcomputing.com, leedom@chelsio.com, felix@chelsio.com, Vipul Pandya , Jay Hernandez Subject: [PATCH 6/7] cxgb4: Inform caller if driver didn't upgrade firmware Date: Wed, 26 Sep 2012 18:09:41 +0530 Message-Id: <1348663182-20190-7-git-send-email-vipul@chelsio.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1348663182-20190-1-git-send-email-vipul@chelsio.com> References: <1348663182-20190-1-git-send-email-vipul@chelsio.com> X-OriginalArrivalTime: 26 Sep 2012 12:43:29.0730 (UTC) FILETIME=[87D45220:01CD9BE4] Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org If a card had already been initialized, on reloading cxgb4 driver firmware required an upgrade but the upgrade did not happen. In that case a mailbox timeout would occur during T4 configuration file stuff. The fix is to let the caller know the firmware was not upgraded so a reset would be issued before starting the T4 config stuff. Signed-off-by: Jay Hernandez Signed-off-by: Vipul Pandya --- drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c index b9cd08d..a3f866d 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c @@ -933,7 +933,13 @@ static int upgrade_fw(struct adapter *adap) if (!ret) dev_info(dev, "firmware upgraded to version %pI4 from " FW_FNAME "\n", &hdr->fw_ver); + } else { + /* + * Tell our caller that we didn't upgrade the firmware. + */ + ret = -EINVAL; } + out: release_firmware(fw); return ret; }