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: 9585037 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 EEF886042F for ; Tue, 21 Feb 2017 16:16:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DD5FB285C6 for ; Tue, 21 Feb 2017 16:16:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D083D285DD; Tue, 21 Feb 2017 16:16:55 +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=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5E01C283A6 for ; Tue, 21 Feb 2017 16:16:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753804AbdBUQQx (ORCPT ); Tue, 21 Feb 2017 11:16:53 -0500 Received: from mail-lf0-f68.google.com ([209.85.215.68]:33624 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753748AbdBUQQ3 (ORCPT ); Tue, 21 Feb 2017 11:16:29 -0500 Received: by mail-lf0-f68.google.com with SMTP id 86so5300454lfv.0 for ; Tue, 21 Feb 2017 08:16:28 -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=UZ0fZLLbiE38hztE8Hk7h1R+5bCZzafxGkkrM3G20sBKbWBN1N2ruJ5RXQw8xaayy/ GifPOj0zAiXzKTDfbGFqBW3xzXvylqolQ5fTzPz2kfT4k/DGrKsjbfJLha037Ynt47wI YcFAvUoypkXkEC4z7FzPFbOW0UrNI51XvTmg8EzBT0jYY3WM+9v1gumq25P2HmULVECE cG7mH14GyTAWzPG0T3/L+NGreRpBXO9a95uESUbObkSm2MHbSsCSfKCg/GZmq281L1KN 6dRjKoKW9H/H22oOnAB0B9vS2hUH1jPrKIQP6G35SLKqFt+nMmd7LBb9R8FMp/4zo0RT oOLg== X-Gm-Message-State: AMke39kBygE6LmgX65WkyMt1TykDPDGqMwYJnsU1+4KiGIoxhrqyJmbMhdiCAu7GqGlOLw== 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 Cc: Erik Stromdahl 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> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.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;