Skip to contentSkip to conversation

ASoC: Intel: Remove obsolete solutions and components

PATCH In review Cezary Rojewski 6 participants 25 messages Oct 6, 2020 – Oct 12, 2020

Subsystems (4)
lore
Share & tools
lore

Cezary Rojewski

author maintainer
#0 lore raw

v2 cover ASoC: Intel: Remove obsolete solutions and components

Follow up to catpt series as mentioned in:
[PATCH v10 00/14] ASoC: Intel: Catpt - Lynx and Wildcat point
https://www.spinics.net/lists/alsa-devel/msg116440.html

As catpt is a direct replacement to sound/soc/intel/haswell, it leaves a lot of code redudant. The second legacy solution - baytrail - is deprecated for a long time by sound/soc/intel/atom with SOF flavor available too.

This series addresses the redudancy and removes obsolete code. Along with the legacy solutions, all orphaned components are removed too.

As a consequence, further cleanups are unlocked: sound/soc/intel/skylake becomes the sole user of processing code found in sound/soc/intel/common. Those are not part of this series.

Changes in v2:
- just a rebase so patch 04/13 applies cleanly
- left the tags as no actual changes done in between

Cezary Rojewski (13):
ASoC: Intel: Remove haswell solution
ASoC: Intel: Remove max98090 support for baytrail solution
ASoC: Intel: Remove rt5640 support for baytrail solution
ASoC: Intel: Remove baytrail solution
ASoC: Intel: Remove SST ACPI component
ASoC: Intel: Remove SST firmware components
ASoC: Intel: Skylake: Unassign ram_read and read_write ops
ASoC: Intel: Remove unused DSP operations
ASoC: Intel: Remove unused DSP interface fields
ASoC: Intel: Remove SST-legacy specific constants
ASoC: Intel: Make atom components independent of sst-dsp
ASoC: Intel: Remove sst_pdata structure
ASoC: Intel: Remove sst_dsp_get_thread_context

 include/sound/soc-acpi-intel-match.h          |    1 -
 include/trace/events/hswadsp.h                |  385 ---
 sound/soc/intel/Kconfig                       |   26 -
 sound/soc/intel/Makefile                      |    1 -
 sound/soc/intel/atom/sst/sst.c                |    1 -
 sound/soc/intel/atom/sst/sst.h                |    7 +
 sound/soc/intel/atom/sst/sst_acpi.c           |    1 -
 sound/soc/intel/atom/sst/sst_drv_interface.c  |    3 -
 sound/soc/intel/atom/sst/sst_ipc.c            |    1 -
 sound/soc/intel/atom/sst/sst_loader.c         |    1 -
 sound/soc/intel/atom/sst/sst_pvt.c            |    1 -
 sound/soc/intel/atom/sst/sst_stream.c         |    1 -
 sound/soc/intel/baytrail/Makefile             |    5 -
 sound/soc/intel/baytrail/sst-baytrail-dsp.c   |  358 ---
 sound/soc/intel/baytrail/sst-baytrail-ipc.c   |  772 ------
 sound/soc/intel/baytrail/sst-baytrail-ipc.h   |   64 -
 sound/soc/intel/baytrail/sst-baytrail-pcm.c   |  459 ----
 sound/soc/intel/boards/Kconfig                |   25 -
 sound/soc/intel/boards/Makefile               |    4 -
 sound/soc/intel/boards/byt-max98090.c         |  182 --
 sound/soc/intel/boards/byt-rt5640.c           |  224 --
 sound/soc/intel/boards/bytcht_es8316.c        |    1 -
 sound/soc/intel/boards/bytcr_rt5640.c         |    1 -
 sound/soc/intel/common/Makefile               |    4 -
 .../intel/common/soc-acpi-intel-byt-match.c   |   15 -
 sound/soc/intel/common/sst-acpi.c             |  236 --
 sound/soc/intel/common/sst-dsp-priv.h         |  284 +--
 sound/soc/intel/common/sst-dsp.c              |  162 --
 sound/soc/intel/common/sst-dsp.h              |  222 --
 sound/soc/intel/common/sst-firmware.c         | 1273 ----------
 sound/soc/intel/common/sst-ipc.c              |   27 -
 sound/soc/intel/common/sst-ipc.h              |    3 -
 sound/soc/intel/haswell/Makefile              |    5 -
 sound/soc/intel/haswell/sst-haswell-dsp.c     |  705 ------
 sound/soc/intel/haswell/sst-haswell-ipc.c     | 2222 -----------------
 sound/soc/intel/haswell/sst-haswell-ipc.h     |  527 ----
 sound/soc/intel/haswell/sst-haswell-pcm.c     | 1369 ----------
 sound/soc/intel/skylake/bxt-sst.c             |    2 -
 sound/soc/intel/skylake/cnl-sst.c             |    4 +-
 sound/soc/intel/skylake/skl-sst-dsp.c         |    2 +-
 sound/soc/intel/skylake/skl-sst-ipc.c         |    2 +-
 sound/soc/intel/skylake/skl-sst.c             |    2 -
 42 files changed, 11 insertions(+), 9579 deletions(-)
 delete mode 100644 include/trace/events/hswadsp.h
 delete mode 100644 sound/soc/intel/baytrail/Makefile
 delete mode 100644 sound/soc/intel/baytrail/sst-baytrail-dsp.c
 delete mode 100644 sound/soc/intel/baytrail/sst-baytrail-ipc.c
 delete mode 100644 sound/soc/intel/baytrail/sst-baytrail-ipc.h
 delete mode 100644 sound/soc/intel/baytrail/sst-baytrail-pcm.c
 delete mode 100644 sound/soc/intel/boards/byt-max98090.c
 delete mode 100644 sound/soc/intel/boards/byt-rt5640.c
 delete mode 100644 sound/soc/intel/common/sst-acpi.c
 delete mode 100644 sound/soc/intel/common/sst-firmware.c
 delete mode 100644 sound/soc/intel/haswell/Makefile
 delete mode 100644 sound/soc/intel/haswell/sst-haswell-dsp.c
 delete mode 100644 sound/soc/intel/haswell/sst-haswell-ipc.c
 delete mode 100644 sound/soc/intel/haswell/sst-haswell-ipc.h
 delete mode 100644 sound/soc/intel/haswell/sst-haswell-pcm.c
Signature · 1 line
2.17.1
author maintainer
#1 lore raw

PATCH v2 1/13 ASoC: Intel: Remove haswell solution

Newly added catpt solution found in sound/soc/intel/catpt is a direct replacement to sound/soc/intel/haswell. It covers all features supported by it and more - by aligning to recommended flows and requirement list based on Windows driver equivalent. No harm is done to userspace as catpt - similarly to haswell - loads no extenal topology files while sharing the exact same ADSP firmware binary.

Given the above, existing haswell code is redundant so remove it.

---
 include/trace/events/hswadsp.h            |  385 ----
 sound/soc/intel/haswell/Makefile          |    5 -
 sound/soc/intel/haswell/sst-haswell-dsp.c |  705 -------
 sound/soc/intel/haswell/sst-haswell-ipc.c | 2222 ---------------------
 sound/soc/intel/haswell/sst-haswell-ipc.h |  527 -----
 sound/soc/intel/haswell/sst-haswell-pcm.c | 1369 -------------
 6 files changed, 5213 deletions(-)
 delete mode 100644 include/trace/events/hswadsp.h
 delete mode 100644 sound/soc/intel/haswell/Makefile
 delete mode 100644 sound/soc/intel/haswell/sst-haswell-dsp.c
 delete mode 100644 sound/soc/intel/haswell/sst-haswell-ipc.c
 delete mode 100644 sound/soc/intel/haswell/sst-haswell-ipc.h
 delete mode 100644 sound/soc/intel/haswell/sst-haswell-pcm.c
