platform: remove support for Broadwell and Haswell

Remove all support for Broadwell and Haswell platforms, they
aren't supported any more.

Signed-off-by: Guennadi Liakhovetski <[email protected]>

CODEOWNERS

@@ -40,7 +40,6 @@ src/audio/codec_adapter/*		@cujomalainey @abonislawski @dbaluta
 src/audio/google/*			@thesofproject/google
 
 # platforms
-src/platform/haswell/*			@randerwang
 src/platform/suecreek/*			@lyakh
 src/arch/xtensa/debug/gdb/*		@abonislawski
 src/platform/imx8/**			@dbaluta
@@ -50,7 +49,6 @@ src/platform/mt8195/**		@yaochunhung @kuanhsuncheng
 # drivers
 src/drivers/intel/dmic.c		@singalsu
 src/drivers/intel/cavs/sue-iomux.c	@lyakh
-src/drivers/intel/haswell/*		@randerwang
 src/drivers/imx/**			@dbaluta
 src/drivers/dw/*			@lyakh
 src/drivers/amd/*			@bhiregoudar @sunilkumardommati

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 hsw apl cnl imx imx8m imx8ulp rn rmb mt8186 mt8195; do \
+	for arch in apl cnl 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-hsw-elf/bin:${PATH}"
 ENV PATH="/home/sof/work/xtensa-apl-elf/bin:${PATH}"
 ENV PATH="/home/sof/work/xtensa-cnl-elf/bin:${PATH}"
 ENV PATH="/home/sof/work/xtensa-rn-elf/bin:${PATH}"
@@ -114,7 +113,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 hsw apl cnl imx imx8m imx8ulp rn rmb mt8186 mt8195; do \
+	for arch in apl cnl imx imx8m imx8ulp rn rmb mt8186 mt8195; do \
 		./configure --target=xtensa-${arch}-elf \
 		--prefix=/home/sof/work/xtensa-root && \
 		make && make install && \

scripts/qemu-check.sh

@@ -3,7 +3,7 @@
 # Copyright(c) 2018 Intel Corporation. All rights reserved.
 set -e
 
-SUPPORTED_PLATFORMS=(bdw hsw apl icl skl kbl cnl imx8 imx8x imx8m)
+SUPPORTED_PLATFORMS=(apl icl skl kbl cnl imx8 imx8x imx8m)
 
 SOF_DIR=$(cd "$(dirname "$0")" && cd .. && pwd)
 
@@ -81,23 +81,6 @@ do
 
 	has_rom=false
 	case "$platform" in
-		bdw)
-			READY_IPC="00 3c 01 80"
-			OUTBOX_OFFSET="9e000"
-			SHM_IPC_REG=qemu-bridge-shim-io
-			SHM_MBOX=qemu-bridge-dram-mem
-			;;
-		hsw)
-		# This READY_IPC value comes from:
-		#   shim_write(SHIM_IPCD, outbox | SHIM_IPCD_BUSY);
-		#   outbox=MAILBOX_HOST_OFFSET >> 3;
-		#   MAILBOX_HOST_OFFSET>>3 = 0xFC00
-		#   IPC_DIPCIDR_BUSY = BIT(31)
-			READY_IPC="00 fc 00 80"
-			OUTBOX_OFFSET="7e000"
-			SHM_IPC_REG=qemu-bridge-shim-io
-			SHM_MBOX=qemu-bridge-dram-mem # some DMA traces visible here
-			;;
 		apl)
 		# This READY_IPC value comes from:
 		#   ipc_write(IPC_DIPCIDR, IPC_DIPCIDR_BUSY | header);

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+=( hsw bdw apl skl kbl cnl sue icl jsl )
+SUPPORTED_PLATFORMS+=( apl skl kbl cnl sue icl jsl )
 
 BUILD_ROM=no
 BUILD_DEBUG=no
@@ -204,18 +204,6 @@ do
 	PLATFORM_PRIVATE_KEY=''
 
 	case $platform in
-		bdw)
-			PLATFORM="broadwell"
-			XTENSA_CORE="LX4_langwell_audio_17_8"
-			HOST="xtensa-hsw-elf"
-			XTENSA_TOOLS_VERSION="RG-2017.8-linux"
-			;;
-		hsw)
-			PLATFORM="haswell"
-			XTENSA_CORE="LX4_langwell_audio_17_8"
-			HOST="xtensa-hsw-elf"
-			XTENSA_TOOLS_VERSION="RG-2017.8-linux"
-			;;
 		apl)
 			PLATFORM="apollolake"
 			XTENSA_CORE="X4H3I16w2D48w3a_2017_8"

src/arch/xtensa/CMakeLists.txt

@@ -2,11 +2,7 @@
 
 # platform-specific values
 
-if(CONFIG_HASWELL)
-	set(platform_folder haswell)
-elseif(CONFIG_BROADWELL)
-	set(platform_folder haswell)
-elseif(CONFIG_APOLLOLAKE)
+if(CONFIG_APOLLOLAKE)
 	set(platform_folder apollolake)
 elseif(CONFIG_CANNONLAKE)
 	set(platform_folder cannonlake)
@@ -545,7 +541,7 @@ add_custom_target(
 # Keep lists below in sync with rimage/config/*.toml
 
 # .ri not signed: nothing variable in it to erase.
-set(UNSIGNED_RI         hsw bdw sue)
+set(UNSIGNED_RI         sue)
 # NXP
 list(APPEND UNSIGNED_RI imx8 imx8x imx8m imx8ulp)
 # AMD

src/drivers/dw/dma.c

@@ -477,34 +477,6 @@ static int dw_dma_status(struct dma_chan_data *channel,
 	return 0;
 }
 
-/* mask address for dma to identify memory space.
- * It is requested by HSW, BDW. For other
- * platforms, the mask is zero.
- */
-static void dw_dma_mask_address(struct dma_sg_elem *sg_elem,
-				struct dw_lli *lli_desc, uint32_t direction)
-{
-	lli_desc->sar = sg_elem->src;
-	lli_desc->dar = sg_elem->dest;
-
-	switch (direction) {
-	case DMA_DIR_LMEM_TO_HMEM:
-	case DMA_DIR_MEM_TO_DEV:
-		lli_desc->sar |= PLATFORM_DW_DMA_HOST_MASK;
-		break;
-	case DMA_DIR_HMEM_TO_LMEM:
-	case DMA_DIR_DEV_TO_MEM:
-		lli_desc->dar |= PLATFORM_DW_DMA_HOST_MASK;
-		break;
-	case DMA_DIR_MEM_TO_MEM:
-		lli_desc->sar |= PLATFORM_DW_DMA_HOST_MASK;
-		lli_desc->dar |= PLATFORM_DW_DMA_HOST_MASK;
-		break;
-	default:
-		break;
-	}
-}
-
 /* set the DMA channel configuration, source/target address, buffer sizes */
 static int dw_dma_set_config(struct dma_chan_data *channel,
 			     struct dma_sg_config *config)
@@ -737,8 +709,6 @@ static int dw_dma_set_config(struct dma_chan_data *channel,
 			goto out;
 		}
 
-		dw_dma_mask_address(sg_elem, lli_desc, config->direction);
-
 		if (sg_elem->size > DW_CTLH_BLOCK_TS_MASK) {
 			tr_err(&dwdma_tr, "dw_dma_set_config(): dma %d channel %d block size too big %d",
 			       channel->dma->plat_data.id,

src/drivers/intel/CMakeLists.txt

@@ -1,8 +1,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
-if(CONFIG_HASWELL OR CONFIG_BROADWELL)
-	add_subdirectory(haswell)
-elseif(CONFIG_CAVS)
+if(CONFIG_CAVS)
 	add_subdirectory(cavs)
 endif()