Revert "CHROMIUM: ASoC: sof: amd: set the PSP fw_qualifier bit in driver"
This reverts commit 66904d0a5baeeb5937c1e7f96ecebfb9f6f7cbaa.
Reason for revert: The coreboot patch that sets the qualifier bit is merged from upstream. The workaround is not needed anymore.
Original change's description:
> CHROMIUM: ASoC: sof: amd: set the PSP fw_qualifier bit in driver
>
> After sha dma completion PSP will set the qualifier bit,As this fix was not in coreboot, setting the bit from driver as a workaround.
>
> BUG=b:237278240
> TEST=Tested on Skyrim15w board
>
> Change-Id: I510cc0cf6adc51704ae29d4cb15dd3a1ab9fe432
> Signed-off-by: V sujith kumar Reddy <Vsujithkumar.Reddy@amd.com>
> Signed-off-by: V sujith kumar Reddy <vsujithkumar.reddy@amd.corp-partner.google.com>
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/3729262
> Reviewed-by: Yu-Hsuan Hsu <yuhsuan@chromium.org>
> Tested-by: Yu-Hsuan Hsu <yuhsuan@chromium.org>
> Commit-Queue: Yu-Hsuan Hsu <yuhsuan@chromium.org>
Bug: b:237278240
Change-Id: I2c4aec37819fd2483c757a5244a1585656b4f99e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/3812321
Tested-by: Baili Deng <bailideng@google.com>
Commit-Queue: Baili Deng <bailideng@google.com>
Reviewed-by: Yu-Hsuan Hsu <yuhsuan@chromium.org>
diff --git a/sound/soc/sof/amd/acp.c b/sound/soc/sof/amd/acp.c
index dac62eae..aab8b79 100644
--- a/sound/soc/sof/amd/acp.c
+++ b/sound/soc/sof/amd/acp.c
@@ -278,7 +278,6 @@
return ret;
}
- snd_sof_dsp_write(sdev, ACP_DSP_BAR, ACP_SHA_DSP_FW_QUALIFIER, DSP_FW_RUN_ENABLE);
fw_qualifier = snd_sof_dsp_read(sdev, ACP_DSP_BAR, ACP_SHA_DSP_FW_QUALIFIER);
if (!(fw_qualifier & DSP_FW_RUN_ENABLE)) {
dev_err(sdev->dev, "PSP validation failed\n");
