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

ASoC: SDCA: Add lock to serialise the Function initialisation 



To avoid issues on some devices serialise the boot of each SDCA Function
from the others.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.dev>
Link: https://patch.msgid.link/20260109145206.3456151-5-ckeepax@opensource.cirrus.com


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

sound/soc/sdca/sdca_class.c

+1 −0
Original line number Diff line number Diff line
@@ -205,6 +205,7 @@ static int class_sdw_probe(struct sdw_slave *sdw, const struct sdw_device_id *id 
	drv->dev = dev;

	drv->sdw = sdw;

	mutex_init(&drv->regmap_lock);

	mutex_init(&drv->init_lock);



	dev_set_drvdata(drv->dev, drv);

sound/soc/sdca/sdca_class.h

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ struct sdca_class_drv { 
	struct sdca_interrupt_info *irq_info;



	struct mutex regmap_lock;

	/* Serialise function initialisations */

	struct mutex init_lock;

	struct work_struct boot_work;

	struct completion device_attach;

sound/soc/sdca/sdca_class_function.c

+5 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 */



#include <linux/auxiliary_bus.h>

#include <linux/cleanup.h>

#include <linux/minmax.h>

#include <linux/module.h>

#include <linux/pm.h>
@@ -244,6 +245,8 @@ static int class_function_boot(struct class_function_drv *drv) 
	unsigned int val;

	int ret;



	guard(mutex)(&drv->core->init_lock);



	ret = regmap_read(drv->regmap, reg, &val);

	if (ret < 0) {

		dev_err(drv->dev, "failed to read function status: %d\n", ret);
@@ -418,6 +421,8 @@ static int class_function_runtime_resume(struct device *dev) 
	struct class_function_drv *drv = auxiliary_get_drvdata(auxdev);

	int ret;



	guard(mutex)(&drv->core->init_lock);



	regcache_mark_dirty(drv->regmap);

	regcache_cache_only(drv->regmap, false);