thesofproject / sof

Sound Open Firmware
Other
533 stars 308 forks source link

[BUG] addition of AMD_HS breaks backwards compatibility #6615

Closed plbossart closed 1 year ago

plbossart commented 1 year ago

https://lore.kernel.org/alsa-devel/36a45c7a-820a-7675-d740-c0e83ae2c417@collabora.com/

We need to move AMD_HS to the end of the dai list

plbossart commented 1 year ago

To make things worse, new DAI types were added to the kernel definitions but not in the SOF tree. WTH?

kernel:

/** \brief Types of DAI */
enum sof_ipc_dai_type {
    SOF_DAI_INTEL_NONE = 0,     /**< None */
    SOF_DAI_INTEL_SSP,      /**< Intel SSP */
    SOF_DAI_INTEL_DMIC,     /**< Intel DMIC */
    SOF_DAI_INTEL_HDA,      /**< Intel HD/A */
    SOF_DAI_INTEL_ALH,      /**< Intel ALH  */
    SOF_DAI_IMX_SAI,        /**< i.MX SAI */
    SOF_DAI_IMX_ESAI,       /**< i.MX ESAI */
    SOF_DAI_AMD_BT,         /**< AMD ACP BT*/
    SOF_DAI_AMD_SP,         /**< AMD ACP SP */
    SOF_DAI_AMD_DMIC,       /**< AMD ACP DMIC */
    SOF_DAI_AMD_HS,         /**< Amd HS */
    SOF_DAI_MEDIATEK_AFE,       /**< Mediatek AFE */
    SOF_DAI_AMD_SP_VIRTUAL,     /**< AMD ACP SP VIRTUAL */
    SOF_DAI_AMD_HS_VIRTUAL,     /**< AMD ACP HS VIRTUAL */
};

firmware

/** \brief Types of DAI */
enum sof_ipc_dai_type {
    SOF_DAI_INTEL_NONE = 0,     /**< None */
    SOF_DAI_INTEL_SSP,      /**< Intel SSP */
    SOF_DAI_INTEL_DMIC,     /**< Intel DMIC */
    SOF_DAI_INTEL_HDA,      /**< Intel HD/A */
    SOF_DAI_INTEL_ALH,      /**< Intel ALH */
    SOF_DAI_IMX_SAI,                /**< i.MX SAI */
    SOF_DAI_IMX_ESAI,               /**< i.MX ESAI */
    SOF_DAI_AMD_BT,         /**< Amd BT */
    SOF_DAI_AMD_SP,         /**< Amd SP */
    SOF_DAI_AMD_DMIC,       /**< Amd DMIC */
    SOF_DAI_AMD_HS,         /**< Amd HS */
    SOF_DAI_MEDIATEK_AFE            /**< Mtk AFE */
};
ranj063 commented 1 year ago

To make things worse, new DAI types were added to the kernel definitions but not in the SOF tree. WTH? @plbossart I asked this question in the kernel PR but it was merged even before

mengdonglin commented 1 year ago

Fixes merged.