On Tue, Jan 15, 2019 at 10:18:02PM -0800, Guenter Roeck wrote: > On Wed, Dec 26, 2018 at 03:03:19PM +0800, Cheng-Yi Chiang wrote: > > Add a codec driver to control ChromeOS EC codec. > > > > Use EC Host command to enable/disable I2S recording and control other > > configurations. > > > > Signed-off-by: Cheng-Yi Chiang <cychi...@chromium.org> > > --- > > Changes in v3: > > 1.remove cros_ec_codec.h. > > 2.Fix error code overriding in > > set_i2s_config > > set_i2s_sample_depth > > set_bclk > > get_ec_mic_gain > > set_ec_mic_gain > > enable_i2s > > 3.Fix missing return code in cros_ec_i2s_set_dai_fmt. > > 4.Simplify return code in cros_ec_i2s_hw_params and mic_gain_put. > > 5.Remove useless debug message in cros_ec_codec_platform_probe. > > > > MAINTAINERS | 2 + > > sound/soc/codecs/Kconfig | 8 + > > sound/soc/codecs/Makefile | 2 + > > sound/soc/codecs/cros_ec_codec.c | 454 +++++++++++++++++++++++++++++++ > > 4 files changed, 466 insertions(+) > > create mode 100644 sound/soc/codecs/cros_ec_codec.c > > > > diff --git a/MAINTAINERS b/MAINTAINERS > > index 05e1922624e58..d66f80f3252d7 100644 > > --- a/MAINTAINERS > > +++ b/MAINTAINERS > > @@ -3638,8 +3638,10 @@ F: drivers/platform/chrome/ > > > > CHROMEOS EC CODEC DRIVER > > M: Cheng-Yi Chiang <cychi...@chromium.org> > > +R: Enric Balletbo i Serra <enric.balle...@collabora.com> > > S: Maintained > > F: Documentation/devicetree/bindings/sound/google,cros-ec-codec.txt > > +F: sound/soc/codecs/cros_ec_codec.* > > > > CIRRUS LOGIC AUDIO CODEC DRIVERS > > M: Brian Austin <brian.aus...@cirrus.com> > > diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig > > index 87cb9c51e6f5a..0b36428159b71 100644 > > --- a/sound/soc/codecs/Kconfig > > +++ b/sound/soc/codecs/Kconfig > > @@ -50,6 +50,7 @@ config SND_SOC_ALL_CODECS > > select SND_SOC_BT_SCO > > select SND_SOC_BD28623 > > select SND_SOC_CQ0093VC > > + select SND_SOC_CROS_EC_CODEC > > This unconditionally selects SND_SOC_CROS_EC_CODEC, but SND_SOC_CROS_EC_CODEC > depends on MFD_CROS_EC. This is missing an "if MFD_CROS_EC" qualifier. > > > select SND_SOC_CS35L32 if I2C > > select SND_SOC_CS35L33 if I2C > > select SND_SOC_CS35L34 if I2C > > @@ -457,6 +458,13 @@ config SND_SOC_CPCAP > > config SND_SOC_CQ0093VC > > tristate > > > > +config SND_SOC_CROS_EC_CODEC > > + tristate "codec driver for ChromeOS EC" > > + depends on MFD_CROS_EC > > + help > > + If you say yes here you will get support for the > > + ChromeOS Embedded Controller's Audio Codec. > > + > > config SND_SOC_CS35L32 > > tristate "Cirrus Logic CS35L32 CODEC" > > depends on I2C > > diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile > > index 9bb3346fab2fe..3cfd8f5f61705 100644 > > --- a/sound/soc/codecs/Makefile > > +++ b/sound/soc/codecs/Makefile > > @@ -42,6 +42,7 @@ snd-soc-bd28623-objs := bd28623.o > > snd-soc-bt-sco-objs := bt-sco.o > > snd-soc-cpcap-objs := cpcap.o > > snd-soc-cq93vc-objs := cq93vc.o > > +snd-soc-cros-ec-codec-objs := cros_ec_codec.o > > snd-soc-cs35l32-objs := cs35l32.o > > snd-soc-cs35l33-objs := cs35l33.o > > snd-soc-cs35l34-objs := cs35l34.o > > @@ -310,6 +311,7 @@ obj-$(CONFIG_SND_SOC_BD28623) += snd-soc-bd28623.o > > obj-$(CONFIG_SND_SOC_BT_SCO) += snd-soc-bt-sco.o > > obj-$(CONFIG_SND_SOC_CQ0093VC) += snd-soc-cq93vc.o > > obj-$(CONFIG_SND_SOC_CPCAP) += snd-soc-cpcap.o > > +obj-$(CONFIG_SND_SOC_CROS_EC_CODEC) += snd-soc-cros-ec-codec.o > > obj-$(CONFIG_SND_SOC_CS35L32) += snd-soc-cs35l32.o > > obj-$(CONFIG_SND_SOC_CS35L33) += snd-soc-cs35l33.o > > obj-$(CONFIG_SND_SOC_CS35L34) += snd-soc-cs35l34.o > > diff --git a/sound/soc/codecs/cros_ec_codec.c > > b/sound/soc/codecs/cros_ec_codec.c > > new file mode 100644 > > index 0000000000000..85ea23f4b681c > > --- /dev/null > > +++ b/sound/soc/codecs/cros_ec_codec.c > > @@ -0,0 +1,454 @@ > > +// SPDX-License-Identifier: GPL-2.0 > > +/* > > + * Driver for ChromeOS Embedded Controller codec. > > + * > > + * This driver uses the cros-ec interface to communicate with the ChromeOS > > + * EC for audio function. > > + */ > > + > > +#include <linux/delay.h> > > +#include <linux/device.h> > > +#include <linux/kernel.h> > > +#include <linux/mfd/cros_ec.h> > > +#include <linux/mfd/cros_ec_commands.h> > > +#include <linux/module.h> > > +#include <linux/platform_device.h> > > +#include <sound/pcm.h> > > +#include <sound/pcm_params.h> > > +#include <sound/soc.h> > > +#include <sound/tlv.h> > > + > > +#define MAX_GAIN 43 > > Is there some reason for this magic number ? What does it reflect ? > > > + > > +#define DRV_NAME "cros-ec-codec" > > + > > +/** > > + * struct cros_ec_codec_data - ChromeOS EC codec driver data. > > + * @dev: Device structure used in sysfs. > > + * @ec_device: cros_ec_device structure to talk to the physical device. > > + * @component: Pointer to the component. > > + */ > > +struct cros_ec_codec_data { > > + struct device *dev; > > + struct cros_ec_device *ec_device; > > + struct snd_soc_component *component; > > +}; > > + > > +static const DECLARE_TLV_DB_SCALE(ec_mic_gain_tlv, 0, 100, 0); > > +/* > > + * Wrapper for EC command. > > + */ > > +static int ec_command(struct snd_soc_component *component, int version, > > + int command, u8 *outdata, int outsize, > > + u8 *indata, int insize) > > +{ > > + struct cros_ec_codec_data *codec_data = > > + snd_soc_component_get_drvdata(component); > > + struct cros_ec_device *ec_device = codec_data->ec_device; > > + struct cros_ec_command *msg; > > + int ret; > > + > > + msg = kzalloc(sizeof(*msg) + max(insize, outsize), GFP_KERNEL); > > + if (!msg) > > + return -ENOMEM; > > As far as I can see, the calling parameter is always "struct > ec_param_codec_i2s". > With that in mind, this code seems unnecessarily complex. Is this code > expected > to be called multiple times in parallel and requires multiple instances of > struct ec_param_codec_i2s to be allocated ? Even if so, why not just use > a local variable / array ? > > [ This makes me wonder how EC transfers are synchronized in > cros_ec_cmd_xfer_status() and below. Does anyone know ? I don't immedately > see it. > ] > Answering this part myself: locking is implemented in cros_ec_cmd_xfer(), which is called from cros_ec_cmd_xfer_status(). No idea why I didn't see that earlier.
Guenter