ASoC: Intel: Skylake: Add NHLT support to get BE config

The Non-HD Audio Endpoint Description table contains the link
configuration information for the DSP. This is specific to Non HDA
links only, like I2s and PDM

Skylake driver will use NHLT table to retrieve the configuration based
on the link type, format, channel and rate. This configuration is
passed to DSP FW

Signed-off-by: Jeeja KP <jeeja.kp@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/skylake/Makefile b/sound/soc/intel/skylake/Makefile
index 1fccb378e62ce0afd917e4b247af436a47dc97cd..b35faef05779ce7d82902073ac211fe3341b3e0a 100644 (file)
--- a/sound/soc/intel/skylake/Makefile
+++ b/sound/soc/intel/skylake/Makefile
@@ -1,4 +1,4 @@
-snd-soc-skl-objs := skl.o skl-pcm.o
+snd-soc-skl-objs := skl.o skl-pcm.o skl-nhlt.o
 
 obj-$(CONFIG_SND_SOC_INTEL_SKYLAKE) += snd-soc-skl.o
 

diff --git a/sound/soc/intel/skylake/skl-nhlt.c b/sound/soc/intel/skylake/skl-nhlt.c
new file mode 100644 (file)
index 0000000..5c0895e
--- /dev/null
+++ b/sound/soc/intel/skylake/skl-nhlt.c
@@ -0,0 +1,141 @@
+/*
+ *  skl-nhlt.c - Intel SKL Platform NHLT parsing
+ *
+ *  Copyright (C) 2015 Intel Corp
+ *  Author: Sanjiv Kumar <sanjiv.kumar@intel.com>
+ *  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; version 2 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful, but
+ *  WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  General Public License for more details.
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ *
+ */
+#include <linux/acpi.h>
+#include "skl.h"
+
+/* Unique identification for getting NHLT blobs */
+static u8 OSC_UUID[16] = {0x6E, 0x88, 0x9F, 0xA6, 0xEB, 0x6C, 0x94, 0x45,
+                               0xA4, 0x1F, 0x7B, 0x5D, 0xCE, 0x24, 0xC5, 0x53};
+
+#define DSDT_NHLT_PATH "\\_SB.PCI0.HDAS"
+
+void __iomem *skl_nhlt_init(struct device *dev)
+{
+       acpi_handle handle;
+       union acpi_object *obj;
+       struct nhlt_resource_desc  *nhlt_ptr = NULL;
+
+       if (ACPI_FAILURE(acpi_get_handle(NULL, DSDT_NHLT_PATH, &handle))) {
+               dev_err(dev, "Requested NHLT device not found\n");
+               return NULL;
+       }
+
+       obj = acpi_evaluate_dsm(handle, OSC_UUID, 1, 1, NULL);
+       if (obj && obj->type == ACPI_TYPE_BUFFER) {
+               nhlt_ptr = (struct nhlt_resource_desc  *)obj->buffer.pointer;
+
+               return ioremap_cache(nhlt_ptr->min_addr, nhlt_ptr->length);
+       }
+
+       dev_err(dev, "device specific method to extract NHLT blob failed\n");
+       return NULL;
+}
+
+void skl_nhlt_free(void __iomem *addr)
+{
+       iounmap(addr);
+       addr = NULL;
+}
+
+static struct nhlt_specific_cfg *skl_get_specific_cfg(
+               struct device *dev, struct nhlt_fmt *fmt,
+               u8 no_ch, u8 rate, u16 bps)
+{
+       struct nhlt_specific_cfg *sp_config;
+       struct wav_fmt *wfmt;
+       struct nhlt_fmt_cfg *fmt_config = fmt->fmt_config;
+       int i;
+
+       dev_dbg(dev, "Format count =%d\n", fmt->fmt_count);
+
+       for (i = 0; i < fmt->fmt_count; i++) {
+               wfmt = &fmt_config->fmt_ext.fmt;
+               dev_dbg(dev, "ch=%d fmt=%d s_rate=%d\n", wfmt->channels,
+                        wfmt->bits_per_sample, wfmt->samples_per_sec);
+               if (wfmt->channels == no_ch && wfmt->samples_per_sec == rate &&
+                                       wfmt->bits_per_sample == bps) {
+                       sp_config = &fmt_config->config;
+
+                       return sp_config;
+               }
+
+               fmt_config = (struct nhlt_fmt_cfg *)(fmt_config->config.caps +
+                                               fmt_config->config.size);
+       }
+
+       return NULL;
+}
+
+static void dump_config(struct device *dev, u32 instance_id, u8 linktype,
+               u8 s_fmt, u8 num_channels, u32 s_rate, u8 dirn, u16 bps)
+{
+       dev_dbg(dev, "Input configuration\n");
+       dev_dbg(dev, "ch=%d fmt=%d s_rate=%d\n", num_channels, s_fmt, s_rate);
+       dev_dbg(dev, "vbus_id=%d link_type=%d\n", instance_id, linktype);
+       dev_dbg(dev, "bits_per_sample=%d\n", bps);
+}
+
+static bool skl_check_ep_match(struct device *dev, struct nhlt_endpoint *epnt,
+                               u32 instance_id, u8 link_type, u8 dirn)
+{
+       dev_dbg(dev, "vbus_id=%d link_type=%d dir=%d\n",
+               epnt->virtual_bus_id, epnt->linktype, epnt->direction);
+
+       if ((epnt->virtual_bus_id == instance_id) &&
+                       (epnt->linktype == link_type) &&
+                       (epnt->direction == dirn))
+               return true;
+       else
+               return false;
+}
+
+struct nhlt_specific_cfg
+*skl_get_ep_blob(struct skl *skl, u32 instance, u8 link_type,
+                       u8 s_fmt, u8 num_ch, u32 s_rate, u8 dirn)
+{
+       struct nhlt_fmt *fmt;
+       struct nhlt_endpoint *epnt;
+       struct hdac_bus *bus = ebus_to_hbus(&skl->ebus);
+       struct device *dev = bus->dev;
+       struct nhlt_specific_cfg *sp_config;
+       struct nhlt_acpi_table *nhlt = (struct nhlt_acpi_table *)skl->nhlt;
+       u16 bps = num_ch * s_fmt;
+       u8 j;
+
+       dump_config(dev, instance, link_type, s_fmt, num_ch, s_rate, dirn, bps);
+
+       epnt = (struct nhlt_endpoint *)nhlt->desc;
+
+       dev_dbg(dev, "endpoint count =%d\n", nhlt->endpoint_count);
+
+       for (j = 0; j < nhlt->endpoint_count; j++) {
+               if (skl_check_ep_match(dev, epnt, instance, link_type, dirn)) {
+                       fmt = (struct nhlt_fmt *)(epnt->config.caps +
+                                                epnt->config.size);
+                       sp_config = skl_get_specific_cfg(dev, fmt, num_ch, s_rate, bps);
+                       if (sp_config)
+                               return sp_config;
+               }
+
+               epnt = (struct nhlt_endpoint *)((u8 *)epnt + epnt->length);
+       }
+
+       return NULL;
+}

