Unverified Commit 645be01d authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "ASoC: SOF: Intel: fix ICL boot sequence" from Kai Vehmanen... 

Merge series "ASoC: SOF: Intel: fix ICL boot sequence" from Kai Vehmanen <kai.vehmanen@linux.intel.com>:

Series introducing a modified boot sequence for the Intel Ice Lake
platform. While no bugs are currently open for this, the current
DSP boot implementation does not follow the full programming sequence.

This patchset is the first instance where SOF driver uses data in
the extended manifest (part of the firmware binary), to influence
the boot process. IPC cannot be used to get this information, as it
is already needed for early boot.

This change is backwards compatible with old firmware versions,
where extended manifest is not available.

Fred Oh (5):
  ASoC: SOF: ops: add parse_platform_ext_manifest() op
  ASoC: SOF: Intel: hda: define parse_platform_ext_manifest op
  ASoC: SOF: ext_manifest: parse cavs extra config data elem
  ASoC: SOF: ops: modify the signature of stall op
  ASoC: SOF: Intel: hda: add sof_icl_ops for ICL platforms

 include/sound/sof/ext_manifest.h   |   1 +
 sound/soc/sof/intel/Makefile       |   2 +-
 sound/soc/sof/intel/apl.c          |   3 +
 sound/soc/sof/intel/cnl.c          |  19 +---
 sound/soc/sof/intel/ext_manifest.h |  35 +++++++
 sound/soc/sof/intel/hda-loader.c   | 100 ++++++++++++++++++++
 sound/soc/sof/intel/hda.h          |  11 +++
 sound/soc/sof/intel/icl.c          | 145 +++++++++++++++++++++++++++++
 sound/soc/sof/intel/tgl.c          |   3 +
 sound/soc/sof/loader.c             |   3 +
 sound/soc/sof/ops.h                |  14 ++-
 sound/soc/sof/sof-pci-dev.c        |   2 +-
 sound/soc/sof/sof-priv.h           |   7 +-
 13 files changed, 324 insertions(+), 21 deletions(-)
 create mode 100644 sound/soc/sof/intel/ext_manifest.h
 create mode 100644 sound/soc/sof/intel/icl.c

--
2.28.0
parents 853c15b1 0cde3e9f

include/sound/sof/ext_manifest.h

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ enum sof_ext_man_elem_type { 
	SOF_EXT_MAN_ELEM_CC_VERSION		= SOF_IPC_EXT_CC_INFO,

	SOF_EXT_MAN_ELEM_DBG_ABI		= SOF_IPC_EXT_USER_ABI_INFO,

	SOF_EXT_MAN_ELEM_CONFIG_DATA		= 5, /**< ABI3.17 */

	SOF_EXT_MAN_ELEM_PLATFORM_CONFIG_DATA   = 6,

};



/* extended manifest element header */

sound/soc/sof/intel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ snd-sof-intel-ipc-objs := intel-ipc.o 
snd-sof-intel-hda-common-objs := hda.o hda-loader.o hda-stream.o hda-trace.o \

				 hda-dsp.o hda-ipc.o hda-ctrl.o hda-pcm.o \

				 hda-dai.o hda-bus.o \

				 apl.o cnl.o tgl.o

				 apl.o cnl.o tgl.o icl.o

snd-sof-intel-hda-common-$(CONFIG_SND_SOC_SOF_HDA_PROBES) += hda-compress.o



snd-sof-intel-hda-objs := hda-codec.o

sound/soc/sof/intel/apl.c

+3 −0
Original line number Diff line number Diff line
@@ -92,6 +92,9 @@ const struct snd_sof_dsp_ops sof_apl_ops = { 
	.pre_fw_run = hda_dsp_pre_fw_run,

	.post_fw_run = hda_dsp_post_fw_run,



	/* parse platform specific extended manifest */

	.parse_platform_ext_manifest = hda_dsp_ext_man_get_cavs_config_data,



	/* dsp core power up/down */

	.core_power_up = hda_dsp_enable_core,

	.core_power_down = hda_dsp_core_reset_power_down,

sound/soc/sof/intel/cnl.c

+3 −16
Original line number Diff line number Diff line
@@ -294,6 +294,9 @@ const struct snd_sof_dsp_ops sof_cnl_ops = { 
	.pre_fw_run = hda_dsp_pre_fw_run,

	.post_fw_run = hda_dsp_post_fw_run,



	/* parse platform specific extended manifest */

	.parse_platform_ext_manifest = hda_dsp_ext_man_get_cavs_config_data,



	/* dsp core power up/down */

	.core_power_up = hda_dsp_enable_core,

	.core_power_down = hda_dsp_core_reset_power_down,
@@ -346,22 +349,6 @@ const struct sof_intel_dsp_desc cnl_chip_info = { 
};

EXPORT_SYMBOL_NS(cnl_chip_info, SND_SOC_SOF_INTEL_HDA_COMMON);



const struct sof_intel_dsp_desc icl_chip_info = {

	/* Icelake */

	.cores_num = 4,

	.init_core_mask = 1,

	.host_managed_cores_mask = GENMASK(3, 0),

	.ipc_req = CNL_DSP_REG_HIPCIDR,

	.ipc_req_mask = CNL_DSP_REG_HIPCIDR_BUSY,

	.ipc_ack = CNL_DSP_REG_HIPCIDA,

	.ipc_ack_mask = CNL_DSP_REG_HIPCIDA_DONE,

	.ipc_ctl = CNL_DSP_REG_HIPCCTL,

	.rom_init_timeout	= 300,

	.ssp_count = ICL_SSP_COUNT,

	.ssp_base_offset = CNL_SSP_BASE_OFFSET,

};

EXPORT_SYMBOL_NS(icl_chip_info, SND_SOC_SOF_INTEL_HDA_COMMON);



const struct sof_intel_dsp_desc ehl_chip_info = {

	/* Elkhartlake */

	.cores_num = 4,

sound/soc/sof/intel/ext_manifest.h

0 → 100644
+35 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) 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) 2020 Intel Corporation. All rights reserved.

 */



/*

 * Intel extended manifest is a extra place to store Intel cavs specific

 * metadata about firmware, for example LPRO/HPRO configuration is

 * Intel cavs specific. This part of output binary is not signed.

 */



#ifndef __INTEL_CAVS_EXT_MANIFEST_H__

#define __INTEL_CAVS_EXT_MANIFEST_H__



#include <sound/sof/ext_manifest.h>



/* EXT_MAN_ELEM_PLATFORM_CONFIG_DATA elements identificators */

enum sof_cavs_config_elem_type {

	SOF_EXT_MAN_CAVS_CONFIG_EMPTY		= 0,

	SOF_EXT_MAN_CAVS_CONFIG_CAVS_LPRO	= 1,

	SOF_EXT_MAN_CAVS_CONFIG_OUTBOX_SIZE	= 2,

	SOF_EXT_MAN_CAVS_CONFIG_INBOX_SIZE	= 3,

};



/* EXT_MAN_ELEM_PLATFORM_CONFIG_DATA elements */

struct sof_ext_man_cavs_config_data {

	struct sof_ext_man_elem_header hdr;



	struct sof_config_elem elems[];

} __packed;



#endif /* __INTEL_CAVS_EXT_MANIFEST_H__ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE