* [PATCH 1/5] soundwire: amd: change the soundwire wake enable/disable sequence
2024-12-25 7:23 [PATCH 0/5] soundwire: amd: code improvements and new platform Vijendar Mukunda
@ 2024-12-25 7:23 ` Vijendar Mukunda
2024-12-25 7:23 ` [PATCH 2/5] soundwire: amd: add debug log for soundwire wake event Vijendar Mukunda
` (4 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Vijendar Mukunda @ 2024-12-25 7:23 UTC (permalink / raw)
To: vkoul
Cc: yung-chuan.liao, pierre-louis.bossart, sanyog.r.kale,
Basavaraj.Hiregoudar, Sunil-kumar.Dommati, venkataprasad.potturu,
Mario.Limonciello, linux-sound, linux-kernel, alsa-devel,
Vijendar Mukunda
During runtime suspend scenario, SoundWire wake should be enabled and
during system level suspend scenario SoundWire wake should be disabled.
Implement the SoundWire wake enable/disable sequence as per design flow
for SoundWire poweroff mode.
Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
---
drivers/soundwire/amd_manager.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/soundwire/amd_manager.c b/drivers/soundwire/amd_manager.c
index 71b3cf2df89d..187006e68ad6 100644
--- a/drivers/soundwire/amd_manager.c
+++ b/drivers/soundwire/amd_manager.c
@@ -1139,6 +1139,7 @@ static int __maybe_unused amd_suspend(struct device *dev)
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) {
+ amd_sdw_wake_enable(amd_manager, false);
/*
* As per hardware programming sequence on AMD platforms,
* clock stop should be invoked first before powering-off
@@ -1166,6 +1167,7 @@ static int __maybe_unused amd_suspend_runtime(struct device *dev)
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) {
+ amd_sdw_wake_enable(amd_manager, true);
ret = amd_sdw_clock_stop(amd_manager);
if (ret)
return ret;
--
2.34.1
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH 2/5] soundwire: amd: add debug log for soundwire wake event
2024-12-25 7:23 [PATCH 0/5] soundwire: amd: code improvements and new platform Vijendar Mukunda
2024-12-25 7:23 ` [PATCH 1/5] soundwire: amd: change the soundwire wake enable/disable sequence Vijendar Mukunda
@ 2024-12-25 7:23 ` Vijendar Mukunda
2024-12-25 7:23 ` [PATCH 3/5] soundwire: amd: add support for ACP7.0 & ACP7.1 platforms Vijendar Mukunda
` (3 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Vijendar Mukunda @ 2024-12-25 7:23 UTC (permalink / raw)
To: vkoul
Cc: yung-chuan.liao, pierre-louis.bossart, sanyog.r.kale,
Basavaraj.Hiregoudar, Sunil-kumar.Dommati, venkataprasad.potturu,
Mario.Limonciello, linux-sound, linux-kernel, alsa-devel,
Vijendar Mukunda
Add debug log in amd_sdw_process_wake_event() function.
Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
---
drivers/soundwire/amd_manager.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/soundwire/amd_manager.c b/drivers/soundwire/amd_manager.c
index 187006e68ad6..60be5805715e 100644
--- a/drivers/soundwire/amd_manager.c
+++ b/drivers/soundwire/amd_manager.c
@@ -849,6 +849,7 @@ 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)
{
+ dev_dbg(amd_manager->dev, "SoundWire Wake event reported\n");
pm_request_resume(amd_manager->dev);
writel(0x00, amd_manager->acp_mmio + ACP_SW_WAKE_EN(amd_manager->instance));
writel(0x00, amd_manager->mmio + ACP_SW_STATE_CHANGE_STATUS_8TO11);
--
2.34.1
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH 3/5] soundwire: amd: add support for ACP7.0 & ACP7.1 platforms
2024-12-25 7:23 [PATCH 0/5] soundwire: amd: code improvements and new platform Vijendar Mukunda
2024-12-25 7:23 ` [PATCH 1/5] soundwire: amd: change the soundwire wake enable/disable sequence Vijendar Mukunda
2024-12-25 7:23 ` [PATCH 2/5] soundwire: amd: add debug log for soundwire wake event Vijendar Mukunda
@ 2024-12-25 7:23 ` Vijendar Mukunda
2025-01-02 7:14 ` Mukunda,Vijendar
2024-12-25 7:23 ` [PATCH 4/5] soundwire: amd: add soundwire host wake interrupt enable/disable sequence Vijendar Mukunda
` (2 subsequent siblings)
5 siblings, 1 reply; 8+ messages in thread
From: Vijendar Mukunda @ 2024-12-25 7:23 UTC (permalink / raw)
To: vkoul
Cc: yung-chuan.liao, pierre-louis.bossart, sanyog.r.kale,
Basavaraj.Hiregoudar, Sunil-kumar.Dommati, venkataprasad.potturu,
Mario.Limonciello, linux-sound, linux-kernel, alsa-devel,
Vijendar Mukunda
Add SoundWire support for ACP7.0 and ACP7.1 platforms.
Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
---
drivers/soundwire/amd_manager.c | 23 +++++++++++++++++++++++
drivers/soundwire/amd_manager.h | 18 ++++++++++++++++++
include/linux/soundwire/sdw_amd.h | 2 ++
3 files changed, 43 insertions(+)
diff --git a/drivers/soundwire/amd_manager.c b/drivers/soundwire/amd_manager.c
index 60be5805715e..9eb8d345b527 100644
--- a/drivers/soundwire/amd_manager.c
+++ b/drivers/soundwire/amd_manager.c
@@ -446,6 +446,10 @@ static int amd_sdw_port_params(struct sdw_bus *bus, struct sdw_port_params *p_pa
return -EINVAL;
}
break;
+ case ACP70_PCI_REV_ID:
+ case ACP71_PCI_REV_ID:
+ frame_fmt_reg = acp70_sdw_dp_reg[p_params->num].frame_fmt_reg;
+ break;
default:
return -EINVAL;
}
@@ -494,6 +498,14 @@ static int amd_sdw_transport_params(struct sdw_bus *bus,
return -EINVAL;
}
break;
+ case ACP70_PCI_REV_ID:
+ case ACP71_PCI_REV_ID:
+ frame_fmt_reg = acp70_sdw_dp_reg[params->port_num].frame_fmt_reg;
+ sample_int_reg = acp70_sdw_dp_reg[params->port_num].sample_int_reg;
+ hctrl_dp0_reg = acp70_sdw_dp_reg[params->port_num].hctrl_dp0_reg;
+ offset_reg = acp70_sdw_dp_reg[params->port_num].offset_reg;
+ lane_ctrl_ch_en_reg = acp70_sdw_dp_reg[params->port_num].lane_ctrl_ch_en_reg;
+ break;
default:
return -EINVAL;
}
@@ -549,6 +561,10 @@ static int amd_sdw_port_enable(struct sdw_bus *bus,
return -EINVAL;
}
break;
+ case ACP70_PCI_REV_ID:
+ case ACP71_PCI_REV_ID:
+ lane_ctrl_ch_en_reg = acp70_sdw_dp_reg[enable_ch->port_num].lane_ctrl_ch_en_reg;
+ break;
default:
return -EINVAL;
}
@@ -895,6 +911,7 @@ int amd_sdw_manager_start(struct amd_sdw_manager *amd_manager)
ret = amd_enable_sdw_manager(amd_manager);
if (ret)
return ret;
+
amd_sdw_set_frameshape(amd_manager);
}
/* Enable runtime PM */
@@ -966,6 +983,11 @@ static int amd_sdw_manager_probe(struct platform_device *pdev)
return -EINVAL;
}
break;
+ case ACP70_PCI_REV_ID:
+ case ACP71_PCI_REV_ID:
+ amd_manager->num_dout_ports = AMD_ACP70_SDW_MAX_TX_PORTS;
+ amd_manager->num_din_ports = AMD_ACP70_SDW_MAX_RX_PORTS;
+ break;
default:
return -EINVAL;
}
@@ -1172,6 +1194,7 @@ static int __maybe_unused amd_suspend_runtime(struct device *dev)
ret = amd_sdw_clock_stop(amd_manager);
if (ret)
return ret;
+
return amd_deinit_sdw_manager(amd_manager);
}
return 0;
diff --git a/drivers/soundwire/amd_manager.h b/drivers/soundwire/amd_manager.h
index cc2170e4521e..30244a31c21c 100644
--- a/drivers/soundwire/amd_manager.h
+++ b/drivers/soundwire/amd_manager.h
@@ -159,8 +159,11 @@
#define AMD_ACP63_SDW0_MAX_RX_PORTS 3
#define AMD_ACP63_SDW1_MAX_TX_PORTS 1
#define AMD_ACP63_SDW1_MAX_RX_PORTS 1
+#define AMD_ACP70_SDW_MAX_TX_PORTS 3
+#define AMD_ACP70_SDW_MAX_RX_PORTS 3
#define AMD_ACP63_SDW0_MAX_DAI 6
#define AMD_ACP63_SDW1_MAX_DAI 2
+#define AMD_ACP70_SDW_MAX_DAI 6
#define AMD_SDW_SLAVE_0_ATTACHED 5
#define AMD_SDW_SSP_COUNTER_VAL 3
@@ -244,6 +247,21 @@ static struct sdw_manager_dp_reg acp63_sdw1_dp_reg[AMD_ACP63_SDW1_MAX_DAI] = {
ACP_SW_AUDIO1_RX_OFFSET, ACP_SW_AUDIO1_RX_CHANNEL_ENABLE_DP0}
};
+static struct sdw_manager_dp_reg acp70_sdw_dp_reg[AMD_ACP70_SDW_MAX_DAI] = {
+ {ACP_SW_AUDIO0_TX_FRAME_FORMAT, ACP_SW_AUDIO0_TX_SAMPLEINTERVAL, ACP_SW_AUDIO0_TX_HCTRL_DP0,
+ ACP_SW_AUDIO0_TX_OFFSET_DP0, ACP_SW_AUDIO0_TX_CHANNEL_ENABLE_DP0},
+ {ACP_SW_AUDIO1_TX_FRAME_FORMAT, ACP_SW_AUDIO1_TX_SAMPLEINTERVAL, ACP_SW_AUDIO1_TX_HCTRL,
+ ACP_SW_AUDIO1_TX_OFFSET, ACP_SW_AUDIO1_TX_CHANNEL_ENABLE_DP0},
+ {ACP_SW_AUDIO2_TX_FRAME_FORMAT, ACP_SW_AUDIO2_TX_SAMPLEINTERVAL, ACP_SW_AUDIO2_TX_HCTRL,
+ ACP_SW_AUDIO2_TX_OFFSET, ACP_SW_AUDIO2_TX_CHANNEL_ENABLE_DP0},
+ {ACP_SW_AUDIO0_RX_FRAME_FORMAT, ACP_SW_AUDIO0_RX_SAMPLEINTERVAL, ACP_SW_AUDIO0_RX_HCTRL_DP0,
+ ACP_SW_AUDIO0_RX_OFFSET_DP0, ACP_SW_AUDIO0_RX_CHANNEL_ENABLE_DP0},
+ {ACP_SW_AUDIO1_RX_FRAME_FORMAT, ACP_SW_AUDIO1_RX_SAMPLEINTERVAL, ACP_SW_AUDIO1_RX_HCTRL,
+ ACP_SW_AUDIO1_RX_OFFSET, ACP_SW_AUDIO1_RX_CHANNEL_ENABLE_DP0},
+ {ACP_SW_AUDIO2_RX_FRAME_FORMAT, ACP_SW_AUDIO2_RX_SAMPLEINTERVAL, ACP_SW_AUDIO2_RX_HCTRL,
+ ACP_SW_AUDIO2_RX_OFFSET, ACP_SW_AUDIO2_RX_CHANNEL_ENABLE_DP0},
+};
+
static u32 sdw_manager_reg_mask_array[AMD_SDW_MAX_MANAGER_COUNT] = {
AMD_SDW0_EXT_INTR_MASK,
AMD_SDW1_EXT_INTR_MASK
diff --git a/include/linux/soundwire/sdw_amd.h b/include/linux/soundwire/sdw_amd.h
index 799f8578137b..6b839987f14c 100644
--- a/include/linux/soundwire/sdw_amd.h
+++ b/include/linux/soundwire/sdw_amd.h
@@ -28,6 +28,8 @@
#define ACP_SDW1 1
#define AMD_SDW_MAX_MANAGER_COUNT 2
#define ACP63_PCI_REV_ID 0x63
+#define ACP70_PCI_REV_ID 0x70
+#define ACP71_PCI_REV_ID 0x71
struct acp_sdw_pdata {
u16 instance;
--
2.34.1
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 3/5] soundwire: amd: add support for ACP7.0 & ACP7.1 platforms
2024-12-25 7:23 ` [PATCH 3/5] soundwire: amd: add support for ACP7.0 & ACP7.1 platforms Vijendar Mukunda
@ 2025-01-02 7:14 ` Mukunda,Vijendar
0 siblings, 0 replies; 8+ messages in thread
From: Mukunda,Vijendar @ 2025-01-02 7:14 UTC (permalink / raw)
To: vkoul
Cc: yung-chuan.liao, pierre-louis.bossart, sanyog.r.kale,
Basavaraj.Hiregoudar, Sunil-kumar.Dommati, venkataprasad.potturu,
Mario.Limonciello, linux-sound, linux-kernel, alsa-devel
On 25/12/24 12:53, Vijendar Mukunda wrote:
> Add SoundWire support for ACP7.0 and ACP7.1 platforms.
>
> Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
> ---
> drivers/soundwire/amd_manager.c | 23 +++++++++++++++++++++++
> drivers/soundwire/amd_manager.h | 18 ++++++++++++++++++
> include/linux/soundwire/sdw_amd.h | 2 ++
> 3 files changed, 43 insertions(+)
>
> diff --git a/drivers/soundwire/amd_manager.c b/drivers/soundwire/amd_manager.c
> index 60be5805715e..9eb8d345b527 100644
> --- a/drivers/soundwire/amd_manager.c
> +++ b/drivers/soundwire/amd_manager.c
> @@ -446,6 +446,10 @@ static int amd_sdw_port_params(struct sdw_bus *bus, struct sdw_port_params *p_pa
> return -EINVAL;
> }
> break;
> + case ACP70_PCI_REV_ID:
> + case ACP71_PCI_REV_ID:
> + frame_fmt_reg = acp70_sdw_dp_reg[p_params->num].frame_fmt_reg;
> + break;
> default:
> return -EINVAL;
> }
> @@ -494,6 +498,14 @@ static int amd_sdw_transport_params(struct sdw_bus *bus,
> return -EINVAL;
> }
> break;
> + case ACP70_PCI_REV_ID:
> + case ACP71_PCI_REV_ID:
> + frame_fmt_reg = acp70_sdw_dp_reg[params->port_num].frame_fmt_reg;
> + sample_int_reg = acp70_sdw_dp_reg[params->port_num].sample_int_reg;
> + hctrl_dp0_reg = acp70_sdw_dp_reg[params->port_num].hctrl_dp0_reg;
> + offset_reg = acp70_sdw_dp_reg[params->port_num].offset_reg;
> + lane_ctrl_ch_en_reg = acp70_sdw_dp_reg[params->port_num].lane_ctrl_ch_en_reg;
> + break;
> default:
> return -EINVAL;
> }
> @@ -549,6 +561,10 @@ static int amd_sdw_port_enable(struct sdw_bus *bus,
> return -EINVAL;
> }
> break;
> + case ACP70_PCI_REV_ID:
> + case ACP71_PCI_REV_ID:
> + lane_ctrl_ch_en_reg = acp70_sdw_dp_reg[enable_ch->port_num].lane_ctrl_ch_en_reg;
> + break;
> default:
> return -EINVAL;
> }
> @@ -895,6 +911,7 @@ int amd_sdw_manager_start(struct amd_sdw_manager *amd_manager)
> ret = amd_enable_sdw_manager(amd_manager);
> if (ret)
> return ret;
> +
> amd_sdw_set_frameshape(amd_manager);
> }
> /* Enable runtime PM */
> @@ -966,6 +983,11 @@ static int amd_sdw_manager_probe(struct platform_device *pdev)
> return -EINVAL;
> }
> break;
> + case ACP70_PCI_REV_ID:
> + case ACP71_PCI_REV_ID:
> + amd_manager->num_dout_ports = AMD_ACP70_SDW_MAX_TX_PORTS;
> + amd_manager->num_din_ports = AMD_ACP70_SDW_MAX_RX_PORTS;
> + break;
> default:
> return -EINVAL;
> }
> @@ -1172,6 +1194,7 @@ static int __maybe_unused amd_suspend_runtime(struct device *dev)
> ret = amd_sdw_clock_stop(amd_manager);
> if (ret)
> return ret;
> +
Extra white line is added. Will fix it in V2 version.
> return amd_deinit_sdw_manager(amd_manager);
> }
> return 0;
> diff --git a/drivers/soundwire/amd_manager.h b/drivers/soundwire/amd_manager.h
> index cc2170e4521e..30244a31c21c 100644
> --- a/drivers/soundwire/amd_manager.h
> +++ b/drivers/soundwire/amd_manager.h
> @@ -159,8 +159,11 @@
> #define AMD_ACP63_SDW0_MAX_RX_PORTS 3
> #define AMD_ACP63_SDW1_MAX_TX_PORTS 1
> #define AMD_ACP63_SDW1_MAX_RX_PORTS 1
> +#define AMD_ACP70_SDW_MAX_TX_PORTS 3
> +#define AMD_ACP70_SDW_MAX_RX_PORTS 3
> #define AMD_ACP63_SDW0_MAX_DAI 6
> #define AMD_ACP63_SDW1_MAX_DAI 2
> +#define AMD_ACP70_SDW_MAX_DAI 6
> #define AMD_SDW_SLAVE_0_ATTACHED 5
> #define AMD_SDW_SSP_COUNTER_VAL 3
>
> @@ -244,6 +247,21 @@ static struct sdw_manager_dp_reg acp63_sdw1_dp_reg[AMD_ACP63_SDW1_MAX_DAI] = {
> ACP_SW_AUDIO1_RX_OFFSET, ACP_SW_AUDIO1_RX_CHANNEL_ENABLE_DP0}
> };
>
> +static struct sdw_manager_dp_reg acp70_sdw_dp_reg[AMD_ACP70_SDW_MAX_DAI] = {
> + {ACP_SW_AUDIO0_TX_FRAME_FORMAT, ACP_SW_AUDIO0_TX_SAMPLEINTERVAL, ACP_SW_AUDIO0_TX_HCTRL_DP0,
> + ACP_SW_AUDIO0_TX_OFFSET_DP0, ACP_SW_AUDIO0_TX_CHANNEL_ENABLE_DP0},
> + {ACP_SW_AUDIO1_TX_FRAME_FORMAT, ACP_SW_AUDIO1_TX_SAMPLEINTERVAL, ACP_SW_AUDIO1_TX_HCTRL,
> + ACP_SW_AUDIO1_TX_OFFSET, ACP_SW_AUDIO1_TX_CHANNEL_ENABLE_DP0},
> + {ACP_SW_AUDIO2_TX_FRAME_FORMAT, ACP_SW_AUDIO2_TX_SAMPLEINTERVAL, ACP_SW_AUDIO2_TX_HCTRL,
> + ACP_SW_AUDIO2_TX_OFFSET, ACP_SW_AUDIO2_TX_CHANNEL_ENABLE_DP0},
> + {ACP_SW_AUDIO0_RX_FRAME_FORMAT, ACP_SW_AUDIO0_RX_SAMPLEINTERVAL, ACP_SW_AUDIO0_RX_HCTRL_DP0,
> + ACP_SW_AUDIO0_RX_OFFSET_DP0, ACP_SW_AUDIO0_RX_CHANNEL_ENABLE_DP0},
> + {ACP_SW_AUDIO1_RX_FRAME_FORMAT, ACP_SW_AUDIO1_RX_SAMPLEINTERVAL, ACP_SW_AUDIO1_RX_HCTRL,
> + ACP_SW_AUDIO1_RX_OFFSET, ACP_SW_AUDIO1_RX_CHANNEL_ENABLE_DP0},
> + {ACP_SW_AUDIO2_RX_FRAME_FORMAT, ACP_SW_AUDIO2_RX_SAMPLEINTERVAL, ACP_SW_AUDIO2_RX_HCTRL,
> + ACP_SW_AUDIO2_RX_OFFSET, ACP_SW_AUDIO2_RX_CHANNEL_ENABLE_DP0},
> +};
> +
> static u32 sdw_manager_reg_mask_array[AMD_SDW_MAX_MANAGER_COUNT] = {
> AMD_SDW0_EXT_INTR_MASK,
> AMD_SDW1_EXT_INTR_MASK
> diff --git a/include/linux/soundwire/sdw_amd.h b/include/linux/soundwire/sdw_amd.h
> index 799f8578137b..6b839987f14c 100644
> --- a/include/linux/soundwire/sdw_amd.h
> +++ b/include/linux/soundwire/sdw_amd.h
> @@ -28,6 +28,8 @@
> #define ACP_SDW1 1
> #define AMD_SDW_MAX_MANAGER_COUNT 2
> #define ACP63_PCI_REV_ID 0x63
> +#define ACP70_PCI_REV_ID 0x70
> +#define ACP71_PCI_REV_ID 0x71
>
> struct acp_sdw_pdata {
> u16 instance;
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 4/5] soundwire: amd: add soundwire host wake interrupt enable/disable sequence
2024-12-25 7:23 [PATCH 0/5] soundwire: amd: code improvements and new platform Vijendar Mukunda
` (2 preceding siblings ...)
2024-12-25 7:23 ` [PATCH 3/5] soundwire: amd: add support for ACP7.0 & ACP7.1 platforms Vijendar Mukunda
@ 2024-12-25 7:23 ` Vijendar Mukunda
2024-12-25 7:24 ` [PATCH 5/5] soundwire: amd: clear soundwire pme wake status Vijendar Mukunda
2024-12-25 7:33 ` [PATCH 0/5] soundwire: amd: code improvements and new platform Mukunda,Vijendar
5 siblings, 0 replies; 8+ messages in thread
From: Vijendar Mukunda @ 2024-12-25 7:23 UTC (permalink / raw)
To: vkoul
Cc: yung-chuan.liao, pierre-louis.bossart, sanyog.r.kale,
Basavaraj.Hiregoudar, Sunil-kumar.Dommati, venkataprasad.potturu,
Mario.Limonciello, linux-sound, linux-kernel, alsa-devel,
Vijendar Mukunda
SoundWire host wake interrupt will be asserted based on below
pre-conditions for ACP7.0 & ACP7.1 platforms for SoundWire poweroff mode.
- ACP device should be in D0 state.
- SoundWire manager instance should be in D3 state.
- SoundWire manager device state should be set to D3.
Implement code changes to enable/disable SoundWire host wake mask and
SoundWire device state for ACP7.0 & ACP7.1 platforms for SoundWire
poweroff mode as mentioned below.
- Enable SoundWire host wake mask during runtime suspend sequence.
- Disable SoundWire host wake mask during resume sequence.
- Set the SoundWire device state to D3 during runtime suspend sequence and
set the device state to D0 state during resume sequence by programming
'AMD_SDW_DEVICE_STATE' register.
Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
---
drivers/soundwire/amd_manager.c | 45 +++++++++++++++++++++++++++++++++
drivers/soundwire/amd_manager.h | 7 +++++
2 files changed, 52 insertions(+)
diff --git a/drivers/soundwire/amd_manager.c b/drivers/soundwire/amd_manager.c
index 9eb8d345b527..6f9d9f765a20 100644
--- a/drivers/soundwire/amd_manager.c
+++ b/drivers/soundwire/amd_manager.c
@@ -143,6 +143,47 @@ static void amd_sdw_wake_enable(struct amd_sdw_manager *amd_manager, bool enable
writel(wake_ctrl, amd_manager->mmio + ACP_SW_STATE_CHANGE_STATUS_MASK_8TO11);
}
+static int amd_sdw_host_wake_enable(struct amd_sdw_manager *amd_manager, bool enable)
+{
+ u32 intr_cntl1;
+ u32 sdw_host_wake_irq_mask;
+ u32 sdw_dev_state_mask;
+ u32 target_dev_state;
+ u32 sdw_dev_state;
+
+ if (!amd_manager->wake_en_mask)
+ return 0;
+
+ switch (amd_manager->instance) {
+ case ACP_SDW0:
+ sdw_host_wake_irq_mask = AMD_SDW0_HOST_WAKE_INTR_MASK;
+ sdw_dev_state_mask = AMD_SDW0_DEVICE_STATE_MASK;
+ break;
+ case ACP_SDW1:
+ sdw_host_wake_irq_mask = AMD_SDW1_HOST_WAKE_INTR_MASK;
+ sdw_dev_state_mask = AMD_SDW1_DEVICE_STATE_MASK;
+ break;
+ default:
+ return -EINVAL;
+ }
+
+ intr_cntl1 = readl(amd_manager->acp_mmio + ACP_EXTERNAL_INTR_CNTL(ACP_SDW1));
+ if (enable) {
+ intr_cntl1 |= sdw_host_wake_irq_mask;
+ target_dev_state = AMD_SDW_DEVICE_STATE_D3;
+ } else {
+ intr_cntl1 &= ~sdw_host_wake_irq_mask;
+ target_dev_state = AMD_SDW_DEVICE_STATE_D0;
+ }
+ writel(intr_cntl1, amd_manager->acp_mmio + ACP_EXTERNAL_INTR_CNTL(ACP_SDW1));
+ sdw_dev_state = readl(amd_manager->acp_mmio + AMD_SDW_DEVICE_STATE);
+ amd_updatel(amd_manager->acp_mmio, AMD_SDW_DEVICE_STATE, sdw_dev_state_mask,
+ target_dev_state);
+ sdw_dev_state = readl(amd_manager->acp_mmio + AMD_SDW_DEVICE_STATE);
+ dev_dbg(amd_manager->dev, "AMD_SDW_DEVICE_STATE:0x%x\n", sdw_dev_state);
+ return 0;
+}
+
static void amd_sdw_ctl_word_prep(u32 *lower_word, u32 *upper_word, struct sdw_msg *msg,
int cmd_offset)
{
@@ -1191,6 +1232,8 @@ static int __maybe_unused amd_suspend_runtime(struct device *dev)
return amd_sdw_clock_stop(amd_manager);
} else if (amd_manager->power_mode_mask & AMD_SDW_POWER_OFF_MODE) {
amd_sdw_wake_enable(amd_manager, true);
+ if (amd_manager->acp_rev >= ACP70_PCI_REV_ID)
+ amd_sdw_host_wake_enable(amd_manager, true);
ret = amd_sdw_clock_stop(amd_manager);
if (ret)
return ret;
@@ -1217,6 +1260,8 @@ static int __maybe_unused amd_resume_runtime(struct device *dev)
return amd_sdw_clock_stop_exit(amd_manager);
} else if (amd_manager->power_mode_mask & AMD_SDW_POWER_OFF_MODE) {
writel(0x00, amd_manager->acp_mmio + ACP_SW_WAKE_EN(amd_manager->instance));
+ if (amd_manager->acp_rev >= ACP70_PCI_REV_ID)
+ amd_sdw_host_wake_enable(amd_manager, false);
val = readl(amd_manager->mmio + ACP_SW_CLK_RESUME_CTRL);
if (val) {
val |= AMD_SDW_CLK_RESUME_REQ;
diff --git a/drivers/soundwire/amd_manager.h b/drivers/soundwire/amd_manager.h
index 30244a31c21c..18faef593865 100644
--- a/drivers/soundwire/amd_manager.h
+++ b/drivers/soundwire/amd_manager.h
@@ -194,6 +194,13 @@
#define AMD_SDW_CLK_RESUME_DONE 3
#define AMD_SDW_WAKE_STAT_MASK BIT(16)
#define AMD_SDW_WAKE_INTR_MASK BIT(16)
+#define AMD_SDW0_HOST_WAKE_INTR_MASK BIT(22)
+#define AMD_SDW1_HOST_WAKE_INTR_MASK BIT(23)
+#define AMD_SDW_DEVICE_STATE 0x1430
+#define AMD_SDW0_DEVICE_STATE_MASK 3
+#define AMD_SDW1_DEVICE_STATE_MASK 0xc
+#define AMD_SDW_DEVICE_STATE_D0 0
+#define AMD_SDW_DEVICE_STATE_D3 3
static u32 amd_sdw_freq_tbl[AMD_SDW_MAX_FREQ_NUM] = {
AMD_SDW_DEFAULT_CLK_FREQ,
--
2.34.1
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH 5/5] soundwire: amd: clear soundwire pme wake status
2024-12-25 7:23 [PATCH 0/5] soundwire: amd: code improvements and new platform Vijendar Mukunda
` (3 preceding siblings ...)
2024-12-25 7:23 ` [PATCH 4/5] soundwire: amd: add soundwire host wake interrupt enable/disable sequence Vijendar Mukunda
@ 2024-12-25 7:24 ` Vijendar Mukunda
2024-12-25 7:33 ` [PATCH 0/5] soundwire: amd: code improvements and new platform Mukunda,Vijendar
5 siblings, 0 replies; 8+ messages in thread
From: Vijendar Mukunda @ 2024-12-25 7:24 UTC (permalink / raw)
To: vkoul
Cc: yung-chuan.liao, pierre-louis.bossart, sanyog.r.kale,
Basavaraj.Hiregoudar, Sunil-kumar.Dommati, venkataprasad.potturu,
Mario.Limonciello, linux-sound, linux-kernel, alsa-devel,
Vijendar Mukunda
Clear the SoundWire PME wake status during resume sequence for
ACP7.0 & ACP7.1 platforms.
Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
---
drivers/soundwire/amd_manager.c | 33 ++++++++++++++++++++++++++++++++-
drivers/soundwire/amd_manager.h | 2 ++
2 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/drivers/soundwire/amd_manager.c b/drivers/soundwire/amd_manager.c
index 6f9d9f765a20..8b1cb07e8aac 100644
--- a/drivers/soundwire/amd_manager.c
+++ b/drivers/soundwire/amd_manager.c
@@ -1132,6 +1132,28 @@ static int amd_sdw_clock_stop_exit(struct amd_sdw_manager *amd_manager)
return 0;
}
+static int amd_sdw_clear_pme_wake_status(struct amd_sdw_manager *amd_manager)
+{
+ u32 pme_stat, val;
+
+ switch (amd_manager->instance) {
+ case ACP_SDW0:
+ pme_stat = AMD_SDW0_PME_STAT;
+ break;
+ case ACP_SDW1:
+ pme_stat = AMD_SDW1_PME_STAT;
+ break;
+ default:
+ return -EINVAL;
+ }
+ val = readl(amd_manager->acp_mmio + ACP_EXTERNAL_INTR_STAT(ACP_SDW1));
+ if (val & pme_stat)
+ writel(pme_stat, amd_manager->acp_mmio + ACP_EXTERNAL_INTR_STAT(ACP_SDW1));
+ val = readl(amd_manager->acp_mmio + ACP_EXTERNAL_INTR_STAT(ACP_SDW1));
+ dev_dbg(amd_manager->dev, "ACP_EXTERNAL_INTR_STAT1 : 0x%x\n", val);
+ return 0;
+}
+
static int amd_resume_child_device(struct device *dev, void *data)
{
struct sdw_slave *slave = dev_to_sdw_dev(dev);
@@ -1257,11 +1279,20 @@ static int __maybe_unused amd_resume_runtime(struct device *dev)
}
if (amd_manager->power_mode_mask & AMD_SDW_CLK_STOP_MODE) {
+ if (amd_manager->acp_rev >= ACP70_PCI_REV_ID) {
+ ret = amd_sdw_clear_pme_wake_status(amd_manager);
+ if (ret)
+ return ret;
+ }
return amd_sdw_clock_stop_exit(amd_manager);
} else if (amd_manager->power_mode_mask & AMD_SDW_POWER_OFF_MODE) {
writel(0x00, amd_manager->acp_mmio + ACP_SW_WAKE_EN(amd_manager->instance));
- if (amd_manager->acp_rev >= ACP70_PCI_REV_ID)
+ if (amd_manager->acp_rev >= ACP70_PCI_REV_ID) {
amd_sdw_host_wake_enable(amd_manager, false);
+ ret = amd_sdw_clear_pme_wake_status(amd_manager);
+ if (ret)
+ return ret;
+ }
val = readl(amd_manager->mmio + ACP_SW_CLK_RESUME_CTRL);
if (val) {
val |= AMD_SDW_CLK_RESUME_REQ;
diff --git a/drivers/soundwire/amd_manager.h b/drivers/soundwire/amd_manager.h
index 18faef593865..4f7e236b2e34 100644
--- a/drivers/soundwire/amd_manager.h
+++ b/drivers/soundwire/amd_manager.h
@@ -201,6 +201,8 @@
#define AMD_SDW1_DEVICE_STATE_MASK 0xc
#define AMD_SDW_DEVICE_STATE_D0 0
#define AMD_SDW_DEVICE_STATE_D3 3
+#define AMD_SDW0_PME_STAT BIT(26)
+#define AMD_SDW1_PME_STAT BIT(27)
static u32 amd_sdw_freq_tbl[AMD_SDW_MAX_FREQ_NUM] = {
AMD_SDW_DEFAULT_CLK_FREQ,
--
2.34.1
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 0/5] soundwire: amd: code improvements and new platform
2024-12-25 7:23 [PATCH 0/5] soundwire: amd: code improvements and new platform Vijendar Mukunda
` (4 preceding siblings ...)
2024-12-25 7:24 ` [PATCH 5/5] soundwire: amd: clear soundwire pme wake status Vijendar Mukunda
@ 2024-12-25 7:33 ` Mukunda,Vijendar
5 siblings, 0 replies; 8+ messages in thread
From: Mukunda,Vijendar @ 2024-12-25 7:33 UTC (permalink / raw)
To: vkoul
Cc: yung-chuan.liao, pierre-louis.bossart, sanyog.r.kale,
Basavaraj.Hiregoudar, Sunil-kumar.Dommati, venkataprasad.potturu,
Mario.Limonciello, linux-sound, linux-kernel, alsa-devel
On 25/12/24 12:53, Vijendar Mukunda wrote:
> This patch series consists of code improvements and new platform support
> for ACP7.0 & ACP7.1 platforms.
Subject line was not posted correctly.
It should be "soundwire: amd: code improvements and new platform support addition"
>
> Vijendar Mukunda (5):
> soundwire: amd: change the soundwire wake enable/disable sequence
> soundwire: amd: add debug log for soundwire wake event
> soundwire: amd: add support for ACP7.0 & ACP7.1 platforms
> soundwire: amd: add soundwire host wake interrupt enable/disable
> sequence
> soundwire: amd: clear soundwire pme wake status
>
> drivers/soundwire/amd_manager.c | 102 ++++++++++++++++++++++++++++++
> drivers/soundwire/amd_manager.h | 27 ++++++++
> include/linux/soundwire/sdw_amd.h | 2 +
> 3 files changed, 131 insertions(+)
>
^ permalink raw reply [flat|nested] 8+ messages in thread