include/trace/events/hswadsp.h deleted +0 -385
deleted file mode 100644
index 939d7a09d73f..000000000000
@@ -1,385 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#undef TRACE_SYSTEM
-#define TRACE_SYSTEM hswadsp
-
-#if !defined(_TRACE_HSWADSP_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_HSWADSP_H
-
-#include <linux/types.h>
-#include <linux/ktime.h>
-#include <linux/tracepoint.h>
-
-struct sst_hsw;
-struct sst_hsw_stream;
-struct sst_hsw_ipc_stream_free_req;
-struct sst_hsw_ipc_volume_req;
-struct sst_hsw_ipc_stream_alloc_req;
-struct sst_hsw_audio_data_format_ipc;
-struct sst_hsw_ipc_stream_info_reply;
-struct sst_hsw_ipc_device_config_req;
-
-DECLARE_EVENT_CLASS(sst_irq,
-
-	TP_PROTO(uint32_t status, uint32_t mask),
-
-	TP_ARGS(status, mask),
-
-	TP_STRUCT__entry(
-		__field(	unsigned int,	status		)
-		__field(	unsigned int,	mask		)
-	),
-
-	TP_fast_assign(
-		__entry->status = status;
-		__entry->mask = mask;
-	),
-
-	TP_printk("status 0x%8.8x mask 0x%8.8x",
-		(unsigned int)__entry->status, (unsigned int)__entry->mask)
-);
-
-DEFINE_EVENT(sst_irq, sst_irq_busy,
-
-	TP_PROTO(unsigned int status, unsigned int mask),
-
-	TP_ARGS(status, mask)
-
-);
-
-DEFINE_EVENT(sst_irq, sst_irq_done,
-
-	TP_PROTO(unsigned int status, unsigned int mask),
-
-	TP_ARGS(status, mask)
-
-);
-
-DECLARE_EVENT_CLASS(ipc,
-
-	TP_PROTO(const char *name, int val),
-
-	TP_ARGS(name, val),
-
-	TP_STRUCT__entry(
-		__string(	name,	name		)
-		__field(	unsigned int,	val	)
-	),
-
-	TP_fast_assign(
-		__assign_str(name, name);
-		__entry->val = val;
-	),
-
-	TP_printk("%s 0x%8.8x", __get_str(name), (unsigned int)__entry->val)
-
-);
-
-DEFINE_EVENT(ipc, ipc_request,
-
-	TP_PROTO(const char *name, int val),
-
-	TP_ARGS(name, val)
-
-);
-
-DEFINE_EVENT(ipc, ipc_reply,
-
-	TP_PROTO(const char *name, int val),
-
-	TP_ARGS(name, val)
-
-);
-
-DEFINE_EVENT(ipc, ipc_pending_reply,
-
-	TP_PROTO(const char *name, int val),
-
-	TP_ARGS(name, val)
-
-);
-
-DEFINE_EVENT(ipc, ipc_notification,
-
-	TP_PROTO(const char *name, int val),
-
-	TP_ARGS(name, val)
-
-);
-
-DEFINE_EVENT(ipc, ipc_error,
-
-	TP_PROTO(const char *name, int val),
-
-	TP_ARGS(name, val)
-
-);
-
-DECLARE_EVENT_CLASS(stream_position,
-
-	TP_PROTO(unsigned int id, unsigned int pos),
-
-	TP_ARGS(id, pos),
-
-	TP_STRUCT__entry(
-		__field(	unsigned int,	id		)
-		__field(	unsigned int,	pos		)
-	),
-
-	TP_fast_assign(
-		__entry->id = id;
-		__entry->pos = pos;
-	),
-
-	TP_printk("id %d position 0x%x",
-		(unsigned int)__entry->id, (unsigned int)__entry->pos)
-);
-
-DEFINE_EVENT(stream_position, stream_read_position,
-
-	TP_PROTO(unsigned int id, unsigned int pos),
-
-	TP_ARGS(id, pos)
-
-);
-
-DEFINE_EVENT(stream_position, stream_write_position,
-
-	TP_PROTO(unsigned int id, unsigned int pos),
-
-	TP_ARGS(id, pos)
-
-);
-
-TRACE_EVENT(hsw_stream_buffer,
-
-	TP_PROTO(struct sst_hsw_stream *stream),
-
-	TP_ARGS(stream),
-
-	TP_STRUCT__entry(
-		__field(	int,	id	)
-		__field(	int,	pt_addr	)
-		__field(	int,	num_pages	)
-		__field(	int,	ring_size	)
-		__field(	int,	ring_offset	)
-		__field(	int,	first_pfn	)
-	),
-
-	TP_fast_assign(
-		__entry->id = stream->host_id;
-		__entry->pt_addr = stream->request.ringinfo.ring_pt_address;
-		__entry->num_pages = stream->request.ringinfo.num_pages;
-		__entry->ring_size = stream->request.ringinfo.ring_size;
-		__entry->ring_offset = stream->request.ringinfo.ring_offset;
-		__entry->first_pfn = stream->request.ringinfo.ring_first_pfn;
-	),
-
-	TP_printk("stream %d ring addr 0x%x pages %d size 0x%x offset 0x%x PFN 0x%x",
-		(int) __entry->id,  (int)__entry->pt_addr,
-		(int)__entry->num_pages, (int)__entry->ring_size,
-		(int)__entry->ring_offset, (int)__entry->first_pfn)
-);
-
-TRACE_EVENT(hsw_stream_alloc_reply,
-
-	TP_PROTO(struct sst_hsw_stream *stream),
-
-	TP_ARGS(stream),
-
-	TP_STRUCT__entry(
-		__field(	int,	id	)
-		__field(	int,	stream_id	)
-		__field(	int,	mixer_id	)
-		__field(	int,	peak0	)
-		__field(	int,	peak1	)
-		__field(	int,	vol0	)
-		__field(	int,	vol1	)
-	),
-
-	TP_fast_assign(
-		__entry->id = stream->host_id;
-		__entry->stream_id = stream->reply.stream_hw_id;
-		__entry->mixer_id = stream->reply.mixer_hw_id;
-		__entry->peak0 = stream->reply.peak_meter_register_address[0];
-		__entry->peak1 = stream->reply.peak_meter_register_address[1];
-		__entry->vol0 = stream->reply.volume_register_address[0];
-		__entry->vol1 = stream->reply.volume_register_address[1];
-	),
-
-	TP_printk("stream %d hw id %d mixer %d peak 0x%x:0x%x vol 0x%x,0x%x",
-		(int) __entry->id, (int) __entry->stream_id, (int)__entry->mixer_id,
-		(int)__entry->peak0, (int)__entry->peak1,
-		(int)__entry->vol0, (int)__entry->vol1)
-);
-
-TRACE_EVENT(hsw_mixer_info_reply,
-
-	TP_PROTO(struct sst_hsw_ipc_stream_info_reply *reply),
-
-	TP_ARGS(reply),
-
-	TP_STRUCT__entry(
-		__field(	int,	mixer_id	)
-		__field(	int,	peak0	)
-		__field(	int,	peak1	)
-		__field(	int,	vol0	)
-		__field(	int,	vol1	)
-	),
-
-	TP_fast_assign(
-		__entry->mixer_id = reply->mixer_hw_id;
-		__entry->peak0 = reply->peak_meter_register_address[0];
-		__entry->peak1 = reply->peak_meter_register_address[1];
-		__entry->vol0 = reply->volume_register_address[0];
-		__entry->vol1 = reply->volume_register_address[1];
-	),
-
-	TP_printk("mixer id %d peak 0x%x:0x%x vol 0x%x,0x%x",
-		(int)__entry->mixer_id,
-		(int)__entry->peak0, (int)__entry->peak1,
-		(int)__entry->vol0, (int)__entry->vol1)
-);
-
-TRACE_EVENT(hsw_stream_data_format,
-
-	TP_PROTO(struct sst_hsw_stream *stream,
-		struct sst_hsw_audio_data_format_ipc *req),
-
-	TP_ARGS(stream, req),
-
-	TP_STRUCT__entry(
-		__field(	uint32_t,	id	)
-		__field(	uint32_t,	frequency	)
-		__field(	uint32_t,	bitdepth	)
-		__field(	uint32_t,	map	)
-		__field(	uint32_t,	config	)
-		__field(	uint32_t,	style	)
-		__field(	uint8_t,	ch_num	)
-		__field(	uint8_t,	valid_bit	)
-	),
-
-	TP_fast_assign(
-		__entry->id = stream->host_id;
-		__entry->frequency = req->frequency;
-		__entry->bitdepth = req->bitdepth;
-		__entry->map = req->map;
-		__entry->config = req->config;
-		__entry->style = req->style;
-		__entry->ch_num = req->ch_num;
-		__entry->valid_bit = req->valid_bit;
-	),
-
-	TP_printk("stream %d freq %d depth %d map 0x%x config 0x%x style 0x%x ch %d bits %d",
-		(int) __entry->id, (uint32_t)__entry->frequency,
-		(uint32_t)__entry->bitdepth, (uint32_t)__entry->map,
-		(uint32_t)__entry->config, (uint32_t)__entry->style,
-		(uint8_t)__entry->ch_num, (uint8_t)__entry->valid_bit)
-);
-
-TRACE_EVENT(hsw_stream_alloc_request,
-
-	TP_PROTO(struct sst_hsw_stream *stream,
-		struct sst_hsw_ipc_stream_alloc_req *req),
-
-	TP_ARGS(stream, req),
-
-	TP_STRUCT__entry(
-		__field(	uint32_t,	id	)
-		__field(	uint8_t,	path_id	)
-		__field(	uint8_t,	stream_type	)
-		__field(	uint8_t,	format_id	)
-	),
-
-	TP_fast_assign(
-		__entry->id = stream->host_id;
-		__entry->path_id = req->path_id;
-		__entry->stream_type = req->stream_type;
-		__entry->format_id = req->format_id;
-	),
-
-	TP_printk("stream %d path %d type %d format %d",
-		(int) __entry->id, (uint8_t)__entry->path_id,
-		(uint8_t)__entry->stream_type, (uint8_t)__entry->format_id)
-);
-
-TRACE_EVENT(hsw_stream_free_req,
-
-	TP_PROTO(struct sst_hsw_stream *stream,
-		struct sst_hsw_ipc_stream_free_req *req),
-
-	TP_ARGS(stream, req),
-
-	TP_STRUCT__entry(
-		__field(	int,	id	)
-		__field(	int,	stream_id	)
-	),
-
-	TP_fast_assign(
-		__entry->id = stream->host_id;
-		__entry->stream_id = req->stream_id;
-	),
-
-	TP_printk("stream %d hw id %d",
-		(int) __entry->id, (int) __entry->stream_id)
-);
-
-TRACE_EVENT(hsw_volume_req,
-
-	TP_PROTO(struct sst_hsw_stream *stream,
-		struct sst_hsw_ipc_volume_req *req),
-
-	TP_ARGS(stream, req),
-
-	TP_STRUCT__entry(
-		__field(	int,	id	)
-		__field(	uint32_t,	channel	)
-		__field(	uint32_t,	target_volume	)
-		__field(	uint64_t,	curve_duration	)
-		__field(	uint32_t,	curve_type	)
-	),
-
-	TP_fast_assign(
-		__entry->id = stream->host_id;
-		__entry->channel = req->channel;
-		__entry->target_volume = req->target_volume;
-		__entry->curve_duration = req->curve_duration;
-		__entry->curve_type = req->curve_type;
-	),
-
-	TP_printk("stream %d chan 0x%x vol %d duration %llu type %d",
-		(int) __entry->id, (uint32_t) __entry->channel,
-		(uint32_t)__entry->target_volume,
-		(uint64_t)__entry->curve_duration,
-		(uint32_t)__entry->curve_type)
-);
-
-TRACE_EVENT(hsw_device_config_req,
-
-	TP_PROTO(struct sst_hsw_ipc_device_config_req *req),
-
-	TP_ARGS(req),
-
-	TP_STRUCT__entry(
-		__field(	uint32_t,	ssp	)
-		__field(	uint32_t,	clock_freq	)
-		__field(	uint32_t,	mode	)
-		__field(	uint16_t,	clock_divider	)
-	),
-
-	TP_fast_assign(
-		__entry->ssp = req->ssp_interface;
-		__entry->clock_freq = req->clock_frequency;
-		__entry->mode = req->mode;
-		__entry->clock_divider = req->clock_divider;
-	),
-
-	TP_printk("SSP %d Freq %d mode %d div %d",
-		(uint32_t)__entry->ssp,
-		(uint32_t)__entry->clock_freq, (uint32_t)__entry->mode,
-		(uint32_t)__entry->clock_divider)
-);
-
-#endif /* _TRACE_HSWADSP_H */
-
-/* This part must be outside protection */
-#include <trace/define_trace.h>
sound/soc/intel/haswell/Makefile deleted +0 -5
deleted file mode 100644
index ad2341aea8ae..000000000000
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-snd-soc-sst-haswell-pcm-objs := \
-	        sst-haswell-ipc.o sst-haswell-pcm.o sst-haswell-dsp.o
-
-obj-$(CONFIG_SND_SOC_INTEL_HASWELL) += snd-soc-sst-haswell-pcm.o
sound/soc/intel/haswell/sst-haswell-dsp.c deleted +0 -705

705 lines not on this page · raw message

sound/soc/intel/haswell/sst-haswell-ipc.c deleted +0 -2222

1,905 lines not on this page · raw message

sound/soc/intel/haswell/sst-haswell-ipc.h deleted +0 -527

527 lines not on this page · raw message

sound/soc/intel/haswell/sst-haswell-pcm.c deleted +0 -1369

1,369 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.17.1

Part of the diff is not shown here. View the raw message.

author maintainer
#2 lore raw

PATCH v2 2/13 ASoC: Intel: Remove max98090 support for baytrail solution

