* [PATCH V2 1/9] soundwire: amd: rename AMD_SDW_MAX_MANAGER_COUNT macro
2026-10-13 9:58 [PATCH V2 0/9] soundwire: amd: introduce hw_ops dispatch and split driver into revision-specific files Vijendar Mukunda
@ 2026-10-13 9:58 ` Vijendar Mukunda
2026-10-13 9:58 ` [PATCH V2 2/9] soundwire: amd: allocate pdevinfo and sdw_pdata by ACP revision in probe Vijendar Mukunda
` (7 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Vijendar Mukunda @ 2026-10-13 9:58 UTC (permalink / raw)
To: vkoul
Cc: broonie, alsa-devel, yung-chuan.liao, pierre-louis.bossart,
Basavaraj.Hiregoudar, Sunil-kumar.Dommati, venkataprasad.potturu,
Syed.SabaKareem, Mario.Limonciello, Richard.Gong,
Vijendar.Mukunda, linux-sound, linux-kernel
Rename AMD_SDW_MAX_MANAGER_COUNT to AMD_ACP63_SDW_MAX_MANAGER_COUNT and
add a comment clarifying that ACP6.3/7.0/7.1/7.2 all expose two
SoundWire manager instances. The rename makes the platform scope
explicit and matches the acp63 prefix convention used for the shared
ACP6.3-base hardware throughout the driver.
Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
---
drivers/soundwire/amd_manager.c | 2 +-
drivers/soundwire/amd_manager.h | 2 +-
include/linux/soundwire/sdw_amd.h | 5 +++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/soundwire/amd_manager.c b/drivers/soundwire/amd_manager.c
index beb982b17fa9..c4eb97e46807 100644
--- a/drivers/soundwire/amd_manager.c
+++ b/drivers/soundwire/amd_manager.c
@@ -486,7 +486,7 @@ static int amd_sdw_compute_params(struct sdw_bus *bus, struct sdw_stream_runtime
int port_bo, hstart, hstop, sample_int;
unsigned int rate, bps, channels;
unsigned int stream_slot_size, max_slots;
- static unsigned int next_offset[AMD_SDW_MAX_MANAGER_COUNT] = {1};
+ static unsigned int next_offset[AMD_ACP63_SDW_MAX_MANAGER_COUNT] = {1};
unsigned int inst_id = amd_manager->instance;
port_bo = 0;
diff --git a/drivers/soundwire/amd_manager.h b/drivers/soundwire/amd_manager.h
index 88cf8a426a0c..76ecaceb3ee5 100644
--- a/drivers/soundwire/amd_manager.h
+++ b/drivers/soundwire/amd_manager.h
@@ -266,7 +266,7 @@ static struct sdw_manager_dp_reg acp70_sdw_dp_reg[AMD_ACP70_SDW_MAX_DAI] = {
ACP_SW_AUDIO2_RX_OFFSET, ACP_SW_AUDIO2_RX_CHANNEL_ENABLE_DP0},
};
-static u32 sdw_manager_reg_mask_array[AMD_SDW_MAX_MANAGER_COUNT] = {
+static u32 sdw_manager_reg_mask_array[AMD_ACP63_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 d0e97007e3ff..40ba84c3b2cc 100644
--- a/include/linux/soundwire/sdw_amd.h
+++ b/include/linux/soundwire/sdw_amd.h
@@ -26,7 +26,8 @@
#define AMD_SDW_POWER_OFF_MODE 2
#define ACP_SDW0 0
#define ACP_SDW1 1
-#define AMD_SDW_MAX_MANAGER_COUNT 2
+/* ACP6.3/7.0/7.1/7.2 all expose two SoundWire manager instances */
+#define AMD_ACP63_SDW_MAX_MANAGER_COUNT 2
#define ACP63_PCI_REV_ID 0x63
#define ACP70_PCI_REV_ID 0x70
#define ACP71_PCI_REV_ID 0x71
@@ -138,7 +139,7 @@ struct sdw_amd_acpi_info {
struct sdw_amd_ctx {
int count;
u32 link_mask;
- struct platform_device *pdev[AMD_SDW_MAX_MANAGER_COUNT];
+ struct platform_device *pdev[AMD_ACP63_SDW_MAX_MANAGER_COUNT];
struct sdw_peripherals *peripherals;
};
--
2.48.1
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH V2 2/9] soundwire: amd: allocate pdevinfo and sdw_pdata by ACP revision in probe
2026-10-13 9:58 [PATCH V2 0/9] soundwire: amd: introduce hw_ops dispatch and split driver into revision-specific files Vijendar Mukunda
2026-10-13 9:58 ` [PATCH V2 1/9] soundwire: amd: rename AMD_SDW_MAX_MANAGER_COUNT macro Vijendar Mukunda
@ 2026-10-13 9:58 ` Vijendar Mukunda
2026-10-13 9:58 ` [PATCH V2 3/9] soundwire: amd: allocate sdw_amd_ctx pdev array dynamically Vijendar Mukunda
` (6 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Vijendar Mukunda @ 2026-10-13 9:58 UTC (permalink / raw)
To: vkoul
Cc: broonie, alsa-devel, yung-chuan.liao, pierre-louis.bossart,
Basavaraj.Hiregoudar, Sunil-kumar.Dommati, venkataprasad.potturu,
Syed.SabaKareem, Mario.Limonciello, Richard.Gong,
Vijendar.Mukunda, linux-sound, linux-kernel
Determine the SoundWire manager count from the ACP revision and allocate
the pdevinfo and sdw_pdata arrays dynamically instead of using fixed-size
stack arrays.
Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
---
drivers/soundwire/amd_init.c | 37 ++++++++++++++++++++++++++++++++----
1 file changed, 33 insertions(+), 4 deletions(-)
diff --git a/drivers/soundwire/amd_init.c b/drivers/soundwire/amd_init.c
index 88004d59322e..15d117172bdb 100644
--- a/drivers/soundwire/amd_init.c
+++ b/drivers/soundwire/amd_init.c
@@ -68,12 +68,12 @@ static int sdw_amd_cleanup(struct sdw_amd_ctx *ctx)
static struct sdw_amd_ctx *sdw_amd_probe_controller(struct sdw_amd_res *res)
{
+ struct platform_device_info *pdevinfo;
+ struct acp_sdw_pdata *sdw_pdata;
struct sdw_amd_ctx *ctx;
struct acpi_device *adev;
- struct acp_sdw_pdata sdw_pdata[2];
- struct platform_device_info pdevinfo[2];
u32 link_mask;
- int count, index;
+ int count, index, max_manager_count;
int ret;
if (!res)
@@ -88,6 +88,18 @@ static struct sdw_amd_ctx *sdw_amd_probe_controller(struct sdw_amd_res *res)
count = res->count;
dev_dbg(&adev->dev, "Creating %d SDW Link devices\n", count);
+ switch (res->acp_rev) {
+ case ACP63_PCI_REV_ID:
+ case ACP70_PCI_REV_ID:
+ case ACP71_PCI_REV_ID:
+ case ACP72_PCI_REV_ID:
+ max_manager_count = AMD_ACP63_SDW_MAX_MANAGER_COUNT;
+ break;
+ default:
+ dev_err(&adev->dev, "unsupported ACP revision: 0x%x\n", res->acp_rev);
+ return NULL;
+ }
+
ret = amd_enable_sdw_pads(res->mmio_base, res->link_mask, res->parent);
if (ret)
return NULL;
@@ -112,7 +124,20 @@ static struct sdw_amd_ctx *sdw_amd_probe_controller(struct sdw_amd_res *res)
sdw_res->flags = IORESOURCE_MEM;
sdw_res->start = res->addr;
sdw_res->end = res->addr + res->reg_range;
- memset(&pdevinfo, 0, sizeof(pdevinfo));
+
+ sdw_pdata = kcalloc(max_manager_count, sizeof(*sdw_pdata), GFP_KERNEL);
+ if (!sdw_pdata) {
+ kfree(ctx);
+ return NULL;
+ }
+
+ pdevinfo = kcalloc(max_manager_count, sizeof(*pdevinfo), GFP_KERNEL);
+ if (!pdevinfo) {
+ kfree(sdw_pdata);
+ kfree(ctx);
+ return NULL;
+ }
+
link_mask = ctx->link_mask;
for (index = 0; index < count; index++) {
if (!(link_mask & BIT(index)))
@@ -133,6 +158,8 @@ static struct sdw_amd_ctx *sdw_amd_probe_controller(struct sdw_amd_res *res)
if (IS_ERR(ctx->pdev[index]))
goto err;
}
+ kfree(pdevinfo);
+ kfree(sdw_pdata);
return ctx;
err:
while (index--) {
@@ -142,6 +169,8 @@ static struct sdw_amd_ctx *sdw_amd_probe_controller(struct sdw_amd_res *res)
platform_device_unregister(ctx->pdev[index]);
}
+ kfree(pdevinfo);
+ kfree(sdw_pdata);
kfree(ctx);
return NULL;
}
--
2.48.1
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH V2 3/9] soundwire: amd: allocate sdw_amd_ctx pdev array dynamically
2026-10-13 9:58 [PATCH V2 0/9] soundwire: amd: introduce hw_ops dispatch and split driver into revision-specific files Vijendar Mukunda
2026-10-13 9:58 ` [PATCH V2 1/9] soundwire: amd: rename AMD_SDW_MAX_MANAGER_COUNT macro Vijendar Mukunda
2026-10-13 9:58 ` [PATCH V2 2/9] soundwire: amd: allocate pdevinfo and sdw_pdata by ACP revision in probe Vijendar Mukunda
@ 2026-10-13 9:58 ` Vijendar Mukunda
2026-10-13 9:58 ` [PATCH V2 4/9] soundwire: amd: rename hardware backend symbols to amd_acp63_*() prefix Vijendar Mukunda
` (5 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Vijendar Mukunda @ 2026-10-13 9:58 UTC (permalink / raw)
To: vkoul
Cc: broonie, alsa-devel, yung-chuan.liao, pierre-louis.bossart,
Basavaraj.Hiregoudar, Sunil-kumar.Dommati, venkataprasad.potturu,
Syed.SabaKareem, Mario.Limonciello, Richard.Gong,
Vijendar.Mukunda, linux-sound, linux-kernel
Replace the fixed-size pdev[AMD_ACP63_SDW_MAX_MANAGER_COUNT] member of
struct sdw_amd_ctx with a dynamically allocated pointer array. The array
is sized by max_manager_count via kcalloc() in sdw_amd_probe_controller()
and freed on all error paths and in sdw_amd_cleanup().
Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
---
drivers/soundwire/amd_init.c | 12 ++++++++++++
include/linux/soundwire/sdw_amd.h | 2 +-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/drivers/soundwire/amd_init.c b/drivers/soundwire/amd_init.c
index 15d117172bdb..94d766b3f8af 100644
--- a/drivers/soundwire/amd_init.c
+++ b/drivers/soundwire/amd_init.c
@@ -62,6 +62,7 @@ static int sdw_amd_cleanup(struct sdw_amd_ctx *ctx)
continue;
platform_device_unregister(ctx->pdev[i]);
}
+ kfree(ctx->pdev);
return 0;
}
@@ -116,8 +117,16 @@ static struct sdw_amd_ctx *sdw_amd_probe_controller(struct sdw_amd_res *res)
ctx->count = count;
ctx->link_mask = res->link_mask;
+
+ ctx->pdev = kcalloc(max_manager_count, sizeof(*ctx->pdev), GFP_KERNEL);
+ if (!ctx->pdev) {
+ kfree(ctx);
+ return NULL;
+ }
+
struct resource *sdw_res __free(kfree) = kzalloc_obj(*sdw_res);
if (!sdw_res) {
+ kfree(ctx->pdev);
kfree(ctx);
return NULL;
}
@@ -127,6 +136,7 @@ static struct sdw_amd_ctx *sdw_amd_probe_controller(struct sdw_amd_res *res)
sdw_pdata = kcalloc(max_manager_count, sizeof(*sdw_pdata), GFP_KERNEL);
if (!sdw_pdata) {
+ kfree(ctx->pdev);
kfree(ctx);
return NULL;
}
@@ -134,6 +144,7 @@ static struct sdw_amd_ctx *sdw_amd_probe_controller(struct sdw_amd_res *res)
pdevinfo = kcalloc(max_manager_count, sizeof(*pdevinfo), GFP_KERNEL);
if (!pdevinfo) {
kfree(sdw_pdata);
+ kfree(ctx->pdev);
kfree(ctx);
return NULL;
}
@@ -171,6 +182,7 @@ static struct sdw_amd_ctx *sdw_amd_probe_controller(struct sdw_amd_res *res)
kfree(pdevinfo);
kfree(sdw_pdata);
+ kfree(ctx->pdev);
kfree(ctx);
return NULL;
}
diff --git a/include/linux/soundwire/sdw_amd.h b/include/linux/soundwire/sdw_amd.h
index 40ba84c3b2cc..476de2c30389 100644
--- a/include/linux/soundwire/sdw_amd.h
+++ b/include/linux/soundwire/sdw_amd.h
@@ -139,7 +139,7 @@ struct sdw_amd_acpi_info {
struct sdw_amd_ctx {
int count;
u32 link_mask;
- struct platform_device *pdev[AMD_ACP63_SDW_MAX_MANAGER_COUNT];
+ struct platform_device **pdev;
struct sdw_peripherals *peripherals;
};
--
2.48.1
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH V2 4/9] soundwire: amd: rename hardware backend symbols to amd_acp63_*() prefix
2026-10-13 9:58 [PATCH V2 0/9] soundwire: amd: introduce hw_ops dispatch and split driver into revision-specific files Vijendar Mukunda
` (2 preceding siblings ...)
2026-10-13 9:58 ` [PATCH V2 3/9] soundwire: amd: allocate sdw_amd_ctx pdev array dynamically Vijendar Mukunda
@ 2026-10-13 9:58 ` Vijendar Mukunda
2026-10-13 9:58 ` [PATCH V2 5/9] soundwire: amd: remove unused AMD_SDW_MAX_FREQ_NUM define Vijendar Mukunda
` (4 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Vijendar Mukunda @ 2026-10-13 9:58 UTC (permalink / raw)
To: vkoul
Cc: broonie, alsa-devel, yung-chuan.liao, pierre-louis.bossart,
Basavaraj.Hiregoudar, Sunil-kumar.Dommati, venkataprasad.potturu,
Syed.SabaKareem, Mario.Limonciello, Richard.Gong,
Vijendar.Mukunda, linux-sound, linux-kernel
In preparation for the hw_ops dispatch framework, rename the
revision-specific hardware-access functions, op-table instances and
the register-offset constant in amd_manager.c / amd_manager.h to the
amd_acp63_*() / ACP63_* prefix. The amd_acp63_ prefix denotes ACP6.3
as the base revision of this shared IP block, not ACP6.3-only support.
Generic SoundWire protocol helpers (amd_sdw_xfer_msg(), amd_prop_read(),
amd_sdw_clock_stop() and related bus helpers) and the top-level
work_struct handlers (amd_sdw_irq_thread(),
amd_sdw_update_slave_status_work()) intentionally keep the amd_sdw_*()
prefix; inline comments mark them as revision-independent. All other
amd_sdw_*() and amd_*() functions in the hardware path are renamed,
including amd_acp63_sdw_process_wake_event().
Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
---
drivers/soundwire/amd_manager.c | 158 +++++++++++++++++---------------
drivers/soundwire/amd_manager.h | 7 +-
2 files changed, 92 insertions(+), 73 deletions(-)
diff --git a/drivers/soundwire/amd_manager.c b/drivers/soundwire/amd_manager.c
index c4eb97e46807..c585f7d529c0 100644
--- a/drivers/soundwire/amd_manager.c
+++ b/drivers/soundwire/amd_manager.c
@@ -27,7 +27,7 @@
#define to_amd_sdw(b) container_of(b, struct amd_sdw_manager, bus)
-static int amd_sdw_clk_init_ctrl(struct amd_sdw_manager *amd_manager)
+static int amd_acp63_sdw_clk_init_ctrl(struct amd_sdw_manager *amd_manager)
{
struct sdw_bus *bus = &amd_manager->bus;
struct sdw_master_prop *prop = &bus->prop;
@@ -57,7 +57,7 @@ static int amd_sdw_clk_init_ctrl(struct amd_sdw_manager *amd_manager)
return 0;
}
-static int amd_init_sdw_manager(struct amd_sdw_manager *amd_manager)
+static int amd_acp63_init_sdw_manager(struct amd_sdw_manager *amd_manager)
{
u32 val;
int ret;
@@ -89,7 +89,7 @@ static int amd_init_sdw_manager(struct amd_sdw_manager *amd_manager)
AMD_SDW_TIMEOUT);
}
-static int amd_enable_sdw_manager(struct amd_sdw_manager *amd_manager)
+static int amd_acp63_enable_sdw_manager(struct amd_sdw_manager *amd_manager)
{
u32 val;
@@ -98,7 +98,7 @@ static int amd_enable_sdw_manager(struct amd_sdw_manager *amd_manager)
AMD_SDW_TIMEOUT);
}
-static int amd_disable_sdw_manager(struct amd_sdw_manager *amd_manager)
+static int amd_acp63_disable_sdw_manager(struct amd_sdw_manager *amd_manager)
{
u32 val;
@@ -115,7 +115,7 @@ static int amd_disable_sdw_manager(struct amd_sdw_manager *amd_manager)
AMD_SDW_TIMEOUT);
}
-static void amd_enable_sdw_interrupts(struct amd_sdw_manager *amd_manager)
+static void amd_acp63_enable_sdw_interrupts(struct amd_sdw_manager *amd_manager)
{
u32 val;
@@ -131,7 +131,7 @@ static void amd_enable_sdw_interrupts(struct amd_sdw_manager *amd_manager)
writel(AMD_SDW_IRQ_ERROR_MASK, amd_manager->mmio + ACP_SW_ERROR_INTR_MASK);
}
-static void amd_disable_sdw_interrupts(struct amd_sdw_manager *amd_manager)
+static void amd_acp63_disable_sdw_interrupts(struct amd_sdw_manager *amd_manager)
{
u32 irq_mask;
@@ -146,7 +146,7 @@ static void amd_disable_sdw_interrupts(struct amd_sdw_manager *amd_manager)
writel(0x00, amd_manager->mmio + ACP_SW_ERROR_INTR_MASK);
}
-static void amd_sdw_set_frameshape(struct amd_sdw_manager *amd_manager)
+static void amd_acp63_sdw_set_frameshape(struct amd_sdw_manager *amd_manager)
{
u32 frame_size;
@@ -154,7 +154,7 @@ 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)
+static void amd_acp63_sdw_wake_enable(struct amd_sdw_manager *amd_manager, bool enable)
{
u32 wake_ctrl;
@@ -167,7 +167,8 @@ 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_set_device_state(struct amd_sdw_manager *amd_manager, u32 target_device_state)
+static int amd_acp63_sdw_set_device_state(struct amd_sdw_manager *amd_manager,
+ u32 target_device_state)
{
u32 sdw_dev_state;
@@ -190,7 +191,7 @@ static int amd_sdw_set_device_state(struct amd_sdw_manager *amd_manager, u32 tar
return 0;
}
-static int amd_sdw_host_wake_enable(struct amd_sdw_manager *amd_manager, bool enable)
+static int amd_acp63_sdw_host_wake_enable(struct amd_sdw_manager *amd_manager, bool enable)
{
u32 intr_cntl1;
u32 sdw_host_wake_irq_mask;
@@ -244,8 +245,8 @@ static void amd_sdw_ctl_word_prep(u32 *lower_word, u32 *upper_word, struct sdw_m
*lower_word = lower_data;
}
-static int amd_sdw_send_cmd_get_resp(struct amd_sdw_manager *amd_manager, u32 lower_data,
- u32 upper_data, u64 *response)
+static int amd_acp63_sdw_send_cmd_get_resp(struct amd_sdw_manager *amd_manager, u32 lower_data,
+ u32 upper_data, u64 *response)
{
u32 lower_resp, upper_resp;
u32 sts;
@@ -301,7 +302,8 @@ amd_program_scp_addr(struct amd_sdw_manager *amd_manager, struct sdw_msg *msg)
scp_msg.buf = &msg->addr_page1;
scp_msg.flags = SDW_MSG_FLAG_WRITE;
amd_sdw_ctl_word_prep(&lower_data, &upper_data, &scp_msg, 0);
- if (amd_sdw_send_cmd_get_resp(amd_manager, lower_data, upper_data, &response_buf[0])) {
+ if (amd_acp63_sdw_send_cmd_get_resp(amd_manager, lower_data, upper_data,
+ &response_buf[0])) {
dev_err_ratelimited(amd_manager->dev,
"SCP_addrpage command timeout for Slave %d\n", msg->dev_num);
return SDW_CMD_TIMEOUT;
@@ -309,7 +311,8 @@ amd_program_scp_addr(struct amd_sdw_manager *amd_manager, struct sdw_msg *msg)
scp_msg.addr = SDW_SCP_ADDRPAGE2;
scp_msg.buf = &msg->addr_page2;
amd_sdw_ctl_word_prep(&lower_data, &upper_data, &scp_msg, 0);
- if (amd_sdw_send_cmd_get_resp(amd_manager, lower_data, upper_data, &response_buf[1])) {
+ if (amd_acp63_sdw_send_cmd_get_resp(amd_manager, lower_data, upper_data,
+ &response_buf[1])) {
dev_err_ratelimited(amd_manager->dev,
"SCP_addrpage command timeout for Slave %d\n", msg->dev_num);
return SDW_CMD_TIMEOUT;
@@ -374,6 +377,7 @@ static enum sdw_command_response amd_sdw_fill_msg_resp(struct amd_sdw_manager *a
return SDW_CMD_OK;
}
+/* AMD SoundWire bus helper shared across all ACP revisions. */
static unsigned int _amd_sdw_xfer_msg(struct amd_sdw_manager *amd_manager, struct sdw_msg *msg,
int cmd_offset)
{
@@ -381,7 +385,7 @@ static unsigned int _amd_sdw_xfer_msg(struct amd_sdw_manager *amd_manager, struc
u32 upper_data = 0, lower_data = 0;
amd_sdw_ctl_word_prep(&lower_data, &upper_data, msg, cmd_offset);
- if (amd_sdw_send_cmd_get_resp(amd_manager, lower_data, upper_data, &response)) {
+ if (amd_acp63_sdw_send_cmd_get_resp(amd_manager, lower_data, upper_data, &response)) {
dev_err_ratelimited(amd_manager->dev, "command timeout for Slave %d\n",
msg->dev_num);
return SDW_CMD_TIMEOUT;
@@ -389,6 +393,7 @@ static unsigned int _amd_sdw_xfer_msg(struct amd_sdw_manager *amd_manager, struc
return amd_sdw_fill_msg_resp(amd_manager, msg, response, cmd_offset);
}
+/* AMD SoundWire bus helper shared across all ACP revisions. */
static enum sdw_command_response amd_sdw_xfer_msg(struct sdw_bus *bus, struct sdw_msg *msg)
{
struct amd_sdw_manager *amd_manager = to_amd_sdw(bus);
@@ -405,6 +410,7 @@ static enum sdw_command_response amd_sdw_xfer_msg(struct sdw_bus *bus, struct sd
return SDW_CMD_OK;
}
+/* AMD SoundWire bus helper shared across all ACP revisions. */
static void amd_sdw_fill_slave_status(struct amd_sdw_manager *amd_manager, u16 index, u32 status)
{
switch (status) {
@@ -419,6 +425,7 @@ static void amd_sdw_fill_slave_status(struct amd_sdw_manager *amd_manager, u16 i
}
}
+/* AMD SoundWire bus helper shared across all ACP revisions. */
static void amd_sdw_process_ping_status(u64 response, struct amd_sdw_manager *amd_manager)
{
u64 slave_stat;
@@ -436,12 +443,12 @@ static void amd_sdw_process_ping_status(u64 response, struct amd_sdw_manager *am
}
}
-static void amd_sdw_read_and_process_ping_status(struct amd_sdw_manager *amd_manager)
+static void amd_acp63_sdw_read_and_process_ping_status(struct amd_sdw_manager *amd_manager)
{
u64 response;
mutex_lock(&amd_manager->bus.msg_lock);
- if (amd_sdw_send_cmd_get_resp(amd_manager, 0, 0, &response)) {
+ if (amd_acp63_sdw_send_cmd_get_resp(amd_manager, 0, 0, &response)) {
mutex_unlock(&amd_manager->bus.msg_lock);
dev_err_ratelimited(amd_manager->dev, "SDW%x ping status timeout\n",
amd_manager->instance);
@@ -454,7 +461,7 @@ static void amd_sdw_read_and_process_ping_status(struct amd_sdw_manager *amd_man
mutex_unlock(&amd_manager->bus.msg_lock);
}
-static u32 amd_sdw_read_ping_status(struct sdw_bus *bus)
+static u32 amd_acp63_sdw_read_ping_status(struct sdw_bus *bus)
{
struct amd_sdw_manager *amd_manager = to_amd_sdw(bus);
u64 response;
@@ -463,7 +470,7 @@ static u32 amd_sdw_read_ping_status(struct sdw_bus *bus)
/* Called by sdw_show_ping_status() which holds msg_lock. */
lockdep_assert_held(&bus->msg_lock);
- if (amd_sdw_send_cmd_get_resp(amd_manager, 0, 0, &response)) {
+ if (amd_acp63_sdw_send_cmd_get_resp(amd_manager, 0, 0, &response)) {
dev_err_ratelimited(amd_manager->dev, "SDW%x ping status timeout\n",
amd_manager->instance);
return amd_manager->ping_slave_stat == U32_MAX ? 0 : amd_manager->ping_slave_stat;
@@ -476,7 +483,7 @@ static u32 amd_sdw_read_ping_status(struct sdw_bus *bus)
return slave_stat;
}
-static int amd_sdw_compute_params(struct sdw_bus *bus, struct sdw_stream_runtime *stream)
+static int amd_acp63_sdw_compute_params(struct sdw_bus *bus, struct sdw_stream_runtime *stream)
{
struct amd_sdw_manager *amd_manager = to_amd_sdw(bus);
struct sdw_transport_data t_data = {0};
@@ -562,8 +569,8 @@ static int amd_sdw_compute_params(struct sdw_bus *bus, struct sdw_stream_runtime
return 0;
}
-static int amd_sdw_port_params(struct sdw_bus *bus, struct sdw_port_params *p_params,
- unsigned int bank)
+static int amd_acp63_sdw_port_params(struct sdw_bus *bus, struct sdw_port_params *p_params,
+ unsigned int bank)
{
struct amd_sdw_manager *amd_manager = to_amd_sdw(bus);
u32 frame_fmt_reg, dpn_frame_fmt;
@@ -599,9 +606,9 @@ static int amd_sdw_port_params(struct sdw_bus *bus, struct sdw_port_params *p_pa
return 0;
}
-static int amd_sdw_transport_params(struct sdw_bus *bus,
- struct sdw_transport_params *params,
- enum sdw_reg_bank bank)
+static int amd_acp63_sdw_transport_params(struct sdw_bus *bus,
+ struct sdw_transport_params *params,
+ enum sdw_reg_bank bank)
{
struct amd_sdw_manager *amd_manager = to_amd_sdw(bus);
u32 dpn_frame_fmt;
@@ -676,9 +683,9 @@ static int amd_sdw_transport_params(struct sdw_bus *bus,
return 0;
}
-static int amd_sdw_port_enable(struct sdw_bus *bus,
- struct sdw_enable_ch *enable_ch,
- unsigned int bank)
+static int amd_acp63_sdw_port_enable(struct sdw_bus *bus,
+ struct sdw_enable_ch *enable_ch,
+ unsigned int bank)
{
struct amd_sdw_manager *amd_manager = to_amd_sdw(bus);
u32 dpn_ch_enable;
@@ -755,6 +762,7 @@ static int sdw_master_read_amd_prop(struct sdw_bus *bus)
return 0;
}
+/* AMD SoundWire bus helper shared across all ACP revisions. */
static int amd_prop_read(struct sdw_bus *bus)
{
sdw_master_read_prop(bus);
@@ -762,16 +770,16 @@ static int amd_prop_read(struct sdw_bus *bus)
return 0;
}
-static const struct sdw_master_port_ops amd_sdw_port_ops = {
- .dpn_set_port_params = amd_sdw_port_params,
- .dpn_set_port_transport_params = amd_sdw_transport_params,
- .dpn_port_enable_ch = amd_sdw_port_enable,
+static const struct sdw_master_port_ops amd_acp63_sdw_port_ops = {
+ .dpn_set_port_params = amd_acp63_sdw_port_params,
+ .dpn_set_port_transport_params = amd_acp63_sdw_transport_params,
+ .dpn_port_enable_ch = amd_acp63_sdw_port_enable,
};
-static const struct sdw_master_ops amd_sdw_ops = {
+static const struct sdw_master_ops amd_acp63_sdw_ops = {
.read_prop = amd_prop_read,
.xfer_msg = amd_sdw_xfer_msg,
- .read_ping_status = amd_sdw_read_ping_status,
+ .read_ping_status = amd_acp63_sdw_read_ping_status,
};
static int amd_sdw_hw_params(struct snd_pcm_substream *substream,
@@ -967,7 +975,7 @@ static void amd_sdw_update_slave_status_work(struct work_struct *work)
ACP_SW_STATE_CHANGE_STATUS_MASK_0TO7);
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);
+ amd_acp63_sdw_read_and_process_ping_status(amd_manager);
goto update_status;
} else {
dev_err_ratelimited(amd_manager->dev,
@@ -1001,7 +1009,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)
+static void amd_acp63_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);
@@ -1024,12 +1032,12 @@ static void amd_sdw_irq_thread(struct work_struct *work)
amd_manager->instance, status_change_0to7, status_change_8to11);
if (status_change_8to11 & AMD_SDW_WAKE_STAT_MASK) {
- amd_sdw_process_wake_event(amd_manager);
+ amd_acp63_sdw_process_wake_event(amd_manager);
status_change_8to11 &= ~AMD_SDW_WAKE_STAT_MASK;
}
if (status_change_8to11 & AMD_SDW_PREQ_INTR_STAT) {
- amd_sdw_read_and_process_ping_status(amd_manager);
+ amd_acp63_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);
@@ -1047,17 +1055,17 @@ int amd_sdw_manager_start(struct amd_sdw_manager *amd_manager)
prop = &amd_manager->bus.prop;
if (!prop->hw_disabled) {
- ret = amd_sdw_clk_init_ctrl(amd_manager);
+ ret = amd_acp63_sdw_clk_init_ctrl(amd_manager);
if (ret)
return ret;
- ret = amd_init_sdw_manager(amd_manager);
+ ret = amd_acp63_init_sdw_manager(amd_manager);
if (ret)
return ret;
- amd_enable_sdw_interrupts(amd_manager);
- ret = amd_enable_sdw_manager(amd_manager);
+ amd_acp63_enable_sdw_interrupts(amd_manager);
+ ret = amd_acp63_enable_sdw_manager(amd_manager);
if (ret)
return ret;
- amd_sdw_set_frameshape(amd_manager);
+ amd_acp63_sdw_set_frameshape(amd_manager);
}
/* Enable runtime PM */
pm_runtime_set_autosuspend_delay(amd_manager->dev, AMD_SDW_MASTER_SUSPEND_DELAY_MS);
@@ -1093,15 +1101,15 @@ static int amd_sdw_manager_probe(struct platform_device *pdev)
amd_manager->ping_slave_stat = U32_MAX;
amd_manager->instance = pdata->instance;
amd_manager->mmio = amd_manager->acp_mmio +
- (amd_manager->instance * SDW_MANAGER_REG_OFFSET);
+ (amd_manager->instance * ACP63_SDW_MANAGER_REG_OFFSET);
amd_manager->acp_sdw_lock = pdata->acp_sdw_lock;
amd_manager->acp_rev = pdata->acp_rev;
amd_manager->cols_index = sdw_find_col_index(AMD_SDW_DEFAULT_COLUMNS);
amd_manager->rows_index = sdw_find_row_index(AMD_SDW_DEFAULT_ROWS);
amd_manager->dev = dev;
- amd_manager->bus.ops = &amd_sdw_ops;
- amd_manager->bus.port_ops = &amd_sdw_port_ops;
- amd_manager->bus.compute_params = &amd_sdw_compute_params;
+ amd_manager->bus.ops = &amd_acp63_sdw_ops;
+ amd_manager->bus.port_ops = &amd_acp63_sdw_port_ops;
+ amd_manager->bus.compute_params = &amd_acp63_sdw_compute_params;
amd_manager->bus.clk_stop_timeout = 200;
amd_manager->bus.link_id = amd_manager->instance;
@@ -1170,15 +1178,21 @@ static void amd_sdw_manager_remove(struct platform_device *pdev)
if (pm_runtime_enabled(&pdev->dev))
pm_runtime_disable(&pdev->dev);
- amd_disable_sdw_interrupts(amd_manager);
+ amd_acp63_disable_sdw_interrupts(amd_manager);
cancel_work_sync(&amd_manager->amd_sdw_irq_thread);
cancel_work_sync(&amd_manager->amd_sdw_work);
sdw_bus_master_delete(&amd_manager->bus);
- ret = amd_disable_sdw_manager(amd_manager);
+ ret = amd_acp63_disable_sdw_manager(amd_manager);
if (ret)
dev_err(&pdev->dev, "Failed to disable device (%pe)\n", ERR_PTR(ret));
}
+/*
+ * AMD SoundWire clock-stop sequence shared across all ACP revisions.
+ * Differences between revisions in this path are minimal; a switch/case
+ * on acp_rev is sufficient to accommodate any variant-specific additions
+ * needed for future platforms.
+ */
static int amd_sdw_clock_stop(struct amd_sdw_manager *amd_manager)
{
u32 val;
@@ -1210,7 +1224,7 @@ static int amd_sdw_clock_stop(struct amd_sdw_manager *amd_manager)
return 0;
}
-static int amd_sdw_clock_stop_exit(struct amd_sdw_manager *amd_manager)
+static int amd_acp63_sdw_clock_stop_exit(struct amd_sdw_manager *amd_manager)
{
int ret;
u32 val;
@@ -1302,7 +1316,7 @@ static int amd_sdw_host_wake_enable_by_rev(struct amd_sdw_manager *amd_manager,
case ACP70_PCI_REV_ID:
case ACP71_PCI_REV_ID:
case ACP72_PCI_REV_ID:
- return amd_sdw_host_wake_enable(amd_manager, enable);
+ return amd_acp63_sdw_host_wake_enable(amd_manager, enable);
default:
dev_err(amd_manager->dev, "unexpected acp_rev 0x%x\n", amd_manager->acp_rev);
return -EINVAL;
@@ -1323,22 +1337,22 @@ static int __maybe_unused amd_suspend(struct device *dev)
}
if (amd_manager->power_mode_mask & AMD_SDW_CLK_STOP_MODE) {
- amd_disable_sdw_interrupts(amd_manager);
+ amd_acp63_disable_sdw_interrupts(amd_manager);
cancel_work_sync(&amd_manager->amd_sdw_irq_thread);
cancel_work_sync(&amd_manager->amd_sdw_work);
- amd_sdw_wake_enable(amd_manager, false);
+ amd_acp63_sdw_wake_enable(amd_manager, false);
ret = amd_sdw_host_wake_enable_by_rev(amd_manager, false);
if (ret)
return ret;
ret = amd_sdw_clock_stop(amd_manager);
if (ret)
return ret;
- amd_enable_sdw_interrupts(amd_manager);
+ amd_acp63_enable_sdw_interrupts(amd_manager);
} else if (amd_manager->power_mode_mask & AMD_SDW_POWER_OFF_MODE) {
- amd_disable_sdw_interrupts(amd_manager);
+ amd_acp63_disable_sdw_interrupts(amd_manager);
cancel_work_sync(&amd_manager->amd_sdw_irq_thread);
cancel_work_sync(&amd_manager->amd_sdw_work);
- amd_sdw_wake_enable(amd_manager, false);
+ amd_acp63_sdw_wake_enable(amd_manager, false);
ret = amd_sdw_host_wake_enable_by_rev(amd_manager, false);
if (ret)
return ret;
@@ -1349,7 +1363,7 @@ static int __maybe_unused amd_suspend(struct device *dev)
ret = amd_sdw_clock_stop(amd_manager);
if (ret)
return ret;
- ret = amd_disable_sdw_manager(amd_manager);
+ ret = amd_acp63_disable_sdw_manager(amd_manager);
if (ret)
return ret;
}
@@ -1359,7 +1373,7 @@ static int __maybe_unused amd_suspend(struct device *dev)
case ACP70_PCI_REV_ID:
case ACP71_PCI_REV_ID:
case ACP72_PCI_REV_ID:
- ret = amd_sdw_set_device_state(amd_manager, AMD_SDW_DEVICE_STATE_D3);
+ ret = amd_acp63_sdw_set_device_state(amd_manager, AMD_SDW_DEVICE_STATE_D3);
if (ret)
return ret;
break;
@@ -1383,29 +1397,29 @@ static int __maybe_unused amd_suspend_runtime(struct device *dev)
return 0;
}
if (amd_manager->power_mode_mask & AMD_SDW_CLK_STOP_MODE) {
- amd_disable_sdw_interrupts(amd_manager);
+ amd_acp63_disable_sdw_interrupts(amd_manager);
cancel_work_sync(&amd_manager->amd_sdw_irq_thread);
cancel_work_sync(&amd_manager->amd_sdw_work);
- amd_sdw_wake_enable(amd_manager, true);
+ amd_acp63_sdw_wake_enable(amd_manager, true);
ret = amd_sdw_host_wake_enable_by_rev(amd_manager, true);
if (ret)
return ret;
ret = amd_sdw_clock_stop(amd_manager);
if (ret)
return ret;
- amd_enable_sdw_interrupts(amd_manager);
+ amd_acp63_enable_sdw_interrupts(amd_manager);
} else if (amd_manager->power_mode_mask & AMD_SDW_POWER_OFF_MODE) {
- amd_disable_sdw_interrupts(amd_manager);
+ amd_acp63_disable_sdw_interrupts(amd_manager);
cancel_work_sync(&amd_manager->amd_sdw_irq_thread);
cancel_work_sync(&amd_manager->amd_sdw_work);
- amd_sdw_wake_enable(amd_manager, true);
+ amd_acp63_sdw_wake_enable(amd_manager, true);
ret = amd_sdw_host_wake_enable_by_rev(amd_manager, true);
if (ret)
return ret;
ret = amd_sdw_clock_stop(amd_manager);
if (ret)
return ret;
- ret = amd_disable_sdw_manager(amd_manager);
+ ret = amd_acp63_disable_sdw_manager(amd_manager);
if (ret)
return ret;
}
@@ -1415,7 +1429,7 @@ static int __maybe_unused amd_suspend_runtime(struct device *dev)
case ACP70_PCI_REV_ID:
case ACP71_PCI_REV_ID:
case ACP72_PCI_REV_ID:
- ret = amd_sdw_set_device_state(amd_manager, AMD_SDW_DEVICE_STATE_D3);
+ ret = amd_acp63_sdw_set_device_state(amd_manager, AMD_SDW_DEVICE_STATE_D3);
if (ret)
return ret;
if (amd_manager->wake_en_mask) {
@@ -1448,7 +1462,7 @@ static int __maybe_unused amd_resume_runtime(struct device *dev)
}
if (amd_manager->power_mode_mask & AMD_SDW_CLK_STOP_MODE) {
- ret = amd_sdw_clock_stop_exit(amd_manager);
+ ret = amd_acp63_sdw_clock_stop_exit(amd_manager);
if (ret)
return ret;
ret = amd_sdw_host_wake_enable_by_rev(amd_manager, false);
@@ -1483,17 +1497,17 @@ static int __maybe_unused amd_resume_runtime(struct device *dev)
}
}
sdw_clear_slave_status(bus, SDW_UNATTACH_REQUEST_MASTER_RESET);
- ret = amd_sdw_clk_init_ctrl(amd_manager);
+ ret = amd_acp63_sdw_clk_init_ctrl(amd_manager);
if (ret)
return ret;
- ret = amd_init_sdw_manager(amd_manager);
+ ret = amd_acp63_init_sdw_manager(amd_manager);
if (ret)
return ret;
- amd_enable_sdw_interrupts(amd_manager);
- ret = amd_enable_sdw_manager(amd_manager);
+ amd_acp63_enable_sdw_interrupts(amd_manager);
+ ret = amd_acp63_enable_sdw_manager(amd_manager);
if (ret)
return ret;
- amd_sdw_set_frameshape(amd_manager);
+ amd_acp63_sdw_set_frameshape(amd_manager);
}
switch (amd_manager->acp_rev) {
case ACP63_PCI_REV_ID:
@@ -1501,7 +1515,7 @@ static int __maybe_unused amd_resume_runtime(struct device *dev)
case ACP70_PCI_REV_ID:
case ACP71_PCI_REV_ID:
case ACP72_PCI_REV_ID:
- ret = amd_sdw_set_device_state(amd_manager, AMD_SDW_DEVICE_STATE_D0);
+ ret = amd_acp63_sdw_set_device_state(amd_manager, AMD_SDW_DEVICE_STATE_D0);
if (ret)
return ret;
break;
diff --git a/drivers/soundwire/amd_manager.h b/drivers/soundwire/amd_manager.h
index 76ecaceb3ee5..adde192f61fe 100644
--- a/drivers/soundwire/amd_manager.h
+++ b/drivers/soundwire/amd_manager.h
@@ -8,7 +8,12 @@
#include <linux/soundwire/sdw_amd.h>
-#define SDW_MANAGER_REG_OFFSET 0xc00
+/*
+ * Register offset between successive SoundWire manager instances.
+ * This value applies to ACP6.3, ACP7.0, ACP7.1, and ACP7.2. A new
+ * revision with a different offset must define its own constant.
+ */
+#define ACP63_SDW_MANAGER_REG_OFFSET 0xc00
#define AMD_SDW_DEFAULT_ROWS 50
#define AMD_SDW_DEFAULT_COLUMNS 10
#define ACP_PAD_PULLDOWN_CTRL 0x0001448
--
2.48.1
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH V2 5/9] soundwire: amd: remove unused AMD_SDW_MAX_FREQ_NUM define
2026-10-13 9:58 [PATCH V2 0/9] soundwire: amd: introduce hw_ops dispatch and split driver into revision-specific files Vijendar Mukunda
` (3 preceding siblings ...)
2026-10-13 9:58 ` [PATCH V2 4/9] soundwire: amd: rename hardware backend symbols to amd_acp63_*() prefix Vijendar Mukunda
@ 2026-10-13 9:58 ` Vijendar Mukunda
2026-10-13 9:58 ` [PATCH V2 6/9] soundwire: amd: introduce struct amd_sdw_hw_ops dispatch framework Vijendar Mukunda
` (3 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Vijendar Mukunda @ 2026-10-13 9:58 UTC (permalink / raw)
To: vkoul
Cc: broonie, alsa-devel, yung-chuan.liao, pierre-louis.bossart,
Basavaraj.Hiregoudar, Sunil-kumar.Dommati, venkataprasad.potturu,
Syed.SabaKareem, Mario.Limonciello, Richard.Gong,
Vijendar.Mukunda, linux-sound, linux-kernel
The AMD_SDW_MAX_FREQ_NUM macro has no users anywhere in the driver.
Remove it as a straightforward cleanup with no functional change.
Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
---
drivers/soundwire/amd_manager.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/soundwire/amd_manager.h b/drivers/soundwire/amd_manager.h
index adde192f61fe..63fecff62079 100644
--- a/drivers/soundwire/amd_manager.h
+++ b/drivers/soundwire/amd_manager.h
@@ -159,7 +159,6 @@
#define AMD_SDW_IRQ_MASK_0TO7 0x77777777
#define AMD_SDW_IRQ_MASK_8TO11 0x000c7777
#define AMD_SDW_IRQ_ERROR_MASK 0xff
-#define AMD_SDW_MAX_FREQ_NUM 1
#define AMD_ACP63_SDW0_MAX_TX_PORTS 3
#define AMD_ACP63_SDW0_MAX_RX_PORTS 3
#define AMD_ACP63_SDW1_MAX_TX_PORTS 1
--
2.48.1
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH V2 6/9] soundwire: amd: introduce struct amd_sdw_hw_ops dispatch framework
2026-10-13 9:58 [PATCH V2 0/9] soundwire: amd: introduce hw_ops dispatch and split driver into revision-specific files Vijendar Mukunda
` (4 preceding siblings ...)
2026-10-13 9:58 ` [PATCH V2 5/9] soundwire: amd: remove unused AMD_SDW_MAX_FREQ_NUM define Vijendar Mukunda
@ 2026-10-13 9:58 ` Vijendar Mukunda
2026-10-13 9:58 ` [PATCH V2 7/9] soundwire: amd: dispatch irq/work handlers to per-revision functions Vijendar Mukunda
` (2 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Vijendar Mukunda @ 2026-10-13 9:58 UTC (permalink / raw)
To: vkoul
Cc: broonie, alsa-devel, yung-chuan.liao, pierre-louis.bossart,
Basavaraj.Hiregoudar, Sunil-kumar.Dommati, venkataprasad.potturu,
Syed.SabaKareem, Mario.Limonciello, Richard.Gong,
Vijendar.Mukunda, linux-sound, linux-kernel
Add struct amd_sdw_hw_ops, a function-pointer dispatch table for
hardware-revision-specific SoundWire manager operations, including
register-level init/enable/disable, interrupt masking, frameshape,
wake/host-wake, command/response, ping handling, clock-stop exit,
and the PM suspend/resume paths. Add inline dispatch helpers for
each callback and a const hw_ops pointer in struct amd_sdw_manager.
Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
---
drivers/soundwire/amd_manager.h | 175 ++++++++++++++++++++++++++++++
include/linux/soundwire/sdw_amd.h | 4 +
2 files changed, 179 insertions(+)
diff --git a/drivers/soundwire/amd_manager.h b/drivers/soundwire/amd_manager.h
index 63fecff62079..d66b8d6f41c1 100644
--- a/drivers/soundwire/amd_manager.h
+++ b/drivers/soundwire/amd_manager.h
@@ -274,4 +274,179 @@ static u32 sdw_manager_reg_mask_array[AMD_ACP63_SDW_MAX_MANAGER_COUNT] = {
AMD_SDW0_EXT_INTR_MASK,
AMD_SDW1_EXT_INTR_MASK
};
+
+#define AMD_SDW_HW_OPS(amd_manager, cb) ((amd_manager)->hw_ops->cb)
+
+/**
+ * struct amd_sdw_hw_ops - hardware-revision-specific SoundWire manager ops
+ *
+ * @init_sdw_manager: enable the SoundWire manager hardware and perform bus reset
+ * @enable_sdw_manager: set the manager enable bit and wait for it to assert
+ * @disable_sdw_manager: clear the manager enable bit and wait for it to deassert
+ * @enable_sdw_interrupts: unmask ACP-level and per-manager interrupt bits
+ * @disable_sdw_interrupts: mask ACP-level and per-manager interrupt bits
+ * @set_frameshape: write the row/column frame-shape register
+ * @send_cmd_get_resp: issue an immediate command and return the response;
+ * returns 0 on success with the raw u64 response in @response,
+ * or negative on hardware timeout
+ * @wake_enable: enable or disable the in-band SoundWire wake interrupt
+ * @host_wake_enable: enable or disable the host-side wake interrupt
+ * @set_device_state: write the D0/D3 device power state for the manager instance
+ * @read_and_process_ping_status: issue a PING command and process the slave
+ * attach/detach status; called from the IRQ work path
+ * @process_wake_event: handle an in-band wake notification from a slave
+ * @clk_init_ctrl: set the clock divider and update the frame shape registers
+ * based on the current bus clock frequency
+ * @clock_stop_exit: restart the SoundWire bus clock after a CLK_STOP_MODE
+ * suspend; implementation differs across ACP revisions
+ * @suspend: system-suspend hook; stops the bus and powers down the manager
+ * @suspend_runtime: runtime-suspend hook; same sequence as @suspend
+ * @resume_runtime: runtime-resume hook; reinitialises the manager and restarts
+ * the bus after a POWER_OFF_MODE or CLK_STOP_MODE suspend
+ */
+struct amd_sdw_hw_ops {
+ int (*init_sdw_manager)(struct amd_sdw_manager *amd_manager);
+ int (*enable_sdw_manager)(struct amd_sdw_manager *amd_manager);
+ int (*disable_sdw_manager)(struct amd_sdw_manager *amd_manager);
+ void (*enable_sdw_interrupts)(struct amd_sdw_manager *amd_manager);
+ void (*disable_sdw_interrupts)(struct amd_sdw_manager *amd_manager);
+ void (*set_frameshape)(struct amd_sdw_manager *amd_manager);
+ int (*send_cmd_get_resp)(struct amd_sdw_manager *amd_manager, u32 lower_data,
+ u32 upper_data, u64 *response);
+ void (*wake_enable)(struct amd_sdw_manager *amd_manager, bool enable);
+ int (*host_wake_enable)(struct amd_sdw_manager *amd_manager, bool enable);
+ int (*set_device_state)(struct amd_sdw_manager *amd_manager, u32 target_device_state);
+ void (*read_and_process_ping_status)(struct amd_sdw_manager *amd_manager);
+ void (*process_wake_event)(struct amd_sdw_manager *amd_manager);
+ int (*clk_init_ctrl)(struct amd_sdw_manager *amd_manager);
+ int (*clock_stop_exit)(struct amd_sdw_manager *amd_manager);
+ int (*suspend)(struct amd_sdw_manager *amd_manager);
+ int (*suspend_runtime)(struct amd_sdw_manager *amd_manager);
+ int (*resume_runtime)(struct amd_sdw_manager *amd_manager);
+};
+
+static inline int acp_init_sdw_manager(struct amd_sdw_manager *amd_manager)
+{
+ if (amd_manager && amd_manager->hw_ops && amd_manager->hw_ops->init_sdw_manager)
+ return AMD_SDW_HW_OPS(amd_manager, init_sdw_manager)(amd_manager);
+ return -EOPNOTSUPP;
+}
+
+static inline int acp_enable_sdw_manager(struct amd_sdw_manager *amd_manager)
+{
+ if (amd_manager && amd_manager->hw_ops && amd_manager->hw_ops->enable_sdw_manager)
+ return AMD_SDW_HW_OPS(amd_manager, enable_sdw_manager)(amd_manager);
+ return -EOPNOTSUPP;
+}
+
+static inline int acp_disable_sdw_manager(struct amd_sdw_manager *amd_manager)
+{
+ if (amd_manager && amd_manager->hw_ops && amd_manager->hw_ops->disable_sdw_manager)
+ return AMD_SDW_HW_OPS(amd_manager, disable_sdw_manager)(amd_manager);
+ return -EOPNOTSUPP;
+}
+
+static inline void acp_enable_sdw_interrupts(struct amd_sdw_manager *amd_manager)
+{
+ if (amd_manager && amd_manager->hw_ops && amd_manager->hw_ops->enable_sdw_interrupts)
+ AMD_SDW_HW_OPS(amd_manager, enable_sdw_interrupts)(amd_manager);
+}
+
+static inline void acp_disable_sdw_interrupts(struct amd_sdw_manager *amd_manager)
+{
+ if (amd_manager && amd_manager->hw_ops && amd_manager->hw_ops->disable_sdw_interrupts)
+ AMD_SDW_HW_OPS(amd_manager, disable_sdw_interrupts)(amd_manager);
+}
+
+static inline void acp_sdw_set_frameshape(struct amd_sdw_manager *amd_manager)
+{
+ if (amd_manager && amd_manager->hw_ops && amd_manager->hw_ops->set_frameshape)
+ AMD_SDW_HW_OPS(amd_manager, set_frameshape)(amd_manager);
+}
+
+static inline int acp_sdw_send_cmd_get_resp(struct amd_sdw_manager *amd_manager,
+ u32 lower_data, u32 upper_data, u64 *response)
+{
+ if (amd_manager && amd_manager->hw_ops && amd_manager->hw_ops->send_cmd_get_resp)
+ return AMD_SDW_HW_OPS(amd_manager, send_cmd_get_resp)(amd_manager,
+ lower_data, upper_data,
+ response);
+ return -EOPNOTSUPP;
+}
+
+static inline void acp_sdw_wake_enable(struct amd_sdw_manager *amd_manager, bool enable)
+{
+ if (amd_manager && amd_manager->hw_ops && amd_manager->hw_ops->wake_enable)
+ AMD_SDW_HW_OPS(amd_manager, wake_enable)(amd_manager, enable);
+}
+
+static inline int acp_sdw_host_wake_enable(struct amd_sdw_manager *amd_manager, bool enable)
+{
+ if (amd_manager && amd_manager->hw_ops && amd_manager->hw_ops->host_wake_enable)
+ return AMD_SDW_HW_OPS(amd_manager, host_wake_enable)(amd_manager, enable);
+ return -EOPNOTSUPP;
+}
+
+static inline int acp_sdw_set_device_state(struct amd_sdw_manager *amd_manager,
+ u32 target_device_state)
+{
+ if (amd_manager && amd_manager->hw_ops && amd_manager->hw_ops->set_device_state)
+ return AMD_SDW_HW_OPS(amd_manager, set_device_state)(amd_manager,
+ target_device_state);
+ return -EOPNOTSUPP;
+}
+
+static inline void acp_sdw_read_and_process_ping_status(struct amd_sdw_manager *amd_manager)
+{
+ if (amd_manager && amd_manager->hw_ops && amd_manager->hw_ops->read_and_process_ping_status)
+ AMD_SDW_HW_OPS(amd_manager, read_and_process_ping_status)(amd_manager);
+}
+
+static inline void acp_sdw_process_wake_event(struct amd_sdw_manager *amd_manager)
+{
+ if (amd_manager && amd_manager->hw_ops && amd_manager->hw_ops->process_wake_event)
+ AMD_SDW_HW_OPS(amd_manager, process_wake_event)(amd_manager);
+}
+
+static inline int acp_sdw_clk_init_ctrl(struct amd_sdw_manager *amd_manager)
+{
+ if (amd_manager && amd_manager->hw_ops && amd_manager->hw_ops->clk_init_ctrl)
+ return AMD_SDW_HW_OPS(amd_manager, clk_init_ctrl)(amd_manager);
+ return -EOPNOTSUPP;
+}
+
+static inline int acp_sdw_clock_stop_exit(struct amd_sdw_manager *amd_manager)
+{
+ if (amd_manager && amd_manager->hw_ops && amd_manager->hw_ops->clock_stop_exit)
+ return AMD_SDW_HW_OPS(amd_manager, clock_stop_exit)(amd_manager);
+ return -EOPNOTSUPP;
+}
+
+static inline int acp_sdw_suspend(struct device *dev)
+{
+ struct amd_sdw_manager *amd_manager = dev_get_drvdata(dev);
+
+ if (amd_manager && amd_manager->hw_ops && amd_manager->hw_ops->suspend)
+ return AMD_SDW_HW_OPS(amd_manager, suspend)(amd_manager);
+ return -EOPNOTSUPP;
+}
+
+static inline int acp_sdw_suspend_runtime(struct device *dev)
+{
+ struct amd_sdw_manager *amd_manager = dev_get_drvdata(dev);
+
+ if (amd_manager && amd_manager->hw_ops && amd_manager->hw_ops->suspend_runtime)
+ return AMD_SDW_HW_OPS(amd_manager, suspend_runtime)(amd_manager);
+ return -EOPNOTSUPP;
+}
+
+static inline int acp_sdw_resume_runtime(struct device *dev)
+{
+ struct amd_sdw_manager *amd_manager = dev_get_drvdata(dev);
+
+ if (amd_manager && amd_manager->hw_ops && amd_manager->hw_ops->resume_runtime)
+ return AMD_SDW_HW_OPS(amd_manager, resume_runtime)(amd_manager);
+ return -EOPNOTSUPP;
+}
+
#endif
diff --git a/include/linux/soundwire/sdw_amd.h b/include/linux/soundwire/sdw_amd.h
index 476de2c30389..cbfa3d6b3460 100644
--- a/include/linux/soundwire/sdw_amd.h
+++ b/include/linux/soundwire/sdw_amd.h
@@ -55,10 +55,13 @@ struct sdw_amd_dai_runtime {
enum sdw_stream_type stream_type;
};
+struct amd_sdw_hw_ops;
+
/**
* struct amd_sdw_manager - amd manager driver context
* @bus: bus handle
* @dev: linux device
+ * @hw_ops: pointer to hardware-revision-specific dispatch table
* @mmio: SoundWire registers mmio base
* @acp_mmio: acp registers mmio base
* @amd_sdw_irq_thread: SoundWire manager irq workqueue
@@ -85,6 +88,7 @@ struct sdw_amd_dai_runtime {
struct amd_sdw_manager {
struct sdw_bus bus;
struct device *dev;
+ const struct amd_sdw_hw_ops *hw_ops;
void __iomem *mmio;
void __iomem *acp_mmio;
--
2.48.1
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH V2 7/9] soundwire: amd: dispatch irq/work handlers to per-revision functions
2026-10-13 9:58 [PATCH V2 0/9] soundwire: amd: introduce hw_ops dispatch and split driver into revision-specific files Vijendar Mukunda
` (5 preceding siblings ...)
2026-10-13 9:58 ` [PATCH V2 6/9] soundwire: amd: introduce struct amd_sdw_hw_ops dispatch framework Vijendar Mukunda
@ 2026-10-13 9:58 ` Vijendar Mukunda
2026-10-13 9:58 ` [PATCH V2 8/9] soundwire: amd: populate hw_ops and wire all call sites through acp_*() helpers Vijendar Mukunda
2026-10-13 9:58 ` [PATCH V2 9/9] soundwire: amd: extract shared functions into amd_manager_common.c Vijendar Mukunda
8 siblings, 0 replies; 10+ messages in thread
From: Vijendar Mukunda @ 2026-10-13 9:58 UTC (permalink / raw)
To: vkoul
Cc: broonie, alsa-devel, yung-chuan.liao, pierre-louis.bossart,
Basavaraj.Hiregoudar, Sunil-kumar.Dommati, venkataprasad.potturu,
Syed.SabaKareem, Mario.Limonciello, Richard.Gong,
Vijendar.Mukunda, linux-sound, linux-kernel
Split the top-level interrupt and status-update work handlers into a
revision-specific implementation and a generic work_struct entry point.
amd_acp63_sdw_irq_thread() and amd_acp63_sdw_update_slave_status_work()
now hold the ACP6.3-family handler logic and take struct amd_sdw_manager *.
amd_sdw_irq_thread() and amd_sdw_update_slave_status_work() remain the
work_struct handlers registered with INIT_WORK(); each recovers the
manager via container_of() and switches on acp_rev, invoking the
corresponding amd_acp63_*() implementation for ACP6.3, ACP7.0, ACP7.1
and ACP7.2 and emitting dev_err() + return on an unexpected revision.
Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
---
drivers/soundwire/amd_manager.c | 44 ++++++++++++++++++++++++++++-----
1 file changed, 38 insertions(+), 6 deletions(-)
diff --git a/drivers/soundwire/amd_manager.c b/drivers/soundwire/amd_manager.c
index c585f7d529c0..90bf5d4e5ba2 100644
--- a/drivers/soundwire/amd_manager.c
+++ b/drivers/soundwire/amd_manager.c
@@ -949,10 +949,8 @@ 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)
+static void amd_acp63_sdw_update_slave_status_work(struct amd_sdw_manager *amd_manager)
{
- 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) {
@@ -985,6 +983,24 @@ static void amd_sdw_update_slave_status_work(struct work_struct *work)
}
}
+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);
+
+ switch (amd_manager->acp_rev) {
+ case ACP63_PCI_REV_ID:
+ case ACP70_PCI_REV_ID:
+ case ACP71_PCI_REV_ID:
+ case ACP72_PCI_REV_ID:
+ amd_acp63_sdw_update_slave_status_work(amd_manager);
+ break;
+ default:
+ dev_err(amd_manager->dev, "unexpected acp_rev 0x%x\n", amd_manager->acp_rev);
+ return;
+ }
+}
+
static void amd_sdw_update_slave_status(u32 status_change_0to7, u32 status_change_8to11,
struct amd_sdw_manager *amd_manager)
{
@@ -1016,10 +1032,8 @@ static void amd_acp63_sdw_process_wake_event(struct amd_sdw_manager *amd_manager
writel(0x00, amd_manager->acp_mmio + ACP_SW_WAKE_EN(amd_manager->instance));
}
-static void amd_sdw_irq_thread(struct work_struct *work)
+static void amd_acp63_sdw_irq_thread(struct amd_sdw_manager *amd_manager)
{
- 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;
@@ -1048,6 +1062,24 @@ static void amd_sdw_irq_thread(struct work_struct *work)
writel(0x00, amd_manager->mmio + ACP_SW_STATE_CHANGE_STATUS_0TO7);
}
+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);
+
+ switch (amd_manager->acp_rev) {
+ case ACP63_PCI_REV_ID:
+ case ACP70_PCI_REV_ID:
+ case ACP71_PCI_REV_ID:
+ case ACP72_PCI_REV_ID:
+ amd_acp63_sdw_irq_thread(amd_manager);
+ break;
+ default:
+ dev_err(amd_manager->dev, "unexpected acp_rev 0x%x\n", amd_manager->acp_rev);
+ return;
+ }
+}
+
int amd_sdw_manager_start(struct amd_sdw_manager *amd_manager)
{
struct sdw_master_prop *prop;
--
2.48.1
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH V2 8/9] soundwire: amd: populate hw_ops and wire all call sites through acp_*() helpers
2026-10-13 9:58 [PATCH V2 0/9] soundwire: amd: introduce hw_ops dispatch and split driver into revision-specific files Vijendar Mukunda
` (6 preceding siblings ...)
2026-10-13 9:58 ` [PATCH V2 7/9] soundwire: amd: dispatch irq/work handlers to per-revision functions Vijendar Mukunda
@ 2026-10-13 9:58 ` Vijendar Mukunda
2026-10-13 9:58 ` [PATCH V2 9/9] soundwire: amd: extract shared functions into amd_manager_common.c Vijendar Mukunda
8 siblings, 0 replies; 10+ messages in thread
From: Vijendar Mukunda @ 2026-10-13 9:58 UTC (permalink / raw)
To: vkoul
Cc: broonie, alsa-devel, yung-chuan.liao, pierre-louis.bossart,
Basavaraj.Hiregoudar, Sunil-kumar.Dommati, venkataprasad.potturu,
Syed.SabaKareem, Mario.Limonciello, Richard.Gong,
Vijendar.Mukunda, linux-sound, linux-kernel
Populate the amd_sdw_hw_ops dispatch table introduced in the previous
patch and convert every direct amd_acp63_*() call site in the driver to
use the corresponding acp_*() inline helper.
Introduce a static const struct amd_sdw_hw_ops amd_acp63_hw_ops table
that registers all amd_acp63_*() callbacks. Add amd_sdw_hw_init_ops()
which assigns the table pointer based on acp_rev, and call it from
amd_sdw_manager_probe() so hw_ops is set before any dispatch helper is
reached.
Extract the PM suspend/resume logic into amd_acp63_sdw_suspend(),
amd_acp63_sdw_suspend_runtime() and amd_acp63_sdw_resume_runtime()
hw_ops callbacks (taking struct amd_sdw_manager * instead of
struct device *). The existing amd_suspend(), amd_suspend_runtime() and
amd_resume_runtime() device-PM entry points become thin one-liners that
delegate to the corresponding acp_sdw_*() helpers.
Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
---
drivers/soundwire/amd_manager.c | 360 ++++++++++++++++++--------------
1 file changed, 206 insertions(+), 154 deletions(-)
diff --git a/drivers/soundwire/amd_manager.c b/drivers/soundwire/amd_manager.c
index 90bf5d4e5ba2..2e78d68cb37a 100644
--- a/drivers/soundwire/amd_manager.c
+++ b/drivers/soundwire/amd_manager.c
@@ -302,8 +302,7 @@ amd_program_scp_addr(struct amd_sdw_manager *amd_manager, struct sdw_msg *msg)
scp_msg.buf = &msg->addr_page1;
scp_msg.flags = SDW_MSG_FLAG_WRITE;
amd_sdw_ctl_word_prep(&lower_data, &upper_data, &scp_msg, 0);
- if (amd_acp63_sdw_send_cmd_get_resp(amd_manager, lower_data, upper_data,
- &response_buf[0])) {
+ if (acp_sdw_send_cmd_get_resp(amd_manager, lower_data, upper_data, &response_buf[0])) {
dev_err_ratelimited(amd_manager->dev,
"SCP_addrpage command timeout for Slave %d\n", msg->dev_num);
return SDW_CMD_TIMEOUT;
@@ -311,8 +310,7 @@ amd_program_scp_addr(struct amd_sdw_manager *amd_manager, struct sdw_msg *msg)
scp_msg.addr = SDW_SCP_ADDRPAGE2;
scp_msg.buf = &msg->addr_page2;
amd_sdw_ctl_word_prep(&lower_data, &upper_data, &scp_msg, 0);
- if (amd_acp63_sdw_send_cmd_get_resp(amd_manager, lower_data, upper_data,
- &response_buf[1])) {
+ if (acp_sdw_send_cmd_get_resp(amd_manager, lower_data, upper_data, &response_buf[1])) {
dev_err_ratelimited(amd_manager->dev,
"SCP_addrpage command timeout for Slave %d\n", msg->dev_num);
return SDW_CMD_TIMEOUT;
@@ -385,7 +383,7 @@ static unsigned int _amd_sdw_xfer_msg(struct amd_sdw_manager *amd_manager, struc
u32 upper_data = 0, lower_data = 0;
amd_sdw_ctl_word_prep(&lower_data, &upper_data, msg, cmd_offset);
- if (amd_acp63_sdw_send_cmd_get_resp(amd_manager, lower_data, upper_data, &response)) {
+ if (acp_sdw_send_cmd_get_resp(amd_manager, lower_data, upper_data, &response)) {
dev_err_ratelimited(amd_manager->dev, "command timeout for Slave %d\n",
msg->dev_num);
return SDW_CMD_TIMEOUT;
@@ -448,7 +446,7 @@ static void amd_acp63_sdw_read_and_process_ping_status(struct amd_sdw_manager *a
u64 response;
mutex_lock(&amd_manager->bus.msg_lock);
- if (amd_acp63_sdw_send_cmd_get_resp(amd_manager, 0, 0, &response)) {
+ if (acp_sdw_send_cmd_get_resp(amd_manager, 0, 0, &response)) {
mutex_unlock(&amd_manager->bus.msg_lock);
dev_err_ratelimited(amd_manager->dev, "SDW%x ping status timeout\n",
amd_manager->instance);
@@ -470,7 +468,7 @@ static u32 amd_acp63_sdw_read_ping_status(struct sdw_bus *bus)
/* Called by sdw_show_ping_status() which holds msg_lock. */
lockdep_assert_held(&bus->msg_lock);
- if (amd_acp63_sdw_send_cmd_get_resp(amd_manager, 0, 0, &response)) {
+ if (acp_sdw_send_cmd_get_resp(amd_manager, 0, 0, &response)) {
dev_err_ratelimited(amd_manager->dev, "SDW%x ping status timeout\n",
amd_manager->instance);
return amd_manager->ping_slave_stat == U32_MAX ? 0 : amd_manager->ping_slave_stat;
@@ -973,7 +971,7 @@ static void amd_acp63_sdw_update_slave_status_work(struct amd_sdw_manager *amd_m
ACP_SW_STATE_CHANGE_STATUS_MASK_0TO7);
writel(AMD_SDW_IRQ_MASK_8TO11, amd_manager->mmio +
ACP_SW_STATE_CHANGE_STATUS_MASK_8TO11);
- amd_acp63_sdw_read_and_process_ping_status(amd_manager);
+ acp_sdw_read_and_process_ping_status(amd_manager);
goto update_status;
} else {
dev_err_ratelimited(amd_manager->dev,
@@ -1046,12 +1044,12 @@ static void amd_acp63_sdw_irq_thread(struct amd_sdw_manager *amd_manager)
amd_manager->instance, status_change_0to7, status_change_8to11);
if (status_change_8to11 & AMD_SDW_WAKE_STAT_MASK) {
- amd_acp63_sdw_process_wake_event(amd_manager);
+ acp_sdw_process_wake_event(amd_manager);
status_change_8to11 &= ~AMD_SDW_WAKE_STAT_MASK;
}
if (status_change_8to11 & AMD_SDW_PREQ_INTR_STAT) {
- amd_acp63_sdw_read_and_process_ping_status(amd_manager);
+ acp_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);
@@ -1087,17 +1085,17 @@ int amd_sdw_manager_start(struct amd_sdw_manager *amd_manager)
prop = &amd_manager->bus.prop;
if (!prop->hw_disabled) {
- ret = amd_acp63_sdw_clk_init_ctrl(amd_manager);
+ ret = acp_sdw_clk_init_ctrl(amd_manager);
if (ret)
return ret;
- ret = amd_acp63_init_sdw_manager(amd_manager);
+ ret = acp_init_sdw_manager(amd_manager);
if (ret)
return ret;
- amd_acp63_enable_sdw_interrupts(amd_manager);
- ret = amd_acp63_enable_sdw_manager(amd_manager);
+ acp_enable_sdw_interrupts(amd_manager);
+ ret = acp_enable_sdw_manager(amd_manager);
if (ret)
return ret;
- amd_acp63_sdw_set_frameshape(amd_manager);
+ acp_sdw_set_frameshape(amd_manager);
}
/* Enable runtime PM */
pm_runtime_set_autosuspend_delay(amd_manager->dev, AMD_SDW_MASTER_SUSPEND_DELAY_MS);
@@ -1108,117 +1106,6 @@ int amd_sdw_manager_start(struct amd_sdw_manager *amd_manager)
return 0;
}
-static int amd_sdw_manager_probe(struct platform_device *pdev)
-{
- const struct acp_sdw_pdata *pdata = pdev->dev.platform_data;
- struct resource *res;
- struct device *dev = &pdev->dev;
- struct sdw_master_prop *prop;
- struct amd_sdw_manager *amd_manager;
- int ret;
-
- amd_manager = devm_kzalloc(dev, sizeof(struct amd_sdw_manager), GFP_KERNEL);
- if (!amd_manager)
- return -ENOMEM;
-
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- if (!res)
- return -ENOMEM;
-
- amd_manager->acp_mmio = devm_ioremap(dev, res->start, resource_size(res));
- if (!amd_manager->acp_mmio) {
- dev_err(dev, "mmio not found\n");
- return -ENOMEM;
- }
- amd_manager->ping_slave_stat = U32_MAX;
- amd_manager->instance = pdata->instance;
- amd_manager->mmio = amd_manager->acp_mmio +
- (amd_manager->instance * ACP63_SDW_MANAGER_REG_OFFSET);
- amd_manager->acp_sdw_lock = pdata->acp_sdw_lock;
- amd_manager->acp_rev = pdata->acp_rev;
- amd_manager->cols_index = sdw_find_col_index(AMD_SDW_DEFAULT_COLUMNS);
- amd_manager->rows_index = sdw_find_row_index(AMD_SDW_DEFAULT_ROWS);
- amd_manager->dev = dev;
- amd_manager->bus.ops = &amd_acp63_sdw_ops;
- amd_manager->bus.port_ops = &amd_acp63_sdw_port_ops;
- amd_manager->bus.compute_params = &amd_acp63_sdw_compute_params;
- amd_manager->bus.clk_stop_timeout = 200;
- amd_manager->bus.link_id = amd_manager->instance;
-
- /*
- * Due to BIOS compatibility, the two links are exposed within
- * the scope of a single controller. If this changes, the
- * controller_id will have to be updated with drv_data
- * information.
- */
- amd_manager->bus.controller_id = 0;
- dev_dbg(dev, "acp_rev:0x%x\n", amd_manager->acp_rev);
- switch (amd_manager->acp_rev) {
- case ACP63_PCI_REV_ID:
- switch (amd_manager->instance) {
- case ACP_SDW0:
- amd_manager->num_dout_ports = AMD_ACP63_SDW0_MAX_TX_PORTS;
- amd_manager->num_din_ports = AMD_ACP63_SDW0_MAX_RX_PORTS;
- break;
- case ACP_SDW1:
- amd_manager->num_dout_ports = AMD_ACP63_SDW1_MAX_TX_PORTS;
- amd_manager->num_din_ports = AMD_ACP63_SDW1_MAX_RX_PORTS;
- break;
- default:
- return -EINVAL;
- }
- break;
- case ACP70_PCI_REV_ID:
- case ACP71_PCI_REV_ID:
- case ACP72_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;
- }
- amd_manager->max_ports = amd_manager->num_dout_ports + amd_manager->num_din_ports;
- amd_manager->port_offset_map = devm_kcalloc(dev, amd_manager->max_ports,
- sizeof(int), GFP_KERNEL);
- if (!amd_manager->port_offset_map)
- return -ENOMEM;
-
- prop = &amd_manager->bus.prop;
- prop->mclk_freq = AMD_SDW_BUS_BASE_FREQ;
-
- ret = sdw_bus_master_add(&amd_manager->bus, dev, dev->fwnode);
- if (ret) {
- dev_err(dev, "Failed to register SoundWire manager(%d)\n", ret);
- return ret;
- }
- ret = amd_sdw_register_dais(amd_manager);
- if (ret) {
- dev_err(dev, "CPU DAI registration failed\n");
- sdw_bus_master_delete(&amd_manager->bus);
- 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);
- return 0;
-}
-
-static void amd_sdw_manager_remove(struct platform_device *pdev)
-{
- struct amd_sdw_manager *amd_manager = dev_get_drvdata(&pdev->dev);
- int ret;
-
- if (pm_runtime_enabled(&pdev->dev))
- pm_runtime_disable(&pdev->dev);
- amd_acp63_disable_sdw_interrupts(amd_manager);
- cancel_work_sync(&amd_manager->amd_sdw_irq_thread);
- cancel_work_sync(&amd_manager->amd_sdw_work);
- sdw_bus_master_delete(&amd_manager->bus);
- ret = amd_acp63_disable_sdw_manager(amd_manager);
- if (ret)
- dev_err(&pdev->dev, "Failed to disable device (%pe)\n", ERR_PTR(ret));
-}
-
/*
* AMD SoundWire clock-stop sequence shared across all ACP revisions.
* Differences between revisions in this path are minimal; a switch/case
@@ -1348,7 +1235,7 @@ static int amd_sdw_host_wake_enable_by_rev(struct amd_sdw_manager *amd_manager,
case ACP70_PCI_REV_ID:
case ACP71_PCI_REV_ID:
case ACP72_PCI_REV_ID:
- return amd_acp63_sdw_host_wake_enable(amd_manager, enable);
+ return acp_sdw_host_wake_enable(amd_manager, enable);
default:
dev_err(amd_manager->dev, "unexpected acp_rev 0x%x\n", amd_manager->acp_rev);
return -EINVAL;
@@ -1356,9 +1243,8 @@ static int amd_sdw_host_wake_enable_by_rev(struct amd_sdw_manager *amd_manager,
return 0;
}
-static int __maybe_unused amd_suspend(struct device *dev)
+static int amd_acp63_sdw_suspend(struct amd_sdw_manager *amd_manager)
{
- struct amd_sdw_manager *amd_manager = dev_get_drvdata(dev);
struct sdw_bus *bus = &amd_manager->bus;
int ret;
@@ -1369,22 +1255,22 @@ static int __maybe_unused amd_suspend(struct device *dev)
}
if (amd_manager->power_mode_mask & AMD_SDW_CLK_STOP_MODE) {
- amd_acp63_disable_sdw_interrupts(amd_manager);
+ acp_disable_sdw_interrupts(amd_manager);
cancel_work_sync(&amd_manager->amd_sdw_irq_thread);
cancel_work_sync(&amd_manager->amd_sdw_work);
- amd_acp63_sdw_wake_enable(amd_manager, false);
+ acp_sdw_wake_enable(amd_manager, false);
ret = amd_sdw_host_wake_enable_by_rev(amd_manager, false);
if (ret)
return ret;
ret = amd_sdw_clock_stop(amd_manager);
if (ret)
return ret;
- amd_acp63_enable_sdw_interrupts(amd_manager);
+ acp_enable_sdw_interrupts(amd_manager);
} else if (amd_manager->power_mode_mask & AMD_SDW_POWER_OFF_MODE) {
- amd_acp63_disable_sdw_interrupts(amd_manager);
+ acp_disable_sdw_interrupts(amd_manager);
cancel_work_sync(&amd_manager->amd_sdw_irq_thread);
cancel_work_sync(&amd_manager->amd_sdw_work);
- amd_acp63_sdw_wake_enable(amd_manager, false);
+ acp_sdw_wake_enable(amd_manager, false);
ret = amd_sdw_host_wake_enable_by_rev(amd_manager, false);
if (ret)
return ret;
@@ -1395,7 +1281,7 @@ static int __maybe_unused amd_suspend(struct device *dev)
ret = amd_sdw_clock_stop(amd_manager);
if (ret)
return ret;
- ret = amd_acp63_disable_sdw_manager(amd_manager);
+ ret = acp_disable_sdw_manager(amd_manager);
if (ret)
return ret;
}
@@ -1405,7 +1291,7 @@ static int __maybe_unused amd_suspend(struct device *dev)
case ACP70_PCI_REV_ID:
case ACP71_PCI_REV_ID:
case ACP72_PCI_REV_ID:
- ret = amd_acp63_sdw_set_device_state(amd_manager, AMD_SDW_DEVICE_STATE_D3);
+ ret = acp_sdw_set_device_state(amd_manager, AMD_SDW_DEVICE_STATE_D3);
if (ret)
return ret;
break;
@@ -1416,9 +1302,8 @@ static int __maybe_unused amd_suspend(struct device *dev)
return 0;
}
-static int __maybe_unused amd_suspend_runtime(struct device *dev)
+static int amd_acp63_sdw_suspend_runtime(struct amd_sdw_manager *amd_manager)
{
- struct amd_sdw_manager *amd_manager = dev_get_drvdata(dev);
struct sdw_bus *bus = &amd_manager->bus;
int ret;
u32 val;
@@ -1429,29 +1314,29 @@ static int __maybe_unused amd_suspend_runtime(struct device *dev)
return 0;
}
if (amd_manager->power_mode_mask & AMD_SDW_CLK_STOP_MODE) {
- amd_acp63_disable_sdw_interrupts(amd_manager);
+ acp_disable_sdw_interrupts(amd_manager);
cancel_work_sync(&amd_manager->amd_sdw_irq_thread);
cancel_work_sync(&amd_manager->amd_sdw_work);
- amd_acp63_sdw_wake_enable(amd_manager, true);
+ acp_sdw_wake_enable(amd_manager, true);
ret = amd_sdw_host_wake_enable_by_rev(amd_manager, true);
if (ret)
return ret;
ret = amd_sdw_clock_stop(amd_manager);
if (ret)
return ret;
- amd_acp63_enable_sdw_interrupts(amd_manager);
+ acp_enable_sdw_interrupts(amd_manager);
} else if (amd_manager->power_mode_mask & AMD_SDW_POWER_OFF_MODE) {
- amd_acp63_disable_sdw_interrupts(amd_manager);
+ acp_disable_sdw_interrupts(amd_manager);
cancel_work_sync(&amd_manager->amd_sdw_irq_thread);
cancel_work_sync(&amd_manager->amd_sdw_work);
- amd_acp63_sdw_wake_enable(amd_manager, true);
+ acp_sdw_wake_enable(amd_manager, true);
ret = amd_sdw_host_wake_enable_by_rev(amd_manager, true);
if (ret)
return ret;
ret = amd_sdw_clock_stop(amd_manager);
if (ret)
return ret;
- ret = amd_acp63_disable_sdw_manager(amd_manager);
+ ret = acp_disable_sdw_manager(amd_manager);
if (ret)
return ret;
}
@@ -1461,7 +1346,7 @@ static int __maybe_unused amd_suspend_runtime(struct device *dev)
case ACP70_PCI_REV_ID:
case ACP71_PCI_REV_ID:
case ACP72_PCI_REV_ID:
- ret = amd_acp63_sdw_set_device_state(amd_manager, AMD_SDW_DEVICE_STATE_D3);
+ ret = acp_sdw_set_device_state(amd_manager, AMD_SDW_DEVICE_STATE_D3);
if (ret)
return ret;
if (amd_manager->wake_en_mask) {
@@ -1480,9 +1365,8 @@ static int __maybe_unused amd_suspend_runtime(struct device *dev)
return 0;
}
-static int __maybe_unused amd_resume_runtime(struct device *dev)
+static int amd_acp63_sdw_resume_runtime(struct amd_sdw_manager *amd_manager)
{
- struct amd_sdw_manager *amd_manager = dev_get_drvdata(dev);
struct sdw_bus *bus = &amd_manager->bus;
int ret;
u32 val;
@@ -1494,7 +1378,7 @@ static int __maybe_unused amd_resume_runtime(struct device *dev)
}
if (amd_manager->power_mode_mask & AMD_SDW_CLK_STOP_MODE) {
- ret = amd_acp63_sdw_clock_stop_exit(amd_manager);
+ ret = acp_sdw_clock_stop_exit(amd_manager);
if (ret)
return ret;
ret = amd_sdw_host_wake_enable_by_rev(amd_manager, false);
@@ -1529,17 +1413,17 @@ static int __maybe_unused amd_resume_runtime(struct device *dev)
}
}
sdw_clear_slave_status(bus, SDW_UNATTACH_REQUEST_MASTER_RESET);
- ret = amd_acp63_sdw_clk_init_ctrl(amd_manager);
+ ret = acp_sdw_clk_init_ctrl(amd_manager);
if (ret)
return ret;
- ret = amd_acp63_init_sdw_manager(amd_manager);
+ ret = acp_init_sdw_manager(amd_manager);
if (ret)
return ret;
- amd_acp63_enable_sdw_interrupts(amd_manager);
- ret = amd_acp63_enable_sdw_manager(amd_manager);
+ acp_enable_sdw_interrupts(amd_manager);
+ ret = acp_enable_sdw_manager(amd_manager);
if (ret)
return ret;
- amd_acp63_sdw_set_frameshape(amd_manager);
+ acp_sdw_set_frameshape(amd_manager);
}
switch (amd_manager->acp_rev) {
case ACP63_PCI_REV_ID:
@@ -1547,7 +1431,7 @@ static int __maybe_unused amd_resume_runtime(struct device *dev)
case ACP70_PCI_REV_ID:
case ACP71_PCI_REV_ID:
case ACP72_PCI_REV_ID:
- ret = amd_acp63_sdw_set_device_state(amd_manager, AMD_SDW_DEVICE_STATE_D0);
+ ret = acp_sdw_set_device_state(amd_manager, AMD_SDW_DEVICE_STATE_D0);
if (ret)
return ret;
break;
@@ -1558,6 +1442,174 @@ static int __maybe_unused amd_resume_runtime(struct device *dev)
return 0;
}
+static int __maybe_unused amd_suspend(struct device *dev)
+{
+ return acp_sdw_suspend(dev);
+}
+
+static int __maybe_unused amd_suspend_runtime(struct device *dev)
+{
+ return acp_sdw_suspend_runtime(dev);
+}
+
+static int __maybe_unused amd_resume_runtime(struct device *dev)
+{
+ return acp_sdw_resume_runtime(dev);
+}
+
+static int amd_sdw_hw_init_ops(struct amd_sdw_manager *amd_manager);
+
+static int amd_sdw_manager_probe(struct platform_device *pdev)
+{
+ const struct acp_sdw_pdata *pdata = pdev->dev.platform_data;
+ struct resource *res;
+ struct device *dev = &pdev->dev;
+ struct sdw_master_prop *prop;
+ struct amd_sdw_manager *amd_manager;
+ int ret;
+
+ amd_manager = devm_kzalloc(dev, sizeof(struct amd_sdw_manager), GFP_KERNEL);
+ if (!amd_manager)
+ return -ENOMEM;
+
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ if (!res)
+ return -ENOMEM;
+
+ amd_manager->acp_mmio = devm_ioremap(dev, res->start, resource_size(res));
+ if (!amd_manager->acp_mmio) {
+ dev_err(dev, "mmio not found\n");
+ return -ENOMEM;
+ }
+ amd_manager->ping_slave_stat = U32_MAX;
+ amd_manager->instance = pdata->instance;
+ amd_manager->mmio = amd_manager->acp_mmio +
+ (amd_manager->instance * ACP63_SDW_MANAGER_REG_OFFSET);
+ amd_manager->acp_sdw_lock = pdata->acp_sdw_lock;
+ amd_manager->acp_rev = pdata->acp_rev;
+ amd_manager->cols_index = sdw_find_col_index(AMD_SDW_DEFAULT_COLUMNS);
+ amd_manager->rows_index = sdw_find_row_index(AMD_SDW_DEFAULT_ROWS);
+ amd_manager->dev = dev;
+ amd_manager->bus.ops = &amd_acp63_sdw_ops;
+ amd_manager->bus.port_ops = &amd_acp63_sdw_port_ops;
+ amd_manager->bus.compute_params = &amd_acp63_sdw_compute_params;
+ amd_manager->bus.clk_stop_timeout = 200;
+ amd_manager->bus.link_id = amd_manager->instance;
+ ret = amd_sdw_hw_init_ops(amd_manager);
+ if (ret) {
+ dev_err(dev, "Failed to initialize hw ops (%d)\n", ret);
+ return ret;
+ }
+
+ /*
+ * Due to BIOS compatibility, the two links are exposed within
+ * the scope of a single controller. If this changes, the
+ * controller_id will have to be updated with drv_data
+ * information.
+ */
+ amd_manager->bus.controller_id = 0;
+ dev_dbg(dev, "acp_rev:0x%x\n", amd_manager->acp_rev);
+ switch (amd_manager->acp_rev) {
+ case ACP63_PCI_REV_ID:
+ switch (amd_manager->instance) {
+ case ACP_SDW0:
+ amd_manager->num_dout_ports = AMD_ACP63_SDW0_MAX_TX_PORTS;
+ amd_manager->num_din_ports = AMD_ACP63_SDW0_MAX_RX_PORTS;
+ break;
+ case ACP_SDW1:
+ amd_manager->num_dout_ports = AMD_ACP63_SDW1_MAX_TX_PORTS;
+ amd_manager->num_din_ports = AMD_ACP63_SDW1_MAX_RX_PORTS;
+ break;
+ default:
+ return -EINVAL;
+ }
+ break;
+ case ACP70_PCI_REV_ID:
+ case ACP71_PCI_REV_ID:
+ case ACP72_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;
+ }
+ amd_manager->max_ports = amd_manager->num_dout_ports + amd_manager->num_din_ports;
+ amd_manager->port_offset_map = devm_kcalloc(dev, amd_manager->max_ports,
+ sizeof(int), GFP_KERNEL);
+ if (!amd_manager->port_offset_map)
+ return -ENOMEM;
+
+ prop = &amd_manager->bus.prop;
+ prop->mclk_freq = AMD_SDW_BUS_BASE_FREQ;
+
+ ret = sdw_bus_master_add(&amd_manager->bus, dev, dev->fwnode);
+ if (ret) {
+ dev_err(dev, "Failed to register SoundWire manager(%d)\n", ret);
+ return ret;
+ }
+ ret = amd_sdw_register_dais(amd_manager);
+ if (ret) {
+ dev_err(dev, "CPU DAI registration failed\n");
+ sdw_bus_master_delete(&amd_manager->bus);
+ 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);
+ return 0;
+}
+
+static void amd_sdw_manager_remove(struct platform_device *pdev)
+{
+ struct amd_sdw_manager *amd_manager = dev_get_drvdata(&pdev->dev);
+ int ret;
+
+ if (pm_runtime_enabled(&pdev->dev))
+ pm_runtime_disable(&pdev->dev);
+ acp_disable_sdw_interrupts(amd_manager);
+ cancel_work_sync(&amd_manager->amd_sdw_irq_thread);
+ cancel_work_sync(&amd_manager->amd_sdw_work);
+ sdw_bus_master_delete(&amd_manager->bus);
+ ret = acp_disable_sdw_manager(amd_manager);
+ if (ret)
+ dev_err(&pdev->dev, "Failed to disable device (%pe)\n", ERR_PTR(ret));
+}
+
+static const struct amd_sdw_hw_ops amd_acp63_hw_ops = {
+ .init_sdw_manager = amd_acp63_init_sdw_manager,
+ .enable_sdw_manager = amd_acp63_enable_sdw_manager,
+ .disable_sdw_manager = amd_acp63_disable_sdw_manager,
+ .enable_sdw_interrupts = amd_acp63_enable_sdw_interrupts,
+ .disable_sdw_interrupts = amd_acp63_disable_sdw_interrupts,
+ .set_frameshape = amd_acp63_sdw_set_frameshape,
+ .send_cmd_get_resp = amd_acp63_sdw_send_cmd_get_resp,
+ .wake_enable = amd_acp63_sdw_wake_enable,
+ .host_wake_enable = amd_acp63_sdw_host_wake_enable,
+ .set_device_state = amd_acp63_sdw_set_device_state,
+ .read_and_process_ping_status = amd_acp63_sdw_read_and_process_ping_status,
+ .process_wake_event = amd_acp63_sdw_process_wake_event,
+ .clk_init_ctrl = amd_acp63_sdw_clk_init_ctrl,
+ .clock_stop_exit = amd_acp63_sdw_clock_stop_exit,
+ .suspend = amd_acp63_sdw_suspend,
+ .suspend_runtime = amd_acp63_sdw_suspend_runtime,
+ .resume_runtime = amd_acp63_sdw_resume_runtime,
+};
+
+static int amd_sdw_hw_init_ops(struct amd_sdw_manager *amd_manager)
+{
+ switch (amd_manager->acp_rev) {
+ case ACP63_PCI_REV_ID:
+ case ACP70_PCI_REV_ID:
+ case ACP71_PCI_REV_ID:
+ case ACP72_PCI_REV_ID:
+ amd_manager->hw_ops = &amd_acp63_hw_ops;
+ break;
+ default:
+ return -EINVAL;
+ }
+ return 0;
+}
+
static const struct dev_pm_ops amd_pm = {
.prepare = amd_pm_prepare,
SET_SYSTEM_SLEEP_PM_OPS(amd_suspend, amd_resume_runtime)
--
2.48.1
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH V2 9/9] soundwire: amd: extract shared functions into amd_manager_common.c
2026-10-13 9:58 [PATCH V2 0/9] soundwire: amd: introduce hw_ops dispatch and split driver into revision-specific files Vijendar Mukunda
` (7 preceding siblings ...)
2026-10-13 9:58 ` [PATCH V2 8/9] soundwire: amd: populate hw_ops and wire all call sites through acp_*() helpers Vijendar Mukunda
@ 2026-10-13 9:58 ` Vijendar Mukunda
8 siblings, 0 replies; 10+ messages in thread
From: Vijendar Mukunda @ 2026-10-13 9:58 UTC (permalink / raw)
To: vkoul
Cc: broonie, alsa-devel, yung-chuan.liao, pierre-louis.bossart,
Basavaraj.Hiregoudar, Sunil-kumar.Dommati, venkataprasad.potturu,
Syed.SabaKareem, Mario.Limonciello, Richard.Gong,
Vijendar.Mukunda, linux-sound, linux-kernel
Move the revision-independent amd_sdw_*() functions out of
amd_manager.c into a new amd_manager_common.c. This covers message
transfer helpers, ping and slave-status processing, DAI ops and
registration, the clock-stop sequence, PM prepare and
suspend/resume thin wrappers, and the platform_driver infrastructure.
Rename amd_manager.c to amd_acp63_manager.c now that it contains
only the amd_acp63_*() register-level functions, the amd_acp63_hw_ops
table and amd_sdw_hw_init_ops(). Update the Makefile to build
amd_manager_common.o and amd_acp63_manager.o.
Add cross-file prototypes to amd_manager.h for symbols each file
references in the other. Drop static from amd_acp63_sdw_ops,
amd_acp63_sdw_port_ops, amd_acp63_sdw_compute_params,
amd_acp63_sdw_irq_thread, amd_acp63_sdw_update_slave_status_work
and amd_sdw_hw_init_ops, which amd_manager_common.c now calls.
Move the revision-specific register-map tables (struct sdw_manager_dp_reg,
the acp63/acp70 dp_reg arrays and sdw_manager_reg_mask_array) from
amd_manager.h into amd_acp63_manager.c to avoid -Wunused-variable when
amd_manager_common.c includes the shared header.
No functional change.
Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
---
drivers/soundwire/Makefile | 2 +-
.../{amd_manager.c => amd_acp63_manager.c} | 824 ++----------------
drivers/soundwire/amd_manager.h | 84 +-
drivers/soundwire/amd_manager_common.c | 773 ++++++++++++++++
4 files changed, 867 insertions(+), 816 deletions(-)
rename drivers/soundwire/{amd_manager.c => amd_acp63_manager.c} (56%)
create mode 100644 drivers/soundwire/amd_manager_common.c
diff --git a/drivers/soundwire/Makefile b/drivers/soundwire/Makefile
index e80a2c2cf3e7..1011599c20e7 100644
--- a/drivers/soundwire/Makefile
+++ b/drivers/soundwire/Makefile
@@ -20,7 +20,7 @@ soundwire-bus-y += irq.o
endif
#AMD driver
-soundwire-amd-y := amd_init.o amd_manager.o
+soundwire-amd-y := amd_init.o amd_manager_common.o amd_acp63_manager.o
obj-$(CONFIG_SOUNDWIRE_AMD) += soundwire-amd.o
#Cadence Objs
diff --git a/drivers/soundwire/amd_manager.c b/drivers/soundwire/amd_acp63_manager.c
similarity index 56%
rename from drivers/soundwire/amd_manager.c
rename to drivers/soundwire/amd_acp63_manager.c
index 2e78d68cb37a..af59fb453df2 100644
--- a/drivers/soundwire/amd_manager.c
+++ b/drivers/soundwire/amd_acp63_manager.c
@@ -1,12 +1,11 @@
// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)
/*
- * SoundWire AMD Manager driver
+ * SoundWire AMD ACP6.3 (and compatible) Manager hardware ops
*
- * Copyright 2023-24 Advanced Micro Devices, Inc.
+ * Copyright 2023-24, 2026 Advanced Micro Devices, Inc.
*/
#include <linux/completion.h>
-#include <linux/cleanup.h>
#include <linux/device.h>
#include <linux/io.h>
#include <linux/jiffies.h>
@@ -23,10 +22,76 @@
#include "amd_init.h"
#include "amd_manager.h"
-#define DRV_NAME "amd_sdw_manager"
-
#define to_amd_sdw(b) container_of(b, struct amd_sdw_manager, bus)
+struct sdw_manager_dp_reg {
+ u32 frame_fmt_reg;
+ u32 sample_int_reg;
+ u32 hctrl_dp0_reg;
+ u32 offset_reg;
+ u32 lane_ctrl_ch_en_reg;
+};
+
+/*
+ * SDW0 Manager instance registers 6 CPU DAI (3 TX & 3 RX Ports)
+ * whereas SDW1 Manager Instance registers 2 CPU DAI (one TX & one RX port)
+ * Below is the CPU DAI <->Manager port number mapping
+ * i.e SDW0 Pin0 -> port number 0 -> AUDIO0 TX
+ * SDW0 Pin1 -> Port number 1 -> AUDIO1 TX
+ * SDW0 Pin2 -> Port number 2 -> AUDIO2 TX
+ * SDW0 Pin3 -> port number 3 -> AUDIO0 RX
+ * SDW0 Pin4 -> Port number 4 -> AUDIO1 RX
+ * SDW0 Pin5 -> Port number 5 -> AUDIO2 RX
+ * Whereas for SDW1 instance
+ * SDW1 Pin0 -> port number 0 -> AUDIO1 TX
+ * SDW1 Pin1 -> Port number 1 -> AUDIO1 RX
+ * Same mapping should be used for programming DMA controller registers in SoundWire DMA driver.
+ * i.e if AUDIO0 TX channel is selected then we need to use AUDIO0 TX registers for DMA programming
+ * in SoundWire DMA driver.
+ */
+
+static struct sdw_manager_dp_reg acp63_sdw0_dp_reg[AMD_ACP63_SDW0_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 struct sdw_manager_dp_reg acp63_sdw1_dp_reg[AMD_ACP63_SDW1_MAX_DAI] = {
+ {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_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}
+};
+
+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_ACP63_SDW_MAX_MANAGER_COUNT] = {
+ AMD_SDW0_EXT_INTR_MASK,
+ AMD_SDW1_EXT_INTR_MASK
+};
+
static int amd_acp63_sdw_clk_init_ctrl(struct amd_sdw_manager *amd_manager)
{
struct sdw_bus *bus = &amd_manager->bus;
@@ -219,32 +284,6 @@ static int amd_acp63_sdw_host_wake_enable(struct amd_sdw_manager *amd_manager, b
return 0;
}
-static void amd_sdw_ctl_word_prep(u32 *lower_word, u32 *upper_word, struct sdw_msg *msg,
- int cmd_offset)
-{
- u32 upper_data;
- u32 lower_data = 0;
- u16 addr;
- u8 upper_addr, lower_addr;
- u8 data = 0;
-
- addr = msg->addr + cmd_offset;
- upper_addr = (addr & 0xFF00) >> 8;
- lower_addr = addr & 0xFF;
-
- if (msg->flags == SDW_MSG_FLAG_WRITE)
- data = msg->buf[cmd_offset];
-
- upper_data = FIELD_PREP(AMD_SDW_MCP_CMD_DEV_ADDR, msg->dev_num);
- upper_data |= FIELD_PREP(AMD_SDW_MCP_CMD_COMMAND, msg->flags + 2);
- upper_data |= FIELD_PREP(AMD_SDW_MCP_CMD_REG_ADDR_HIGH, upper_addr);
- lower_data |= FIELD_PREP(AMD_SDW_MCP_CMD_REG_ADDR_LOW, lower_addr);
- lower_data |= FIELD_PREP(AMD_SDW_MCP_CMD_REG_DATA, data);
-
- *upper_word = upper_data;
- *lower_word = lower_data;
-}
-
static int amd_acp63_sdw_send_cmd_get_resp(struct amd_sdw_manager *amd_manager, u32 lower_data,
u32 upper_data, u64 *response)
{
@@ -289,158 +328,6 @@ static int amd_acp63_sdw_send_cmd_get_resp(struct amd_sdw_manager *amd_manager,
return 0;
}
-static enum sdw_command_response
-amd_program_scp_addr(struct amd_sdw_manager *amd_manager, struct sdw_msg *msg)
-{
- struct sdw_msg scp_msg = {0};
- u64 response_buf[2] = {0};
- u32 upper_data = 0, lower_data = 0;
- int index;
-
- scp_msg.dev_num = msg->dev_num;
- scp_msg.addr = SDW_SCP_ADDRPAGE1;
- scp_msg.buf = &msg->addr_page1;
- scp_msg.flags = SDW_MSG_FLAG_WRITE;
- amd_sdw_ctl_word_prep(&lower_data, &upper_data, &scp_msg, 0);
- if (acp_sdw_send_cmd_get_resp(amd_manager, lower_data, upper_data, &response_buf[0])) {
- dev_err_ratelimited(amd_manager->dev,
- "SCP_addrpage command timeout for Slave %d\n", msg->dev_num);
- return SDW_CMD_TIMEOUT;
- }
- scp_msg.addr = SDW_SCP_ADDRPAGE2;
- scp_msg.buf = &msg->addr_page2;
- amd_sdw_ctl_word_prep(&lower_data, &upper_data, &scp_msg, 0);
- if (acp_sdw_send_cmd_get_resp(amd_manager, lower_data, upper_data, &response_buf[1])) {
- dev_err_ratelimited(amd_manager->dev,
- "SCP_addrpage command timeout for Slave %d\n", msg->dev_num);
- return SDW_CMD_TIMEOUT;
- }
-
- for (index = 0; index < 2; index++) {
- if (!(response_buf[index] & AMD_SDW_MCP_RESP_ACK)) {
- if (response_buf[index] & AMD_SDW_MCP_RESP_NACK) {
- dev_err_ratelimited(amd_manager->dev,
- "SCP_addrpage NACKed for Slave %d\n",
- msg->dev_num);
- return SDW_CMD_FAIL;
- }
- dev_dbg_ratelimited(amd_manager->dev, "SCP_addrpage ignored for Slave %d\n",
- msg->dev_num);
- return SDW_CMD_IGNORED;
- }
- }
- return SDW_CMD_OK;
-}
-
-static int amd_prep_msg(struct amd_sdw_manager *amd_manager, struct sdw_msg *msg)
-{
- int ret;
-
- if (msg->page) {
- ret = amd_program_scp_addr(amd_manager, msg);
- if (ret) {
- msg->len = 0;
- return ret;
- }
- }
- switch (msg->flags) {
- case SDW_MSG_FLAG_READ:
- case SDW_MSG_FLAG_WRITE:
- break;
- default:
- dev_err(amd_manager->dev, "Invalid msg cmd: %d\n", msg->flags);
- return -EINVAL;
- }
- return 0;
-}
-
-static enum sdw_command_response amd_sdw_fill_msg_resp(struct amd_sdw_manager *amd_manager,
- struct sdw_msg *msg, u64 response,
- int offset)
-{
- if (response & AMD_SDW_MCP_RESP_ACK) {
- if (msg->flags == SDW_MSG_FLAG_READ)
- msg->buf[offset] = FIELD_GET(AMD_SDW_MCP_RESP_RDATA, response);
- } else {
- if (response & AMD_SDW_MCP_RESP_NACK) {
- dev_err_ratelimited(amd_manager->dev,
- "command response NACK received for Slave %d\n",
- msg->dev_num);
- return SDW_CMD_FAIL;
- }
- dev_dbg_ratelimited(amd_manager->dev, "command is ignored for Slave %d\n",
- msg->dev_num);
- return SDW_CMD_IGNORED;
- }
- return SDW_CMD_OK;
-}
-
-/* AMD SoundWire bus helper shared across all ACP revisions. */
-static unsigned int _amd_sdw_xfer_msg(struct amd_sdw_manager *amd_manager, struct sdw_msg *msg,
- int cmd_offset)
-{
- u64 response;
- u32 upper_data = 0, lower_data = 0;
-
- amd_sdw_ctl_word_prep(&lower_data, &upper_data, msg, cmd_offset);
- if (acp_sdw_send_cmd_get_resp(amd_manager, lower_data, upper_data, &response)) {
- dev_err_ratelimited(amd_manager->dev, "command timeout for Slave %d\n",
- msg->dev_num);
- return SDW_CMD_TIMEOUT;
- }
- return amd_sdw_fill_msg_resp(amd_manager, msg, response, cmd_offset);
-}
-
-/* AMD SoundWire bus helper shared across all ACP revisions. */
-static enum sdw_command_response amd_sdw_xfer_msg(struct sdw_bus *bus, struct sdw_msg *msg)
-{
- struct amd_sdw_manager *amd_manager = to_amd_sdw(bus);
- int ret, i;
-
- ret = amd_prep_msg(amd_manager, msg);
- if (ret)
- return SDW_CMD_FAIL_OTHER;
- for (i = 0; i < msg->len; i++) {
- ret = _amd_sdw_xfer_msg(amd_manager, msg, i);
- if (ret)
- return ret;
- }
- return SDW_CMD_OK;
-}
-
-/* AMD SoundWire bus helper shared across all ACP revisions. */
-static void amd_sdw_fill_slave_status(struct amd_sdw_manager *amd_manager, u16 index, u32 status)
-{
- switch (status) {
- case SDW_SLAVE_ATTACHED:
- case SDW_SLAVE_UNATTACHED:
- case SDW_SLAVE_ALERT:
- amd_manager->status[index] = status;
- break;
- default:
- amd_manager->status[index] = SDW_SLAVE_RESERVED;
- break;
- }
-}
-
-/* AMD SoundWire bus helper shared across all ACP revisions. */
-static void amd_sdw_process_ping_status(u64 response, struct amd_sdw_manager *amd_manager)
-{
- u64 slave_stat;
- u32 val;
- 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, "slave_stat:0x%llx\n", 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, "val:0x%x\n", val);
- amd_sdw_fill_slave_status(amd_manager, dev_index, val);
- }
-}
-
static void amd_acp63_sdw_read_and_process_ping_status(struct amd_sdw_manager *amd_manager)
{
u64 response;
@@ -481,7 +368,7 @@ static u32 amd_acp63_sdw_read_ping_status(struct sdw_bus *bus)
return slave_stat;
}
-static int amd_acp63_sdw_compute_params(struct sdw_bus *bus, struct sdw_stream_runtime *stream)
+int amd_acp63_sdw_compute_params(struct sdw_bus *bus, struct sdw_stream_runtime *stream)
{
struct amd_sdw_manager *amd_manager = to_amd_sdw(bus);
struct sdw_transport_data t_data = {0};
@@ -726,228 +613,19 @@ static int amd_acp63_sdw_port_enable(struct sdw_bus *bus,
return 0;
}
-static int sdw_master_read_amd_prop(struct sdw_bus *bus)
-{
- struct amd_sdw_manager *amd_manager = to_amd_sdw(bus);
- struct fwnode_handle *link;
- struct sdw_master_prop *prop;
- u32 quirk_mask = 0;
- u32 wake_en_mask = 0;
- u32 power_mode_mask = 0;
- char name[32];
-
- prop = &bus->prop;
- /* Find manager handle */
- snprintf(name, sizeof(name), "mipi-sdw-link-%d-subproperties", bus->link_id);
- link = device_get_named_child_node(bus->dev, name);
- if (!link) {
- dev_err(bus->dev, "Manager node %s not found\n", name);
- return -EIO;
- }
- fwnode_property_read_u32(link, "amd-sdw-enable", &quirk_mask);
- if (!(quirk_mask & AMD_SDW_QUIRK_MASK_BUS_ENABLE))
- prop->hw_disabled = true;
- prop->quirks = SDW_MASTER_QUIRKS_CLEAR_INITIAL_CLASH |
- SDW_MASTER_QUIRKS_CLEAR_INITIAL_PARITY;
-
- fwnode_property_read_u32(link, "amd-sdw-wakeup-enable", &wake_en_mask);
- amd_manager->wake_en_mask = wake_en_mask;
- fwnode_property_read_u32(link, "amd-sdw-power-mode", &power_mode_mask);
- amd_manager->power_mode_mask = power_mode_mask;
-
- fwnode_handle_put(link);
-
- return 0;
-}
-
-/* AMD SoundWire bus helper shared across all ACP revisions. */
-static int amd_prop_read(struct sdw_bus *bus)
-{
- sdw_master_read_prop(bus);
- sdw_master_read_amd_prop(bus);
- return 0;
-}
-
-static const struct sdw_master_port_ops amd_acp63_sdw_port_ops = {
+const struct sdw_master_port_ops amd_acp63_sdw_port_ops = {
.dpn_set_port_params = amd_acp63_sdw_port_params,
.dpn_set_port_transport_params = amd_acp63_sdw_transport_params,
.dpn_port_enable_ch = amd_acp63_sdw_port_enable,
};
-static const struct sdw_master_ops amd_acp63_sdw_ops = {
+const struct sdw_master_ops amd_acp63_sdw_ops = {
.read_prop = amd_prop_read,
.xfer_msg = amd_sdw_xfer_msg,
.read_ping_status = amd_acp63_sdw_read_ping_status,
};
-static int amd_sdw_hw_params(struct snd_pcm_substream *substream,
- struct snd_pcm_hw_params *params,
- struct snd_soc_dai *dai)
-{
- struct amd_sdw_manager *amd_manager = snd_soc_dai_get_drvdata(dai);
- struct sdw_amd_dai_runtime *dai_runtime;
- struct sdw_stream_config sconfig;
- int ch, dir;
- int ret;
-
- dai_runtime = amd_manager->dai_runtime_array[dai->id];
- if (!dai_runtime)
- return -EIO;
-
- ch = params_channels(params);
- if (substream->stream == SNDRV_PCM_STREAM_CAPTURE)
- dir = SDW_DATA_DIR_RX;
- else
- dir = SDW_DATA_DIR_TX;
- dev_dbg(amd_manager->dev, "dir:%d dai->id:0x%x\n", dir, dai->id);
-
- sconfig.direction = dir;
- sconfig.ch_count = ch;
- sconfig.frame_rate = params_rate(params);
- sconfig.type = dai_runtime->stream_type;
-
- sconfig.bps = snd_pcm_format_width(params_format(params));
-
- /* Port configuration */
- struct sdw_port_config *pconfig __free(kfree) = kzalloc_obj(*pconfig);
- if (!pconfig)
- return -ENOMEM;
-
- pconfig->num = dai->id;
- pconfig->ch_mask = (1 << ch) - 1;
- ret = sdw_stream_add_master(&amd_manager->bus, &sconfig,
- pconfig, 1, dai_runtime->stream);
- if (ret)
- dev_err(amd_manager->dev, "add manager to stream failed:%d\n", ret);
-
- return ret;
-}
-
-static int amd_sdw_hw_free(struct snd_pcm_substream *substream, struct snd_soc_dai *dai)
-{
- struct amd_sdw_manager *amd_manager = snd_soc_dai_get_drvdata(dai);
- struct sdw_amd_dai_runtime *dai_runtime;
- int ret;
-
- dai_runtime = amd_manager->dai_runtime_array[dai->id];
- if (!dai_runtime)
- return -EIO;
-
- ret = sdw_stream_remove_master(&amd_manager->bus, dai_runtime->stream);
- if (ret < 0)
- dev_err(dai->dev, "remove manager from stream %s failed: %d\n",
- dai_runtime->stream->name, ret);
- return ret;
-}
-
-static int amd_set_sdw_stream(struct snd_soc_dai *dai, void *stream, int direction)
-{
- struct amd_sdw_manager *amd_manager = snd_soc_dai_get_drvdata(dai);
- struct sdw_amd_dai_runtime *dai_runtime;
-
- dai_runtime = amd_manager->dai_runtime_array[dai->id];
- if (stream) {
- /* first paranoia check */
- if (dai_runtime) {
- dev_err(dai->dev, "dai_runtime already allocated for dai %s\n", dai->name);
- return -EINVAL;
- }
-
- /* allocate and set dai_runtime info */
- dai_runtime = kzalloc_obj(*dai_runtime);
- if (!dai_runtime)
- return -ENOMEM;
-
- dai_runtime->stream_type = SDW_STREAM_PCM;
- dai_runtime->bus = &amd_manager->bus;
- dai_runtime->stream = stream;
- amd_manager->dai_runtime_array[dai->id] = dai_runtime;
- } else {
- /* second paranoia check */
- if (!dai_runtime) {
- dev_err(dai->dev, "dai_runtime not allocated for dai %s\n", dai->name);
- return -EINVAL;
- }
-
- /* for NULL stream we release allocated dai_runtime */
- kfree(dai_runtime);
- amd_manager->dai_runtime_array[dai->id] = NULL;
- }
- return 0;
-}
-
-static int amd_pcm_set_sdw_stream(struct snd_soc_dai *dai, void *stream, int direction)
-{
- return amd_set_sdw_stream(dai, stream, direction);
-}
-
-static void *amd_get_sdw_stream(struct snd_soc_dai *dai, int direction)
-{
- struct amd_sdw_manager *amd_manager = snd_soc_dai_get_drvdata(dai);
- struct sdw_amd_dai_runtime *dai_runtime;
-
- dai_runtime = amd_manager->dai_runtime_array[dai->id];
- if (!dai_runtime)
- return ERR_PTR(-EINVAL);
-
- return dai_runtime->stream;
-}
-
-static const struct snd_soc_dai_ops amd_sdw_dai_ops = {
- .hw_params = amd_sdw_hw_params,
- .hw_free = amd_sdw_hw_free,
- .set_stream = amd_pcm_set_sdw_stream,
- .get_stream = amd_get_sdw_stream,
-};
-
-static const struct snd_soc_component_driver amd_sdw_dai_component = {
- .name = "soundwire",
-};
-
-static int amd_sdw_register_dais(struct amd_sdw_manager *amd_manager)
-{
- struct sdw_amd_dai_runtime **dai_runtime_array;
- struct snd_soc_dai_driver *dais;
- struct snd_soc_pcm_stream *stream;
- struct device *dev;
- int i, num_dais;
-
- dev = amd_manager->dev;
- num_dais = amd_manager->num_dout_ports + amd_manager->num_din_ports;
- dais = devm_kcalloc(dev, num_dais, sizeof(*dais), GFP_KERNEL);
- if (!dais)
- return -ENOMEM;
-
- dai_runtime_array = devm_kcalloc(dev, num_dais,
- sizeof(struct sdw_amd_dai_runtime *),
- GFP_KERNEL);
- if (!dai_runtime_array)
- return -ENOMEM;
- amd_manager->dai_runtime_array = dai_runtime_array;
- for (i = 0; i < num_dais; i++) {
- dais[i].name = devm_kasprintf(dev, GFP_KERNEL, "SDW%d Pin%d", amd_manager->instance,
- i);
- if (!dais[i].name)
- return -ENOMEM;
- if (i < amd_manager->num_dout_ports)
- stream = &dais[i].playback;
- else
- stream = &dais[i].capture;
-
- stream->channels_min = 2;
- stream->channels_max = 2;
- stream->rates = SNDRV_PCM_RATE_48000;
- stream->formats = SNDRV_PCM_FMTBIT_S16_LE;
-
- dais[i].ops = &amd_sdw_dai_ops;
- dais[i].id = i;
- }
-
- return devm_snd_soc_register_component(dev, &amd_sdw_dai_component,
- dais, num_dais);
-}
-
-static void amd_acp63_sdw_update_slave_status_work(struct amd_sdw_manager *amd_manager)
+void amd_acp63_sdw_update_slave_status_work(struct amd_sdw_manager *amd_manager)
{
int retry_count = 0;
@@ -981,48 +659,6 @@ static void amd_acp63_sdw_update_slave_status_work(struct amd_sdw_manager *amd_m
}
}
-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);
-
- switch (amd_manager->acp_rev) {
- case ACP63_PCI_REV_ID:
- case ACP70_PCI_REV_ID:
- case ACP71_PCI_REV_ID:
- case ACP72_PCI_REV_ID:
- amd_acp63_sdw_update_slave_status_work(amd_manager);
- break;
- default:
- dev_err(amd_manager->dev, "unexpected acp_rev 0x%x\n", amd_manager->acp_rev);
- return;
- }
-}
-
-static void amd_sdw_update_slave_status(u32 status_change_0to7, u32 status_change_8to11,
- struct amd_sdw_manager *amd_manager)
-{
- u64 slave_stat;
- u32 val;
- 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, "status_change_0to7:0x%x status_change_8to11:0x%x\n",
- 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;
- amd_sdw_fill_slave_status(amd_manager, dev_index, val);
- }
- }
- }
-}
-
static void amd_acp63_sdw_process_wake_event(struct amd_sdw_manager *amd_manager)
{
dev_dbg(amd_manager->dev, "SoundWire Wake event reported\n");
@@ -1030,7 +666,7 @@ static void amd_acp63_sdw_process_wake_event(struct amd_sdw_manager *amd_manager
writel(0x00, amd_manager->acp_mmio + ACP_SW_WAKE_EN(amd_manager->instance));
}
-static void amd_acp63_sdw_irq_thread(struct amd_sdw_manager *amd_manager)
+void amd_acp63_sdw_irq_thread(struct amd_sdw_manager *amd_manager)
{
u32 status_change_8to11;
u32 status_change_0to7;
@@ -1060,89 +696,6 @@ static void amd_acp63_sdw_irq_thread(struct amd_sdw_manager *amd_manager)
writel(0x00, amd_manager->mmio + ACP_SW_STATE_CHANGE_STATUS_0TO7);
}
-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);
-
- switch (amd_manager->acp_rev) {
- case ACP63_PCI_REV_ID:
- case ACP70_PCI_REV_ID:
- case ACP71_PCI_REV_ID:
- case ACP72_PCI_REV_ID:
- amd_acp63_sdw_irq_thread(amd_manager);
- break;
- default:
- dev_err(amd_manager->dev, "unexpected acp_rev 0x%x\n", amd_manager->acp_rev);
- return;
- }
-}
-
-int amd_sdw_manager_start(struct amd_sdw_manager *amd_manager)
-{
- struct sdw_master_prop *prop;
- int ret;
-
- prop = &amd_manager->bus.prop;
- if (!prop->hw_disabled) {
- ret = acp_sdw_clk_init_ctrl(amd_manager);
- if (ret)
- return ret;
- ret = acp_init_sdw_manager(amd_manager);
- if (ret)
- return ret;
- acp_enable_sdw_interrupts(amd_manager);
- ret = acp_enable_sdw_manager(amd_manager);
- if (ret)
- return ret;
- acp_sdw_set_frameshape(amd_manager);
- }
- /* Enable runtime PM */
- pm_runtime_set_autosuspend_delay(amd_manager->dev, AMD_SDW_MASTER_SUSPEND_DELAY_MS);
- pm_runtime_use_autosuspend(amd_manager->dev);
- pm_runtime_mark_last_busy(amd_manager->dev);
- pm_runtime_set_active(amd_manager->dev);
- pm_runtime_enable(amd_manager->dev);
- return 0;
-}
-
-/*
- * AMD SoundWire clock-stop sequence shared across all ACP revisions.
- * Differences between revisions in this path are minimal; a switch/case
- * on acp_rev is sufficient to accommodate any variant-specific additions
- * needed for future platforms.
- */
-static int amd_sdw_clock_stop(struct amd_sdw_manager *amd_manager)
-{
- u32 val;
- 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;
- }
-
- ret = readl_poll_timeout(amd_manager->mmio + ACP_SW_CLK_RESUME_CTRL, val,
- (val & AMD_SDW_CLK_STOP_DONE), ACP_DELAY_US, AMD_SDW_TIMEOUT);
- if (ret) {
- dev_err(amd_manager->dev, "SDW%x clock stop failed\n", amd_manager->instance);
- return 0;
- }
-
- amd_manager->clk_stopped = true;
- if (amd_manager->wake_en_mask)
- 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_acp63_sdw_clock_stop_exit(struct amd_sdw_manager *amd_manager)
{
int ret;
@@ -1172,77 +725,6 @@ static int amd_acp63_sdw_clock_stop_exit(struct amd_sdw_manager *amd_manager)
return 0;
}
-static int amd_resume_child_device(struct device *dev, void *data)
-{
- struct sdw_slave *slave = dev_to_sdw_dev(dev);
- int ret;
-
- if (!slave->probed) {
- dev_dbg(dev, "skipping device, no probed driver\n");
- return 0;
- }
- if (!slave->dev_num_sticky) {
- dev_dbg(dev, "skipping device, never detected on bus\n");
- return 0;
- }
- ret = pm_request_resume(dev);
- if (ret < 0) {
- dev_err(dev, "pm_request_resume failed: %d\n", ret);
- return ret;
- }
- return 0;
-}
-
-static int __maybe_unused amd_pm_prepare(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, ignoring\n",
- bus->link_id);
- return 0;
- }
- /*
- * When multiple peripheral devices connected over the same link, if SoundWire manager
- * device is not in runtime suspend state, observed that device alerts are missing
- * without pm_prepare on AMD platforms in clockstop mode0.
- */
- if (amd_manager->power_mode_mask) {
- ret = pm_runtime_resume(dev);
- if (ret < 0) {
- dev_err(bus->dev, "pm_runtime_resume failed: %d\n", ret);
- return 0;
- }
- }
- /* To force peripheral devices to system level suspend state, resume the devices
- * from runtime suspend state first. Without that unable to dispatch the alert
- * status to peripheral driver during system level resume as they are in runtime
- * suspend state.
- */
- ret = device_for_each_child(bus->dev, NULL, amd_resume_child_device);
- if (ret < 0)
- dev_err(dev, "amd_resume_child_device failed: %d\n", ret);
- return 0;
-}
-
-static int amd_sdw_host_wake_enable_by_rev(struct amd_sdw_manager *amd_manager, bool enable)
-{
- switch (amd_manager->acp_rev) {
- case ACP63_PCI_REV_ID:
- break;
- case ACP70_PCI_REV_ID:
- case ACP71_PCI_REV_ID:
- case ACP72_PCI_REV_ID:
- return acp_sdw_host_wake_enable(amd_manager, enable);
- default:
- dev_err(amd_manager->dev, "unexpected acp_rev 0x%x\n", amd_manager->acp_rev);
- return -EINVAL;
- }
- return 0;
-}
-
static int amd_acp63_sdw_suspend(struct amd_sdw_manager *amd_manager)
{
struct sdw_bus *bus = &amd_manager->bus;
@@ -1442,139 +924,6 @@ static int amd_acp63_sdw_resume_runtime(struct amd_sdw_manager *amd_manager)
return 0;
}
-static int __maybe_unused amd_suspend(struct device *dev)
-{
- return acp_sdw_suspend(dev);
-}
-
-static int __maybe_unused amd_suspend_runtime(struct device *dev)
-{
- return acp_sdw_suspend_runtime(dev);
-}
-
-static int __maybe_unused amd_resume_runtime(struct device *dev)
-{
- return acp_sdw_resume_runtime(dev);
-}
-
-static int amd_sdw_hw_init_ops(struct amd_sdw_manager *amd_manager);
-
-static int amd_sdw_manager_probe(struct platform_device *pdev)
-{
- const struct acp_sdw_pdata *pdata = pdev->dev.platform_data;
- struct resource *res;
- struct device *dev = &pdev->dev;
- struct sdw_master_prop *prop;
- struct amd_sdw_manager *amd_manager;
- int ret;
-
- amd_manager = devm_kzalloc(dev, sizeof(struct amd_sdw_manager), GFP_KERNEL);
- if (!amd_manager)
- return -ENOMEM;
-
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- if (!res)
- return -ENOMEM;
-
- amd_manager->acp_mmio = devm_ioremap(dev, res->start, resource_size(res));
- if (!amd_manager->acp_mmio) {
- dev_err(dev, "mmio not found\n");
- return -ENOMEM;
- }
- amd_manager->ping_slave_stat = U32_MAX;
- amd_manager->instance = pdata->instance;
- amd_manager->mmio = amd_manager->acp_mmio +
- (amd_manager->instance * ACP63_SDW_MANAGER_REG_OFFSET);
- amd_manager->acp_sdw_lock = pdata->acp_sdw_lock;
- amd_manager->acp_rev = pdata->acp_rev;
- amd_manager->cols_index = sdw_find_col_index(AMD_SDW_DEFAULT_COLUMNS);
- amd_manager->rows_index = sdw_find_row_index(AMD_SDW_DEFAULT_ROWS);
- amd_manager->dev = dev;
- amd_manager->bus.ops = &amd_acp63_sdw_ops;
- amd_manager->bus.port_ops = &amd_acp63_sdw_port_ops;
- amd_manager->bus.compute_params = &amd_acp63_sdw_compute_params;
- amd_manager->bus.clk_stop_timeout = 200;
- amd_manager->bus.link_id = amd_manager->instance;
- ret = amd_sdw_hw_init_ops(amd_manager);
- if (ret) {
- dev_err(dev, "Failed to initialize hw ops (%d)\n", ret);
- return ret;
- }
-
- /*
- * Due to BIOS compatibility, the two links are exposed within
- * the scope of a single controller. If this changes, the
- * controller_id will have to be updated with drv_data
- * information.
- */
- amd_manager->bus.controller_id = 0;
- dev_dbg(dev, "acp_rev:0x%x\n", amd_manager->acp_rev);
- switch (amd_manager->acp_rev) {
- case ACP63_PCI_REV_ID:
- switch (amd_manager->instance) {
- case ACP_SDW0:
- amd_manager->num_dout_ports = AMD_ACP63_SDW0_MAX_TX_PORTS;
- amd_manager->num_din_ports = AMD_ACP63_SDW0_MAX_RX_PORTS;
- break;
- case ACP_SDW1:
- amd_manager->num_dout_ports = AMD_ACP63_SDW1_MAX_TX_PORTS;
- amd_manager->num_din_ports = AMD_ACP63_SDW1_MAX_RX_PORTS;
- break;
- default:
- return -EINVAL;
- }
- break;
- case ACP70_PCI_REV_ID:
- case ACP71_PCI_REV_ID:
- case ACP72_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;
- }
- amd_manager->max_ports = amd_manager->num_dout_ports + amd_manager->num_din_ports;
- amd_manager->port_offset_map = devm_kcalloc(dev, amd_manager->max_ports,
- sizeof(int), GFP_KERNEL);
- if (!amd_manager->port_offset_map)
- return -ENOMEM;
-
- prop = &amd_manager->bus.prop;
- prop->mclk_freq = AMD_SDW_BUS_BASE_FREQ;
-
- ret = sdw_bus_master_add(&amd_manager->bus, dev, dev->fwnode);
- if (ret) {
- dev_err(dev, "Failed to register SoundWire manager(%d)\n", ret);
- return ret;
- }
- ret = amd_sdw_register_dais(amd_manager);
- if (ret) {
- dev_err(dev, "CPU DAI registration failed\n");
- sdw_bus_master_delete(&amd_manager->bus);
- 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);
- return 0;
-}
-
-static void amd_sdw_manager_remove(struct platform_device *pdev)
-{
- struct amd_sdw_manager *amd_manager = dev_get_drvdata(&pdev->dev);
- int ret;
-
- if (pm_runtime_enabled(&pdev->dev))
- pm_runtime_disable(&pdev->dev);
- acp_disable_sdw_interrupts(amd_manager);
- cancel_work_sync(&amd_manager->amd_sdw_irq_thread);
- cancel_work_sync(&amd_manager->amd_sdw_work);
- sdw_bus_master_delete(&amd_manager->bus);
- ret = acp_disable_sdw_manager(amd_manager);
- if (ret)
- dev_err(&pdev->dev, "Failed to disable device (%pe)\n", ERR_PTR(ret));
-}
-
static const struct amd_sdw_hw_ops amd_acp63_hw_ops = {
.init_sdw_manager = amd_acp63_init_sdw_manager,
.enable_sdw_manager = amd_acp63_enable_sdw_manager,
@@ -1595,7 +944,7 @@ static const struct amd_sdw_hw_ops amd_acp63_hw_ops = {
.resume_runtime = amd_acp63_sdw_resume_runtime,
};
-static int amd_sdw_hw_init_ops(struct amd_sdw_manager *amd_manager)
+int amd_sdw_hw_init_ops(struct amd_sdw_manager *amd_manager)
{
switch (amd_manager->acp_rev) {
case ACP63_PCI_REV_ID:
@@ -1609,24 +958,3 @@ static int amd_sdw_hw_init_ops(struct amd_sdw_manager *amd_manager)
}
return 0;
}
-
-static const struct dev_pm_ops amd_pm = {
- .prepare = amd_pm_prepare,
- SET_SYSTEM_SLEEP_PM_OPS(amd_suspend, amd_resume_runtime)
- 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);
-
-MODULE_AUTHOR("Vijendar.Mukunda@amd.com");
-MODULE_DESCRIPTION("AMD SoundWire driver");
-MODULE_LICENSE("Dual BSD/GPL");
-MODULE_ALIAS("platform:" DRV_NAME);
diff --git a/drivers/soundwire/amd_manager.h b/drivers/soundwire/amd_manager.h
index d66b8d6f41c1..cbd91eb2411f 100644
--- a/drivers/soundwire/amd_manager.h
+++ b/drivers/soundwire/amd_manager.h
@@ -207,73 +207,23 @@
#define AMD_SDW_DEVICE_STATE_D3 3
#define ACP_PME_EN 0x0001400
-struct sdw_manager_dp_reg {
- u32 frame_fmt_reg;
- u32 sample_int_reg;
- u32 hctrl_dp0_reg;
- u32 offset_reg;
- u32 lane_ctrl_ch_en_reg;
-};
-
-/*
- * SDW0 Manager instance registers 6 CPU DAI (3 TX & 3 RX Ports)
- * whereas SDW1 Manager Instance registers 2 CPU DAI (one TX & one RX port)
- * Below is the CPU DAI <->Manager port number mapping
- * i.e SDW0 Pin0 -> port number 0 -> AUDIO0 TX
- * SDW0 Pin1 -> Port number 1 -> AUDIO1 TX
- * SDW0 Pin2 -> Port number 2 -> AUDIO2 TX
- * SDW0 Pin3 -> port number 3 -> AUDIO0 RX
- * SDW0 Pin4 -> Port number 4 -> AUDIO1 RX
- * SDW0 Pin5 -> Port number 5 -> AUDIO2 RX
- * Whereas for SDW1 instance
- * SDW1 Pin0 -> port number 0 -> AUDIO1 TX
- * SDW1 Pin1 -> Port number 1 -> AUDIO1 RX
- * Same mapping should be used for programming DMA controller registers in SoundWire DMA driver.
- * i.e if AUDIO0 TX channel is selected then we need to use AUDIO0 TX registers for DMA programming
- * in SoundWire DMA driver.
- */
-
-static struct sdw_manager_dp_reg acp63_sdw0_dp_reg[AMD_ACP63_SDW0_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 struct sdw_manager_dp_reg acp63_sdw1_dp_reg[AMD_ACP63_SDW1_MAX_DAI] = {
- {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_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}
-};
-
-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_ACP63_SDW_MAX_MANAGER_COUNT] = {
- AMD_SDW0_EXT_INTR_MASK,
- AMD_SDW1_EXT_INTR_MASK
-};
+/* Cross-file prototypes: amd_manager_common.c functions used by amd_acp63_manager.c */
+enum sdw_command_response amd_sdw_xfer_msg(struct sdw_bus *bus, struct sdw_msg *msg);
+void amd_sdw_fill_slave_status(struct amd_sdw_manager *amd_manager, u16 index, u32 status);
+void amd_sdw_process_ping_status(u64 response, struct amd_sdw_manager *amd_manager);
+void amd_sdw_update_slave_status(u32 status_change_0to7, u32 status_change_8to11,
+ struct amd_sdw_manager *amd_manager);
+int amd_sdw_clock_stop(struct amd_sdw_manager *amd_manager);
+int amd_sdw_host_wake_enable_by_rev(struct amd_sdw_manager *amd_manager, bool enable);
+int amd_prop_read(struct sdw_bus *bus);
+
+/* Cross-file prototypes: amd_acp63_manager.c symbols used by amd_manager_common.c */
+int amd_sdw_hw_init_ops(struct amd_sdw_manager *amd_manager);
+int amd_acp63_sdw_compute_params(struct sdw_bus *bus, struct sdw_stream_runtime *stream);
+extern const struct sdw_master_port_ops amd_acp63_sdw_port_ops;
+extern const struct sdw_master_ops amd_acp63_sdw_ops;
+void amd_acp63_sdw_irq_thread(struct amd_sdw_manager *amd_manager);
+void amd_acp63_sdw_update_slave_status_work(struct amd_sdw_manager *amd_manager);
#define AMD_SDW_HW_OPS(amd_manager, cb) ((amd_manager)->hw_ops->cb)
diff --git a/drivers/soundwire/amd_manager_common.c b/drivers/soundwire/amd_manager_common.c
new file mode 100644
index 000000000000..94b4b611a2ea
--- /dev/null
+++ b/drivers/soundwire/amd_manager_common.c
@@ -0,0 +1,773 @@
+// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)
+/*
+ * SoundWire AMD Manager driver
+ *
+ * Copyright 2026 Advanced Micro Devices, Inc.
+ */
+
+#include <linux/completion.h>
+#include <linux/cleanup.h>
+#include <linux/device.h>
+#include <linux/io.h>
+#include <linux/jiffies.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#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>
+#include "bus.h"
+#include "amd_init.h"
+#include "amd_manager.h"
+
+#define DRV_NAME "amd_sdw_manager"
+
+#define to_amd_sdw(b) container_of(b, struct amd_sdw_manager, bus)
+
+static void amd_sdw_ctl_word_prep(u32 *lower_word, u32 *upper_word, struct sdw_msg *msg,
+ int cmd_offset)
+{
+ u32 upper_data;
+ u32 lower_data = 0;
+ u16 addr;
+ u8 upper_addr, lower_addr;
+ u8 data = 0;
+
+ addr = msg->addr + cmd_offset;
+ upper_addr = (addr & 0xFF00) >> 8;
+ lower_addr = addr & 0xFF;
+
+ if (msg->flags == SDW_MSG_FLAG_WRITE)
+ data = msg->buf[cmd_offset];
+
+ upper_data = FIELD_PREP(AMD_SDW_MCP_CMD_DEV_ADDR, msg->dev_num);
+ upper_data |= FIELD_PREP(AMD_SDW_MCP_CMD_COMMAND, msg->flags + 2);
+ upper_data |= FIELD_PREP(AMD_SDW_MCP_CMD_REG_ADDR_HIGH, upper_addr);
+ lower_data |= FIELD_PREP(AMD_SDW_MCP_CMD_REG_ADDR_LOW, lower_addr);
+ lower_data |= FIELD_PREP(AMD_SDW_MCP_CMD_REG_DATA, data);
+
+ *upper_word = upper_data;
+ *lower_word = lower_data;
+}
+
+static enum sdw_command_response
+amd_program_scp_addr(struct amd_sdw_manager *amd_manager, struct sdw_msg *msg)
+{
+ struct sdw_msg scp_msg = {0};
+ u64 response_buf[2] = {0};
+ u32 upper_data = 0, lower_data = 0;
+ int index;
+
+ scp_msg.dev_num = msg->dev_num;
+ scp_msg.addr = SDW_SCP_ADDRPAGE1;
+ scp_msg.buf = &msg->addr_page1;
+ scp_msg.flags = SDW_MSG_FLAG_WRITE;
+ amd_sdw_ctl_word_prep(&lower_data, &upper_data, &scp_msg, 0);
+ if (acp_sdw_send_cmd_get_resp(amd_manager, lower_data, upper_data, &response_buf[0])) {
+ dev_err_ratelimited(amd_manager->dev,
+ "SCP_addrpage command timeout for Slave %d\n", msg->dev_num);
+ return SDW_CMD_TIMEOUT;
+ }
+ scp_msg.addr = SDW_SCP_ADDRPAGE2;
+ scp_msg.buf = &msg->addr_page2;
+ amd_sdw_ctl_word_prep(&lower_data, &upper_data, &scp_msg, 0);
+ if (acp_sdw_send_cmd_get_resp(amd_manager, lower_data, upper_data, &response_buf[1])) {
+ dev_err_ratelimited(amd_manager->dev,
+ "SCP_addrpage command timeout for Slave %d\n", msg->dev_num);
+ return SDW_CMD_TIMEOUT;
+ }
+
+ for (index = 0; index < 2; index++) {
+ if (!(response_buf[index] & AMD_SDW_MCP_RESP_ACK)) {
+ if (response_buf[index] & AMD_SDW_MCP_RESP_NACK) {
+ dev_err_ratelimited(amd_manager->dev,
+ "SCP_addrpage NACKed for Slave %d\n",
+ msg->dev_num);
+ return SDW_CMD_FAIL;
+ }
+ dev_dbg_ratelimited(amd_manager->dev, "SCP_addrpage ignored for Slave %d\n",
+ msg->dev_num);
+ return SDW_CMD_IGNORED;
+ }
+ }
+ return SDW_CMD_OK;
+}
+
+static int amd_prep_msg(struct amd_sdw_manager *amd_manager, struct sdw_msg *msg)
+{
+ int ret;
+
+ if (msg->page) {
+ ret = amd_program_scp_addr(amd_manager, msg);
+ if (ret) {
+ msg->len = 0;
+ return ret;
+ }
+ }
+ switch (msg->flags) {
+ case SDW_MSG_FLAG_READ:
+ case SDW_MSG_FLAG_WRITE:
+ break;
+ default:
+ dev_err(amd_manager->dev, "Invalid msg cmd: %d\n", msg->flags);
+ return -EINVAL;
+ }
+ return 0;
+}
+
+static enum sdw_command_response amd_sdw_fill_msg_resp(struct amd_sdw_manager *amd_manager,
+ struct sdw_msg *msg, u64 response,
+ int offset)
+{
+ if (response & AMD_SDW_MCP_RESP_ACK) {
+ if (msg->flags == SDW_MSG_FLAG_READ)
+ msg->buf[offset] = FIELD_GET(AMD_SDW_MCP_RESP_RDATA, response);
+ } else {
+ if (response & AMD_SDW_MCP_RESP_NACK) {
+ dev_err_ratelimited(amd_manager->dev,
+ "command response NACK received for Slave %d\n",
+ msg->dev_num);
+ return SDW_CMD_FAIL;
+ }
+ dev_dbg_ratelimited(amd_manager->dev, "command is ignored for Slave %d\n",
+ msg->dev_num);
+ return SDW_CMD_IGNORED;
+ }
+ return SDW_CMD_OK;
+}
+
+/* AMD SoundWire bus helper shared across all ACP revisions. */
+static unsigned int _amd_sdw_xfer_msg(struct amd_sdw_manager *amd_manager, struct sdw_msg *msg,
+ int cmd_offset)
+{
+ u64 response;
+ u32 upper_data = 0, lower_data = 0;
+
+ amd_sdw_ctl_word_prep(&lower_data, &upper_data, msg, cmd_offset);
+ if (acp_sdw_send_cmd_get_resp(amd_manager, lower_data, upper_data, &response)) {
+ dev_err_ratelimited(amd_manager->dev, "command timeout for Slave %d\n",
+ msg->dev_num);
+ return SDW_CMD_TIMEOUT;
+ }
+ return amd_sdw_fill_msg_resp(amd_manager, msg, response, cmd_offset);
+}
+
+/* AMD SoundWire bus helper shared across all ACP revisions. */
+enum sdw_command_response amd_sdw_xfer_msg(struct sdw_bus *bus, struct sdw_msg *msg)
+{
+ struct amd_sdw_manager *amd_manager = to_amd_sdw(bus);
+ int ret, i;
+
+ ret = amd_prep_msg(amd_manager, msg);
+ if (ret)
+ return SDW_CMD_FAIL_OTHER;
+ for (i = 0; i < msg->len; i++) {
+ ret = _amd_sdw_xfer_msg(amd_manager, msg, i);
+ if (ret)
+ return ret;
+ }
+ return SDW_CMD_OK;
+}
+
+/* AMD SoundWire bus helper shared across all ACP revisions. */
+void amd_sdw_fill_slave_status(struct amd_sdw_manager *amd_manager, u16 index, u32 status)
+{
+ switch (status) {
+ case SDW_SLAVE_ATTACHED:
+ case SDW_SLAVE_UNATTACHED:
+ case SDW_SLAVE_ALERT:
+ amd_manager->status[index] = status;
+ break;
+ default:
+ amd_manager->status[index] = SDW_SLAVE_RESERVED;
+ break;
+ }
+}
+
+/* AMD SoundWire bus helper shared across all ACP revisions. */
+void amd_sdw_process_ping_status(u64 response, struct amd_sdw_manager *amd_manager)
+{
+ u64 slave_stat;
+ u32 val;
+ 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, "slave_stat:0x%llx\n", 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, "val:0x%x\n", val);
+ amd_sdw_fill_slave_status(amd_manager, dev_index, val);
+ }
+}
+
+static int sdw_master_read_amd_prop(struct sdw_bus *bus)
+{
+ struct amd_sdw_manager *amd_manager = to_amd_sdw(bus);
+ struct fwnode_handle *link;
+ struct sdw_master_prop *prop;
+ u32 quirk_mask = 0;
+ u32 wake_en_mask = 0;
+ u32 power_mode_mask = 0;
+ char name[32];
+
+ prop = &bus->prop;
+ /* Find manager handle */
+ snprintf(name, sizeof(name), "mipi-sdw-link-%d-subproperties", bus->link_id);
+ link = device_get_named_child_node(bus->dev, name);
+ if (!link) {
+ dev_err(bus->dev, "Manager node %s not found\n", name);
+ return -EIO;
+ }
+ fwnode_property_read_u32(link, "amd-sdw-enable", &quirk_mask);
+ if (!(quirk_mask & AMD_SDW_QUIRK_MASK_BUS_ENABLE))
+ prop->hw_disabled = true;
+ prop->quirks = SDW_MASTER_QUIRKS_CLEAR_INITIAL_CLASH |
+ SDW_MASTER_QUIRKS_CLEAR_INITIAL_PARITY;
+
+ fwnode_property_read_u32(link, "amd-sdw-wakeup-enable", &wake_en_mask);
+ amd_manager->wake_en_mask = wake_en_mask;
+ fwnode_property_read_u32(link, "amd-sdw-power-mode", &power_mode_mask);
+ amd_manager->power_mode_mask = power_mode_mask;
+
+ fwnode_handle_put(link);
+
+ return 0;
+}
+
+/* AMD SoundWire bus helper shared across all ACP revisions. */
+int amd_prop_read(struct sdw_bus *bus)
+{
+ sdw_master_read_prop(bus);
+ sdw_master_read_amd_prop(bus);
+ return 0;
+}
+
+static int amd_sdw_hw_params(struct snd_pcm_substream *substream,
+ struct snd_pcm_hw_params *params,
+ struct snd_soc_dai *dai)
+{
+ struct amd_sdw_manager *amd_manager = snd_soc_dai_get_drvdata(dai);
+ struct sdw_amd_dai_runtime *dai_runtime;
+ struct sdw_stream_config sconfig;
+ int ch, dir;
+ int ret;
+
+ dai_runtime = amd_manager->dai_runtime_array[dai->id];
+ if (!dai_runtime)
+ return -EIO;
+
+ ch = params_channels(params);
+ if (substream->stream == SNDRV_PCM_STREAM_CAPTURE)
+ dir = SDW_DATA_DIR_RX;
+ else
+ dir = SDW_DATA_DIR_TX;
+ dev_dbg(amd_manager->dev, "dir:%d dai->id:0x%x\n", dir, dai->id);
+
+ sconfig.direction = dir;
+ sconfig.ch_count = ch;
+ sconfig.frame_rate = params_rate(params);
+ sconfig.type = dai_runtime->stream_type;
+
+ sconfig.bps = snd_pcm_format_width(params_format(params));
+
+ /* Port configuration */
+ struct sdw_port_config *pconfig __free(kfree) = kzalloc_obj(*pconfig);
+ if (!pconfig)
+ return -ENOMEM;
+
+ pconfig->num = dai->id;
+ pconfig->ch_mask = (1 << ch) - 1;
+ ret = sdw_stream_add_master(&amd_manager->bus, &sconfig,
+ pconfig, 1, dai_runtime->stream);
+ if (ret)
+ dev_err(amd_manager->dev, "add manager to stream failed:%d\n", ret);
+
+ return ret;
+}
+
+static int amd_sdw_hw_free(struct snd_pcm_substream *substream, struct snd_soc_dai *dai)
+{
+ struct amd_sdw_manager *amd_manager = snd_soc_dai_get_drvdata(dai);
+ struct sdw_amd_dai_runtime *dai_runtime;
+ int ret;
+
+ dai_runtime = amd_manager->dai_runtime_array[dai->id];
+ if (!dai_runtime)
+ return -EIO;
+
+ ret = sdw_stream_remove_master(&amd_manager->bus, dai_runtime->stream);
+ if (ret < 0)
+ dev_err(dai->dev, "remove manager from stream %s failed: %d\n",
+ dai_runtime->stream->name, ret);
+ return ret;
+}
+
+static int amd_set_sdw_stream(struct snd_soc_dai *dai, void *stream, int direction)
+{
+ struct amd_sdw_manager *amd_manager = snd_soc_dai_get_drvdata(dai);
+ struct sdw_amd_dai_runtime *dai_runtime;
+
+ dai_runtime = amd_manager->dai_runtime_array[dai->id];
+ if (stream) {
+ /* first paranoia check */
+ if (dai_runtime) {
+ dev_err(dai->dev, "dai_runtime already allocated for dai %s\n", dai->name);
+ return -EINVAL;
+ }
+
+ /* allocate and set dai_runtime info */
+ dai_runtime = kzalloc_obj(*dai_runtime);
+ if (!dai_runtime)
+ return -ENOMEM;
+
+ dai_runtime->stream_type = SDW_STREAM_PCM;
+ dai_runtime->bus = &amd_manager->bus;
+ dai_runtime->stream = stream;
+ amd_manager->dai_runtime_array[dai->id] = dai_runtime;
+ } else {
+ /* second paranoia check */
+ if (!dai_runtime) {
+ dev_err(dai->dev, "dai_runtime not allocated for dai %s\n", dai->name);
+ return -EINVAL;
+ }
+
+ /* for NULL stream we release allocated dai_runtime */
+ kfree(dai_runtime);
+ amd_manager->dai_runtime_array[dai->id] = NULL;
+ }
+ return 0;
+}
+
+static int amd_pcm_set_sdw_stream(struct snd_soc_dai *dai, void *stream, int direction)
+{
+ return amd_set_sdw_stream(dai, stream, direction);
+}
+
+static void *amd_get_sdw_stream(struct snd_soc_dai *dai, int direction)
+{
+ struct amd_sdw_manager *amd_manager = snd_soc_dai_get_drvdata(dai);
+ struct sdw_amd_dai_runtime *dai_runtime;
+
+ dai_runtime = amd_manager->dai_runtime_array[dai->id];
+ if (!dai_runtime)
+ return ERR_PTR(-EINVAL);
+
+ return dai_runtime->stream;
+}
+
+static const struct snd_soc_dai_ops amd_sdw_dai_ops = {
+ .hw_params = amd_sdw_hw_params,
+ .hw_free = amd_sdw_hw_free,
+ .set_stream = amd_pcm_set_sdw_stream,
+ .get_stream = amd_get_sdw_stream,
+};
+
+static const struct snd_soc_component_driver amd_sdw_dai_component = {
+ .name = "soundwire",
+};
+
+static int amd_sdw_register_dais(struct amd_sdw_manager *amd_manager)
+{
+ struct sdw_amd_dai_runtime **dai_runtime_array;
+ struct snd_soc_dai_driver *dais;
+ struct snd_soc_pcm_stream *stream;
+ struct device *dev;
+ int i, num_dais;
+
+ dev = amd_manager->dev;
+ num_dais = amd_manager->num_dout_ports + amd_manager->num_din_ports;
+ dais = devm_kcalloc(dev, num_dais, sizeof(*dais), GFP_KERNEL);
+ if (!dais)
+ return -ENOMEM;
+
+ dai_runtime_array = devm_kcalloc(dev, num_dais,
+ sizeof(struct sdw_amd_dai_runtime *),
+ GFP_KERNEL);
+ if (!dai_runtime_array)
+ return -ENOMEM;
+ amd_manager->dai_runtime_array = dai_runtime_array;
+ for (i = 0; i < num_dais; i++) {
+ dais[i].name = devm_kasprintf(dev, GFP_KERNEL, "SDW%d Pin%d", amd_manager->instance,
+ i);
+ if (!dais[i].name)
+ return -ENOMEM;
+ if (i < amd_manager->num_dout_ports)
+ stream = &dais[i].playback;
+ else
+ stream = &dais[i].capture;
+
+ stream->channels_min = 2;
+ stream->channels_max = 2;
+ stream->rates = SNDRV_PCM_RATE_48000;
+ stream->formats = SNDRV_PCM_FMTBIT_S16_LE;
+
+ dais[i].ops = &amd_sdw_dai_ops;
+ dais[i].id = i;
+ }
+
+ return devm_snd_soc_register_component(dev, &amd_sdw_dai_component,
+ 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);
+
+ switch (amd_manager->acp_rev) {
+ case ACP63_PCI_REV_ID:
+ case ACP70_PCI_REV_ID:
+ case ACP71_PCI_REV_ID:
+ case ACP72_PCI_REV_ID:
+ amd_acp63_sdw_update_slave_status_work(amd_manager);
+ break;
+ default:
+ dev_err(amd_manager->dev, "unexpected acp_rev 0x%x\n", amd_manager->acp_rev);
+ return;
+ }
+}
+
+void amd_sdw_update_slave_status(u32 status_change_0to7, u32 status_change_8to11,
+ struct amd_sdw_manager *amd_manager)
+{
+ u64 slave_stat;
+ u32 val;
+ 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, "status_change_0to7:0x%x status_change_8to11:0x%x\n",
+ 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;
+ amd_sdw_fill_slave_status(amd_manager, dev_index, val);
+ }
+ }
+ }
+}
+
+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);
+
+ switch (amd_manager->acp_rev) {
+ case ACP63_PCI_REV_ID:
+ case ACP70_PCI_REV_ID:
+ case ACP71_PCI_REV_ID:
+ case ACP72_PCI_REV_ID:
+ amd_acp63_sdw_irq_thread(amd_manager);
+ break;
+ default:
+ dev_err(amd_manager->dev, "unexpected acp_rev 0x%x\n", amd_manager->acp_rev);
+ return;
+ }
+}
+
+int amd_sdw_manager_start(struct amd_sdw_manager *amd_manager)
+{
+ struct sdw_master_prop *prop;
+ int ret;
+
+ prop = &amd_manager->bus.prop;
+ if (!prop->hw_disabled) {
+ ret = acp_sdw_clk_init_ctrl(amd_manager);
+ if (ret)
+ return ret;
+ ret = acp_init_sdw_manager(amd_manager);
+ if (ret)
+ return ret;
+ acp_enable_sdw_interrupts(amd_manager);
+ ret = acp_enable_sdw_manager(amd_manager);
+ if (ret)
+ return ret;
+ acp_sdw_set_frameshape(amd_manager);
+ }
+ /* Enable runtime PM */
+ pm_runtime_set_autosuspend_delay(amd_manager->dev, AMD_SDW_MASTER_SUSPEND_DELAY_MS);
+ pm_runtime_use_autosuspend(amd_manager->dev);
+ pm_runtime_mark_last_busy(amd_manager->dev);
+ pm_runtime_set_active(amd_manager->dev);
+ pm_runtime_enable(amd_manager->dev);
+ return 0;
+}
+
+/*
+ * AMD SoundWire clock-stop sequence shared across all ACP revisions.
+ * Differences between revisions in this path are minimal; a switch/case
+ * on acp_rev is sufficient to accommodate any variant-specific additions
+ * needed for future platforms.
+ */
+int amd_sdw_clock_stop(struct amd_sdw_manager *amd_manager)
+{
+ u32 val;
+ 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;
+ }
+
+ ret = readl_poll_timeout(amd_manager->mmio + ACP_SW_CLK_RESUME_CTRL, val,
+ (val & AMD_SDW_CLK_STOP_DONE), ACP_DELAY_US, AMD_SDW_TIMEOUT);
+ if (ret) {
+ dev_err(amd_manager->dev, "SDW%x clock stop failed\n", amd_manager->instance);
+ return 0;
+ }
+
+ amd_manager->clk_stopped = true;
+ if (amd_manager->wake_en_mask)
+ 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_resume_child_device(struct device *dev, void *data)
+{
+ struct sdw_slave *slave = dev_to_sdw_dev(dev);
+ int ret;
+
+ if (!slave->probed) {
+ dev_dbg(dev, "skipping device, no probed driver\n");
+ return 0;
+ }
+ if (!slave->dev_num_sticky) {
+ dev_dbg(dev, "skipping device, never detected on bus\n");
+ return 0;
+ }
+ ret = pm_request_resume(dev);
+ if (ret < 0) {
+ dev_err(dev, "pm_request_resume failed: %d\n", ret);
+ return ret;
+ }
+ return 0;
+}
+
+static int __maybe_unused amd_pm_prepare(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, ignoring\n",
+ bus->link_id);
+ return 0;
+ }
+ /*
+ * When multiple peripheral devices connected over the same link, if SoundWire manager
+ * device is not in runtime suspend state, observed that device alerts are missing
+ * without pm_prepare on AMD platforms in clockstop mode0.
+ */
+ if (amd_manager->power_mode_mask) {
+ ret = pm_runtime_resume(dev);
+ if (ret < 0) {
+ dev_err(bus->dev, "pm_runtime_resume failed: %d\n", ret);
+ return 0;
+ }
+ }
+ /* To force peripheral devices to system level suspend state, resume the devices
+ * from runtime suspend state first. Without that unable to dispatch the alert
+ * status to peripheral driver during system level resume as they are in runtime
+ * suspend state.
+ */
+ ret = device_for_each_child(bus->dev, NULL, amd_resume_child_device);
+ if (ret < 0)
+ dev_err(dev, "amd_resume_child_device failed: %d\n", ret);
+ return 0;
+}
+
+int amd_sdw_host_wake_enable_by_rev(struct amd_sdw_manager *amd_manager, bool enable)
+{
+ switch (amd_manager->acp_rev) {
+ case ACP63_PCI_REV_ID:
+ break;
+ case ACP70_PCI_REV_ID:
+ case ACP71_PCI_REV_ID:
+ case ACP72_PCI_REV_ID:
+ return acp_sdw_host_wake_enable(amd_manager, enable);
+ default:
+ dev_err(amd_manager->dev, "unexpected acp_rev 0x%x\n", amd_manager->acp_rev);
+ return -EINVAL;
+ }
+ return 0;
+}
+
+static int __maybe_unused amd_suspend(struct device *dev)
+{
+ return acp_sdw_suspend(dev);
+}
+
+static int __maybe_unused amd_suspend_runtime(struct device *dev)
+{
+ return acp_sdw_suspend_runtime(dev);
+}
+
+static int __maybe_unused amd_resume_runtime(struct device *dev)
+{
+ return acp_sdw_resume_runtime(dev);
+}
+
+static int amd_sdw_manager_probe(struct platform_device *pdev)
+{
+ const struct acp_sdw_pdata *pdata = pdev->dev.platform_data;
+ struct resource *res;
+ struct device *dev = &pdev->dev;
+ struct sdw_master_prop *prop;
+ struct amd_sdw_manager *amd_manager;
+ int ret;
+
+ amd_manager = devm_kzalloc(dev, sizeof(struct amd_sdw_manager), GFP_KERNEL);
+ if (!amd_manager)
+ return -ENOMEM;
+
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ if (!res)
+ return -ENOMEM;
+
+ amd_manager->acp_mmio = devm_ioremap(dev, res->start, resource_size(res));
+ if (!amd_manager->acp_mmio) {
+ dev_err(dev, "mmio not found\n");
+ return -ENOMEM;
+ }
+ amd_manager->ping_slave_stat = U32_MAX;
+ amd_manager->instance = pdata->instance;
+ amd_manager->acp_sdw_lock = pdata->acp_sdw_lock;
+ amd_manager->acp_rev = pdata->acp_rev;
+ amd_manager->dev = dev;
+ amd_manager->bus.clk_stop_timeout = 200;
+ amd_manager->bus.link_id = amd_manager->instance;
+ ret = amd_sdw_hw_init_ops(amd_manager);
+ if (ret) {
+ dev_err(dev, "Failed to initialize hw ops (%d)\n", ret);
+ return ret;
+ }
+
+ /*
+ * Due to BIOS compatibility, the two links are exposed within
+ * the scope of a single controller. If this changes, the
+ * controller_id will have to be updated with drv_data
+ * information.
+ */
+ amd_manager->bus.controller_id = 0;
+ dev_dbg(dev, "acp_rev:0x%x\n", amd_manager->acp_rev);
+ switch (amd_manager->acp_rev) {
+ case ACP63_PCI_REV_ID:
+ switch (amd_manager->instance) {
+ case ACP_SDW0:
+ amd_manager->num_dout_ports = AMD_ACP63_SDW0_MAX_TX_PORTS;
+ amd_manager->num_din_ports = AMD_ACP63_SDW0_MAX_RX_PORTS;
+ break;
+ case ACP_SDW1:
+ amd_manager->num_dout_ports = AMD_ACP63_SDW1_MAX_TX_PORTS;
+ amd_manager->num_din_ports = AMD_ACP63_SDW1_MAX_RX_PORTS;
+ break;
+ default:
+ return -EINVAL;
+ }
+ break;
+ case ACP70_PCI_REV_ID:
+ case ACP71_PCI_REV_ID:
+ case ACP72_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:
+ dev_err(dev, "unsupported ACP revision: 0x%x\n", amd_manager->acp_rev);
+ return -EINVAL;
+ }
+ amd_manager->max_ports = amd_manager->num_dout_ports + amd_manager->num_din_ports;
+
+ switch (amd_manager->acp_rev) {
+ case ACP63_PCI_REV_ID:
+ case ACP70_PCI_REV_ID:
+ case ACP71_PCI_REV_ID:
+ case ACP72_PCI_REV_ID:
+ amd_manager->mmio = amd_manager->acp_mmio +
+ (amd_manager->instance * ACP63_SDW_MANAGER_REG_OFFSET);
+ amd_manager->bus.ops = &amd_acp63_sdw_ops;
+ amd_manager->bus.port_ops = &amd_acp63_sdw_port_ops;
+ amd_manager->bus.compute_params = &amd_acp63_sdw_compute_params;
+ amd_manager->port_offset_map = devm_kcalloc(dev, amd_manager->max_ports,
+ sizeof(int), GFP_KERNEL);
+ if (!amd_manager->port_offset_map)
+ return -ENOMEM;
+ break;
+ default:
+ dev_err(dev, "unsupported ACP revision: 0x%x\n", amd_manager->acp_rev);
+ return -EINVAL;
+ }
+
+ prop = &amd_manager->bus.prop;
+ prop->mclk_freq = AMD_SDW_BUS_BASE_FREQ;
+
+ ret = sdw_bus_master_add(&amd_manager->bus, dev, dev->fwnode);
+ if (ret) {
+ dev_err(dev, "Failed to register SoundWire manager(%d)\n", ret);
+ return ret;
+ }
+ ret = amd_sdw_register_dais(amd_manager);
+ if (ret) {
+ dev_err(dev, "CPU DAI registration failed\n");
+ sdw_bus_master_delete(&amd_manager->bus);
+ 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);
+ return 0;
+}
+
+static void amd_sdw_manager_remove(struct platform_device *pdev)
+{
+ struct amd_sdw_manager *amd_manager = dev_get_drvdata(&pdev->dev);
+ int ret;
+
+ if (pm_runtime_enabled(&pdev->dev))
+ pm_runtime_disable(&pdev->dev);
+ acp_disable_sdw_interrupts(amd_manager);
+ cancel_work_sync(&amd_manager->amd_sdw_irq_thread);
+ cancel_work_sync(&amd_manager->amd_sdw_work);
+ sdw_bus_master_delete(&amd_manager->bus);
+ ret = acp_disable_sdw_manager(amd_manager);
+ if (ret)
+ dev_err(&pdev->dev, "Failed to disable device (%pe)\n", ERR_PTR(ret));
+}
+
+static const struct dev_pm_ops amd_pm = {
+ .prepare = amd_pm_prepare,
+ SET_SYSTEM_SLEEP_PM_OPS(amd_suspend, amd_resume_runtime)
+ 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);
+
+MODULE_AUTHOR("Vijendar.Mukunda@amd.com");
+MODULE_DESCRIPTION("AMD SoundWire driver");
+MODULE_LICENSE("Dual BSD/GPL");
+MODULE_ALIAS("platform:" DRV_NAME);
--
2.48.1
^ permalink raw reply [flat|nested] 10+ messages in thread