From patchwork Tue Feb 21 16:15:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Erik Stromdahl X-Patchwork-Id: 9585067 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D74A96042F for ; Tue, 21 Feb 2017 16:17:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C4FCE28527 for ; Tue, 21 Feb 2017 16:17:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B90E0285C6; Tue, 21 Feb 2017 16:17:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7564E28527 for ; Tue, 21 Feb 2017 16:17:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=lskVod6y6RcECpEEnLG/F2GHdm5bfA68wGT71om+cjc=; b=WVgzDmCaLEm9HDtZDyP4kDvsP0 L7KxifGOnJ4tOoDYbP0LFOl3jBsFmmZSXysH4GofEjEhdmRvLK8kXa4XOptIMlJ+6p5nLB3nY6UUF DF07GSlBiohMkYnZso8MKqCnW3D7XddFfFVcgJYnz2HhAOxwp2kBOoJAJEbLHM9ArQG4l9zwYlOtX H5+aFmFT/f3NdOTnSdCVYStVCBfoNFxylBaY7EfVEGmlt6HEaIh4J+Yp/Rems4krix8nrYo/ANJy5 DKTL6eijAwf222J11ofmmdpPv+Ua8CJgDQWlp8BZJin7Uci9XNX2uADv9Bq9L5gcaaqpbGDRWo5tG yt0pKqIw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cgD84-0007VB-H2; Tue, 21 Feb 2017 16:17:28 +0000 Received: from merlin.infradead.org ([2001:4978:20e::2]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cgD7V-00071r-46 for ath10k@bombadil.infradead.org; Tue, 21 Feb 2017 16:16:53 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=FKKBtItlaGSm4IcCxRXw6RQA2qK2t7XpnYJQZ7sLet8=; b=DeLCyzuJ2TOlsvVt4Ej4VIZIS BMVqqMLD836/+JTFXQ1jErnmVpchS30DxS/w0cNvhA43S315k3KSb9liEG9ymqVXwp1cSE6FTf9Dh Ca3v3pQ3TVOVvxIlrsn64YHg4kfmCNADZc3oFzprSgr8eNQrn23cnkSg07Roth7x6cD/NEkcwIOO+ pVCa5AC4yjg1EDNtcQqrZmw5Thbx5KzyQEfADMNs4sTF0VHtKUUFDUPyCXjlKNeLlnYySGtJJycJc clsKO48j7fryxTkpy2O/++SruXQP847wsHq0oQcerNehWmGTAuyaxWTYe9inVRIyoWVNxV1OQ17+M ADA8nMhCw==; Received: from mail-lf0-x242.google.com ([2a00:1450:4010:c07::242]) by merlin.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cgD7R-0007Gx-2H for ath10k@lists.infradead.org; Tue, 21 Feb 2017 16:16:52 +0000 Received: by mail-lf0-x242.google.com with SMTP id 90so4027100lfr.3 for ; Tue, 21 Feb 2017 08:16:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=FKKBtItlaGSm4IcCxRXw6RQA2qK2t7XpnYJQZ7sLet8=; b=CkOwDnzClLmZAddfP4T9+4+lb7gUUDlXFWcC959FRmEeMGdNqNghrtHmlnBW8lJ8TF CZRh0JRWuyQ0rPeShG+LrfGFj9QuLaUH/mYiref9rt2hrfcPBmV1MZIw1pA2OmJII45A AOAfTcZfEAthzX3e+v6E/ecBZXveKcO85/vDbClXRWIcTVCUzeoejOamFXD0FN/MMwjg jwGLXnh0bSCEuv/UgGyScLULKMmfRQ0sn7yWwi0AhH40BWi3lOXWwPYDUPkP1tnozK6e CntMjBtOoV0TgER+nZqlzEFX/NwwTYb4MkKGGJGH6W1qRmxx0ClA7c0KX2ZElNgZ06Y/ iP1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=FKKBtItlaGSm4IcCxRXw6RQA2qK2t7XpnYJQZ7sLet8=; b=PO+YktqvTkOZqghb5ue8a8Qg+RkP4brVI4rVVf3Kz3dQx+EhcgUvseLsLFxouBoBT8 LmB4mnbL4NxiVosarDdemR5EFY3YJmiJmNgs2Ix2P1Kd1aPuYscG2XYyz5RzE3SDwxK9 3Vu9WsUQyI4BSTULzrKK0YL04KzJF2NURY5T9bu9+/vRawqJ+u1cOLW36zSlD+20JI3e dccYXik2ozk+VcsOmXV8QmJJVVTCgLQCMjy+naAVM1TaFgz7IJUDBgEe7lYmKrLT4tah Eaa63JlWSccuQyjGpEXKcdPAytDAjVlHuNBXh1GMrXM2E+8KKUvn9JQ5lxXxJhPtl2QF aXvQ== X-Gm-Message-State: AMke39mZI8CEiTk2X/sXG0sAwe3r6YF8+mLzDqs1acLaU2UCcPYKhf/uPnK7kb0AGKpfTg== X-Received: by 10.46.5.196 with SMTP id 187mr6852460ljf.36.1487693787488; Tue, 21 Feb 2017 08:16:27 -0800 (PST) Received: from erik-mate-1604.lan (90-227-62-61-no75.tbcn.telia.com. [90.227.62.61]) by smtp.gmail.com with ESMTPSA id t29sm6336069ljd.39.2017.02.21.08.16.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 21 Feb 2017 08:16:26 -0800 (PST) From: Erik Stromdahl To: kvalo@qca.qualcomm.com, linux-wireless@vger.kernel.org, ath10k@lists.infradead.org Subject: [RFC v4 16/21] ath10k: add start_once support Date: Tue, 21 Feb 2017 17:15:36 +0100 Message-Id: <1487693741-10042-17-git-send-email-erik.stromdahl@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1487693741-10042-1-git-send-email-erik.stromdahl@gmail.com> References: <1487693741-10042-1-git-send-email-erik.stromdahl@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170221_111649_340320_C2331E8A X-CRM114-Status: GOOD ( 13.43 ) X-BeenThere: ath10k@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Erik Stromdahl MIME-Version: 1.0 Sender: "ath10k" Errors-To: ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Add possibility to configure the driver to only start target once. This can reduce startup time of SDIO devices significantly since loading the firmware can take a substantial amount of time. The patch is also necessary for high latency devices in general since it does not seem to be possible to rerun the BMI phase (fw upload) without power-cycling the device. Signed-off-by: Erik Stromdahl --- drivers/net/wireless/ath/ath10k/core.c | 19 +++++++++++++++---- drivers/net/wireless/ath/ath10k/core.h | 2 ++ drivers/net/wireless/ath/ath10k/hw.h | 6 ++++++ 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c index 6b667c7..0a177bf 100644 --- a/drivers/net/wireless/ath/ath10k/core.c +++ b/drivers/net/wireless/ath/ath10k/core.c @@ -1919,6 +1919,9 @@ int ath10k_core_start(struct ath10k *ar, enum ath10k_firmware_mode mode, int status; u32 val; + if (ar->is_started && ar->hw_params.start_once) + return 0; + lockdep_assert_held(&ar->conf_mutex); clear_bit(ATH10K_FLAG_CRASH_FLUSH, &ar->dev_flags); @@ -2138,6 +2141,7 @@ int ath10k_core_start(struct ath10k *ar, enum ath10k_firmware_mode mode, if (status) goto err_hif_stop; + ar->is_started = true; return 0; err_hif_stop: @@ -2190,6 +2194,7 @@ void ath10k_core_stop(struct ath10k *ar) ath10k_htt_tx_stop(&ar->htt); ath10k_htt_rx_free(&ar->htt); ath10k_wmi_detach(ar); + ar->is_started = false; } EXPORT_SYMBOL(ath10k_core_stop); @@ -2291,12 +2296,18 @@ static int ath10k_core_probe_fw(struct ath10k *ar) goto err_unlock; } - ath10k_debug_print_boot_info(ar); - ath10k_core_stop(ar); + /* Leave target running if hw_params.start_once is set */ + if (ar->hw_params.start_once) { + mutex_unlock(&ar->conf_mutex); + } else { + ath10k_debug_print_boot_info(ar); + ath10k_core_stop(ar); - mutex_unlock(&ar->conf_mutex); + mutex_unlock(&ar->conf_mutex); + + ath10k_hif_power_down(ar); + } - ath10k_hif_power_down(ar); return 0; err_unlock: diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h index e3cdaba..6be6e66 100644 --- a/drivers/net/wireless/ath/ath10k/core.h +++ b/drivers/net/wireless/ath/ath10k/core.h @@ -780,6 +780,8 @@ struct ath10k { bool is_high_latency; + bool is_started; + struct { enum ath10k_bus bus; const struct ath10k_hif_ops *ops; diff --git a/drivers/net/wireless/ath/ath10k/hw.h b/drivers/net/wireless/ath/ath10k/hw.h index bc4fd43..cf88aba 100644 --- a/drivers/net/wireless/ath/ath10k/hw.h +++ b/drivers/net/wireless/ath/ath10k/hw.h @@ -466,6 +466,12 @@ struct ath10k_hw_params { bool is_high_latency; enum ath10k_bus bus; + + /* Specifies whether or not the device should be started once. + * If set, the device will be started once by the early fw probe + * and it will not be terminated afterwards. + */ + bool start_once; }; struct htt_rx_desc;