In reply to Cezary Rojewski

byt-max98090 is deprecated in favor of cht-bsw-max98090 used by sound/soc/intel/atom and SOF solutions both. Remove redundant machine board and all related code.

---
 sound/soc/intel/boards/Kconfig                |  11 --
 sound/soc/intel/boards/Makefile               |   2 -
 sound/soc/intel/boards/byt-max98090.c         | 182 ------------------
 .../intel/common/soc-acpi-intel-byt-match.c   |   5 -
 4 files changed, 200 deletions(-)
 delete mode 100644 sound/soc/intel/boards/byt-max98090.c
sound/soc/intel/boards/Kconfig +0 -11
index 6afdd9ac4478..a8da892441be 100644
@@ -87,17 +87,6 @@ endif ## SND_SOC_INTEL_CATPT || SND_SOC_SOF_BROADWELL
 
 if SND_SOC_INTEL_BAYTRAIL
 
-config SND_SOC_INTEL_BYT_MAX98090_MACH
-	tristate "Baytrail with MAX98090 codec"
-	depends on I2C
-	depends on X86_INTEL_LPSS || COMPILE_TEST
-	select SND_SOC_MAX98090
-	help
-	  This adds audio driver for Intel Baytrail platform based boards
-	  with the MAX98090 audio codec. This driver is deprecated, use
-	  SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH instead for better
-	  functionality.
-
 config SND_SOC_INTEL_BYT_RT5640_MACH
 	tristate "Baytrail with RT5640 codec"
 	depends on I2C
sound/soc/intel/boards/Makefile +0 -2
index de7cc9b86354..b2e5709a097b 100644
@@ -1,7 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 snd-soc-sst-haswell-objs := haswell.o
 snd-soc-sst-byt-rt5640-mach-objs := byt-rt5640.o
-snd-soc-sst-byt-max98090-mach-objs := byt-max98090.o
 snd-soc-sst-bdw-rt5650-mach-objs := bdw-rt5650.o
 snd-soc-sst-bdw-rt5677-mach-objs := bdw-rt5677.o
 snd-soc-sst-broadwell-objs := broadwell.o
@@ -44,7 +43,6 @@ snd-soc-sof-sdw-objs += sof_sdw.o				\
 obj-$(CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH) += snd-soc-sof_rt5682.o
 obj-$(CONFIG_SND_SOC_INTEL_HASWELL_MACH) += snd-soc-sst-haswell.o
 obj-$(CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH) += snd-soc-sst-byt-rt5640-mach.o
-obj-$(CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH) += snd-soc-sst-byt-max98090-mach.o
 obj-$(CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON) += snd-soc-sst-bxt-da7219_max98357a.o
 obj-$(CONFIG_SND_SOC_INTEL_BXT_RT298_MACH) += snd-soc-sst-bxt-rt298.o
 obj-$(CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH) += snd-soc-sst-sof-pcm512x.o
sound/soc/intel/boards/byt-max98090.c deleted +0 -182

182 lines not on this page · raw message

sound/soc/intel/common/soc-acpi-intel-byt-match.c +0 -5
index 1cc801ba92eb..4043a1ab44b3 100644
@@ -126,11 +126,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_baytrail_legacy_machines[] = {
 		.drv_name = "byt-rt5640",
 		.fw_filename = "intel/fw_sst_0f28.bin-48kHz_i2s_master",
 	},
-	{
-		.id = "193C9890",
-		.drv_name = "byt-max98090",
-		.fw_filename = "intel/fw_sst_0f28.bin-48kHz_i2s_master",
-	},
 	{}
 };
 EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_baytrail_legacy_machines);
Signature · 1 line
2.17.1
author maintainer
#3 lore raw

PATCH v2 3/13 ASoC: Intel: Remove rt5640 support for baytrail solution

In reply to Cezary Rojewski

byt-rt5640 is deprecated in favor of bytcr_rt5640 used by sound/soc/intel/atom and SOF solutions both. Remove redundant machine board and all related code.

---
 include/sound/soc-acpi-intel-match.h          |   1 -
 sound/soc/intel/boards/Kconfig                |  14 --
 sound/soc/intel/boards/Makefile               |   2 -
 sound/soc/intel/boards/byt-rt5640.c           | 224 ------------------
 .../intel/common/soc-acpi-intel-byt-match.c   |  10 -
 5 files changed, 251 deletions(-)
 delete mode 100644 sound/soc/intel/boards/byt-rt5640.c
include/sound/soc-acpi-intel-match.h +0 -1
index ab6f75a86611..5c49e7d78002 100644
@@ -16,7 +16,6 @@
  */
 extern struct snd_soc_acpi_mach snd_soc_acpi_intel_haswell_machines[];
 extern struct snd_soc_acpi_mach snd_soc_acpi_intel_broadwell_machines[];
-extern struct snd_soc_acpi_mach snd_soc_acpi_intel_baytrail_legacy_machines[];
 extern struct snd_soc_acpi_mach snd_soc_acpi_intel_baytrail_machines[];
 extern struct snd_soc_acpi_mach snd_soc_acpi_intel_cherrytrail_machines[];
 extern struct snd_soc_acpi_mach snd_soc_acpi_intel_skl_machines[];
sound/soc/intel/boards/Kconfig +0 -14
index a8da892441be..c10c37803c67 100644
@@ -85,20 +85,6 @@ config SND_SOC_INTEL_BROADWELL_MACH
 	  If unsure select "N".
 endif ## SND_SOC_INTEL_CATPT || SND_SOC_SOF_BROADWELL
 
-if SND_SOC_INTEL_BAYTRAIL
-
-config SND_SOC_INTEL_BYT_RT5640_MACH
-	tristate "Baytrail with RT5640 codec"
-	depends on I2C
-	depends on X86_INTEL_LPSS || COMPILE_TEST
-	select SND_SOC_RT5640
-	help
-	  This adds audio driver for Intel Baytrail platform based boards
-	  with the RT5640 audio codec. This driver is deprecated, use
-	  SND_SOC_INTEL_BYTCR_RT5640_MACH instead for better functionality.
-
-endif ## SND_SOC_INTEL_BAYTRAIL
-
 if SND_SST_ATOM_HIFI2_PLATFORM || SND_SOC_SOF_BAYTRAIL
 
 config SND_SOC_INTEL_BYTCR_RT5640_MACH
sound/soc/intel/boards/Makefile +0 -2
index b2e5709a097b..a58e4d22e9c8 100644
@@ -1,6 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-only
 snd-soc-sst-haswell-objs := haswell.o
-snd-soc-sst-byt-rt5640-mach-objs := byt-rt5640.o
 snd-soc-sst-bdw-rt5650-mach-objs := bdw-rt5650.o
 snd-soc-sst-bdw-rt5677-mach-objs := bdw-rt5677.o
 snd-soc-sst-broadwell-objs := broadwell.o
@@ -42,7 +41,6 @@ snd-soc-sof-sdw-objs += sof_sdw.o				\
 			sof_sdw_dmic.o sof_sdw_hdmi.o hda_dsp_common.o
 obj-$(CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH) += snd-soc-sof_rt5682.o
 obj-$(CONFIG_SND_SOC_INTEL_HASWELL_MACH) += snd-soc-sst-haswell.o
-obj-$(CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH) += snd-soc-sst-byt-rt5640-mach.o
 obj-$(CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON) += snd-soc-sst-bxt-da7219_max98357a.o
 obj-$(CONFIG_SND_SOC_INTEL_BXT_RT298_MACH) += snd-soc-sst-bxt-rt298.o
 obj-$(CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH) += snd-soc-sst-sof-pcm512x.o
sound/soc/intel/boards/byt-rt5640.c deleted +0 -224

224 lines not on this page · raw message

sound/soc/intel/common/soc-acpi-intel-byt-match.c +0 -10
index 4043a1ab44b3..c348607b49a5 100644
@@ -120,16 +120,6 @@ static struct snd_soc_acpi_mach *byt_quirk(void *arg)
 	}
 }
 
