[PATCH 8/9] soundwire: amd: wire amd_acp63_*() call sites through acp_*() helpers
From: Vijendar Mukunda
Date: Thu Sep 17 2026 - 05:14:50 EST
Extract PM logic into amd_acp63_sdw_suspend(),
amd_acp63_sdw_suspend_runtime() and
amd_acp63_sdw_resume_runtime() hw_ops callbacks, each taking
struct amd_sdw_manager * instead of struct device *.
Replace the existing amd_suspend(), amd_suspend_runtime() and
amd_resume_runtime() static wrappers with thin one-liners that
delegate to the corresponding acp_sdw_*() dispatch helpers.
Introduce a static const struct amd_sdw_hw_ops amd_acp63_hw_ops
table that populates all 19 hw_ops slots with the amd_acp63_*()
callbacks. Introduce amd_sdw_hw_init_ops() to assign a pointer
to this table based on acp_rev, and call it from
amd_sdw_manager_probe() to wire up the dispatch table at probe
time.
Convert all remaining direct amd_acp63_*() call sites in the
start, PM, interrupt, and remove paths to use the corresponding
acp_*() wrappers.
Place amd_acp63_hw_ops and amd_sdw_hw_init_ops() after
amd_sdw_manager_remove() so all amd_acp63_*() functions they
reference are already defined. Add a forward declaration of
amd_sdw_hw_init_ops() before amd_sdw_manager_probe() to resolve
the call site ordering.
Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@xxxxxxx>
---
drivers/soundwire/amd_manager.c | 366 ++++++++++++++++++--------------
1 file changed, 210 insertions(+), 156 deletions(-)
diff --git a/drivers/soundwire/amd_manager.c b/drivers/soundwire/amd_manager.c
index 87a2e779dd4e..834e943b040b 100644
--- a/drivers/soundwire/amd_manager.c
+++ b/drivers/soundwire/amd_manager.c
@@ -303,8 +303,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;
@@ -312,8 +311,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;
@@ -386,7 +384,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;
@@ -449,7 +447,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);
@@ -471,7 +469,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;
@@ -974,7 +972,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,
@@ -989,7 +987,7 @@ 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);
- amd_acp63_sdw_update_slave_status_work(amd_manager);
+ acp_sdw_update_slave_status_work(amd_manager);
}
static void amd_sdw_update_slave_status(u32 status_change_0to7, u32 status_change_8to11,
@@ -1037,10 +1035,10 @@ static void amd_acp63_sdw_irq_thread(struct amd_sdw_manager *amd_manager)
dev_dbg(amd_manager->dev, "[SDW%d] SDW INT: 0to7=0x%x, 8to11=0x%x\n",
amd_manager->instance, status_change_0to7, status_change_8to11);
if (status_change_8to11 & AMD_SDW_WAKE_STAT_MASK)
- return amd_acp63_sdw_process_wake_event(amd_manager);
+ return acp_sdw_process_wake_event(amd_manager);
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);
@@ -1056,7 +1054,7 @@ static void amd_sdw_interrupt_thread(struct work_struct *work)
struct amd_sdw_manager *amd_manager =
container_of(work, struct amd_sdw_manager, amd_sdw_irq_thread);
- amd_acp63_sdw_irq_thread(amd_manager);
+ acp_sdw_irq_thread(amd_manager);
}
int amd_sdw_manager_start(struct amd_sdw_manager *amd_manager)
@@ -1066,17 +1064,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);
@@ -1087,117 +1085,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_interrupt_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
@@ -1327,7 +1214,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;
@@ -1335,9 +1222,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;
@@ -1348,22 +1234,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;
@@ -1374,7 +1260,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;
}
@@ -1384,7 +1270,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;
@@ -1395,9 +1281,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;
@@ -1408,29 +1293,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;
}
@@ -1440,7 +1325,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) {
@@ -1459,9 +1344,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;
@@ -1473,7 +1357,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);
@@ -1508,17 +1392,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:
@@ -1526,7 +1410,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;
@@ -1537,6 +1421,176 @@ 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_interrupt_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,
+ .irq_thread = amd_acp63_sdw_irq_thread,
+ .update_slave_status_work = amd_acp63_sdw_update_slave_status_work,
+ .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