On 27-03-24, 12:01, Vijendar Mukunda wrote:
> When SoundWire Wake interrupt is enabled along with SoundWire Wake
> enable register, SoundWire wake interrupt will be reported
> when SoundWire manager is in D3 state and ACP is in D3 state.
>
> When SoundWire Wake interrupt is reported, it will invoke runtime
> resume of the SoundWire manager device.
>
> In case of system level suspend, for ClockStop Mode SoundWire Wake
> interrupt should be disabled.
> It should be enabled only for runtime suspend scenario.
> Change wake interrupt enable/disable sequence for ClockStop Mode in
> system level suspend and runtime suspend sceanrio.
>
> Fixes: 9cf1efc5ed2d ("soundwire: amd: add pm_prepare callback and pm ops support")
>
no empty line b/w fixes and s-o-b line please
I have fixed it up while applying
Also, fixes should be first patch followed by other changes...
> Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@xxxxxxx>
> ---
> drivers/soundwire/amd_manager.c | 15 +++++++++++++++
> drivers/soundwire/amd_manager.h | 3 ++-
> 2 files changed, 17 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/soundwire/amd_manager.c b/drivers/soundwire/amd_manager.c
> index 1066d87aa011..20d94bcfc9b4 100644
> --- a/drivers/soundwire/amd_manager.c
> +++ b/drivers/soundwire/amd_manager.c
> @@ -129,6 +129,19 @@ static void amd_sdw_set_frameshape(struct amd_sdw_manager *amd_manager)
> writel(frame_size, amd_manager->mmio + ACP_SW_FRAMESIZE);
> }
>
> +static void amd_sdw_wake_enable(struct amd_sdw_manager *amd_manager, bool enable)
> +{
> + u32 wake_ctrl;
> +
> + wake_ctrl = readl(amd_manager->mmio + ACP_SW_STATE_CHANGE_STATUS_MASK_8TO11);
> + if (enable)
> + wake_ctrl |= AMD_SDW_WAKE_INTR_MASK;
> + else
> + wake_ctrl &= ~AMD_SDW_WAKE_INTR_MASK;
> +
> + writel(wake_ctrl, amd_manager->mmio + ACP_SW_STATE_CHANGE_STATUS_MASK_8TO11);
> +}
> +
> static void amd_sdw_ctl_word_prep(u32 *lower_word, u32 *upper_word, struct sdw_msg *msg,
> int cmd_offset)
> {
> @@ -1094,6 +1107,7 @@ static int __maybe_unused amd_suspend(struct device *dev)
> }
>
> if (amd_manager->power_mode_mask & AMD_SDW_CLK_STOP_MODE) {
> + amd_sdw_wake_enable(amd_manager, false);
> return amd_sdw_clock_stop(amd_manager);
> } else if (amd_manager->power_mode_mask & AMD_SDW_POWER_OFF_MODE) {
> /*
> @@ -1120,6 +1134,7 @@ static int __maybe_unused amd_suspend_runtime(struct device *dev)
> return 0;
> }
> if (amd_manager->power_mode_mask & AMD_SDW_CLK_STOP_MODE) {
> + amd_sdw_wake_enable(amd_manager, true);
> return amd_sdw_clock_stop(amd_manager);
> } else if (amd_manager->power_mode_mask & AMD_SDW_POWER_OFF_MODE) {
> ret = amd_sdw_clock_stop(amd_manager);
> diff --git a/drivers/soundwire/amd_manager.h b/drivers/soundwire/amd_manager.h
> index 418b679e0b1a..707065468e05 100644
> --- a/drivers/soundwire/amd_manager.h
> +++ b/drivers/soundwire/amd_manager.h
> @@ -152,7 +152,7 @@
> #define AMD_SDW0_EXT_INTR_MASK 0x200000
> #define AMD_SDW1_EXT_INTR_MASK 4
> #define AMD_SDW_IRQ_MASK_0TO7 0x77777777
> -#define AMD_SDW_IRQ_MASK_8TO11 0x000d7777
> +#define AMD_SDW_IRQ_MASK_8TO11 0x000c7777
> #define AMD_SDW_IRQ_ERROR_MASK 0xff
> #define AMD_SDW_MAX_FREQ_NUM 1
> #define AMD_SDW0_MAX_TX_PORTS 3
> @@ -190,6 +190,7 @@
> #define AMD_SDW_CLK_RESUME_REQ 2
> #define AMD_SDW_CLK_RESUME_DONE 3
> #define AMD_SDW_WAKE_STAT_MASK BIT(16)
> +#define AMD_SDW_WAKE_INTR_MASK BIT(16)
>
> static u32 amd_sdw_freq_tbl[AMD_SDW_MAX_FREQ_NUM] = {
> AMD_SDW_DEFAULT_CLK_FREQ,
> --
> 2.34.1
--
~Vinod
