- Alsa-devel - mailman.alsa-project.org

[PATCH V2 5/8] soundwire: amd: add soundwire manager interrupt handling
by Vijendar Mukunda 14 Feb '23

14 Feb '23

Add support for handling soundwire manager interrupts. Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda(a)amd.com> Signed-off-by: Mastan Katragadda <Mastan.Katragadda(a)amd.com> --- drivers/soundwire/amd_manager.c | 132 ++++++++++++++++++++++++++++++ drivers/soundwire/amd_manager.h | 1 + include/linux/soundwire/sdw_amd.h | 7 ++ 3 files changed, 140 insertions(+) diff --git a/drivers/soundwire/amd_manager.c b/drivers/soundwire/amd_manager.c index 14c88b80ab6d..87f9a987d93a 100644 --- a/drivers/soundwire/amd_manager.c +++ b/drivers/soundwire/amd_manager.c @@ -417,6 +417,47 @@ static enum sdw_command_response amd_sdw_xfer_msg(struct sdw_bus *bus, struct sd return SDW_CMD_OK; } +static void amd_sdw_process_ping_status(u64 response, struct amd_sdw_manager *amd_manager) +{ + u64 slave_stat = 0; + u32 val = 0; + u16 dev_index; + + /* slave status response*/ + slave_stat = FIELD_GET(AMD_SDW_MCP_SLAVE_STAT_0_3, response); + slave_stat |= FIELD_GET(AMD_SDW_MCP_SLAVE_STAT_4_11, response) << 8; + + dev_dbg(amd_manager->dev, "%s: slave_stat:0x%llx\n", __func__, slave_stat); + for (dev_index = 0; dev_index <= SDW_MAX_DEVICES; ++dev_index) { + val = (slave_stat >> (dev_index * 2)) & AMD_SDW_MCP_SLAVE_STATUS_MASK; + dev_dbg(amd_manager->dev, "%s val:0x%x\n", __func__, val); + switch (val) { + case SDW_SLAVE_ATTACHED: + amd_manager->status[dev_index] = SDW_SLAVE_ATTACHED; + break; + case SDW_SLAVE_UNATTACHED: + amd_manager->status[dev_index] = SDW_SLAVE_UNATTACHED; + break; + case SDW_SLAVE_ALERT: + amd_manager->status[dev_index] = SDW_SLAVE_ALERT; + break; + default: + amd_manager->status[dev_index] = SDW_SLAVE_RESERVED; + break; + } + } +} + +static void amd_sdw_read_and_process_ping_status(struct amd_sdw_manager *amd_manager) +{ + u64 response = 0; + + mutex_lock(&amd_manager->bus.msg_lock); + response = amd_sdw_send_cmd_get_resp(amd_manager, 0, 0); + mutex_unlock(&amd_manager->bus.msg_lock); + amd_sdw_process_ping_status(response, amd_manager); +} + static u32 amd_sdw_read_ping_status(struct sdw_bus *bus) { struct amd_sdw_manager *amd_manager = to_amd_sdw(bus); @@ -817,6 +858,95 @@ static int amd_sdw_register_dais(struct amd_sdw_manager *amd_manager) dais, num_dais); } +static void amd_sdw_update_slave_status_work(struct work_struct *work) +{ + struct amd_sdw_manager *amd_manager = + container_of(work, struct amd_sdw_manager, amd_sdw_work); + int retry_count = 0; + + if (amd_manager->status[0] == SDW_SLAVE_ATTACHED) { + acp_reg_writel(0, amd_manager->mmio + ACP_SW_STATE_CHANGE_STATUS_MASK_0TO7); + acp_reg_writel(0, amd_manager->mmio + ACP_SW_STATE_CHANGE_STATUS_MASK_8TO11); + } + +update_status: + sdw_handle_slave_status(&amd_manager->bus, amd_manager->status); + if (amd_manager->status[0] == SDW_SLAVE_ATTACHED) { + if (retry_count++ < SDW_MAX_DEVICES) { + acp_reg_writel(AMD_SDW_IRQ_MASK_0TO7, amd_manager->mmio + + ACP_SW_STATE_CHANGE_STATUS_MASK_0TO7); + acp_reg_writel(AMD_SDW_IRQ_MASK_8TO11, + amd_manager->mmio + ACP_SW_STATE_CHANGE_STATUS_MASK_8TO11); + amd_sdw_read_and_process_ping_status(amd_manager); + goto update_status; + } else { + dev_err_ratelimited(amd_manager->dev, + "Device0 detected after %d iterations\n", + retry_count); + } + } +} + +static void amd_sdw_update_slave_status(u32 status_change_0to7, u32 status_change_8to11, + struct amd_sdw_manager *amd_manager) +{ + u64 slave_stat = 0; + u32 val = 0; + int dev_index; + + if (status_change_0to7 == AMD_SDW_SLAVE_0_ATTACHED) + memset(amd_manager->status, 0, sizeof(amd_manager->status)); + slave_stat = status_change_0to7; + slave_stat |= FIELD_GET(AMD_SDW_MCP_SLAVE_STATUS_8TO_11, status_change_8to11) << 32; + dev_dbg(amd_manager->dev, "%s: status_change_0to7:0x%x status_change_8to11:0x%x\n", + __func__, status_change_0to7, status_change_8to11); + if (slave_stat) { + for (dev_index = 0; dev_index <= SDW_MAX_DEVICES; ++dev_index) { + if (slave_stat & AMD_SDW_MCP_SLAVE_STATUS_VALID_MASK(dev_index)) { + val = (slave_stat >> AMD_SDW_MCP_SLAVE_STAT_SHIFT_MASK(dev_index)) & + AMD_SDW_MCP_SLAVE_STATUS_MASK; + switch (val) { + case SDW_SLAVE_ATTACHED: + amd_manager->status[dev_index] = SDW_SLAVE_ATTACHED; + break; + case SDW_SLAVE_UNATTACHED: + amd_manager->status[dev_index] = SDW_SLAVE_UNATTACHED; + break; + case SDW_SLAVE_ALERT: + amd_manager->status[dev_index] = SDW_SLAVE_ALERT; + break; + default: + amd_manager->status[dev_index] = SDW_SLAVE_RESERVED; + break; + } + } + } + } +} + +static void amd_sdw_irq_thread(struct work_struct *work) +{ + struct amd_sdw_manager *amd_manager = + container_of(work, struct amd_sdw_manager, amd_sdw_irq_thread); + u32 status_change_8to11; + u32 status_change_0to7; + + status_change_8to11 = acp_reg_readl(amd_manager->mmio + ACP_SW_STATE_CHANGE_STATUS_8TO11); + status_change_0to7 = acp_reg_readl(amd_manager->mmio + ACP_SW_STATE_CHANGE_STATUS_0TO7); + dev_dbg(amd_manager->dev, "%s [SDW%d] SDW INT: 0to7=0x%x, 8to11=0x%x\n", + __func__, amd_manager->instance, status_change_0to7, status_change_8to11); + if (status_change_8to11 & AMD_SDW_PREQ_INTR_STAT) { + amd_sdw_read_and_process_ping_status(amd_manager); + } else { + /* Check for the updated status on peripheral device */ + amd_sdw_update_slave_status(status_change_0to7, status_change_8to11, amd_manager); + } + if (status_change_8to11 || status_change_0to7) + schedule_work(&amd_manager->amd_sdw_work); + acp_reg_writel(0x00, amd_manager->mmio + ACP_SW_STATE_CHANGE_STATUS_8TO11); + acp_reg_writel(0x00, amd_manager->mmio + ACP_SW_STATE_CHANGE_STATUS_0TO7); +} + static void amd_sdw_probe_work(struct work_struct *work) { struct amd_sdw_manager *amd_manager = container_of(work, struct amd_sdw_manager, @@ -909,6 +1039,8 @@ static int amd_sdw_manager_probe(struct platform_device *pdev) return ret; } dev_set_drvdata(dev, amd_manager); + INIT_WORK(&amd_manager->amd_sdw_irq_thread, amd_sdw_irq_thread); + INIT_WORK(&amd_manager->amd_sdw_work, amd_sdw_update_slave_status_work); INIT_WORK(&amd_manager->probe_work, amd_sdw_probe_work); schedule_work(&amd_manager->probe_work); return 0; diff --git a/drivers/soundwire/amd_manager.h b/drivers/soundwire/amd_manager.h index 3e1bded1e769..5bcaf7a763bb 100644 --- a/drivers/soundwire/amd_manager.h +++ b/drivers/soundwire/amd_manager.h @@ -186,6 +186,7 @@ #define AMD_SDW1_PAD_KEEPER_EN_MASK 0x10 #define AMD_SDW0_PAD_KEEPER_DISABLE_MASK 0x1E #define AMD_SDW1_PAD_KEEPER_DISABLE_MASK 0xF +#define AMD_SDW_PREQ_INTR_STAT BIT(19) enum amd_sdw_cmd_type { AMD_SDW_CMD_PING = 0, diff --git a/include/linux/soundwire/sdw_amd.h b/include/linux/soundwire/sdw_amd.h index c978cfbc0207..003b8a197fc5 100644 --- a/include/linux/soundwire/sdw_amd.h +++ b/include/linux/soundwire/sdw_amd.h @@ -45,8 +45,11 @@ struct sdw_amd_dai_runtime { * @mmio: soundwire registers mmio base * @acp_mmio: acp registers mmio base * @reg_mask: register mask structure per manager instance + * @amd_sdw_irq_thread: soundwire manager irq workqueue + * @amd_sdw_work: peripheral status work queue * @probe_work: soundwire manager probe workqueue * @sdw_lock: mutex to protect acp share register access + * @status: peripheral devices status array * @num_din_ports: number of input ports * @num_dout_ports: number of output ports * @cols_index: Column index in frame shape @@ -65,10 +68,14 @@ struct amd_sdw_manager { void __iomem *acp_mmio; struct sdw_manager_reg_mask *reg_mask; + struct work_struct amd_sdw_irq_thread; + struct work_struct amd_sdw_work; struct work_struct probe_work; /* mutex to protect acp common register access */ struct mutex *sdw_lock; + enum sdw_slave_status status[SDW_MAX_DEVICES + 1]; + int num_din_ports; int num_dout_ports; -- 2.34.1

3 5

[PATCH V2 6/8] soundwire: amd: add runtime pm ops for AMD soundwire manager driver
by Vijendar Mukunda 14 Feb '23

14 Feb '23

Add support for runtime pm ops for AMD soundwire manager driver. Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda(a)amd.com> Signed-off-by: Mastan Katragadda <Mastan.Katragadda(a)amd.com> --- drivers/soundwire/amd_manager.c | 163 ++++++++++++++++++++++++++++++ drivers/soundwire/amd_manager.h | 3 + include/linux/soundwire/sdw_amd.h | 16 +++ 3 files changed, 182 insertions(+) diff --git a/drivers/soundwire/amd_manager.c b/drivers/soundwire/amd_manager.c index 87f9a987d93a..eced189ba6e0 100644 --- a/drivers/soundwire/amd_manager.c +++ b/drivers/soundwire/amd_manager.c @@ -14,6 +14,7 @@ #include <linux/slab.h> #include <linux/soundwire/sdw.h> #include <linux/soundwire/sdw_registers.h> +#include <linux/pm_runtime.h> #include <linux/wait.h> #include <sound/pcm_params.h> #include <sound/soc.h> @@ -185,6 +186,15 @@ static void amd_disable_sdw_interrupts(struct amd_sdw_manager *amd_manager) acp_reg_writel(0x00, amd_manager->mmio + ACP_SW_ERROR_INTR_MASK); } +static int amd_deinit_sdw_manager(struct amd_sdw_manager *amd_manager) +{ + int ret; + + amd_disable_sdw_interrupts(amd_manager); + ret = amd_disable_sdw_manager(amd_manager); + return ret; +} + static void amd_sdw_set_frameshape(struct amd_sdw_manager *amd_manager) { u32 frame_size; @@ -1043,6 +1053,12 @@ static int amd_sdw_manager_probe(struct platform_device *pdev) INIT_WORK(&amd_manager->amd_sdw_work, amd_sdw_update_slave_status_work); INIT_WORK(&amd_manager->probe_work, amd_sdw_probe_work); schedule_work(&amd_manager->probe_work); + /* Enable runtime PM */ + pm_runtime_set_autosuspend_delay(dev, AMD_SDW_MASTER_SUSPEND_DELAY_MS); + pm_runtime_use_autosuspend(dev); + pm_runtime_mark_last_busy(dev); + pm_runtime_set_active(dev); + pm_runtime_enable(dev); return 0; } @@ -1057,14 +1073,161 @@ static int amd_sdw_manager_remove(struct platform_device *pdev) amd_disable_sdw_interrupts(amd_manager); sdw_bus_master_delete(&amd_manager->bus); ret = amd_disable_sdw_manager(amd_manager); + pm_runtime_disable(&pdev->dev); return ret; } +static int amd_sdw_clock_stop(struct amd_sdw_manager *amd_manager) +{ + u32 val; + u32 retry_count = 0; + int ret; + + ret = sdw_bus_prep_clk_stop(&amd_manager->bus); + if (ret < 0 && ret != -ENODATA) { + dev_err(amd_manager->dev, "prepare clock stop failed %d", ret); + return 0; + } + ret = sdw_bus_clk_stop(&amd_manager->bus); + if (ret < 0 && ret != -ENODATA) { + dev_err(amd_manager->dev, "bus clock stop failed %d", ret); + return 0; + } + + do { + val = acp_reg_readl(amd_manager->mmio + ACP_SW_CLK_RESUME_CTRL); + if (val & AMD_SDW_CLK_STOP_DONE) { + amd_manager->clk_stopped = true; + break; + } + } while (retry_count++ < AMD_SDW_CLK_STOP_MAX_RETRY_COUNT); + + if (!amd_manager->clk_stopped) { + dev_err(amd_manager->dev, "SDW%x clock stop failed\n", amd_manager->instance); + return 0; + } + + if (amd_manager->wake_en_mask) + acp_reg_writel(0x01, amd_manager->acp_mmio + ACP_SW_WAKE_EN(amd_manager->instance)); + + dev_dbg(amd_manager->dev, "SDW%x clock stop successful\n", amd_manager->instance); + return 0; +} + +static int amd_sdw_clock_stop_exit(struct amd_sdw_manager *amd_manager) +{ + int ret; + u32 val = 0; + u32 retry_count = 0; + + if (amd_manager->clk_stopped) { + val = acp_reg_readl(amd_manager->mmio + ACP_SW_CLK_RESUME_CTRL); + val |= AMD_SDW_CLK_RESUME_REQ; + acp_reg_writel(val, amd_manager->mmio + ACP_SW_CLK_RESUME_CTRL); + do { + val = acp_reg_readl(amd_manager->mmio + ACP_SW_CLK_RESUME_CTRL); + if (val & AMD_SDW_CLK_RESUME_DONE) + break; + usleep_range(10, 100); + } while (retry_count++ < AMD_SDW_CLK_STOP_MAX_RETRY_COUNT); + if (val & AMD_SDW_CLK_RESUME_DONE) { + acp_reg_writel(0, amd_manager->mmio + ACP_SW_CLK_RESUME_CTRL); + ret = sdw_bus_exit_clk_stop(&amd_manager->bus); + if (ret < 0) + dev_err(amd_manager->dev, "bus failed to exit clock stop %d\n", + ret); + amd_manager->clk_stopped = false; + } + } + if (amd_manager->clk_stopped) { + dev_err(amd_manager->dev, "SDW%x clock stop exit failed\n", amd_manager->instance); + return 0; + } + dev_dbg(amd_manager->dev, "SDW%x clock stop exit successful\n", amd_manager->instance); + return 0; +} + +static int __maybe_unused amd_suspend_runtime(struct device *dev) +{ + struct amd_sdw_manager *amd_manager = dev_get_drvdata(dev); + struct sdw_bus *bus = &amd_manager->bus; + int ret; + + if (bus->prop.hw_disabled) { + dev_dbg(bus->dev, "Soundwire manager %d is disabled,\n", + bus->link_id); + return 0; + } + if (amd_manager->power_mode_mask & AMD_SDW_CLK_STOP_MODE) { + ret = amd_sdw_clock_stop(amd_manager); + if (ret) + return ret; + } else if (amd_manager->power_mode_mask & AMD_SDW_POWER_OFF_MODE) { + ret = amd_sdw_clock_stop(amd_manager); + if (ret) + return ret; + ret = amd_deinit_sdw_manager(amd_manager); + if (ret) + return ret; + } + return 0; +} + +static int __maybe_unused amd_resume_runtime(struct device *dev) +{ + struct amd_sdw_manager *amd_manager = dev_get_drvdata(dev); + struct sdw_bus *bus = &amd_manager->bus; + int ret; + u32 val = 0; + u32 retry_count = 0; + + if (bus->prop.hw_disabled) { + dev_dbg(bus->dev, "Soundwire manager %d is disabled, ignoring\n", + bus->link_id); + return 0; + } + + if (amd_manager->power_mode_mask & AMD_SDW_CLK_STOP_MODE) { + ret = amd_sdw_clock_stop_exit(amd_manager); + if (ret) + return ret; + } else if (amd_manager->power_mode_mask & AMD_SDW_POWER_OFF_MODE) { + val = acp_reg_readl(amd_manager->mmio + ACP_SW_CLK_RESUME_CTRL); + if (val) { + val |= AMD_SDW_CLK_RESUME_REQ; + acp_reg_writel(val, amd_manager->mmio + ACP_SW_CLK_RESUME_CTRL); + do { + val = acp_reg_readl(amd_manager->mmio + ACP_SW_CLK_RESUME_CTRL); + if (val & AMD_SDW_CLK_RESUME_DONE) + break; + usleep_range(10, 100); + } while (retry_count++ < AMD_SDW_CLK_STOP_MAX_RETRY_COUNT); + if (val & AMD_SDW_CLK_RESUME_DONE) { + acp_reg_writel(0, amd_manager->mmio + ACP_SW_CLK_RESUME_CTRL); + amd_manager->clk_stopped = false; + } + } + sdw_clear_slave_status(bus, SDW_UNATTACH_REQUEST_MASTER_RESET); + amd_init_sdw_manager(amd_manager); + amd_enable_sdw_interrupts(amd_manager); + ret = amd_enable_sdw_manager(amd_manager); + if (ret) + return ret; + amd_sdw_set_frameshape(amd_manager); + } + return 0; +} + +static const struct dev_pm_ops amd_pm = { + SET_RUNTIME_PM_OPS(amd_suspend_runtime, amd_resume_runtime, NULL) +}; + static struct platform_driver amd_sdw_driver = { .probe = &amd_sdw_manager_probe, .remove = &amd_sdw_manager_remove, .driver = { .name = "amd_sdw_manager", + .pm = &amd_pm, } }; module_platform_driver(amd_sdw_driver); diff --git a/drivers/soundwire/amd_manager.h b/drivers/soundwire/amd_manager.h index 5bcaf7a763bb..6ec37612ae4e 100644 --- a/drivers/soundwire/amd_manager.h +++ b/drivers/soundwire/amd_manager.h @@ -187,6 +187,9 @@ #define AMD_SDW0_PAD_KEEPER_DISABLE_MASK 0x1E #define AMD_SDW1_PAD_KEEPER_DISABLE_MASK 0xF #define AMD_SDW_PREQ_INTR_STAT BIT(19) +#define AMD_SDW_CLK_STOP_DONE 1 +#define AMD_SDW_CLK_RESUME_REQ 2 +#define AMD_SDW_CLK_RESUME_DONE 3 enum amd_sdw_cmd_type { AMD_SDW_CMD_PING = 0, diff --git a/include/linux/soundwire/sdw_amd.h b/include/linux/soundwire/sdw_amd.h index 003b8a197fc5..9074c7736ff7 100644 --- a/include/linux/soundwire/sdw_amd.h +++ b/include/linux/soundwire/sdw_amd.h @@ -8,6 +8,20 @@ #include <linux/soundwire/sdw.h> +/* AMD pm_runtime quirk definitions */ + +/* + * Force the clock to stop(ClockStopMode0) when suspend callback + * is invoked. + */ +#define AMD_SDW_CLK_STOP_MODE 1 + +/* + * Stop the bus when runtime suspend/system level suspend callback + * is invoked. If set, a complete bus reset and re-enumeration will + * be performed when the bus restarts. + */ +#define AMD_SDW_POWER_OFF_MODE 2 #define ACP_SDW0 0 #define ACP_SDW1 1 @@ -57,6 +71,7 @@ struct sdw_amd_dai_runtime { * @instance: soundwire manager instance * @quirks: soundwire manager quirks * @wake_en_mask: wake enable mask per soundwire manager + * @clk_stopped: flag set to true when clock is stopped * @power_mode_mask: flag interprets amd soundwire manager power mode * @dai_runtime_array: dai runtime array */ @@ -86,6 +101,7 @@ struct amd_sdw_manager { u32 quirks; u32 wake_en_mask; u32 power_mode_mask; + bool clk_stopped; struct sdw_amd_dai_runtime **dai_runtime_array; }; -- 2.34.1

3 4

[PATCH V2 7/8] soundwire: amd: handle soundwire wake enable interrupt
by Vijendar Mukunda 14 Feb '23

14 Feb '23

Add wake enable interrupt support for both the soundwire manager instances. Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda(a)amd.com> Signed-off-by: Mastan Katragadda <Mastan.Katragadda(a)amd.com> --- drivers/soundwire/amd_manager.c | 10 ++++++++++ drivers/soundwire/amd_manager.h | 1 + 2 files changed, 11 insertions(+) diff --git a/drivers/soundwire/amd_manager.c b/drivers/soundwire/amd_manager.c index eced189ba6e0..e53dc67f8529 100644 --- a/drivers/soundwire/amd_manager.c +++ b/drivers/soundwire/amd_manager.c @@ -934,6 +934,13 @@ static void amd_sdw_update_slave_status(u32 status_change_0to7, u32 status_chang } } +static void amd_sdw_process_wake_event(struct amd_sdw_manager *amd_manager) +{ + pm_request_resume(amd_manager->dev); + acp_reg_writel(0x00, amd_manager->acp_mmio + ACP_SW_WAKE_EN(amd_manager->instance)); + acp_reg_writel(0x00, amd_manager->mmio + ACP_SW_STATE_CHANGE_STATUS_8TO11); +} + static void amd_sdw_irq_thread(struct work_struct *work) { struct amd_sdw_manager *amd_manager = @@ -945,6 +952,9 @@ static void amd_sdw_irq_thread(struct work_struct *work) status_change_0to7 = acp_reg_readl(amd_manager->mmio + ACP_SW_STATE_CHANGE_STATUS_0TO7); dev_dbg(amd_manager->dev, "%s [SDW%d] SDW INT: 0to7=0x%x, 8to11=0x%x\n", __func__, amd_manager->instance, status_change_0to7, status_change_8to11); + if (status_change_8to11 & AMD_SDW_WAKE_STAT_MASK) + return amd_sdw_process_wake_event(amd_manager); + if (status_change_8to11 & AMD_SDW_PREQ_INTR_STAT) { amd_sdw_read_and_process_ping_status(amd_manager); } else { diff --git a/drivers/soundwire/amd_manager.h b/drivers/soundwire/amd_manager.h index 6ec37612ae4e..86bc6d4f48bf 100644 --- a/drivers/soundwire/amd_manager.h +++ b/drivers/soundwire/amd_manager.h @@ -190,6 +190,7 @@ #define AMD_SDW_CLK_STOP_DONE 1 #define AMD_SDW_CLK_RESUME_REQ 2 #define AMD_SDW_CLK_RESUME_DONE 3 +#define AMD_SDW_WAKE_STAT_MASK BIT(16) enum amd_sdw_cmd_type { AMD_SDW_CMD_PING = 0, -- 2.34.1

3 4

[PATCH] SoC: rt5682s: Disable jack detection interrupt during suspend
by Matthias Kaehlcke 14 Feb '23

14 Feb '23

The rt5682s driver switches its regmap to cache-only when the device suspends and back to regular mode on resume. When the jack detect interrupt fires rt5682s_irq() schedules the jack detect work. This can result in invalid reads from the regmap in cache-only mode if the work runs before the device has resumed: [ 19.672162] rt5682s 2-001a: ASoC: error at soc_component_read_no_lock on rt5682s.2-001a for register: [0x000000f0] -16 Disable the jack detection interrupt during suspend and re-enable it on resume. The driver already schedules the jack detection work on resume, so any state change during suspend is still handled. Signed-off-by: Matthias Kaehlcke <mka(a)chromium.org> --- sound/soc/codecs/rt5682s.c | 10 +++++++++- sound/soc/codecs/rt5682s.h | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/rt5682s.c b/sound/soc/codecs/rt5682s.c index f5e5dbc3b0f0..59117ebc5ecd 100644 --- a/sound/soc/codecs/rt5682s.c +++ b/sound/soc/codecs/rt5682s.c @@ -2895,6 +2895,9 @@ static int rt5682s_suspend(struct snd_soc_component *component) { struct rt5682s_priv *rt5682s = snd_soc_component_get_drvdata(component); + if (rt5682s->irq) + disable_irq(rt5682s->irq); + cancel_delayed_work_sync(&rt5682s->jack_detect_work); cancel_delayed_work_sync(&rt5682s->jd_check_work); @@ -2919,6 +2922,9 @@ static int rt5682s_resume(struct snd_soc_component *component) &rt5682s->jack_detect_work, msecs_to_jiffies(0)); } + if (rt5682s->irq) + enable_irq(rt5682s->irq); + return 0; } #else @@ -3259,7 +3265,9 @@ static int rt5682s_i2c_probe(struct i2c_client *i2c) ret = devm_request_threaded_irq(&i2c->dev, i2c->irq, NULL, rt5682s_irq, IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | IRQF_ONESHOT, "rt5682s", rt5682s); - if (ret) + if (!ret) + rt5682s->irq = i2c->irq; + else dev_err(&i2c->dev, "Failed to reguest IRQ: %d\n", ret); } diff --git a/sound/soc/codecs/rt5682s.h b/sound/soc/codecs/rt5682s.h index 67f86a38a1cc..caa7733b430f 100644 --- a/sound/soc/codecs/rt5682s.h +++ b/sound/soc/codecs/rt5682s.h @@ -1472,6 +1472,7 @@ struct rt5682s_priv { int pll_comb; int jack_type; + unsigned int irq; int irq_work_delay_time; int wclk_enabled; }; -- 2.39.1.519.gcb327c4b5f-goog

2 2

[PATCH] ASoC: imx-pcm-rpmsg: Remove unused variable
by Deepak R Varma 14 Feb '23

14 Feb '23

Variable ret is initialed but is never modified or used except for returning the initial value 0. The value can be directly returned instead and the variable definition can be dropped. Issue identified using returnvar.cocci Coccinelle semantic patch. Signed-off-by: Deepak R Varma <drv(a)mailo.com> --- sound/soc/fsl/imx-pcm-rpmsg.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sound/soc/fsl/imx-pcm-rpmsg.c b/sound/soc/fsl/imx-pcm-rpmsg.c index 2f310994f7ee..6614b3447649 100644 --- a/sound/soc/fsl/imx-pcm-rpmsg.c +++ b/sound/soc/fsl/imx-pcm-rpmsg.c @@ -140,7 +140,6 @@ static int imx_rpmsg_pcm_hw_params(struct snd_soc_component *component, { struct rpmsg_info *info = dev_get_drvdata(component->dev); struct rpmsg_msg *msg; - int ret = 0; if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { msg = &info->msg[TX_HW_PARAM]; @@ -184,7 +183,7 @@ static int imx_rpmsg_pcm_hw_params(struct snd_soc_component *component, info->send_message(msg, info); - return ret; + return 0; } static snd_pcm_uframes_t imx_rpmsg_pcm_pointer(struct snd_soc_component *component, @@ -282,7 +281,6 @@ static int imx_rpmsg_pcm_close(struct snd_soc_component *component, struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); struct rpmsg_info *info = dev_get_drvdata(component->dev); struct rpmsg_msg *msg; - int ret = 0; /* Flush work in workqueue to make TX_CLOSE is the last message */ flush_workqueue(info->rpmsg_wq); @@ -305,7 +303,7 @@ static int imx_rpmsg_pcm_close(struct snd_soc_component *component, dev_warn(rtd->dev, "Msg is dropped!, number is %d\n", info->msg_drop_count[substream->stream]); - return ret; + return 0; } static int imx_rpmsg_pcm_prepare(struct snd_soc_component *component, -- 2.34.1

2 1

[PATCH] ASoC: codecs: wcd934x: Use min macro for comparison and assignment
by Deepak R Varma 14 Feb '23

14 Feb '23

Simplify code by using min helper macro for logical evaluation and value assignment. The change also facilitates code realignment for improved readability. Proposed change is identified using minmax.cocci Coccinelle script. Signed-off-by: Deepak R Varma <drv(a)mailo.com> --- sound/soc/codecs/wcd934x.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/sound/soc/codecs/wcd934x.c b/sound/soc/codecs/wcd934x.c index 28175c746b9a..783479a4d535 100644 --- a/sound/soc/codecs/wcd934x.c +++ b/sound/soc/codecs/wcd934x.c @@ -4737,13 +4737,9 @@ static u32 wcd934x_get_dmic_sample_rate(struct snd_soc_component *comp, if (dec_found && adc_mux_index <= 8) { tx_fs_reg = WCD934X_CDC_TX0_TX_PATH_CTL + (16 * adc_mux_index); tx_stream_fs = snd_soc_component_read(comp, tx_fs_reg) & 0x0F; - if (tx_stream_fs <= 4) { - if (wcd->dmic_sample_rate <= - WCD9XXX_DMIC_SAMPLE_RATE_2P4MHZ) - dmic_fs = wcd->dmic_sample_rate; - else - dmic_fs = WCD9XXX_DMIC_SAMPLE_RATE_2P4MHZ; - } else + if (tx_stream_fs <= 4) + dmic_fs = min(wcd->dmic_sample_rate, WCD9XXX_DMIC_SAMPLE_RATE_2P4MHZ); + else dmic_fs = WCD9XXX_DMIC_SAMPLE_RATE_4P8MHZ; } else { dmic_fs = wcd->dmic_sample_rate; -- 2.34.1

2 1

[PATCH 0/5] ASoC: SOF: Intel/ipc4: Support for low power playback (d0i3)
by Peter Ujfalusi 14 Feb '23

14 Feb '23

Hi, The following series will enable the the Low Power Audio (LPA) playback on Intel platforms when using IPC4. The support is closely follows how IPC3 supports similar use case. All depending patches are upstream and our CI have been testing this feature for some time without issues. Regards, Peter --- Rander Wang (5): ASoC: SOF: Introduce a new set_pm_gate() IPC PM op ASoC: SOF: Intel: hda-dsp: use set_pm_gate according to ipc version ASoC: SOF: ipc4: Wake up dsp core before sending ipc msg ASoC: SOF: Intel: Enable d0i3 work for ipc4 ASoC: SOF: Intel: hda-dsp: Set streaming flag for d0i3 sound/soc/sof/intel/cnl.c | 2 ++ sound/soc/sof/intel/hda-dsp.c | 46 ++++++++++++++++++++++++++--------- sound/soc/sof/intel/hda-ipc.c | 28 +++++++++++++++++++++ sound/soc/sof/intel/hda.h | 2 ++ sound/soc/sof/intel/mtl.c | 2 ++ sound/soc/sof/ipc3.c | 18 ++++++++++++++ sound/soc/sof/ipc4.c | 24 ++++++++++++++++++ sound/soc/sof/sof-priv.h | 2 ++ 8 files changed, 113 insertions(+), 11 deletions(-) -- 2.39.1

2 6

[PATCH] ASoC: tlv320adcx140: extend list of supported samplerates
by Alexandru Ardelean 14 Feb '23

14 Feb '23

From: Steffen Aschbacher <steffen.aschbacher(a)stihl.de> The 'tlv320adcx140' driver currently supports 3 devices: TLV320ADC3140, TLV320ADC5140 and TLV320ADC6140. All 3 devices, support higher samplerates, up to 768-kHz according to their datasheets. In our applications, we only tested (and worked) with 96 kHz and 192 kHz. This change extends the list of supported sample-rates for these devices with 96 & 192 kHz. References: https://www.ti.com/product/TLV320ADC3140 https://www.ti.com/product/TLV320ADC5140 https://www.ti.com/product/TLV320ADC6140 Signed-off-by: Steffen Aschbacher <steffen.aschbacher(a)stihl.de> Signed-off-by: Alexandru Ardelean <alex(a)shruggie.ro> --- sound/soc/codecs/tlv320adcx140.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/tlv320adcx140.h b/sound/soc/codecs/tlv320adcx140.h index fd80fac8b327..27a1f1012fe2 100644 --- a/sound/soc/codecs/tlv320adcx140.h +++ b/sound/soc/codecs/tlv320adcx140.h @@ -6,7 +6,9 @@ #define _TLV320ADCX140_H #define ADCX140_RATES (SNDRV_PCM_RATE_44100 | \ - SNDRV_PCM_RATE_48000) + SNDRV_PCM_RATE_48000 | \ + SNDRV_PCM_RATE_96000 | \ + SNDRV_PCM_RATE_192000) #define ADCX140_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | \ SNDRV_PCM_FMTBIT_S20_3LE | \ -- 2.34.1

2 1

[PATCH 00/35] Documentation: correct lots of spelling errors (series 1)
by Randy Dunlap 14 Feb '23

14 Feb '23

Correct many spelling errors in Documentation/ as reported by codespell. Maintainers of specific kernel subsystems are only Cc-ed on their respective patches, not the entire series. [if all goes well] These patches are based on linux-next-20230125. [PATCH 01/35] Documentation: arm64: correct spelling [PATCH 02/35] Documentation: arm: correct spelling [PATCH 03/35] Documentation: block: correct spelling [PATCH 04/35] Documentation: bpf: correct spelling [PATCH 05/35] Documentation: core-api: correct spelling [PATCH 06/35] Documentation: fault-injection: correct spelling [PATCH 07/35] Documentation: fb: correct spelling [PATCH 08/35] Documentation: features: correct spelling [PATCH 09/35] Documentation: firmware-guide/acpi: correct spelling [PATCH 10/35] Documentation: hid: correct spelling [PATCH 11/35] Documentation: i2c: correct spelling [PATCH 12/35] Documentation: input: correct spelling [PATCH 13/35] Documentation: isdn: correct spelling [PATCH 14/35] Documentation: leds: correct spelling [PATCH 15/35] Documentation: litmus-tests: correct spelling [PATCH 16/35] Documentation: livepatch: correct spelling [PATCH 17/35] Documentation: locking: correct spelling [PATCH 18/35] Documentation: mm: correct spelling [PATCH 19/35] Documentation: openrisc: correct spelling [PATCH 20/35] Documentation: PCI: correct spelling [PATCH 21/35] Documentation: powerpc: correct spelling [PATCH 22/35] Documentation: power: correct spelling [PATCH 23/35] Documentation: s390: correct spelling [PATCH 24/35] Documentation: scheduler: correct spelling [PATCH 25/35] Documentation: security: correct spelling [PATCH 26/35] Documentation: sound: correct spelling [PATCH 27/35] Documentation: spi: correct spelling [PATCH 28/35] Documentation: target: correct spelling [PATCH 29/35] Documentation: timers: correct spelling [PATCH 30/35] Documentation: tools/rtla: correct spelling [PATCH 31/35] Documentation: trace: correct spelling [PATCH 32/35] Documentation: usb: correct spelling [PATCH 33/35] Documentation: w1: correct spelling [PATCH 34/35] Documentation: x86: correct spelling [PATCH 35/35] Documentation: xtensa: correct spelling Documentation/PCI/endpoint/pci-vntb-howto.rst | 2 - Documentation/PCI/msi-howto.rst | 2 - Documentation/arm/arm.rst | 2 - Documentation/arm/ixp4xx.rst | 4 +- Documentation/arm/keystone/knav-qmss.rst | 2 - Documentation/arm/stm32/stm32-dma-mdma-chaining.rst | 6 +-- Documentation/arm/sunxi/clocks.rst | 2 - Documentation/arm/swp_emulation.rst | 2 - Documentation/arm/tcm.rst | 2 - Documentation/arm/vlocks.rst | 2 - Documentation/arm64/booting.rst | 2 - Documentation/arm64/elf_hwcaps.rst | 2 - Documentation/arm64/sve.rst | 4 +- Documentation/block/data-integrity.rst | 2 - Documentation/bpf/libbpf/libbpf_naming_convention.rst | 6 +-- Documentation/bpf/map_xskmap.rst | 2 - Documentation/bpf/ringbuf.rst | 4 +- Documentation/bpf/verifier.rst | 2 - Documentation/core-api/packing.rst | 2 - Documentation/core-api/padata.rst | 2 - Documentation/fault-injection/fault-injection.rst | 2 - Documentation/fb/sm712fb.rst | 2 - Documentation/fb/sstfb.rst | 2 - Documentation/features/core/thread-info-in-task/arch-support.txt | 2 - Documentation/firmware-guide/acpi/acpi-lid.rst | 2 - Documentation/firmware-guide/acpi/namespace.rst | 2 - Documentation/hid/hid-alps.rst | 2 - Documentation/hid/hid-bpf.rst | 2 - Documentation/hid/hiddev.rst | 2 - Documentation/hid/hidraw.rst | 2 - Documentation/hid/intel-ish-hid.rst | 2 - Documentation/i2c/gpio-fault-injection.rst | 2 - Documentation/i2c/smbus-protocol.rst | 2 - Documentation/input/devices/iforce-protocol.rst | 2 - Documentation/input/multi-touch-protocol.rst | 2 - Documentation/isdn/interface_capi.rst | 2 - Documentation/isdn/m_isdn.rst | 2 - Documentation/leds/leds-qcom-lpg.rst | 4 +- Documentation/litmus-tests/README | 2 - Documentation/livepatch/reliable-stacktrace.rst | 2 - Documentation/locking/lockdep-design.rst | 4 +- Documentation/locking/locktorture.rst | 2 - Documentation/locking/locktypes.rst | 2 - Documentation/locking/preempt-locking.rst | 2 - Documentation/mm/hmm.rst | 4 +- Documentation/mm/hwpoison.rst | 2 - Documentation/openrisc/openrisc_port.rst | 4 +- Documentation/power/suspend-and-interrupts.rst | 2 - Documentation/powerpc/kasan.txt | 2 - Documentation/powerpc/papr_hcalls.rst | 2 - Documentation/powerpc/qe_firmware.rst | 4 +- Documentation/powerpc/vas-api.rst | 4 +- Documentation/s390/pci.rst | 4 +- Documentation/s390/vfio-ccw.rst | 2 - Documentation/scheduler/sched-bwc.rst | 2 - Documentation/scheduler/sched-energy.rst | 4 +- Documentation/security/digsig.rst | 4 +- Documentation/security/keys/core.rst | 2 - Documentation/security/secrets/coco.rst | 2 - Documentation/sound/alsa-configuration.rst | 8 ++-- Documentation/sound/cards/audigy-mixer.rst | 2 - Documentation/sound/cards/maya44.rst | 2 - Documentation/sound/cards/sb-live-mixer.rst | 2 - Documentation/sound/designs/jack-controls.rst | 2 - Documentation/sound/designs/seq-oss.rst | 2 - Documentation/sound/hd-audio/notes.rst | 2 - Documentation/spi/pxa2xx.rst | 12 +++--- Documentation/spi/spi-lm70llp.rst | 2 - Documentation/spi/spi-summary.rst | 2 - Documentation/target/tcmu-design.rst | 2 - Documentation/timers/hrtimers.rst | 2 - Documentation/tools/rtla/rtla-timerlat-top.rst | 2 - Documentation/trace/coresight/coresight-etm4x-reference.rst | 2 - Documentation/trace/events.rst | 6 +-- Documentation/trace/fprobe.rst | 2 - Documentation/trace/ftrace-uses.rst | 2 - Documentation/trace/hwlat_detector.rst | 2 - Documentation/trace/rv/runtime-verification.rst | 2 - Documentation/trace/uprobetracer.rst | 2 - Documentation/usb/chipidea.rst | 19 +++++----- Documentation/usb/gadget-testing.rst | 2 - Documentation/usb/mass-storage.rst | 2 - Documentation/w1/w1-netlink.rst | 2 - Documentation/x86/boot.rst | 2 - Documentation/x86/buslock.rst | 2 - Documentation/x86/mds.rst | 2 - Documentation/x86/resctrl.rst | 2 - Documentation/x86/sgx.rst | 2 - Documentation/xtensa/atomctl.rst | 2 - 89 files changed, 124 insertions(+), 123 deletions(-) Cc: Jonathan Corbet <corbet(a)lwn.net> Cc: Catalin Marinas <catalin.marinas(a)arm.com> Cc: Will Deacon <will(a)kernel.org> Cc: Russell King <linux(a)armlinux.org.uk> Cc: Jens Axboe <axboe(a)kernel.dk> Cc: Andrii Nakryiko <andrii(a)kernel.org> Cc: Alexei Starovoitov <ast(a)kernel.org> Cc: Daniel Borkmann <daniel(a)iogearbox.net> Cc: Vladimir Oltean <olteanv(a)gmail.com> Cc: Steffen Klassert <steffen.klassert(a)secunet.com> Cc: Daniel Jordan <daniel.m.jordan(a)oracle.com> Cc: Akinobu Mita <akinobu.mita(a)gmail.com> Cc: Helge Deller <deller(a)gmx.de> Cc: "Rafael J. Wysocki" <rafael(a)kernel.org> Cc: Jiri Kosina <jikos(a)kernel.org> Cc: Benjamin Tissoires <benjamin.tissoires(a)redhat.com> Cc: Srinivas Pandruvada <srinivas.pandruvada(a)linux.intel.com> Cc: Wolfram Sang <wsa(a)kernel.org> Cc: Dmitry Torokhov <dmitry.torokhov(a)gmail.com> Cc: Henrik Rydberg <rydberg(a)bitmath.org> Cc: Karsten Keil <isdn(a)linux-pingi.de> Cc: Pavel Machek <pavel(a)ucw.cz> Cc: Lee Jones <lee(a)kernel.org> Cc: Josh Poimboeuf <jpoimboe(a)kernel.org> Cc: Miroslav Benes <mbenes(a)suse.cz> Cc: Petr Mladek <pmladek(a)suse.com> Cc: Peter Zijlstra <peterz(a)infradead.org> Cc: Ingo Molnar <mingo(a)redhat.com> Cc: Jérôme Glisse <jglisse(a)redhat.com> Cc: Naoya Horiguchi <naoya.horiguchi(a)nec.com> Cc: Miaohe Lin <linmiaohe(a)huawei.com> Cc: Jonas Bonn <jonas(a)southpole.se> Cc: Stefan Kristiansson <stefan.kristiansson(a)saunalahti.fi> Cc: Stafford Horne <shorne(a)gmail.com> Cc: Bjorn Helgaas <bhelgaas(a)google.com> Cc: Lorenzo Pieralisi <lpieralisi(a)kernel.org> Cc: Marc Zyngier <maz(a)kernel.org> Cc: Michael Ellerman <mpe(a)ellerman.id.au> Cc: Len Brown <len.brown(a)intel.com> Cc: Heiko Carstens <hca(a)linux.ibm.com> Cc: Vasily Gorbik <gor(a)linux.ibm.com> Cc: Alexander Gordeev <agordeev(a)linux.ibm.com> Cc: Juri Lelli <juri.lelli(a)redhat.com> Cc: Vincent Guittot <vincent.guittot(a)linaro.org> Cc: David Howells <dhowells(a)redhat.com> Cc: Jarkko Sakkinen <jarkko(a)kernel.org> Cc: Paul Moore <paul(a)paul-moore.com> Cc: James Morris <jmorris(a)namei.org> Cc: "Serge E. Hallyn" <serge(a)hallyn.com> Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: Mark Brown <broonie(a)kernel.org> Cc: "Martin K. Petersen" <martin.petersen(a)oracle.com> Cc: Daniel Bristot de Oliveira <bristot(a)kernel.org> Cc: Steven Rostedt <rostedt(a)goodmis.org> Cc: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Cc: Masami Hiramatsu <mhiramat(a)kernel.org> Cc: Mathieu Poirier <mathieu.poirier(a)linaro.org> Cc: Suzuki K Poulose <suzuki.poulose(a)arm.com> Cc: Evgeniy Polyakov <zbr(a)ioremap.net> Cc: Fenghua Yu <fenghua.yu(a)intel.com> Cc: Reinette Chatre <reinette.chatre(a)intel.com> Cc: Thomas Gleixner <tglx(a)linutronix.de> Cc: Borislav Petkov <bp(a)alien8.de> Cc: Chris Zankel <chris(a)zankel.net> Cc: Max Filippov <jcmvbkbc(a)gmail.com> Cc: alsa-devel(a)alsa-project.org Cc: coresight(a)lists.linaro.org Cc: bpf(a)vger.kernel.org Cc: dri-devel(a)lists.freedesktop.org Cc: isdn4linux(a)listserv.isdn4linux.de Cc: keyrings(a)vger.kernel.org Cc: linux-acpi(a)vger.kernel.org Cc: linux-block(a)vger.kernel.org Cc: linux-crypto(a)vger.kernel.org Cc: linux-doc(a)vger.kernel.org Cc: linux-fbdev(a)vger.kernel.org Cc: linux-i2c(a)vger.kernel.org Cc: linux-input(a)vger.kernel.org Cc: linux-leds(a)vger.kernel.org Cc: linux-pci(a)vger.kernel.org Cc: linux-s390(a)vger.kernel.org Cc: linux-scsi(a)vger.kernel.org Cc: linux-sgx(a)vger.kernel.org Cc: linux-spi(a)vger.kernel.org Cc: linux-trace-devel(a)vger.kernel.org Cc: linux-trace-kernel(a)vger.kernel.org Cc: live-patching(a)vger.kernel.org Cc: linux-pm(a)vger.kernel.org Cc: linux-security-module(a)vger.kernel.org Cc: linux-usb(a)vger.kernel.org Cc: netdev(a)vger.kernel.org Cc: target-devel(a)vger.kernel.org Cc: linux-mm(a)kvack.org Cc: openrisc(a)lists.librecores.org Cc: linux-arm-kernel(a)lists.infradead.org Cc: linux-xtensa(a)linux-xtensa.org Cc: linuxppc-dev(a)lists.ozlabs.org Cc: x86(a)kernel.org

6 6

[PATCH 1/2] ALSA: hda/realtek: fix mute/micmute LEDs don't work for a HP platform.
by Andy Chi 14 Feb '23

14 Feb '23

There is a HP platform needs ALC236_FIXUP_HP_GPIO_LED quirk to make mic-mute/audio-mute working. Signed-off-by: Andy Chi <andy.chi(a)canonical.com> --- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 1134a493d225..7b9fb38ff732 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -9436,6 +9436,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x103c, 0x8b5e, "HP", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF), SND_PCI_QUIRK(0x103c, 0x8b7a, "HP", ALC236_FIXUP_HP_GPIO_LED), SND_PCI_QUIRK(0x103c, 0x8b7d, "HP", ALC236_FIXUP_HP_GPIO_LED), + SND_PCI_QUIRK(0x103c, 0x8b87, "HP", ALC236_FIXUP_HP_GPIO_LED), SND_PCI_QUIRK(0x103c, 0x8b8a, "HP", ALC236_FIXUP_HP_GPIO_LED), SND_PCI_QUIRK(0x103c, 0x8b8b, "HP", ALC236_FIXUP_HP_GPIO_LED), SND_PCI_QUIRK(0x103c, 0x8b8d, "HP", ALC236_FIXUP_HP_GPIO_LED), -- 2.34.1

2 9