[REVIEW ONLY] topology 2.0

tools/topology/v2/attributes.conf

@@ -0,0 +1,55 @@
+# common attributes and attribute types. Attributes, defined here can then be
+# used by any blocks. E.g. the "format" attribute can be used by pipelines,
+# DAIs, etc.
+
+# we're using an "availability" parameter in attribute declaration instead of
+# adding ".optional" or ".mandatory" to the array name
+
+DefineType.format {
+	enum [
+		"s16le"
+		"s24le"
+		"s32le"
+		"float"
+	]
+}
+
+DefineType.time_domain {
+	enum [
+		"dma"
+		"timer"
+	]
+}
+
+DefineAttribute.tokens {
+	type array.tuple
+}
+
+DefineAttribute.format {
+	type format
+	availability mandatory
+}
+
+DefineAttribute.template {
+	type string
+	availability mandatory
+}
+
+DefineAttribute.pipeline_id {
+	type integer
+	availability mandatory
+}
+
+DefineAttribute.periods_sink {
+	type integer
+	availability optional
+	default 2
+	min 1
+}
+
+DefineAttribute.periods_source {
+	type integer
+	availability optional
+	default 2
+	min 1
+}

tools/topology/v2/buffer.conf

@@ -0,0 +1,17 @@
+# Buffer block and related attributes
+
+DefineAttribute.capabilities {
+	type array.integer
+}
+
+# A buffer block, most attributes inherited from "Widget"
+DefineWidget."buffer" {
+	attributes [
+		name
+		format
+		periods
+		capabilities
+	]
+
+	type buffer
+}

tools/topology/v2/bxt.conf

@@ -0,0 +1,17 @@
+# BXT specific topology elements
+
+# BXT host memory capability flags
+platform_host_mem_cap [
+	MEM_CAP_RAM
+	MEM_CAP_DMA
+	MEM_CAP_CACHE
+	MEM_CAP_HP
+]
+
+# BXT DAI memory capability flags
+platform_dai_mem_cap [
+	MEM_CAP_RAM
+	MEM_CAP_DMA
+	MEM_CAP_CACHE
+	MEM_CAP_HP
+]

tools/topology/v2/common.conf

@@ -0,0 +1,47 @@
+# Common topology defines
+
+# All SOF widget types
+DefineType.widget_type {
+	enum [
+		"aif_in"
+		"aif_out"
+		"asrc"
+		"buffer"
+		"dai_in"
+		"dai_out"
+		"effect"
+		"input"
+		"mixer"
+		"output"
+		"pga"
+		"scheduler"
+		"siggen"
+		"src"
+	]
+}
+
+# Attributes, common to all widgets
+DefineAttribute.type {
+	type widget_type
+	availability optional
+}
+
+DefineAttribute.index {
+	type integer
+	availability optional
+}
+
+DefineAttribute.no_pm {
+	type bool
+	availability optional
+	default true
+}
+
+# All widgets inherit these attributes
+DefineWidget {
+	attributes [
+		type
+		index
+		no_pm
+	]
+}

tools/topology/v2/dai.conf

@@ -0,0 +1,114 @@
+# DAI attributes and component declarations
+
+# These have to be globally defined, so they are using a "dai_" prefix
+DefineAttribute.dai_format {
+	type format
+	# could make it optional with s32le as default?
+	availability mandatory
+}
+
+DefineAttribute.dai_periods {
+	type integer
+	availability optional
+	default 2
+	min 1
+}
+
+DefineAttribute.dai_index {
+	type integer
+	availability mandatory
+}
+
+DefineType.dai_type {
+	enum [
+		"ALH"
+		"DMIC"
+		"ESAI"
+		"HDA"
+		"SAI"
+		"SSP"
+	]
+}
+
+DefineAttribute.dai_type {
+	type dai_type
+	availability mandatory
+}
+
+# The DAI widget
+DefineWidget."dai" {
+	DefineAttribute.backend {
+		type string
+		availability mandatory
+	}
+
+	attributes [
+		template
+		backend
+		periods_sink
+		periods_source
+		dai_format
+		dai_type
+		dai_index
+	        schedule_time_domain
+	]
+}
+
+# DAI_CONFIG adds 2 components: SectionBE, SectionHWConfig, but we want a block
+# for each component, so we need two defines
+
+# A back end / SectionBE
+DefineBE {
+	DefineAttribute.index {
+		type integer
+		availability mandatory
+	}
+
+	DefineAttribute.id {
+		type integer
+		availability mandatory
+	}
+
+	DefineAttribute.default_hw_conf_id {
+		type integer
+		availability mandatory
+	}
+
+	DefineAttribute.hw_configs {
+		type array.string
+		availability mandatory
+	}
+
+	# index is always \"0\", default_hw_conf_id is always identical
+	attributes [
+		id
+		index
+		default_hw_conf_id
+		hw_configs
+	]
+
+	index 0
+	default_hw_conf_id $id
+
+	# FIXME we need concatenation
+	hw_configs [
+		@func concat
+			strings [
+				$dai_type
+				$dai_index
+			]
+	]
+}
+
+# SectionHWConfig
+DefineHWConfig {
+	DefineAttribute.id {
+		type integer
+		availability mandatory
+	}
+
+	attributes [
+		id
+		# we also need to define attributes for SSP, SAI, ESAI
+	]
+}

tools/topology/v2/machine.conf

@@ -0,0 +1,80 @@
+# Instantiate a subtree - all the pipelines, connected to one DAI
+subtree {
+	# Subtree-level attributes
+
+	# the DAI will use pipeline_id from the first pipeline in the array
+	# We put all the DAI attributes in the global scope, but in principle
+	# the compiler can also be taught to take them from the DAI scope.
+	dai_format s32le
+	dai_periods 2
+	dai_type HDA
+	dai_index 4
+        schedule_time_domain timer
+
+	# the below could also be written as "pipelines.0 {...}" especially in
+	# cases with only one pipeline in the subtree
+
+	# Each element of this array instantiates a block, as defined per
+	# DefineWidget."pipeline"
+	# TODO: this has to be made explicit
+	pipelines [
+		{
+			template "volume-playback"
+
+			pipeline_id 7
+			pipeline_channels 2
+			pipeline_format s24le
+			pipeline_rate 48000
+
+			schedule_period 1000
+			schedule_priority 0
+			# optional: 0 core is the default
+			schedule_core 0
+
+			pcm_id 3
+			pcm_rate {
+				min 48000
+				max 48000
+			}
+
+			tokens [
+				{
+					# from bxt.m4, cnl.m4
+					sched_mips 5000
+				}
+			]
+
+			# Not every pipeline has a PCM, some pipelines might
+			# just form an alternative path in a graph, so a PCM in
+			# a pipeline is optional, but common
+			# PCM_PLAYBACK_ADD(HDMI1, 3, PIPELINE_PCM_7)
+			# adds a "SectionPCM" block
+			pcm {
+				name "HDMI1"
+			}
+		}
+	]
+
+	# Instantiate a block, as defined per
+	# DefineWidget."dai"
+	# TODO: this has to be made explicit
+	dai {
+		# DAI-specific attributes
+		template "playback"
+		backend "iDisp1"
+	}
+
+	# The fourth parameter is the BE name and it seems to always be equal to
+	# the fifth parameter of the DAI_ADD() macro, however, this hasn't been
+	# verified in all topologies.
+	# DAI_CONFIG(HDA, 4, 1, iDisp1)
+	# Possibly this can be merged with the "dai" block above
+	dai_config {
+		id 1
+	}
+
+	# Need to instantiate SectionHWConfig separately
+	hw_config {
+		id 1
+	}
+}