platform: remove support for cAVS 1.8 platforms

Remove all support for cAVS 1.8 platformsm including Cannon Lake, Comet Lake, Whiskey Lake and Coffee Lake, they aren't supported any more. Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
jsarha · Mar 2, 2023 · dc9ba28 · dc9ba28
1 parent d371135
commit dc9ba28
Show file tree

Hide file tree

Showing 74 changed files with 34 additions and 6,621 deletions.
diff --git a/app/boards/intel_adsp_cavs18.conf b/app/boards/intel_adsp_cavs18.conf
diff --git a/installer/GNUmakefile b/installer/GNUmakefile
@@ -39,9 +39,6 @@ $(info UNSIGNED_list = ${UNSIGNED_list} )
 $(info SIGNED_list   = ${SIGNED_list}   )
 $(info ALIAS_list    = ${ALIAS_list}    )
 
-target_of_cfl := cnl
-target_of_cml := cnl
-
 target_of_ehl := tgl
 target_of_adl   := tgl
 target_of_adl-s := tgl-h

diff --git a/scripts/docker_build/sof_builder/Dockerfile b/scripts/docker_build/sof_builder/Dockerfile
@@ -88,7 +88,7 @@ RUN cd "$HOME" && \
 	git clone $CLONE_DEFAULTS --branch sof-gcc10x $CT_NG_REPO && \
 	cd crosstool-ng && \
 	./bootstrap && ./configure --prefix=`pwd` && make && make install && \
-	for arch in cnl imx imx8m imx8ulp rn rmb mt8186 mt8195; do \
+	for arch in imx imx8m imx8ulp rn rmb mt8186 mt8195; do \
 		echo "$arch: ct-ng build start..." && \
 		cp config-${arch}-gcc10.2-gdb9 .config && \
 		# replace the build dist to save space
@@ -99,7 +99,6 @@ RUN cd "$HOME" && \
 	done && \
 	echo "Stage2: xtensa-overlay, crosstool-ng are done!"
 
-ENV PATH="/home/sof/work/xtensa-cnl-elf/bin:${PATH}"
 ENV PATH="/home/sof/work/xtensa-rn-elf/bin:${PATH}"
 ENV PATH="/home/sof/work/xtensa-rmb-elf/bin:${PATH}"
 ENV PATH="/home/sof/work/xtensa-imx-elf/bin:${PATH}"
@@ -112,7 +111,7 @@ ARG NEWLIB_REPO=https://github.com/jcmvbkbc/newlib-xtensa.git
 RUN cd "$HOME" && \
 	git clone $CLONE_DEFAULTS --branch xtensa $NEWLIB_REPO && \
 	cd newlib-xtensa && \
-	for arch in cnl imx imx8m imx8ulp rn rmb mt8186 mt8195; do \
+	for arch in imx imx8m imx8ulp rn rmb mt8186 mt8195; do \
 		./configure --target=xtensa-${arch}-elf \
 		--prefix=/home/sof/work/xtensa-root && \
 		make && make install && \

diff --git a/scripts/qemu-check.sh b/scripts/qemu-check.sh
@@ -3,7 +3,7 @@
 # Copyright(c) 2018 Intel Corporation. All rights reserved.
 set -e
 
-SUPPORTED_PLATFORMS=(icl cnl imx8 imx8x imx8m)
+SUPPORTED_PLATFORMS=(icl imx8 imx8x imx8m)
 
 SOF_DIR=$(cd "$(dirname "$0")" && cd .. && pwd)
 
@@ -81,13 +81,6 @@ do
 
 	has_rom=false
 	case "$platform" in
-		cnl)
-			READY_IPC="00 00 00 f0"
-			SHM_IPC_REG="qemu-bridge-ipc(|-dsp)-io"
-			OUTBOX_OFFSET="5000"
-			SHM_MBOX=qemu-bridge-hp-sram-mem
-			has_rom=true
-			;;
 		icl)
 			READY_IPC="00 00 00 f0"
 			SHM_IPC_REG="qemu-bridge-ipc(|-dsp)-io"

diff --git a/scripts/xtensa-build-all.sh b/scripts/xtensa-build-all.sh
@@ -24,7 +24,7 @@ SUPPORTED_PLATFORMS+=( mt8188 )
 # Not actually "supported" in the main branch anymore (go to stable-v2.3
 # instead) but kept here for historical reasons and experimentation
 # convenience.
-SUPPORTED_PLATFORMS+=( cnl icl jsl )
+SUPPORTED_PLATFORMS+=( icl jsl )
 
 BUILD_ROM=no
 BUILD_DEBUG=no
@@ -204,13 +204,6 @@ do
 	PLATFORM_PRIVATE_KEY=''
 
 	case $platform in
