public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	stable@vger.kernel.org, Alex Elder <elder@linaro.org>,
	Jakub Kicinski <kuba@kernel.org>
Subject: [PATCH 5.16 37/43] net: ipa: request IPA register values be retained
Date: Fri,  4 Feb 2022 10:22:44 +0100	[thread overview]
Message-ID: <20220204091918.370849377@linuxfoundation.org> (raw)
In-Reply-To: <20220204091917.166033635@linuxfoundation.org>

From: Alex Elder <elder@linaro.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 <elder@linaro.org>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 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(+)

--- a/drivers/net/ipa/ipa_power.c
+++ b/drivers/net/ipa/ipa_power.c
@@ -11,6 +11,8 @@
 #include <linux/pm_runtime.h>
 #include <linux/bitops.h>
 
+#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
 	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
 	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 *po
 
 	pm_runtime_disable(dev);
 	pm_runtime_dont_use_autosuspend(dev);
+	ipa_power_retention_exit(power);
 	ipa_interconnect_exit(power);
 	kfree(power);
 	clk_put(clk);
--- a/drivers/net/ipa/ipa_power.h
+++ b/drivers/net/ipa/ipa_power.h
@@ -41,6 +41,13 @@ void ipa_power_modem_queue_wake(struct i
 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
  *
--- 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
 	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;
 



  parent reply	other threads:[~2022-02-04  9:29 UTC|newest]

Thread overview: 54+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-04  9:22 [PATCH 5.16 00/43] 5.16.6-rc1 review Greg Kroah-Hartman
2022-02-04  9:22 ` [PATCH 5.16 01/43] PCI: pciehp: Fix infinite loop in IRQ handler upon power fault Greg Kroah-Hartman
2022-02-04  9:22 ` [PATCH 5.16 02/43] selftests: mptcp: fix ipv6 routing setup Greg Kroah-Hartman
2022-02-04  9:22 ` [PATCH 5.16 03/43] net: ipa: use a bitmap for endpoint replenish_enabled Greg Kroah-Hartman
2022-02-04  9:22 ` [PATCH 5.16 04/43] net: ipa: prevent concurrent replenish Greg Kroah-Hartman
2022-02-04  9:22 ` [PATCH 5.16 05/43] drm/vc4: hdmi: Make sure the device is powered with CEC Greg Kroah-Hartman
2022-02-04  9:22 ` [PATCH 5.16 06/43] cgroup-v1: Require capabilities to set release_agent Greg Kroah-Hartman
2022-02-04  9:22 ` [PATCH 5.16 07/43] Revert "mm/gup: small refactoring: simplify try_grab_page()" Greg Kroah-Hartman
2022-02-04  9:22 ` [PATCH 5.16 08/43] net: phy: Fix qca8081 with speeds lower than 2.5Gb/s Greg Kroah-Hartman
2022-02-04  9:22 ` [PATCH 5.16 09/43] ovl: dont fail copy up if no fileattr support on upper Greg Kroah-Hartman
2022-02-04  9:22 ` [PATCH 5.16 10/43] lockd: fix server crash on reboot of client holding lock Greg Kroah-Hartman
2022-02-04  9:22 ` [PATCH 5.16 11/43] lockd: fix failure to cleanup client locks Greg Kroah-Hartman
2022-02-04  9:22 ` [PATCH 5.16 12/43] net/mlx5e: IPsec: Fix crypto offload for non TCP/UDP encapsulated traffic Greg Kroah-Hartman
2022-02-04  9:22 ` [PATCH 5.16 13/43] net/mlx5e: IPsec: Fix tunnel mode crypto offload for non TCP/UDP traffic Greg Kroah-Hartman
2022-02-04  9:22 ` [PATCH 5.16 14/43] net/mlx5e: TC, Reject rules with drop and modify hdr action Greg Kroah-Hartman
2022-02-04  9:22 ` [PATCH 5.16 15/43] net/mlx5: Bridge, take rtnl lock in init error handler Greg Kroah-Hartman
2022-02-04  9:22 ` [PATCH 5.16 16/43] net/mlx5: Bridge, ensure dev_name is null-terminated Greg Kroah-Hartman
2022-02-04  9:22 ` [PATCH 5.16 17/43] net/mlx5e: Fix handling of wrong devices during bond netevent Greg Kroah-Hartman
2022-02-04  9:22 ` [PATCH 5.16 18/43] net/mlx5: Use del_timer_sync in fw reset flow of halting poll Greg Kroah-Hartman
2022-02-04  9:22 ` [PATCH 5.16 19/43] net/mlx5e: Fix module EEPROM query Greg Kroah-Hartman
2022-02-04  9:22 ` [PATCH 5.16 20/43] net/mlx5e: TC, Reject rules with forward and drop actions Greg Kroah-Hartman
2022-02-04  9:22 ` [PATCH 5.16 21/43] net/mlx5: Fix offloading with ESWITCH_IPV4_TTL_MODIFY_ENABLE Greg Kroah-Hartman
2022-02-04  9:22 ` [PATCH 5.16 22/43] net/mlx5e: Dont treat small ceil values as unlimited in HTB offload Greg Kroah-Hartman
2022-02-04  9:22 ` [PATCH 5.16 23/43] net/mlx5: Bridge, Fix devlink deadlock on net namespace deletion Greg Kroah-Hartman
2022-02-04  9:22 ` [PATCH 5.16 24/43] net/mlx5e: Avoid field-overflowing memcpy() Greg Kroah-Hartman
2022-02-04  9:22 ` [PATCH 5.16 25/43] net/mlx5e: Fix wrong calculation of header index in HW_GRO Greg Kroah-Hartman
2022-02-04  9:22 ` [PATCH 5.16 26/43] net/mlx5e: Fix broken SKB allocation in HW-GRO Greg Kroah-Hartman
2022-02-04  9:22 ` [PATCH 5.16 27/43] net/mlx5: E-Switch, Fix uninitialized variable modact Greg Kroah-Hartman
2022-02-04  9:22 ` [PATCH 5.16 28/43] net/mlx5e: Avoid implicit modify hdr for decap drop rule Greg Kroah-Hartman
2022-02-04  9:22 ` [PATCH 5.16 29/43] ipheth: fix EOVERFLOW in ipheth_rcvbulk_callback Greg Kroah-Hartman
2022-02-04  9:22 ` [PATCH 5.16 30/43] i40e: Fix reset bw limit when DCB enabled with 1 TC Greg Kroah-Hartman
2022-02-04  9:22 ` [PATCH 5.16 31/43] i40e: Fix reset path while removing the driver Greg Kroah-Hartman
2022-02-04  9:22 ` [PATCH 5.16 32/43] net: amd-xgbe: ensure to reset the tx_timer_active flag Greg Kroah-Hartman
2022-02-04  9:22 ` [PATCH 5.16 33/43] net: amd-xgbe: Fix skb data length underflow Greg Kroah-Hartman
2022-02-04  9:22 ` [PATCH 5.16 34/43] fanotify: Fix stale file descriptor in copy_event_to_user() Greg Kroah-Hartman
2022-02-04  9:22 ` [PATCH 5.16 35/43] net: sched: fix use-after-free in tc_new_tfilter() Greg Kroah-Hartman
2022-02-04  9:22 ` [PATCH 5.16 36/43] rtnetlink: make sure to refresh master_dev/m_ops in __rtnl_newlink() Greg Kroah-Hartman
2022-02-04  9:22 ` Greg Kroah-Hartman [this message]
2022-02-04  9:22 ` [PATCH 5.16 38/43] bpf: Fix possible race in inc_misses_counter Greg Kroah-Hartman
2022-02-04  9:22 ` [PATCH 5.16 39/43] cpuset: Fix the bug that subpart_cpus updated wrongly in update_cpumask() Greg Kroah-Hartman
2022-02-04  9:22 ` [PATCH 5.16 40/43] e1000e: Handshake with CSME starts from ADL platforms Greg Kroah-Hartman
2022-02-04  9:22 ` [PATCH 5.16 41/43] af_packet: fix data-race in packet_setsockopt / packet_setsockopt Greg Kroah-Hartman
2022-02-04  9:22 ` [PATCH 5.16 42/43] tcp: fix mem under-charging with zerocopy sendmsg() Greg Kroah-Hartman
2022-02-04  9:22 ` [PATCH 5.16 43/43] tcp: add missing tcp_skb_can_collapse() test in tcp_shift_skb_data() Greg Kroah-Hartman
2022-02-04 18:15 ` [PATCH 5.16 00/43] 5.16.6-rc1 review Florian Fainelli
2022-02-04 20:31 ` Shuah Khan
2022-02-04 22:55 ` Justin Forbes
2022-02-04 23:41 ` Guenter Roeck
2022-02-05  4:40 ` Rudi Heitbaum
2022-02-05  5:14 ` Slade Watkins
2022-02-05  6:28 ` Naresh Kamboju
2022-02-05  6:50 ` Scott Bruce
2022-02-05  8:14 ` Bagas Sanjaya
2022-02-05  9:08 ` Ron Economos

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220204091918.370849377@linuxfoundation.org \
    --to=gregkh@linuxfoundation.org \
    --cc=elder@linaro.org \
    --cc=kuba@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox