From patchwork Mon Jun 12 15:03:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Erik Stromdahl X-Patchwork-Id: 9781309 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 562F760212 for ; Mon, 12 Jun 2017 15:03:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 41EEA26E51 for ; Mon, 12 Jun 2017 15:03:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 36DAF28633; Mon, 12 Jun 2017 15:03:28 +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=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI 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 B62B026E51 for ; Mon, 12 Jun 2017 15:03:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752474AbdFLPD0 (ORCPT ); Mon, 12 Jun 2017 11:03:26 -0400 Received: from mail-lf0-f66.google.com ([209.85.215.66]:35571 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751974AbdFLPDY (ORCPT ); Mon, 12 Jun 2017 11:03:24 -0400 Received: by mail-lf0-f66.google.com with SMTP id v20so9679894lfa.2 for ; Mon, 12 Jun 2017 08:03:23 -0700 (PDT) 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=C1UCmKugBDPZe3i8QFgARWjXLYCQCjEFWLsGgvHknAA=; b=uHN9tLgvL7kIKtCSkhim2hZoyBszQZ87XgTS5HS2zhOikXn1b7AS+Wlijhz0SQs7ib FaxHTu4N0KM+fTLtZZbcZoJ7zLXUl3ioEj5cqt4Hbn5+TQ4vbkwVQku1DaP4745cCALf +TLiznLcCR05zWD4cSHoYDANgnjVgZ0ZQJ5umRIw8tljQpNjbm7DDmhahrrJQDRaIS3Z ZCcU/YU3citLF94iKPvi8RIcwxRtCdyWLSGD8AK4iudGImUqfbhIv6e3R4j5629wkqi2 1vcQu24Uh4sKdO8qdJI2SYvMH/m9mcB/DKpWuCkrALVzJso+u0CB71ywSrgvSq8C2rPp J1PA== 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=C1UCmKugBDPZe3i8QFgARWjXLYCQCjEFWLsGgvHknAA=; b=U2fqGCamfX72E3tcHYeC9eKIMVCeEjJP0D3qrgpca53roRt2A4sMYKMwGf385sti8V DoLwkPXE6MeB73l+VdpOVOfMw7vCdsSmynE+LcerD2bSYZ0uXkD+G4YIWXGDbL5/YeSA hNBdIJBgdnI7kfxmKvFckysi2TfLS+XLlyv00jBbfsuVtKnAvxQXdWjjSzUgOlowV9UF oz/c96IHuhzbcLjWKYPPjW2ucy5um+CWVpx4cL2kjz7Pdm+4x0kfHYMrdLPdpD94QIsS MjJLRVjpLmoRVD52GJDza+Kcg2Z1Q5CMhnwBaqOHlCCCukf/MxpI+tgw2Ku4uW1WUkl9 QSYg== X-Gm-Message-State: AODbwcCdqGhylAeYdfI1BwINMjl8Pb4TRvdGob6X1SJFOBedtZEScq+H QqPgSwaKcU2Eww== X-Received: by 10.25.94.5 with SMTP id s5mr5465605lfb.179.1497279803138; Mon, 12 Jun 2017 08:03:23 -0700 (PDT) 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 n71sm2709253lje.14.2017.06.12.08.03.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 12 Jun 2017 08:03:22 -0700 (PDT) From: Erik Stromdahl To: kvalo@qca.qualcomm.com, linux-wireless@vger.kernel.org, ath10k@lists.infradead.org Cc: Erik Stromdahl Subject: [RFC v2 04/10] ath10k: add start_once support Date: Mon, 12 Jun 2017 17:03:05 +0200 Message-Id: <1497279791-9598-5-git-send-email-erik.stromdahl@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1497279791-9598-1-git-send-email-erik.stromdahl@gmail.com> References: <1497279791-9598-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 587c013..a1a4610 100644 --- a/drivers/net/wireless/ath/ath10k/core.c +++ b/drivers/net/wireless/ath/ath10k/core.c @@ -1966,6 +1966,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); @@ -2185,6 +2188,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: @@ -2237,6 +2241,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); @@ -2339,12 +2344,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 cdac923..0e75441 100644 --- a/drivers/net/wireless/ath/ath10k/core.h +++ b/drivers/net/wireless/ath/ath10k/core.h @@ -784,6 +784,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 160377aa..f733e73 100644 --- a/drivers/net/wireless/ath/ath10k/hw.h +++ b/drivers/net/wireless/ath/ath10k/hw.h @@ -473,6 +473,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;