Re: [PATCH] ASoC: SDCA: Use Function Extension info for FDL

From: Charles Keepax

Date: Wed Nov 18 2026 - 05:55:00 EST


On Tue, Nov 17, 2026 at 02:48:53PM +0000, Maciej Strozek wrote:
> Add additional way of selecting files for FDL using Function Extension
> ID and Function Extension Version, following Windows' SDCA driver usage
> of those controls for FDL.
> Make sure the introduced FEID/FEV search path is separate from the
> 'legacy' SSID-only search path in case some vendors choose to re-use
> SSIDs for different SKUs and identify them by Function Extension
> controls instead.
>
> Change-Id: I6ac1a5e5c85b67c2e9e0eaff930bfefd5e89afaf
> Signed-off-by: Maciej Strozek <mstrozek@xxxxxxxxxxxxxxxxxxxxx>
> ---
> @@ -231,25 +263,21 @@ static int fdl_load_file(struct sdca_interrupt *interrupt,
> }
> }
>
> - disk_filename = fdl_get_sku_filename(dev, fdl_file);
> - if (!disk_filename)
> - return -ENOMEM;
> + ret = fdl_get_sku_filename(interrupt, fdl_file,
> + &disk_filename, &fallback_filename);
> + if (ret)
> + return ret;
>
> dev_dbg(dev, "FDL disk filename: %s\n", disk_filename);

We should probably drop these FDL disk filename prints since the
filename is now printed through source anyway.

> const struct firmware *firmware __free(firmware) = NULL;
> + disk_source = disk_filename;
> ret = firmware_request_nowarn(&firmware, disk_filename, dev);
> - kfree(disk_filename);
> if (ret) {
> - disk_filename = kasprintf(GFP_KERNEL, "sdca/%x/%x.bin",
> - fdl_file->vendor_id, fdl_file->file_id);
> - if (!disk_filename)
> - return -ENOMEM;
> + dev_dbg(dev, "FDL disk filename: %s\n", fallback_filename);
>
> - dev_dbg(dev, "FDL disk filename: %s\n", disk_filename);
> -
> - ret = firmware_request_nowarn(&firmware, disk_filename, dev);
> - kfree(disk_filename);
> + disk_source = fallback_filename;
> + ret = firmware_request_nowarn(&firmware, fallback_filename, dev);
> }
>
> if (!ret) {
> @@ -259,18 +287,19 @@ static int fdl_load_file(struct sdca_interrupt *interrupt,
> tmp->file_length != firmware->size) {
> dev_err(dev, "bad disk SWF size\n");
> } else if (!swf || swf->file_version <= tmp->file_version) {
> - dev_dbg(dev, "using SWF from disk\n");
> swf = tmp;
> + source = disk_source;
> }
> }
>
> if (!swf) {
> dev_err(dev, "failed to locate SWF\n");
> - return -ENOENT;
> + ret = -ENOENT;
> + goto out_free;

We shouldn't mix goto clean up with the __free clean up. Probably
better to use an else here for the UMP write.

Thanks,
Charles
> }
>
> - dev_info(dev, "loading SWF: %x-%x-%x\n",
> - swf->vendor_id, swf->file_id, swf->file_version);
> + dev_info(dev, "loading SWF: %x-%x-%x from %s\n",
> + swf->vendor_id, swf->file_id, swf->file_version, source);