Skip to content

Commit 335c4cb

Browse files
crojewsk-intelbroonie
authored andcommitted
ASoC: Intel: avs: D0ix power state support
Audio DSP device supports D0 substates in form of D0ix, allowing for preserving more power even when device is still considered active (D0). When entered, certain domains which are not being currently used become power gated. Entering and leaving D0ix is a complex process and differs between firmware generations. Conditions that disallow D0i3 and require immediate D0i0 transition include but may not be limited to: IPC traffic, firmware tracing and SRAM I/O. To make D0ix toggling sane, delay D0i3 transition and refresh the timer each time an IPC is requested. Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com> Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com> Link: https://lore.kernel.org/r/20220516101116.190192-9-cezary.rojewski@intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 4b86115 commit 335c4cb

File tree

4 files changed

+150
-3
lines changed

4 files changed

+150
-3
lines changed

sound/soc/intel/avs/avs.h

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ struct avs_dev;
2222
struct avs_tplg;
2323
struct avs_tplg_library;
2424
struct avs_soc_component;
25+
struct avs_ipc_msg;
2526

2627
/*
2728
* struct avs_dsp_ops - Platform-specific DSP operations
@@ -48,6 +49,8 @@ struct avs_dsp_ops {
4849
int (* const log_buffer_offset)(struct avs_dev *, u32);
4950
int (* const log_buffer_status)(struct avs_dev *, union avs_notify_msg *);
5051
int (* const coredump)(struct avs_dev *, union avs_notify_msg *);
52+
bool (* const d0ix_toggle)(struct avs_dev *, struct avs_ipc_msg *, bool);
53+
int (* const set_d0ix)(struct avs_dev *, bool);
5154
};
5255

5356
#define avs_dsp_op(adev, op, ...) \
@@ -191,6 +194,9 @@ struct avs_ipc {
191194
struct completion busy_completion;
192195

193196
struct work_struct recovery_work;
197+
struct delayed_work d0ix_work;
198+
atomic_t d0ix_disable_depth;
199+
bool in_d0ix;
194200
};
195201

196202
#define AVS_EIPC EREMOTEIO
@@ -227,13 +233,21 @@ int avs_dsp_send_msg_timeout(struct avs_dev *adev,
227233
struct avs_ipc_msg *reply, int timeout);
228234
int avs_dsp_send_msg(struct avs_dev *adev,
229235
struct avs_ipc_msg *request, struct avs_ipc_msg *reply);
236+
/* Two variants below are for messages that control DSP power states. */
237+
int avs_dsp_send_pm_msg_timeout(struct avs_dev *adev, struct avs_ipc_msg *request,
238+
struct avs_ipc_msg *reply, int timeout, bool wake_d0i0);
239+
int avs_dsp_send_pm_msg(struct avs_dev *adev, struct avs_ipc_msg *request,
240+
struct avs_ipc_msg *reply, bool wake_d0i0);
230241
int avs_dsp_send_rom_msg_timeout(struct avs_dev *adev,
231242
struct avs_ipc_msg *request, int timeout);
232243
int avs_dsp_send_rom_msg(struct avs_dev *adev, struct avs_ipc_msg *request);
233244
void avs_dsp_interrupt_control(struct avs_dev *adev, bool enable);
234245
int avs_ipc_init(struct avs_ipc *ipc, struct device *dev);
235246
void avs_ipc_block(struct avs_ipc *ipc);
236247

248+
int avs_dsp_disable_d0ix(struct avs_dev *adev);
249+
int avs_dsp_enable_d0ix(struct avs_dev *adev);
250+
237251
/* Firmware resources management */
238252

239253
int avs_get_module_entry(struct avs_dev *adev, const guid_t *uuid, struct avs_module_entry *entry);

sound/soc/intel/avs/dsp.c

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,15 @@ static int avs_dsp_get_core(struct avs_dev *adev, u32 core_id)
152152

153153
adev->core_refs[core_id]++;
154154
if (adev->core_refs[core_id] == 1) {
155+
/*
156+
* No cores other than main-core can be running for DSP
157+
* to achieve d0ix. Conscious SET_D0IX IPC failure is permitted,
158+
* simply d0ix power state will no longer be attempted.
159+
*/
160+
ret = avs_dsp_disable_d0ix(adev);
161+
if (ret && ret != -AVS_EIPC)
162+
goto err_disable_d0ix;
163+
155164
ret = avs_dsp_enable(adev, mask);
156165
if (ret)
157166
goto err_enable_dsp;
@@ -160,6 +169,8 @@ static int avs_dsp_get_core(struct avs_dev *adev, u32 core_id)
160169
return 0;
161170

162171
err_enable_dsp:
172+
avs_dsp_enable_d0ix(adev);
173+
err_disable_d0ix:
163174
adev->core_refs[core_id]--;
164175
err:
165176
dev_err(adev->dev, "get core %d failed: %d\n", core_id, ret);
@@ -185,6 +196,9 @@ static int avs_dsp_put_core(struct avs_dev *adev, u32 core_id)
185196
ret = avs_dsp_disable(adev, mask);
186197
if (ret)
187198
goto err;
199+
200+
/* Match disable_d0ix in avs_dsp_get_core(). */
201+
avs_dsp_enable_d0ix(adev);
188202
}
189203

