Unverified Commit 8a6502ad authored by Cezary Rojewski's avatar Cezary Rojewski Committed by Mark Brown
Browse files

ASoC: Intel: avs: CNL-based platforms support 



Define handlers specific to cAVS 1.8 platforms, that is CNL, CFL, CML
and all other variants based on this very version of AudioDSP
architecture. Most operations are inherited from their predecessors.

Reviewed-by: default avatarAmadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Signed-off-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Link: https://msgid.link/r/20240220115035.770402-7-cezary.rojewski@intel.com


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

sound/soc/intel/avs/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
snd-soc-avs-objs := dsp.o ipc.o messages.o utils.o core.o loader.o \

		    topology.o path.o pcm.o board_selection.o control.o

snd-soc-avs-objs += cldma.o

snd-soc-avs-objs += skl.o apl.o

snd-soc-avs-objs += skl.o apl.o cnl.o



snd-soc-avs-objs += trace.o

# tell define_trace.h where to find the trace header

sound/soc/intel/avs/apl.c

+8 −7
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ 
#include "path.h"

#include "topology.h"



static int __maybe_unused

avs_apl_enable_logs(struct avs_dev *adev, enum avs_log_enable enable, u32 aging_period,

#ifdef CONFIG_DEBUG_FS

int avs_apl_enable_logs(struct avs_dev *adev, enum avs_log_enable enable, u32 aging_period,

			u32 fifo_full_period, unsigned long resource_mask, u32 *priorities)

{

	struct avs_apl_log_state_info *info;
@@ -47,8 +47,9 @@ avs_apl_enable_logs(struct avs_dev *adev, enum avs_log_enable enable, u32 aging_ 


	return 0;

}

#endif



static int avs_apl_log_buffer_status(struct avs_dev *adev, union avs_notify_msg *msg)

int avs_apl_log_buffer_status(struct avs_dev *adev, union avs_notify_msg *msg)

{

	struct avs_apl_log_buffer_layout layout;

	void __iomem *addr, *buf;
@@ -102,7 +103,7 @@ static int avs_apl_wait_log_entry(struct avs_dev *adev, u32 core, 
/* reads log header and tests its type */

#define avs_apl_is_entry_stackdump(addr) ((readl(addr) >> 30) & 0x1)



static int avs_apl_coredump(struct avs_dev *adev, union avs_notify_msg *msg)

int avs_apl_coredump(struct avs_dev *adev, union avs_notify_msg *msg)

{

	struct avs_apl_log_buffer_layout layout;

	void __iomem *addr, *buf;
@@ -202,7 +203,7 @@ static bool avs_apl_lp_streaming(struct avs_dev *adev) 
	return true;

}



static bool avs_apl_d0ix_toggle(struct avs_dev *adev, struct avs_ipc_msg *tx, bool wake)

bool avs_apl_d0ix_toggle(struct avs_dev *adev, struct avs_ipc_msg *tx, bool wake)

{

	/* wake in all cases */

	if (wake)
@@ -219,7 +220,7 @@ static bool avs_apl_d0ix_toggle(struct avs_dev *adev, struct avs_ipc_msg *tx, bo 
	return avs_apl_lp_streaming(adev);

}



static int avs_apl_set_d0ix(struct avs_dev *adev, bool enable)

int avs_apl_set_d0ix(struct avs_dev *adev, bool enable)

{

	bool streaming = false;

	int ret;

sound/soc/intel/avs/avs.h

+8 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ struct avs_dsp_ops { 


extern const struct avs_dsp_ops avs_skl_dsp_ops;

extern const struct avs_dsp_ops avs_apl_dsp_ops;

extern const struct avs_dsp_ops avs_cnl_dsp_ops;



#define AVS_PLATATTR_CLDMA		BIT_ULL(0)

#define AVS_PLATATTR_IMR		BIT_ULL(1)
@@ -265,7 +266,14 @@ int avs_dsp_disable_d0ix(struct avs_dev *adev); 
int avs_dsp_enable_d0ix(struct avs_dev *adev);



irqreturn_t avs_skl_irq_thread(struct avs_dev *adev);

irqreturn_t avs_cnl_irq_thread(struct avs_dev *adev);

int avs_apl_enable_logs(struct avs_dev *adev, enum avs_log_enable enable, u32 aging_period,

			u32 fifo_full_period, unsigned long resource_mask, u32 *priorities);

int avs_skl_log_buffer_offset(struct avs_dev *adev, u32 core);

int avs_apl_log_buffer_status(struct avs_dev *adev, union avs_notify_msg *msg);

int avs_apl_coredump(struct avs_dev *adev, union avs_notify_msg *msg);

bool avs_apl_d0ix_toggle(struct avs_dev *adev, struct avs_ipc_msg *tx, bool wake);

int avs_apl_set_d0ix(struct avs_dev *adev, bool enable);



/* Firmware resources management */

sound/soc/intel/avs/cnl.c

0 → 100644
+61 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

//

// Copyright(c) 2021-2024 Intel Corporation. All rights reserved.

//

// Authors: Cezary Rojewski <cezary.rojewski@intel.com>

//          Amadeusz Slawinski <amadeuszx.slawinski@linux.intel.com>

//



#include <sound/hdaudio_ext.h>

#include "avs.h"

#include "messages.h"



irqreturn_t avs_cnl_irq_thread(struct avs_dev *adev)

{

	union avs_reply_msg msg;

	u32 hipctdr, hipctdd, hipctda;



	hipctdr = snd_hdac_adsp_readl(adev, CNL_ADSP_REG_HIPCTDR);

	hipctdd = snd_hdac_adsp_readl(adev, CNL_ADSP_REG_HIPCTDD);



	/* Ensure DSP sent new response to process. */

	if (!(hipctdr & CNL_ADSP_HIPCTDR_BUSY))

		return IRQ_NONE;



	msg.primary = hipctdr;

	msg.ext.val = hipctdd;

	avs_dsp_process_response(adev, msg.val);



	/* Tell DSP we accepted its message. */

	snd_hdac_adsp_updatel(adev, CNL_ADSP_REG_HIPCTDR,

			      CNL_ADSP_HIPCTDR_BUSY, CNL_ADSP_HIPCTDR_BUSY);

	/* Ack this response. */

	snd_hdac_adsp_updatel(adev, CNL_ADSP_REG_HIPCTDA,

			      CNL_ADSP_HIPCTDA_DONE, CNL_ADSP_HIPCTDA_DONE);

	/* HW might have been clock gated, give some time for change to propagate. */

	snd_hdac_adsp_readl_poll(adev, CNL_ADSP_REG_HIPCTDA, hipctda,

				 !(hipctda & CNL_ADSP_HIPCTDA_DONE), 10, 1000);

	/* Unmask busy interrupt. */

	snd_hdac_adsp_updatel(adev, CNL_ADSP_REG_HIPCCTL,

			      AVS_ADSP_HIPCCTL_BUSY, AVS_ADSP_HIPCCTL_BUSY);



	return IRQ_HANDLED;

}



const struct avs_dsp_ops avs_cnl_dsp_ops = {

	.power = avs_dsp_core_power,

	.reset = avs_dsp_core_reset,

	.stall = avs_dsp_core_stall,

	.irq_handler = avs_irq_handler,

	.irq_thread = avs_cnl_irq_thread,

	.int_control = avs_dsp_interrupt_control,

	.load_basefw = avs_hda_load_basefw,

	.load_lib = avs_hda_load_library,

	.transfer_mods = avs_hda_transfer_modules,

	.log_buffer_offset = avs_skl_log_buffer_offset,

	.log_buffer_status = avs_apl_log_buffer_status,

	.coredump = avs_apl_coredump,

	.d0ix_toggle = avs_apl_d0ix_toggle,

	.set_d0ix = avs_apl_set_d0ix,

	AVS_SET_ENABLE_LOGS_OP(apl)

};

sound/soc/intel/avs/core.c

+26 −0
Original line number Diff line number Diff line
@@ -767,6 +767,17 @@ static const struct avs_hipc_spec skl_hipc_spec = { 
	.ctl_offset = SKL_ADSP_REG_HIPCCTL,

};



static const struct avs_hipc_spec cnl_hipc_spec = {

	.req_offset = CNL_ADSP_REG_HIPCIDR,

	.req_ext_offset = CNL_ADSP_REG_HIPCIDD,

	.req_busy_mask = CNL_ADSP_HIPCIDR_BUSY,

	.ack_offset = CNL_ADSP_REG_HIPCIDA,

	.ack_done_mask = CNL_ADSP_HIPCIDA_DONE,

	.rsp_offset = CNL_ADSP_REG_HIPCTDR,

	.rsp_busy_mask = CNL_ADSP_HIPCTDR_BUSY,

	.ctl_offset = CNL_ADSP_REG_HIPCCTL,

};



static const struct avs_spec skl_desc = {

	.name = "skl",

	.min_fw_version = { 9, 21, 0, 4732 },
@@ -787,6 +798,16 @@ static const struct avs_spec apl_desc = { 
	.hipc = &skl_hipc_spec,

};



static const struct avs_spec cnl_desc = {

	.name = "cnl",

	.min_fw_version = { 10, 23, 0, 5314 },

	.dsp_ops = &avs_cnl_dsp_ops,

	.core_init_mask = 1,

	.attributes = AVS_PLATATTR_IMR,

	.sram = &apl_sram_spec,

	.hipc = &cnl_hipc_spec,

};



static const struct pci_device_id avs_ids[] = {

	{ PCI_DEVICE_DATA(INTEL, HDA_SKL_LP, &skl_desc) },

	{ PCI_DEVICE_DATA(INTEL, HDA_SKL, &skl_desc) },
@@ -796,6 +817,11 @@ static const struct pci_device_id avs_ids[] = { 
	{ PCI_DEVICE_DATA(INTEL, HDA_CML_S, &skl_desc) },

	{ PCI_DEVICE_DATA(INTEL, HDA_APL, &apl_desc) },

	{ PCI_DEVICE_DATA(INTEL, HDA_GML, &apl_desc) },

	{ PCI_DEVICE_DATA(INTEL, HDA_CNL_LP,	&cnl_desc) },

	{ PCI_DEVICE_DATA(INTEL, HDA_CNL_H,	&cnl_desc) },

	{ PCI_DEVICE_DATA(INTEL, HDA_CML_LP,	&cnl_desc) },

	{ PCI_DEVICE_DATA(INTEL, HDA_CML_H,	&cnl_desc) },

	{ PCI_DEVICE_DATA(INTEL, HDA_RKL_S,	&cnl_desc) },

	{ 0 }

};

MODULE_DEVICE_TABLE(pci, avs_ids);