Commit 15fa179f authored by Amadeusz Sławiński's avatar Amadeusz Sławiński Committed by Takashi Iwai
Browse files

ALSA: hda: Fill gaps in NHLT endpoint-interface 



Two key operations missings are: endpoint presence-check and retrieval
of matching endpoint hardware configuration (blob). Add operations for
both use cases.

Signed-off-by: default avatarAmadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Signed-off-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Link: https://lore.kernel.org/r/20211126140355.1042684-2-cezary.rojewski@intel.com


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 6dd21ad8

include/sound/intel-nhlt.h

+29 −8
Original line number Diff line number Diff line
@@ -10,6 +10,14 @@ 


#include <linux/acpi.h>



enum nhlt_link_type {

	NHLT_LINK_HDA = 0,

	NHLT_LINK_DSP = 1,

	NHLT_LINK_DMIC = 2,

	NHLT_LINK_SSP = 3,

	NHLT_LINK_INVALID

};



#if IS_ENABLED(CONFIG_ACPI) && IS_ENABLED(CONFIG_SND_INTEL_NHLT)



struct wav_fmt {
@@ -33,14 +41,6 @@ struct wav_fmt_ext { 
	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,
@@ -132,6 +132,12 @@ void intel_nhlt_free(struct nhlt_acpi_table *addr); 


int intel_nhlt_get_dmic_geo(struct device *dev, struct nhlt_acpi_table *nhlt);



bool intel_nhlt_has_endpoint_type(struct nhlt_acpi_table *nhlt, u8 link_type);

struct nhlt_specific_cfg *

intel_nhlt_get_endpoint_blob(struct device *dev, struct nhlt_acpi_table *nhlt,

			     u32 bus_id, u8 link_type, u8 vbps, u8 bps,

			     u8 num_ch, u32 rate, u8 dir, u8 dev_type);



#else



struct nhlt_acpi_table;
@@ -150,6 +156,21 @@ static inline int intel_nhlt_get_dmic_geo(struct device *dev, 
{

	return 0;

}



static inline bool intel_nhlt_has_endpoint_type(struct nhlt_acpi_table *nhlt,

						u8 link_type)

{

	return false;

}



static inline struct nhlt_specific_cfg *

intel_nhlt_get_endpoint_blob(struct device *dev, struct nhlt_acpi_table *nhlt,

			     u32 bus_id, u8 link_type, u8 vbps, u8 bps,

			     u8 num_ch, u32 rate, u8 dir, u8 dev_type)

{

	return NULL;

}



#endif



#endif

sound/hda/intel-nhlt.c

+102 −0
Original line number Diff line number Diff line
@@ -110,3 +110,105 @@ int intel_nhlt_get_dmic_geo(struct device *dev, struct nhlt_acpi_table *nhlt) 
	return dmic_geo;

}

EXPORT_SYMBOL_GPL(intel_nhlt_get_dmic_geo);



bool intel_nhlt_has_endpoint_type(struct nhlt_acpi_table *nhlt, u8 link_type)

{

	struct nhlt_endpoint *epnt;

	int i;



	if (!nhlt)

		return false;



	epnt = (struct nhlt_endpoint *)nhlt->desc;

	for (i = 0; i < nhlt->endpoint_count; i++) {

		if (epnt->linktype == link_type)

			return true;



		epnt = (struct nhlt_endpoint *)((u8 *)epnt + epnt->length);

	}

	return false;

}

EXPORT_SYMBOL(intel_nhlt_has_endpoint_type);



static struct nhlt_specific_cfg *

nhlt_get_specific_cfg(struct device *dev, struct nhlt_fmt *fmt, u8 num_ch,

		      u32 rate, u8 vbps, u8 bps)

{

	struct nhlt_fmt_cfg *cfg = fmt->fmt_config;

	struct wav_fmt *wfmt;

	u16 _bps, _vbps;

	int i;



	dev_dbg(dev, "Endpoint format count=%d\n", fmt->fmt_count);



	for (i = 0; i < fmt->fmt_count; i++) {

		wfmt = &cfg->fmt_ext.fmt;

		_bps = wfmt->bits_per_sample;

		_vbps = cfg->fmt_ext.sample.valid_bits_per_sample;



		dev_dbg(dev, "Endpoint format: ch=%d fmt=%d/%d rate=%d\n",

			wfmt->channels, _vbps, _bps, wfmt->samples_per_sec);



		if (wfmt->channels == num_ch && wfmt->samples_per_sec == rate &&

		    vbps == _vbps && bps == _bps)

			return &cfg->config;



		cfg = (struct nhlt_fmt_cfg *)(cfg->config.caps + cfg->config.size);

	}



	return NULL;

}



static bool nhlt_check_ep_match(struct device *dev, struct nhlt_endpoint *epnt,

				u32 bus_id, u8 link_type, u8 dir, u8 dev_type)

{

	dev_dbg(dev, "Endpoint: vbus_id=%d link_type=%d dir=%d dev_type = %d\n",

		epnt->virtual_bus_id, epnt->linktype,

		epnt->direction, epnt->device_type);



	if ((epnt->virtual_bus_id != bus_id) ||

	    (epnt->linktype != link_type) ||

	    (epnt->direction != dir))

		return false;



	/* link of type DMIC bypasses device_type check */

	return epnt->linktype == NHLT_LINK_DMIC ||

	       epnt->device_type == dev_type;

}



struct nhlt_specific_cfg *

intel_nhlt_get_endpoint_blob(struct device *dev, struct nhlt_acpi_table *nhlt,

			     u32 bus_id, u8 link_type, u8 vbps, u8 bps,

			     u8 num_ch, u32 rate, u8 dir, u8 dev_type)

{

	struct nhlt_specific_cfg *cfg;

	struct nhlt_endpoint *epnt;

	struct nhlt_fmt *fmt;

	int i;



	if (!nhlt)

		return NULL;



	dev_dbg(dev, "Looking for configuration:\n");

	dev_dbg(dev, "  vbus_id=%d link_type=%d dir=%d, dev_type=%d\n",

		bus_id, link_type, dir, dev_type);

	dev_dbg(dev, "  ch=%d fmt=%d/%d rate=%d\n", num_ch, vbps, bps, rate);

	dev_dbg(dev, "Endpoint count=%d\n", nhlt->endpoint_count);



	epnt = (struct nhlt_endpoint *)nhlt->desc;



	for (i = 0; i < nhlt->endpoint_count; i++) {

		if (nhlt_check_ep_match(dev, epnt, bus_id, link_type, dir, dev_type)) {

			fmt = (struct nhlt_fmt *)(epnt->config.caps + epnt->config.size);



			cfg = nhlt_get_specific_cfg(dev, fmt, num_ch, rate, vbps, bps);

			if (cfg)

				return cfg;

		}



		epnt = (struct nhlt_endpoint *)((u8 *)epnt + epnt->length);

	}



	return NULL;

}

EXPORT_SYMBOL(intel_nhlt_get_endpoint_blob);