-		cnl)
-			PLATFORM="cannonlake"
-			XTENSA_CORE="X6H3CNL_2017_8"
-			HOST="xtensa-cnl-elf"
-			XTENSA_TOOLS_VERSION="RG-2017.8-linux"
-			HAVE_ROM='yes'
-			;;
 		icl)
 			PLATFORM="icelake"
 			XTENSA_CORE="X6H3CNL_2017_8"
@@ -338,11 +331,7 @@ do
 		TOOLCHAIN=$HOST
 		PATH=$SOF_TOP/../$HOST/bin:$OLDPATH
 		COMPILER="gcc"
-
-		case "$platform" in
-			cnl) DEFCONFIG_PATCH="_gcc";;
-			*)   DEFCONFIG_PATCH="";;
-		esac
+		DEFCONFIG_PATCH=""
 	fi
 
 	BUILD_DIR=build_${platform}_${COMPILER}

diff --git a/scripts/xtensa-build-zephyr.py b/scripts/xtensa-build-zephyr.py
@@ -72,13 +72,6 @@
 
 platform_list = [
 	# Intel platforms
-	{
-		"name": "cnl",
-		"PLAT_CONFIG": "intel_adsp_cavs18",
-		"XTENSA_CORE": "X6H3CNL_2017_8",
-		"XTENSA_TOOLS_VERSION": f"RG-2017.8{xtensa_tools_version_postfix}",
-		"DEFAULT_TOOLCHAIN_VARIANT": "xcc"
-	},
 	{
 		"name": "icl",
 		"PLAT_CONFIG": "intel_adsp_cavs20",
@@ -192,23 +185,19 @@ def parse_args():
 For SOF:
     /lib/firmware/intel/sof
     └───────community
-        │   ├── sof-tgl.ri
-        │   └── sof-cnl.ri
+        │   └── sof-tgl.ri
         ├── dbgkey
-        │   ├── sof-tgl.ri
-        │   └── sof-cnl.ri
-        ├── sof-tgl.ri
-        └── sof-cnl.ri
+        │   └── sof-tgl.ri
+        └── sof-tgl.ri
 For AVS(filename dsp_basefw.bin):
 Noted that with fw_naming set as 'AVS', there will be output subdirectories for each platform
     /lib/firmware/intel/sof-ipc4
     └── tgl
-    │   ├── community
-    │   │   └── dsp_basefw.bin
-    │   ├── dbgkey
-    │   │   └── dsp_basefw.bin
-    │   └── dsp_basefw.bin
-    └── cnl"""
+        ├── community
+        │   └── dsp_basefw.bin
+        ├── dbgkey
+        │   └── dsp_basefw.bin
+        └── dsp_basefw.bin"""
 	)
 	parser.add_argument("-j", "--jobs", required=False, type=int,
 						help="Number of concurrent jobs. Passed to west build and"

diff --git a/src/arch/xtensa/CMakeLists.txt b/src/arch/xtensa/CMakeLists.txt
@@ -2,9 +2,7 @@
 
 # platform-specific values
 
-if(CONFIG_CANNONLAKE)
-	set(platform_folder cannonlake)
-elseif(CONFIG_ICELAKE)
+if(CONFIG_ICELAKE)
 	set(platform_folder icelake)
 elseif(CONFIG_TIGERLAKE)
 	set(platform_folder tigerlake)

diff --git a/src/arch/xtensa/configs/cannonlake_defconfig b/src/arch/xtensa/configs/cannonlake_defconfig
diff --git a/src/arch/xtensa/configs/cannonlake_gcc_defconfig b/src/arch/xtensa/configs/cannonlake_gcc_defconfig
diff --git a/src/arch/xtensa/configs/override/cannonlake_chrome.config b/src/arch/xtensa/configs/override/cannonlake_chrome.config
diff --git a/src/drivers/intel/ssp/mn.c b/src/drivers/intel/ssp/mn.c
@@ -542,53 +542,12 @@ static inline int setup_current_bclk_mn_source(uint32_t bclk, uint32_t *scr_div,
 	return ret;
 }
 
-#if CAVS_VERSION >= CAVS_VERSION_2_0
 static inline bool check_bclk_xtal_source(uint32_t bclk, bool mn_in_use,
 					  uint32_t *scr_div)
 {
 	/* since cAVS 2.0 bypassing XTAL (ECS=0) is not supported */
 	return false;
 }
-#else
-/**
- * \brief Checks if XTAL source for BCLK should be used.
- *	  Before cAVS 2.0 BCLK could use XTAL directly (without M/N).
- *	  BCLK that use M/N = 1/1 or bypass XTAL is preferred.
- * \param[in] bclk Bit clock frequency.
- * \param[in] mn_in_use True if M/N source is already locked by another port.
- * \param[out] scr_div SCR divisor.
- * \return true if XTAL source should be used, false otherwise.
- */
-static inline bool check_bclk_xtal_source(uint32_t bclk, bool mn_in_use,
-					  uint32_t *scr_div)
-{
-	struct mn *mn = mn_get();
-	bool ret = false;
-	int i;
-
-	for (i = 0; i <= MAX_SSP_FREQ_INDEX; i++) {
-		if (ssp_freq[i].freq % bclk != 0)
-			continue;
-
-		if (ssp_freq_sources[i] == SSP_CLOCK_XTAL_OSCILLATOR) {
-			/* XTAL turned out to be lowest source that can work
-			 * just with SCR, so use it
-			 */
-			*scr_div = ssp_freq[i].freq / bclk;
-			ret = true;
-			break;
-		}
-
-		/* if M/N is already set up for desired clock,
-		 * we can quit and let M/N logic handle it
-		 */
-		if (!mn_in_use || mn->bclk_source_mn_clock == i)
-			break;
-	}
-
-	return ret;
-}
-#endif
 
 int mn_set_bclk(uint32_t dai_index, uint32_t bclk_rate,
 		uint32_t *out_scr_div, bool *out_need_ecs)

diff --git a/src/include/sof/drivers/dmic.h b/src/include/sof/drivers/dmic.h
@@ -35,12 +35,6 @@
 #define DMIC_UNMUTE_CIC		1	/* Unmute CIC at 1 ms */
 #define DMIC_UNMUTE_FIR		2	/* Unmute FIR at 2 ms */
 
-#if CONFIG_CANNONLAKE
-#define DMIC_HW_VERSION		1
-#define DMIC_HW_CONTROLLERS	2
-#define DMIC_HW_FIFOS		2
-#endif
-
 #if CONFIG_ICELAKE || CONFIG_TIGERLAKE
 #define DMIC_HW_VERSION		1
 #define DMIC_HW_CONTROLLERS	2

diff --git a/src/platform/CMakeLists.txt b/src/platform/CMakeLists.txt
@@ -5,9 +5,7 @@ if(CONFIG_LIBRARY)
 	return()
 endif()
 
-if(CONFIG_CANNONLAKE)
-	add_subdirectory(cannonlake)
-elseif(CONFIG_ICELAKE)
+if(CONFIG_ICELAKE)
 	add_subdirectory(icelake)
 elseif(CONFIG_TIGERLAKE)
 	add_subdirectory(tigerlake)

diff --git a/src/platform/Kconfig b/src/platform/Kconfig
@@ -7,24 +7,6 @@ choice
 	default ZEPHYR_POSIX if ARCH_POSIX
 	default TIGERLAKE
 
-config CANNONLAKE
-	bool "Build for Cannonlake"
-	select XT_BOOT_LOADER
-	select XT_IRQ_MAP
-	select DMA_GW
-	select DW
-	select DW_DMA
-	select MEM_WND
-	select DMA_HW_LLI
-	select DW_DMA_AGGREGATED_IRQ
-	select DMA_FIFO_PARTITION
-	select CAVS
-	select CAVS_VERSION_1_8
-	select XT_WAITI_DELAY
-	select CAVS_USE_LPRO_IN_WAITI
-	help
-	  Select if your target platform is Cannonlake-compatible
-
 config ICELAKE
 	bool "Build for Icelake"
 	select XT_BOOT_LOADER
@@ -224,7 +206,7 @@ endchoice
 
 config MAX_CORE_COUNT
 	int
-	default 4 if ICELAKE || CANNONLAKE || TIGERLAKE
+	default 4 if ICELAKE || TIGERLAKE
 	default 3 if METEORLAKE
 	default 1
 	help
@@ -284,20 +266,14 @@ config CAVS
 	select WAKEUP_HOOK
 	select SCHEDULE_DMA_SINGLE_CHANNEL
 
-config CAVS_VERSION_1_8
-	depends on CAVS
-	bool
-	help
-	  Select for CAVS version 1.8
-
 config CAVS_VERSION_2_0
-	depends on CAVS && !CAVS_VERSION_1_8
+	depends on CAVS
 	bool
 	help
 	  Select for CAVS version 2.0
 
 config CAVS_VERSION_2_5
-	depends on CAVS && !CAVS_VERSION_1_8 && !CAVS_VERSION_2_0
+	depends on CAVS && !CAVS_VERSION_2_0
 	bool
 	help
 	  Select for CAVS version 2.5
@@ -414,7 +390,6 @@ config CAVS_IMR_D3_PERSISTENT
 # TODO: it should just take manifest version and offsets
 config RIMAGE_SIGNING_SCHEMA
 	string "Rimage firmware signing schema name"
-	default "cnl" if CANNONLAKE
 	default "icl" if ICELAKE
 	default "tgl" if TIGERLAKE
 	default "imx8" if IMX8

diff --git a/src/platform/cannonlake/CMakeLists.txt b/src/platform/cannonlake/CMakeLists.txt
diff --git a/src/platform/cannonlake/base_module.c b/src/platform/cannonlake/base_module.c