Unverified Commit 2a4667f3 authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

ASoC: SDCA: Add type flag for Controls 



SDCA Controls come in a variety of data formats, to simplify later
parsing work out this data type as the control is parsed and stash it
for later use.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://patch.msgid.link/20250312172205.4152686-5-ckeepax@opensource.cirrus.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 49680c9f

include/sound/sdca_function.h

+23 −0
Original line number Diff line number Diff line
@@ -600,6 +600,27 @@ enum sdca_entity0_controls { 
#define SDCA_CTL_DEVICE_VERSION_NAME			"Device Version"

#define SDCA_CTL_DEVICE_SDCA_VERSION_NAME		"Device SDCA Version"



/**

 * enum sdca_control_datatype - SDCA Control Data Types

 *

 * Data Types as described in the SDCA specification v1.0 section

 * 7.3.

 */

enum sdca_control_datatype {

	SDCA_CTL_DATATYPE_ONEBIT,

	SDCA_CTL_DATATYPE_INTEGER,

	SDCA_CTL_DATATYPE_SPEC_ENCODED_VALUE,

	SDCA_CTL_DATATYPE_BCD,

	SDCA_CTL_DATATYPE_Q7P8DB,

	SDCA_CTL_DATATYPE_BYTEINDEX,

	SDCA_CTL_DATATYPE_POSTURENUMBER,

	SDCA_CTL_DATATYPE_DP_INDEX,

	SDCA_CTL_DATATYPE_BITINDEX,

	SDCA_CTL_DATATYPE_BITMAP,

	SDCA_CTL_DATATYPE_GUID,

	SDCA_CTL_DATATYPE_IMPDEF,

};



/**

 * enum sdca_access_mode - SDCA Control access mode

 *
@@ -653,6 +674,7 @@ struct sdca_control_range { 
 * @cn_list: A bitmask showing the valid Control Numbers within this Control,

 * Control Numbers typically represent channels.

 * @range: Buffer describing valid range of values for the Control.

 * @type: Format of the data in the Control.

 * @mode: Access mode of the Control.

 * @layers: Bitmask of access layers of the Control.

 * @deferrable: Indicates if the access to the Control can be deferred.
@@ -669,6 +691,7 @@ struct sdca_control { 
	u64 cn_list;



	struct sdca_control_range range;

	enum sdca_control_datatype type;

	enum sdca_access_mode mode;

	u8 layers;

sound/soc/sdca/sdca_functions.c

+173 −0
Original line number Diff line number Diff line
@@ -603,6 +603,178 @@ static unsigned int find_sdca_control_bits(const struct sdca_entity *entity, 
	}

}



static enum sdca_control_datatype

find_sdca_control_datatype(const struct sdca_entity *entity,

			   const struct sdca_control *control)

{

	switch (SDCA_CTL_TYPE(entity->type, control->sel)) {

	case SDCA_CTL_TYPE_S(XU, BYPASS):

	case SDCA_CTL_TYPE_S(MFPU, BYPASS):

	case SDCA_CTL_TYPE_S(FU, MUTE):

	case SDCA_CTL_TYPE_S(FU, AGC):

	case SDCA_CTL_TYPE_S(FU, BASS_BOOST):

	case SDCA_CTL_TYPE_S(FU, LOUDNESS):

		return SDCA_CTL_DATATYPE_ONEBIT;

	case SDCA_CTL_TYPE_S(IT, LATENCY):

	case SDCA_CTL_TYPE_S(OT, LATENCY):

	case SDCA_CTL_TYPE_S(MU, LATENCY):

	case SDCA_CTL_TYPE_S(SU, LATENCY):

	case SDCA_CTL_TYPE_S(FU, LATENCY):

	case SDCA_CTL_TYPE_S(XU, LATENCY):

	case SDCA_CTL_TYPE_S(CRU, LATENCY):

	case SDCA_CTL_TYPE_S(UDMPU, LATENCY):

	case SDCA_CTL_TYPE_S(MFPU, LATENCY):

	case SDCA_CTL_TYPE_S(SMPU, LATENCY):

	case SDCA_CTL_TYPE_S(SAPU, LATENCY):

	case SDCA_CTL_TYPE_S(PPU, LATENCY):

	case SDCA_CTL_TYPE_S(SU, SELECTOR):

	case SDCA_CTL_TYPE_S(UDMPU, OPAQUESET_0):

	case SDCA_CTL_TYPE_S(UDMPU, OPAQUESET_1):

	case SDCA_CTL_TYPE_S(UDMPU, OPAQUESET_2):

	case SDCA_CTL_TYPE_S(UDMPU, OPAQUESET_3):

	case SDCA_CTL_TYPE_S(UDMPU, OPAQUESET_4):

	case SDCA_CTL_TYPE_S(UDMPU, OPAQUESET_5):

	case SDCA_CTL_TYPE_S(UDMPU, OPAQUESET_6):

	case SDCA_CTL_TYPE_S(UDMPU, OPAQUESET_7):

	case SDCA_CTL_TYPE_S(UDMPU, OPAQUESET_8):

	case SDCA_CTL_TYPE_S(UDMPU, OPAQUESET_9):

	case SDCA_CTL_TYPE_S(UDMPU, OPAQUESET_10):

	case SDCA_CTL_TYPE_S(UDMPU, OPAQUESET_11):

	case SDCA_CTL_TYPE_S(UDMPU, OPAQUESET_12):

	case SDCA_CTL_TYPE_S(UDMPU, OPAQUESET_13):

	case SDCA_CTL_TYPE_S(UDMPU, OPAQUESET_14):

	case SDCA_CTL_TYPE_S(UDMPU, OPAQUESET_15):

	case SDCA_CTL_TYPE_S(UDMPU, OPAQUESET_16):

	case SDCA_CTL_TYPE_S(UDMPU, OPAQUESET_17):

	case SDCA_CTL_TYPE_S(UDMPU, OPAQUESET_18):

	case SDCA_CTL_TYPE_S(UDMPU, OPAQUESET_19):

	case SDCA_CTL_TYPE_S(UDMPU, OPAQUESET_20):

	case SDCA_CTL_TYPE_S(UDMPU, OPAQUESET_21):

	case SDCA_CTL_TYPE_S(UDMPU, OPAQUESET_22):

	case SDCA_CTL_TYPE_S(UDMPU, OPAQUESET_23):

	case SDCA_CTL_TYPE_S(SAPU, PROTECTION_MODE):

	case SDCA_CTL_TYPE_S(SMPU, HIST_BUFFER_PREAMBLE):

	case SDCA_CTL_TYPE_S(XU, FDL_HOST_REQUEST):

	case SDCA_CTL_TYPE_S(XU, XU_ID):

	case SDCA_CTL_TYPE_S(CX, CLOCK_SELECT):

	case SDCA_CTL_TYPE_S(TG, TONE_DIVIDER):

	case SDCA_CTL_TYPE_S(ENTITY_0, FUNCTION_MANUFACTURER_ID):

	case SDCA_CTL_TYPE_S(ENTITY_0, FUNCTION_ID):

	case SDCA_CTL_TYPE_S(ENTITY_0, FUNCTION_EXTENSION_ID):

	case SDCA_CTL_TYPE_S(ENTITY_0, DEVICE_MANUFACTURER_ID):

	case SDCA_CTL_TYPE_S(ENTITY_0, DEVICE_PART_ID):

	case SDCA_CTL_TYPE_S(XU, FDL_MESSAGEOFFSET):

	case SDCA_CTL_TYPE_S(XU, FDL_MESSAGELENGTH):

	case SDCA_CTL_TYPE_S(SPE, AUTHTX_MESSAGEOFFSET):

	case SDCA_CTL_TYPE_S(SPE, AUTHTX_MESSAGELENGTH):

	case SDCA_CTL_TYPE_S(SPE, AUTHRX_MESSAGEOFFSET):

	case SDCA_CTL_TYPE_S(SPE, AUTHRX_MESSAGELENGTH):

	case SDCA_CTL_TYPE_S(MFPU, AE_MESSAGEOFFSET):

	case SDCA_CTL_TYPE_S(MFPU, AE_MESSAGELENGTH):

	case SDCA_CTL_TYPE_S(SMPU, HIST_MESSAGEOFFSET):

	case SDCA_CTL_TYPE_S(SMPU, HIST_MESSAGELENGTH):

	case SDCA_CTL_TYPE_S(SMPU, DTODTX_MESSAGEOFFSET):

	case SDCA_CTL_TYPE_S(SMPU, DTODTX_MESSAGELENGTH):

	case SDCA_CTL_TYPE_S(SMPU, DTODRX_MESSAGEOFFSET):

	case SDCA_CTL_TYPE_S(SMPU, DTODRX_MESSAGELENGTH):

	case SDCA_CTL_TYPE_S(SAPU, DTODTX_MESSAGEOFFSET):

	case SDCA_CTL_TYPE_S(SAPU, DTODTX_MESSAGELENGTH):

	case SDCA_CTL_TYPE_S(SAPU, DTODRX_MESSAGEOFFSET):

	case SDCA_CTL_TYPE_S(SAPU, DTODRX_MESSAGELENGTH):

	case SDCA_CTL_TYPE_S(HIDE, HIDTX_MESSAGEOFFSET):

	case SDCA_CTL_TYPE_S(HIDE, HIDTX_MESSAGELENGTH):

	case SDCA_CTL_TYPE_S(HIDE, HIDRX_MESSAGEOFFSET):

	case SDCA_CTL_TYPE_S(HIDE, HIDRX_MESSAGELENGTH):

		return SDCA_CTL_DATATYPE_INTEGER;

	case SDCA_CTL_TYPE_S(IT, MIC_BIAS):

	case SDCA_CTL_TYPE_S(SMPU, HIST_BUFFER_MODE):

	case SDCA_CTL_TYPE_S(PDE, REQUESTED_PS):

	case SDCA_CTL_TYPE_S(PDE, ACTUAL_PS):

	case SDCA_CTL_TYPE_S(ENTITY_0, FUNCTION_TYPE):

		return SDCA_CTL_DATATYPE_SPEC_ENCODED_VALUE;

	case SDCA_CTL_TYPE_S(XU, XU_VERSION):

	case SDCA_CTL_TYPE_S(ENTITY_0, FUNCTION_SDCA_VERSION):

	case SDCA_CTL_TYPE_S(ENTITY_0, FUNCTION_VERSION):

	case SDCA_CTL_TYPE_S(ENTITY_0, FUNCTION_EXTENSION_VERSION):

	case SDCA_CTL_TYPE_S(ENTITY_0, DEVICE_VERSION):

	case SDCA_CTL_TYPE_S(ENTITY_0, DEVICE_SDCA_VERSION):

		return SDCA_CTL_DATATYPE_BCD;

	case SDCA_CTL_TYPE_S(FU, CHANNEL_VOLUME):

	case SDCA_CTL_TYPE_S(FU, GAIN):

	case SDCA_CTL_TYPE_S(MU, MIXER):

	case SDCA_CTL_TYPE_S(PPU, HORIZONTALBALANCE):

	case SDCA_CTL_TYPE_S(PPU, VERTICALBALANCE):

	case SDCA_CTL_TYPE_S(MFPU, ULTRASOUND_LEVEL):

	case SDCA_CTL_TYPE_S(UDMPU, ACOUSTIC_ENERGY_LEVEL_MONITOR):

	case SDCA_CTL_TYPE_S(UDMPU, ULTRASOUND_LOOP_GAIN):

		return SDCA_CTL_DATATYPE_Q7P8DB;

	case SDCA_CTL_TYPE_S(IT, USAGE):

	case SDCA_CTL_TYPE_S(OT, USAGE):

	case SDCA_CTL_TYPE_S(IT, CLUSTERINDEX):

	case SDCA_CTL_TYPE_S(CRU, CLUSTERINDEX):

	case SDCA_CTL_TYPE_S(UDMPU, CLUSTERINDEX):

	case SDCA_CTL_TYPE_S(MFPU, CLUSTERINDEX):

	case SDCA_CTL_TYPE_S(MFPU, CENTER_FREQUENCY_INDEX):

	case SDCA_CTL_TYPE_S(MFPU, AE_NUMBER):

	case SDCA_CTL_TYPE_S(SAPU, OPAQUESETREQ_INDEX):

	case SDCA_CTL_TYPE_S(XU, FDL_SET_INDEX):

	case SDCA_CTL_TYPE_S(CS, SAMPLERATEINDEX):

	case SDCA_CTL_TYPE_S(GE, SELECTED_MODE):

	case SDCA_CTL_TYPE_S(GE, DETECTED_MODE):

		return SDCA_CTL_DATATYPE_BYTEINDEX;

	case SDCA_CTL_TYPE_S(PPU, POSTURENUMBER):

		return SDCA_CTL_DATATYPE_POSTURENUMBER;

	case SDCA_CTL_TYPE_S(IT, DATAPORT_SELECTOR):

	case SDCA_CTL_TYPE_S(OT, DATAPORT_SELECTOR):

		return SDCA_CTL_DATATYPE_DP_INDEX;

	case SDCA_CTL_TYPE_S(MFPU, ALGORITHM_READY):

	case SDCA_CTL_TYPE_S(MFPU, ALGORITHM_ENABLE):

	case SDCA_CTL_TYPE_S(MFPU, ALGORITHM_PREPARE):

	case SDCA_CTL_TYPE_S(SAPU, PROTECTION_STATUS):

	case SDCA_CTL_TYPE_S(SMPU, TRIGGER_ENABLE):

	case SDCA_CTL_TYPE_S(SMPU, TRIGGER_STATUS):

	case SDCA_CTL_TYPE_S(SMPU, TRIGGER_READY):

	case SDCA_CTL_TYPE_S(SPE, PRIVACY_POLICY):

	case SDCA_CTL_TYPE_S(SPE, PRIVACY_OWNER):

		return SDCA_CTL_DATATYPE_BITINDEX;

	case SDCA_CTL_TYPE_S(IT, KEEP_ALIVE):

	case SDCA_CTL_TYPE_S(OT, KEEP_ALIVE):

	case SDCA_CTL_TYPE_S(IT, NDAI_STREAM):

	case SDCA_CTL_TYPE_S(OT, NDAI_STREAM):

	case SDCA_CTL_TYPE_S(IT, NDAI_CATEGORY):

	case SDCA_CTL_TYPE_S(OT, NDAI_CATEGORY):

	case SDCA_CTL_TYPE_S(IT, NDAI_CODINGTYPE):

	case SDCA_CTL_TYPE_S(OT, NDAI_CODINGTYPE):

	case SDCA_CTL_TYPE_S(IT, NDAI_PACKETTYPE):

	case SDCA_CTL_TYPE_S(OT, NDAI_PACKETTYPE):

	case SDCA_CTL_TYPE_S(SMPU, HIST_ERROR):

	case SDCA_CTL_TYPE_S(XU, FDL_STATUS):

	case SDCA_CTL_TYPE_S(CS, CLOCK_VALID):

	case SDCA_CTL_TYPE_S(SPE, PRIVACY_LOCKSTATE):

	case SDCA_CTL_TYPE_S(ENTITY_0, COMMIT_GROUP_MASK):

	case SDCA_CTL_TYPE_S(ENTITY_0, FUNCTION_STATUS):

	case SDCA_CTL_TYPE_S(ENTITY_0, FUNCTION_ACTION):

	case SDCA_CTL_TYPE_S(XU, FDL_CURRENTOWNER):

	case SDCA_CTL_TYPE_S(SPE, AUTHTX_CURRENTOWNER):

	case SDCA_CTL_TYPE_S(SPE, AUTHRX_CURRENTOWNER):

	case SDCA_CTL_TYPE_S(MFPU, AE_CURRENTOWNER):

	case SDCA_CTL_TYPE_S(SMPU, HIST_CURRENTOWNER):

	case SDCA_CTL_TYPE_S(SMPU, DTODTX_CURRENTOWNER):

	case SDCA_CTL_TYPE_S(SMPU, DTODRX_CURRENTOWNER):

	case SDCA_CTL_TYPE_S(SAPU, DTODTX_CURRENTOWNER):

	case SDCA_CTL_TYPE_S(SAPU, DTODRX_CURRENTOWNER):

	case SDCA_CTL_TYPE_S(HIDE, HIDTX_CURRENTOWNER):

	case SDCA_CTL_TYPE_S(HIDE, HIDRX_CURRENTOWNER):

		return SDCA_CTL_DATATYPE_BITMAP;

	case SDCA_CTL_TYPE_S(IT, MATCHING_GUID):

	case SDCA_CTL_TYPE_S(OT, MATCHING_GUID):

	case SDCA_CTL_TYPE_S(ENTITY_0, MATCHING_GUID):

		return SDCA_CTL_DATATYPE_GUID;

	default:

		return SDCA_CTL_DATATYPE_IMPDEF;

	}

}



static int find_sdca_control_range(struct device *dev,

				   struct fwnode_handle *control_node,

				   struct sdca_control_range *range)
@@ -744,6 +916,7 @@ static int find_sdca_entity_control(struct device *dev, struct sdca_entity *enti 
	if (!control->label)

		return -ENOMEM;



	control->type = find_sdca_control_datatype(entity, control);

	control->nbits = find_sdca_control_bits(entity, control);



	dev_info(dev, "%s: %s: control %#x mode %#x layers %#x cn %#llx int %d value %#x %s\n",