mirror of
https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux-stable.git
synced 2025-09-28 17:40:21 +10:00
7e1fe5d9e7
Setting ACP ACLK as clock source when ACP enters D0 state causing
firmware load failure as mentioned in below scenario.
- Load snd_sof_amd_rembrandt
- Play or Record audio
- Stop audio
- Unload snd_sof_amd_rembrandt
- Reload snd_sof_amd_rembrandt
If acp_clkmux_sel register field is set, then clock source will be
set to ACP ACLK when ACP enters D0 state.
During stream stop, if there is no active stream is running then
acp firmware will set the ACP ACLK value to zero.
When driver is reloaded and clock source is selected as ACP ACLK,
as ACP ACLK is programmed to zero, firmware loading will fail.
For RMB platform, remove the clock mux selection field so that
ACP will use internal clock source when ACP enters D0 state.
Fixes: 41cb85bc4b ("ASoC: SOF: amd: Add support for Rembrandt plaform.")
Reported-by: coolstar <coolstarorganization@gmail.com>
Closes: https://github.com/thesofproject/sof/issues/8137
Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
Link: https://lore.kernel.org/r/20230927071412.2416250-1-Vijendar.Mukunda@amd.com
Signed-off-by: Mark Brown <broonie@kernel.org>
104 lines
2.7 KiB
C
104 lines
2.7 KiB
C
// SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause)
|
|
//
|
|
// This file is provided under a dual BSD/GPLv2 license. When using or
|
|
// redistributing this file, you may do so under either license.
|
|
//
|
|
// Copyright(c) 2022 Advanced Micro Devices, Inc. All rights reserved.
|
|
//
|
|
// Authors: Ajit Kumar Pandey <AjitKumar.Pandey@amd.com>
|
|
|
|
/*.
|
|
* PCI interface for Rembrandt ACP device
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/pci.h>
|
|
#include <linux/platform_device.h>
|
|
#include <sound/sof.h>
|
|
#include <sound/soc-acpi.h>
|
|
|
|
#include "../ops.h"
|
|
#include "../sof-pci-dev.h"
|
|
#include "../../amd/mach-config.h"
|
|
#include "acp.h"
|
|
#include "acp-dsp-offset.h"
|
|
|
|
#define ACP6x_REG_START 0x1240000
|
|
#define ACP6x_REG_END 0x125C000
|
|
#define ACP6X_FUTURE_REG_ACLK_0 0x1854
|
|
|
|
static const struct sof_amd_acp_desc rembrandt_chip_info = {
|
|
.rev = 6,
|
|
.host_bridge_id = HOST_BRIDGE_RMB,
|
|
.pgfsm_base = ACP6X_PGFSM_BASE,
|
|
.ext_intr_stat = ACP6X_EXT_INTR_STAT,
|
|
.dsp_intr_base = ACP6X_DSP_SW_INTR_BASE,
|
|
.sram_pte_offset = ACP6X_SRAM_PTE_OFFSET,
|
|
.hw_semaphore_offset = ACP6X_AXI2DAGB_SEM_0,
|
|
.fusion_dsp_offset = ACP6X_DSP_FUSION_RUNSTALL,
|
|
.probe_reg_offset = ACP6X_FUTURE_REG_ACLK_0,
|
|
};
|
|
|
|
static const struct sof_dev_desc rembrandt_desc = {
|
|
.machines = snd_soc_acpi_amd_rmb_sof_machines,
|
|
.resindex_lpe_base = 0,
|
|
.resindex_pcicfg_base = -1,
|
|
.resindex_imr_base = -1,
|
|
.irqindex_host_ipc = -1,
|
|
.chip_info = &rembrandt_chip_info,
|
|
.ipc_supported_mask = BIT(SOF_IPC),
|
|
.ipc_default = SOF_IPC,
|
|
.default_fw_path = {
|
|
[SOF_IPC] = "amd/sof",
|
|
},
|
|
.default_tplg_path = {
|
|
[SOF_IPC] = "amd/sof-tplg",
|
|
},
|
|
.default_fw_filename = {
|
|
[SOF_IPC] = "sof-rmb.ri",
|
|
},
|
|
.nocodec_tplg_filename = "sof-acp.tplg",
|
|
.ops = &sof_rembrandt_ops,
|
|
.ops_init = sof_rembrandt_ops_init,
|
|
};
|
|
|
|
static int acp_pci_rmb_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
|
|
{
|
|
unsigned int flag;
|
|
|
|
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;
|
|
|
|
return sof_pci_probe(pci, pci_id);
|
|
};
|
|
|
|
static void acp_pci_rmb_remove(struct pci_dev *pci)
|
|
{
|
|
sof_pci_remove(pci);
|
|
}
|
|
|
|
/* PCI IDs */
|
|
static const struct pci_device_id rmb_pci_ids[] = {
|
|
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, ACP_PCI_DEV_ID),
|
|
.driver_data = (unsigned long)&rembrandt_desc},
|
|
{ 0, }
|
|
};
|
|
MODULE_DEVICE_TABLE(pci, rmb_pci_ids);
|
|
|
|
/* pci_driver definition */
|
|
static struct pci_driver snd_sof_pci_amd_rmb_driver = {
|
|
.name = KBUILD_MODNAME,
|
|
.id_table = rmb_pci_ids,
|
|
.probe = acp_pci_rmb_probe,
|
|
.remove = acp_pci_rmb_remove,
|
|
};
|
|
module_pci_driver(snd_sof_pci_amd_rmb_driver);
|
|
|
|
MODULE_LICENSE("Dual BSD/GPL");
|
|
MODULE_IMPORT_NS(SND_SOC_SOF_AMD_COMMON);
|
|
MODULE_IMPORT_NS(SND_SOC_SOF_PCI_DEV);
|