Skip to content

Commit 3df7528

Browse files
vijendarmukundavinodkoul
authored andcommitted
soundwire: amd: add soundwire host wake interrupt enable/disable sequence
For wake event, SoundWire host wake interrupt will be asserted based on below pre-conditions for ACP7.0 & ACP7.1 platforms. - ACP device should be in D0 state. - SoundWire manager instance should be in D3 state. - SoundWire manager device state should be set to D3. - ACP_PME_EN should be set to 1. Implement code changes to enable/disable SoundWire host wake interrupt mask during suspend and resume as per design flow for ACP7.0 & ACP7.1 platforms. Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com> Link: https://lore.kernel.org/r/20250207065841.4718-7-Vijendar.Mukunda@amd.com Signed-off-by: Vinod Koul <vkoul@kernel.org>
1 parent 5818ed3 commit 3df7528

File tree

2 files changed

+60
-0
lines changed

2 files changed

+60
-0
lines changed

drivers/soundwire/amd_manager.c

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,34 @@ static int amd_sdw_set_device_state(struct amd_sdw_manager *amd_manager, u32 tar
166166
return 0;
167167
}
168168

169+
static int amd_sdw_host_wake_enable(struct amd_sdw_manager *amd_manager, bool enable)
170+
{
171+
u32 intr_cntl1;
172+
u32 sdw_host_wake_irq_mask;
173+
174+
if (!amd_manager->wake_en_mask)
175+
return 0;
176+
177+
switch (amd_manager->instance) {
178+
case ACP_SDW0:
179+
sdw_host_wake_irq_mask = AMD_SDW0_HOST_WAKE_INTR_MASK;
180+
break;
181+
case ACP_SDW1:
182+
sdw_host_wake_irq_mask = AMD_SDW1_HOST_WAKE_INTR_MASK;
183+
break;
184+
default:
185+
return -EINVAL;
186+
}
187+
188+
intr_cntl1 = readl(amd_manager->acp_mmio + ACP_EXTERNAL_INTR_CNTL(ACP_SDW1));
189+
if (enable)
190+
intr_cntl1 |= sdw_host_wake_irq_mask;
191+
else
192+
intr_cntl1 &= ~sdw_host_wake_irq_mask;
193+
writel(intr_cntl1, amd_manager->acp_mmio + ACP_EXTERNAL_INTR_CNTL(ACP_SDW1));
194+
return 0;
195+
}
196+
169197
static void amd_sdw_ctl_word_prep(u32 *lower_word, u32 *upper_word, struct sdw_msg *msg,
170198
int cmd_offset)
171199
{
@@ -1182,11 +1210,21 @@ static int __maybe_unused amd_suspend(struct device *dev)
11821210

11831211
if (amd_manager->power_mode_mask & AMD_SDW_CLK_STOP_MODE) {
11841212
amd_sdw_wake_enable(amd_manager, false);
1213+
if (amd_manager->acp_rev >= ACP70_PCI_REV_ID) {
1214+
ret = amd_sdw_host_wake_enable(amd_manager, false);
1215+
if (ret)
1216+
return ret;
1217+
}
11851218
ret = amd_sdw_clock_stop(amd_manager);
11861219
if (ret)
11871220
return ret;
11881221
} else if (amd_manager->power_mode_mask & AMD_SDW_POWER_OFF_MODE) {
11891222
amd_sdw_wake_enable(amd_manager, false);
1223+
if (amd_manager->acp_rev >= ACP70_PCI_REV_ID) {
1224+
ret = amd_sdw_host_wake_enable(amd_manager, false);
1225+
if (ret)
1226+
return ret;
1227+
}
11901228
/*
11911229
* As per hardware programming sequence on AMD platforms,
11921230
* clock stop should be invoked first before powering-off
@@ -1220,11 +1258,21 @@ static int __maybe_unused amd_suspend_runtime(struct device *dev)
12201258
}
12211259
if (amd_manager->power_mode_mask & AMD_SDW_CLK_STOP_MODE) {
12221260
amd_sdw_wake_enable(amd_manager, true);
1261+
if (amd_manager->acp_rev >= ACP70_PCI_REV_ID) {
1262+
ret = amd_sdw_host_wake_enable(amd_manager, true);
1263+
if (ret)
1264+
return ret;
1265+
}
12231266
ret = amd_sdw_clock_stop(amd_manager);
12241267
if (ret)
12251268
return ret;
12261269
} else if (amd_manager->power_mode_mask & AMD_SDW_POWER_OFF_MODE) {
12271270
amd_sdw_wake_enable(amd_manager, true);
1271+
if (amd_manager->acp_rev >= ACP70_PCI_REV_ID) {
1272+
ret = amd_sdw_host_wake_enable(amd_manager, true);
1273+
if (ret)
1274+
return ret;
1275+
}
12281276
ret = amd_sdw_clock_stop(amd_manager);
12291277
if (ret)
12301278
return ret;
@@ -1265,8 +1313,18 @@ static int __maybe_unused amd_resume_runtime(struct device *dev)
12651313
ret = amd_sdw_clock_stop_exit(amd_manager);
12661314
if (ret)
12671315
return ret;
1316+
if (amd_manager->acp_rev >= ACP70_PCI_REV_ID) {
1317+
ret = amd_sdw_host_wake_enable(amd_manager, false);
1318+
if (ret)
1319+
return ret;
1320+
}
12681321
} else if (amd_manager->power_mode_mask & AMD_SDW_POWER_OFF_MODE) {
12691322
writel(0x00, amd_manager->acp_mmio + ACP_SW_WAKE_EN(amd_manager->instance));
1323+
if (amd_manager->acp_rev >= ACP70_PCI_REV_ID) {
1324+
ret = amd_sdw_host_wake_enable(amd_manager, false);
1325+
if (ret)
1326+
return ret;
1327+
}
12701328
val = readl(amd_manager->mmio + ACP_SW_CLK_RESUME_CTRL);
12711329
if (val) {
12721330
val |= AMD_SDW_CLK_RESUME_REQ;

drivers/soundwire/amd_manager.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,8 @@
194194
#define AMD_SDW_CLK_RESUME_DONE 3
195195
#define AMD_SDW_WAKE_STAT_MASK BIT(16)
196196
#define AMD_SDW_WAKE_INTR_MASK BIT(16)
197+
#define AMD_SDW0_HOST_WAKE_INTR_MASK BIT(22)
198+
#define AMD_SDW1_HOST_WAKE_INTR_MASK BIT(23)
197199
#define AMD_SDW_DEVICE_STATE 0x1430
198200
#define AMD_SDW0_DEVICE_STATE_MASK GENMASK(1, 0)
199201
#define AMD_SDW1_DEVICE_STATE_MASK GENMASK(3, 2)

0 commit comments

Comments
 (0)