iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: SOF: amd: refactor PSP smn_read

Browse Source 
Use the read_poll_timeout marco for PSP smn_read calls.

Signed-off-by: Mastan Katragadda <Mastan.Katragadda@amd.com>
Link: https://lore.kernel.org/r/20230630070544.2167421-2-Mastan.Katragadda@amd.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Mastan Katragadda 2023-06-30 12:35:43 +05:30 committed by Mark Brown
parent 3d74f42c56
commit 2b48d170fb
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
sound/soc/sof/amd/acp.c
View File

@ -28,12 +28,14 @@ static int smn_write(struct pci_dev *dev, u32 smn_addr, u32 data)
return 0; return 0;
} }
static int smn_read(struct pci_dev *dev, u32 smn_addr, u32 *data) static int smn_read(struct pci_dev *dev, u32 smn_addr)
{ {
pci_write_config_dword(dev, 0x60, smn_addr); u32 data = 0;
pci_read_config_dword(dev, 0x64, data);
return 0; pci_write_config_dword(dev, 0x60, smn_addr);
pci_read_config_dword(dev, 0x64, &data);
return data;
} }
static void init_dma_descriptor(struct acp_dev_data *adata) static void init_dma_descriptor(struct acp_dev_data *adata)
@ -150,15 +152,13 @@ int configure_and_run_dma(struct acp_dev_data *adata, unsigned int src_addr,
static int psp_mbox_ready(struct acp_dev_data *adata, bool ack) static int psp_mbox_ready(struct acp_dev_data *adata, bool ack)
{ {
struct snd_sof_dev *sdev = adata->dev; struct snd_sof_dev *sdev = adata->dev;
int timeout; int ret;
u32 data; u32 data;
for (timeout = ACP_PSP_TIMEOUT_COUNTER; timeout > 0; timeout--) { ret = read_poll_timeout(smn_read, data, data & MBOX_READY_MASK, MBOX_DELAY_US,
msleep(20); ACP_PSP_TIMEOUT_US, false, adata->smn_dev, MP0_C2PMSG_114_REG);
smn_read(adata->smn_dev, MP0_C2PMSG_114_REG, &data); if (!ret)
if (data & MBOX_READY_MASK) return 0;
return 0;
}
dev_err(sdev->dev, "PSP error status %x\n", data & MBOX_STATUS_MASK); dev_err(sdev->dev, "PSP error status %x\n", data & MBOX_STATUS_MASK);
@ -177,23 +177,19 @@ static int psp_mbox_ready(struct acp_dev_data *adata, bool ack)
static int psp_send_cmd(struct acp_dev_data *adata, int cmd) static int psp_send_cmd(struct acp_dev_data *adata, int cmd)
{ {
struct snd_sof_dev *sdev = adata->dev; struct snd_sof_dev *sdev = adata->dev;
int ret, timeout; int ret;
u32 data; u32 data;
if (!cmd) if (!cmd)
return -EINVAL; return -EINVAL;
/* Get a non-zero Doorbell value from PSP */ /* Get a non-zero Doorbell value from PSP */
for (timeout = ACP_PSP_TIMEOUT_COUNTER; timeout > 0; timeout--) { ret = read_poll_timeout(smn_read, data, data, MBOX_DELAY_US, ACP_PSP_TIMEOUT_US, false,
msleep(MBOX_DELAY); adata->smn_dev, MP0_C2PMSG_73_REG);
smn_read(adata->smn_dev, MP0_C2PMSG_73_REG, &data);
if (data)
break;
}
if (!timeout) { if (ret) {
dev_err(sdev->dev, "Failed to get Doorbell from MBOX %x\n", MP0_C2PMSG_73_REG); dev_err(sdev->dev, "Failed to get Doorbell from MBOX %x\n", MP0_C2PMSG_73_REG);
return -EINVAL; return ret;
} }
/* Check if PSP is ready for new command */ /* Check if PSP is ready for new command */

4
sound/soc/sof/amd/acp.h
View File

@ -61,12 +61,12 @@
#define HOST_BRIDGE_CZN 0x1630 #define HOST_BRIDGE_CZN 0x1630
#define HOST_BRIDGE_RMB 0x14B5 #define HOST_BRIDGE_RMB 0x14B5
#define ACP_SHA_STAT 0x8000 #define ACP_SHA_STAT 0x8000
#define ACP_PSP_TIMEOUT_COUNTER 5 #define ACP_PSP_TIMEOUT_US 1000000
#define ACP_EXT_INTR_ERROR_STAT 0x20000000 #define ACP_EXT_INTR_ERROR_STAT 0x20000000
#define MP0_C2PMSG_114_REG 0x3810AC8 #define MP0_C2PMSG_114_REG 0x3810AC8
#define MP0_C2PMSG_73_REG 0x3810A24 #define MP0_C2PMSG_73_REG 0x3810A24
#define MBOX_ACP_SHA_DMA_COMMAND 0x70000 #define MBOX_ACP_SHA_DMA_COMMAND 0x70000
#define MBOX_DELAY 1000 #define MBOX_DELAY_US 1000
#define MBOX_READY_MASK 0x80000000 #define MBOX_READY_MASK 0x80000000
#define MBOX_STATUS_MASK 0xFFFF #define MBOX_STATUS_MASK 0xFFFF