ASoC: Intel: avs: Switch to ACPI NHLT

Now that NHLT support in ACPI framework was introduced, migrate avs
driver to new API.

Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
Link: https://lore.kernel.org/r/20240419084307.2718881-3-cezary.rojewski@intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index 4b9e498e330373be1903fa38dee092729da20f2b..38b61dfd1487fb798a88afde319b001ff2e45b64 100644 (file)
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -214,6 +214,7 @@ config SND_SOC_INTEL_AVS
        depends on X86 || COMPILE_TEST
        depends on PCI
        depends on COMMON_CLK
+       select ACPI_NHLT if ACPI
        select SND_SOC_ACPI if ACPI
        select SND_SOC_TOPOLOGY
        select SND_SOC_HDA

diff --git a/sound/soc/intel/avs/avs.h b/sound/soc/intel/avs/avs.h
index f80f79415344abde8784ce485ee7345fb8d61b30..900786eb81e4d8a79a1a84e8adbda0e7ddf6eebe 100644 (file)
--- a/sound/soc/intel/avs/avs.h
+++ b/sound/soc/intel/avs/avs.h
@@ -151,7 +151,6 @@ struct avs_dev {
        struct completion fw_ready;
        struct work_struct probe_work;
 
-       struct nhlt_acpi_table *nhlt;
        struct list_head comp_list;
        struct mutex comp_list_mutex;
        struct list_head path_list;

diff --git a/sound/soc/intel/avs/board_selection.c b/sound/soc/intel/avs/board_selection.c
index 8360ce557401c646a1f02bf1d7bf4cec811016c0..290ea314ace82ce5934f9668565f815d0995a6fa 100644 (file)
--- a/sound/soc/intel/avs/board_selection.c
+++ b/sound/soc/intel/avs/board_selection.c
@@ -10,10 +10,10 @@
 #include <linux/module.h>
 #include <linux/dmi.h>
 #include <linux/pci.h>
+#include <acpi/nhlt.h>
 #include <linux/platform_device.h>
 #include <sound/hda_codec.h>
 #include <sound/hda_register.h>
-#include <sound/intel-nhlt.h>
 #include <sound/soc-acpi.h>
 #include <sound/soc-component.h>
 #include "avs.h"
@@ -434,8 +434,7 @@ static int avs_register_dmic_board(struct avs_dev *adev)
        struct snd_soc_acpi_mach mach = {{0}};
        int ret;
 
-       if (!adev->nhlt ||
-           !intel_nhlt_has_endpoint_type(adev->nhlt, NHLT_LINK_DMIC)) {
+       if (!acpi_nhlt_find_endpoint(ACPI_NHLT_LINKTYPE_PDM, -1, -1, -1)) {
                dev_dbg(adev->dev, "no DMIC endpoints present\n");
                return 0;
        }
@@ -523,7 +522,7 @@ static int avs_register_i2s_boards(struct avs_dev *adev)
        struct snd_soc_acpi_mach *mach;
        int ret;
 
-       if (!adev->nhlt || !intel_nhlt_has_endpoint_type(adev->nhlt, NHLT_LINK_SSP)) {
+       if (!acpi_nhlt_find_endpoint(ACPI_NHLT_LINKTYPE_SSP, -1, -1, -1)) {
                dev_dbg(adev->dev, "no I2S endpoints present\n");
                return 0;
        }

diff --git a/sound/soc/intel/avs/core.c b/sound/soc/intel/avs/core.c
index d7f8940099cec6510c1179b7045134243767625d..a61ce42b426cbf428f254802cf3dfa275cf4c3bd 100644 (file)
--- a/sound/soc/intel/avs/core.c
+++ b/sound/soc/intel/avs/core.c
@@ -14,15 +14,16 @@
 // foundation of this driver
 //
 
+#include <linux/acpi.h>
 #include <linux/module.h>
 #include <linux/pci.h>
+#include <acpi/nhlt.h>
 #include <sound/hda_codec.h>
 #include <sound/hda_i915.h>
 #include <sound/hda_register.h>
 #include <sound/hdaudio.h>
 #include <sound/hdaudio_ext.h>
 #include <sound/intel-dsp-config.h>
-#include <sound/intel-nhlt.h>
 #include "../../codecs/hda.h"
 #include "avs.h"
 #include "cldma.h"
@@ -214,9 +215,7 @@ static void avs_hda_probe_work(struct work_struct *work)
        if (ret < 0)
                return;
 
-       adev->nhlt = intel_nhlt_init(adev->dev);
-       if (!adev->nhlt)
-               dev_info(bus->dev, "platform has no NHLT\n");
+       acpi_nhlt_get_gbl_table();
        avs_debugfs_init(adev);
 
        avs_register_all_boards(adev);
@@ -549,8 +548,7 @@ static void avs_pci_remove(struct pci_dev *pci)
        avs_unregister_all_boards(adev);
 
        avs_debugfs_exit(adev);
-       if (adev->nhlt)
-               intel_nhlt_free(adev->nhlt);
+       acpi_nhlt_put_gbl_table();
 
        if (avs_platattr_test(adev, CLDMA))
                hda_cldma_free(&code_loader);

diff --git a/sound/soc/intel/avs/path.c b/sound/soc/intel/avs/path.c
index e785fc2a7008fab675225f361c963f9fa918d293..531a086642be1f11098a74f79c889df9f7e224da 100644 (file)
--- a/sound/soc/intel/avs/path.c
+++ b/sound/soc/intel/avs/path.c
@@ -6,7 +6,8 @@
 //          Amadeusz Slawinski <amadeuszx.slawinski@linux.intel.com>
 //
 
-#include <sound/intel-nhlt.h>
+#include <linux/acpi.h>
+#include <acpi/nhlt.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
 #include "avs.h"
@@ -143,10 +144,10 @@ static bool avs_dma_type_is_input(u32 dma_type)
 
 static int avs_copier_create(struct avs_dev *adev, struct avs_path_module *mod)
 {
-       struct nhlt_acpi_table *nhlt = adev->nhlt;
        struct avs_tplg_module *t = mod->template;
        struct avs_copier_cfg *cfg;
-       struct nhlt_specific_cfg *ep_blob;
+       struct acpi_nhlt_format_config *ep_blob;
+       struct acpi_nhlt_endpoint *ep;
        union avs_connector_node_id node_id = {0};
        size_t cfg_size, data_size = 0;
        void *data = NULL;
@@ -174,18 +175,18 @@ static int avs_copier_create(struct avs_dev *adev, struct avs_path_module *mod)
                else
                        fmt = t->cfg_ext->copier.out_fmt;
 
-               ep_blob = intel_nhlt_get_endpoint_blob(adev->dev,
-                       nhlt, t->cfg_ext->copier.vindex.i2s.instance,
-                       NHLT_LINK_SSP, fmt->valid_bit_depth, fmt->bit_depth,
-                       fmt->num_channels, fmt->sampling_freq, direction,
-                       NHLT_DEVICE_I2S);
+               ep = acpi_nhlt_find_endpoint(ACPI_NHLT_LINKTYPE_SSP,
+                                            ACPI_NHLT_DEVICETYPE_CODEC, direction,
+                                            t->cfg_ext->copier.vindex.i2s.instance);
+               ep_blob = acpi_nhlt_endpoint_find_fmtcfg(ep, fmt->num_channels, fmt->sampling_freq,
+                                                        fmt->valid_bit_depth, fmt->bit_depth);
                if (!ep_blob) {
                        dev_err(adev->dev, "no I2S ep_blob found\n");
                        return -ENOENT;
                }
 
-               data = ep_blob->caps;
-               data_size = ep_blob->size;
+               data = ep_blob->config.capabilities;
+               data_size = ep_blob->config.capabilities_size;
                /* I2S gateway's vindex is statically assigned in topology */
                node_id.vindex = t->cfg_ext->copier.vindex.val;
 
@@ -199,17 +200,16 @@ static int avs_copier_create(struct avs_dev *adev, struct avs_path_module *mod)
                else
                        fmt = t->in_fmt;
 
-               ep_blob = intel_nhlt_get_endpoint_blob(adev->dev, nhlt, 0,
-                               NHLT_LINK_DMIC, fmt->valid_bit_depth,
-                               fmt->bit_depth, fmt->num_channels,
-                               fmt->sampling_freq, direction, NHLT_DEVICE_DMIC);
+               ep = acpi_nhlt_find_endpoint(ACPI_NHLT_LINKTYPE_PDM, -1, direction, 0);
+               ep_blob = acpi_nhlt_endpoint_find_fmtcfg(ep, fmt->num_channels, fmt->sampling_freq,
+                                                        fmt->valid_bit_depth, fmt->bit_depth);
                if (!ep_blob) {
                        dev_err(adev->dev, "no DMIC ep_blob found\n");
                        return -ENOENT;
                }
 
-               data = ep_blob->caps;
-               data_size = ep_blob->size;
+               data = ep_blob->config.capabilities;
+               data_size = ep_blob->config.capabilities_size;
                /* DMIC gateway's vindex is statically assigned in topology */
                node_id.vindex = t->cfg_ext->copier.vindex.val;