From 94d0f2e55ca451216d7c7894580d68bc4c949c42 Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi Date: Thu, 23 Sep 2021 10:23:30 +0300 Subject: [PATCH] fixup! ASoC: SOF: amd: Add fw loader and renoir dsp ops to load firmware Upstream is in a process of deprecating the pci wrappers for the DMA API: commit 38de3afffb72 ("NTB: switch from 'pci_' to 'dma_' API") Signed-off-by: Peter Ujfalusi --- sound/soc/sof/amd/acp-loader.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/sound/soc/sof/amd/acp-loader.c b/sound/soc/sof/amd/acp-loader.c index 2c38c47b076187..81d8401269e924 100644 --- a/sound/soc/sof/amd/acp-loader.c +++ b/sound/soc/sof/amd/acp-loader.c @@ -62,7 +62,9 @@ int acp_dsp_block_write(struct snd_sof_dev *sdev, enum snd_sof_fw_blk_type blk_t size_fw = plat_data->fw->size; page_count = PAGE_ALIGN(size_fw) >> PAGE_SHIFT; dma_size = page_count * ACP_PAGE_SIZE; - adata->bin_buf = pci_alloc_consistent(pci, dma_size, &adata->sha_dma_addr); + adata->bin_buf = dma_alloc_coherent(&pci->dev, dma_size, + &adata->sha_dma_addr, + GFP_ATOMIC); if (!adata->bin_buf) return -ENOMEM; memset(adata->bin_buf, 0, dma_size); @@ -72,8 +74,10 @@ int acp_dsp_block_write(struct snd_sof_dev *sdev, enum snd_sof_fw_blk_type blk_t break; case SOF_FW_BLK_TYPE_DRAM: if (!adata->data_buf) { - adata->data_buf = pci_alloc_consistent(pci, ACP_DEFAULT_DRAM_LENGTH, - &adata->dma_addr); + adata->data_buf = dma_alloc_coherent(&pci->dev, + ACP_DEFAULT_DRAM_LENGTH, + &adata->dma_addr, + GFP_ATOMIC); if (!adata->data_buf) return -ENOMEM; memset(adata->data_buf, 0, ACP_DEFAULT_DRAM_LENGTH); @@ -173,8 +177,8 @@ int acp_dsp_pre_fw_run(struct snd_sof_dev *sdev) dev_err(sdev->dev, "acp dma transfer status: %d\n", ret); /* Free memory once DMA is complete */ - pci_free_consistent(pci, size_fw, &adata->bin_buf, adata->sha_dma_addr); - pci_free_consistent(pci, ACP_DEFAULT_DRAM_LENGTH, &adata->data_buf, adata->dma_addr); + dma_free_coherent(&pci->dev, size_fw, &adata->bin_buf, adata->sha_dma_addr); + dma_free_coherent(&pci->dev, ACP_DEFAULT_DRAM_LENGTH, &adata->data_buf, adata->dma_addr); return ret; }