From patchwork Sat Jun 21 00:39:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luis R. Rodriguez" X-Patchwork-Id: 362390 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 8005D14008B for ; Sat, 21 Jun 2014 10:41:00 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757954AbaFUAj4 (ORCPT ); Fri, 20 Jun 2014 20:39:56 -0400 Received: from mail-pa0-f48.google.com ([209.85.220.48]:38099 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757196AbaFUAjw (ORCPT ); Fri, 20 Jun 2014 20:39:52 -0400 Received: by mail-pa0-f48.google.com with SMTP id et14so3653283pad.7 for ; Fri, 20 Jun 2014 17:39:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=/A/Zp/g4RfBUULKDKNnKI4bN6rJ9Giifc3tP557MP0w=; b=I2gf+FCeUrDNO+MMo4XydN26qEB3Z/We9o95QaujlFmyGbm6E0QaLkosIW5OnteD8Q jgWPsJve7KgEQ6K/1yfvawiM2xW9jfkQYuMT+cn68GxOy2xeKEGw7iW9bkcSg/p1pXov DY7SBpBsfiwagHqlm1RzRVkmhSNE2vFOZl/374lr+OLnpKok20/5xkRS9zApZy3HBo39 jStxpTJGz3P6E6Q0XpU7bfzXt5BQI4qUaFUd6i10PgYVGV9unUUBjT6tHAoC32AUF8HX Nj0ClG3SRsjMBsO0icnrKr4gMcfzpsbxW2M8UYw711GCmomC7tKlWHrNNuN7cMrnWa3V YO+Q== X-Received: by 10.68.220.137 with SMTP id pw9mr9134217pbc.24.1403311191912; Fri, 20 Jun 2014 17:39:51 -0700 (PDT) Received: from mcgrof@gmail.com (c-98-234-145-61.hsd1.ca.comcast.net. [98.234.145.61]) by mx.google.com with ESMTPSA id au4sm15376300pbc.10.2014.06.20.17.39.48 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 20 Jun 2014 17:39:50 -0700 (PDT) Received: by mcgrof@gmail.com (sSMTP sendmail emulation); Fri, 20 Jun 2014 17:39:47 -0700 From: "Luis R. Rodriguez" To: hariprasad@chelsio.com, leedom@chelsio.com Cc: poswald@suse.com, santosh@chelsio.com, jcheung@suse.com, dchang@suse.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, mcgrof@suse.com Subject: [RFT 1/3] cxgb4: make ethtool set_flash use request_firmware_nowait() Date: Fri, 20 Jun 2014 17:39:39 -0700 Message-Id: <1403311181-9328-2-git-send-email-mcgrof@do-not-panic.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1403311181-9328-1-git-send-email-mcgrof@do-not-panic.com> References: <1403311181-9328-1-git-send-email-mcgrof@do-not-panic.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: "Luis R. Rodriguez" cxgb4 loading can take a while, this is part of the crusade to change it to be asynchronous. Cc: Casey Leedom Cc: Hariprasad Shenai Cc: Philip Oswald Cc: Santosh Rastapur Cc: Jeffrey Cheung Cc: David Chang Signed-off-by: Luis R. Rodriguez --- drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 3 ++ drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 40 ++++++++++++++++++++----- 2 files changed, 36 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h index f503dce..bcf9acf 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h @@ -647,6 +647,9 @@ struct adapter { struct dentry *debugfs_root; spinlock_t stats_lock; + + struct completion flash_comp; + int flash_comp_status; }; /* Defined bit width of user definable filter tuples diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c index 2f8d6b9..9cf6f3e 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c @@ -2713,22 +2713,48 @@ out: return err; } +static void cxgb4_flash_complete(const struct firmware *fw, void *context) +{ + struct adapter *adap = context; + int ret; + + if (!fw) { + adap->flash_comp_status = -EINVAL; + goto out; + } + + ret = t4_load_fw(adap, fw->data, fw->size); + if (!ret) + adap->flash_comp_status = ret; + +out: + release_firmware(fw); + complete(&adap->flash_comp); +} + static int set_flash(struct net_device *netdev, struct ethtool_flash *ef) { int ret; - const struct firmware *fw; struct adapter *adap = netdev2adap(netdev); + init_completion(&adap->flash_comp); + adap->flash_comp_status = 0; + ef->data[sizeof(ef->data) - 1] = '\0'; - ret = request_firmware(&fw, ef->data, adap->pdev_dev); + ret = request_firmware_nowait(THIS_MODULE, 1, ef->data, + adap->pdev_dev, GFP_KERNEL, + adap, cxgb4_flash_complete); if (ret < 0) return ret; - ret = t4_load_fw(adap, fw->data, fw->size); - release_firmware(fw); - if (!ret) - dev_info(adap->pdev_dev, "loaded firmware %s\n", ef->data); - return ret; + wait_for_completion(&adap->flash_comp); + + if (adap->flash_comp_status != 0) + return adap->flash_comp_status; + + dev_info(adap->pdev_dev, "loaded firmware %s\n", ef->data); + + return 0; } #define WOL_SUPPORTED (WAKE_BCAST | WAKE_MAGIC)