From patchwork Tue Jul 7 20:16:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 11650171 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1489B14DD for ; Tue, 7 Jul 2020 20:17:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EC01C21532 for ; Tue, 7 Jul 2020 20:17:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="ZwncCXRK" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728753AbgGGURH (ORCPT ); Tue, 7 Jul 2020 16:17:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50250 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728708AbgGGURG (ORCPT ); Tue, 7 Jul 2020 16:17:06 -0400 Received: from mail-pg1-x542.google.com (mail-pg1-x542.google.com [IPv6:2607:f8b0:4864:20::542]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 90AC4C08C5DC for ; Tue, 7 Jul 2020 13:17:06 -0700 (PDT) Received: by mail-pg1-x542.google.com with SMTP id d4so20516262pgk.4 for ; Tue, 07 Jul 2020 13:17:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YRNXLfXkEnloDVfNSoeRyJNNX40mgSiHGZ6Wuoalny4=; b=ZwncCXRK6l1VG7QSOJiRPOwV5x2CH1bxGTFsKoDVW7JX/wMkzJqc4zcw5J3pUVUOcq HzmJ9ly+VJzodlPnROsFPDglXmNrQteBhGkCrgI9RbibjcOhjHoxEc3HeTZZGNnfPl6e VFInjfpHtwLcQsZz5PYk2hdmakKaKvIqV6+P4= 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:mime-version:content-transfer-encoding; bh=YRNXLfXkEnloDVfNSoeRyJNNX40mgSiHGZ6Wuoalny4=; b=RSM81ZMZV/h5Z3MrpTn+Jn6hKkBpniX0WORYRYtHGRkI5xNpTD8Q1Av2jr01CqNQN0 /5kvRlgx7FeIwshdvPpZLfi1qR/z5/KjJ0bnE0Tc14vZWTQ7qdfOjYugNMW4WPMiRpXR MGDpY6iqzqG1Ftcw6oniSigrue2lrUBHywyFEKWBBJvLXQKThVC51gnvghmhDHrnY1eR +4QnzVLuLH0DyNxjHlOyobSfm+4T2b6AbtEVKjB4BR38X8GPxgLSI1Rr1urLEEfuCn6b LaJ7v4+cczLGbUaMCzyrYCAHgH2OSALKaCR4XYX8D4mOUb2h0bQSRB9RDtX7m9FKuYMo 3wYg== X-Gm-Message-State: AOAM531oOMtryMur6PPqUnwKMJ/p2hy+J4gicaV724xhURDmZ6dPAVgD tH4yT2UM6s3NxSvw6IpBuiGfrQ== X-Google-Smtp-Source: ABdhPJy8BoXCvL5f7CuqgJneTnjO+BcgSip9UTzWmDjPpsIbiLLyJdAmItQ01LEKO6BhO/NduQecbQ== X-Received: by 2002:aa7:858c:: with SMTP id w12mr29376916pfn.143.1594153026110; Tue, 07 Jul 2020 13:17:06 -0700 (PDT) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:42b0:34ff:fe3d:58e6]) by smtp.gmail.com with ESMTPSA id i23sm7166097pfq.206.2020.07.07.13.17.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jul 2020 13:17:05 -0700 (PDT) From: Douglas Anderson To: Mark Brown , Andy Gross , Bjorn Andersson Cc: mka@chromium.org, Akash Asthana , Rajendra Nayak , swboyd@chromium.org, linux-arm-msm@vger.kernel.org, georgi.djakov@linaro.org, ctheegal@codeaurora.org, mkshah@codeaurora.org, Douglas Anderson , linux-kernel@vger.kernel.org, linux-spi@vger.kernel.org Subject: [PATCH 1/2] spi: spi-qcom-qspi: Avoid clock setting if not needed Date: Tue, 7 Jul 2020 13:16:40 -0700 Message-Id: <20200707131607.1.Ia7cb4f41ce93d37d0a764b47c8a453ce9e9c70ef@changeid> X-Mailer: git-send-email 2.27.0.383.g050319c2ae-goog In-Reply-To: <20200707201641.2030532-1-dianders@chromium.org> References: <20200707201641.2030532-1-dianders@chromium.org> MIME-Version: 1.0 Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org As per recent changes to the spi-qcom-qspi, now when we set the clock we'll call into the interconnect framework and also call the OPP API. Those are expensive operations. Let's avoid calling them if possible. This has a big impact on getting transfer rates back up to where they were (or maybe slightly better) before those patches landed. Fixes: cff80645d6d3 ("spi: spi-qcom-qspi: Add interconnect support") Signed-off-by: Douglas Anderson Acked-by: Mark Brown --- This applies atop the Qualcomm tree after Rajendra's ("spi: spi-qcom-qspi: Use OPP API to set clk/perf state") patch and I'd hope it could land there with Mark's Ack just like the patch it Fixes did. drivers/spi/spi-qcom-qspi.c | 43 ++++++++++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 10 deletions(-) diff --git a/drivers/spi/spi-qcom-qspi.c b/drivers/spi/spi-qcom-qspi.c index 18a59aa23ef8..322b88c22a86 100644 --- a/drivers/spi/spi-qcom-qspi.c +++ b/drivers/spi/spi-qcom-qspi.c @@ -144,6 +144,7 @@ struct qcom_qspi { struct icc_path *icc_path_cpu_to_qspi; struct opp_table *opp_table; bool has_opp_table; + unsigned long last_speed; /* Lock to protect data accessed by IRQs */ spinlock_t lock; }; @@ -226,19 +227,13 @@ static void qcom_qspi_handle_err(struct spi_master *master, spin_unlock_irqrestore(&ctrl->lock, flags); } -static int qcom_qspi_transfer_one(struct spi_master *master, - struct spi_device *slv, - struct spi_transfer *xfer) +static int qcom_qspi_set_speed(struct qcom_qspi *ctrl, unsigned long speed_hz) { - struct qcom_qspi *ctrl = spi_master_get_devdata(master); int ret; - unsigned long speed_hz; - unsigned long flags; unsigned int avg_bw_cpu; - speed_hz = slv->max_speed_hz; - if (xfer->speed_hz) - speed_hz = xfer->speed_hz; + if (speed_hz == ctrl->last_speed) + return 0; /* In regular operation (SBL_EN=1) core must be 4x transfer clock */ ret = dev_pm_opp_set_rate(ctrl->dev, speed_hz * 4); @@ -259,6 +254,28 @@ static int qcom_qspi_transfer_one(struct spi_master *master, return ret; } + ctrl->last_speed = speed_hz; + + return 0; +} + +static int qcom_qspi_transfer_one(struct spi_master *master, + struct spi_device *slv, + struct spi_transfer *xfer) +{ + struct qcom_qspi *ctrl = spi_master_get_devdata(master); + int ret; + unsigned long speed_hz; + unsigned long flags; + + speed_hz = slv->max_speed_hz; + if (xfer->speed_hz) + speed_hz = xfer->speed_hz; + + ret = qcom_qspi_set_speed(ctrl, speed_hz); + if (ret) + return ret; + spin_lock_irqsave(&ctrl->lock, flags); /* We are half duplex, so either rx or tx will be set */ @@ -602,7 +619,13 @@ static int __maybe_unused qcom_qspi_runtime_resume(struct device *dev) return ret; } - return clk_bulk_prepare_enable(QSPI_NUM_CLKS, ctrl->clks); + ret = clk_bulk_prepare_enable(QSPI_NUM_CLKS, ctrl->clks); + if (ret) + return ret; + + dev_pm_opp_set_rate(dev, ctrl->last_speed * 4); + + return 0; } static int __maybe_unused qcom_qspi_suspend(struct device *dev) From patchwork Tue Jul 7 20:16:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 11650177 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D471D14DD for ; Tue, 7 Jul 2020 20:17:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BC2882158C for ; Tue, 7 Jul 2020 20:17:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="PEF9ZsRV" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728737AbgGGURQ (ORCPT ); Tue, 7 Jul 2020 16:17:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50256 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728280AbgGGURH (ORCPT ); Tue, 7 Jul 2020 16:17:07 -0400 Received: from mail-pg1-x541.google.com (mail-pg1-x541.google.com [IPv6:2607:f8b0:4864:20::541]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9BF0FC061755 for ; Tue, 7 Jul 2020 13:17:07 -0700 (PDT) Received: by mail-pg1-x541.google.com with SMTP id z5so20517647pgb.6 for ; Tue, 07 Jul 2020 13:17:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZILeJ5BZkm/uJN5KrFNC9NBv85e8cyhdlG5Nb7NnKfw=; b=PEF9ZsRVchuRojCnoBR189XtTxSFN3+B4mXytX4tqxHyuQjt7rNIqVM/5BqhKAiMKh A2oE6hV+YU5K4Hk1Sem4UY+19X1f9l8eR7ZUDwqxDcGgGI1bWo0smuHyvggB7E52zjg8 l17phmDc8cnnnKqPaM9NuguL7F1EBwKFpbxrM= 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:mime-version:content-transfer-encoding; bh=ZILeJ5BZkm/uJN5KrFNC9NBv85e8cyhdlG5Nb7NnKfw=; b=MJZ3XPunNuwDeemG5r2TaymDFfRZQdeTZ1pQURtYkZnA2MutfXGR+69wrLCoe+CLJf Zk8aTePIRBFxoTZnGzKn2A73mhCvbvUyHa3KjW+H3SVTe+K4dgsZ23SreGoz+9u3QQNl ShLOqhgjTT5I7G/8Dl0WUpYjG9RScutFVHtTlxAGAU1hKCC3jBblCfuwiK+9KzuLHu/l mncv8M6YCOwQW87GQO32nyA1basLL1DIkQEkgfHTvwiEQ2YwnJOjhy7OK4O3NyMIIJCt urHp5n3nnMnVZM14028PD1eHNP5ZfNOpASynahv82Sb+SZycgltsrcjDqS/bizUCOEec vRZw== X-Gm-Message-State: AOAM532XrjfCGvsjnI6Figy/0maVZ1B0yvHxEDE6SjYVnC/sNsoMJrSN T17u4puRj8Kb3Lj4gV4/IDN32Q== X-Google-Smtp-Source: ABdhPJyzC6YhrCBBgLE/o37IuvPm7JwXJTU/H5+6wIN27ryUkGCqJ6FXjj4v1rsz8wks0fFAxQXGRA== X-Received: by 2002:aa7:9575:: with SMTP id x21mr49762878pfq.140.1594153027176; Tue, 07 Jul 2020 13:17:07 -0700 (PDT) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:42b0:34ff:fe3d:58e6]) by smtp.gmail.com with ESMTPSA id i23sm7166097pfq.206.2020.07.07.13.17.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jul 2020 13:17:06 -0700 (PDT) From: Douglas Anderson To: Mark Brown , Andy Gross , Bjorn Andersson Cc: mka@chromium.org, Akash Asthana , Rajendra Nayak , swboyd@chromium.org, linux-arm-msm@vger.kernel.org, georgi.djakov@linaro.org, ctheegal@codeaurora.org, mkshah@codeaurora.org, Douglas Anderson , linux-kernel@vger.kernel.org, linux-spi@vger.kernel.org Subject: [PATCH 2/2] spi: spi-qcom-qspi: Set an autosuspend delay of 250 ms Date: Tue, 7 Jul 2020 13:16:41 -0700 Message-Id: <20200707131607.2.I3c56d655737c89bd9b766567a04b0854db1a4152@changeid> X-Mailer: git-send-email 2.27.0.383.g050319c2ae-goog In-Reply-To: <20200707201641.2030532-1-dianders@chromium.org> References: <20200707201641.2030532-1-dianders@chromium.org> MIME-Version: 1.0 Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org In commit cff80645d6d3 ("spi: spi-qcom-qspi: Add interconnect support") the spi_geni_runtime_suspend() and spi_geni_runtime_resume() became a bit slower. Measuring on my hardware I see numbers in the hundreds of microseconds now. Let's use autosuspend to help avoid some of the overhead. Now if we're doing a bunch of transfers we won't need to be constantly chruning. The number 250 ms for the autosuspend delay was picked a bit arbitrarily, so if someone has measurements showing a better value we could easily change this. Fixes: cff80645d6d3 ("spi: spi-qcom-qspi: Add interconnect support") Signed-off-by: Douglas Anderson Acked-by: Mark Brown --- This patch could go through the SPI tree or land in the Qualcomm tree. The patch it Fixes is currently in the Qualcomm tree so if it lands in the main SPI tree there'd be a bit of a perf regression in the Qualcomm tree until things merge together in mainline. drivers/spi/spi-qcom-qspi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/spi/spi-qcom-qspi.c b/drivers/spi/spi-qcom-qspi.c index 322b88c22a86..6c39b23222b8 100644 --- a/drivers/spi/spi-qcom-qspi.c +++ b/drivers/spi/spi-qcom-qspi.c @@ -553,6 +553,8 @@ static int qcom_qspi_probe(struct platform_device *pdev) goto exit_probe_master_put; } + pm_runtime_use_autosuspend(dev); + pm_runtime_set_autosuspend_delay(dev, 250); pm_runtime_enable(dev); ret = spi_register_master(master);