diff --git a/sound/soc/intel/skylake/skl-nhlt.h b/sound/soc/intel/skylake/skl-nhlt.h
new file mode 100644 (file)
index 0000000..b0e2e4d
--- /dev/null
+++ b/sound/soc/intel/skylake/skl-nhlt.h
@@ -0,0 +1,116 @@
+/*
+ *  skl-nhlt.h - Intel HDA Platform NHLT header
+ *
+ *  Copyright (C) 2015 Intel Corp
+ *  Author: Sanjiv Kumar <sanjiv.kumar@intel.com>
+ *  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; version 2 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful, but
+ *  WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  General Public License for more details.
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ *
+ */
+#ifndef __SKL_NHLT_H__
+#define __SKL_NHLT_H__
+
+struct acpi_desc_header {
+       u32  signature;
+       u32  length;
+       u8   revision;
+       u8   checksum;
+       u8   oem_id[6];
+       u64  oem_table_id;
+       u32  oem_revision;
+       u32  creator_id;
+       u32  creator_revision;
+} __packed;
+
+struct wav_fmt {
+       u16 fmt_tag;
+       u16 channels;
+       u32 samples_per_sec;
+       u32 avg_bytes_per_sec;
+       u16 block_align;
+       u16 bits_per_sample;
+       u16 cb_size;
+} __packed;
+
+struct wav_fmt_ext {
+       struct wav_fmt fmt;
+       union samples {
+               u16 valid_bits_per_sample;
+               u16 samples_per_block;
+               u16 reserved;
+       } sample;
+       u32 channel_mask;
+       u8 sub_fmt[16];
+} __packed;
+
+enum nhlt_link_type {
+       NHLT_LINK_HDA = 0,
+       NHLT_LINK_DSP = 1,
+       NHLT_LINK_DMIC = 2,
+       NHLT_LINK_SSP = 3,
+       NHLT_LINK_INVALID
+};
+
+enum nhlt_device_type {
+       NHLT_DEVICE_BT = 0,
+       NHLT_DEVICE_DMIC = 1,
+       NHLT_DEVICE_I2S = 4,
+       NHLT_DEVICE_INVALID
+};
+
+struct nhlt_specific_cfg {
+       u32 size;
+       u8 caps[0];
+} __packed;
+
+struct nhlt_fmt_cfg {
+       struct wav_fmt_ext fmt_ext;
+       struct nhlt_specific_cfg config;
+} __packed;
+
+struct nhlt_fmt {
+       u8 fmt_count;
+       struct nhlt_fmt_cfg fmt_config[0];
+} __packed;
+
+struct nhlt_endpoint {
+       u32  length;
+       u8   linktype;
+       u8   instance_id;
+       u16  vendor_id;
+       u16  device_id;
+       u16  revision_id;
+       u32  subsystem_id;
+       u8   device_type;
+       u8   direction;
+       u8   virtual_bus_id;
+       struct nhlt_specific_cfg config;
+} __packed;
+
+struct nhlt_acpi_table {
+       struct acpi_desc_header header;
+       u8 endpoint_count;
+       struct nhlt_endpoint desc[0];
+} __packed;
+
+struct nhlt_resource_desc  {
+       u32 extra;
+       u16 flags;
+       u64 addr_spc_gra;
+       u64 min_addr;
+       u64 max_addr;
+       u64 addr_trans_offset;
+       u64 length;
+} __packed;
+
+#endif

