ASoC: SOF: amd: Add pci revision id check

[ Upstream commit 1d4a84632b90d88316986b05bcdfe715399a33db ]

Add pci revision id check for renoir and rembrandt platforms.

Signed-off-by: Venkata Prasad Potturu <venkataprasad.potturu@amd.com>
Link: https://lore.kernel.org/r/20230523072009.2379198-1-venkataprasad.potturu@amd.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/sound/soc/sof/amd/acp.h b/sound/soc/sof/amd/acp.h
index dd3c072d01721737bc67190eeccf1cb3fdb29e93..14148c311f5041e6c28bd382a0031fb636021778 100644 (file)
--- a/sound/soc/sof/amd/acp.h
+++ b/sound/soc/sof/amd/acp.h
@@ -54,6 +54,9 @@
 
 #define ACP_DSP_TO_HOST_IRQ                    0x04
 
+#define ACP_RN_PCI_ID                          0x01
+#define ACP_RMB_PCI_ID                         0x6F
+
 #define HOST_BRIDGE_CZN                                0x1630
 #define HOST_BRIDGE_RMB                                0x14B5
 #define ACP_SHA_STAT                           0x8000

diff --git a/sound/soc/sof/amd/pci-rmb.c b/sound/soc/sof/amd/pci-rmb.c
index 4e1de462b431b8ba251cfc27f888d127f26d6f2c..5698d910b26f3d28b135b2cd3ec7b858ae09b90c 100644 (file)
--- a/sound/soc/sof/amd/pci-rmb.c
+++ b/sound/soc/sof/amd/pci-rmb.c
@@ -90,6 +90,9 @@ static int acp_pci_rmb_probe(struct pci_dev *pci, const struct pci_device_id *pc
        unsigned int flag, i, addr;
        int ret;
 
+       if (pci->revision != ACP_RMB_PCI_ID)
+               return -ENODEV;
+
        flag = snd_amd_acp_find_config(pci);
        if (flag != FLAG_AMD_SOF && flag != FLAG_AMD_SOF_ONLY_DMIC)
                return -ENODEV;

diff --git a/sound/soc/sof/amd/pci-rn.c b/sound/soc/sof/amd/pci-rn.c
index fca40b261671bd901b5b51f526c0d4d11e072082..9189f63632789c56d63c398a54fde233ae78e502 100644 (file)
--- a/sound/soc/sof/amd/pci-rn.c
+++ b/sound/soc/sof/amd/pci-rn.c
@@ -90,6 +90,9 @@ static int acp_pci_rn_probe(struct pci_dev *pci, const struct pci_device_id *pci
        unsigned int flag, i, addr;
        int ret;
 
+       if (pci->revision != ACP_RN_PCI_ID)
+               return -ENODEV;
+
        flag = snd_amd_acp_find_config(pci);
        if (flag != FLAG_AMD_SOF && flag != FLAG_AMD_SOF_ONLY_DMIC)
                return -ENODEV;