From patchwork Wed Apr 13 14:48:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 561193 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 090BBC433F5 for ; Wed, 13 Apr 2022 14:48:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234201AbiDMOui (ORCPT ); Wed, 13 Apr 2022 10:50:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40210 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229891AbiDMOui (ORCPT ); Wed, 13 Apr 2022 10:50:38 -0400 Received: from mail-io1-xd2c.google.com (mail-io1-xd2c.google.com [IPv6:2607:f8b0:4864:20::d2c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3B65C63BF0 for ; Wed, 13 Apr 2022 07:48:17 -0700 (PDT) Received: by mail-io1-xd2c.google.com with SMTP id 9so2143769iou.5 for ; Wed, 13 Apr 2022 07:48:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+IpVkEffy7PlUYnFxm9TjdHlDyLe6Pv7WXvVTMMNw9s=; b=z1g6cxyUI+ZITdpnQCCQY6aEP2Bat5C8q9ULSNL59iWOj+OuscEGKwBa56qB/LDiuo i4BDRQuCTwYIW51OULzItjuoLatStoFtqftALbVdcOyS/FcaFYW+sGVMkCuCgMZkcS6T 1PswEn8Cb/7y/XqQ8NDixokxyS/GZH+Vxw6zvHWaGiOltdQ6PTpi2CbwVzFufzxbqCBf BVg9/344h8WlpJ5OTjwEsG5TN+ab9NHFhiQMk9It+3s1BrsYQf9S+zYr2vTMz4FgbF4s c0sodTIdneyBW1EarOky7U6Dp9/+l5wvAUs6/niQ/FI4FabJMC7y1qdTc9ZyPijugbzD NEpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+IpVkEffy7PlUYnFxm9TjdHlDyLe6Pv7WXvVTMMNw9s=; b=GGbeq7x4EdRBHzcu6xPT7IAGR8c8LheQPvnRf8sEoQ+/4Y6o/sdZQOKeGD/IvF7gJ+ Juyik9QBX8xjdmLmDwx+Pr3ylPMFFiUivPUMT6K+mCSljS1zEqJhcQ+PFWm9LbuRHhZS SbxDdCTqzSOcJaWD7YOD/KCfza5WWpdZg/t31tB2AJE+YpASXylk1bRcCb0hlVrZLg9n nBi5nneP/AgMTOi8kV4++qtVlJv3etcwNXTpabIQqCWqn+RP0S0hz1K/quAW8VYdToxC VoEH3Ghw4NFE+vCzpvzu3L4viou+emc56AWLwb32gujvfOVPEG1vVxJJHdJ70bfTch8D Sv8Q== X-Gm-Message-State: AOAM531TV/7bqV4j/ycOd3R7yFZzftuxsUhrW/b0Uw68ZJ4q0WJ16h9X 49nxsLG7m5Ec4jw2GOTPpq+YyFmpafXMHQ== X-Google-Smtp-Source: ABdhPJx/w7ihmRRL1LnVIdvfc8uMHPenPasOawMwk0L4IX/EMpdDCkbg+rzY/pJsgn2dUlqTa6SXJg== X-Received: by 2002:a05:6638:1250:b0:314:d9da:13b2 with SMTP id o16-20020a056638125000b00314d9da13b2mr6173036jas.99.1649861296187; Wed, 13 Apr 2022 07:48:16 -0700 (PDT) Received: from presto.localdomain (c-73-185-129-58.hsd1.mn.comcast.net. [73.185.129.58]) by smtp.gmail.com with ESMTPSA id u15-20020a056e021a4f00b002c665afb993sm108381ilv.11.2022.04.13.07.48.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Apr 2022 07:48:15 -0700 (PDT) From: Alex Elder To: stable@vger.kernel.org Cc: Deepak Kumar Singh , clew@codeaurora.org, swboyd@chromium.org, bjorn.andersson@linaro.org, kuba@kernel.org, elder@kernel.org, gregkh@linuxfoundation.org Subject: [PATCH 1/3] soc: qcom: aoss: Expose send for generic usecase Date: Wed, 13 Apr 2022 09:48:09 -0500 Message-Id: <20220413144811.522143-2-elder@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220413144811.522143-1-elder@linaro.org> References: <20220413144811.522143-1-elder@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Deepak Kumar Singh commit 8c75d585b931ac874fbe4ee5a8f1811d20c2817f upstream. Not all upcoming usecases will have an interface to allow the aoss driver to hook onto. Expose the send api and create a get function to enable drivers to send their own messages to aoss. Signed-off-by: Chris Lew Signed-off-by: Deepak Kumar Singh Reviewed-by: Stephen Boyd Signed-off-by: Bjorn Andersson Link: https://lore.kernel.org/r/1630420228-31075-2-git-send-email-deesin@codeaurora.org --- drivers/soc/qcom/qcom_aoss.c | 54 +++++++++++++++++++++++++++++- include/linux/soc/qcom/qcom_aoss.h | 38 +++++++++++++++++++++ 2 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 include/linux/soc/qcom/qcom_aoss.h diff --git a/drivers/soc/qcom/qcom_aoss.c b/drivers/soc/qcom/qcom_aoss.c index a0659cf278456..d40d8e20ceb46 100644 --- a/drivers/soc/qcom/qcom_aoss.c +++ b/drivers/soc/qcom/qcom_aoss.c @@ -8,10 +8,12 @@ #include #include #include +#include #include #include #include #include +#include #define QMP_DESC_MAGIC 0x0 #define QMP_DESC_VERSION 0x4 @@ -223,11 +225,14 @@ static bool qmp_message_empty(struct qmp *qmp) * * Return: 0 on success, negative errno on failure */ -static int qmp_send(struct qmp *qmp, const void *data, size_t len) +int qmp_send(struct qmp *qmp, const void *data, size_t len) { long time_left; int ret; + if (WARN_ON(IS_ERR_OR_NULL(qmp) || !data)) + return -EINVAL; + if (WARN_ON(len + sizeof(u32) > qmp->size)) return -EINVAL; @@ -261,6 +266,7 @@ static int qmp_send(struct qmp *qmp, const void *data, size_t len) return ret; } +EXPORT_SYMBOL(qmp_send); static int qmp_qdss_clk_prepare(struct clk_hw *hw) { @@ -519,6 +525,51 @@ static void qmp_cooling_devices_remove(struct qmp *qmp) thermal_cooling_device_unregister(qmp->cooling_devs[i].cdev); } +/** + * qmp_get() - get a qmp handle from a device + * @dev: client device pointer + * + * Return: handle to qmp device on success, ERR_PTR() on failure + */ +struct qmp *qmp_get(struct device *dev) +{ + struct platform_device *pdev; + struct device_node *np; + struct qmp *qmp; + + if (!dev || !dev->of_node) + return ERR_PTR(-EINVAL); + + np = of_parse_phandle(dev->of_node, "qcom,qmp", 0); + if (!np) + return ERR_PTR(-ENODEV); + + pdev = of_find_device_by_node(np); + of_node_put(np); + if (!pdev) + return ERR_PTR(-EINVAL); + + qmp = platform_get_drvdata(pdev); + + return qmp ? qmp : ERR_PTR(-EPROBE_DEFER); +} +EXPORT_SYMBOL(qmp_get); + +/** + * qmp_put() - release a qmp handle + * @qmp: qmp handle obtained from qmp_get() + */ +void qmp_put(struct qmp *qmp) +{ + /* + * Match get_device() inside of_find_device_by_node() in + * qmp_get() + */ + if (!IS_ERR_OR_NULL(qmp)) + put_device(qmp->dev); +} +EXPORT_SYMBOL(qmp_put); + static int qmp_probe(struct platform_device *pdev) { struct resource *res; @@ -615,6 +666,7 @@ static struct platform_driver qmp_driver = { .driver = { .name = "qcom_aoss_qmp", .of_match_table = qmp_dt_match, + .suppress_bind_attrs = true, }, .probe = qmp_probe, .remove = qmp_remove, diff --git a/include/linux/soc/qcom/qcom_aoss.h b/include/linux/soc/qcom/qcom_aoss.h new file mode 100644 index 0000000000000..3c2a82e606f81 --- /dev/null +++ b/include/linux/soc/qcom/qcom_aoss.h @@ -0,0 +1,38 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright (c) 2021, The Linux Foundation. All rights reserved. + */ + +#ifndef __QCOM_AOSS_H__ +#define __QCOM_AOSS_H__ + +#include +#include + +struct qmp; + +#if IS_ENABLED(CONFIG_QCOM_AOSS_QMP) + +int qmp_send(struct qmp *qmp, const void *data, size_t len); +struct qmp *qmp_get(struct device *dev); +void qmp_put(struct qmp *qmp); + +#else + +static inline int qmp_send(struct qmp *qmp, const void *data, size_t len) +{ + return -ENODEV; +} + +static inline struct qmp *qmp_get(struct device *dev) +{ + return ERR_PTR(-ENODEV); +} + +static inline void qmp_put(struct qmp *qmp) +{ +} + +#endif + +#endif From patchwork Wed Apr 13 14:48:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 561192 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 91DD0C433FE for ; Wed, 13 Apr 2022 14:48:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236127AbiDMOul (ORCPT ); Wed, 13 Apr 2022 10:50:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40258 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229891AbiDMOul (ORCPT ); Wed, 13 Apr 2022 10:50:41 -0400 Received: from mail-io1-xd2c.google.com (mail-io1-xd2c.google.com [IPv6:2607:f8b0:4864:20::d2c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CD24E63BF0 for ; Wed, 13 Apr 2022 07:48:19 -0700 (PDT) Received: by mail-io1-xd2c.google.com with SMTP id p21so2147637ioj.4 for ; Wed, 13 Apr 2022 07:48:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=X5sSdpjUHCfybVwprx6qx71sk3MsE1l8j38zhRYOgvA=; b=LmwOZ9RxrDn0V6KLyIvhi4GfqdnQ4v5IahSBu2X92eHXl4Ai65YlU+6EkOilLbjXkG 9jRnY+oe+uql7tubFiAZdeftpc/VHifxyy/3bx1Yt+n3A4v4z9p3MqQpnlMEgMtEoJdP +XGMptIn/3cVyGLX+23Jl0FR9byx836xJ8Nxv/0v20Dfl9sYiZKtdtkSDIVCJG3oDXjs xvn1ez+vFkp5f6TRJiBczQrn527bwLbgHwZdYq4TFBaJm5ljpEa3VzD6/KhhYaL15Jgx ZA//BnMb5XpVBSdo6QQyPsYTqJiTzn9b9qNbFEUhvHGvyBaxbbr5r2o3xQ3oDS+L7w06 Bpyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=X5sSdpjUHCfybVwprx6qx71sk3MsE1l8j38zhRYOgvA=; b=IFdBu2UtDAVLMgmasqAKB6zKLwR4d//wnS+TgmhRXa5uayVdtdDbGpzujtpwH5hBxB JDXV1oPvCt0ETZBf7NX+YQxJkxZmfGxQx5mXubzr/Jn/R22iZ2i2sGHQWaL7ZnigQWCU QwsUmH7H0aAOf59zfr3fnHRhyCacHlokjDQqbCSu53t4+ia0BLT76iA0reO0ndghJxqp sfSpjSHhaUvPci6RJ8RbNYyio2je1sjyRd8QpmemUJzNt1lqG3gASk8k1IiMqf2wNc7t yfcEJLy1XOOaC8QTbvkxVteBHDMoAJ8xyQJU1jrS0uHR9gdqW5zCEDM8BbvPl/EmahQv FOQw== X-Gm-Message-State: AOAM531/0tIhWerWuRETmg96zch+UXXVusH8TPolO0Lp/z1cawWc4kNX XDRAT2W+jaFHkgX9RfIF9ibUPxjZYcGf1A== X-Google-Smtp-Source: ABdhPJxpAGG0zohJ+3BFEfkvsyd4fX292L+LzDb6aZkn52SWhHkhtWORE52Z9CUjr41R7UZFEswahg== X-Received: by 2002:a05:6638:110d:b0:326:541a:ef7c with SMTP id n13-20020a056638110d00b00326541aef7cmr3299678jal.208.1649861298876; Wed, 13 Apr 2022 07:48:18 -0700 (PDT) Received: from presto.localdomain (c-73-185-129-58.hsd1.mn.comcast.net. [73.185.129.58]) by smtp.gmail.com with ESMTPSA id u15-20020a056e021a4f00b002c665afb993sm108381ilv.11.2022.04.13.07.48.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Apr 2022 07:48:18 -0700 (PDT) From: Alex Elder To: stable@vger.kernel.org Cc: kuba@kernel.org, clew@codeaurora.org, deesin@codeaurora.org, swboyd@chromium.org, bjorn.andersson@linaro.org, elder@kernel.org, gregkh@linuxfoundation.org Subject: [PATCH 3/3] net: ipa: request IPA register values be retained Date: Wed, 13 Apr 2022 09:48:11 -0500 Message-Id: <20220413144811.522143-4-elder@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220413144811.522143-1-elder@linaro.org> References: <20220413144811.522143-1-elder@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org commit 34a081761e4e3c35381cbfad609ebae2962fe2f8 upstream. In some cases, the IPA hardware needs to request the always-on subsystem (AOSS) to coordinate with the IPA microcontroller to retain IPA register values at power collapse. This is done by issuing a QMP request to the AOSS microcontroller. A similar request ondoes that request. We must get and hold the "QMP" handle early, because we might get back EPROBE_DEFER for that. But the actual request should be sent while we know the IPA clock is active, and when we know the microcontroller is operational. Fixes: 1aac309d3207 ("net: ipa: use autosuspend") Signed-off-by: Alex Elder Signed-off-by: Jakub Kicinski --- drivers/net/ipa/ipa_power.c | 52 +++++++++++++++++++++++++++++++++++++ drivers/net/ipa/ipa_power.h | 7 +++++ drivers/net/ipa/ipa_uc.c | 5 ++++ 3 files changed, 64 insertions(+) diff --git a/drivers/net/ipa/ipa_power.c b/drivers/net/ipa/ipa_power.c index b1c6c0fcb654f..f2989aac47a62 100644 --- a/drivers/net/ipa/ipa_power.c +++ b/drivers/net/ipa/ipa_power.c @@ -11,6 +11,8 @@ #include #include +#include "linux/soc/qcom/qcom_aoss.h" + #include "ipa.h" #include "ipa_power.h" #include "ipa_endpoint.h" @@ -64,6 +66,7 @@ enum ipa_power_flag { * struct ipa_power - IPA power management information * @dev: IPA device pointer * @core: IPA core clock + * @qmp: QMP handle for AOSS communication * @spinlock: Protects modem TX queue enable/disable * @flags: Boolean state flags * @interconnect_count: Number of elements in interconnect[] @@ -72,6 +75,7 @@ enum ipa_power_flag { struct ipa_power { struct device *dev; struct clk *core; + struct qmp *qmp; spinlock_t spinlock; /* used with STOPPED/STARTED power flags */ DECLARE_BITMAP(flags, IPA_POWER_FLAG_COUNT); u32 interconnect_count; @@ -382,6 +386,47 @@ void ipa_power_modem_queue_active(struct ipa *ipa) clear_bit(IPA_POWER_FLAG_STARTED, ipa->power->flags); } +static int ipa_power_retention_init(struct ipa_power *power) +{ + struct qmp *qmp = qmp_get(power->dev); + + if (IS_ERR(qmp)) { + if (PTR_ERR(qmp) == -EPROBE_DEFER) + return -EPROBE_DEFER; + + /* We assume any other error means it's not defined/needed */ + qmp = NULL; + } + power->qmp = qmp; + + return 0; +} + +static void ipa_power_retention_exit(struct ipa_power *power) +{ + qmp_put(power->qmp); + power->qmp = NULL; +} + +/* Control register retention on power collapse */ +void ipa_power_retention(struct ipa *ipa, bool enable) +{ + static const char fmt[] = "{ class: bcm, res: ipa_pc, val: %c }"; + struct ipa_power *power = ipa->power; + char buf[36]; /* Exactly enough for fmt[]; size a multiple of 4 */ + int ret; + + if (!power->qmp) + return; /* Not needed on this platform */ + + (void)snprintf(buf, sizeof(buf), fmt, enable ? '1' : '0'); + + ret = qmp_send(power->qmp, buf, sizeof(buf)); + if (ret) + dev_err(power->dev, "error %d sending QMP %sable request\n", + ret, enable ? "en" : "dis"); +} + int ipa_power_setup(struct ipa *ipa) { int ret; @@ -438,12 +483,18 @@ ipa_power_init(struct device *dev, const struct ipa_power_data *data) if (ret) goto err_kfree; + ret = ipa_power_retention_init(power); + if (ret) + goto err_interconnect_exit; + pm_runtime_set_autosuspend_delay(dev, IPA_AUTOSUSPEND_DELAY); pm_runtime_use_autosuspend(dev); pm_runtime_enable(dev); return power; +err_interconnect_exit: + ipa_interconnect_exit(power); err_kfree: kfree(power); err_clk_put: @@ -460,6 +511,7 @@ void ipa_power_exit(struct ipa_power *power) pm_runtime_disable(dev); pm_runtime_dont_use_autosuspend(dev); + ipa_power_retention_exit(power); ipa_interconnect_exit(power); kfree(power); clk_put(clk); diff --git a/drivers/net/ipa/ipa_power.h b/drivers/net/ipa/ipa_power.h index 2151805d7fbb0..6f84f057a2095 100644 --- a/drivers/net/ipa/ipa_power.h +++ b/drivers/net/ipa/ipa_power.h @@ -40,6 +40,13 @@ void ipa_power_modem_queue_wake(struct ipa *ipa); */ void ipa_power_modem_queue_active(struct ipa *ipa); +/** + * ipa_power_retention() - Control register retention on power collapse + * @ipa: IPA pointer + * @enable: Whether retention should be enabled or disabled + */ +void ipa_power_retention(struct ipa *ipa, bool enable); + /** * ipa_power_setup() - Set up IPA power management * @ipa: IPA pointer diff --git a/drivers/net/ipa/ipa_uc.c b/drivers/net/ipa/ipa_uc.c index 856e55a080a7f..fe11910518d95 100644 --- a/drivers/net/ipa/ipa_uc.c +++ b/drivers/net/ipa/ipa_uc.c @@ -11,6 +11,7 @@ #include "ipa.h" #include "ipa_uc.h" +#include "ipa_power.h" /** * DOC: The IPA embedded microcontroller @@ -154,6 +155,7 @@ static void ipa_uc_response_hdlr(struct ipa *ipa, enum ipa_irq_id irq_id) case IPA_UC_RESPONSE_INIT_COMPLETED: if (ipa->uc_powered) { ipa->uc_loaded = true; + ipa_power_retention(ipa, true); pm_runtime_mark_last_busy(dev); (void)pm_runtime_put_autosuspend(dev); ipa->uc_powered = false; @@ -184,6 +186,9 @@ void ipa_uc_deconfig(struct ipa *ipa) ipa_interrupt_remove(ipa->interrupt, IPA_IRQ_UC_1); ipa_interrupt_remove(ipa->interrupt, IPA_IRQ_UC_0); + if (ipa->uc_loaded) + ipa_power_retention(ipa, false); + if (!ipa->uc_powered) return;