Re: [PATCH] ASoC: SDCA: Add quirk for incorrect function types for 3 systems

[Pierre-Louis Bossart <pierre-louis.bossart@linux.dev>]

On 9/1/25 09:57, Maciej Strozek wrote:
> Certain systems have CS42L43 DisCo that claims to conform to version 0.6.28
> but uses the function types from the 1.0 spec. Add a quirk as a workaround.
> 
> Signed-off-by: Maciej Strozek <mstrozek@opensource.cirrus.com>

yay firmware quirks... Probably the start of a *long* list, eh?

Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.dev>

> ---
>  include/sound/sdca.h            |  1 +
>  sound/soc/sdca/sdca_device.c    | 20 ++++++++++++++++++++
>  sound/soc/sdca/sdca_functions.c | 13 ++++++++-----
>  3 files changed, 29 insertions(+), 5 deletions(-)
> 
> diff --git a/include/sound/sdca.h b/include/sound/sdca.h
> index 5a5d6de78d728..9c6a351c9d474 100644
> --- a/include/sound/sdca.h
> +++ b/include/sound/sdca.h
> @@ -46,6 +46,7 @@ struct sdca_device_data {
> 
>  enum sdca_quirk {
>  	SDCA_QUIRKS_RT712_VB,
> +	SDCA_QUIRKS_SKIP_FUNC_TYPE_PATCHING,
>  };
> 
>  #if IS_ENABLED(CONFIG_ACPI) && IS_ENABLED(CONFIG_SND_SOC_SDCA)
> diff --git a/sound/soc/sdca/sdca_device.c b/sound/soc/sdca/sdca_device.c
> index 0244cdcdd109a..4798ce2c8f0b4 100644
> --- a/sound/soc/sdca/sdca_device.c
> +++ b/sound/soc/sdca/sdca_device.c
> @@ -7,6 +7,7 @@
>   */
> 
>  #include <linux/acpi.h>
> +#include <linux/dmi.h>
>  #include <linux/module.h>
>  #include <linux/property.h>
>  #include <linux/soundwire/sdw.h>
> @@ -55,11 +56,30 @@ static bool sdca_device_quirk_rt712_vb(struct sdw_slave *slave)
>  	return false;
>  }
> 
> +static bool sdca_device_quirk_skip_func_type_patching(struct sdw_slave *slave)
> +{
> +	const char *vendor, *sku;
> +
> +	vendor = dmi_get_system_info(DMI_SYS_VENDOR);
> +	sku = dmi_get_system_info(DMI_PRODUCT_SKU);
> +
> +	if (vendor && sku &&
> +	    !strcmp(vendor, "Dell Inc.") &&
> +	    (!strcmp(sku, "0C62") || !strcmp(sku, "0C63") || !strcmp(sku, "0C6B")) &&
> +	    slave->sdca_data.interface_revision == 0x061c &&
> +	    slave->id.mfg_id == 0x01fa && slave->id.part_id == 0x4243)
> +		return true;
> +
> +	return false;
> +}
> +
>  bool sdca_device_quirk_match(struct sdw_slave *slave, enum sdca_quirk quirk)
>  {
>  	switch (quirk) {
>  	case SDCA_QUIRKS_RT712_VB:
>  		return sdca_device_quirk_rt712_vb(slave);
> +	case SDCA_QUIRKS_SKIP_FUNC_TYPE_PATCHING:
> +		return sdca_device_quirk_skip_func_type_patching(slave);
>  	default:
>  		break;
>  	}
> diff --git a/sound/soc/sdca/sdca_functions.c b/sound/soc/sdca/sdca_functions.c
> index f26f597dca9e9..13f68f7b6dd6a 100644
> --- a/sound/soc/sdca/sdca_functions.c
> +++ b/sound/soc/sdca/sdca_functions.c
> @@ -90,6 +90,7 @@ static int find_sdca_function(struct acpi_device *adev, void *data)
>  {
>  	struct fwnode_handle *function_node = acpi_fwnode_handle(adev);
>  	struct sdca_device_data *sdca_data = data;
> +	struct sdw_slave *slave = container_of(sdca_data, struct sdw_slave, sdca_data);
>  	struct device *dev = &adev->dev;
>  	struct fwnode_handle *control5; /* used to identify function type */
>  	const char *function_name;
> @@ -137,11 +138,13 @@ static int find_sdca_function(struct acpi_device *adev, void *data)
>  		return ret;
>  	}
> 
> -	ret = patch_sdca_function_type(sdca_data->interface_revision, &function_type);
> -	if (ret < 0) {
> -		dev_err(dev, "SDCA version %#x invalid function type %d\n",
> -			sdca_data->interface_revision, function_type);
> -		return ret;
> +	if (!sdca_device_quirk_match(slave, SDCA_QUIRKS_SKIP_FUNC_TYPE_PATCHING)) {
> +		ret = patch_sdca_function_type(sdca_data->interface_revision, &function_type);
> +		if (ret < 0) {
> +			dev_err(dev, "SDCA version %#x invalid function type %d\n",
> +				sdca_data->interface_revision, function_type);
> +			return ret;
> +		}
>  	}
> 
>  	function_name = get_sdca_function_name(function_type);
> --
> 2.47.2
>