Unverified Commit 848c0d34 authored by Vijendar Mukunda's avatar Vijendar Mukunda Committed by Mark Brown
Browse files

ASoC: SOF: amd: add support for acp6.3 based platform 



Add SOF support for ACP6.3 version based platform

Signed-off-by: default avatarVijendar Mukunda <Vijendar.Mukunda@amd.com>
Link: https://lore.kernel.org/r/20231020062822.3913760-2-Vijendar.Mukunda@amd.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent bb98b592

sound/soc/sof/amd/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -60,4 +60,13 @@ config SND_SOC_SOF_ACP_PROBES 
	  This option is not user-selectable but automatically handled by

	  'select' statements at a higher level



config SND_SOC_SOF_AMD_ACP63

	tristate "SOF support for ACP6.3 platform"

	depends on SND_SOC_SOF_PCI

	select SND_SOC_SOF_AMD_COMMON

	help

	  Select this option for SOF support on

	  AMD ACP6.3 version based platforms.

	  Say Y if you want to enable SOF on ACP6.3 based platform.

	  If unsure select "N".

endif

sound/soc/sof/amd/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -9,8 +9,10 @@ snd-sof-amd-acp-$(CONFIG_SND_SOC_SOF_ACP_PROBES) = acp-probes.o 
snd-sof-amd-renoir-objs := pci-rn.o renoir.o

snd-sof-amd-rembrandt-objs := pci-rmb.o rembrandt.o

snd-sof-amd-vangogh-objs := pci-vangogh.o vangogh.o

snd-sof-amd-acp63-objs := pci-acp63.o acp63.o



obj-$(CONFIG_SND_SOC_SOF_AMD_COMMON) += snd-sof-amd-acp.o

obj-$(CONFIG_SND_SOC_SOF_AMD_RENOIR) +=snd-sof-amd-renoir.o

obj-$(CONFIG_SND_SOC_SOF_AMD_REMBRANDT) +=snd-sof-amd-rembrandt.o

obj-$(CONFIG_SND_SOC_SOF_AMD_VANGOGH) +=snd-sof-amd-vangogh.o

obj-$(CONFIG_SND_SOC_SOF_AMD_ACP63) +=snd-sof-amd-acp63.o

sound/soc/sof/amd/acp.h

+4 −0
Original line number Diff line number Diff line
@@ -62,10 +62,12 @@ 
#define ACP_RN_PCI_ID				0x01

#define ACP_VANGOGH_PCI_ID			0x50

#define ACP_RMB_PCI_ID				0x6F

#define ACP63_PCI_ID				0x63



#define HOST_BRIDGE_CZN				0x1630

#define HOST_BRIDGE_VGH				0x1645

#define HOST_BRIDGE_RMB				0x14B5

#define HOST_BRIDGE_ACP63			0x14E8

#define ACP_SHA_STAT				0x8000

#define ACP_PSP_TIMEOUT_US			1000000

#define ACP_EXT_INTR_ERROR_STAT			0x20000000
@@ -273,6 +275,8 @@ extern struct snd_sof_dsp_ops sof_vangogh_ops; 
int sof_vangogh_ops_init(struct snd_sof_dev *sdev);

extern struct snd_sof_dsp_ops sof_rembrandt_ops;

int sof_rembrandt_ops_init(struct snd_sof_dev *sdev);

extern struct snd_sof_dsp_ops sof_acp63_ops;

int sof_acp63_ops_init(struct snd_sof_dev *sdev);



struct snd_soc_acpi_mach *amd_sof_machine_select(struct snd_sof_dev *sdev);

/* Machine configuration */

sound/soc/sof/amd/acp63.c

0 → 100644
+146 −0
Original line number Diff line number Diff line 
// 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) 2023 Advanced Micro Devices, Inc.

//

// Authors: Vijendar Mukunda <Vijendar.Mukunda@amd.com>



/*

 * Hardware interface for Audio DSP on ACP6.3 version based platform

 */



#include <linux/platform_device.h>

#include <linux/module.h>



#include "../ops.h"

#include "../sof-audio.h"

#include "acp.h"

#include "acp-dsp-offset.h"



#define I2S_HS_INSTANCE		0

#define I2S_BT_INSTANCE		1

#define I2S_SP_INSTANCE		2

#define PDM_DMIC_INSTANCE	3

#define I2S_HS_VIRTUAL_INSTANCE 4



static struct snd_soc_dai_driver acp63_sof_dai[] = {

	[I2S_HS_INSTANCE] = {

		.id = I2S_HS_INSTANCE,

		.name = "acp-sof-hs",

		.playback = {

			.rates = SNDRV_PCM_RATE_8000_96000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S8 |

				   SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 2,

			.channels_max = 8,

			.rate_min = 8000,

			.rate_max = 96000,

		},

		.capture = {

			.rates = SNDRV_PCM_RATE_8000_48000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S8 |

				   SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S32_LE,

			/* Supporting only stereo for I2S HS controller capture */

			.channels_min = 2,

			.channels_max = 2,

			.rate_min = 8000,

			.rate_max = 48000,

		},

	},



