| Message ID | 20230630070544.2167421-1-Mastan.Katragadda@amd.com |
|---|---|
| State | Accepted |
| Commit | b1db244c716fe300e36428aeb0874913d2e0a91d |
| Headers | show |
| Series | [1/2] ASoC: SOF: amd: add revision check for sending sha dma completion command | expand |
On 30/06/23 22:37, Mark Brown wrote: > On Fri, 30 Jun 2023 12:35:42 +0530, Mastan Katragadda wrote: >> ACP driver should send SHA DMA completion command to PSP module for RN >> platform only. >> Add a revision check for RN platform. >> >> > Applied to > > https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next > > Thanks! > > [1/2] ASoC: SOF: amd: add revision check for sending sha dma completion command > commit: b1db244c716fe300e36428aeb0874913d2e0a91d It looks like second patch didn't get merged in this series. Do we need to resend the second patch? > All being well this means that it will be integrated into the linux-next > tree (usually sometime in the next 24 hours) and sent to Linus during > the next merge window (or sooner if it is a bug fix), however if > problems are discovered then the patch may be dropped or reverted. > > You may get further e-mails resulting from automated or manual testing > and review of the tree, please engage with people reporting problems and > send followup patches addressing any issues that are reported if needed. > > If any updates are required or you are submitting further changes they > should be sent as incremental updates against current git, existing > patches will not be replaced. > > Please add any relevant lists and maintainers to the CCs when replying > to this mail. > > Thanks, > Mark >
On 03/07/23 21:40, Mark Brown wrote: > On Mon, Jul 03, 2023 at 08:58:17PM +0530, Mukunda,Vijendar wrote: >> On 30/06/23 22:37, Mark Brown wrote: >>> Thanks! >>> >>> [1/2] ASoC: SOF: amd: add revision check for sending sha dma completion command >>> commit: b1db244c716fe300e36428aeb0874913d2e0a91d >> It looks like second patch didn't get merged in this series. >> Do we need to resend the second patch? > I don't know off hand what that second patch was. If it wasn't a bug > fix it'll just be waiting till after the merge window. Do I need to resend the second patch?
On Wed, Jul 12, 2023 at 09:03:30AM +0530, Mastan Katragadda wrote: > On 03/07/23 21:40, Mark Brown wrote: > > I don't know off hand what that second patch was. If it wasn't a bug > > fix it'll just be waiting till after the merge window. > Do I need to resend the second patch? I still don't know what the patch was - if it's not applied probably.
On Fri, 30 Jun 2023 12:35:42 +0530, Mastan Katragadda wrote: > ACP driver should send SHA DMA completion command to PSP module for RN > platform only. > Add a revision check for RN platform. > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [2/2] ASoC: SOF: amd: refactor PSP smn_read commit: 2b48d170fb9965dda9d41edcb0bbfc9ee4c6584f All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/sound/soc/sof/amd/acp.c b/sound/soc/sof/amd/acp.c index 2ae76bcd3590..afb505461ea1 100644 --- a/sound/soc/sof/amd/acp.c +++ b/sound/soc/sof/amd/acp.c @@ -217,6 +217,7 @@ int configure_and_run_sha_dma(struct acp_dev_data *adata, void *image_addr, unsigned int image_length) { struct snd_sof_dev *sdev = adata->dev; + const struct sof_amd_acp_desc *desc = get_chip_info(sdev->pdata); unsigned int tx_count, fw_qualifier, val; int ret; @@ -251,9 +252,12 @@ int configure_and_run_sha_dma(struct acp_dev_data *adata, void *image_addr, return ret; } - ret = psp_send_cmd(adata, MBOX_ACP_SHA_DMA_COMMAND); - if (ret) - return ret; + /* psp_send_cmd only required for renoir platform (rev - 3) */ + if (desc->rev == 3) { + ret = psp_send_cmd(adata, MBOX_ACP_SHA_DMA_COMMAND); + if (ret) + return ret; + } ret = snd_sof_dsp_read_poll_timeout(sdev, ACP_DSP_BAR, ACP_SHA_DSP_FW_QUALIFIER, fw_qualifier, fw_qualifier & DSP_FW_RUN_ENABLE,
ACP driver should send SHA DMA completion command to PSP module for RN platform only. Add a revision check for RN platform. Signed-off-by: Mastan Katragadda <Mastan.Katragadda@amd.com> --- sound/soc/sof/amd/acp.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)