Skip to content

Commit 8ff8bdb

Browse files
Alex Eldergregkh
Alex Elder
authored andcommitted
net: ipa: request IPA register values be retained
commit 34a0817 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: 1aac309 ("net: ipa: use autosuspend") Signed-off-by: Alex Elder <[email protected]> Signed-off-by: Jakub Kicinski <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 587ced6 commit 8ff8bdb

File tree

3 files changed

+64
-0
lines changed

3 files changed

+64
-0
lines changed

drivers/net/ipa/ipa_power.c

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
#include <linux/pm_runtime.h>
1212
#include <linux/bitops.h>
1313

14+
#include "linux/soc/qcom/qcom_aoss.h"
15+
1416
#include "ipa.h"
1517
#include "ipa_power.h"
1618
#include "ipa_endpoint.h"
@@ -64,6 +66,7 @@ enum ipa_power_flag {
6466
* struct ipa_power - IPA power management information
6567
* @dev: IPA device pointer
6668
* @core: IPA core clock
69+
* @qmp: QMP handle for AOSS communication
6770
* @spinlock: Protects modem TX queue enable/disable
6871
* @flags: Boolean state flags
6972
* @interconnect_count: Number of elements in interconnect[]
@@ -72,6 +75,7 @@ enum ipa_power_flag {
7275
struct ipa_power {
7376
struct device *dev;
7477
struct clk *core;
78+
struct qmp *qmp;
7579
spinlock_t spinlock; /* used with STOPPED/STARTED power flags */
7680
DECLARE_BITMAP(flags, IPA_POWER_FLAG_COUNT);
7781
u32 interconnect_count;
@@ -382,6 +386,47 @@ void ipa_power_modem_queue_active(struct ipa *ipa)
382386
clear_bit(IPA_POWER_FLAG_STARTED, ipa->power->flags);
383387
}
384388

389+
static int ipa_power_retention_init(struct ipa_power *power)
390+
{
391+
struct qmp *qmp = qmp_get(power->dev);
392+
393+
if (IS_ERR(qmp)) {
394+
if (PTR_ERR(qmp) == -EPROBE_DEFER)
395+
return -EPROBE_DEFER;
396+
397+
/* We assume any other error means it's not defined/needed */
398+
qmp = NULL;
399+
}
400+
power->qmp = qmp;
401+
402+
return 0;
403+
}
404+
405+
static void ipa_power_retention_exit(struct ipa_power *power)
406+
{
407+
qmp_put(power->qmp);
408+
power->qmp = NULL;
409+
}
410+
411+
/* Control register retention on power collapse */
412+
void ipa_power_retention(struct ipa *ipa, bool enable)
413+
{
414+
static const char fmt[] = "{ class: bcm, res: ipa_pc, val: %c }";
415+
struct ipa_power *power = ipa->power;
416+
char buf[36]; /* Exactly enough for fmt[]; size a multiple of 4 */
417+
int ret;
418+
419+
if (!power->qmp)
420+
return; /* Not needed on this platform */
421+
422+
(void)snprintf(buf, sizeof(buf), fmt, enable ? '1' : '0');
423+
424+
ret = qmp_send(power->qmp, buf, sizeof(buf));
425+
if (ret)
426+
dev_err(power->dev, "error %d sending QMP %sable request\n",
427+
ret, enable ? "en" : "dis");
428+
}
429+
385430
int ipa_power_setup(struct ipa *ipa)
386431
{
387432
int ret;
@@ -438,12 +483,18 @@ ipa_power_init(struct device *dev, const struct ipa_power_data *data)
438483
if (ret)
439484
goto err_kfree;
440485

486+
ret = ipa_power_retention_init(power);
487+
if (ret)
488+
goto err_interconnect_exit;
489+
441490
pm_runtime_set_autosuspend_delay(dev, IPA_AUTOSUSPEND_DELAY);
442491
pm_runtime_use_autosuspend(dev);
443492
pm_runtime_enable(dev);
444493

445494
return power;
446495

496+
err_interconnect_exit:
497+
ipa_interconnect_exit(power);
447498
err_kfree:
448499
kfree(power);
449500
err_clk_put:
@@ -460,6 +511,7 @@ void ipa_power_exit(struct ipa_power *power)
460511

461512
pm_runtime_disable(dev);
462513
pm_runtime_dont_use_autosuspend(dev);
514+
ipa_power_retention_exit(power);
463515
ipa_interconnect_exit(power);
464516
kfree(power);
465517
clk_put(clk);

drivers/net/ipa/ipa_power.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,13 @@ void ipa_power_modem_queue_wake(struct ipa *ipa);
4040
*/
4141
void ipa_power_modem_queue_active(struct ipa *ipa);
4242

43+
/**
44+
* ipa_power_retention() - Control register retention on power collapse
45+
* @ipa: IPA pointer
46+
* @enable: Whether retention should be enabled or disabled
47+
*/
48+
void ipa_power_retention(struct ipa *ipa, bool enable);
49+
4350
/**
4451
* ipa_power_setup() - Set up IPA power management
4552
* @ipa: IPA pointer

drivers/net/ipa/ipa_uc.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
#include "ipa.h"
1313
#include "ipa_uc.h"
14+
#include "ipa_power.h"
1415

1516
/**
1617
* DOC: The IPA embedded microcontroller
@@ -154,6 +155,7 @@ static void ipa_uc_response_hdlr(struct ipa *ipa, enum ipa_irq_id irq_id)
154155
case IPA_UC_RESPONSE_INIT_COMPLETED:
155156
if (ipa->uc_powered) {
156157
ipa->uc_loaded = true;
158+
ipa_power_retention(ipa, true);
157159
pm_runtime_mark_last_busy(dev);
158160
(void)pm_runtime_put_autosuspend(dev);
159161
ipa->uc_powered = false;
@@ -184,6 +186,9 @@ void ipa_uc_deconfig(struct ipa *ipa)
184186

185187
ipa_interrupt_remove(ipa->interrupt, IPA_IRQ_UC_1);
186188
ipa_interrupt_remove(ipa->interrupt, IPA_IRQ_UC_0);
189+
if (ipa->uc_loaded)
190+
ipa_power_retention(ipa, false);
191+
187192
if (!ipa->uc_powered)
188193
return;
189194

0 commit comments

Comments
 (0)