	[I2S_BT_INSTANCE] = {

		.id = I2S_BT_INSTANCE,

		.name = "acp-sof-bt",

		.playback = {

			.rates = SNDRV_PCM_RATE_8000_96000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S8 |

				   SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 2,

			.channels_max = 8,

			.rate_min = 8000,

			.rate_max = 96000,

		},

		.capture = {

			.rates = SNDRV_PCM_RATE_8000_48000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S8 |

				   SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S32_LE,

			/* Supporting only stereo for I2S BT controller capture */

			.channels_min = 2,

			.channels_max = 2,

			.rate_min = 8000,

			.rate_max = 48000,

		},

	},



	[I2S_SP_INSTANCE] = {

		.id = I2S_SP_INSTANCE,

		.name = "acp-sof-sp",

		.playback = {

			.rates = SNDRV_PCM_RATE_8000_96000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S8 |

				   SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 2,

			.channels_max = 8,

			.rate_min = 8000,

			.rate_max = 96000,

		},

		.capture = {

			.rates = SNDRV_PCM_RATE_8000_48000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S8 |

				   SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S32_LE,

			/* Supporting only stereo for I2S SP controller capture */

			.channels_min = 2,

			.channels_max = 2,

			.rate_min = 8000,

			.rate_max = 48000,

		},

	},



	[PDM_DMIC_INSTANCE] = {

		.id = PDM_DMIC_INSTANCE,

		.name = "acp-sof-dmic",

		.capture = {

			.rates = SNDRV_PCM_RATE_8000_48000,

			.formats = SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 2,

			.channels_max = 4,

			.rate_min = 8000,

			.rate_max = 48000,

		},

	},



	[I2S_HS_VIRTUAL_INSTANCE] = {

		.id = I2S_HS_VIRTUAL_INSTANCE,

		.name = "acp-sof-hs-virtual",

		.playback = {

			.rates = SNDRV_PCM_RATE_8000_96000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S8 |

				   SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 2,

			.channels_max = 8,

			.rate_min = 8000,

			.rate_max = 96000,

		},

	},

};



/* Phoenix ops */

struct snd_sof_dsp_ops sof_acp63_ops;

EXPORT_SYMBOL_NS(sof_acp63_ops, SND_SOC_SOF_AMD_COMMON);



int sof_acp63_ops_init(struct snd_sof_dev *sdev)

{

	/* common defaults */

	memcpy(&sof_acp63_ops, &sof_acp_common_ops, sizeof(struct snd_sof_dsp_ops));



	sof_acp63_ops.drv = acp63_sof_dai;

	sof_acp63_ops.num_drv = ARRAY_SIZE(acp63_sof_dai);



	return 0;

}



MODULE_IMPORT_NS(SND_SOC_SOF_AMD_COMMON);

MODULE_DESCRIPTION("ACP63 SOF Driver");

MODULE_LICENSE("Dual BSD/GPL");

sound/soc/sof/amd/pci-acp63.c

0 → 100644
+106 −0
Original line number Diff line number Diff line 
// 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) 2023 Advanced Micro Devices, Inc. All rights reserved.

//

// Authors: Vijendar Mukunda <Vijendar.Mukunda@amd.com>



/*.

 * PCI interface for ACP6.3 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_FUTURE_REG_ACLK_0		0x1854

#define ACP6x_REG_START			0x1240000

#define ACP6x_REG_END			0x125C000



static const struct sof_amd_acp_desc acp63_chip_info = {

	.rev		= 6,

	.host_bridge_id = HOST_BRIDGE_ACP63,

	.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 acp63_desc = {

	.machines		= snd_soc_acpi_amd_acp63_sof_machines,

	.resindex_lpe_base	= 0,

	.resindex_pcicfg_base	= -1,

	.resindex_imr_base	= -1,

	.irqindex_host_ipc	= -1,

	.chip_info		= &acp63_chip_info,

	.ipc_supported_mask     = BIT(SOF_IPC_TYPE_3),

	.ipc_default            = SOF_IPC_TYPE_3,

	.default_fw_path	= {

		[SOF_IPC_TYPE_3] = "amd/sof",

	},

	.default_tplg_path	= {

		[SOF_IPC_TYPE_3] = "amd/sof-tplg",

	},

	.default_fw_filename	= {

		[SOF_IPC_TYPE_3] = "sof-acp_6_3.ri",

	},

	.nocodec_tplg_filename	= "sof-acp.tplg",

	.ops			= &sof_acp63_ops,

	.ops_init		= sof_acp63_ops_init,

};



static int acp63_pci_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)

{

	unsigned int flag;



	if (pci->revision != ACP63_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 acp63_pci_remove(struct pci_dev *pci)

{

	sof_pci_remove(pci);

}



/* PCI IDs */

static const struct pci_device_id acp63_pci_ids[] = {

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, ACP_PCI_DEV_ID),

	.driver_data = (unsigned long)&acp63_desc},

	{ 0, }

};

MODULE_DEVICE_TABLE(pci, acp63_pci_ids);



/* pci_driver definition */

static struct pci_driver snd_sof_pci_amd_acp63_driver = {

	.name = KBUILD_MODNAME,

	.id_table = acp63_pci_ids,

	.probe = acp63_pci_probe,

	.remove = acp63_pci_remove,

	.driver = {

		.pm = &sof_pci_pm,

	},

};

module_pci_driver(snd_sof_pci_amd_acp63_driver);



MODULE_LICENSE("Dual BSD/GPL");

MODULE_IMPORT_NS(SND_SOC_SOF_AMD_COMMON);

MODULE_IMPORT_NS(SND_SOC_SOF_PCI_DEV);