Add SDCA UMP/FDL support
Subsystems (6)
Charles Keepax
maintainerv2 cover Add SDCA UMP/FDL support
Next installment of the SDCA changes, hopefully the next series after this should be the full class driver. It is worth noting this series has a build dependency on a patch working its way through the PM/ACPI tree:
commit ac46f5b6c661 ("ACPICA: Add SoundWire File Table (SWFT) signature")git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
But we can probably worry about that later, as normally there is a reasonable amount of review on these SDCA series'.
This series broadly breaks down into 3 chunks, first there are several changes to remove the assumption that the struct device used for SDCA purposes represents the SoundWire slave. This is because the SDCA class driver will be made of an auxiliary driver for each SDCA Function, thus the SoundWire slave will be on the parent device for each individual driver. Then there are patches to add support for UMP/FDL. And then finally since the rest of the HID support is there and UMP was the last missing part required a small patch to add a function to allow reporting of HID events from SDCA devices.
Thanks,
Charles
Changes since v1:
- Add timeout for UMP buffer transfers
- Add function reset
- Parse XU properties from DisCo
- Rename entity_xu library to FDL
- Add a limit to the number of times it will try the FDL process
- Rename soundwire device pointers to sdev to distinguish from Function devices pointers
Charles Keepax (16):
ASoC: SDCA: Rename SoundWire struct device variables
regmap: sdw-mbq: Don't assume the regmap device is the SoundWire slave
ASoC: SDCA: Add manual PM runtime gets to IRQ handlers
ASoC: SDCA: Pass SoundWire slave to HID
ASoC: SDCA: Pass device register map from IRQ alloc to handlers
ASoC: SDCA: Update externally_requested flag to cover all requests
ASoC: SDCA: Factor out a helper to find SDCA IRQ data
ASoC: SDCA: Rely less on the ASoC component in IRQ handling
ASoC: SDCA: Force some SDCA Controls to be volatile
ASoC: SDCA: Parse XU Entity properties
ASoC: SDCA: Parse Function Reset max delay
ASoC: SDCA: Add UMP buffer helper functions
ASoC: SDCA: Add completion for FDL start and stop
ASoC: SDCA: Add UMP timeout handling for FDL
ASoC: SDCA: Add early IRQ handling
ASoC: SDCA: Add HID button IRQ
Maciej Strozek (3):
ASoC: SDCA: Add SDCA FDL data parsing
ASoC: SDCA: Add FDL library for XU entities
ASoC: SDCA: Add FDL-specific IRQ processing
Marco Crivellari (1):
ASoC: replace use of system_unbound_wq with system_dfl_wq
Signature · 1 line
2.47.3
Charles Keepax
maintainerPATCH v2 1/19 ASoC: SDCA: Rename SoundWire struct device variables
The SDCA core processes two different struct device's at various times, usually it is processing the struct device associated with an individual SDCA Function driver. However, there are times that it is processing the struct device associated with the actual SoundWire peripheral, usually the parent of the Function device.
To ensure this distinction remains clear in the code, rename the variable when handling the actual SoundWire device to sdev.
---
New since v1.
sound/soc/sdca/sdca_functions.c | 6 +++--- sound/soc/sdca/sdca_interrupts.c | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-)
sound/soc/sdca/sdca_functions.c +3 -3
@@ -179,11 +179,11 @@ static int find_sdca_function(struct acpi_device *adev, void *data)*/ void sdca_lookup_functions (struct sdw_slave *slave) { -struct device *dev = &slave->dev; -struct acpi_device *adev =to_acpi_device_node (dev->fwnode); +struct device *sdev = &slave->dev; +struct acpi_device *adev =to_acpi_device_node (sdev->fwnode);if (!adev) { -dev_info (dev,"no matching ACPI device found, ignoring peripheral\n" ); +dev_info (sdev,"no matching ACPI device found, ignoring peripheral\n" );return ; }
sound/soc/sdca/sdca_interrupts.c +7 -7
@@ -400,7 +400,7 @@ EXPORT_SYMBOL_NS_GPL(sdca_irq_populate, "SND_SOC_SDCA");/** * sdca_irq_allocate - allocate an SDCA interrupt structure for a device -* @dev: Device pointer against which things should be allocated. +* @sdev: Device pointer against which things should be allocated. * @regmap: regmap to be used for accessing the SDCA IRQ registers. * @irq: The interrupt number. *
@@ -411,30 +411,30 @@ EXPORT_SYMBOL_NS_GPL(sdca_irq_populate, "SND_SOC_SDCA");* Return: A pointer to the allocated sdca_interrupt_info struct, or an * error code. */ -struct sdca_interrupt_info *sdca_irq_allocate (struct device *dev, +struct sdca_interrupt_info *sdca_irq_allocate (struct device *sdev,struct regmap *regmap,int irq) {struct sdca_interrupt_info *info;int ret; - info =devm_kzalloc (dev,sizeof (*info),GFP_KERNEL ); + info =devm_kzalloc (sdev,sizeof (*info),GFP_KERNEL );if (!info)return ERR_PTR (-ENOMEM ); info->irq_chip = sdca_irq_chip; - ret =devm_mutex_init (dev, &info->irq_lock); + ret =devm_mutex_init (sdev, &info->irq_lock);if (ret)return ERR_PTR (ret); - ret =devm_regmap_add_irq_chip (dev, regmap, irq,IRQF_ONESHOT ,0 , + ret =devm_regmap_add_irq_chip (sdev, regmap, irq,IRQF_ONESHOT ,0 , &info->irq_chip, &info->irq_data);if (ret) { -dev_err (dev,"failed to register irq chip: %d\n" , ret); +dev_err (sdev,"failed to register irq chip: %d\n" , ret);return ERR_PTR (ret); } -dev_dbg (dev,"registered on irq %d\n" , irq); +dev_dbg (sdev,"registered on irq %d\n" , irq);return info; }
Signature · 1 line
2.47.3
Charles Keepax
maintainerPATCH v2 2/19 regmap: sdw-mbq: Don't assume the regmap device is the SoundWire slave
In reply to Charles KeepaxCurrently, the code assumes that the device that registered the MBQ register map is the actual SoundWire slave device. This works fine for all current users, however future SDCA devices will likely be implemented with the SoundWire slave as a parent device and separate child drivers with regmaps for each audio Function. Update the regmap_init_sdw_mbq_cfg macro to allow these two to be specified separately.
---
No changes since v1.
drivers/base/regmap/regmap-sdw-mbq.c | 23 ++++++++++++----------- include/linux/regmap.h | 21 +++++++++++---------- sound/soc/codecs/rt722-sdca-sdw.c | 4 +++- 3 files changed, 26 insertions(+), 22 deletions(-)
drivers/base/regmap/regmap-sdw-mbq.c +12 -11
@@ -15,6 +15,7 @@struct regmap_mbq_context {struct device *dev; +struct sdw_slave *sdw;struct regmap_sdw_mbq_cfg cfg;
@@ -46,7 +47,7 @@ static bool regmap_sdw_mbq_deferrable(struct regmap_mbq_context *ctx, unsigned istatic int regmap_sdw_mbq_poll_busy (struct sdw_slave *slave,unsigned int reg,struct regmap_mbq_context *ctx) { -struct device *dev = &slave->dev; +struct device *dev = ctx->dev;int val, ret =0 ;dev_dbg (dev,"Deferring transaction for 0x%x\n" , reg);
@@ -96,8 +97,7 @@ static int regmap_sdw_mbq_write_impl(struct sdw_slave *slave,static int regmap_sdw_mbq_write (void *context,unsigned int reg,unsigned int val) {struct regmap_mbq_context *ctx = context; -struct device *dev = ctx->dev; -struct sdw_slave *slave =dev_to_sdw_dev (dev); +struct sdw_slave *slave = ctx->sdw;bool deferrable =regmap_sdw_mbq_deferrable (ctx, reg);int mbq_size =regmap_sdw_mbq_size (ctx, reg);int ret;
@@ -156,8 +156,7 @@ static int regmap_sdw_mbq_read_impl(struct sdw_slave *slave,static int regmap_sdw_mbq_read (void *context,unsigned int reg,unsigned int *val) {struct regmap_mbq_context *ctx = context; -struct device *dev = ctx->dev; -struct sdw_slave *slave =dev_to_sdw_dev (dev); +struct sdw_slave *slave = ctx->sdw;bool deferrable =regmap_sdw_mbq_deferrable (ctx, reg);int mbq_size =regmap_sdw_mbq_size (ctx, reg);int ret;
@@ -208,6 +207,7 @@ static int regmap_sdw_mbq_config_check(const struct regmap_config *config)static struct regmap_mbq_context *regmap_sdw_mbq_gen_context (struct device *dev, +struct sdw_slave *sdw,const struct regmap_config *config,const struct regmap_sdw_mbq_cfg *mbq_config) {
@@ -218,6 +218,7 @@ regmap_sdw_mbq_gen_context(struct device *dev,return ERR_PTR (-ENOMEM ); ctx->dev = dev; + ctx->sdw = sdw;if (mbq_config) ctx->cfg = *mbq_config;
@@ -228,7 +229,7 @@ regmap_sdw_mbq_gen_context(struct device *dev,return ctx; } -struct regmap *__regmap_init_sdw_mbq(struct sdw_slave *sdw, +struct regmap *__regmap_init_sdw_mbq(struct device *dev, struct sdw_slave *sdw, const struct regmap_config *config, const struct regmap_sdw_mbq_cfg *mbq_config, struct lock_class_key *lock_key,
@@ -241,16 +242,16 @@ struct regmap *__regmap_init_sdw_mbq(struct sdw_slave *sdw,if (ret)return ERR_PTR (ret); - ctx =regmap_sdw_mbq_gen_context (&sdw->dev, config, mbq_config); + ctx =regmap_sdw_mbq_gen_context (dev, sdw, config, mbq_config);if (IS_ERR (ctx))return ERR_CAST (ctx); -return __regmap_init (&sdw->dev, ®map_sdw_mbq, ctx, +return __regmap_init (dev, ®map_sdw_mbq, ctx, config, lock_key, lock_name); }EXPORT_SYMBOL_GPL (__regmap_init_sdw_mbq); -struct regmap *__devm_regmap_init_sdw_mbq(struct sdw_slave *sdw, +struct regmap *__devm_regmap_init_sdw_mbq(struct device *dev, struct sdw_slave *sdw, const struct regmap_config *config, const struct regmap_sdw_mbq_cfg *mbq_config, struct lock_class_key *lock_key,
@@ -263,11 +264,11 @@ struct regmap *__devm_regmap_init_sdw_mbq(struct sdw_slave *sdw,if (ret)return ERR_PTR (ret); - ctx =regmap_sdw_mbq_gen_context (&sdw->dev, config, mbq_config); + ctx =regmap_sdw_mbq_gen_context (dev, sdw, config, mbq_config);if (IS_ERR (ctx))return ERR_CAST (ctx); -return __devm_regmap_init (&sdw->dev, ®map_sdw_mbq, ctx, +return __devm_regmap_init (dev, ®map_sdw_mbq, ctx, config, lock_key, lock_name); }EXPORT_SYMBOL_GPL (__devm_regmap_init_sdw_mbq);
include/linux/regmap.h +11 -10
@@ -676,7 +676,7 @@ struct regmap *__regmap_init_sdw(struct sdw_slave *sdw,const struct regmap_config *config, struct lock_class_key *lock_key, const char *lock_name); -struct regmap *__regmap_init_sdw_mbq(struct sdw_slave *sdw, +struct regmap *__regmap_init_sdw_mbq(struct device *dev, struct sdw_slave *sdw, const struct regmap_config *config, const struct regmap_sdw_mbq_cfg *mbq_config, struct lock_class_key *lock_key,
@@ -738,7 +738,7 @@ struct regmap *__devm_regmap_init_sdw(struct sdw_slave *sdw,const struct regmap_config *config, struct lock_class_key *lock_key, const char *lock_name); -struct regmap *__devm_regmap_init_sdw_mbq(struct sdw_slave *sdw, +struct regmap *__devm_regmap_init_sdw_mbq(struct device *dev, struct sdw_slave *sdw, const struct regmap_config *config, const struct regmap_sdw_mbq_cfg *mbq_config, struct lock_class_key *lock_key,
@@ -970,7 +970,7 @@ bool regmap_ac97_default_volatile(struct device *dev, unsigned int reg);*/ #define regmap_init_sdw_mbq (sdw, config) \ __regmap_lockdep_wrapper(__regmap_init_sdw_mbq, #config, \ - sdw, config, NULL) + &sdw->dev, sdw, config, NULL)/** * regmap_init_sdw_mbq_cfg() - Initialise MBQ SDW register map with config
@@ -983,9 +983,9 @@ bool regmap_ac97_default_volatile(struct device *dev, unsigned int reg);* to a struct regmap. The regmap will be automatically freed by the * device management code. */ -#define regmap_init_sdw_mbq_cfg (sdw, config, mbq_config) \ +#define regmap_init_sdw_mbq_cfg (dev, sdw, config, mbq_config) \ __regmap_lockdep_wrapper(__regmap_init_sdw_mbq, #config, \ - sdw, config, mbq_config) + dev, sdw, config, mbq_config)/** * regmap_init_spi_avmm() - Initialize register map for Intel SPI Slave
@@ -1198,12 +1198,13 @@ bool regmap_ac97_default_volatile(struct device *dev, unsigned int reg);*/ #define devm_regmap_init_sdw_mbq (sdw, config) \ __regmap_lockdep_wrapper(__devm_regmap_init_sdw_mbq, #config, \ - sdw, config, NULL) + &sdw->dev, sdw, config, NULL)/** * devm_regmap_init_sdw_mbq_cfg() - Initialise managed MBQ SDW register map with config * -* @sdw: Device that will be interacted with +* @dev: Device that will be interacted with +* @sdw: SoundWire Device that will be interacted with * @config: Configuration for register map * @mbq_config: Properties for the MBQ registers *
@@ -1211,9 +1212,9 @@ bool regmap_ac97_default_volatile(struct device *dev, unsigned int reg);* to a struct regmap. The regmap will be automatically freed by the * device management code. */ -#define devm_regmap_init_sdw_mbq_cfg (sdw, config, mbq_config) \ - __regmap_lockdep_wrapper(__devm_regmap_init_sdw_mbq, \ - #config, sdw, config, mbq_config) +#define devm_regmap_init_sdw_mbq_cfg (dev, sdw, config, mbq_config) \ + __regmap_lockdep_wrapper(__devm_regmap_init_sdw_mbq, \ + #config, dev, sdw, config, mbq_config)/** * devm_regmap_init_slimbus() - Initialise managed register map
sound/soc/codecs/rt722-sdca-sdw.c +3 -1
@@ -419,7 +419,9 @@ static int rt722_sdca_sdw_probe(struct sdw_slave *slave,struct regmap *regmap;/* Regmap Initialization */ - regmap =devm_regmap_init_sdw_mbq_cfg (slave, &rt722_sdca_regmap, &rt722_mbq_config); + regmap =devm_regmap_init_sdw_mbq_cfg (&slave->dev, slave, + &rt722_sdca_regmap, + &rt722_mbq_config);if (IS_ERR (regmap))return PTR_ERR (regmap);
Signature · 1 line
2.47.3
Charles Keepax
maintainerPATCH v2 3/19 ASoC: SDCA: Add manual PM runtime gets to IRQ handlers
In reply to Charles KeepaxSDCA interrupt handling is a bit odd, the SDCA IRQ registers are defined on a device level but the handling of the IRQ is at the Function level. As such the regmap IRQ's PM runtime operations need to be on the device itself to ensure those registers are available but an additional runtime get is required for the Function child when the IRQ is actually handled. Add the required manual PM runtime gets.
---
No changes since v1.
sound/soc/sdca/sdca_interrupts.c | 42 ++++++++++++++++++++++++-------- 1 file changed, 32 insertions(+), 10 deletions(-)
sound/soc/sdca/sdca_interrupts.c +32 -10
@@ -11,7 +11,9 @@#include <linux/bits.h> #include <linux/cleanup.h> #include <linux/device.h> +#include <linux/dev_printk.h> #include <linux/interrupt.h> +#include <linux/pm_runtime.h> #include <linux/regmap.h> #include <linux/soundwire/sdw.h> #include <linux/soundwire/sdw_registers.h>
@@ -86,18 +88,25 @@ static irqreturn_t function_status_handler(int irq, void *data) {struct sdca_interrupt *interrupt = data;struct device *dev = interrupt->component->dev; +irqreturn_t irqret =IRQ_NONE ;unsigned int reg, val;unsigned long status;unsigned int mask;int ret; + ret =pm_runtime_get_sync (dev); +if (ret <0 ) { +dev_err (dev,"failed to resume for function status: %d\n" , ret); + goto error; + } + reg =SDW_SDCA_CTL (interrupt->function->desc->adr, interrupt->entity->id, interrupt->control->sel,0 ); ret =regmap_read (interrupt->component->regmap, reg, &val);if (ret <0 ) {dev_err (dev,"failed to read function status: %d\n" , ret); -return IRQ_NONE ; + goto error; }dev_dbg (dev,"function status: %#x\n" , val);
@@ -130,10 +139,13 @@ static irqreturn_t function_status_handler(int irq, void *data) ret =regmap_write (interrupt->component->regmap, reg, val);if (ret <0 ) {dev_err (dev,"failed to clear function status: %d\n" , ret); -return IRQ_NONE ; + goto error; } -return IRQ_HANDLED ; + irqret =IRQ_HANDLED ; +error: +pm_runtime_put (dev); +return irqret; }static irqreturn_t detected_mode_handler (int irq,void *data)
@@ -146,21 +158,28 @@ static irqreturn_t detected_mode_handler(int irq, void *data)struct snd_kcontrol *kctl = interrupt->priv; struct snd_ctl_elem_value *ucontrol __free(kfree) = NULL;struct soc_enum *soc_enum; +irqreturn_t irqret =IRQ_NONE ;unsigned int reg, val;int ret; + ret =pm_runtime_get_sync (dev); +if (ret <0 ) { +dev_err (dev,"failed to resume for detected mode: %d\n" , ret); + goto error; + } +if (!kctl) { const char *name __free(kfree) = kasprintf(GFP_KERNEL, "%s %s", interrupt->entity->label,SDCA_CTL_SELECTED_MODE_NAME );if (!name) -return IRQ_NONE ; + goto error; kctl =snd_soc_component_get_kcontrol (component, name);if (!kctl) {dev_dbg (dev,"control not found: %s\n" , name); -return IRQ_NONE ; + goto error; } interrupt->priv = kctl;
@@ -174,7 +193,7 @@ static irqreturn_t detected_mode_handler(int irq, void *data) ret =regmap_read (component->regmap, reg, &val);if (ret <0 ) {dev_err (dev,"failed to read detected mode: %d\n" , ret); -return IRQ_NONE ; + goto error; }switch (val) {
@@ -195,7 +214,7 @@ static irqreturn_t detected_mode_handler(int irq, void *data) ret =regmap_read (component->regmap, reg, &val);if (ret) {dev_err (dev,"failed to re-check selected mode: %d\n" , ret); -return IRQ_NONE ; + goto error; }break ;default :
@@ -206,7 +225,7 @@ static irqreturn_t detected_mode_handler(int irq, void *data) ucontrol =kzalloc (sizeof (*ucontrol),GFP_KERNEL );if (!ucontrol) -return IRQ_NONE ; + goto error; ucontrol->value.enumerated.item[0 ] =snd_soc_enum_val_to_item (soc_enum, val);
@@ -215,12 +234,15 @@ static irqreturn_t detected_mode_handler(int irq, void *data)up_write (rwsem);if (ret <0 ) {dev_err (dev,"failed to update selected mode: %d\n" , ret); -return IRQ_NONE ; + goto error; }snd_ctl_notify (card->snd_card,SNDRV_CTL_EVENT_MASK_VALUE , &kctl->id); -return IRQ_HANDLED ; + irqret =IRQ_HANDLED ; +error: +pm_runtime_put (dev); +return irqret; } static int sdca_irq_request_locked(struct device *dev,
Signature · 1 line
2.47.3
Charles Keepax
maintainerPATCH v2 4/19 ASoC: SDCA: Pass SoundWire slave to HID
In reply to Charles KeepaxThe SDCA HID code can't assume that the struct device it is passed is the SoundWire slave device. HID is represented by a Function in SDCA and will thus likely be implemented by a child driver. Update the code to explicitly pass in the SoundWire slave device.
---
No changes since v1.
include/sound/sdca_function.h | 2 +- include/sound/sdca_hid.h | 8 ++++++-- sound/soc/sdca/sdca_functions.c | 20 ++++++++++++-------- sound/soc/sdca/sdca_hid.c | 12 +++++------- 4 files changed, 24 insertions(+), 18 deletions(-)
include/sound/sdca_function.h +1 -1
@@ -1332,7 +1332,7 @@ static inline u32 sdca_range_search(struct sdca_control_range *range,return 0 ; } -int sdca_parse_function (struct device *dev, +int sdca_parse_function (struct device *dev,struct sdw_slave *sdw,struct sdca_function_desc *desc,struct sdca_function_data *function);
include/sound/sdca_hid.h +6 -2
@@ -12,10 +12,14 @@#include <linux/hid.h> #if IS_ENABLED (CONFIG_SND_SOC_SDCA_HID ) -int sdca_add_hid_device (struct device *dev,struct sdca_entity *entity); + +int sdca_add_hid_device (struct device *dev,struct sdw_slave *sdw, +struct sdca_entity *entity);#else -static inline int sdca_add_hid_device (struct device *dev,struct sdca_entity *entity) + +static inline int sdca_add_hid_device (struct device *dev,struct sdw_slave *sdw, +struct sdca_entity *entity) {return 0 ; }
sound/soc/sdca/sdca_functions.c +12 -8
@@ -1253,7 +1253,8 @@ static int find_sdca_entity_ge(struct device *dev, }static int -find_sdca_entity_hide (struct device *dev,struct fwnode_handle *function_node, +find_sdca_entity_hide (struct device *dev,struct sdw_slave *sdw, +struct fwnode_handle *function_node,struct fwnode_handle *entity_node,struct sdca_entity *entity) {struct sdca_entity_hide *hide = &entity->hide;
@@ -1328,7 +1329,7 @@ find_sdca_entity_hide(struct device *dev, struct fwnode_handle *function_node, report_desc, nval);/* add HID device */ - ret =sdca_add_hid_device (dev, entity); + ret =sdca_add_hid_device (dev, sdw, entity);if (ret) {dev_err (dev,"%pfwP: failed to add HID device: %d\n" , entity_node, ret);return ret;
@@ -1339,7 +1340,7 @@ find_sdca_entity_hide(struct device *dev, struct fwnode_handle *function_node,return 0 ; } -static int find_sdca_entity (struct device *dev, +static int find_sdca_entity (struct device *dev,struct sdw_slave *sdw,struct fwnode_handle *function_node,struct fwnode_handle *entity_node,struct sdca_entity *entity)
@@ -1381,7 +1382,8 @@ static int find_sdca_entity(struct device *dev, ret =find_sdca_entity_ge (dev, entity_node, entity);break ;case SDCA_ENTITY_TYPE_HIDE : - ret =find_sdca_entity_hide (dev, function_node, entity_node, entity); + ret =find_sdca_entity_hide (dev, sdw, function_node, + entity_node, entity);break ;default :break ;
@@ -1396,7 +1398,7 @@ static int find_sdca_entity(struct device *dev,return 0 ; } -static int find_sdca_entities (struct device *dev, +static int find_sdca_entities (struct device *dev,struct sdw_slave *sdw,struct fwnode_handle *function_node,struct sdca_function_data *function) {
@@ -1448,7 +1450,8 @@ static int find_sdca_entities(struct device *dev,return -EINVAL ; } - ret =find_sdca_entity (dev, function_node, entity_node, &entities[i]); + ret =find_sdca_entity (dev, sdw, function_node, + entity_node, &entities[i]);fwnode_handle_put (entity_node);if (ret)return ret;
@@ -1927,12 +1930,13 @@ static int find_sdca_clusters(struct device *dev,/** * sdca_parse_function - parse ACPI DisCo for a Function * @dev: Pointer to device against which function data will be allocated. +* @sdw: SoundWire slave device to be processed. * @function_desc: Pointer to the Function short descriptor. * @function: Pointer to the Function information, to be populated. * * Return: Returns 0 for success. */ -int sdca_parse_function (struct device *dev, +int sdca_parse_function (struct device *dev,struct sdw_slave *sdw,struct sdca_function_desc *function_desc,struct sdca_function_data *function) {
@@ -1953,7 +1957,7 @@ int sdca_parse_function(struct device *dev,if (ret)return ret; - ret =find_sdca_entities (dev, function_desc->node, function); + ret =find_sdca_entities (dev, sdw, function_desc->node, function);if (ret)return ret;
sound/soc/sdca/sdca_hid.c +5 -7
@@ -82,15 +82,13 @@ static const struct hid_ll_driver sdw_hid_driver = { .raw_request = sdwhid_raw_request, }; -int sdca_add_hid_device (struct device *dev,struct sdca_entity *entity) +int sdca_add_hid_device (struct device *dev,struct sdw_slave *sdw, +struct sdca_entity *entity) { -struct sdw_bus *bus; +struct sdw_bus *bus = sdw->bus;struct hid_device *hid; -struct sdw_slave *slave =dev_to_sdw_dev (dev);int ret; - bus = slave->bus; - hid =hid_allocate_device ();if (IS_ERR (hid))return PTR_ERR (hid);
@@ -103,8 +101,8 @@ int sdca_add_hid_device(struct device *dev, struct sdca_entity *entity)snprintf (hid->name,sizeof (hid->name),"HID sdw:%01x:%01x:%04x:%04x:%02x" , - bus->controller_id, bus->link_id, slave->id.mfg_id, - slave->id.part_id, slave->id.class_id); + bus->controller_id, bus->link_id, sdw->id.mfg_id, + sdw->id.part_id, sdw->id.class_id);snprintf (hid->phys,sizeof (hid->phys),"%s" , dev->bus->name);
Signature · 1 line
2.47.3
Charles Keepax
maintainerPATCH v2 5/19 ASoC: SDCA: Pass device register map from IRQ alloc to handlers
In reply to Charles KeepaxStore a copy of the device register map in the structure for the IRQ handlers. This will allow the individual IRQ handlers access to the device level register map if required.
---
No changes since v1.
include/sound/sdca_interrupts.h | 2 ++ sound/soc/sdca/sdca_interrupts.c | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-)
include/sound/sdca_interrupts.h +2 -0
@@ -23,6 +23,7 @@ struct sdca_function_data;/** * struct sdca_interrupt - contains information about a single SDCA interrupt * @name: The name of the interrupt. +* @device_regmap: Pointer to the IRQ regmap. * @component: Pointer to the ASoC component owns the interrupt. * @function: Pointer to the Function that the interrupt is associated with. * @entity: Pointer to the Entity that the interrupt is associated with.
@@ -35,6 +36,7 @@ struct sdca_function_data;struct sdca_interrupt {const char *name; +struct regmap *device_regmap;struct snd_soc_component *component;struct sdca_function_data *function;struct sdca_entity *entity;
sound/soc/sdca/sdca_interrupts.c +4 -1
@@ -437,7 +437,7 @@ struct sdca_interrupt_info *sdca_irq_allocate(struct device *sdev, struct regmap *regmap, int irq) {struct sdca_interrupt_info *info; -int ret; +int ret, i; info =devm_kzalloc (sdev,sizeof (*info),GFP_KERNEL );if (!info)
@@ -445,6 +445,9 @@ struct sdca_interrupt_info *sdca_irq_allocate(struct device *sdev, info->irq_chip = sdca_irq_chip; +for (i =0 ; i <ARRAY_SIZE (info->irqs); i++) + info->irqs[i].device_regmap = regmap; + ret =devm_mutex_init (sdev, &info->irq_lock);if (ret)return ERR_PTR (ret);
Signature · 1 line
2.47.3
Charles Keepax
maintainerPATCH v2 6/19 ASoC: SDCA: Update externally_requested flag to cover all requests
In reply to Charles KeepaxCurrently there is a flag to indicate if an IRQ has been requested by something outside the SDCA core, such that the core can skip requesting that IRQ. However, it is simpler and more useful to just note that the IRQ has been requested. This will allow the core to also request IRQs in multiple phases.
Rename the externally_requested flag to requested and set it every time an IRQ is requested.
---
No changes since v1.
include/sound/sdca_interrupts.h | 7 +++---- sound/soc/sdca/sdca_interrupts.c | 8 ++++---- 2 files changed, 7 insertions(+), 8 deletions(-)
include/sound/sdca_interrupts.h +3 -4
@@ -29,9 +29,8 @@ struct sdca_function_data;* @entity: Pointer to the Entity that the interrupt is associated with. * @control: Pointer to the Control that the interrupt is associated with. * @priv: Pointer to private data for use by the handler. -* @externally_requested: Internal flag used to check if a client driver has -* already requested the interrupt, for custom handling, allowing the core to -* skip handling this interrupt. +* @requested: Internal flag used to check if a client driver has already +* requested the interrupt. */ struct sdca_interrupt {const char *name;
@@ -44,7 +43,7 @@ struct sdca_interrupt {void *priv; -bool externally_requested; +bool requested; };/**
sound/soc/sdca/sdca_interrupts.c +4 -4
@@ -262,6 +262,8 @@ static int sdca_irq_request_locked(struct device *dev,if (ret)return ret; + info->irqs[sdca_irq].requested = true; +dev_dbg (dev,"requested irq %d for %s\n" , irq, name);return 0 ;
@@ -301,8 +303,6 @@ int sdca_irq_request(struct device *dev, struct sdca_interrupt_info *info,return ret; } - info->irqs[sdca_irq].externally_requested = true; -return 0 ; }EXPORT_SYMBOL_NS_GPL (sdca_irq_request,"SND_SOC_SDCA" );
@@ -379,9 +379,9 @@ int sdca_irq_populate(struct sdca_function_data *function, interrupt = &info->irqs[irq]; -if (interrupt->externally_requested) { +if (interrupt->requested) {dev_dbg (dev, -"skipping irq %d, externally requested\n" , +"skipping irq %d, already requested\n" , irq);continue ; }
Signature · 1 line
2.47.3
Charles Keepax
maintainerPATCH v2 7/19 ASoC: SDCA: Factor out a helper to find SDCA IRQ data
In reply to Charles KeepaxAdd a helper function to locate the sdca_interrupt structure for a given SDCA IRQ, this makes the code a little more readable and will facilitate some additions in the future.
---
No changes since v1.
sound/soc/sdca/sdca_interrupts.c | 36 +++++++++++++++++++------------- 1 file changed, 22 insertions(+), 14 deletions(-)
sound/soc/sdca/sdca_interrupts.c +22 -14
@@ -341,6 +341,24 @@ int sdca_irq_data_populate(struct snd_soc_component *component, }EXPORT_SYMBOL_NS_GPL (sdca_irq_data_populate,"SND_SOC_SDCA" ); +static struct sdca_interrupt *get_interrupt_data (struct device *dev,int irq, +struct sdca_interrupt_info *info) +{ +if (irq ==SDCA_NO_INTERRUPT ) { +return NULL ; + }else if (irq <0 || irq >=SDCA_MAX_INTERRUPTS ) { +dev_err (dev,"bad irq position: %d\n" , irq); +return ERR_PTR (-EINVAL ); + } + +if (info->irqs[irq].requested) { +dev_dbg (dev,"skipping irq %d, already requested\n" , irq); +return NULL ; + } + +return &info->irqs[irq]; +} +/** * sdca_irq_populate - Request all the individual IRQs for an SDCA Function * @function: Pointer to the SDCA Function.
@@ -370,21 +388,11 @@ int sdca_irq_populate(struct sdca_function_data *function,irq_handler_t handler;int ret; -if (irq ==SDCA_NO_INTERRUPT ) { -continue ; - }else if (irq <0 || irq >=SDCA_MAX_INTERRUPTS ) { -dev_err (dev,"bad irq position: %d\n" , irq); -return -EINVAL ; - } - - interrupt = &info->irqs[irq]; - -if (interrupt->requested) { -dev_dbg (dev, -"skipping irq %d, already requested\n" , - irq); + interrupt =get_interrupt_data (dev, irq, info); +if (IS_ERR (interrupt)) +return PTR_ERR (interrupt); +else if (!interrupt)continue ; - } ret =sdca_irq_data_populate (component, function, entity, control, interrupt);
Signature · 1 line
2.47.3
Pierre-Louis Bossart
reviewerRe: [PATCH v2 07/19] ASoC: SDCA: Factor out a helper to find SDCA IRQ data
sound/soc/sdca/sdca_interrupts.c int sdca_irq_data_populate(struct snd_soc_component *component, · line 352
Quoted 10 lines
sound/soc/sdca/sdca_interrupts.c +9
-0+static struct sdca_interrupt *get_interrupt_data (struct device *dev,int irq, +struct sdca_interrupt_info *info) +{ +if (irq ==SDCA_NO_INTERRUPT ) { +return NULL ; + }else if (irq <0 || irq >=SDCA_MAX_INTERRUPTS ) { +dev_err (dev,"bad irq position: %d\n" , irq); +return ERR_PTR (-EINVAL ); + }
Checking for the range isn't bad but could this be improved with the 'mipi-sdca-control-interrupt-position' DisCo properties? When parsing the DisCo data, we can probably come-up with a mask of valid interrupts, no?
Charles Keepax
maintainerRe: [PATCH v2 07/19] ASoC: SDCA: Factor out a helper to find SDCA IRQ data
Quoted 16 lines · Pierre-Louis Bossart
sound/soc/sdca/sdca_interrupts.c int sdca_irq_data_populate(struct snd_soc_component *component, · line 352
Quoted 10 lines
sound/soc/sdca/sdca_interrupts.c +9
-0+static struct sdca_interrupt *get_interrupt_data (struct device *dev,int irq, +struct sdca_interrupt_info *info) +{ +if (irq ==SDCA_NO_INTERRUPT ) { +return NULL ; + }else if (irq <0 || irq >=SDCA_MAX_INTERRUPTS ) { +dev_err (dev,"bad irq position: %d\n" , irq); +return ERR_PTR (-EINVAL ); + }Checking for the range isn't bad but could this be improved with the 'mipi-sdca-control-interrupt-position' DisCo properties?
When parsing the DisCo data, we can probably come-up with a mask of valid interrupts, no?
I am not sure the check is appropriate here. This is simply returning a data for a given irq number. Currently the two users and both are directly requesting the IRQ numbers from that interrupt-position property you mention, so really here we are checking that those property values are within the range of valid IRQs. Checking them against themself isn't obviously helpful.
Thanks,
Charles
Charles Keepax
maintainerPATCH v2 8/19 ASoC: SDCA: Rely less on the ASoC component in IRQ handling
In reply to Charles KeepaxIn the future some IRQs (mostly the UMPs used during File DownLoad) will need to run after the device has enumerated on the bus but before the soundcard is actually constructed. As such refactor more of the IRQ handling to use raw device and regmap pointers, rather than accessing things through the component.
---
No changes since v1.
include/sound/sdca_interrupts.h | 7 +++++- sound/soc/sdca/sdca_interrupts.c | 37 +++++++++++++++++++++----------- 2 files changed, 31 insertions(+), 13 deletions(-)
include/sound/sdca_interrupts.h +6 -1
@@ -23,7 +23,9 @@ struct sdca_function_data;/** * struct sdca_interrupt - contains information about a single SDCA interrupt * @name: The name of the interrupt. +* @dev: Pointer to the Function device. * @device_regmap: Pointer to the IRQ regmap. +* @function_regmap: Pointer to the SDCA Function regmap. * @component: Pointer to the ASoC component owns the interrupt. * @function: Pointer to the Function that the interrupt is associated with. * @entity: Pointer to the Entity that the interrupt is associated with.
@@ -35,7 +37,9 @@ struct sdca_function_data;struct sdca_interrupt {const char *name; +struct device *dev;struct regmap *device_regmap; +struct regmap *function_regmap;struct snd_soc_component *component;struct sdca_function_data *function;struct sdca_entity *entity;
@@ -65,7 +69,8 @@ struct sdca_interrupt_info {int sdca_irq_request (struct device *dev,struct sdca_interrupt_info *interrupt_info,int sdca_irq,const char *name,irq_handler_t handler,void *data); -int sdca_irq_data_populate(struct snd_soc_component *component, +int sdca_irq_data_populate(struct device *dev, struct regmap *function_regmap, + struct snd_soc_component *component, struct sdca_function_data *function, struct sdca_entity *entity, struct sdca_control *control,
sound/soc/sdca/sdca_interrupts.c +25 -12
@@ -77,7 +77,7 @@ static const struct regmap_irq_chip sdca_irq_chip = {static irqreturn_t base_handler (int irq,void *data) {struct sdca_interrupt *interrupt = data; -struct device *dev = interrupt->component->dev; +struct device *dev = interrupt->dev;dev_info (dev,"%s irq without full handling\n" , interrupt->name);
@@ -87,7 +87,7 @@ static irqreturn_t base_handler(int irq, void *data)static irqreturn_t function_status_handler (int irq,void *data) {struct sdca_interrupt *interrupt = data; -struct device *dev = interrupt->component->dev; +struct device *dev = interrupt->dev;irqreturn_t irqret =IRQ_NONE ;unsigned int reg, val;unsigned long status;
@@ -103,7 +103,7 @@ static irqreturn_t function_status_handler(int irq, void *data) reg =SDW_SDCA_CTL (interrupt->function->desc->adr, interrupt->entity->id, interrupt->control->sel,0 ); - ret =regmap_read (interrupt->component->regmap, reg, &val); + ret =regmap_read (interrupt->function_regmap, reg, &val);if (ret <0 ) {dev_err (dev,"failed to read function status: %d\n" , ret); goto error;
@@ -136,7 +136,7 @@ static irqreturn_t function_status_handler(int irq, void *data) } } - ret =regmap_write (interrupt->component->regmap, reg, val); + ret =regmap_write (interrupt->function_regmap, reg, val);if (ret <0 ) {dev_err (dev,"failed to clear function status: %d\n" , ret); goto error;
@@ -151,8 +151,8 @@ static irqreturn_t function_status_handler(int irq, void *data)static irqreturn_t detected_mode_handler (int irq,void *data) {struct sdca_interrupt *interrupt = data; +struct device *dev = interrupt->dev;struct snd_soc_component *component = interrupt->component; -struct device *dev = component->dev;struct snd_soc_card *card = component->card;struct rw_semaphore *rwsem = &card->snd_card->controls_rwsem;struct snd_kcontrol *kctl = interrupt->priv;
@@ -190,7 +190,7 @@ static irqreturn_t detected_mode_handler(int irq, void *data) reg =SDW_SDCA_CTL (interrupt->function->desc->adr, interrupt->entity->id, interrupt->control->sel,0 ); - ret =regmap_read (component->regmap, reg, &val); + ret =regmap_read (interrupt->function_regmap, reg, &val);if (ret <0 ) {dev_err (dev,"failed to read detected mode: %d\n" , ret); goto error;
@@ -209,9 +209,9 @@ static irqreturn_t detected_mode_handler(int irq, void *data)* detected mode is unknown we need to see what the device * selected as a "safe" option. */ -regcache_drop_region (component->regmap, reg, reg); +regcache_drop_region (interrupt->function_regmap, reg, reg); - ret =regmap_read (component->regmap, reg, &val); + ret =regmap_read (interrupt->function_regmap, reg, &val);if (ret) {dev_err (dev,"failed to re-check selected mode: %d\n" , ret); goto error;
@@ -309,6 +309,8 @@ EXPORT_SYMBOL_NS_GPL(sdca_irq_request, "SND_SOC_SDCA");/** * sdca_irq_data_populate - Populate common interrupt data +* @dev: Pointer to the Function device. +* @regmap: Pointer to the Function regmap. * @component: Pointer to the ASoC component for the Function. * @function: Pointer to the SDCA Function. * @entity: Pointer to the SDCA Entity.
@@ -317,21 +319,31 @@ EXPORT_SYMBOL_NS_GPL(sdca_irq_request, "SND_SOC_SDCA");* * Return: Zero on success, and a negative error code on failure. */ -int sdca_irq_data_populate (struct snd_soc_component *component, +int sdca_irq_data_populate (struct device *dev,struct regmap *regmap, +struct snd_soc_component *component,struct sdca_function_data *function,struct sdca_entity *entity,struct sdca_control *control,struct sdca_interrupt *interrupt) { -struct device *dev = component->dev;const char *name; +if (!dev && component) + dev = component->dev; +if (!dev) +return -ENODEV ; + name =devm_kasprintf (dev,GFP_KERNEL ,"%s %s %s" , function->desc->name, entity->label, control->label);if (!name)return -ENOMEM ; interrupt->name = name; + interrupt->dev = dev; +if (!regmap && component) + interrupt->function_regmap = component->regmap; +else + interrupt->function_regmap = regmap; interrupt->component = component; interrupt->function = function; interrupt->entity = entity;
@@ -394,8 +406,9 @@ int sdca_irq_populate(struct sdca_function_data *function,else if (!interrupt)continue ; - ret =sdca_irq_data_populate (component, function, entity, - control, interrupt); + ret =sdca_irq_data_populate (dev,NULL , component, + function, entity, control, + interrupt);if (ret)return ret;
Signature · 1 line
2.47.3
Charles Keepax
maintainerPATCH v2 9/19 ASoC: SDCA: Force some SDCA Controls to be volatile
In reply to Charles KeepaxWhilst SDCA does specify an Access Mode for each Control, there is not a 1-to-1 mapping between that and ASoC's internal representation. Some registers require being treated as volatile from the hosts perspective even in their Access Mode is Read-Write. Add an explicit list of SDCA controls that should be forced volatile.
---
No changes since v1.
include/sound/sdca_function.h | 1 + sound/soc/sdca/sdca_functions.c | 58 +++++++++++++++++++++++++++++++++ sound/soc/sdca/sdca_regmap.c | 9 +---- 3 files changed, 60 insertions(+), 8 deletions(-)
include/sound/sdca_function.h +1 -0
@@ -771,6 +771,7 @@ struct sdca_control {u8 layers;bool deferrable; +bool is_volatile;bool has_default;bool has_fixed; };
sound/soc/sdca/sdca_functions.c +58 -0
70 lines not on this page · raw message
sound/soc/sdca/sdca_regmap.c +1 -8
@@ -147,14 +147,7 @@ bool sdca_regmap_volatile(struct sdca_function_data *function, unsigned int reg)if (!control)return false; -switch (control->mode) { -case SDCA_ACCESS_MODE_RO : -case SDCA_ACCESS_MODE_RW1S : -case SDCA_ACCESS_MODE_RW1C : -return true; -default : -return false; - } +return control->is_volatile; }EXPORT_SYMBOL_NS (sdca_regmap_volatile,"SND_SOC_SDCA" );
Signature · 1 line
2.47.3
Pierre-Louis Bossart
reviewerRe: [PATCH v2 09/19] ASoC: SDCA: Force some SDCA Controls to be volatile
Quoted 27 lines
sound/soc/sdca/sdca_functions.c +26
-0+switch (SDCA_CTL_TYPE (entity->type, control->sel)) { +case SDCA_CTL_TYPE_S (XU ,FDL_HOST_REQUEST ): +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 ): +case SDCA_CTL_TYPE_S (XU ,FDL_STATUS ): +case SDCA_CTL_TYPE_S (XU ,FDL_CURRENTOWNER ):
sound/soc/sdca/sdca_functions.c find_sdca_control_datatype(const struct sdca_entity *entity, · line 831
Quoted 10 lines
sound/soc/sdca/sdca_functions.c +10
-0+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 ):
Maybe reorder these cases by entity type? or by control selector? The list above is a mix that doesn't seem very logical to me.
Charles Keepax
maintainerRe: [PATCH v2 09/19] ASoC: SDCA: Force some SDCA Controls to be volatile
Quoted 33 lines · Pierre-Louis Bossart
Quoted 33 lines
sound/soc/sdca/sdca_functions.c +32
-0+switch (SDCA_CTL_TYPE (entity->type, control->sel)) { +case SDCA_CTL_TYPE_S (XU ,FDL_HOST_REQUEST ): +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 ): +case SDCA_CTL_TYPE_S (XU ,FDL_STATUS ): +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 ):
Quoted 8 lines
sound/soc/sdca/sdca_functions.c find_sdca_control_datatype(const struct sdca_entity *entity, · line 831
Quoted 4 lines
sound/soc/sdca/sdca_functions.c +4
-0+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 ):Maybe reorder these cases by entity type? or by control selector? The list above is a mix that doesn't seem very logical to me.
Yeah I will reorder by entity.
Thanks,
Charles
Charles Keepax
maintainerPATCH v2 10/19 ASoC: SDCA: Parse XU Entity properties
In reply to Charles KeepaxParse the DisCo properties for XU Entities.
---
New since v1.
include/sound/sdca_function.h | 23 +++++++++++++++++++++++ sound/soc/sdca/sdca_functions.c | 25 +++++++++++++++++++++++++ 2 files changed, 48 insertions(+)
include/sound/sdca_function.h +23 -0
@@ -1090,6 +1090,27 @@ struct sdca_entity_hide {struct hid_descriptor hid_desc; }; +/** +* enum sdca_xu_reset_machanism - SDCA FDL Resets +*/ +enum sdca_xu_reset_mechanism { +SDCA_XU_RESET_FUNCTION =0x0 , +SDCA_XU_RESET_DEVICE =0x1 , +SDCA_XU_RESET_BUS =0x2 , +}; + +/** +* struct sdca_entity_xu - information specific to XU Entities +* @max_delay: the maximum time in microseconds allowed for the Device +* to change the ownership from Device to Host +* @reset_mechanism: indicates the type of reset that can be requested +* the end of an FDL. +*/ +struct sdca_entity_xu { +unsigned int max_delay; +enum sdca_xu_reset_mechanism reset_mechanism; +}; +/** * struct sdca_entity - information for one SDCA Entity * @label: String such as "OT 12".
@@ -1106,6 +1127,7 @@ struct sdca_entity_hide {* @pde: Power Domain Entity specific Entity properties. * @ge: Group Entity specific Entity properties. * @hide: HIDE Entity specific Entity properties. +* @xu: XU Entity specific Entity properties. */ struct sdca_entity {const char *label;
@@ -1123,6 +1145,7 @@ struct sdca_entity {struct sdca_entity_pde pde;struct sdca_entity_ge ge;struct sdca_entity_hide hide; +struct sdca_entity_xu xu; }; };
sound/soc/sdca/sdca_functions.c +25 -0
@@ -1398,6 +1398,28 @@ find_sdca_entity_hide(struct device *dev, struct sdw_slave *sdw,return 0 ; } +static int find_sdca_entity_xu (struct device *dev, +struct fwnode_handle *entity_node, +struct sdca_entity *entity) +{ +struct sdca_entity_xu *xu = &entity->xu; +u32 tmp; +int ret; + + ret =fwnode_property_read_u32 (entity_node, +"mipi-sdca-RxUMP-ownership-transition-max-delay" , + &tmp); +if (!ret) + xu->max_delay = tmp; + + ret =fwnode_property_read_u32 (entity_node,"mipi-sdca-FDL-reset-mechanism" , + &tmp); +if (!ret) + xu->reset_mechanism = tmp; + +return 0 ; +} + static int find_sdca_entity(struct device *dev, struct sdw_slave *sdw, struct fwnode_handle *function_node, struct fwnode_handle *entity_node,
@@ -1430,6 +1452,9 @@ static int find_sdca_entity(struct device *dev, struct sdw_slave *sdw,case SDCA_ENTITY_TYPE_OT : ret =find_sdca_entity_iot (dev, entity_node, entity);break ; +case SDCA_ENTITY_TYPE_XU : + ret =find_sdca_entity_xu (dev, entity_node, entity); +break ;case SDCA_ENTITY_TYPE_CS : ret =find_sdca_entity_cs (dev, entity_node, entity);break ;
Signature · 1 line
2.47.3
Pierre-Louis Bossart
reviewerRe: [PATCH v2 10/19] ASoC: SDCA: Parse XU Entity properties
include/sound/sdca_function.h struct sdca_entity_hide { · line 1100
Quoted 9 lines
include/sound/sdca_function.h +8
-0+/** +* enum sdca_xu_reset_machanism - SDCA FDL Resets +*/ +enum sdca_xu_reset_mechanism { +SDCA_XU_RESET_FUNCTION =0x0 , +SDCA_XU_RESET_DEVICE =0x1 , +SDCA_XU_RESET_BUS =0x2 , +};
It'd be worth explaining how the last two might work? The RESET_BUS is puzzling, if the controller performs a hard reset then in theory the device should lose all context. Likewise a RESET_DEVICE should cause the SoundWire device to fall off the bus and lose context as well, and in the case of a multi-function device it could be fun if each function causes a device reset. This could end-up in a boot-loop, no?
sound/soc/sdca/sdca_functions.c find_sdca_entity_hide(struct device *dev, struct sdw_slave *sdw, · line 1413
Quoted 13 lines
sound/soc/sdca/sdca_functions.c +13
-0+static int find_sdca_entity_xu (struct device *dev, +struct fwnode_handle *entity_node, +struct sdca_entity *entity) +{ +struct sdca_entity_xu *xu = &entity->xu; +u32 tmp; +int ret; + + ret =fwnode_property_read_u32 (entity_node, +"mipi-sdca-RxUMP-ownership-transition-max-delay" , + &tmp); +if (!ret) + xu->max_delay = tmp;
maybe add a sanity check on the value?
sound/soc/sdca/sdca_functions.c find_sdca_entity_hide(struct device *dev, struct sdw_slave *sdw, · line 1418
Quoted 4 lines
sound/soc/sdca/sdca_functions.c +4
-0+ ret =fwnode_property_read_u32 (entity_node,"mipi-sdca-FDL-reset-mechanism" , + &tmp); +if (!ret) + xu->reset_mechanism = tmp;
same here?
m
Charles Keepax
maintainerRe: [PATCH v2 10/19] ASoC: SDCA: Parse XU Entity properties
Quoted 17 lines · Pierre-Louis Bossart
include/sound/sdca_function.h struct sdca_entity_hide { · line 1100
Quoted 9 lines
include/sound/sdca_function.h +8
-0+/** +* enum sdca_xu_reset_machanism - SDCA FDL Resets +*/ +enum sdca_xu_reset_mechanism { +SDCA_XU_RESET_FUNCTION =0x0 , +SDCA_XU_RESET_DEVICE =0x1 , +SDCA_XU_RESET_BUS =0x2 , +};It'd be worth explaining how the last two might work? The
RESET_BUSis puzzling, if the controller performs a hard reset then in theory the device should lose all context. Likewise aRESET_DEVICEshould cause the SoundWire device to fall off the bus and lose context as well, and in the case of a multi-function device it could be fun if each function causes a device reset. This could end-up in a boot-loop, no?
I mean yeah that one seems problematic to implement to me, but table 322 in v1.1 defines these three resets. Its up to the implementation of the device to pick one that works for it.
Quoted 16 lines
sound/soc/sdca/sdca_functions.c find_sdca_entity_hide(struct device *dev, struct sdw_slave *sdw, · line 1413
Quoted 13 lines
sound/soc/sdca/sdca_functions.c +13
-0+static int find_sdca_entity_xu (struct device *dev, +struct fwnode_handle *entity_node, +struct sdca_entity *entity) +{ +struct sdca_entity_xu *xu = &entity->xu; +u32 tmp; +int ret; + + ret =fwnode_property_read_u32 (entity_node, +"mipi-sdca-RxUMP-ownership-transition-max-delay" , + &tmp); +if (!ret) + xu->max_delay = tmp;maybe add a sanity check on the value?
Quoted 6 lines
sound/soc/sdca/sdca_functions.c find_sdca_entity_hide(struct device *dev, struct sdw_slave *sdw, · line 1418
Quoted 4 lines
sound/soc/sdca/sdca_functions.c +4
-0+ ret =fwnode_property_read_u32 (entity_node,"mipi-sdca-FDL-reset-mechanism" , + &tmp); +if (!ret) + xu->reset_mechanism = tmp;same here?
None of the existing delays are sanity checking, so I think I would vote for leaving this as future work. It would make more sense to add it to all delays rather than just the subset we are adding there.
Thanks,
Charles
Charles Keepax
maintainerPATCH v2 11/19 ASoC: SDCA: Parse Function Reset max delay
In reply to Charles KeepaxParse the DisCo property to get the timeout for a Function Reset.
---
New since v1.
include/sound/sdca_function.h | 3 +++ sound/soc/sdca/sdca_functions.c | 10 ++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-)
include/sound/sdca_function.h +3 -0
@@ -1323,6 +1323,8 @@ enum sdca_cluster_range {* @num_clusters: Number of Channel Clusters reported in this Function. * @busy_max_delay: Maximum Function busy delay in microseconds, before an * error should be reported. +* @reset_max_delay: Maximum Function reset delay in microseconds, before an +* error should be reported. */ struct sdca_function_data {struct sdca_function_desc *desc;
@@ -1335,6 +1337,7 @@ struct sdca_function_data {int num_clusters;unsigned int busy_max_delay; +unsigned int reset_max_delay; }; static inline u32 sdca_range(struct sdca_control_range *range,
sound/soc/sdca/sdca_functions.c +8 -2
@@ -2033,8 +2033,14 @@ int sdca_parse_function(struct device *dev, struct sdw_slave *sdw,if (!ret) function->busy_max_delay = tmp; -dev_info (dev,"%pfwP: name %s delay %dus\n" , function->desc->node, - function->desc->name, function->busy_max_delay); + ret =fwnode_property_read_u32 (function_desc->node, +"mipi-sdca-function-reset-max-delay" , &tmp); +if (!ret) + function->reset_max_delay = tmp; + +dev_info (dev,"%pfwP: name %s busy delay %dus reset delay %dus\n" , + function->desc->node, function->desc->name, + function->busy_max_delay, function->reset_max_delay); ret =find_sdca_init_table (dev, function_desc->node, function);if (ret)
Signature · 1 line
2.47.3
Charles Keepax
maintainerPATCH v2 12/19 ASoC: SDCA: Add UMP buffer helper functions
In reply to Charles KeepaxAdd helper functions for handling Universal Message Passing (UMP) buffers on SDCA devices. These are generic mechanisms to pass blocks of binary data between the host and the device, in both directions. They are used for things like passing HID descriptors and the File Download process.
---
No changes since v1.
include/sound/sdca_function.h | 26 ++++ include/sound/sdca_ump.h | 45 +++++++ sound/soc/sdca/Makefile | 3 +- sound/soc/sdca/sdca_ump.c | 247 ++++++++++++++++++++++++++++++++++ 4 files changed, 320 insertions(+), 1 deletion(-) create mode 100644 include/sound/sdca_ump.h create mode 100644 sound/soc/sdca/sdca_ump.c
include/sound/sdca_function.h +26 -0
@@ -133,6 +133,32 @@ struct sdca_init_write {#define SDCA_CTL_TYPE_S (ent, sel) SDCA_CTL_TYPE(SDCA_ENTITY_TYPE_##ent, \ SDCA_CTL_##ent##_##sel) +/** +* enum sdca_messageoffset_range - Column definitions UMP MessageOffset +*/ +enum sdca_messageoffset_range { +SDCA_MESSAGEOFFSET_BUFFER_START_ADDRESS =0 , +SDCA_MESSAGEOFFSET_BUFFER_LENGTH =1 , +SDCA_MESSAGEOFFSET_UMP_MODE =2 , +SDCA_MESSAGEOFFSET_NCOLS =3 , +}; + +/** +* enum sdca_ump_mode - SDCA UMP Mode +*/ +enum sdca_ump_mode { +SDCA_UMP_MODE_DIRECT =0x00 , +SDCA_UMP_MODE_INDIRECT =0x01 , +}; + +/** +* enum sdca_ump_owner - SDCA UMP Owner +*/ +enum sdca_ump_owner { +SDCA_UMP_OWNER_HOST =0x00 , +SDCA_UMP_OWNER_DEVICE =0x01 , +}; +/** * enum sdca_it_controls - SDCA Controls for Input Terminal *
include/sound/sdca_ump.h new file +45 -0
45 lines not on this page · raw message
sound/soc/sdca/Makefile +2 -1
@@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only -snd-soc-sdca-y := sdca_functions.o sdca_device.o sdca_regmap.o sdca_asoc.o +snd-soc-sdca-y := sdca_functions.o sdca_device.o sdca_regmap.o sdca_asoc.o \ + sdca_ump.o snd-soc-sdca-$(CONFIG_SND_SOC_SDCA_HID) += sdca_hid.o snd-soc-sdca-$(CONFIG_SND_SOC_SDCA_IRQ) += sdca_interrupts.o
sound/soc/sdca/sdca_ump.c new file +247 -0
247 lines not on this page · raw message
Signature · 1 line
2.47.3
Pierre-Louis Bossart
reviewerRe: [PATCH v2 12/19] ASoC: SDCA: Add UMP buffer helper functions
Quoted 16 lines
include/sound/sdca_ump.h new file +15
-0+int sdca_ump_get_owner_host (struct device *dev, +struct regmap *function_regmap, +struct sdca_function_data *function, +struct sdca_entity *entity, +struct sdca_control *control); +int sdca_ump_set_owner_device (struct device *dev, +struct regmap *function_regmap, +struct sdca_function_data *function, +struct sdca_entity *entity, +struct sdca_control *control); +int sdca_ump_read_message(struct device *dev, + struct regmap *device_regmap, + struct regmap *function_regmap, + struct sdca_function_data *function, + struct sdca_entity *entity,
include/sound/sdca_ump.h line 43
Quoted 10 lines
include/sound/sdca_ump.h new file +10
-0+ unsigned int offset_sel, unsigned int length_sel, + void **msg); +int sdca_ump_write_message (struct device *dev, +struct regmap *device_regmap, +struct regmap *function_regmap, +struct sdca_function_data *function, +struct sdca_entity *entity, +unsigned int offset_sel,unsigned int msg_offset, +unsigned int length_sel, +void *msg,int msg_len);
I am still missing the big picture on when/where the timeouts read from DisCo properties are used. I looked at patch 14 and I don't see any timeouts used except for the reset.
Quoted 10 lines
+/**
+ *sdca_ump_read_message- read a UMP message from the device
+ * @dev: Pointer to the struct device used for error messages.
+ * @device_regmap: Pointer to the Device register map.
+ * @function_regmap: Pointer to the regmap for the SDCA Function.
+ * @function: Pointer to the Function information.
+ * @entity: Pointer to the SDCA Entity.
+ * @offset_sel: Control Selector for the UMP Offset Control.
+ * @length_sel: Control Selector for the UMP Length Control.
+ * @msg: Pointer that will be populated with an dynamically buffer
Quoted 8 lines
+ * containing the UMP message. Note this needs to be freed by the
+ * caller.
+ *
+ * The caller should first callsdca_ump_get_owner_host()to ensure the host
+ * currently owns the UMP buffer, and then this function can be used to
+ * retrieve a message. It is the callers responsibility to free the
+ * message once it is finished with it. Finallysdca_ump_set_owner_device()
+ * should be called to return the buffer to the device.
Maybe I misunderstood something in the UMP spec, but I could see a different flow where the host does a set_owner_device() and later reads the buffer updated by the device once the ownership is given back to the host.
I think you're assuming that a read is always initiated by the device, but what if the host wants to read something (volume/acoustic levels, etc) without getting any notification?
IOW, will a read only happen when the device throws an interrupt on its own? The spec doesn't seem very clear on this...
Charles Keepax
maintainerRe: [PATCH v2 12/19] ASoC: SDCA: Add UMP buffer helper functions
Quoted 4 lines · Pierre-Louis Bossart
I am still missing the big picture on when/where the timeouts read from DisCo properties are used.
I looked at patch 14 and I don't see any timeouts used except for the reset.
Apologies I should have called out in the cover-letter patch 17 adds the timeouts.
Quoted 11 lines
Quoted 5 lines
+ * The caller should first call
sdca_ump_get_owner_host()to ensure the host
+ * currently owns the UMP buffer, and then this function can be used to
+ * retrieve a message. It is the callers responsibility to free the
+ * message once it is finished with it. Finallysdca_ump_set_owner_device()
+ * should be called to return the buffer to the device.Maybe I misunderstood something in the UMP spec, but I could see a different flow where the host does a
set_owner_device()and later reads the buffer updated by the device once the ownership is given back to the host.
Quoted 7 lines
I think you're assuming that a read is always initiated by the device, but what if the host wants to read something (volume/acoustic levels, etc) without getting any notification?
IOW, will a read only happen when the device throws an interrupt on its own? The spec doesn't seem very clear on this...
Assuming the host is currently holding ownership of the buffer, then your example would look like:
1) host calls set_owner_device()
1.1) host optionally calls schedule_timeout() if it wants
2) the device then fills the buffer
3) device passes the ownership back to the host
4) host receives an IRQ on the buffer
4.1) host calls cancel_timeout() since ownership returned
5) host calls read_message() to get the data
The device should still throw an IRQ when it passes the buffer back which the host responds to. IMHO there is no real difference between the two use-cases you are talking about here.
A read can happen any time the host has ownership of the buffer but the UMP helpers don't make assumptions here, if someone implements code that calls read_message() not in response to an IRQ that is fine. As long as they ensured they have ownership first.
We do make slightly more assumptions in the current FDL code, primarily that the FDL buffer has an ownership IRQ. There is the slight corner case of a device that wanted to do FDL but not support IRQs. But I think its fine not to support everything especially kinda esoteric stuff in the first version of the code.
Thanks,
Charles
Charles Keepax
maintainerPATCH v2 13/19 ASoC: SDCA: Add SDCA FDL data parsing
In reply to Charles KeepaxFrom: Maciej Strozek <[email protected]>
Add parsing of ACPI DisCo information specific to FDL (File DownLoad). DisCo contains a list of File Sets which can be requested by the device and within each of those a list of individual files to be downloaded to the device. Optionally the contents of the files may also be present in a special ACPI table, called SWFT (SoundWire File Table).
---
Changes since v1:
- Moved find_sdca_filesets to be in a slightly more consistent place in the file.
include/sound/sdca.h | 5 ++ include/sound/sdca_function.h | 40 ++++++++++++++ sound/soc/sdca/sdca_device.c | 20 +++++++ sound/soc/sdca/sdca_functions.c | 93 +++++++++++++++++++++++++++++++++ 4 files changed, 158 insertions(+)
include/sound/sdca.h +5 -0
@@ -12,6 +12,7 @@#include <linux/types.h> #include <linux/kconfig.h> +struct acpi_table_swft ;struct sdw_slave ;#define SDCA_MAX_FUNCTION_COUNT 8
@@ -37,11 +38,13 @@ struct sdca_function_desc {* @num_functions: Total number of supported SDCA functions. Invalid/unsupported * functions will be skipped. * @function: Array of function descriptors. +* @swft: Pointer to the SWFT table, if available. */ struct sdca_device_data {u32 interface_revision;int num_functions;struct sdca_function_desc function[SDCA_MAX_FUNCTION_COUNT ]; +struct acpi_table_swft *swft; };enum sdca_quirk {
@@ -52,12 +55,14 @@ enum sdca_quirk {#if IS_ENABLED (CONFIG_ACPI ) &&IS_ENABLED (CONFIG_SND_SOC_SDCA )void sdca_lookup_functions (struct sdw_slave *slave); +void sdca_lookup_swft (struct sdw_slave *slave);void sdca_lookup_interface_revision (struct sdw_slave *slave);bool sdca_device_quirk_match (struct sdw_slave *slave,enum sdca_quirk quirk);#else static inline void sdca_lookup_functions (struct sdw_slave *slave) {} +static inline void sdca_lookup_swft (struct sdw_slave *slave) {}static inline void sdca_lookup_interface_revision (struct sdw_slave *slave) {}static inline bool sdca_device_quirk_match (struct sdw_slave *slave,enum sdca_quirk quirk) {
include/sound/sdca_function.h +40 -0
@@ -13,6 +13,7 @@#include <linux/types.h> #include <linux/hid.h> +struct acpi_table_swft ;struct device ;struct sdca_entity ;struct sdca_function_desc ;
@@ -1338,6 +1339,42 @@ enum sdca_cluster_range { SDCA_CLUSTER_NCOLS = 2, }; +/** +* struct sdca_fdl_file - information about a file from a fileset used in FDL +* @vendor_id: Vendor ID of the file. +* @file_id: File ID of the file. +* @fdl_offset: Offset information for FDL. +*/ +struct sdca_fdl_file { +u16 vendor_id; +u32 file_id; +u32 fdl_offset; +}; + +/** +* struct sdca_fdl_set - information about a set of files used in FDL +* @files: Array of files in this FDL set. +* @num_files: Number of files in this FDL set. +* @id: ID of the FDL set. +*/ +struct sdca_fdl_set { +struct sdca_fdl_file *files; +int num_files; +u32 id; +}; + +/** +* struct sdca_fdl_data - information about a function's FDL data +* @swft: Pointer to the SoundWire File Table. +* @sets: Array of FDL sets used by this function. +* @num_sets: Number of FDL sets used by this function. +*/ +struct sdca_fdl_data { +struct acpi_table_swft *swft; +struct sdca_fdl_set *sets; +int num_sets; +}; +/** * struct sdca_function_data - top-level information for one SDCA function * @desc: Pointer to short descriptor from initial parsing.
@@ -1351,6 +1388,7 @@ enum sdca_cluster_range {* error should be reported. * @reset_max_delay: Maximum Function reset delay in microseconds, before an * error should be reported. +* @fdl_data: FDL data for this Function, if available. */ struct sdca_function_data {struct sdca_function_desc *desc;
@@ -1364,6 +1402,8 @@ struct sdca_function_data {unsigned int busy_max_delay;unsigned int reset_max_delay; + +struct sdca_fdl_data fdl_data; }; static inline u32 sdca_range(struct sdca_control_range *range,
sound/soc/sdca/sdca_device.c +20 -0
@@ -7,6 +7,7 @@*/ #include <linux/acpi.h> +#include <linux/device.h> #include <linux/dmi.h> #include <linux/module.h> #include <linux/property.h>
@@ -27,6 +28,25 @@ void sdca_lookup_interface_revision(struct sdw_slave *slave) }EXPORT_SYMBOL_NS (sdca_lookup_interface_revision,"SND_SOC_SDCA" ); +static void devm_acpi_table_put (void *ptr) +{ +acpi_put_table ((struct acpi_table_header *)ptr); +} + +void sdca_lookup_swft (struct sdw_slave *slave) +{ +acpi_status status; + + status =acpi_get_table (ACPI_SIG_SWFT ,0 , + (struct acpi_table_header **)&slave->sdca_data.swft); +if (ACPI_FAILURE (status)) +dev_info (&slave->dev,"SWFT not available\n" ); +else +devm_add_action_or_reset (&slave->dev, devm_acpi_table_put, + &slave->sdca_data.swft); +} +EXPORT_SYMBOL_NS (sdca_lookup_swft,"SND_SOC_SDCA" ); +static bool sdca_device_quirk_rt712_vb (struct sdw_slave *slave) {struct sdw_slave_id *id = &slave->id;
sound/soc/sdca/sdca_functions.c +93 -0
105 lines not on this page · raw message
Signature · 1 line
2.47.3
Mark Brown
maintainerRe: [PATCH v2 13/19] ASoC: SDCA: Add SDCA FDL data parsing
Quoted 7 lines · Charles Keepax
From: Maciej Strozek <[email protected]>
Add parsing of ACPI DisCo information specific to FDL (File DownLoad). DisCo contains a list of File Sets which can be requested by the device and within each of those a list of individual files to be downloaded to the device. Optionally the contents of the files may also be present in a special ACPI table, called SWFT (SoundWire File Table).
This breaks the build:
/build/stage/linux/sound/soc/sdca/sdca_device.c:40:26: error: use of undeclared identifier 'ACPI_SIG_SWFT'
40 | status = acpi_get_table(ACPI_SIG_SWFT, 0,
| ^
1 error generated.
The identifier is added by some tree in -next but is not present in mainline or my tree.
Mark Brown
maintainerRe: [PATCH v2 13/19] ASoC: SDCA: Add SDCA FDL data parsing
Quoted 11 lines · Mark Brown
Quoted 7 lines · Charles Keepax
From: Maciej Strozek <[email protected]>
Add parsing of ACPI DisCo information specific to FDL (File DownLoad). DisCo contains a list of File Sets which can be requested by the device and within each of those a list of individual files to be downloaded to the device. Optionally the contents of the files may also be present in a special ACPI table, called SWFT (SoundWire File Table).
This breaks the build:
Quoted 7 lines
/build/stage/linux/sound/soc/sdca/sdca_device.c:40:26: error: use of undeclared identifier '
ACPI_SIG_SWFT'
40 | status = acpi_get_table(ACPI_SIG_SWFT, 0,
| ^
1 error generated.The identifier is added by some tree in -next but is not present in mainline or my tree.
This is
commit ac46f5b6c661 ("ACPICA: Add SoundWire File Table (SWFT) signature")git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
noted in the cover letter.
Charles Keepax
maintainerRe: [PATCH v2 13/19] ASoC: SDCA: Add SDCA FDL data parsing
In reply to Mark BrownQuoted 11 lines · Mark Brown
Quoted 7 lines · Charles Keepax
From: Maciej Strozek <[email protected]>
Add parsing of ACPI DisCo information specific to FDL (File DownLoad). DisCo contains a list of File Sets which can be requested by the device and within each of those a list of individual files to be downloaded to the device. Optionally the contents of the files may also be present in a special ACPI table, called SWFT (SoundWire File Table).
This breaks the build:
Quoted 7 lines
/build/stage/linux/sound/soc/sdca/sdca_device.c:40:26: error: use of undeclared identifier '
ACPI_SIG_SWFT'
40 | status = acpi_get_table(ACPI_SIG_SWFT, 0,
| ^
1 error generated.The identifier is added by some tree in -next but is not present in mainline or my tree.
Yeah apologies for that, it is called out in the cover letter. But I wanted to get the review started as soon as we could, as most of the SDCA stuff has seen a fair few rounds of review. If we are ready to merge it, we would need to organise some sort of immutable branch with Rafael, he is CCed on the series, for visibility.
Thanks,
Charles
Mark Brown
maintainerRe: [PATCH v2 13/19] ASoC: SDCA: Add SDCA FDL data parsing
Quoted 11 lines · Charles Keepax
Quoted 2 lines · Mark Brown
The identifier is added by some tree in -next but is not present in mainline or my tree.
Yeah apologies for that, it is called out in the cover letter. But I wanted to get the review started as soon as we could, as most of the SDCA stuff has seen a fair few rounds of review. If we are ready to merge it, we would need to organise some sort of immutable branch with Rafael, he is CCed on the series, for visibility.
I at least wanted to throw it into CI since it looked to be settling down. I think at this point it might be easier to just wait the three weeks or so for -rc1, that gives a bit more time for review and it's a lot less effort.
Charles Keepax
maintainerRe: [PATCH v2 13/19] ASoC: SDCA: Add SDCA FDL data parsing
Quoted 13 lines · Mark Brown
Quoted 11 lines · Charles Keepax
Quoted 2 lines · Mark Brown
The identifier is added by some tree in -next but is not present in mainline or my tree.
Yeah apologies for that, it is called out in the cover letter. But I wanted to get the review started as soon as we could, as most of the SDCA stuff has seen a fair few rounds of review. If we are ready to merge it, we would need to organise some sort of immutable branch with Rafael, he is CCed on the series, for visibility.
Quoted 4 lines
I at least wanted to throw it into CI since it looked to be settling down. I think at this point it might be easier to just wait the three weeks or so for -rc1, that gives a bit more time for review and it's a lot less effort.
I think that is probably fine, would be good to get at least one more Pierre look over before we merge anyway. Would you mind if we fired up the next series early (likely in a week or so)? Suboptimal to have two in review at once but it would enable us to get a head start on review. We are starting to get a little pressure from customers at this end on supporting the part this is all in aid of.
Thanks,
Charles
Mark Brown
maintainerRe: [PATCH v2 13/19] ASoC: SDCA: Add SDCA FDL data parsing
Quoted 7 lines · Charles Keepax
I think that is probably fine, would be good to get at least one more Pierre look over before we merge anyway. Would you mind if we fired up the next series early (likely in a week or so)? Suboptimal to have two in review at once but it would enable us to get a head start on review. We are starting to get a little pressure from customers at this end on supporting the part this is all in aid of.
It's fine by me to have both in flight at once.
Charles Keepax
maintainerRe: [PATCH v2 13/19] ASoC: SDCA: Add SDCA FDL data parsing
Quoted 11 lines · Mark Brown
Quoted 7 lines · Charles Keepax
I think that is probably fine, would be good to get at least one more Pierre look over before we merge anyway. Would you mind if we fired up the next series early (likely in a week or so)? Suboptimal to have two in review at once but it would enable us to get a head start on review. We are starting to get a little pressure from customers at this end on supporting the part this is all in aid of.
It's fine by me to have both in flight at once.
Super we will work on that and Pierre's latest comments on this series and send new ones next week.
Thanks,
Charles
Charles Keepax
maintainerPATCH v2 14/19 ASoC: SDCA: Add FDL library for XU entities
In reply to Charles KeepaxFrom: Maciej Strozek <[email protected]>
Some instances of the XU Entity have a need for Files to be downloaded from the Host. In these XUs, there is one instance of a Host to Device (Consumer) UMP, identified by the FDL_CurrentOwner Control. FDL Library introduced here implements the FDL flow triggered by FDL_CurrentOwner irq, which sends a file from SoundWire File Table (SWFT) or from the firmware directory in specific cases, to the Device FDL UMP.
Currently only Direct method of FDL is implemented.
---
Changes since v1:
- Remembered to actually add my sign-off
- Renamed things to be FDL rather than XU
- Added a function reset helper, and call it when the device resets a reset, other resets are still todos.
include/sound/sdca_fdl.h | 58 ++++++ include/sound/sdca_function.h | 24 +++ sound/soc/sdca/Kconfig | 8 + sound/soc/sdca/Makefile | 1 + sound/soc/sdca/sdca_fdl.c | 370 ++++++++++++++++++++++++++++++++++ 5 files changed, 461 insertions(+) create mode 100644 include/sound/sdca_fdl.h create mode 100644 sound/soc/sdca/sdca_fdl.c
include/sound/sdca_fdl.h new file +58 -0
@@ -0,0 +1,58 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* The MIPI SDCA specification is available for public downloads at +* https://www.mipi.org/mipi-sdca-v1-0-download +* +* Copyright (C) 2025 Cirrus Logic, Inc. and +* Cirrus Logic International Semiconductor Ltd. +*/ + +#ifndef __SDCA_FDL_H__ +#define __SDCA_FDL_H__ + +struct device ; +struct regmap ; +struct sdca_fdl_set ; +struct sdca_function_data ; +struct sdca_interrupt ; + +/** +* struct fdl_state - FDL state structure to keep data between interrupts +* @set: Pointer to the FDL set currently being downloaded. +* @file_index: Index of the current file being processed. +*/ +struct fdl_state { +struct sdca_fdl_set *set; +int file_index; +}; + +#define SDCA_CTL_XU_FDLH_COMPLETE 0 +#define SDCA_CTL_XU_FDLH_MORE_FILES SDCA_CTL_XU_FDLH_SET_IN_PROGRESS +#define SDCA_CTL_XU_FDLH_FILE_AVAILABLE (SDCA_CTL_XU_FDLH_TRANSFERRED_FILE | \ + SDCA_CTL_XU_FDLH_SET_IN_PROGRESS) +#define SDCA_CTL_XU_FDLH_MASK (SDCA_CTL_XU_FDLH_TRANSFERRED_CHUNK | \ + SDCA_CTL_XU_FDLH_TRANSFERRED_FILE | \ + SDCA_CTL_XU_FDLH_SET_IN_PROGRESS | \ + SDCA_CTL_XU_FDLH_RESET_ACK | \ + SDCA_CTL_XU_FDLH_REQ_ABORT) + +#define SDCA_CTL_XU_FDLD_COMPLETE 0 +#define SDCA_CTL_XU_FDLD_FILE_OK (SDCA_CTL_XU_FDLH_TRANSFERRED_FILE | \ + SDCA_CTL_XU_FDLH_SET_IN_PROGRESS | \ + SDCA_CTL_XU_FDLD_ACK_TRANSFER | \ + SDCA_CTL_XU_FDLD_NEEDS_SET) +#define SDCA_CTL_XU_FDLD_MORE_FILES_OK (SDCA_CTL_XU_FDLH_SET_IN_PROGRESS | \ + SDCA_CTL_XU_FDLD_ACK_TRANSFER | \ + SDCA_CTL_XU_FDLD_NEEDS_SET) +#define SDCA_CTL_XU_FDLD_MASK (SDCA_CTL_XU_FDLD_REQ_RESET | \ + SDCA_CTL_XU_FDLD_REQ_ABORT | \ + SDCA_CTL_XU_FDLD_ACK_TRANSFER | \ + SDCA_CTL_XU_FDLD_NEEDS_SET) + +int sdca_fdl_alloc_state (struct sdca_interrupt *interrupt); +int sdca_fdl_process (struct sdca_interrupt *interrupt); + +int sdca_reset_function (struct device *dev,struct sdca_function_data *function, +struct regmap *regmap); + +#endif // __SDCA_FDL_H__
include/sound/sdca_function.h +24 -0
@@ -285,6 +285,27 @@ enum sdca_xu_controls {SDCA_CTL_XU_FDL_STATUS =0x14 ,SDCA_CTL_XU_FDL_SET_INDEX =0x15 ,SDCA_CTL_XU_FDL_HOST_REQUEST =0x16 , + +/* FDL Status Host->Device bit definitions */ +SDCA_CTL_XU_FDLH_TRANSFERRED_CHUNK =BIT (0 ), +SDCA_CTL_XU_FDLH_TRANSFERRED_FILE =BIT (1 ), +SDCA_CTL_XU_FDLH_SET_IN_PROGRESS =BIT (2 ), +SDCA_CTL_XU_FDLH_RESET_ACK =BIT (4 ), +SDCA_CTL_XU_FDLH_REQ_ABORT =BIT (5 ), +/* FDL Status Device->Host bit definitions */ +SDCA_CTL_XU_FDLD_REQ_RESET =BIT (4 ), +SDCA_CTL_XU_FDLD_REQ_ABORT =BIT (5 ), +SDCA_CTL_XU_FDLD_ACK_TRANSFER =BIT (6 ), + SDCA_CTL_XU_FDLD_NEEDS_SET = BIT(7), +}; + +/** +* enum sdca_set_index_range - Column definitions UMP SetIndex +*/ +enum sdca_fdl_set_index_range { +SDCA_FDL_SET_INDEX_SET_NUMBER =0 , +SDCA_FDL_SET_INDEX_FILE_SET_ID =1 , +SDCA_FDL_SET_INDEX_NCOLS =2 , };/**
@@ -569,6 +590,9 @@ enum sdca_entity0_controls {SDCA_CTL_ENTITY_0_FUNCTION_NEEDS_INITIALIZATION =BIT (5 ),SDCA_CTL_ENTITY_0_FUNCTION_HAS_BEEN_RESET =BIT (6 ),SDCA_CTL_ENTITY_0_FUNCTION_BUSY =BIT (7 ), + +/* Function Action Bits */ + SDCA_CTL_ENTITY_0_RESET_FUNCTION_NOW = BIT(0), };#define SDCA_CTL_MIC_BIAS_NAME "Mic Bias"
sound/soc/sdca/Kconfig +8 -0
@@ -25,6 +25,14 @@ config SND_SOC_SDCA_IRQ help This option enables support for SDCA IRQs. +config SND_SOC_SDCA_FDL + bool "SDCA FDL (File DownLoad) support" + depends on SND_SOC_SDCA + default y + help + This option enables support for the File Download using UMP, + typically used for downloading firmware to devices. + config SND_SOC_SDCA_OPTIONAL def_tristate SND_SOC_SDCA || !SND_SOC_SDCA
sound/soc/sdca/Makefile +1 -0
@@ -4,5 +4,6 @@ snd-soc-sdca-y := sdca_functions.o sdca_device.o sdca_regmap.o sdca_asoc.o \ sdca_ump.o snd-soc-sdca-$(CONFIG_SND_SOC_SDCA_HID) += sdca_hid.o snd-soc-sdca-$(CONFIG_SND_SOC_SDCA_IRQ) += sdca_interrupts.o +snd-soc-sdca-$(CONFIG_SND_SOC_SDCA_FDL) += sdca_fdl.o obj-$(CONFIG_SND_SOC_SDCA) += snd-soc-sdca.o
sound/soc/sdca/sdca_fdl.c new file +370 -0
370 lines not on this page · raw message
Signature · 1 line
2.47.3
Charles Keepax
maintainerPATCH v2 15/19 ASoC: SDCA: Add FDL-specific IRQ processing
In reply to Charles KeepaxFrom: Maciej Strozek <[email protected]>
Hookup the XU IRQs required for the FDL process.
---
Changes since v1:
- Actually remembered to add my sign-off
- Minor commit message tweaks
sound/soc/sdca/sdca_interrupts.c | 34 ++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)
sound/soc/sdca/sdca_interrupts.c +34 -0
@@ -18,8 +18,10 @@#include <linux/soundwire/sdw.h> #include <linux/soundwire/sdw_registers.h> #include <sound/sdca.h> +#include <sound/sdca_fdl.h> #include <sound/sdca_function.h> #include <sound/sdca_interrupts.h> +#include <sound/sdca_ump.h> #include <sound/soc-component.h> #include <sound/soc.h>
@@ -245,6 +247,29 @@ static irqreturn_t detected_mode_handler(int irq, void *data)return irqret; } +static irqreturn_t fdl_owner_handler (int irq,void *data) +{ +struct sdca_interrupt *interrupt = data; +struct device *dev = interrupt->dev; +irqreturn_t irqret =IRQ_NONE ; +int ret; + + ret =pm_runtime_get_sync (dev); +if (ret <0 ) { +dev_err (dev,"failed to resume for fdl: %d\n" , ret); + goto error; + } + + ret =sdca_fdl_process (interrupt); +if (ret) + goto error; + + irqret =IRQ_HANDLED ; +error: +pm_runtime_put (dev); +return irqret; +} + static int sdca_irq_request_locked(struct device *dev, struct sdca_interrupt_info *info, int sdca_irq, const char *name,
@@ -423,6 +448,15 @@ int sdca_irq_populate(struct sdca_function_data *function,if (control->sel ==SDCA_CTL_GE_DETECTED_MODE ) handler = detected_mode_handler;break ; +case SDCA_ENTITY_TYPE_XU : +if (control->sel ==SDCA_CTL_XU_FDL_CURRENTOWNER ) { + ret =sdca_fdl_alloc_state (interrupt); +if (ret) +return ret; + + handler = fdl_owner_handler; + } +break ;default :break ; }
Signature · 1 line
2.47.3
Charles Keepax
maintainerPATCH v2 16/19 ASoC: SDCA: Add completion for FDL start and stop
In reply to Charles KeepaxAdd some completions and a helper function to allow other parts of the system to wait for FDL to complete. The sdca_fdl_sync() function will wait until it completes a full time out without a new FDL request happening, this ensures that even parts requiring multiple rounds of FDL should be fully downloaded before the driver boot continues.
---
Changes since v1:
- Added a limit to the number of times it will attempt FDL
- Split the time outs such that a shorter timeout is used whilst waiting for FDL to start and a longer one for it to complete.
include/sound/sdca_fdl.h | 10 ++++++ sound/soc/sdca/sdca_fdl.c | 75 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+)
include/sound/sdca_fdl.h +10 -0
@@ -10,18 +10,26 @@#ifndef __SDCA_FDL_H__#define __SDCA_FDL_H__ +#include <linux/completion.h> +struct device ;struct regmap ;struct sdca_fdl_set ;struct sdca_function_data ;struct sdca_interrupt ; +struct sdca_interrupt_info ;/** * struct fdl_state - FDL state structure to keep data between interrupts +* @begin: Completion indicating the start of an FDL download cycle. +* @done: Completion indicating the end of an FDL download cycle. * @set: Pointer to the FDL set currently being downloaded. * @file_index: Index of the current file being processed. */ struct fdl_state { +struct completion begin; +struct completion done; +struct sdca_fdl_set *set;int file_index; };
@@ -51,6 +59,8 @@ struct fdl_state {int sdca_fdl_alloc_state (struct sdca_interrupt *interrupt);int sdca_fdl_process (struct sdca_interrupt *interrupt); +int sdca_fdl_sync (struct device *dev,struct sdca_function_data *function, +struct sdca_interrupt_info *info);int sdca_reset_function (struct device *dev,struct sdca_function_data *function,struct regmap *regmap);
sound/soc/sdca/sdca_fdl.c +75 -0
105 lines not on this page · raw message
Signature · 1 line
2.47.3
Pierre-Louis Bossart
reviewerRe: [PATCH v2 16/19] ASoC: SDCA: Add completion for FDL start and stop
Quoted 5 lines · Charles Keepax
Add some completions and a helper function to allow other parts of the system to wait for FDL to complete. The
sdca_fdl_sync()function will wait until it completes a full time out without a new FDL request happening, this ensures that even parts requiring multiple rounds of FDL should be fully downloaded before the driver boot continues.
I couldn't figure out what the last sentence means. In theory we have a status that can be checked to know if all the firmware sets have been processed by the device. so why do we need a 'timeout without a new FDL request'. The status tells you exactly when the FDL iterations are over.
include/sound/sdca_fdl.h line 32
Quoted 11 lines
/**
* structfdl_state- FDL state structure to keep data between interrupts
+ * @begin: Completion indicating the start of an FDL download cycle.
+ * @done: Completion indicating the end of an FDL download cycle.
* @set: Pointer to the FDL set currently being downloaded.
* @file_index: Index of the current file being processed.
*/
structfdl_state{include/sound/sdca_fdl.h +3
-0+struct completion begin; +struct completion done; +
maybe explain why you need to track the 'begin' phase? This isn't a concept I can map to the FDL state machine.
IIRC the device tells you if it needs firmware or not. It could very well be that it kept all the context and doesn't need to be re-initialized always. Adding a timeout in all cases doesn't seem quite right - or it should be something done for specific hardware that always needs to be re-initialized with firmware.
sound/soc/sdca/sdca_fdl.c int sdca_reset_function(struct device *dev, struct sdca_function_data *function, · line 78
Quoted 12 lines
sound/soc/sdca/sdca_fdl.c +12
-0+/** +* sdca_fdl_sync - wait for a function to finish FDL +* @dev: Device pointer for error messages. +* @function: Pointer to the SDCA Function. +* @info: Pointer to the SDCA interrupt info for this device. +* +* Return: Zero on success or a negative error code. +*/ +int sdca_fdl_sync (struct device *dev,struct sdca_function_data *function, +struct sdca_interrupt_info *info) +{ +static const int max_fdls =10 ;
I think you can have 8 sets with 3 bits for the status. where does the 10 come from?
sound/soc/sdca/sdca_fdl.c int sdca_reset_function(struct device *dev, struct sdca_function_data *function, · line 80
Quoted 2 lines
sound/soc/sdca/sdca_fdl.c +2
-0+unsigned long begin_timeout =msecs_to_jiffies (100 ); +unsigned long done_timeout =msecs_to_jiffies (4000 );
probably some defines would be nicer
sound/soc/sdca/sdca_fdl.c int sdca_reset_function(struct device *dev, struct sdca_function_data *function, · line 88
Quoted 8 lines
sound/soc/sdca/sdca_fdl.c +8
-0+int nfdl; +int i, j; + +for (i =0 ; i < max_fdls; i++) { + nfdl =0 ; + +for (j =0 ; j <SDCA_MAX_INTERRUPTS ; j++) { +struct sdca_interrupt *interrupt = &info->irqs[j];
I don't fully understand why you have the interrupt in the inner loop. For a given XU, one might think that there's a single interrupt for the XU UMP used for FDL, and that each set is sent with the same mechanism?
Quoted 27 lines
sound/soc/sdca/sdca_fdl.c +27
-0+struct fdl_state *fdl_state; +unsigned long time; + +if (interrupt->function != function || + !interrupt->entity || !interrupt->control || + interrupt->entity->type !=SDCA_ENTITY_TYPE_XU || + interrupt->control->sel !=SDCA_CTL_XU_FDL_CURRENTOWNER ) +continue ; + + fdl_state = interrupt->priv; + nfdl++; + +/* +* Looking for timeout without any new FDL requests +* to imply the device has completed initial +* firmware setup. Alas the specification doesn't +* have any mechanism to detect this. +*/ + time =wait_for_completion_timeout (&fdl_state->begin, + begin_timeout); +if (!time) { +dev_dbg (dev,"no new FDL starts\n" ); + nfdl--; +continue ; + } + + time = wait_for_completion_timeout(&fdl_state->done,
sound/soc/sdca/sdca_fdl.c int sdca_reset_function(struct device *dev, struct sdca_function_data *function, · line 125
Quoted 10 lines
sound/soc/sdca/sdca_fdl.c +10
-0+ done_timeout); +if (!time) { +dev_err (dev,"timed out waiting for FDL to complete\n" ); +return -ETIMEDOUT ; + } + } + +if (!nfdl) +return 0 ; + }
Why don't you use the mask provided in the NEEDS_SET message?
Review
Quoted 2 lines
(quoted diff) +2
-0+ + dev_err(dev, "too many FDL quests\n");
requests?
Quoted 37 lines
sound/soc/sdca/sdca_fdl.c +13
-0+return -ETIMEDOUT ; +} +EXPORT_SYMBOL_NS_GPL (sdca_fdl_sync,"SND_SOC_SDCA" ); +static char *fdl_get_sku_filename (struct device *dev,struct sdca_fdl_file *fdl_file) {@@ -225,6 +291,9 @@ static void fdl_end(struct sdca_interrupt *interrupt) fdl_state->set =NULL ; +pm_runtime_put (interrupt->dev); +complete (&fdl_state->done); +dev_dbg (interrupt->dev,"completed FDL process\n" ); }@@ -238,6 +307,9 @@ static unsigned int fdl_status_process(struct sdca_interrupt *interrupt,case SDCA_CTL_XU_FDLD_NEEDS_SET :dev_dbg (interrupt->dev,"starting FDL process...\n" ); +pm_runtime_get (interrupt->dev); +complete (&fdl_state->begin); + fdl_state->file_index =0 ; fdl_state->set =fdl_get_set (interrupt); fallthrough;@@ -363,6 +435,9 @@ int sdca_fdl_alloc_state(struct sdca_interrupt *interrupt)if (!fdl_state)return -ENOMEM ; +init_completion (&fdl_state->begin); +init_completion (&fdl_state->done); + interrupt->priv = fdl_state;return 0 ;
Charles Keepax
maintainerRe: [PATCH v2 16/19] ASoC: SDCA: Add completion for FDL start and stop
Quoted 7 lines · Pierre-Louis Bossart
Quoted 5 lines · Charles Keepax
Add some completions and a helper function to allow other parts of the system to wait for FDL to complete. The
sdca_fdl_sync()function will wait until it completes a full time out without a new FDL request happening, this ensures that even parts requiring multiple rounds of FDL should be fully downloaded before the driver boot continues.
Quoted 5 lines
I couldn't figure out what the last sentence means. In theory we have a status that can be checked to know if all the firmware sets have been processed by the device. so why do we need a 'timeout without a new FDL request'. The status tells you exactly when the FDL iterations are over.
This is the other timeout I was asking about after you so usefully pointed out the DisCo property I was missing for the UMPs.
Presuming you are referring to the FDL status. That will keep track of the progress of a single FDL set. But I can't see anything that prevents a device requesting a second set (and in fact our device does). So after the first FDL has been complete one has to wait to see if the device initiates any further FDL.
All the spec says in step 9, 13.1, v1.1 is "Wait until there are no new requests for File Download". But if I am missing some additional status field that indicates the device is happy and ready to rock that would be awesome?
Quoted 6 lines
Quoted 6 lines
/**
* structfdl_state- FDL state structure to keep data between interrupts
+ * @begin: Completion indicating the start of an FDL download cycle.
+ * @done: Completion indicating the end of an FDL download cycle.
* @set: Pointer to the FDL set currently being downloaded.
* @file_index: Index of the current file being processed.
Quoted 8 lines
include/sound/sdca_fdl.h line 32
Quoted 5 lines
*/
structfdl_state{include/sound/sdca_fdl.h +3
-0+struct completion begin; +struct completion done; +maybe explain why you need to track the 'begin' phase? This isn't a concept I can map to the FDL state machine.
These are not so much concepts from the state machine as just the naive interpretation of their names. Begin means an FDL has begun, and done means that FDL has completed. We track the begin because as far as I can see the only signal the device is fully ready is that it doesn't initiate an FDL for a while.
Quoted 6 lines
IIRC the device tells you if it needs firmware or not. It could very well be that it kept all the context and doesn't need to be re-initialized always. Adding a timeout in all cases doesn't seem quite right - or it should be something done for specific hardware that always needs to be re-initialized with firmware.
I think what I am missing here is what is the mechanism for that telling you it no longer needs firmware? As far as I can see the only mechanism is an IRQ on the FDL UMP buffer, so we wait for that.
Quoted 6 lines
sound/soc/sdca/sdca_fdl.c int sdca_reset_function(struct device *dev, struct sdca_function_data *function, · line 78
Quoted 4 lines
sound/soc/sdca/sdca_fdl.c +4
-0+int sdca_fdl_sync (struct device *dev,struct sdca_function_data *function, +struct sdca_interrupt_info *info) +{ +static const int max_fdls =10 ;I think you can have 8 sets with 3 bits for the status. where does the 10 come from?
This is just an arbitrary number of retries before we give up. Basically for the UMP timeout case you wanted added, we now reset the function, so hopefully it will succeed on the next go.
Sorry what do you mean by 8 sets with 3 bits for the status? I am a little concerned I am missing something here. As far as I can see Set_Index is a 1 byte control, so 256 possible set numbers, and the FDL status is also 1 byte, so 8 bits for the status.
Quoted 5 lines
Quoted 5 lines
sound/soc/sdca/sdca_fdl.c +5
-0+int nfdl; +int i, j; + +for (i =0 ; i < max_fdls; i++) { + nfdl =0 ;
Quoted 8 lines
sound/soc/sdca/sdca_fdl.c int sdca_reset_function(struct device *dev, struct sdca_function_data *function, · line 88
Quoted 3 lines
sound/soc/sdca/sdca_fdl.c +3
-0+ +for (j =0 ; j <SDCA_MAX_INTERRUPTS ; j++) { +struct sdca_interrupt *interrupt = &info->irqs[j];I don't fully understand why you have the interrupt in the inner loop. For a given XU, one might think that there's a single interrupt for the XU UMP used for FDL, and that each set is sent with the same mechanism?
There probably is a single interrupt, but you need to find it first. This is called from the function boot, so it doesn't automatically have access to what that XU is, it is faster to search the IRQs than to search all the entities, as there is a lot less of them typically.
Also I don't think it is a spec requirement that there is only a single XU FDLing, so the code supports more.
Quoted 31 lines
Quoted 31 lines
sound/soc/sdca/sdca_fdl.c +31
-0+struct fdl_state *fdl_state; +unsigned long time; + +if (interrupt->function != function || + !interrupt->entity || !interrupt->control || + interrupt->entity->type !=SDCA_ENTITY_TYPE_XU || + interrupt->control->sel !=SDCA_CTL_XU_FDL_CURRENTOWNER ) +continue ; + + fdl_state = interrupt->priv; + nfdl++; + +/* +* Looking for timeout without any new FDL requests +* to imply the device has completed initial +* firmware setup. Alas the specification doesn't +* have any mechanism to detect this. +*/ + time =wait_for_completion_timeout (&fdl_state->begin, + begin_timeout); +if (!time) { +dev_dbg (dev,"no new FDL starts\n" ); + nfdl--; +continue ; + } + + time =wait_for_completion_timeout (&fdl_state->done, + done_timeout); +if (!time) { +dev_err (dev,"timed out waiting for FDL to complete\n" ); +return -ETIMEDOUT ;
Quoted 8 lines
sound/soc/sdca/sdca_fdl.c int sdca_reset_function(struct device *dev, struct sdca_function_data *function, · line 125
Quoted 6 lines
sound/soc/sdca/sdca_fdl.c +6
-0+ } + } + +if (!nfdl) +return 0 ; + }Why don't you use the mask provided in the
NEEDS_SETmessage?
Perhaps I am misunderstanding here, but NEEDS_SET contains no data, it just tells you to read the FDL_Set_Index control. Which then gives you a single set index to download. The device may then go on to request a second set?
Quoted 4 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+ + dev_err(dev, "too many FDL quests\n");requests?
lol oops, as accidentally hilarious as this is I will fix.
Thanks,
Charles
Charles Keepax
maintainerPATCH v2 17/19 ASoC: SDCA: Add UMP timeout handling for FDL
In reply to Charles KeepaxSeveral of the UMP transactions in the FDL process should timeout if the device does not respond within a certain time, add handling into the UMP helpers and the FDL code to handle this.
---
New since v1.
include/sound/sdca_fdl.h | 5 +++++ include/sound/sdca_ump.h | 5 +++++ sound/soc/sdca/sdca_fdl.c | 24 ++++++++++++++++++++++++ sound/soc/sdca/sdca_ump.c | 15 +++++++++++++++ 4 files changed, 49 insertions(+)
include/sound/sdca_fdl.h +5 -0
@@ -11,6 +11,7 @@#define __SDCA_FDL_H__#include <linux/completion.h> +#include <linux/workqueue.h> struct device ;struct regmap ;
@@ -23,13 +24,17 @@ struct sdca_interrupt_info;* struct fdl_state - FDL state structure to keep data between interrupts * @begin: Completion indicating the start of an FDL download cycle. * @done: Completion indicating the end of an FDL download cycle. +* @timeout: Delayed work used for timing out UMP transactions. +* @interrupt: Pointer to the interrupt struct to which this FDL is attached. * @set: Pointer to the FDL set currently being downloaded. * @file_index: Index of the current file being processed. */ struct fdl_state {struct completion begin;struct completion done; +struct delayed_work timeout; +struct sdca_interrupt *interrupt;struct sdca_fdl_set *set;int file_index; };
include/sound/sdca_ump.h +5 -0
@@ -15,6 +15,7 @@ struct sdca_control;struct sdca_entity ;struct sdca_function_data ;struct snd_soc_component ; +struct delayed_work ; int sdca_ump_get_owner_host(struct device *dev, struct regmap *function_regmap,
@@ -42,4 +43,8 @@ int sdca_ump_write_message(struct device *dev,unsigned int length_sel, void *msg, int msg_len); +void sdca_ump_cancel_timeout (struct delayed_work *work); +void sdca_ump_schedule_timeout (struct delayed_work *work, +unsigned int timeout_us); +#endif // __SDCA_UMP_H__
sound/soc/sdca/sdca_fdl.c +24 -0
@@ -297,6 +297,19 @@ static void fdl_end(struct sdca_interrupt *interrupt)dev_dbg (interrupt->dev,"completed FDL process\n" ); } +static void sdca_fdl_timeout_work (struct work_struct *work) +{ + struct fdl_state *fdl_state = container_of(work, struct fdl_state, + timeout.work); +struct sdca_interrupt *interrupt = fdl_state->interrupt; +struct device *dev = interrupt->dev; + +dev_err (dev,"FDL transaction timed out\n" ); + +fdl_end (interrupt); +sdca_reset_function (dev, interrupt->function, interrupt->function_regmap); +} +static unsigned int fdl_status_process (struct sdca_interrupt *interrupt,unsigned int status) {
@@ -360,6 +373,7 @@ int sdca_fdl_process(struct sdca_interrupt *interrupt) {struct device *dev = interrupt->dev;struct sdca_entity_xu *xu = &interrupt->entity->xu; +struct fdl_state *fdl_state = interrupt->priv;unsigned int reg, status, response;int ret;
@@ -369,6 +383,8 @@ int sdca_fdl_process(struct sdca_interrupt *interrupt)if (ret)return ret; +sdca_ump_cancel_timeout (&fdl_state->timeout); + reg =SDW_SDCA_CTL (interrupt->function->desc->adr, interrupt->entity->id,SDCA_CTL_XU_FDL_STATUS ,0 ); ret =regmap_read (interrupt->function_regmap, reg, &status);
@@ -414,7 +430,13 @@ int sdca_fdl_process(struct sdca_interrupt *interrupt)return 0 ; } +case SDCA_CTL_XU_FDLH_COMPLETE : +if (status &SDCA_CTL_XU_FDLD_REQ_ABORT || + status ==SDCA_CTL_XU_FDLD_COMPLETE ) +return 0 ; + fallthrough;default : +sdca_ump_schedule_timeout (&fdl_state->timeout, xu->max_delay);return 0 ; } }
@@ -435,8 +457,10 @@ int sdca_fdl_alloc_state(struct sdca_interrupt *interrupt)if (!fdl_state)return -ENOMEM ; +INIT_DELAYED_WORK (&fdl_state->timeout, sdca_fdl_timeout_work);init_completion (&fdl_state->begin);init_completion (&fdl_state->done); + fdl_state->interrupt = interrupt; interrupt->priv = fdl_state;
sound/soc/sdca/sdca_ump.c +15 -0
@@ -245,3 +245,18 @@ int sdca_ump_write_message(struct device *dev,return 0 ; }EXPORT_SYMBOL_NS_GPL (sdca_ump_write_message,"SND_SOC_SDCA" ); + +void sdca_ump_cancel_timeout (struct delayed_work *work) +{ +cancel_delayed_work_sync (work); +} +EXPORT_SYMBOL_NS_GPL (sdca_ump_cancel_timeout,"SND_SOC_SDCA" ); + +void sdca_ump_schedule_timeout (struct delayed_work *work,unsigned int timeout_us) +{ +if (!timeout_us) +return ; + +queue_delayed_work (system_wq, work,usecs_to_jiffies (timeout_us)); +} +EXPORT_SYMBOL_NS_GPL (sdca_ump_schedule_timeout,"SND_SOC_SDCA" );
Signature · 1 line
2.47.3
Charles Keepax
maintainerPATCH v2 18/19 ASoC: SDCA: Add early IRQ handling
In reply to Charles KeepaxSome IRQs (FDL) require processing before the primary soundcard is brought up, as the downloaded files could be firmware required for operation of the audio functions of the device. Add a new helper function which registers the required IRQs.
---
No changes since v1.
include/sound/sdca_interrupts.h | 3 ++ sound/soc/sdca/sdca_interrupts.c | 71 ++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+)
include/sound/sdca_interrupts.h +3 -0
@@ -75,6 +75,9 @@ int sdca_irq_data_populate(struct device *dev, struct regmap *function_regmap,struct sdca_entity *entity, struct sdca_control *control, struct sdca_interrupt *interrupt); +int sdca_irq_populate_early (struct device *dev,struct regmap *function_regmap, +struct sdca_function_data *function, +struct sdca_interrupt_info *info);int sdca_irq_populate (struct sdca_function_data *function,struct snd_soc_component *component,struct sdca_interrupt_info *info);
sound/soc/sdca/sdca_interrupts.c +71 -0
77 lines not on this page · raw message
Signature · 1 line
2.47.3
Charles Keepax
maintainerPATCH v2 19/19 ASoC: SDCA: Add HID button IRQ
In reply to Charles KeepaxNow full support for the UMP buffers is available, it is possible to read the SDCA HID descriptors from the device and pass them to user-space. Add a helper function to process HID events from an SDCA device.
---
No changes since v1.
include/sound/sdca_hid.h | 13 +++++++-- sound/soc/sdca/sdca_hid.c | 46 ++++++++++++++++++++++++++++++++ sound/soc/sdca/sdca_interrupts.c | 28 +++++++++++++++++++ 3 files changed, 85 insertions(+), 2 deletions(-)
include/sound/sdca_hid.h +11 -2
@@ -8,13 +8,17 @@#ifndef __SDCA_HID_H__#define __SDCA_HID_H__ -#include <linux/types.h> -#include <linux/hid.h> +struct device ; +struct sdw_slave ; + +struct sdca_entity ; +struct sdca_interrupt ;#if IS_ENABLED (CONFIG_SND_SOC_SDCA_HID )int sdca_add_hid_device (struct device *dev,struct sdw_slave *sdw,struct sdca_entity *entity); +int sdca_hid_process_report (struct sdca_interrupt *interrupt);#else
@@ -24,6 +28,11 @@ static inline int sdca_add_hid_device(struct device *dev, struct sdw_slave *sdw,return 0 ; } +static inline int sdca_hid_process_report (struct sdca_interrupt *interrupt) +{ +return 0 ; +} +#endif #endif /* __SDCA_HID_H__ */
sound/soc/sdca/sdca_hid.c +46 -0
63 lines not on this page · raw message
sound/soc/sdca/sdca_interrupts.c +28 -0
@@ -20,6 +20,7 @@#include <sound/sdca.h> #include <sound/sdca_fdl.h> #include <sound/sdca_function.h> +#include <sound/sdca_hid.h> #include <sound/sdca_interrupts.h> #include <sound/sdca_ump.h> #include <sound/soc-component.h>
@@ -247,6 +248,29 @@ static irqreturn_t detected_mode_handler(int irq, void *data)return irqret; } +static irqreturn_t hid_handler (int irq,void *data) +{ +struct sdca_interrupt *interrupt = data; +struct device *dev = interrupt->dev; +irqreturn_t irqret =IRQ_NONE ; +int ret; + + ret =pm_runtime_get_sync (dev); +if (ret <0 ) { +dev_err (dev,"failed to resume for hid: %d\n" , ret); + goto error; + } + + ret =sdca_hid_process_report (interrupt); +if (ret) + goto error; + + irqret =IRQ_HANDLED ; +error: +pm_runtime_put (dev); +return irqret; +} +static irqreturn_t fdl_owner_handler (int irq,void *data) {struct sdca_interrupt *interrupt = data;
@@ -528,6 +552,10 @@ int sdca_irq_populate(struct sdca_function_data *function, handler = fdl_owner_handler; }break ; +case SDCA_ENTITY_TYPE_HIDE : +if (control->sel ==SDCA_CTL_HIDE_HIDTX_CURRENTOWNER ) + handler = hid_handler; +break ;default :break ; }
Signature · 1 line
2.47.3
Quoted 50 lines · Charles Keepax
Next installment of the SDCA changes, hopefully the next series after this should be the full class driver. It is worth noting this series has a build dependency on a patch working its way through the PM/ACPI tree:
commit
ac46f5b6c661("ACPICA: Add SoundWire File Table (SWFT) signature")git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.gitBut we can probably worry about that later, as normally there is a reasonable amount of review on these SDCA series'.
This series broadly breaks down into 3 chunks, first there are several changes to remove the assumption that the struct device used for SDCA purposes represents the SoundWire slave. This is because the SDCA class driver will be made of an auxiliary driver for each SDCA Function, thus the SoundWire slave will be on the parent device for each individual driver. Then there are patches to add support for UMP/FDL. And then finally since the rest of the HID support is there and UMP was the last missing part required a small patch to add a function to allow reporting of HID events from SDCA devices.
Thanks,
CharlesChanges since v1:
- Add timeout for UMP buffer transfers
- Add function reset
- Parse XU properties from DisCo
- Renameentity_xulibrary to FDL
- Add a limit to the number of times it will try the FDL process
- Rename soundwire device pointers to sdev to distinguish from Function devices pointersCharles Keepax (16):
ASoC: SDCA: Rename SoundWire struct device variables
regmap: sdw-mbq: Don't assume the regmap device is the SoundWire slave
ASoC: SDCA: Add manual PM runtime gets to IRQ handlers
ASoC: SDCA: Pass SoundWire slave to HID
ASoC: SDCA: Pass device register map from IRQ alloc to handlers
ASoC: SDCA: Updateexternally_requestedflag to cover all requests
ASoC: SDCA: Factor out a helper to find SDCA IRQ data
ASoC: SDCA: Rely less on the ASoC component in IRQ handling
ASoC: SDCA: Force some SDCA Controls to be volatile
ASoC: SDCA: Parse XU Entity properties
ASoC: SDCA: Parse Function Reset max delay
ASoC: SDCA: Add UMP buffer helper functions
ASoC: SDCA: Add completion for FDL start and stop
ASoC: SDCA: Add UMP timeout handling for FDL
ASoC: SDCA: Add early IRQ handling
ASoC: SDCA: Add HID button IRQ
Quoted 8 lines
Maciej Strozek (3):
ASoC: SDCA: Add SDCA FDL data parsing
ASoC: SDCA: Add FDL library for XU entities
ASoC: SDCA: Add FDL-specific IRQ processingMarco Crivellari (1):
ASoC: replace use ofsystem_unbound_wqwithsystem_dfl_wq
For this series
Pierre-Louis Bossart
reviewerQuoted 10 lines · Charles Keepax
Next installment of the SDCA changes, hopefully the next series after this should be the full class driver. It is worth noting this series has a build dependency on a patch working its way through the PM/ACPI tree:
commit
ac46f5b6c661("ACPICA: Add SoundWire File Table (SWFT) signature")git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.gitBut we can probably worry about that later, as normally there is a reasonable amount of review on these SDCA series'.
Quoted 9 lines
This series broadly breaks down into 3 chunks, first there are several changes to remove the assumption that the struct device used for SDCA purposes represents the SoundWire slave. This is because the SDCA class driver will be made of an auxiliary driver for each SDCA Function, thus the SoundWire slave will be on the parent device for each individual driver. Then there are patches to add support for UMP/FDL. And then finally since the rest of the HID support is there and UMP was the last missing part required a small patch to add a function to allow reporting of HID events from SDCA devices.
This is starting to look quite good...
There are still a number of opens on the UMP flows, but I won't be able to follow-up until late Fall so no objections from me if this is merged and later improved. Thanks Charles and Maciej for this contribution!
Mark Brown
maintainerQuoted 8 lines · Charles Keepax
Next installment of the SDCA changes, hopefully the next series after this should be the full class driver. It is worth noting this series has a build dependency on a patch working its way through the PM/ACPI tree:
commit
ac46f5b6c661("ACPICA: Add SoundWire File Table (SWFT) signature")git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[01/19] ASoC: SDCA: Rename SoundWire struct device variables
commit: 715159314dfafee66e6deb50b4e3431539a919d8
[02/19] regmap: sdw-mbq: Don't assume the regmap device is the SoundWire slave
commit: 013a3a66f25af3fb614f45df43983657514944c4
[03/19] ASoC: SDCA: Add manual PM runtime gets to IRQ handlers
commit: 907364ea3db47530751add6d2d62122ca17329cb
[04/19] ASoC: SDCA: Pass SoundWire slave to HID
commit: 7159816707dc7040fe3ac4fa3d7ac3d173bd772a
[05/19] ASoC: SDCA: Pass device register map from IRQ alloc to handlers
commit: 390c05f47d0749b24db65586482308c5fd680fe5
[06/19] ASoC: SDCA: Update externally_requested flag to cover all requests
commit: 56bbda23d4bece7ce998666118a068e4f71d59fb
[07/19] ASoC: SDCA: Factor out a helper to find SDCA IRQ data
commit: 8d557cc4867f2008f440c54b4423464301a1ef4b
[08/19] ASoC: SDCA: Rely less on the ASoC component in IRQ handling
commit: dfe7c3401ed3d3bd8e61be8d6d452896513eb52e
[09/19] ASoC: SDCA: Force some SDCA Controls to be volatile
commit: c7b6c6b60594fd1efe35c61bc6a2176b25263ccc
[10/19] ASoC: SDCA: Parse XU Entity properties
commit: 0a5e9769d088bd1d8faf01207210911b9341b62c
[11/19] ASoC: SDCA: Parse Function Reset max delay
commit: 7b6be935e7eff06025e18cea4c6620194450abe2
[12/19] ASoC: SDCA: Add UMP buffer helper functions
commit: daab108504be73182c16a72b9cfe47ac3b1928ca
[13/19] ASoC: SDCA: Add SDCA FDL data parsing
commit: c4d096c3ca425562192a3626c30e82651d0f2c1c
[14/19] ASoC: SDCA: Add FDL library for XU entities
commit: 71f7990a34cdb11f82d3cbbcddaca77a55635466
[15/19] ASoC: SDCA: Add FDL-specific IRQ processing
commit: aeaf27ec6571527e750eed84bb3865a0664ae316
[16/19] ASoC: SDCA: Add completion for FDL start and stop
commit: 0723affa1bee50c3bd7ca00e00dee07fcef224b8
[17/19] ASoC: SDCA: Add UMP timeout handling for FDL
commit: e92e25f777483b7cc3e170214cc84337d7a415cf
[18/19] ASoC: SDCA: Add early IRQ handling
commit: 12aa3160c10a3179c73c4f99a2d5aec0fd907d0c
[19/19] ASoC: SDCA: Add HID button IRQ
commit: ef042df96d0e1089764f39ede61bc8f140a4be00All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark