Changeset 772 for GPL/trunk/alsa-kernel/include/sound/sof.h

Timestamp:

Apr 19, 2025, 8:08:37 PM (4 months ago)

Author:

David Azarewicz

Message:

Merge in changes from 6.6-LTS branch.
Fixed additional 25+ problems.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/include/sound/sof.h (modified) (6 diffs)

GPL/trunk/alsa-kernel/include/sound/sof.h

@@ -17 +17 @@
 
 struct snd_sof_dsp_ops;
+struct snd_sof_dev;
+
+/**
+ * enum sof_fw_state - DSP firmware state definitions
+ * @SOF_FW_BOOT_NOT_STARTED:    firmware boot is not yet started
+ * @SOF_DSPLESS_MODE:           DSP is not used
+ * @SOF_FW_BOOT_PREPARE:        preparing for boot (firmware loading for exaqmple)
+ * @SOF_FW_BOOT_IN_PROGRESS:    firmware boot is in progress
+ * @SOF_FW_BOOT_FAILED:         firmware boot failed
+ * @SOF_FW_BOOT_READY_FAILED:   firmware booted but fw_ready op failed
+ * @SOF_FW_BOOT_READY_OK:       firmware booted and fw_ready op passed
+ * @SOF_FW_BOOT_COMPLETE:       firmware is booted up and functional
+ * @SOF_FW_CRASHED:             firmware crashed after successful boot
+ */
+enum sof_fw_state {
+        SOF_FW_BOOT_NOT_STARTED = 0,
+        SOF_DSPLESS_MODE,
+        SOF_FW_BOOT_PREPARE,
+        SOF_FW_BOOT_IN_PROGRESS,
+        SOF_FW_BOOT_FAILED,
+        SOF_FW_BOOT_READY_FAILED,
+        SOF_FW_BOOT_READY_OK,
+        SOF_FW_BOOT_COMPLETE,
+        SOF_FW_CRASHED,
+};
+
+/* DSP power states */
+enum sof_dsp_power_states {
+        SOF_DSP_PM_D0,
+        SOF_DSP_PM_D1,
+        SOF_DSP_PM_D2,
+        SOF_DSP_PM_D3,
+};
+
+/* Definitions for multiple IPCs */
+enum sof_ipc_type {
+        SOF_IPC_TYPE_3,
+        SOF_IPC_TYPE_4,
+        SOF_IPC_TYPE_COUNT
+};
+
+#define SOF_IPC         SOF_IPC_TYPE_3
+#define SOF_INTEL_IPC4  SOF_IPC_TYPE_4
 
 /*
@@ -22 +65 @@
  */
 struct snd_sof_pdata {
-        const struct firmware *fw;
         const char *name;
         const char *platform;
 
+        /*
+         * PCI SSID. As PCI does not define 0 as invalid, the subsystem_id_set
+         * flag indicates that a value has been written to these members.
+         */
+        unsigned short subsystem_vendor;
+        unsigned short subsystem_device;
+        bool subsystem_id_set;
+
         struct device *dev;
-
-        /* indicate how many first bytes shouldn't be loaded into DSP memory. */
-        size_t fw_offset;
 
         /*
@@ -49 +96 @@
         const char *tplg_filename;
 
+        /* loadable external libraries available under this directory */
+        const char *fw_lib_prefix;
+
         /* machine */
         struct platform_device *pdev_mach;
         const struct snd_soc_acpi_mach *machine;
+        const struct snd_sof_of_mach *of_machine;
 
         void *hw_pdata;
+
+        enum sof_ipc_type ipc_type;
 };
 
@@ -63 +116 @@
         /* list of machines using this configuration */
         struct snd_soc_acpi_mach *machines;
+        struct snd_sof_of_mach *of_machines;
 
         /* alternate list of machines using this configuration */
@@ -75 +129 @@
         int resindex_imr_base;
         int irqindex_host_ipc;
-        int resindex_dma_base;
-
-        /* DMA only valid when resindex_dma_base != -1*/
-        int dma_engine;
-        int dma_size;
 
         /* IPC timeouts in ms */
@@ -91 +140 @@
         const char *nocodec_tplg_filename;
 
-        /* defaults paths for firmware and topology files */
-        const char *default_fw_path;
-        const char *default_tplg_path;
+        /* information on supported IPCs */
+        unsigned int ipc_supported_mask;
+        enum sof_ipc_type ipc_default;
+
+        /* The platform supports DSPless mode */
+        bool dspless_mode_supported;
+
+        /* defaults paths for firmware, library and topology files */
+        const char *default_fw_path[SOF_IPC_TYPE_COUNT];
+        const char *default_lib_path[SOF_IPC_TYPE_COUNT];
+        const char *default_tplg_path[SOF_IPC_TYPE_COUNT];
 
         /* default firmware name */
-        const char *default_fw_filename;
+        const char *default_fw_filename[SOF_IPC_TYPE_COUNT];
 
-        const struct snd_sof_dsp_ops *ops;
+        struct snd_sof_dsp_ops *ops;
+        int (*ops_init)(struct snd_sof_dev *sdev);
+        void (*ops_free)(struct snd_sof_dev *sdev);
 };