-struct snd_soc_acpi_mach snd_soc_acpi_intel_baytrail_legacy_machines[] = {
-	{
-		.id = "10EC5640",
-		.drv_name = "byt-rt5640",
-		.fw_filename = "intel/fw_sst_0f28.bin-48kHz_i2s_master",
-	},
-	{}
-};
-EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_baytrail_legacy_machines);
-
 struct snd_soc_acpi_mach  snd_soc_acpi_intel_baytrail_machines[] = {
 	{
 		.id = "10EC5640",
Signature · 1 line
2.17.1
author maintainer
#4 lore raw

PATCH v2 4/13 ASoC: Intel: Remove baytrail solution

In reply to Cezary Rojewski

sound/soc/intel/baytrail is a niche solution which supports limited number of BYT products - as described by snd_soc_acpi_intel_baytrail_legacy_machines table. For a long time it's deprecated in favor of sound/soc/intel/atom solution with SOF providing support for some products too effectively rendering /baytrail/ redundant. Remove deprecated code from ASoC tree.

---
 sound/soc/intel/Kconfig                     |  13 -
 sound/soc/intel/Makefile                    |   1 -
 sound/soc/intel/baytrail/Makefile           |   5 -
 sound/soc/intel/baytrail/sst-baytrail-dsp.c | 358 ---------
 sound/soc/intel/baytrail/sst-baytrail-ipc.c | 772 --------------------
 sound/soc/intel/baytrail/sst-baytrail-ipc.h |  64 --
 sound/soc/intel/baytrail/sst-baytrail-pcm.c | 459 ------------
 7 files changed, 1672 deletions(-)
 delete mode 100644 sound/soc/intel/baytrail/Makefile
 delete mode 100644 sound/soc/intel/baytrail/sst-baytrail-dsp.c
 delete mode 100644 sound/soc/intel/baytrail/sst-baytrail-ipc.c
 delete mode 100644 sound/soc/intel/baytrail/sst-baytrail-ipc.h
 delete mode 100644 sound/soc/intel/baytrail/sst-baytrail-pcm.c
sound/soc/intel/Kconfig +0 -13
index dfc20f2bb859..41f9c286b34c 100644
@@ -63,19 +63,6 @@ config SND_SOC_INTEL_HASWELL
 	tristate
 	select SND_SOC_INTEL_CATPT
 
-config SND_SOC_INTEL_BAYTRAIL
-	tristate "Baytrail (legacy) Platforms"
-	depends on DMADEVICES && ACPI && SND_SST_ATOM_HIFI2_PLATFORM=n && SND_SOC_SOF_BAYTRAIL=n
-	select SND_SOC_INTEL_SST
-	select SND_SOC_INTEL_SST_ACPI
-	select SND_SOC_INTEL_SST_FIRMWARE
-	select SND_SOC_ACPI_INTEL_MATCH
-	help
-	  If you have a Intel Baytrail platform connected to an I2S codec,
-	  then enable this option by saying Y or m. This was typically used
-	  for Baytrail Chromebooks but this option is now deprecated and is
-	  not recommended, use SND_SST_ATOM_HIFI2_PLATFORM instead.
-
 config SND_SST_ATOM_HIFI2_PLATFORM
 	tristate
 	select SND_SOC_COMPRESS
sound/soc/intel/Makefile +0 -1
index c88c615f85f7..4e0248d2accc 100644
@@ -3,7 +3,6 @@
 obj-$(CONFIG_SND_SOC) += common/
 
 # Platform Support
-obj-$(CONFIG_SND_SOC_INTEL_BAYTRAIL) += baytrail/
 obj-$(CONFIG_SND_SST_ATOM_HIFI2_PLATFORM) += atom/
 obj-$(CONFIG_SND_SOC_INTEL_CATPT) += catpt/
 obj-$(CONFIG_SND_SOC_INTEL_SKYLAKE) += skylake/
sound/soc/intel/baytrail/Makefile deleted +0 -5
deleted file mode 100644
index 4d0806aac6bd..000000000000
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-snd-soc-sst-baytrail-pcm-objs := \
-	        sst-baytrail-ipc.o sst-baytrail-pcm.o sst-baytrail-dsp.o
-
-obj-$(CONFIG_SND_SOC_INTEL_BAYTRAIL) += snd-soc-sst-baytrail-pcm.o
sound/soc/intel/baytrail/sst-baytrail-dsp.c deleted +0 -358

358 lines not on this page · raw message

sound/soc/intel/baytrail/sst-baytrail-ipc.c deleted +0 -772

772 lines not on this page · raw message

sound/soc/intel/baytrail/sst-baytrail-ipc.h deleted +0 -64

64 lines not on this page · raw message

sound/soc/intel/baytrail/sst-baytrail-pcm.c deleted +0 -459

459 lines not on this page · raw message

Signature · 1 line
2.17.1
author maintainer
#5 lore raw

PATCH v2 5/13 ASoC: Intel: Remove SST ACPI component

In reply to Cezary Rojewski

baytrail and haswell solutions present within sound/soc/intel are the only users of sst-acpi componenent and with them removed it becomes redundant so remove it too.

---
 sound/soc/intel/Kconfig           |   6 -
 sound/soc/intel/common/Makefile   |   2 -
 sound/soc/intel/common/sst-acpi.c | 236 ------------------------------
 3 files changed, 244 deletions(-)
 delete mode 100644 sound/soc/intel/common/sst-acpi.c
sound/soc/intel/Kconfig +0 -6
index 41f9c286b34c..a9940e81c5cd 100644
@@ -31,12 +31,6 @@ config SND_SST_IPC_ACPI
 	# This option controls the ACPI-based IPC for HiFi2 platforms
 	# (Baytrail, Cherrytrail)
 
-config SND_SOC_INTEL_SST_ACPI
-	tristate
-	# This option controls ACPI-based probing on
-	# Haswell/Broadwell/Baytrail legacy and will be set
-	# when these platforms are enabled
-
 config SND_SOC_INTEL_SST
 	tristate
 
sound/soc/intel/common/Makefile +0 -2
index 2674c9790fa1..f4d41d284e67 100644
@@ -1,6 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-only
 snd-soc-sst-dsp-objs := sst-dsp.o
-snd-soc-sst-acpi-objs := sst-acpi.o
 snd-soc-sst-ipc-objs := sst-ipc.o
 snd-soc-sst-firmware-objs := sst-firmware.o
 snd-soc-acpi-intel-match-objs := soc-acpi-intel-byt-match.o soc-acpi-intel-cht-match.o \
@@ -14,6 +13,5 @@ snd-soc-acpi-intel-match-objs := soc-acpi-intel-byt-match.o soc-acpi-intel-cht-m
 	soc-acpi-intel-hda-match.o
 
 obj-$(CONFIG_SND_SOC_INTEL_SST) += snd-soc-sst-dsp.o snd-soc-sst-ipc.o
-obj-$(CONFIG_SND_SOC_INTEL_SST_ACPI) += snd-soc-sst-acpi.o
 obj-$(CONFIG_SND_SOC_INTEL_SST_FIRMWARE) += snd-soc-sst-firmware.o
 obj-$(CONFIG_SND_SOC_ACPI_INTEL_MATCH) += snd-soc-acpi-intel-match.o
sound/soc/intel/common/sst-acpi.c deleted +0 -236

236 lines not on this page · raw message

Signature · 1 line
2.17.1
author maintainer
#6 lore raw

PATCH v2 6/13 ASoC: Intel: Remove SST firmware components

In reply to Cezary Rojewski

sst-firmware is host to many image loading over DMA operations. Majority of code targets sound/soc/intel/haswell solution as /baytrail/ never switched to DMA-based firmware loading. With /haswell/ removed this code serves no purpose. Address this redundancy.

---
 sound/soc/intel/Kconfig               |    7 -
 sound/soc/intel/common/Makefile       |    2 -
 sound/soc/intel/common/sst-dsp-priv.h |  216 -----
 sound/soc/intel/common/sst-dsp.h      |   15 -
 sound/soc/intel/common/sst-firmware.c | 1273 -------------------------
 5 files changed, 1513 deletions(-)
 delete mode 100644 sound/soc/intel/common/sst-firmware.c
sound/soc/intel/Kconfig +0 -7
index a9940e81c5cd..e53e9ffc5e2f 100644
@@ -34,13 +34,6 @@ config SND_SST_IPC_ACPI
 config SND_SOC_INTEL_SST
 	tristate
 
-config SND_SOC_INTEL_SST_FIRMWARE
-	tristate
-	select DW_DMAC_CORE
-	# This option controls firmware download on
-	# Haswell/Broadwell/Baytrail legacy and will be set
-	# when these platforms are enabled
-
 config SND_SOC_INTEL_CATPT
 	tristate "Haswell and Broadwell"
 	depends on ACPI || COMPILE_TEST
sound/soc/intel/common/Makefile +0 -2
index f4d41d284e67..64468fe9c513 100644
@@ -1,7 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 snd-soc-sst-dsp-objs := sst-dsp.o
 snd-soc-sst-ipc-objs := sst-ipc.o
-snd-soc-sst-firmware-objs := sst-firmware.o
 snd-soc-acpi-intel-match-objs := soc-acpi-intel-byt-match.o soc-acpi-intel-cht-match.o \
 	soc-acpi-intel-hsw-bdw-match.o \
 	soc-acpi-intel-skl-match.o soc-acpi-intel-kbl-match.o \
@@ -13,5 +12,4 @@ snd-soc-acpi-intel-match-objs := soc-acpi-intel-byt-match.o soc-acpi-intel-cht-m
 	soc-acpi-intel-hda-match.o
 
 obj-$(CONFIG_SND_SOC_INTEL_SST) += snd-soc-sst-dsp.o snd-soc-sst-ipc.o
-obj-$(CONFIG_SND_SOC_INTEL_SST_FIRMWARE) += snd-soc-sst-firmware.o
 obj-$(CONFIG_SND_SOC_ACPI_INTEL_MATCH) += snd-soc-acpi-intel-match.o
sound/soc/intel/common/sst-dsp-priv.h +0 -216

238 lines not on this page · raw message

sound/soc/intel/common/sst-dsp.h +0 -15
index d55014587415..ebd0dc5706a0 100644
@@ -207,13 +207,6 @@ struct sst_pdata {
 	void *dsp;
 };
 
-#if IS_ENABLED(CONFIG_DW_DMAC_CORE)
-/* Initialization */
-struct sst_dsp *sst_dsp_new(struct device *dev,
-	struct sst_dsp_device *sst_dev, struct sst_pdata *pdata);
-void sst_dsp_free(struct sst_dsp *sst);
-#endif
-
 /* SHIM Read / Write */
 void sst_dsp_shim_write(struct sst_dsp *sst, u32 offset, u32 value);
 u32 sst_dsp_shim_read(struct sst_dsp *sst, u32 offset);
@@ -255,14 +248,6 @@ int sst_dsp_wake(struct sst_dsp *sst);
 void sst_dsp_sleep(struct sst_dsp *sst);
 void sst_dsp_stall(struct sst_dsp *sst);
 
-/* DMA */
-int sst_dsp_dma_get_channel(struct sst_dsp *dsp, int chan_id);
-void sst_dsp_dma_put_channel(struct sst_dsp *dsp);
-int sst_dsp_dma_copyfrom(struct sst_dsp *sst, dma_addr_t dest_addr,
-	dma_addr_t src_addr, size_t size);
-int sst_dsp_dma_copyto(struct sst_dsp *sst, dma_addr_t dest_addr,
-	dma_addr_t src_addr, size_t size);
-
 /* Msg IO */
 void sst_dsp_ipc_msg_tx(struct sst_dsp *dsp, u32 msg);
 u32 sst_dsp_ipc_msg_rx(struct sst_dsp *dsp);
sound/soc/intel/common/sst-firmware.c deleted +0 -1273

1,273 lines not on this page · raw message

Signature · 1 line
2.17.1
author maintainer
#7 lore raw

PATCH v2 7/13 ASoC: Intel: Skylake: Unassign ram_read and read_write ops

In reply to Cezary Rojewski

Skylake driver makes no use of ram_read or ram_write operation so remove the assignments. This prepares sound/soc/common/sst-dsp* for following removal of unused DSP operations.

---
 sound/soc/intel/skylake/bxt-sst.c | 2 --
 sound/soc/intel/skylake/cnl-sst.c | 2 --
 sound/soc/intel/skylake/skl-sst.c | 2 --
 3 files changed, 6 deletions(-)
sound/soc/intel/skylake/bxt-sst.c +0 -2
index 38b9d7494083..fd4fdcb95224 100644
@@ -533,8 +533,6 @@ static struct sst_ops skl_ops = {
 	.irq_handler = skl_dsp_sst_interrupt,
 	.write = sst_shim32_write,
 	.read = sst_shim32_read,
-	.ram_read = sst_memcpy_fromio_32,
-	.ram_write = sst_memcpy_toio_32,
 	.free = skl_dsp_free,
 };
 
sound/soc/intel/skylake/cnl-sst.c +0 -2
index c6abcd5aa67b..355a7b116886 100644
@@ -300,8 +300,6 @@ static struct sst_ops cnl_ops = {
 	.irq_handler = cnl_dsp_sst_interrupt,
 	.write = sst_shim32_write,
 	.read = sst_shim32_read,
-	.ram_read = sst_memcpy_fromio_32,
-	.ram_write = sst_memcpy_toio_32,
 	.free = cnl_dsp_free,
 };
 
sound/soc/intel/skylake/skl-sst.c +0 -2
index 00a97cea58b4..39d027ac16ec 100644
@@ -506,8 +506,6 @@ static struct sst_ops skl_ops = {
 	.irq_handler = skl_dsp_sst_interrupt,
 	.write = sst_shim32_write,
 	.read = sst_shim32_read,
-	.ram_read = sst_memcpy_fromio_32,
-	.ram_write = sst_memcpy_toio_32,
 	.free = skl_dsp_free,
 };
 
Signature · 1 line
2.17.1
author maintainer
#8 lore raw

PATCH v2 8/13 ASoC: Intel: Remove unused DSP operations

In reply to Cezary Rojewski

sound/soc/intel/common/ declares several helper functions for /intel/ solutions. In practice, differences between these - /haswell/ and /skylake/ especially - led to many of the helpers being used only by a single solution. As /skylake/ makes no use of these and /haswell/ and /baytail/ are no more, remove the unused functions.

---
 sound/soc/intel/common/sst-dsp-priv.h |  13 ---
 sound/soc/intel/common/sst-dsp.c      | 162 --------------------------
 sound/soc/intel/common/sst-dsp.h      |  26 -----
 sound/soc/intel/common/sst-ipc.c      |  27 -----
 sound/soc/intel/common/sst-ipc.h      |   1 -
 5 files changed, 229 deletions(-)
sound/soc/intel/common/sst-dsp-priv.h +0 -13
index 6b6738a289dc..3787ef07b840 100644
@@ -146,19 +146,6 @@ struct sst_dsp {
 	struct snd_dma_buffer dmab;
 };
 
-/* Size optimised DRAM/IRAM memcpy */
-static inline void sst_dsp_write(struct sst_dsp *sst, void *src,
-	u32 dest_offset, size_t bytes)
-{
-	sst->ops->ram_write(sst, sst->addr.lpe + dest_offset, src, bytes);
-}
-
-static inline void sst_dsp_read(struct sst_dsp *sst, void *dest,
-	u32 src_offset, size_t bytes)
-{
-	sst->ops->ram_read(sst, dest, sst->addr.lpe + src_offset, bytes);
-}
-
 static inline void *sst_dsp_get_thread_context(struct sst_dsp *sst)
 {
 	return sst->thread_context;
sound/soc/intel/common/sst-dsp.c +0 -162

198 lines not on this page · raw message

sound/soc/intel/common/sst-dsp.h +0 -26
index ebd0dc5706a0..427970add9c7 100644
@@ -212,10 +212,6 @@ void sst_dsp_shim_write(struct sst_dsp *sst, u32 offset, u32 value);
 u32 sst_dsp_shim_read(struct sst_dsp *sst, u32 offset);
 int sst_dsp_shim_update_bits(struct sst_dsp *sst, u32 offset,
 				u32 mask, u32 value);
-void sst_dsp_shim_write64(struct sst_dsp *sst, u32 offset, u64 value);
-u64 sst_dsp_shim_read64(struct sst_dsp *sst, u32 offset);
-int sst_dsp_shim_update_bits64(struct sst_dsp *sst, u32 offset,
-				u64 mask, u64 value);
 void sst_dsp_shim_update_bits_forced(struct sst_dsp *sst, u32 offset,
 				u32 mask, u32 value);
 
@@ -224,10 +220,6 @@ void sst_dsp_shim_write_unlocked(struct sst_dsp *sst, u32 offset, u32 value);
 u32 sst_dsp_shim_read_unlocked(struct sst_dsp *sst, u32 offset);
 int sst_dsp_shim_update_bits_unlocked(struct sst_dsp *sst, u32 offset,
 				u32 mask, u32 value);
-void sst_dsp_shim_write64_unlocked(struct sst_dsp *sst, u32 offset, u64 value);
-u64 sst_dsp_shim_read64_unlocked(struct sst_dsp *sst, u32 offset);
-int sst_dsp_shim_update_bits64_unlocked(struct sst_dsp *sst, u32 offset,
-					u64 mask, u64 value);
 void sst_dsp_shim_update_bits_forced_unlocked(struct sst_dsp *sst, u32 offset,
 				u32 mask, u32 value);
 
@@ -236,21 +228,6 @@ void sst_shim32_write(void __iomem *addr, u32 offset, u32 value);
 u32 sst_shim32_read(void __iomem *addr, u32 offset);
 void sst_shim32_write64(void __iomem *addr, u32 offset, u64 value);
 u64 sst_shim32_read64(void __iomem *addr, u32 offset);
-void sst_memcpy_toio_32(struct sst_dsp *sst,
-			void __iomem *dest, void *src, size_t bytes);
-void sst_memcpy_fromio_32(struct sst_dsp *sst,
-			  void *dest, void __iomem *src, size_t bytes);
-
-/* DSP reset & boot */
-void sst_dsp_reset(struct sst_dsp *sst);
-int sst_dsp_boot(struct sst_dsp *sst);
-int sst_dsp_wake(struct sst_dsp *sst);
-void sst_dsp_sleep(struct sst_dsp *sst);
-void sst_dsp_stall(struct sst_dsp *sst);
-
-/* Msg IO */
-void sst_dsp_ipc_msg_tx(struct sst_dsp *dsp, u32 msg);
-u32 sst_dsp_ipc_msg_rx(struct sst_dsp *dsp);
 
 /* Mailbox management */
 int sst_dsp_mailbox_init(struct sst_dsp *sst, u32 inbox_offset,
@@ -262,7 +239,4 @@ void sst_dsp_outbox_read(struct sst_dsp *sst, void *message, size_t bytes);
 int sst_dsp_register_poll(struct sst_dsp  *ctx, u32 offset, u32 mask,
 		 u32 target, u32 time, char *operation);
 
-/* Debug */
-void sst_dsp_dump(struct sst_dsp *sst);
-
 #endif
sound/soc/intel/common/sst-ipc.c +0 -27
index 6068bb697e22..89c10724d2a3 100644
@@ -254,33 +254,6 @@ void sst_ipc_tx_msg_reply_complete(struct sst_generic_ipc *ipc,
 }
 EXPORT_SYMBOL_GPL(sst_ipc_tx_msg_reply_complete);
 
-void sst_ipc_drop_all(struct sst_generic_ipc *ipc)
-{
-	struct ipc_message *msg, *tmp;
-	unsigned long flags;
-	int tx_drop_cnt = 0, rx_drop_cnt = 0;
-
-	/* drop all TX and Rx messages before we stall + reset DSP */
-	spin_lock_irqsave(&ipc->dsp->spinlock, flags);
-
-	list_for_each_entry_safe(msg, tmp, &ipc->tx_list, list) {
-		list_move(&msg->list, &ipc->empty_list);
-		tx_drop_cnt++;
-	}
-
-	list_for_each_entry_safe(msg, tmp, &ipc->rx_list, list) {
-		list_move(&msg->list, &ipc->empty_list);
-		rx_drop_cnt++;
-	}
-
-	spin_unlock_irqrestore(&ipc->dsp->spinlock, flags);
-
-	if (tx_drop_cnt || rx_drop_cnt)
-		dev_err(ipc->dev, "dropped IPC msg RX=%d, TX=%d\n",
-			tx_drop_cnt, rx_drop_cnt);
-}
-EXPORT_SYMBOL_GPL(sst_ipc_drop_all);
-
 int sst_ipc_init(struct sst_generic_ipc *ipc)
 {
 	int ret;
sound/soc/intel/common/sst-ipc.h +0 -1
index 08c4831b2664..9c1f59d88636 100644
@@ -82,7 +82,6 @@ struct ipc_message *sst_ipc_reply_find_msg(struct sst_generic_ipc *ipc,
 void sst_ipc_tx_msg_reply_complete(struct sst_generic_ipc *ipc,
 	struct ipc_message *msg);
 
-void sst_ipc_drop_all(struct sst_generic_ipc *ipc);
 int sst_ipc_init(struct sst_generic_ipc *ipc);
 void sst_ipc_fini(struct sst_generic_ipc *ipc);
 
Signature · 1 line
2.17.1
author maintainer
#9 lore raw

PATCH v2 9/13 ASoC: Intel: Remove unused DSP interface fields

In reply to Cezary Rojewski

With redundant DSP operations removed, several fields for structures:
sst_ops, sst_addr and sst_dsp become obsolete. Remove them too.

---
 sound/soc/intel/common/sst-dsp-priv.h | 45 ---------------------------
 1 file changed, 45 deletions(-)
sound/soc/intel/common/sst-dsp-priv.h +0 -45
index 3787ef07b840..994698ff581e 100644
@@ -22,26 +22,9 @@
  * DSP Operations exported by platform Audio DSP driver.
  */
 struct sst_ops {
-	/* DSP core boot / reset */
-	void (*boot)(struct sst_dsp *);
-	void (*reset)(struct sst_dsp *);
-	int (*wake)(struct sst_dsp *);
-	void (*sleep)(struct sst_dsp *);
-	void (*stall)(struct sst_dsp *);
-
 	/* Shim IO */
 	void (*write)(void __iomem *addr, u32 offset, u32 value);
 	u32 (*read)(void __iomem *addr, u32 offset);
-	void (*write64)(void __iomem *addr, u32 offset, u64 value);
-	u64 (*read64)(void __iomem *addr, u32 offset);
-
-	/* DSP I/DRAM IO */
-	void (*ram_read)(struct sst_dsp *sst, void  *dest, void __iomem *src,
-		size_t bytes);
-	void (*ram_write)(struct sst_dsp *sst, void __iomem *dest, void *src,
-		size_t bytes);
-
-	void (*dump)(struct sst_dsp *);
 
 	/* IRQ handlers */
 	irqreturn_t (*irq_handler)(int irq, void *context);
@@ -55,20 +38,12 @@ struct sst_ops {
  * Audio DSP memory offsets and addresses.
  */
 struct sst_addr {
-	u32 lpe_base;
-	u32 shim_offset;
-	u32 iram_offset;
-	u32 dram_offset;
-	u32 dsp_iram_offset;
-	u32 dsp_dram_offset;
 	u32 sram0_base;
 	u32 sram1_base;
 	u32 w0_stat_sz;
 	u32 w0_up_sz;
 	void __iomem *lpe;
 	void __iomem *shim;
-	void __iomem *pci_cfg;
-	void __iomem *fw_ext;
 };
 
 /*
@@ -93,7 +68,6 @@ struct sst_dsp {
 	spinlock_t spinlock;	/* IPC locking */
 	struct mutex mutex;	/* DSP FW lock */
 	struct device *dev;
-	struct device *dma_dev;
 	void *thread_context;
 	int irq;
 	u32 id;
@@ -110,27 +84,8 @@ struct sst_dsp {
 	/* mailbox */
 	struct sst_mailbox mailbox;
 
-	/* HSW/Byt data */
-
-	/* list of free and used ADSP memory blocks */
-	struct list_head used_block_list;
-	struct list_head free_block_list;
-
 	/* SST FW files loaded and their modules */
 	struct list_head module_list;
-	struct list_head fw_list;
-
-	/* scratch buffer */
-	struct list_head scratch_block_list;
-	u32 scratch_offset;
-	u32 scratch_size;
-
-	/* platform data */
-	struct sst_pdata *pdata;
-
-	/* DMA FW loading */
-	struct sst_dma *dma;
-	bool fw_use_dma;
 
 	/* SKL data */
 
Signature · 1 line
2.17.1
author maintainer
#10 lore raw

PATCH v2 10/13 ASoC: Intel: Remove SST-legacy specific constants

In reply to Cezary Rojewski

As sound/soc/intel/haswell and /baytrail are no more, all SST-legacy specific constants and registers are redundant so remove them.

---
 sound/soc/intel/common/sst-dsp-priv.h |   3 -
 sound/soc/intel/common/sst-dsp.h      | 143 --------------------------
 sound/soc/intel/common/sst-ipc.h      |   2 -
 3 files changed, 148 deletions(-)
sound/soc/intel/common/sst-dsp-priv.h +0 -3
index 994698ff581e..7d9834509f4a 100644
@@ -15,9 +15,6 @@
 
 #include "../skylake/skl-sst-dsp.h"
 
-/* do we need to remove or keep */
-#define DSP_DRAM_ADDR_OFFSET		0x400000
-
 /*
  * DSP Operations exported by platform Audio DSP driver.
  */
sound/soc/intel/common/sst-dsp.h +0 -143

158 lines not on this page · raw message

sound/soc/intel/common/sst-ipc.h +0 -2
index 9c1f59d88636..77d651e888f9 100644
@@ -15,8 +15,6 @@
 #include <linux/workqueue.h>
 #include <linux/sched.h>
 
-#define IPC_MAX_MAILBOX_BYTES	256
-
 struct sst_ipc_message {
 	u64 header;
 	void *data;
Signature · 1 line
2.17.1
author maintainer
#11 lore raw

PATCH v2 11/13 ASoC: Intel: Make atom components independent of sst-dsp

In reply to Cezary Rojewski

With sound/soc/intel/haswell and /baytrail gone, registers left within sst-dsp header are atom-specific. Relocate these to atom internal header to make atom truely independent of sound/soc/common processing code.

---
 sound/soc/intel/atom/sst/sst.c               |  1 -
 sound/soc/intel/atom/sst/sst.h               |  7 +++++++
 sound/soc/intel/atom/sst/sst_acpi.c          |  1 -
 sound/soc/intel/atom/sst/sst_drv_interface.c |  3 ---
 sound/soc/intel/atom/sst/sst_ipc.c           |  1 -
 sound/soc/intel/atom/sst/sst_loader.c        |  1 -
 sound/soc/intel/atom/sst/sst_pvt.c           |  1 -
 sound/soc/intel/atom/sst/sst_stream.c        |  1 -
 sound/soc/intel/boards/bytcht_es8316.c       |  1 -
 sound/soc/intel/boards/bytcr_rt5640.c        |  1 -
 sound/soc/intel/common/sst-dsp.h             | 10 ----------
 11 files changed, 7 insertions(+), 21 deletions(-)
sound/soc/intel/atom/sst/sst.c +0 -1
index d450b9848028..e90590559185 100644
@@ -26,7 +26,6 @@
 #include <asm/platform_sst_audio.h>
 #include "../sst-mfld-platform.h"
 #include "sst.h"
-#include "../../common/sst-dsp.h"
 
 MODULE_AUTHOR("Vinod Koul <[email protected]>");
 MODULE_AUTHOR("Harsha Priya <[email protected]>");
sound/soc/intel/atom/sst/sst.h +7 -0
index 2bee646e81b8..4d37d39fd8f4 100644
@@ -34,6 +34,13 @@
 #define MRFLD_FW_FEATURE_BASE_OFFSET 0x4
 #define MRFLD_FW_BSS_RESET_BIT 0
 
+/* SST Shim register map */
+#define SST_CSR			0x00
+#define SST_ISRX		0x18
+#define SST_IMRX		0x28
+#define SST_IPCX		0x38 /* IPC IA -> SST */
+#define SST_IPCD		0x40 /* IPC SST -> IA */
+
 extern const struct dev_pm_ops intel_sst_pm;
 enum sst_states {
 	SST_FW_LOADING = 1,
sound/soc/intel/atom/sst/sst_acpi.c +0 -1
index f3cfe83b9ac6..f943a0884976 100644
@@ -31,7 +31,6 @@
 #include <sound/soc-acpi.h>
 #include <sound/soc-acpi-intel-match.h>
 #include "../sst-mfld-platform.h"
-#include "../../common/sst-dsp.h"
 #include "../../common/soc-intel-quirks.h"
 #include "sst.h"
 
sound/soc/intel/atom/sst/sst_drv_interface.c +0 -3
index 762495385d5c..0af618dd8073 100644
@@ -24,9 +24,6 @@
 #include <asm/platform_sst_audio.h>
 #include "../sst-mfld-platform.h"
 #include "sst.h"
-#include "../../common/sst-dsp.h"
-
-
 
 #define NUM_CODEC 2
 #define MIN_FRAGMENT 2
sound/soc/intel/atom/sst/sst_ipc.c +0 -1
index c2851a829a64..a8a9aa0057d3 100644
@@ -24,7 +24,6 @@
 #include <asm/platform_sst_audio.h>
 #include "../sst-mfld-platform.h"
 #include "sst.h"
-#include "../../common/sst-dsp.h"
 
 struct sst_block *sst_create_block(struct intel_sst_drv *ctx,
 					u32 msg_id, u32 drv_id)
sound/soc/intel/atom/sst/sst_loader.c +0 -1
index 5c42cce90ce2..1c9b0c9ec483 100644
@@ -29,7 +29,6 @@
 #include <asm/platform_sst_audio.h>
 #include "../sst-mfld-platform.h"
 #include "sst.h"
-#include "../../common/sst-dsp.h"
 
 void memcpy32_toio(void __iomem *dst, const void *src, int count)
 {
sound/soc/intel/atom/sst/sst_pvt.c +0 -1
index c099f7df6168..e6a5c18a7018 100644
@@ -26,7 +26,6 @@
 #include <asm/platform_sst_audio.h>
 #include "../sst-mfld-platform.h"
 #include "sst.h"
-#include "../../common/sst-dsp.h"
 
 int sst_shim_write(void __iomem *addr, int offset, int value)
 {
sound/soc/intel/atom/sst/sst_stream.c +0 -1
index c0221e103e79..ea1ef8a61fa6 100644
@@ -23,7 +23,6 @@
 #include <asm/platform_sst_audio.h>
 #include "../sst-mfld-platform.h"
 #include "sst.h"
-#include "../../common/sst-dsp.h"
 
 int sst_alloc_stream_mrfld(struct intel_sst_drv *sst_drv_ctx, void *params)
 {
sound/soc/intel/boards/bytcht_es8316.c +0 -1
index 414ae4bb5224..9c09b44b4d33 100644
@@ -28,7 +28,6 @@
 #include <sound/soc.h>
 #include <sound/soc-acpi.h>
 #include "../atom/sst-atom-controls.h"
-#include "../common/sst-dsp.h"
 #include "../common/soc-intel-quirks.h"
 
 /* jd-inv + terminating entry */
sound/soc/intel/boards/bytcr_rt5640.c +0 -1
index fc202747ba83..9dadf6561444 100644
@@ -28,7 +28,6 @@
 #include <dt-bindings/sound/rt5640.h>
 #include "../../codecs/rt5640.h"
 #include "../atom/sst-atom-controls.h"
-#include "../common/sst-dsp.h"
 #include "../common/soc-intel-quirks.h"
 
 enum {
sound/soc/intel/common/sst-dsp.h +0 -10
index f580e718b183..021a36b2398a 100644
@@ -12,16 +12,6 @@
 #include <linux/types.h>
 #include <linux/interrupt.h>
 
-/* SST Shim register map
- * The register naming can differ between products. Some products also
- * contain extra functionality.
- */
-#define SST_CSR			0x00
-#define SST_ISRX		0x18
-#define SST_IMRX		0x28
-#define SST_IPCX		0x38 /* IPC IA -> SST */
-#define SST_IPCD		0x40 /* IPC SST -> IA */
-
 struct sst_dsp;
 
 /*
Signature · 1 line
2.17.1
author maintainer
#12 lore raw

PATCH v2 12/13 ASoC: Intel: Remove sst_pdata structure

In reply to Cezary Rojewski

struct sst_pdata is unused among remaining /sound/soc/intel solution so remove it.

---
 sound/soc/intel/common/sst-dsp-priv.h |  2 +-
 sound/soc/intel/common/sst-dsp.h      | 28 ---------------------------
 sound/soc/intel/skylake/skl-sst-dsp.c |  2 +-
 3 files changed, 2 insertions(+), 30 deletions(-)
sound/soc/intel/common/sst-dsp-priv.h +1 -1
index 7d9834509f4a..5a5ce5069f9f 100644
@@ -27,7 +27,7 @@ struct sst_ops {
 	irqreturn_t (*irq_handler)(int irq, void *context);
 
 	/* SST init and free */
-	int (*init)(struct sst_dsp *sst, struct sst_pdata *pdata);
+	int (*init)(struct sst_dsp *sst);
 	void (*free)(struct sst_dsp *sst);
 };
 
sound/soc/intel/common/sst-dsp.h +0 -28
index 021a36b2398a..f111fd3f334b 100644
@@ -26,34 +26,6 @@ struct sst_dsp_device {
 	void *thread_context;
 };
 
-/*
- * SST Platform Data.
- */
-struct sst_pdata {
-	/* ACPI data */
-	u32 lpe_base;
-	u32 lpe_size;
-	u32 pcicfg_base;
-	u32 pcicfg_size;
-	u32 fw_base;
-	u32 fw_size;
-	int irq;
-
-	/* Firmware */
-	const struct firmware *fw;
-
-	/* DMA */
-	int resindex_dma_base; /* other fields invalid if equals to -1 */
-	u32 dma_base;
-	u32 dma_size;
-	int dma_engine;
-	struct device *dma_dev;
-
-	/* DSP */
-	u32 id;
-	void *dsp;
-};
-
 /* SHIM Read / Write */
 void sst_dsp_shim_write(struct sst_dsp *sst, u32 offset, u32 value);
 u32 sst_dsp_shim_read(struct sst_dsp *sst, u32 offset);
sound/soc/intel/skylake/skl-sst-dsp.c +1 -1
index 225706d148d8..4ae3eae0d1fd 100644
@@ -422,7 +422,7 @@ struct sst_dsp *skl_dsp_ctx_init(struct device *dev,
 
 	/* Initialise SST Audio DSP */
 	if (sst->ops->init) {
-		ret = sst->ops->init(sst, NULL);
+		ret = sst->ops->init(sst);
 		if (ret < 0)
 			return NULL;
 	}
Signature · 1 line
2.17.1
author maintainer
#13 lore raw

PATCH v2 13/13 ASoC: Intel: Remove sst_dsp_get_thread_context

In reply to Cezary Rojewski

While sst_dsp_get_thread_context() is declared as solution-agnostic, it is only used by /skylake/ solution. Majority of thread_context field usages are direct accesses. Improve code cohesiveness and convert to single usage model.

---
 sound/soc/intel/common/sst-dsp-priv.h | 5 -----
 sound/soc/intel/skylake/cnl-sst.c     | 2 +-
 sound/soc/intel/skylake/skl-sst-ipc.c | 2 +-
 3 files changed, 2 insertions(+), 7 deletions(-)
sound/soc/intel/common/sst-dsp-priv.h +0 -5
index 5a5ce5069f9f..de2b44568feb 100644
@@ -98,9 +98,4 @@ struct sst_dsp {
 	struct snd_dma_buffer dmab;
 };
 
-static inline void *sst_dsp_get_thread_context(struct sst_dsp *sst)
-{
-	return sst->thread_context;
-}
-
 #endif
sound/soc/intel/skylake/cnl-sst.c +1 -1
index 355a7b116886..fcd8dff27ae8 100644
@@ -311,7 +311,7 @@ static struct sst_ops cnl_ops = {
 static irqreturn_t cnl_dsp_irq_thread_handler(int irq, void *context)
 {
 	struct sst_dsp *dsp = context;
-	struct skl_dev *cnl = sst_dsp_get_thread_context(dsp);
+	struct skl_dev *cnl = dsp->thread_context;
 	struct sst_generic_ipc *ipc = &cnl->ipc;
 	struct skl_ipc_header header = {0};
 	u32 hipcida, hipctdr, hipctdd;
sound/soc/intel/skylake/skl-sst-ipc.c +1 -1
index 667cdddc289f..7a425271b08b 100644
@@ -489,7 +489,7 @@ void skl_ipc_process_reply(struct sst_generic_ipc *ipc,
 irqreturn_t skl_dsp_irq_thread_handler(int irq, void *context)
 {
 	struct sst_dsp *dsp = context;
-	struct skl_dev *skl = sst_dsp_get_thread_context(dsp);
+	struct skl_dev *skl = dsp->thread_context;
 	struct sst_generic_ipc *ipc = &skl->ipc;
 	struct skl_ipc_header header = {0};
 	u32 hipcie, hipct, hipcte;
Signature · 1 line
2.17.1
maintainer Acked-by on the v2 series
#14 lore raw
In reply to Cezary Rojewski
Quoted 24 lines · Cezary Rojewski

Follow up to catpt series as mentioned in:

[PATCH v10 00/14] ASoC: Intel: Catpt - Lynx and Wildcat point

https://www.spinics.net/lists/alsa-devel/msg116440.html

As catpt is a direct replacement to sound/soc/intel/haswell, it leaves a

lot of code redudant. The second legacy solution - baytrail - is

deprecated for a long time by sound/soc/intel/atom with SOF flavor

available too.

This series addresses the redudancy and removes obsolete code. Along

with the legacy solutions, all orphaned components are removed too.

Quoted 5 lines

As a consequence, further cleanups are unlocked: sound/soc/intel/skylake

becomes the sole user of processing code found in

sound/soc/intel/common. Those are not part of this series.

All

#15 lore raw
Quoted 27 lines · Liam Girdwood
Quoted 26 lines · Cezary Rojewski

Follow up to catpt series as mentioned in:

[PATCH v10 00/14] ASoC: Intel: Catpt - Lynx and Wildcat point

https://www.spinics.net/lists/alsa-devel/msg116440.html

As catpt is a direct replacement to sound/soc/intel/haswell, it leaves a

lot of code redudant. The second legacy solution - baytrail - is

deprecated for a long time by sound/soc/intel/atom with SOF flavor

available too.

This series addresses the redudancy and removes obsolete code. Along

with the legacy solutions, all orphaned components are removed too.

As a consequence, further cleanups are unlocked: sound/soc/intel/skylake

Quoted 7 lines
Quoted 3 lines

becomes the sole user of processing code found in

sound/soc/intel/common. Those are not part of this series.

All

Also re-adding my ack already provided for v1.

maintainer
#16 lore raw
In reply to Cezary Rojewski
Quoted 10 lines · Cezary Rojewski

Follow up to catpt series as mentioned in:
[PATCH v10 00/14] ASoC: Intel: Catpt - Lynx and Wildcat point
https://www.spinics.net/lists/alsa-devel/msg116440.html

As catpt is a direct replacement to sound/soc/intel/haswell, it leaves a lot of code redudant. The second legacy solution - baytrail - is deprecated for a long time by sound/soc/intel/atom with SOF flavor available too.

[...]

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[01/13] ASoC: Intel: Remove haswell solution

        commit: ca756120d4bcf28dfde5e3df8882153303d4010f
[02/13] ASoC: Intel: Remove max98090 support for baytrail solution
        commit: 5f3941b63c25d8123ebe4406a714c603525b1b90
[03/13] ASoC: Intel: Remove rt5640 support for baytrail solution
        commit: 3056cb0082feccee9a0012440ee5e4ca6a6e80ac
[04/13] ASoC: Intel: Remove baytrail solution
        commit: 07833cd0569bb73cc9f82814cdab921abb3dfb4a
[05/13] ASoC: Intel: Remove SST ACPI component
        commit: 05668be1b3644f9bd25b22f62e79ad7a5adbd3e2
[06/13] ASoC: Intel: Remove SST firmware components
        commit: fb94b7b11c6a20b786c6a8aec3d701ced8854419
[07/13] ASoC: Intel: Skylake: Unassign ram_read and read_write ops
        commit: a4bebce26d560a4a1dff557ad7822bab90dd1c3f
[08/13] ASoC: Intel: Remove unused DSP operations
        commit: 37465972015cf7aeb586a9245da2a87d3b531959
[09/13] ASoC: Intel: Remove unused DSP interface fields
        commit: b4e60807182a243d9dfe985e9e13d295f5868f81
[10/13] ASoC: Intel: Remove SST-legacy specific constants
        commit: 7d07f9c1ba0e670d1a967f16eda53e5c87411753
[11/13] ASoC: Intel: Make atom components independent of sst-dsp
        commit: b972153d6c53a89dc92d991c466a6b4800a9c91f
[12/13] ASoC: Intel: Remove sst_pdata structure
        commit: 720811f0e4ac5a31d38aaee20905692dd7150997
[13/13] ASoC: Intel: Remove sst_dsp_get_thread_context
        commit: eb062e47f7c8cc28f19ba8f897481c22d13db1ec

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark

#17 lore raw
In reply to Cezary Rojewski

Hi,

Quoted 9 lines · Cezary Rojewski

Follow up to catpt series as mentioned in:
[PATCH v10 00/14] ASoC: Intel: Catpt - Lynx and Wildcat point
https://www.spinics.net/lists/alsa-devel/msg116440.html

As catpt is a direct replacement to sound/soc/intel/haswell, it leaves a lot of code redudant. The second legacy solution - baytrail - is deprecated for a long time by sound/soc/intel/atom with SOF flavor available too.

Quoted 6 lines

This series addresses the redudancy and removes obsolete code. Along with the legacy solutions, all orphaned components are removed too.

As a consequence, further cleanups are unlocked: sound/soc/intel/skylake becomes the sole user of processing code found in sound/soc/intel/common. Those are not part of this series.

Since I've mostly worked with Pierre-Louis on this, I guess you may not know this, but I have more or less single handedly have made sure that audio works properly on Bay Trail and Cherry Trail devices during the last few years. Can you please Cc me on future series which impact Bay Trail / Cherry Trail support ?

FWIW (since that this is already merged) I'm fine with removing the quite old Bay Trail support from common/sst-acpi.c, at least Fedora has been using the medium-old (with SOF being the new thing) CONFIG_SND_SST_IPC_ACPI support for Bay Trail audio support for quite some time now.

This is not just about Bay Trail And Cherry Trail devices though, this series also makes changes impacting Haswell and Broadwell devices.

The commit removing this support claims that at least for Haswell the new sound/soc/intel/catpt replaces it, but I do not see that code in 5.9, so that means that in one cycle we are both introducing the replacement and dropping the old code ? I'm not sure if that is such a great idea, what is the fallback plan if testing does find significant issues with the new catpt code ?

Anyways since AFAIK this series is already in next I guess we will find out how this goes.

Regards,

Hans

#18 lore raw
Quoted 6 lines · Hans de Goede

FWIW (since that this is already merged) I'm fine with removing the quite old Bay Trail support from common/sst-acpi.c, at least Fedora has been using the medium-old (with SOF being the new thing) CONFIG_SND_SST_IPC_ACPI support for Bay Trail audio support for quite some time now.

The same for openSUSE. Since CONFIG_SND_SOC_INTEL_BAYTRAIL is exclusive against SOF and other modern codes, I guess it's quite unlikely that any recent distros enable it.

Quoted 9 lines

This is not just about Bay Trail And Cherry Trail devices though, this series also makes changes impacting Haswell and Broadwell devices.

The commit removing this support claims that at least for Haswell the new sound/soc/intel/catpt replaces it, but I do not see that code in 5.9, so that means that in one cycle we are both introducing the replacement and dropping the old code ? I'm not sure if that is such a great idea, what is the fallback plan if testing does find significant issues with the new catpt code ?

I find the action a bit too rushing, too. OTOH, the old code wasn't well maintained, honestly speaking. So, from another perspective, switching to a new code can be seen as a better chance to fix any bugs.

Of course, we could keep two stuff parallel, but it's rather confusing. And, the HSW/BDW devices that need SST are quite rare and old, so the impact is limited, I guess.

In anyway, let's cross fingers, and feed back to Cezary ASAP when we get a regression.

thanks,

Takashi

maintainer
#19 lore raw
Quoted 10 lines · Takashi Iwai
Quoted 3 lines · Hans de Goede

replacement and dropping the old code ? I'm not sure if that is such a great idea, what is the fallback plan if testing does find significant issues with the new catpt code ?

I find the action a bit too rushing, too. OTOH, the old code wasn't well maintained, honestly speaking. So, from another perspective, switching to a new code can be seen as a better chance to fix any bugs.

That was my take as well - the old code seemed to be very fragile for structural reasons which are hopefully addressed here and Intel seem willing to actively work on supporting this version. I have to confess I had assumed Hans had seen all this stuff going past, the new driver got quite a few rounds of review.

Quoted 3 lines

Of course, we could keep two stuff parallel, but it's rather confusing. And, the HSW/BDW devices that need SST are quite rare and old, so the impact is limited, I guess.

Yes, figuring out which of the various x86 audio driver options you need is fairly painful ATM. Worst case it's just a revert of this removal commit.

#20 lore raw

Hi,

Quoted 12 lines · Mark Brown
Quoted 10 lines · Takashi Iwai
Quoted 3 lines · Hans de Goede

replacement and dropping the old code ? I'm not sure if that is such a great idea, what is the fallback plan if testing does find significant issues with the new catpt code ?

I find the action a bit too rushing, too. OTOH, the old code wasn't well maintained, honestly speaking. So, from another perspective, switching to a new code can be seen as a better chance to fix any bugs.

Quoted 5 lines

That was my take as well - the old code seemed to be very fragile for structural reasons which are hopefully addressed here and Intel seem willing to actively work on supporting this version. I have to confess I had assumed Hans had seen all this stuff going past, the new driver got quite a few rounds of review.

My ASoC interest is 99% Intel Bay Trail / Cherry Trail support, so I'm not on alsa-devel list since that gets a lot more then just that.

IOW I'm relying on being Cc-ed, which might not be the best tactic I guess.

Anyways, the Bay Trail / Cherry Trail changes here are 100% ok with me. I pointed out the Haswell / Broadwell bits since I was taking a look anyways, I don't really have a strong opinion on those, I've never seen a Haswell / Broadwell machine actually using the SST/ASoC code, all those which I have seen use the HDA driver.

And from the sounds of it for those rare Haswell / Broadwell machines which do use the SST code the new catpt code should be an improvement. So from my pov everything is good.

Regards,

Hans

author maintainer
#21 lore raw
Quoted 21 lines · Hans de Goede

Hi,

Quoted 18 lines · Mark Brown
Quoted 11 lines · Takashi Iwai
Quoted 4 lines · Hans de Goede

replacement and dropping the old code ? I'm not sure if that is such a great idea, what is the fallback plan if testing does find significant
issues with the new catpt code ?

I find the action a bit too rushing, too. OTOH, the old code wasn't well maintained, honestly speaking. So, from another perspective, switching to a new code can be seen as a better chance to fix any bugs.

That was my take as well - the old code seemed to be very fragile for structural reasons which are hopefully addressed here and Intel seem willing to actively work on supporting this version. I have to confess I had assumed Hans had seen all this stuff going past, the new driver got quite a few rounds of review.

Thanks for your encouraging words, Takashi and Mark.

My faith is with accuracy of our CI, not the fingers crossing though : )

Happy to receive any feedback. Andy pushed me to dig several low-level issues e.g. DMA engine configuration and PCI description which were hidden since 2014 behind other errors, what I'm thankful for. v1 addressed the latter, further series the former.

Indeed, given the resources that have been put into assembling active HSW/BDW CI - which happily joined the SKL-TGL family in racks -, commitment to support the catpt solution is assured.

Quoted 13 lines

My ASoC interest is 99% Intel Bay Trail / Cherry Trail support, so I'm not on alsa-devel list since that gets a lot more then just that.

IOW I'm relying on being Cc-ed, which might not be the best tactic I guess.

Anyways, the Bay Trail / Cherry Trail changes here are 100% ok with me. I pointed out the Haswell / Broadwell bits since I was taking a look anyways, I don't really have a strong opinion on those, I've never seen a Haswell / Broadwell machine actually using the SST/ASoC code, all those which I have seen use the HDA driver.

Quoted 4 lines

And from the sounds of it for those rare Haswell / Broadwell machines which do use the SST code the new catpt code should be an improvement. So from my pov everything is good.

Hans,

I understand that actual DSP-hw is quite old (2011 dev, 2014 release) so besides what is already available, I won't be adding many things. Those
are: firmware logs (debug feature), module support (WAVES). Nothing more, nothing less. Immediately afterward catpt enters hard-maintenance stage where only fixes are allowed.

Stress tests are still ongoing as my goal is to remove basically any-hsw specific code (~50 lines) as hsw is here only from maintenance point of view as explained in catpt's series cover-letter.

The more eyes looking at the code, the merrier : ) Thanks for your input.

Regards,
Czarek

maintainer
#22 lore raw
In reply to Hans de Goede
Quoted 5 lines · Hans de Goede

My ASoC interest is 99% Intel Bay Trail / Cherry Trail support, so I'm not on alsa-devel list since that gets a lot more then just that.

IOW I'm relying on being Cc-ed, which might not be the best tactic I guess.

Might be sensible to add you to the reviwers for at least the machine driver so you're more likely to get copied on things?

Quoted 5 lines

Anyways, the Bay Trail / Cherry Trail changes here are 100% ok with me. I pointed out the Haswell / Broadwell bits since I was taking a look anyways, I don't really have a strong opinion on those, I've never seen a Haswell / Broadwell machine actually using the SST/ASoC code, all those which I have seen use the HDA driver.

OK, that's good.

author maintainer
#23 lore raw
In reply to Hans de Goede
Quoted 19 lines · Hans de Goede

Hi,

Quoted 9 lines · Cezary Rojewski

Follow up to catpt series as mentioned in:
[PATCH v10 00/14] ASoC: Intel: Catpt - Lynx and Wildcat point
https://www.spinics.net/lists/alsa-devel/msg116440.html

As catpt is a direct replacement to sound/soc/intel/haswell, it leaves a lot of code redudant. The second legacy solution - baytrail - is deprecated for a long time by sound/soc/intel/atom with SOF flavor available too.

Quoted 6 lines

This series addresses the redudancy and removes obsolete code. Along with the legacy solutions, all orphaned components are removed too.

As a consequence, further cleanups are unlocked: sound/soc/intel/skylake becomes the sole user of processing code found in sound/soc/intel/common. Those are not part of this series.

Quoted 6 lines

Since I've mostly worked with Pierre-Louis on this, I guess you may not know this, but I have more or less single handedly have made sure that audio works properly on Bay Trail and Cherry Trail devices during the last few years. Can you please Cc me on future series which impact Bay Trail / Cherry Trail support ?

Hello Hans,

Thanks for your help during maintenance of BYT & CHT products. Agreed, will Cc you in future series for listed devices.

Quoted 6 lines

FWIW (since that this is already merged) I'm fine with removing the quite old Bay Trail support from common/sst-acpi.c, at least Fedora has been using the medium-old (with SOF being the new thing) CONFIG_SND_SST_IPC_ACPI support for Bay Trail audio support for quite some time now.

Please note CONFIG_SND_SST_IPC_ACPI is targeting /atom/ solution, not the /baytrail/ one (see the /atom/sst/Makefile). Fact that is has been used within /common/sst-acpi.c is a developer's mistake probably caused by generic naming of mentioned kconfig.

I'll send a patch today somewhat addressing this inconsistency.

Quoted 10 lines

This is not just about Bay Trail And Cherry Trail devices though, this series also makes changes impacting Haswell and Broadwell devices.

The commit removing this support claims that at least for Haswell the new sound/soc/intel/catpt replaces it, but I do not see that code in 5.9, so that means that in one cycle we are both introducing the replacement and dropping the old code ? I'm not sure if that is such a great idea, what is the fallback plan if testing does find significant issues with the new catpt code ?

Quoted 3 lines

Anyways since AFAIK this series is already in next I guess we will find out how this goes.

Your report about this series being merged to v5.9 is worrying. It is not supposed to be there as catpt-series is its direct dependency. Cover letter for the latter mentions that explicitly while this series starts with "Follow up to catpt series".

Old hsw/bdw code is in fact the main recipient, old baytrail is 'while at it' do (...). Over the past months I've heard more and more voices requesting sound/soc/intel/ code size reduction - dropping the redundant solutions and actually verify their correctness. Well, /haswell/ failed all tests but simple pb/cp. /baytrail/ has been flagged as ~100% duplicate to /atom/ and most of /common/ code isn't actually common. You can see that in this very series where one by one I'm dissecting regions to be removed.

Given the work that has been done behind the scenes, I'd argue hsw/bdw has never been in the better place than it is today - that goes for both, Linux and Windows solutions as both worlds took part in this project. Code rewritten, actual CI running, several setups in racks, documentation refreshed, FW + SW windows again on thier legs and so on.

I'll be sending ~2 patches addressing more advanced scenarios which /haswell/ wasn't even covering. Will keep you in Cc too.

Regards,
Czarek

#24 lore raw

HI,

Quoted 4 lines · Cezary
Quoted 3 lines · Hans de Goede

Hi,

On 10/6/20 8:48 AM, Cezary Rojewski wrote:

<snip>

Quoted 4 lines

Hello Hans,

Thanks for your help during maintenance of BYT & CHT products. Agreed, will Cc you in future series for listed devices.

Great, thank you.

Quoted 7 lines
Quoted 6 lines

FWIW (since that this is already merged) I'm fine with removing the quite old Bay Trail support from common/sst-acpi.c, at least Fedora has been using the medium-old (with SOF being the new thing) CONFIG_SND_SST_IPC_ACPI support for Bay Trail audio support for quite some time now.

Quoted 6 lines

Please note CONFIG_SND_SST_IPC_ACPI is targeting /atom/ solution, not the /baytrail/ one (see the /atom/sst/Makefile). Fact that is has been used within /common/sst-acpi.c is a developer's mistake probably caused by generic naming of mentioned kconfig.

I'll send a patch today somewhat addressing this inconsistency.

Ok.

Quoted 10 lines
Quoted 10 lines

This is not just about Bay Trail And Cherry Trail devices though, this series also makes changes impacting Haswell and Broadwell devices.

The commit removing this support claims that at least for Haswell the new sound/soc/intel/catpt replaces it, but I do not see that code in 5.9, so that means that in one cycle we are both introducing the replacement and dropping the old code ? I'm not sure if that is such a great idea, what is the fallback plan if testing does find significant issues with the new catpt code ?

Quoted 8 lines
Quoted 3 lines

Anyways since AFAIK this series is already in next I guess we will find out how this goes.

Your report about this series being merged to v5.9 is worrying. It is not supposed to be there as catpt-series is its direct dependency. Cover letter for the latter mentions that explicitly while this series starts with "Follow up to catpt series".

Sorry for causing a misunderstanding, this series is not merged for 5.9, AFAICT it is queued up for 5.10. What I was trying to say is that the new catpt code is also NOT in 5.9. So 5.9 will both get the replacement catpt code and drop the old sst-acpi support for Broadwell / Haswell in a single cycle.

<snip>

Quoted 5 lines

Given the work that has been done behind the scenes, I'd argue hsw/bdw has never been in the better place than it is today - that goes for both, Linux and Windows solutions as both worlds took part in this project. Code rewritten, actual CI running, several setups in racks, documentation refreshed, FW + SW windows again on thier legs and so on.

Ok, sounds good, hopefully thing will work out fine for HSW/BDW in 5.10 then.

Regards,

Hans