[PATCH v5 02/25] soundwire: amd: program pad SCHMEN and OE control for ACP 7.0/7.1/7.2
From: Vijendar Mukunda
Date: Sat Nov 07 2026 - 11:11:34 EST
ACP 7.0/7.1/7.2 hardware requires SCHMEN control and
output-enable (OE) registers to be programmed as part of the pad enable
sequence, in addition to the existing keeper and pulldown writes.
Update amd_enable_sdw_pads() to program ACP_PAD_SCHMEN_CTRL and
ACP_PAD_DISABLE_OE_CTRL for active pads. Pass acp_rev to
amd_enable_sdw_pads() and restrict these writes to ACP 7.0/7.1/7.2;
ACP 6.3 is unaffected.
Define per-register masks in amd_init.h replacing generic local defines
in amd_init.c.
Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@xxxxxxx>
Fixes: cf0ddbc29dfa ("soundwire: amd: refactor soundwire pads enable")
---
drivers/soundwire/amd_init.c | 48 ++++++++++++++++++++++--------------
drivers/soundwire/amd_init.h | 15 +++++++++++
2 files changed, 45 insertions(+), 18 deletions(-)
diff --git a/drivers/soundwire/amd_init.c b/drivers/soundwire/amd_init.c
index b4f45bdf3c17..032697ea3590 100644
--- a/drivers/soundwire/amd_init.c
+++ b/drivers/soundwire/amd_init.c
@@ -16,37 +16,49 @@
#include "amd_init.h"
-#define AMD_SDW0_PAD_CTRL_MASK 0x60
-#define AMD_SDW1_PAD_CTRL_MASK 5
-#define AMD_SDW_PAD_CTRL_MASK (AMD_SDW0_PAD_CTRL_MASK | AMD_SDW1_PAD_CTRL_MASK)
-#define AMD_SDW0_PAD_EN 1
-#define AMD_SDW1_PAD_EN 0x10
-#define AMD_SDW_PAD_EN (AMD_SDW0_PAD_EN | AMD_SDW1_PAD_EN)
-
-static int amd_enable_sdw_pads(void __iomem *mmio, u32 link_mask, struct device *dev)
+static int amd_enable_sdw_pads(void __iomem *mmio, u32 link_mask, u32 acp_rev, struct device *dev)
{
- u32 pad_keeper_en, pad_pulldown_ctrl_mask;
+ u32 pad_keeper_mask, pad_pulldown_mask, pad_schmen_mask, pad_oe_mask;
switch (link_mask) {
case 1:
- pad_keeper_en = AMD_SDW0_PAD_EN;
- pad_pulldown_ctrl_mask = AMD_SDW0_PAD_CTRL_MASK;
+ pad_keeper_mask = AMD_SDW0_PAD_KEEPER_EN_MASK;
+ pad_pulldown_mask = AMD_SDW0_PAD_PULLDOWN_MASK;
+ pad_schmen_mask = AMD_SDW0_PAD_SCHMEN_MASK;
+ pad_oe_mask = AMD_SDW0_PAD_OE_CTRL_MASK;
break;
case 2:
- pad_keeper_en = AMD_SDW1_PAD_EN;
- pad_pulldown_ctrl_mask = AMD_SDW1_PAD_CTRL_MASK;
+ pad_keeper_mask = AMD_SDW1_PAD_KEEPER_EN_MASK;
+ pad_pulldown_mask = AMD_SDW1_PAD_PULLDOWN_MASK;
+ pad_schmen_mask = AMD_SDW1_PAD_SCHMEN_MASK;
+ pad_oe_mask = AMD_SDW1_PAD_OE_CTRL_MASK;
break;
case 3:
- pad_keeper_en = AMD_SDW_PAD_EN;
- pad_pulldown_ctrl_mask = AMD_SDW_PAD_CTRL_MASK;
+ pad_keeper_mask = AMD_SDW_PAD_KEEPER_EN_MASK;
+ pad_pulldown_mask = AMD_SDW_PAD_PULLDOWN_MASK;
+ pad_schmen_mask = AMD_SDW_PAD_SCHMEN_MASK;
+ pad_oe_mask = AMD_SDW_PAD_OE_CTRL_MASK;
break;
default:
dev_err(dev, "No SDW Links are enabled\n");
return -ENODEV;
}
- amd_updatel(mmio, ACP_SW_PAD_KEEPER_EN, pad_keeper_en, pad_keeper_en);
- amd_updatel(mmio, ACP_PAD_PULLDOWN_CTRL, pad_pulldown_ctrl_mask, 0);
+ amd_updatel(mmio, ACP_SW_PAD_KEEPER_EN, pad_keeper_mask, pad_keeper_mask);
+ amd_updatel(mmio, ACP_PAD_PULLDOWN_CTRL, pad_pulldown_mask, 0);
+ switch (acp_rev) {
+ case ACP70_PCI_REV_ID:
+ case ACP71_PCI_REV_ID:
+ case ACP72_PCI_REV_ID:
+ amd_updatel(mmio, ACP_PAD_SCHMEN_CTRL, pad_schmen_mask, pad_schmen_mask);
+ amd_updatel(mmio, ACP_PAD_DISABLE_OE_CTRL, pad_oe_mask, 0);
+ break;
+ case ACP63_PCI_REV_ID:
+ break;
+ default:
+ dev_err(dev, "unsupported ACP revision 0x%x\n", acp_rev);
+ return -EINVAL;
+ }
return 0;
}
@@ -86,7 +98,7 @@ 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);
- ret = amd_enable_sdw_pads(res->mmio_base, res->link_mask, res->parent);
+ ret = amd_enable_sdw_pads(res->mmio_base, res->link_mask, res->acp_rev, res->parent);
if (ret)
return NULL;
diff --git a/drivers/soundwire/amd_init.h b/drivers/soundwire/amd_init.h
index 106852464dc7..8324bc7a147f 100644
--- a/drivers/soundwire/amd_init.h
+++ b/drivers/soundwire/amd_init.h
@@ -9,7 +9,22 @@
#include <linux/soundwire/sdw_amd.h>
#define ACP_PAD_PULLDOWN_CTRL 0x0001448
+#define ACP_PAD_SCHMEN_CTRL 0x0001450
#define ACP_SW_PAD_KEEPER_EN 0x0001454
+#define ACP_PAD_DISABLE_OE_CTRL 0x0001468
+
+#define AMD_SDW0_PAD_PULLDOWN_MASK (BIT(5) | BIT(6))
+#define AMD_SDW1_PAD_PULLDOWN_MASK (BIT(0) | BIT(2))
+#define AMD_SDW_PAD_PULLDOWN_MASK (AMD_SDW0_PAD_PULLDOWN_MASK | AMD_SDW1_PAD_PULLDOWN_MASK)
+#define AMD_SDW0_PAD_KEEPER_EN_MASK BIT(0)
+#define AMD_SDW1_PAD_KEEPER_EN_MASK BIT(4)
+#define AMD_SDW_PAD_KEEPER_EN_MASK (AMD_SDW0_PAD_KEEPER_EN_MASK | AMD_SDW1_PAD_KEEPER_EN_MASK)
+#define AMD_SDW0_PAD_OE_CTRL_MASK (BIT(5) | BIT(6))
+#define AMD_SDW1_PAD_OE_CTRL_MASK (BIT(0) | BIT(2))
+#define AMD_SDW_PAD_OE_CTRL_MASK (AMD_SDW0_PAD_OE_CTRL_MASK | AMD_SDW1_PAD_OE_CTRL_MASK)
+#define AMD_SDW0_PAD_SCHMEN_MASK (BIT(5) | BIT(6))
+#define AMD_SDW1_PAD_SCHMEN_MASK (BIT(0) | BIT(2))
+#define AMD_SDW_PAD_SCHMEN_MASK (AMD_SDW0_PAD_SCHMEN_MASK | AMD_SDW1_PAD_SCHMEN_MASK)
int amd_sdw_manager_start(struct amd_sdw_manager *amd_manager);
--
2.53.0