190204
return 0;

sound/soc/intel/avs/ipc.c

Lines changed: 120 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,82 @@
1313
#include "registers.h"
1414

1515
#define AVS_IPC_TIMEOUT_MS 300
16+
#define AVS_D0IX_DELAY_MS 300
17+
18+
static int
19+
avs_dsp_set_d0ix(struct avs_dev *adev, bool enable)
20+
{
21+
struct avs_ipc *ipc = adev->ipc;
22+
int ret;
23+
24+
/* Is transition required? */
25+
if (ipc->in_d0ix == enable)
26+
return 0;
27+
28+
ret = avs_dsp_op(adev, set_d0ix, enable);
29+
if (ret) {
30+
/* Prevent further d0ix attempts on conscious IPC failure. */
31+
if (ret == -AVS_EIPC)
32+
atomic_inc(&ipc->d0ix_disable_depth);
33+
34+
ipc->in_d0ix = false;
35+
return ret;
36+
}
37+
38+
ipc->in_d0ix = enable;
39+
return 0;
40+
}
41+
42+
static void avs_dsp_schedule_d0ix(struct avs_dev *adev, struct avs_ipc_msg *tx)
43+
{
44+
if (atomic_read(&adev->ipc->d0ix_disable_depth))
45+
return;
46+
47+
mod_delayed_work(system_power_efficient_wq, &adev->ipc->d0ix_work,
48+
msecs_to_jiffies(AVS_D0IX_DELAY_MS));
49+
}
50+
51+
static void avs_dsp_d0ix_work(struct work_struct *work)
52+
{
53+
struct avs_ipc *ipc = container_of(work, struct avs_ipc, d0ix_work.work);
54+
55+
avs_dsp_set_d0ix(to_avs_dev(ipc->dev), true);
56+
}
57+
58+
static int avs_dsp_wake_d0i0(struct avs_dev *adev, struct avs_ipc_msg *tx)
59+
{
60+
struct avs_ipc *ipc = adev->ipc;
61+
62+
if (!atomic_read(&ipc->d0ix_disable_depth)) {
63+
cancel_delayed_work_sync(&ipc->d0ix_work);
64+
return avs_dsp_set_d0ix(adev, false);
65+
}
66+
67+
return 0;
68+
}
69+
70+
int avs_dsp_disable_d0ix(struct avs_dev *adev)
71+
{
72+
struct avs_ipc *ipc = adev->ipc;
73+
74+
/* Prevent PG only on the first disable. */
75+
if (atomic_add_return(1, &ipc->d0ix_disable_depth) == 1) {
76+
cancel_delayed_work_sync(&ipc->d0ix_work);
77+
return avs_dsp_set_d0ix(adev, false);
78+
}
79+
80+
return 0;
81+
}
82+
83+
int avs_dsp_enable_d0ix(struct avs_dev *adev)
84+
{
85+
struct avs_ipc *ipc = adev->ipc;
86+
87+
if (atomic_dec_and_test(&ipc->d0ix_disable_depth))
88+
queue_delayed_work(system_power_efficient_wq, &ipc->d0ix_work,
89+
msecs_to_jiffies(AVS_D0IX_DELAY_MS));
90+
return 0;
91+
}
1692

