2021-01-14 06:56:07

by Yu-Hsuan Hsu

Subject: [PATCH v6 1/2] cros_ec_commands: Add EC_CODEC_I2S_RX_RESET

Add the new command EC_CODEC_I2S_RX_RESET in ec_codec_i2s_rx_subcmd,
which is used for resetting the EC codec.

Signed-off-by: Yu-Hsuan Hsu <[email protected]>
---
include/linux/platform_data/cros_ec_commands.h | 1 +
1 file changed, 1 insertion(+)

diff --git a/include/linux/platform_data/cros_ec_commands.h b/include/linux/platform_data/cros_ec_commands.h
index 86376779ab31..95889ada83a3 100644
--- a/include/linux/platform_data/cros_ec_commands.h
+++ b/include/linux/platform_data/cros_ec_commands.h
@@ -4600,6 +4600,7 @@ enum ec_codec_i2s_rx_subcmd {
EC_CODEC_I2S_RX_SET_SAMPLE_DEPTH = 0x2,
EC_CODEC_I2S_RX_SET_DAIFMT = 0x3,
EC_CODEC_I2S_RX_SET_BCLK = 0x4,
+ EC_CODEC_I2S_RX_RESET = 0x5,
EC_CODEC_I2S_RX_SUBCMD_COUNT,
};

--
2.30.0.284.gd98b1dd5eaa7-goog

2021-01-14 06:56:58

by Yu-Hsuan Hsu

Subject: [PATCH v6 2/2] ASoC: cros_ec_codec: Reset I2S RX when probing

It is not guaranteed that I2S RX is disabled when the kernel booting.
For example, if the kernel crashes while it is enabled, it will keep
enabled until the next time EC reboots. Reset I2S RX when probing to
fix this issue.

Signed-off-by: Yu-Hsuan Hsu <[email protected]>
---
Returns the error code when it fails to reset.

sound/soc/codecs/cros_ec_codec.c | 12 ++++++++++++
1 file changed, 12 insertions(+)

diff --git a/sound/soc/codecs/cros_ec_codec.c b/sound/soc/codecs/cros_ec_codec.c
index f33a2a9654e7..40e437aa1d55 100644
--- a/sound/soc/codecs/cros_ec_codec.c
+++ b/sound/soc/codecs/cros_ec_codec.c
@@ -1011,6 +1011,18 @@ static int cros_ec_codec_platform_probe(struct platform_device *pdev)
}
priv->ec_capabilities = r.capabilities;

+ /* Reset EC codec i2s rx. */
+ p.cmd = EC_CODEC_I2S_RX_RESET;
+ ret = send_ec_host_command(priv->ec_device, EC_CMD_EC_CODEC_I2S_RX,
+ (uint8_t *)&p, sizeof(p), NULL, 0);
+ if (ret == -ENOPROTOOPT) {
+ dev_info(dev,
+ "Command not found. Please update the EC firmware.\n");
+ } else if (ret) {
+ dev_err(dev, "failed to EC_CODEC_I2S_RESET: %d\n", ret);
+ return ret;
+ }
+
platform_set_drvdata(pdev, priv);

ret = devm_snd_soc_register_component(dev, &i2s_rx_component_driver,
--
2.30.0.284.gd98b1dd5eaa7-goog

2021-01-14 10:18:03

by Enric Balletbo i Serra

Subject: Re: [PATCH v6 2/2] ASoC: cros_ec_codec: Reset I2S RX when probing

Hi Yu-Hsuan,

On 14/1/21 7:54, Yu-Hsuan Hsu wrote:
> It is not guaranteed that I2S RX is disabled when the kernel booting.
> For example, if the kernel crashes while it is enabled, it will keep
> enabled until the next time EC reboots. Reset I2S RX when probing to
> fix this issue.
>
> Signed-off-by: Yu-Hsuan Hsu <[email protected]>
> ---
> Returns the error code when it fails to reset.
>
> sound/soc/codecs/cros_ec_codec.c | 12 ++++++++++++
> 1 file changed, 12 insertions(+)
>
> diff --git a/sound/soc/codecs/cros_ec_codec.c b/sound/soc/codecs/cros_ec_codec.c
> index f33a2a9654e7..40e437aa1d55 100644
> --- a/sound/soc/codecs/cros_ec_codec.c
> +++ b/sound/soc/codecs/cros_ec_codec.c
> @@ -1011,6 +1011,18 @@ static int cros_ec_codec_platform_probe(struct platform_device *pdev)
> }
> priv->ec_capabilities = r.capabilities;
>
> + /* Reset EC codec i2s rx. */
> + p.cmd = EC_CODEC_I2S_RX_RESET;
> + ret = send_ec_host_command(priv->ec_device, EC_CMD_EC_CODEC_I2S_RX,
> + (uint8_t *)&p, sizeof(p), NULL, 0);
> + if (ret == -ENOPROTOOPT) {
> + dev_info(dev,
> + "Command not found. Please update the EC firmware.\n");

Nitpicking a bit. I'd add which command is not found to give more information to
the user that gets into that path. Command not found is too generic for me.

But,

Reviewed-by: Enric Balletbo i Serra <[email protected]>

> + } else if (ret) {
> + dev_err(dev, "failed to EC_CODEC_I2S_RESET: %d\n", ret);
> + return ret;
> + }
> +
> platform_set_drvdata(pdev, priv);
>
> ret = devm_snd_soc_register_component(dev, &i2s_rx_component_driver,
>

2021-01-14 10:23:04

by Enric Balletbo i Serra

Subject: Re: [PATCH v6 1/2] cros_ec_commands: Add EC_CODEC_I2S_RX_RESET

Hi,

On 14/1/21 7:54, Yu-Hsuan Hsu wrote:
> Add the new command EC_CODEC_I2S_RX_RESET in ec_codec_i2s_rx_subcmd,
> which is used for resetting the EC codec.
>
> Signed-off-by: Yu-Hsuan Hsu <[email protected]>

For if Mark wants to take this patch through his tree.

Acked-by: Enric Balletbo i Serra <[email protected]>

> ---
> include/linux/platform_data/cros_ec_commands.h | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/include/linux/platform_data/cros_ec_commands.h b/include/linux/platform_data/cros_ec_commands.h
> index 86376779ab31..95889ada83a3 100644
> --- a/include/linux/platform_data/cros_ec_commands.h
> +++ b/include/linux/platform_data/cros_ec_commands.h
> @@ -4600,6 +4600,7 @@ enum ec_codec_i2s_rx_subcmd {
> EC_CODEC_I2S_RX_SET_SAMPLE_DEPTH = 0x2,
> EC_CODEC_I2S_RX_SET_DAIFMT = 0x3,
> EC_CODEC_I2S_RX_SET_BCLK = 0x4,
> + EC_CODEC_I2S_RX_RESET = 0x5,
> EC_CODEC_I2S_RX_SUBCMD_COUNT,
> };
>
>