[PATCH 0/3] soundwire: qcom: add pm runtime support
This patchset adds pm runtime support to Qualcomm SounWire Controller using SoundWire Clock Stop and Wake up using Headset events on supported instances and a bus reset on instances that require full reset.
Tested it on SM8250 MTP and Dragon Board DB845c
--srini
Srinivas Kandagatla (3): soundwire: qcom: add runtime pm support dt-bindings: soundwire: qcom: document optional wake irq soundwire: qcom: add wake up interrupt support
.../bindings/soundwire/qcom,sdw.txt | 2 +- drivers/soundwire/qcom.c | 215 +++++++++++++++++- 2 files changed, 215 insertions(+), 2 deletions(-)
Add support to runtime PM using SoundWire clock stop on supported instances and bus reset on instances that require full reset.
Signed-off-by: Srinivas Kandagatla srinivas.kandagatla@linaro.org --- drivers/soundwire/qcom.c | 150 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 149 insertions(+), 1 deletion(-)
diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c index 54813417ef8e..3b2eb95a7e96 100644 --- a/drivers/soundwire/qcom.c +++ b/drivers/soundwire/qcom.c @@ -11,6 +11,7 @@ #include <linux/of.h> #include <linux/of_irq.h> #include <linux/of_device.h> +#include <linux/pm_runtime.h> #include <linux/regmap.h> #include <linux/slab.h> #include <linux/slimbus.h> @@ -20,6 +21,9 @@ #include <sound/soc.h> #include "bus.h"
+#define SWRM_COMP_SW_RESET 0x008 +#define SWRM_COMP_STATUS 0x014 +#define SWRM_FRM_GEN_ENABLED BIT(0) #define SWRM_COMP_HW_VERSION 0x00 #define SWRM_COMP_CFG_ADDR 0x04 #define SWRM_COMP_CFG_IRQ_LEVEL_OR_PULSE_MSK BIT(1) @@ -29,6 +33,7 @@ #define SWRM_COMP_PARAMS_RD_FIFO_DEPTH GENMASK(19, 15) #define SWRM_COMP_PARAMS_DOUT_PORTS_MASK GENMASK(4, 0) #define SWRM_COMP_PARAMS_DIN_PORTS_MASK GENMASK(9, 5) +#define SWRM_COMP_MASTER_ID 0x104 #define SWRM_INTERRUPT_STATUS 0x200 #define SWRM_INTERRUPT_STATUS_RMSK GENMASK(16, 0) #define SWRM_INTERRUPT_STATUS_SLAVE_PEND_IRQ BIT(0) @@ -111,6 +116,13 @@ #define SWR_MAX_CMD_ID 14 #define MAX_FIFO_RD_RETRY 3 #define SWR_OVERFLOW_RETRY_COUNT 30 +#define SWRM_LINK_STATUS_RETRY_CNT 100 + +enum { + MASTER_ID_WSA = 1, + MASTER_ID_RX, + MASTER_ID_TX +};
struct qcom_swrm_port_config { u8 si; @@ -159,6 +171,7 @@ struct qcom_swrm_ctrl { u32 slave_status; u32 wr_fifo_depth; u32 rd_fifo_depth; + bool clk_stop_bus_reset; };
struct qcom_swrm_data { @@ -497,6 +510,7 @@ static irqreturn_t qcom_swrm_irq_handler(int irq, void *dev_id) u32 i; int devnum; int ret = IRQ_HANDLED; + clk_prepare_enable(swrm->hclk);
swrm->reg_read(swrm, SWRM_INTERRUPT_STATUS, &intr_sts); intr_sts_masked = intr_sts & swrm->intr_mask; @@ -604,6 +618,7 @@ static irqreturn_t qcom_swrm_irq_handler(int irq, void *dev_id) intr_sts_masked = intr_sts & swrm->intr_mask; } while (intr_sts_masked);
+ clk_disable_unprepare(swrm->hclk); return ret; }
@@ -1017,6 +1032,15 @@ static int qcom_swrm_startup(struct snd_pcm_substream *substream, struct snd_soc_dai *codec_dai; int ret, i;
+ ret = pm_runtime_get_sync(ctrl->dev); + if (ret < 0 && ret != -EACCES) { + dev_err_ratelimited(ctrl->dev, + "pm_runtime_get_sync failed in %s, ret %d\n", + __func__, ret); + pm_runtime_put_noidle(ctrl->dev); + return ret; + } + sruntime = sdw_alloc_stream(dai->name); if (!sruntime) return -ENOMEM; @@ -1044,6 +1068,9 @@ static void qcom_swrm_shutdown(struct snd_pcm_substream *substream,
sdw_release_stream(ctrl->sruntime[dai->id]); ctrl->sruntime[dai->id] = NULL; + pm_runtime_mark_last_busy(ctrl->dev); + pm_runtime_put_autosuspend(ctrl->dev); + }
static const struct snd_soc_dai_ops qcom_swrm_pdm_dai_ops = { @@ -1197,12 +1224,23 @@ static int qcom_swrm_get_port_config(struct qcom_swrm_ctrl *ctrl) static int swrm_reg_show(struct seq_file *s_file, void *data) { struct qcom_swrm_ctrl *swrm = s_file->private; - int reg, reg_val; + int reg, reg_val, ret; + + ret = pm_runtime_get_sync(swrm->dev); + if (ret < 0 && ret != -EACCES) { + dev_err_ratelimited(swrm->dev, + "pm_runtime_get_sync failed in %s, ret %d\n", + __func__, ret); + pm_runtime_put_noidle(swrm->dev); + }
for (reg = 0; reg <= SWR_MSTR_MAX_REG_ADDR; reg += 4) { swrm->reg_read(swrm, reg, ®_val); seq_printf(s_file, "0x%.3x: 0x%.2x\n", reg, reg_val); } + pm_runtime_mark_last_busy(swrm->dev); + pm_runtime_put_autosuspend(swrm->dev); +
return 0; } @@ -1267,6 +1305,7 @@ static int qcom_swrm_probe(struct platform_device *pdev) ctrl->bus.ops = &qcom_swrm_ops; ctrl->bus.port_ops = &qcom_swrm_port_ops; ctrl->bus.compute_params = &qcom_swrm_compute_params; + ctrl->bus.clk_stop_timeout = 300;
ret = qcom_swrm_get_port_config(ctrl); if (ret) @@ -1319,6 +1358,21 @@ static int qcom_swrm_probe(struct platform_device *pdev) (ctrl->version >> 24) & 0xff, (ctrl->version >> 16) & 0xff, ctrl->version & 0xffff);
+ pm_runtime_set_autosuspend_delay(dev, 3000); + pm_runtime_use_autosuspend(dev); + pm_runtime_mark_last_busy(dev); + pm_runtime_set_active(dev); + pm_runtime_enable(dev); + + /* Clk stop is not supported on WSA Soundwire masters */ + if (ctrl->version <= 0x01030000) { + ctrl->clk_stop_bus_reset = true; + } else { + ctrl->reg_read(ctrl, SWRM_COMP_MASTER_ID, &val); + if (val == MASTER_ID_WSA) + ctrl->clk_stop_bus_reset = true; + } + #ifdef CONFIG_DEBUG_FS ctrl->debugfs = debugfs_create_dir("qualcomm-sdw", ctrl->bus.debugfs); debugfs_create_file("qualcomm-registers", 0400, ctrl->debugfs, ctrl, @@ -1345,6 +1399,99 @@ static int qcom_swrm_remove(struct platform_device *pdev) return 0; }
+static bool swrm_wait_for_frame_gen_enabled(struct qcom_swrm_ctrl *swrm) +{ + int retry = SWRM_LINK_STATUS_RETRY_CNT; + int comp_sts; + + do { + swrm->reg_read(swrm, SWRM_COMP_STATUS, &comp_sts); + + if (comp_sts & SWRM_FRM_GEN_ENABLED) + return true; + + usleep_range(500, 510); + } while (retry--); + + dev_err(swrm->dev, "%s: link status not %s\n", __func__, + comp_sts && SWRM_FRM_GEN_ENABLED ? "connected" : "disconnected"); + + return false; +} + +static int swrm_runtime_resume(struct device *dev) +{ + struct qcom_swrm_ctrl *ctrl = dev_get_drvdata(dev); + int ret; + + clk_prepare_enable(ctrl->hclk); + + if (ctrl->clk_stop_bus_reset) { + reinit_completion(&ctrl->enumeration); + ctrl->reg_write(ctrl, SWRM_COMP_SW_RESET, 0x01); + qcom_swrm_get_device_status(ctrl); + sdw_handle_slave_status(&ctrl->bus, ctrl->status); + qcom_swrm_init(ctrl); + wait_for_completion_timeout(&ctrl->enumeration, + msecs_to_jiffies(TIMEOUT_MS)); + } else { + ctrl->reg_write(ctrl, SWRM_MCP_BUS_CTRL, SWRM_MCP_BUS_CLK_START); + ctrl->reg_write(ctrl, SWRM_INTERRUPT_CLEAR, + SWRM_INTERRUPT_STATUS_MASTER_CLASH_DET); + + ctrl->intr_mask |= SWRM_INTERRUPT_STATUS_MASTER_CLASH_DET; + ctrl->reg_write(ctrl, SWRM_INTERRUPT_MASK_ADDR, ctrl->intr_mask); + ctrl->reg_write(ctrl, SWRM_INTERRUPT_CPU_EN, ctrl->intr_mask); + + usleep_range(100, 105); + } + + if (!swrm_wait_for_frame_gen_enabled(ctrl)) + dev_err(ctrl->dev, "link failed to connect\n"); + + usleep_range(300, 305); + ret = sdw_bus_exit_clk_stop(&ctrl->bus); + if (ret < 0) + dev_err(ctrl->dev, "bus failed to exit clock stop %d\n", ret); + + return 0; +} + +static int __maybe_unused swrm_runtime_suspend(struct device *dev) +{ + struct qcom_swrm_ctrl *ctrl = dev_get_drvdata(dev); + int ret; + + if (!ctrl->clk_stop_bus_reset) { + /* Mask bus clash interrupt */ + ctrl->intr_mask &= ~SWRM_INTERRUPT_STATUS_MASTER_CLASH_DET; + ctrl->reg_write(ctrl, SWRM_INTERRUPT_MASK_ADDR, ctrl->intr_mask); + ctrl->reg_write(ctrl, SWRM_INTERRUPT_CPU_EN, ctrl->intr_mask); + } + /* Prepare slaves for clock stop */ + ret = sdw_bus_prep_clk_stop(&ctrl->bus); + if (ret < 0) { + dev_err(dev, "prepare clock stop failed %d", ret); + return ret; + } + + ret = sdw_bus_clk_stop(&ctrl->bus); + if (ret < 0 && ret != -ENODATA) { + dev_err(dev, "bus clock stop failed %d", ret); + return ret; + } + + clk_disable_unprepare(ctrl->hclk); + + usleep_range(300, 305); + + return 0; +} + +static const struct dev_pm_ops swrm_dev_pm_ops = { + SET_RUNTIME_PM_OPS(swrm_runtime_suspend, swrm_runtime_resume, NULL) +}; + static const struct of_device_id qcom_swrm_of_match[] = { { .compatible = "qcom,soundwire-v1.3.0", .data = &swrm_v1_3_data }, { .compatible = "qcom,soundwire-v1.5.1", .data = &swrm_v1_5_data }, @@ -1359,6 +1506,7 @@ static struct platform_driver qcom_swrm_driver = { .driver = { .name = "qcom-soundwire", .of_match_table = qcom_swrm_of_match, + .pm = &swrm_dev_pm_ops, } }; module_platform_driver(qcom_swrm_driver);
On 2/21/22 04:41, Srinivas Kandagatla wrote:
Add support to runtime PM using SoundWire clock stop on supported instances and bus reset on instances that require full reset.
This commit message and code are a bit confusing, e.g. you have a boolean state
ctrl->clk_stop_bus_reset = true;
Does this mean bus reset on exiting clock stop? or just that clock stop is not supported and bus reset is required with complete re-enumeration.
It would be good to try and explain using SoundWire 1.x terminology what actions are taken on resume.
@@ -1267,6 +1305,7 @@ static int qcom_swrm_probe(struct platform_device *pdev) ctrl->bus.ops = &qcom_swrm_ops; ctrl->bus.port_ops = &qcom_swrm_port_ops; ctrl->bus.compute_params = &qcom_swrm_compute_params;
ctrl->bus.clk_stop_timeout = 300;
ret = qcom_swrm_get_port_config(ctrl); if (ret)
@@ -1319,6 +1358,21 @@ static int qcom_swrm_probe(struct platform_device *pdev) (ctrl->version >> 24) & 0xff, (ctrl->version >> 16) & 0xff, ctrl->version & 0xffff);
- pm_runtime_set_autosuspend_delay(dev, 3000);
- pm_runtime_use_autosuspend(dev);
- pm_runtime_mark_last_busy(dev);
- pm_runtime_set_active(dev);
- pm_runtime_enable(dev);
- /* Clk stop is not supported on WSA Soundwire masters */
- if (ctrl->version <= 0x01030000) {
ctrl->clk_stop_bus_reset = true;- } else {
ctrl->reg_read(ctrl, SWRM_COMP_MASTER_ID, &val);if (val == MASTER_ID_WSA)ctrl->clk_stop_bus_reset = true;- }
I think this means clock_stop_not_supported?
+static int swrm_runtime_resume(struct device *dev) +{
- struct qcom_swrm_ctrl *ctrl = dev_get_drvdata(dev);
- int ret;
- clk_prepare_enable(ctrl->hclk);
- if (ctrl->clk_stop_bus_reset) {
reinit_completion(&ctrl->enumeration);ctrl->reg_write(ctrl, SWRM_COMP_SW_RESET, 0x01);qcom_swrm_get_device_status(ctrl);
don't you need some sort of delay before checking the controller and device status? The bus reset sequence takes 4096 bits, that's a non-zero time.
sdw_handle_slave_status(&ctrl->bus, ctrl->status);qcom_swrm_init(ctrl);wait_for_completion_timeout(&ctrl->enumeration,msecs_to_jiffies(TIMEOUT_MS));- } else {
ctrl->reg_write(ctrl, SWRM_MCP_BUS_CTRL, SWRM_MCP_BUS_CLK_START);ctrl->reg_write(ctrl, SWRM_INTERRUPT_CLEAR,SWRM_INTERRUPT_STATUS_MASTER_CLASH_DET);ctrl->intr_mask |= SWRM_INTERRUPT_STATUS_MASTER_CLASH_DET;ctrl->reg_write(ctrl, SWRM_INTERRUPT_MASK_ADDR, ctrl->intr_mask);ctrl->reg_write(ctrl, SWRM_INTERRUPT_CPU_EN, ctrl->intr_mask);usleep_range(100, 105);- }
- if (!swrm_wait_for_frame_gen_enabled(ctrl))
dev_err(ctrl->dev, "link failed to connect\n");- usleep_range(300, 305);
- ret = sdw_bus_exit_clk_stop(&ctrl->bus);
- if (ret < 0)
dev_err(ctrl->dev, "bus failed to exit clock stop %d\n", ret);- return 0;
+}
+static int __maybe_unused swrm_runtime_suspend(struct device *dev) +{
- struct qcom_swrm_ctrl *ctrl = dev_get_drvdata(dev);
- int ret;
- if (!ctrl->clk_stop_bus_reset) {
/* Mask bus clash interrupt */ctrl->intr_mask &= ~SWRM_INTERRUPT_STATUS_MASTER_CLASH_DET;ctrl->reg_write(ctrl, SWRM_INTERRUPT_MASK_ADDR, ctrl->intr_mask);ctrl->reg_write(ctrl, SWRM_INTERRUPT_CPU_EN, ctrl->intr_mask);- }
- /* Prepare slaves for clock stop */
- ret = sdw_bus_prep_clk_stop(&ctrl->bus);
- if (ret < 0) {
if a device has lost sync and reports -ENODATA, you want still want to go ahead and not prevent the suspend operation from happening.
dev_err(dev, "prepare clock stop failed %d", ret);return ret;- }
- ret = sdw_bus_clk_stop(&ctrl->bus);
- if (ret < 0 && ret != -ENODATA) {
dev_err(dev, "bus clock stop failed %d", ret);return ret;- }
- clk_disable_unprepare(ctrl->hclk);
- usleep_range(300, 305);
- return 0;
+}
+static const struct dev_pm_ops swrm_dev_pm_ops = {
- SET_RUNTIME_PM_OPS(swrm_runtime_suspend, swrm_runtime_resume, NULL)
+};
static const struct of_device_id qcom_swrm_of_match[] = { { .compatible = "qcom,soundwire-v1.3.0", .data = &swrm_v1_3_data }, { .compatible = "qcom,soundwire-v1.5.1", .data = &swrm_v1_5_data }, @@ -1359,6 +1506,7 @@ static struct platform_driver qcom_swrm_driver = { .driver = { .name = "qcom-soundwire", .of_match_table = qcom_swrm_of_match,
.pm = &swrm_dev_pm_ops,}; module_platform_driver(qcom_swrm_driver);
On 22/02/2022 19:15, Pierre-Louis Bossart wrote:
On 2/21/22 04:41, Srinivas Kandagatla wrote:
Add support to runtime PM using SoundWire clock stop on supported instances and bus reset on instances that require full reset.
This commit message and code are a bit confusing, e.g. you have a boolean state
ctrl->clk_stop_bus_reset = true;
Does this mean bus reset on exiting clock stop? or just that clock stop is not supported and bus reset is required with complete re-enumeration.
WSA instances of SoundWire controllers do not support clk stop and a reset of ip is required with complete re-enumeration when a clock is cut off during suspend.
It would be good to try and explain using SoundWire 1.x terminology what actions are taken on resume.
There are two cases here.
1> Controller Instance support ClockStop Mode0, we mostly use the generic core to do that except in resume path we make sure that we start the clock.
2> Controller Instances which that do not support ClockStop, we do soft reset of controller along with hard resetting slaves.
@@ -1267,6 +1305,7 @@ static int qcom_swrm_probe(struct platform_device *pdev) ctrl->bus.ops = &qcom_swrm_ops; ctrl->bus.port_ops = &qcom_swrm_port_ops; ctrl->bus.compute_params = &qcom_swrm_compute_params;
ctrl->bus.clk_stop_timeout = 300;
ret = qcom_swrm_get_port_config(ctrl); if (ret)
@@ -1319,6 +1358,21 @@ static int qcom_swrm_probe(struct platform_device *pdev) (ctrl->version >> 24) & 0xff, (ctrl->version >> 16) & 0xff, ctrl->version & 0xffff);
- pm_runtime_set_autosuspend_delay(dev, 3000);
- pm_runtime_use_autosuspend(dev);
- pm_runtime_mark_last_busy(dev);
- pm_runtime_set_active(dev);
- pm_runtime_enable(dev);
- /* Clk stop is not supported on WSA Soundwire masters */
- if (ctrl->version <= 0x01030000) {
ctrl->clk_stop_bus_reset = true;- } else {
ctrl->reg_read(ctrl, SWRM_COMP_MASTER_ID, &val);if (val == MASTER_ID_WSA)ctrl->clk_stop_bus_reset = true;- }
I think this means clock_stop_not_supported?
Yes It makes more sense to reword this to clock_stop_not_supported.
+static int swrm_runtime_resume(struct device *dev) +{
- struct qcom_swrm_ctrl *ctrl = dev_get_drvdata(dev);
- int ret;
- clk_prepare_enable(ctrl->hclk);
- if (ctrl->clk_stop_bus_reset) {
reinit_completion(&ctrl->enumeration);ctrl->reg_write(ctrl, SWRM_COMP_SW_RESET, 0x01);qcom_swrm_get_device_status(ctrl);don't you need some sort of delay before checking the controller and device status? The bus reset sequence takes 4096 bits, that's a non-zero time.
This is soft reset not full Bus Reset as WSA slaves have hard reset pins that will be toggled as part of suspend-resume.
sdw_handle_slave_status(&ctrl->bus, ctrl->status);qcom_swrm_init(ctrl);wait_for_completion_timeout(&ctrl->enumeration,msecs_to_jiffies(TIMEOUT_MS));- } else {
ctrl->reg_write(ctrl, SWRM_MCP_BUS_CTRL, SWRM_MCP_BUS_CLK_START);ctrl->reg_write(ctrl, SWRM_INTERRUPT_CLEAR,SWRM_INTERRUPT_STATUS_MASTER_CLASH_DET);ctrl->intr_mask |= SWRM_INTERRUPT_STATUS_MASTER_CLASH_DET;ctrl->reg_write(ctrl, SWRM_INTERRUPT_MASK_ADDR, ctrl->intr_mask);ctrl->reg_write(ctrl, SWRM_INTERRUPT_CPU_EN, ctrl->intr_mask);usleep_range(100, 105);- }
- if (!swrm_wait_for_frame_gen_enabled(ctrl))
dev_err(ctrl->dev, "link failed to connect\n");- usleep_range(300, 305);
- ret = sdw_bus_exit_clk_stop(&ctrl->bus);
- if (ret < 0)
dev_err(ctrl->dev, "bus failed to exit clock stop %d\n", ret);- return 0;
+}
+static int __maybe_unused swrm_runtime_suspend(struct device *dev) +{
- struct qcom_swrm_ctrl *ctrl = dev_get_drvdata(dev);
- int ret;
- if (!ctrl->clk_stop_bus_reset) {
/* Mask bus clash interrupt */ctrl->intr_mask &= ~SWRM_INTERRUPT_STATUS_MASTER_CLASH_DET;ctrl->reg_write(ctrl, SWRM_INTERRUPT_MASK_ADDR, ctrl->intr_mask);ctrl->reg_write(ctrl, SWRM_INTERRUPT_CPU_EN, ctrl->intr_mask);- }
- /* Prepare slaves for clock stop */
- ret = sdw_bus_prep_clk_stop(&ctrl->bus);
- if (ret < 0) {
if a device has lost sync and reports -ENODATA, you want still want to go ahead and not prevent the suspend operation from happening.
okay.
--srini
dev_err(dev, "prepare clock stop failed %d", ret);return ret;- }
- ret = sdw_bus_clk_stop(&ctrl->bus);
- if (ret < 0 && ret != -ENODATA) {
dev_err(dev, "bus clock stop failed %d", ret);return ret;- }
- clk_disable_unprepare(ctrl->hclk);
- usleep_range(300, 305);
- return 0;
+}
+static const struct dev_pm_ops swrm_dev_pm_ops = {
- SET_RUNTIME_PM_OPS(swrm_runtime_suspend, swrm_runtime_resume, NULL)
+};
- static const struct of_device_id qcom_swrm_of_match[] = { { .compatible = "qcom,soundwire-v1.3.0", .data = &swrm_v1_3_data }, { .compatible = "qcom,soundwire-v1.5.1", .data = &swrm_v1_5_data },
@@ -1359,6 +1506,7 @@ static struct platform_driver qcom_swrm_driver = { .driver = { .name = "qcom-soundwire", .of_match_table = qcom_swrm_of_match,
.pm = &swrm_dev_pm_ops,
There are two cases here.
1> Controller Instance support ClockStop Mode0, we mostly use the generic core to do that except in resume path we make sure that we start the clock.
2> Controller Instances which that do not support ClockStop, we do soft reset of controller along with hard resetting slaves.
both are fine. we have similar cases defined in sdw_intel.h
+static int swrm_runtime_resume(struct device *dev) +{ + struct qcom_swrm_ctrl *ctrl = dev_get_drvdata(dev); + int ret;
+ clk_prepare_enable(ctrl->hclk);
+ if (ctrl->clk_stop_bus_reset) { + reinit_completion(&ctrl->enumeration); + ctrl->reg_write(ctrl, SWRM_COMP_SW_RESET, 0x01); + qcom_swrm_get_device_status(ctrl);
don't you need some sort of delay before checking the controller and device status? The bus reset sequence takes 4096 bits, that's a non-zero time.
This is soft reset not full Bus Reset as WSA slaves have hard reset pins that will be toggled as part of suspend-resume.
Above you mentioned the peripherals go through a reset as well, in which case they can only re-attach on the bus after 16 frames best case - they need to observe a full cycle of the dynamic sync before changing status.
That's still a non-zero delay (0.3ms for a 48kHz frame rate)
+ sdw_handle_slave_status(&ctrl->bus, ctrl->status); + qcom_swrm_init(ctrl);
Wake IRQ is optional interrupt that can be wired up on SoundWire controller instances like RX path along with MBHC(Multi Button Headset connection). Document this in bindings.
Signed-off-by: Srinivas Kandagatla srinivas.kandagatla@linaro.org --- Documentation/devicetree/bindings/soundwire/qcom,sdw.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/soundwire/qcom,sdw.txt b/Documentation/devicetree/bindings/soundwire/qcom,sdw.txt index b93a2b3e029d..bade68f429b0 100644 --- a/Documentation/devicetree/bindings/soundwire/qcom,sdw.txt +++ b/Documentation/devicetree/bindings/soundwire/qcom,sdw.txt @@ -22,7 +22,7 @@ board specific bus parameters. - interrupts: Usage: required Value type: <prop-encoded-array> - Definition: should specify the SoundWire Controller IRQ + Definition: should specify the SoundWire Controller and optional wake IRQ
- clock-names: Usage: required
Some of the Qualcomm SoundWire Controller instances like the ones that are connected to RX path along with Headset connections support Waking up Controller from Low power clock stop state.
Add support to this wake up interrupt.
Signed-off-by: Srinivas Kandagatla srinivas.kandagatla@linaro.org --- drivers/soundwire/qcom.c | 65 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+)
diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c index 3b2eb95a7e96..b9b76031307b 100644 --- a/drivers/soundwire/qcom.c +++ b/drivers/soundwire/qcom.c @@ -14,6 +14,7 @@ #include <linux/pm_runtime.h> #include <linux/regmap.h> #include <linux/slab.h> +#include <linux/pm_wakeirq.h> #include <linux/slimbus.h> #include <linux/soundwire/sdw.h> #include <linux/soundwire/sdw_registers.h> @@ -154,6 +155,7 @@ struct qcom_swrm_ctrl { u8 rd_cmd_id; int irq; unsigned int version; + int wake_irq; int num_din_ports; int num_dout_ports; int cols_index; @@ -503,6 +505,46 @@ static int qcom_swrm_enumerate(struct sdw_bus *bus) return 0; }
+static irqreturn_t qcom_swrm_wake_irq_handler(int irq, void *dev_id) +{ + struct qcom_swrm_ctrl *swrm = dev_id; + int ret = IRQ_HANDLED; + struct sdw_slave *slave; + + clk_prepare_enable(swrm->hclk); + + if (swrm->wake_irq > 0) { + if (!irqd_irq_disabled(irq_get_irq_data(swrm->wake_irq))) + disable_irq_nosync(swrm->wake_irq); + } + + /* + * resume all the slaves which must have potentially generated this + * interrupt, this should also wake the controller at the same time. + * this is much safer than waking controller directly that will deadlock! + */ + list_for_each_entry(slave, &swrm->bus.slaves, node) { + ret = pm_runtime_get_sync(&slave->dev); + if (ret < 0 && ret != -EACCES) { + dev_err_ratelimited(swrm->dev, + "pm_runtime_get_sync failed in %s, ret %d\n", + __func__, ret); + pm_runtime_put_noidle(&slave->dev); + ret = IRQ_NONE; + goto err; + } + } + + list_for_each_entry(slave, &swrm->bus.slaves, node) { + pm_runtime_mark_last_busy(&slave->dev); + pm_runtime_put_autosuspend(&slave->dev); + } +err: + clk_disable_unprepare(swrm->hclk); + return IRQ_HANDLED; +} + + static irqreturn_t qcom_swrm_irq_handler(int irq, void *dev_id) { struct qcom_swrm_ctrl *swrm = dev_id; @@ -1340,6 +1382,19 @@ static int qcom_swrm_probe(struct platform_device *pdev) goto err_clk; }
+ ctrl->wake_irq = of_irq_get(dev->of_node, 1); + if (ctrl->wake_irq > 0) { + ret = devm_request_threaded_irq(dev, ctrl->wake_irq, NULL, + qcom_swrm_wake_irq_handler, + IRQF_TRIGGER_HIGH | IRQF_ONESHOT, + "swr_wake_irq", ctrl); + if (ret) { + dev_err(dev, "Failed to request soundwire wake irq\n"); + goto err_init; + } + } + + ret = sdw_bus_master_add(&ctrl->bus, dev, dev->fwnode); if (ret) { dev_err(dev, "Failed to register Soundwire controller (%d)\n", @@ -1424,6 +1479,11 @@ static int swrm_runtime_resume(struct device *dev) struct qcom_swrm_ctrl *ctrl = dev_get_drvdata(dev); int ret;
+ if (ctrl->wake_irq > 0) { + if (!irqd_irq_disabled(irq_get_irq_data(ctrl->wake_irq))) + disable_irq_nosync(ctrl->wake_irq); + } + clk_prepare_enable(ctrl->hclk);
if (ctrl->clk_stop_bus_reset) { @@ -1485,6 +1545,11 @@ static int __maybe_unused swrm_runtime_suspend(struct device *dev)
usleep_range(300, 305);
+ if (ctrl->wake_irq > 0) { + if (irqd_irq_disabled(irq_get_irq_data(ctrl->wake_irq))) + enable_irq(ctrl->wake_irq); + } + return 0; }
+static irqreturn_t qcom_swrm_wake_irq_handler(int irq, void *dev_id) +{
- struct qcom_swrm_ctrl *swrm = dev_id;
- int ret = IRQ_HANDLED;
- struct sdw_slave *slave;
- clk_prepare_enable(swrm->hclk);
- if (swrm->wake_irq > 0) {
if (!irqd_irq_disabled(irq_get_irq_data(swrm->wake_irq)))disable_irq_nosync(swrm->wake_irq);- }
- /*
* resume all the slaves which must have potentially generated this* interrupt, this should also wake the controller at the same time.* this is much safer than waking controller directly that will deadlock!*/
There should be no difference if you first resume the controller and then attached peripherals, or do a loop where you rely on the pm_runtime framework.
The notion that there might be a dead-lock is surprising, you would need to elaborate here.
- list_for_each_entry(slave, &swrm->bus.slaves, node) {
ret = pm_runtime_get_sync(&slave->dev);
In my experience, you don't want to blur layers and take references on the child devices from the parent device. I don't know how many times we end-up with weird behavior.
we've done something similar on the Intel side but implemented in a less directive manner.
ret = device_for_each_child(bus->dev, NULL, intel_resume_child_device);
static int intel_resume_child_device(struct device *dev, void *data) { [...] ret = pm_request_resume(dev); if (ret < 0) dev_err(dev, "%s: pm_request_resume failed: %d\n", __func__, ret);
return ret; }
if (ret < 0 && ret != -EACCES) {dev_err_ratelimited(swrm->dev,"pm_runtime_get_sync failed in %s, ret %d\n",__func__, ret);pm_runtime_put_noidle(&slave->dev);ret = IRQ_NONE;goto err;}- }
- list_for_each_entry(slave, &swrm->bus.slaves, node) {
pm_runtime_mark_last_busy(&slave->dev);pm_runtime_put_autosuspend(&slave->dev);- }
+err:
- clk_disable_unprepare(swrm->hclk);
- return IRQ_HANDLED;
+}
On 22/02/2022 19:26, Pierre-Louis Bossart wrote:
+static irqreturn_t qcom_swrm_wake_irq_handler(int irq, void *dev_id) +{
- struct qcom_swrm_ctrl *swrm = dev_id;
- int ret = IRQ_HANDLED;
- struct sdw_slave *slave;
- clk_prepare_enable(swrm->hclk);
- if (swrm->wake_irq > 0) {
if (!irqd_irq_disabled(irq_get_irq_data(swrm->wake_irq)))disable_irq_nosync(swrm->wake_irq);- }
- /*
* resume all the slaves which must have potentially generated this* interrupt, this should also wake the controller at the same time.* this is much safer than waking controller directly that will deadlock!*/There should be no difference if you first resume the controller and then attached peripherals, or do a loop where you rely on the pm_runtime framework.
The notion that there might be a dead-lock is surprising, you would need to elaborate here.Issue is, if wakeup interrupt resumes the controller first which can
trigger an slave pending interrupt (ex: Button press event) in the middle of resume that will try to wake the slave device which in turn will try to wake parent in the middle of resume resulting in a dead lock.
This was the best way to avoid dead lock.
- list_for_each_entry(slave, &swrm->bus.slaves, node) {
ret = pm_runtime_get_sync(&slave->dev);In my experience, you don't want to blur layers and take references on the child devices from the parent device. I don't know how many times we end-up with weird behavior.
we've done something similar on the Intel side but implemented in a less directive manner.
thanks, I can take some inspiration from that.
--srini
ret = device_for_each_child(bus->dev, NULL, intel_resume_child_device);
static int intel_resume_child_device(struct device *dev, void *data) { [...] ret = pm_request_resume(dev); if (ret < 0) dev_err(dev, "%s: pm_request_resume failed: %d\n", __func__, ret);
return ret; }
if (ret < 0 && ret != -EACCES) {dev_err_ratelimited(swrm->dev,"pm_runtime_get_sync failed in %s, ret %d\n",__func__, ret);pm_runtime_put_noidle(&slave->dev);ret = IRQ_NONE;goto err;}- }
- list_for_each_entry(slave, &swrm->bus.slaves, node) {
pm_runtime_mark_last_busy(&slave->dev);pm_runtime_put_autosuspend(&slave->dev);- }
+err:
- clk_disable_unprepare(swrm->hclk);
- return IRQ_HANDLED;
+}
On 2/22/22 16:52, Srinivas Kandagatla wrote:
On 22/02/2022 19:26, Pierre-Louis Bossart wrote:
+static irqreturn_t qcom_swrm_wake_irq_handler(int irq, void *dev_id) +{ + struct qcom_swrm_ctrl *swrm = dev_id; + int ret = IRQ_HANDLED; + struct sdw_slave *slave;
+ clk_prepare_enable(swrm->hclk);
+ if (swrm->wake_irq > 0) { + if (!irqd_irq_disabled(irq_get_irq_data(swrm->wake_irq))) + disable_irq_nosync(swrm->wake_irq); + }
+ /* + * resume all the slaves which must have potentially generated this + * interrupt, this should also wake the controller at the same time. + * this is much safer than waking controller directly that will deadlock! + */
There should be no difference if you first resume the controller and then attached peripherals, or do a loop where you rely on the pm_runtime framework.
The notion that there might be a dead-lock is surprising, you would need to elaborate here.Issue is, if wakeup interrupt resumes the controller first which can
trigger an slave pending interrupt (ex: Button press event) in the middle of resume that will try to wake the slave device which in turn will try to wake parent in the middle of resume resulting in a dead lock.
This was the best way to avoid dead lock.
Not following, sorry. if you use pm_runtime functions and it so happens that the resume already started, then those routines would wait for the resume to complete.
In other words, there can be multiple requests to resume, but only the *first* request will trigger a transition and others will just increase a refcount.
In addition, the pm_runtime framework guarantees that the peripheral device can only start resuming when the parent controller device is fully resumed.
While I am at it, one thing that kept us busy as well is the relationship between system suspend and pm_runtime suspend. In the generic case a system suspend will cause a pm_runtime resume before you can actually start the system suspend, but you might be able to skip this step. In the Intel case when the controller and its parent device were suspended we had to pm_runtime resume everything because some registers were no longer accessible.
On 23/02/2022 00:31, Pierre-Louis Bossart wrote:
On 2/22/22 16:52, Srinivas Kandagatla wrote:
On 22/02/2022 19:26, Pierre-Louis Bossart wrote:
+static irqreturn_t qcom_swrm_wake_irq_handler(int irq, void *dev_id) +{ + struct qcom_swrm_ctrl *swrm = dev_id; + int ret = IRQ_HANDLED; + struct sdw_slave *slave;
+ clk_prepare_enable(swrm->hclk);
+ if (swrm->wake_irq > 0) { + if (!irqd_irq_disabled(irq_get_irq_data(swrm->wake_irq))) + disable_irq_nosync(swrm->wake_irq); + }
+ /* + * resume all the slaves which must have potentially generated this + * interrupt, this should also wake the controller at the same time. + * this is much safer than waking controller directly that will deadlock! + */
There should be no difference if you first resume the controller and then attached peripherals, or do a loop where you rely on the pm_runtime framework.
The notion that there might be a dead-lock is surprising, you would need to elaborate here.Issue is, if wakeup interrupt resumes the controller first which can
trigger an slave pending interrupt (ex: Button press event) in the middle of resume that will try to wake the slave device which in turn will try to wake parent in the middle of resume resulting in a dead lock.
This was the best way to avoid dead lock.
Not following, sorry. if you use pm_runtime functions and it so happens that the resume already started, then those routines would wait for the resume to complete.
yes that is true,
TBH, I was trying to reproduce the issue since morning to collect some traces but no luck so far, I hit these issues pretty much rarely. Now code has changed since few months back am unable to reproduce this anymore. Or it might be just the state of code I had while writing this up.
But when I hit the issue, this is how it looks like:
1. IRQ Wake interrupt resume parent.
2. parent is in middle of resuming
3. Slave Pend interrupt in controller fired up
4. because of (3) child resume is requested and then the parent resume blocked on (2) to finish.
5. from (2) we also trying to resume child.
6. (5) is blocked on (4) to finish which is blocked on (2) to finish
we are dead locked. Only way for me to avoid dead lock was to wake the child up after IRQ wake interrupts.
here is the stack trace of blocked-tasks from sysrq
root@linaro-gnome:~# [ 182.327220] sysrq: Show Blocked State [ 182.331063] task:irq/20-soundwir state:D stack: 0 pid: 445 ppid: 2 flags:0x00000008 [ 182.339655] Call trace: [ 182.342176] __switch_to+0x168/0x1b8 [ 182.345864] __schedule+0x2a8/0x880 [ 182.349459] schedule+0x54/0xf0 [ 182.352700] rpm_resume+0xc4/0x550 [ 182.356211] rpm_resume+0x348/0x550 [ 182.359805] rpm_resume+0x348/0x550 [ 182.363400] __pm_runtime_resume+0x48/0xb8 [ 182.367616] sdw_handle_slave_status+0x1f8/0xf80 [ 182.372371] qcom_swrm_irq_handler+0x5c4/0x6f0 [ 182.376942] irq_thread_fn+0x2c/0xa0 [ 182.380626] irq_thread+0x16c/0x288 [ 182.384221] kthread+0x11c/0x128 [ 182.387549] ret_from_fork+0x10/0x20 [ 182.391231] task:irq/187-swr_wak state:D stack: 0 pid: 446 ppid: 2 flags:0x00000008 [ 182.399819] Call trace: [ 182.402339] __switch_to+0x168/0x1b8 [ 182.406019] __schedule+0x2a8/0x880 [ 182.409614] schedule+0x54/0xf0 [ 182.412854] rpm_resume+0xc4/0x550 [ 182.416363] rpm_resume+0x348/0x550 [ 182.419957] rpm_resume+0x348/0x550 [ 182.423552] __pm_runtime_resume+0x48/0xb8 [ 182.427767] swrm_runtime_resume+0x98/0x3d0 [ 182.432079] pm_generic_runtime_resume+0x2c/0x48 [ 182.436832] __rpm_callback+0x44/0x190 [ 182.440693] rpm_callback+0x6c/0x78 [ 182.444289] rpm_resume+0x2f0/0x550 [ 182.447883] __pm_runtime_resume+0x48/0xb8 [ 182.452099] qcom_swrm_wake_irq_handler+0x20/0x128 [ 182.457033] irq_thread_fn+0x2c/0xa0 [ 182.460712] irq_thread+0x16c/0x288 [ 182.464306] kthread+0x11c/0x128 [ 182.467634] ret_from_fork+0x10/0x20
As am unable to reproduce this issue anymore so I will remove the code dealing with slaves directly for now till we are able to really reproduce the issue.
In other words, there can be multiple requests to resume, but only the *first* request will trigger a transition and others will just increase a refcount.
In addition, the pm_runtime framework guarantees that the peripheral device can only start resuming when the parent controller device is fully resumed.
While I am at it, one thing that kept us busy as well is the relationship between system suspend and pm_runtime suspend. In the generic case a system suspend will cause a pm_runtime resume before you can actually start the system suspend, but you might be able to skip this step. In the Intel case when the controller and its parent device were suspended we had to pm_runtime resume everything because some registers were no longer accessible.
Interesting, thanks for the hints, will keep that in mind.
--srini
Not following, sorry. if you use pm_runtime functions and it so happens that the resume already started, then those routines would wait for the resume to complete.
yes that is true,
TBH, I was trying to reproduce the issue since morning to collect some traces but no luck so far, I hit these issues pretty much rarely. Now code has changed since few months back am unable to reproduce this anymore. Or it might be just the state of code I had while writing this up.
But when I hit the issue, this is how it looks like:
IRQ Wake interrupt resume parent.
parent is in middle of resuming
Slave Pend interrupt in controller fired up
because of (3) child resume is requested and then the parent resume
blocked on (2) to finish.
from (2) we also trying to resume child.
(5) is blocked on (4) to finish which is blocked on (2) to finish
we are dead locked. Only way for me to avoid dead lock was to wake the child up after IRQ wake interrupts.
Maybe a red-herring, but we're seen cases like this where we called pm_runtime_get_sync() while resuming, that didn't go so well. I would look into the use of _no_pm routines if you are already trying to resume.
Thanks Srini for Your patches!!!
I think runtime pm support in bolero codecs side still pending right?
On 2/21/2022 4:11 PM, Srinivas Kandagatla wrote:
This patchset adds pm runtime support to Qualcomm SounWire Controller using SoundWire Clock Stop and Wake up using Headset events on supported instances and a bus reset on instances that require full reset.
Tested it on SM8250 MTP and Dragon Board DB845c
--srini
Srinivas Kandagatla (3): soundwire: qcom: add runtime pm support dt-bindings: soundwire: qcom: document optional wake irq soundwire: qcom: add wake up interrupt support
.../bindings/soundwire/qcom,sdw.txt | 2 +- drivers/soundwire/qcom.c | 215 +++++++++++++++++- 2 files changed, 215 insertions(+), 2 deletions(-)
participants (3)
-
Pierre-Louis Bossart -
Srinivas Kandagatla -
Srinivasa Rao Mandadapu (Temp)