1793
static void avs_dsp_recovery(struct avs_dev *adev)
1894
{
@@ -88,6 +164,8 @@ static void avs_dsp_exception_caught(struct avs_dev *adev, union avs_notify_msg
88164

89165
dev_crit(adev->dev, "communication severed, rebooting dsp..\n");
90166

167+
cancel_delayed_work_sync(&ipc->d0ix_work);
168+
ipc->in_d0ix = false;
91169
/* Re-enabled on recovery completion. */
92170
pm_runtime_disable(adev->dev);
93171

@@ -393,10 +471,35 @@ static int avs_dsp_do_send_msg(struct avs_dev *adev, struct avs_ipc_msg *request
393471
return ret;
394472
}
395473

474+
static int avs_dsp_send_msg_sequence(struct avs_dev *adev, struct avs_ipc_msg *request,
475+
struct avs_ipc_msg *reply, int timeout, bool wake_d0i0,
476+
bool schedule_d0ix)
477+
{
478+
int ret;
479+
480+
if (wake_d0i0) {
481+
ret = avs_dsp_wake_d0i0(adev, request);
482+
if (ret)
483+
return ret;
484+
}
485+
486+
ret = avs_dsp_do_send_msg(adev, request, reply, timeout);
487+
if (ret)
488+
return ret;
489+
490+
if (schedule_d0ix)
491+
avs_dsp_schedule_d0ix(adev, request);
492+
493+
return 0;
494+
}
495+
396496
int avs_dsp_send_msg_timeout(struct avs_dev *adev, struct avs_ipc_msg *request,
397497
struct avs_ipc_msg *reply, int timeout)
398498
{
399-
return avs_dsp_do_send_msg(adev, request, reply, timeout);
499+
bool wake_d0i0 = avs_dsp_op(adev, d0ix_toggle, request, true);
500+
bool schedule_d0ix = avs_dsp_op(adev, d0ix_toggle, request, false);
501+
502+
return avs_dsp_send_msg_sequence(adev, request, reply, timeout, wake_d0i0, schedule_d0ix);
400503
}
401504

402505
int avs_dsp_send_msg(struct avs_dev *adev, struct avs_ipc_msg *request,
@@ -405,6 +508,19 @@ int avs_dsp_send_msg(struct avs_dev *adev, struct avs_ipc_msg *request,
405508
return avs_dsp_send_msg_timeout(adev, request, reply, adev->ipc->default_timeout_ms);
406509
}
407510

511+
int avs_dsp_send_pm_msg_timeout(struct avs_dev *adev, struct avs_ipc_msg *request,
512+
struct avs_ipc_msg *reply, int timeout, bool wake_d0i0)
513+
{
514+
return avs_dsp_send_msg_sequence(adev, request, reply, timeout, wake_d0i0, false);
515+
}
516+
517+
int avs_dsp_send_pm_msg(struct avs_dev *adev, struct avs_ipc_msg *request,
518+
struct avs_ipc_msg *reply, bool wake_d0i0)
519+
{
520+
return avs_dsp_send_pm_msg_timeout(adev, request, reply, adev->ipc->default_timeout_ms,
521+
wake_d0i0);
522+
}
523+
408524
static int avs_dsp_do_send_rom_msg(struct avs_dev *adev, struct avs_ipc_msg *request, int timeout)
409525
{
410526
struct avs_ipc *ipc = adev->ipc;
@@ -465,6 +581,7 @@ int avs_ipc_init(struct avs_ipc *ipc, struct device *dev)
465581
ipc->ready = false;
466582
ipc->default_timeout_ms = AVS_IPC_TIMEOUT_MS;
467583
INIT_WORK(&ipc->recovery_work, avs_dsp_recovery_work);
584+
INIT_DELAYED_WORK(&ipc->d0ix_work, avs_dsp_d0ix_work);
468585
init_completion(&ipc->done_completion);
469586
init_completion(&ipc->busy_completion);
470587
spin_lock_init(&ipc->rx_lock);
@@ -477,4 +594,6 @@ void avs_ipc_block(struct avs_ipc *ipc)
477594
{
478595
ipc->ready = false;
479596
cancel_work_sync(&ipc->recovery_work);
597+
cancel_delayed_work_sync(&ipc->d0ix_work);
598+
ipc->in_d0ix = false;
480599
}

sound/soc/intel/avs/messages.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ int avs_ipc_set_dx(struct avs_dev *adev, u32 core_mask, bool powerup)
432432
request.data = &dx;
433433
request.size = sizeof(dx);
434434

435-
ret = avs_dsp_send_msg(adev, &request, NULL);
435+
ret = avs_dsp_send_pm_msg(adev, &request, NULL, true);
436436
if (ret)
437437
avs_ipc_err(adev, &request, "set dx", ret);
438438

@@ -456,7 +456,7 @@ int avs_ipc_set_d0ix(struct avs_dev *adev, bool enable_pg, bool streaming)
456456

457457
request.header = msg.val;
458458

459-
ret = avs_dsp_send_msg(adev, &request, NULL);
459+
ret = avs_dsp_send_pm_msg(adev, &request, NULL, false);
460460
if (ret)
461461
avs_ipc_err(adev, &request, "set d0ix", ret);
462462

0 commit comments

Comments
 (0)