probes: Add extended boot data regarding probes support.

src/include/ipc/info.h

@@ -39,6 +39,7 @@ enum sof_ipc_ext_data {
 	SOF_IPC_EXT_DMA_BUFFER = 0,
 	SOF_IPC_EXT_WINDOW,
 	SOF_IPC_EXT_CC_INFO,
+	SOF_IPC_EXT_PROBE_INFO,
 };
 
 /* FW version - SOF_IPC_GLB_VERSION */
@@ -139,6 +140,15 @@ struct sof_ipc_cc_version {
 	char desc[]; /* null terminated compiler description */
 } __attribute__((packed));
 
-extern const struct sof_ipc_cc_version cc_version;
+/* extended data: Probe setup */
+struct sof_ipc_probe_support {
+	struct sof_ipc_ext_data_hdr ext_hdr;
+
+	uint32_t probe_points_max;
+	uint32_t injection_dmas_max;
+
+	/* reserved for future use */
+	uint32_t reserved[2];
+} __attribute__((packed));
 
 #endif /* __IPC_INFO_H__ */

src/include/sof/fw-ready-metadata.h

@@ -0,0 +1,16 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2020 Intel Corporation. All rights reserved.
+ *
+ * Author: Artur Kloniecki <arturx.kloniecki@linux.intel.com>
+ */
+
+#ifndef __IPC_FW_READY_METADATA_H__
+#define __IPC_FW_READY_METADATA_H__
+
+#include <ipc/info.h>
+
+extern const struct sof_ipc_cc_version cc_version;
+extern const struct sof_ipc_probe_support probe_support;
+
+#endif /* __IPC_FW_READY_METADATA_H__ */

src/ipc/CMakeLists.txt

@@ -35,6 +35,9 @@ set_property(TARGET data_structs APPEND
 	     PROPERTY COMPILE_DEFINITIONS
 	     CC_OPTIMIZE_FLAGS="${optimization_flag}")
 
-add_local_sources(data_structs cc_version.c)
+add_local_sources(data_structs
+	cc_version.c
+	probe_support.c)
+
 target_link_libraries(data_structs sof_options)
 target_link_libraries(sof_static_libraries INTERFACE data_structs)

src/ipc/cc_version.c

@@ -5,6 +5,7 @@
 // Author: Karol Trzcinski <karolx.trzcinski@linux.intel.com>
 
 #include <ipc/info.h>
+#include <sof/fw-ready-metadata.h>
 #include <sof/common.h>
 #include <sof/compiler_info.h>
 
@@ -18,7 +19,8 @@
 	field = CC_OPTIMIZE_FLAGS, \
 	field[ARRAY_SIZE(((struct sof_ipc_cc_version *)(0))->optim) - 1] = 0
 
-const struct sof_ipc_cc_version cc_version = {
+const struct sof_ipc_cc_version cc_version
+	__attribute__((section(".fw_ready_metadata"))) = {
 	.ext_hdr = {
 		.hdr.cmd = SOF_IPC_FW_READY,
 		.hdr.size = sizeof(struct sof_ipc_cc_version)

src/ipc/probe_support.c

@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: BSD-3-Clause
+//
+// Copyright(c) 2020 Intel Corporation. All rights reserved.
+//
+// Author: Artur Kloniecki <arturx.kloniecki@linux.intel.com>
+
+#include <ipc/info.h>
+#include <sof/fw-ready-metadata.h>
+#include <config.h>
+
+const struct sof_ipc_probe_support probe_support
+	__attribute__((section(".fw_ready_metadata"))) = {
+	.ext_hdr = {
+		.hdr.cmd = SOF_IPC_FW_READY,
+		.hdr.size = sizeof(struct sof_ipc_probe_support),
+		.type = SOF_IPC_EXT_PROBE_INFO,
+	},
+#if CONFIG_PROBE
+	.probe_points_max = CONFIG_PROBE_POINTS_MAX,
+	.injection_dmas_max = CONFIG_PROBE_DMA_MAX
+#endif
+};

src/platform/apollolake/apollolake.x.in

@@ -451,6 +451,7 @@ SECTIONS
   .fw_ready : ALIGN(4)
   {
     KEEP (*(.fw_ready))
+    KEEP (*(.fw_ready_metadata))
   } >sof_fw :sof_fw_phdr
 
   .bss (NOLOAD) : ALIGN(4096)

src/platform/baytrail/baytrail.x.in

@@ -537,5 +537,6 @@ SECTIONS
   .fw_ready : ALIGN(4)
   {
     KEEP (*(.fw_ready))
+    KEEP (*(.fw_ready_metadata))
   } >sof_data :sof_data_phdr
 }

src/platform/baytrail/platform.c

@@ -12,6 +12,7 @@
 #include <sof/drivers/ipc.h>
 #include <sof/drivers/pmc.h>
 #include <sof/drivers/timer.h>
+#include <sof/fw-ready-metadata.h>
 #include <sof/lib/agent.h>
 #include <sof/lib/alloc.h>
 #include <sof/lib/clk.h>
@@ -65,7 +66,8 @@ static const struct sof_ipc_fw_ready ready
 };
 
 #define NUM_BYT_WINDOWS		6
-static const struct sof_ipc_window sram_window = {
+static const struct sof_ipc_window sram_window
+	__attribute__((section(".fw_ready_metadata"))) = {
 	.ext_hdr	= {
 		.hdr.cmd = SOF_IPC_FW_READY,
 		.hdr.size = sizeof(struct sof_ipc_window) +
@@ -139,6 +141,10 @@ int platform_boot_complete(uint32_t boot_message)
 	/* variable length compiler description is a last field of cc_version */
 	mailbox_dspbox_write(mb_offset, &cc_version,
 			     cc_version.ext_hdr.hdr.size);
+	mb_offset = mb_offset + cc_version.ext_hdr.hdr.size;
+
+	mailbox_dspbox_write(mb_offset, &probe_support,
+			     probe_support.ext_hdr.hdr.size);
 
 	/* now interrupt host to tell it we are done booting */
 	shim_write(SHIM_IPCDL, SOF_IPC_FW_READY | outbox);

src/platform/cannonlake/cannonlake.x.in

@@ -415,6 +415,7 @@ SECTIONS
   .fw_ready : ALIGN(4)
   {
     KEEP (*(.fw_ready))
+    KEEP (*(.fw_ready_metadata))
   } >sof_fw :sof_fw_phdr
 
   .bss (NOLOAD) : ALIGN(4096)

src/platform/haswell/haswell.x.in

@@ -562,5 +562,6 @@ SECTIONS
   .fw_ready : ALIGN(4)
   {
     KEEP (*(.fw_ready))
+    KEEP (*(.fw_ready_metadata))
   } >sof_data :sof_data_phdr
 }

src/platform/haswell/platform.c

@@ -10,6 +10,7 @@
 #include <sof/drivers/interrupt.h>
 #include <sof/drivers/ipc.h>
 #include <sof/drivers/timer.h>
+#include <sof/fw-ready-metadata.h>
 #include <sof/lib/agent.h>
 #include <sof/lib/alloc.h>
 #include <sof/lib/clk.h>
@@ -61,7 +62,8 @@ static const struct sof_ipc_fw_ready ready
 };
 
 #define NUM_HSW_WINDOWS		6
-static const struct sof_ipc_window sram_window = {
+static const struct sof_ipc_window sram_window
+	__attribute__((section(".fw_ready_metadata"))) = {
 	.ext_hdr	= {
 		.hdr.cmd = SOF_IPC_FW_READY,
 		.hdr.size = sizeof(struct sof_ipc_window) +
@@ -135,6 +137,10 @@ int platform_boot_complete(uint32_t boot_message)
 	/* variable length compiler description is a last field of cc_version */
 	mailbox_dspbox_write(mb_offset, &cc_version,
 			     cc_version.ext_hdr.hdr.size);
+	mb_offset = mb_offset + cc_version.ext_hdr.hdr.size;
+
+	mailbox_dspbox_write(mb_offset, &probe_support,
+			     probe_support.ext_hdr.hdr.size);
 
 	/* now interrupt host to tell it we are done booting */
 	shim_write(SHIM_IPCD, outbox | SHIM_IPCD_BUSY);

src/platform/icelake/icelake.x.in

@@ -418,6 +418,7 @@ SECTIONS
   .fw_ready : ALIGN(4)
   {
     KEEP (*(.fw_ready))
+    KEEP (*(.fw_ready_metadata))
   } >sof_fw :sof_fw_phdr
 
   .bss (NOLOAD) : ALIGN(4096)

src/platform/imx8/imx8.x.in

@@ -501,5 +501,6 @@ SECTIONS
   .fw_ready : ALIGN(4)
   {
     KEEP (*(.fw_ready))
+    KEEP (*(.fw_ready_metadata))
   } >sof_sdram0 :sof_sdram0_phdr
 }

src/platform/imx8/platform.c

@@ -11,6 +11,7 @@
 #include <sof/drivers/ipc.h>
 #include <sof/drivers/mu.h>
 #include <sof/drivers/timer.h>
+#include <sof/fw-ready-metadata.h>
 #include <sof/lib/agent.h>
 #include <sof/lib/clk.h>
 #include <sof/lib/cpu.h>
@@ -60,7 +61,8 @@ static const struct sof_ipc_fw_ready ready
 
 #define NUM_IMX_WINDOWS		6
 
-static const struct sof_ipc_window sram_window = {
+static const struct sof_ipc_window sram_window
+	__attribute__((section(".fw_ready_metadata"))) = {
 	.ext_hdr	= {
 		.hdr.cmd = SOF_IPC_FW_READY,
 		.hdr.size = sizeof(struct sof_ipc_window) +
@@ -133,6 +135,10 @@ int platform_boot_complete(uint32_t boot_message)
 	/* variable length compiler description is a last field of cc_version */
 	mailbox_dspbox_write(mb_offset, &cc_version,
 			     cc_version.ext_hdr.hdr.size);
+	mb_offset = mb_offset + cc_version.ext_hdr.hdr.size;
+
+	mailbox_dspbox_write(mb_offset, &probe_support,
+			     probe_support.ext_hdr.hdr.size);
 
 	/* now interrupt host to tell it we are done booting */
 	imx_mu_xcr_rmw(IMX_MU_xCR_GIRn(1), 0);

src/platform/imx8m/imx8m.x.in

@@ -501,5 +501,6 @@ SECTIONS
   .fw_ready : ALIGN(4)
   {
     KEEP (*(.fw_ready))
+    KEEP (*(.fw_ready_metadata))
   } >sof_sdram0 :sof_sdram0_phdr
 }

src/platform/imx8m/platform.c

@@ -10,6 +10,7 @@
 #include <sof/drivers/ipc.h>
 #include <sof/drivers/mu.h>
 #include <sof/drivers/timer.h>
+#include <sof/fw-ready-metadata.h>
 #include <sof/lib/agent.h>
 #include <sof/lib/clk.h>
 #include <sof/lib/cpu.h>
@@ -59,7 +60,8 @@ static const struct sof_ipc_fw_ready ready
 
 #define NUM_IMX_WINDOWS		6
 
-static const struct sof_ipc_window sram_window = {
+static const struct sof_ipc_window sram_window
+	__attribute__((section(".fw_ready_metadata"))) = {
 	.ext_hdr	= {
 		.hdr.cmd = SOF_IPC_FW_READY,
 		.hdr.size = sizeof(struct sof_ipc_window) +
@@ -132,6 +134,10 @@ int platform_boot_complete(uint32_t boot_message)
 	/* variable length compiler description is a last field of cc_version */
 	mailbox_dspbox_write(mb_offset, &cc_version,
 			     cc_version.ext_hdr.hdr.size);
+	mb_offset = mb_offset + cc_version.ext_hdr.hdr.size;
+
+	mailbox_dspbox_write(mb_offset, &probe_support,
+			     probe_support.ext_hdr.hdr.size);
 
 	/* now interrupt host to tell it we are done booting */
 	imx_mu_xcr_rmw(IMX_MU_xCR_GIRn(1), 0);

src/platform/intel/cavs/platform.c

@@ -20,6 +20,7 @@
 #include <sof/drivers/interrupt.h>
 #include <sof/drivers/ipc.h>
 #include <sof/drivers/timer.h>
+#include <sof/fw-ready-metadata.h>
 #include <sof/lib/agent.h>
 #include <sof/lib/alloc.h>
 #include <sof/lib/cache.h>
@@ -75,7 +76,8 @@ static const struct sof_ipc_fw_ready ready
 
 #define NUM_WINDOWS 7
 
-static const struct sof_ipc_window sram_window = {
+static const struct sof_ipc_window sram_window
+	__attribute__((section(".fw_ready_metadata"))) = {
 	.ext_hdr	= {
 		.hdr.cmd = SOF_IPC_FW_READY,
 		.hdr.size = sizeof(struct sof_ipc_window) +
@@ -300,6 +302,10 @@ int platform_boot_complete(uint32_t boot_message)
 	/* variable length compiler description is a last field of cc_version */
 	mailbox_dspbox_write(mb_offset, &cc_version,
 			     cc_version.ext_hdr.hdr.size);
+	mb_offset = mb_offset + cc_version.ext_hdr.hdr.size;
+
+	mailbox_dspbox_write(mb_offset, &probe_support,
+			     probe_support.ext_hdr.hdr.size);
 
 	/* tell host we are ready */
 #if CAVS_VERSION == CAVS_VERSION_1_5

src/platform/suecreek/suecreek.x.in

@@ -417,6 +417,7 @@ SECTIONS
   .fw_ready : ALIGN(4)
   {
     KEEP (*(.fw_ready))
+    KEEP (*(.fw_ready_metadata))
   } >sof_fw :sof_fw_phdr
 
   .bss (NOLOAD) : ALIGN(4096)

src/platform/tigerlake/tigerlake.x.in

@@ -430,6 +430,7 @@ SECTIONS
   .fw_ready : ALIGN(4)
   {
     KEEP (*(.fw_ready))
+    KEEP (*(.fw_ready_metadata))
   } >sof_fw :sof_fw_phdr
 
   .bss (NOLOAD) : ALIGN(4096)