diff --git a/sound/soc/intel/skylake/skl.h b/sound/soc/intel/skylake/skl.h
index cc0f3e263495ff7a18b29a3d51046d4a863973ce..31dafa8a0594257fdd98d4276fa844824cc0eed0 100644 (file)
--- a/sound/soc/intel/skylake/skl.h
+++ b/sound/soc/intel/skylake/skl.h
@@ -23,6 +23,7 @@
 
 #include <sound/hda_register.h>
 #include <sound/hdaudio_ext.h>
+#include "skl-nhlt.h"
 
 #define SKL_SUSPEND_DELAY 2000
 
@@ -53,6 +54,8 @@ struct skl {
 
        unsigned int init_failed:1; /* delayed init failed */
        struct platform_device *dmic_dev;
+
+       void __iomem *nhlt; /* nhlt ptr */
 };
 
 #define skl_to_ebus(s) (&(s)->ebus)
@@ -68,4 +71,8 @@ struct skl_dma_params {
 int skl_platform_unregister(struct device *dev);
 int skl_platform_register(struct device *dev);
 
+void __iomem *skl_nhlt_init(struct device *dev);
+void skl_nhlt_free(void __iomem *addr);
+struct nhlt_specific_cfg *skl_get_ep_blob(struct skl *skl, u32 instance,
+                       u8 link_type, u8 s_fmt, u8 no_ch, u32 s_rate, u8 dirn);
 #endif /* __SOUND_SOC_SKL_H */