February 2020 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH - 1/1] pcm: direct: Round down of slave_hw_ptr when buffer size is two period size
by vanitha.channaiah＠in.bosch.com 06 Feb '20

06 Feb '20

From: Vanitha Channaiah <vanitha.channaiah(a)in.bosch.com> For buffer size equal to two period size, the start position of slave_hw_ptr is rounded down in order to avoid xruns For e.g.: Considering below parameters and its values: Period size = 96 (0x60) Buffer size = 192 (0xC0) Timer ticks = 1 avail_min = 0x60 slave_hw_ptr = unaligned value during dmix_start() Issue: - Initial, app_ptr = hw_ptr = 0 - Application fills buffer size of data. so app_ptr = 0xC0, hw_ptr = 0 - During dmix_start(), current slave_hw_ptr is not rounded down. current slave_hw_ptr would be 0x66 - slave_hw_ptr is keep on updating at the hardware 0x67, 0x68, 0x69 - The diff calculation between old_slave_hw_ptr(0x66) and new_slave_hw_ptr(0x69) results in avail = 0x6 - After 1 snd_pcm_period_elapsed(), slave_hw_ptr = 0xC0 - The result of avail = 0x5A which is less than avail_min(0x60) - Here, xruns will be observed Fix: - Initial, app_ptr = hw_ptr = 0 - Application fills buffer size of data. so app_ptr = 0xC0, hw_ptr = 0 - Round down of slave_hw_ptr during dmix_start() leads to below calculation: - During dmix_start(), slave_hw_ptr rounded to 0x60 (old slave_hw_ptr) - The diff calculation between old_slave_hw_ptr(0x60) and new_slave_hw_ptr(0x69) results in avail = 0x9 - After 1 snd_pcm_period_elapsed(), slave_hw_ptr = 0xC0 - The result of avail = 0x60 which is avail_min(0x60) - Here, xruns can be avoided Signed-off-by: Vanitha Channaiah <vanitha.channaiah(a)in.bosch.com> diff --git a/src/pcm/pcm_direct.c b/src/pcm/pcm_direct.c index 54d9900..a201fa3 100644 --- a/src/pcm/pcm_direct.c +++ b/src/pcm/pcm_direct.c @@ -2043,10 +2043,14 @@ int snd_pcm_direct_parse_open_conf(snd_config_t *root, snd_config_t *conf, void snd_pcm_direct_reset_slave_ptr(snd_pcm_t *pcm, snd_pcm_direct_t *dmix) { + /* + * For buffer size equal to two period size, slave_hw_ptr is rounded down + * to avoid xruns + */ if (dmix->hw_ptr_alignment == SND_PCM_HW_PTR_ALIGNMENT_ROUNDUP || (dmix->hw_ptr_alignment == SND_PCM_HW_PTR_ALIGNMENT_AUTO && - pcm->buffer_size <= pcm->period_size * 2)) + pcm->buffer_size < pcm->period_size * 2)) dmix->slave_appl_ptr = ((dmix->slave_appl_ptr + dmix->slave_period_size - 1) / dmix->slave_period_size) * dmix->slave_period_size; -- 2.7.4

3 3

[alsa-devel] HP ALC671 Platform update (again)
by Kailang 06 Feb '20

06 Feb '20

Hi Takashi, HP want to keep BIOS verb table setting for release platform. So, one of platform need to add 0x19 pin for verb quirk. This patch was verified by Canonical. Many Thanks. BR, Kailang

2 1

[alsa-devel] HP ALC671 Platform update
by Kailang 06 Feb '20

06 Feb '20

Hi Takashi, HP want to keep BIOS verb table setting for release platform. So, one of platform need to add 0x19 pin for verb quirk. This patch was verified by Canonical. Many Thanks. BR, Kailang

1 0

[alsa-devel] [PATCH alsa-utils 1/4] Use __func__ instead of __FUNCTION__
by Michael Forney 06 Feb '20

06 Feb '20

They are equivalent, but __func__ is in C99. __FUNCTION__ exists only for backwards compatibility with old gcc versions. Signed-off-by: Michael Forney <mforney(a)mforney.org> --- alsactl/alsactl.h | 16 ++++++++-------- aplay/aplay.c | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/alsactl/alsactl.h b/alsactl/alsactl.h index 4f969ec..69b539c 100644 --- a/alsactl/alsactl.h +++ b/alsactl/alsactl.h @@ -13,15 +13,15 @@ void cerror_(const char *fcn, long line, int cond, const char *fmt, ...); void dbg_(const char *fcn, long line, const char *fmt, ...); #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) -#define info(...) do { info_(__FUNCTION__, __LINE__, __VA_ARGS__); } while (0) -#define error(...) do { error_(__FUNCTION__, __LINE__, __VA_ARGS__); } while (0) -#define cerror(cond, ...) do { cerror_(__FUNCTION__, __LINE__, (cond) != 0, __VA_ARGS__); } while (0) -#define dbg(...) do { dbg_(__FUNCTION__, __LINE__, __VA_ARGS__); } while (0) +#define info(...) do { info_(__func__, __LINE__, __VA_ARGS__); } while (0) +#define error(...) do { error_(__func__, __LINE__, __VA_ARGS__); } while (0) +#define cerror(cond, ...) do { cerror_(__func__, __LINE__, (cond) != 0, __VA_ARGS__); } while (0) +#define dbg(...) do { dbg_(__func__, __LINE__, __VA_ARGS__); } while (0) #else -#define info(args...) do { info_(__FUNCTION__, __LINE__, ##args); } while (0) -#define error(args...) do { error_(__FUNCTION__, __LINE__, ##args); } while (0) -#define cerror(cond, ...) do { error_(__FUNCTION__, __LINE__, (cond) != 0, ##args); } while (0) -#define dbg(args...) do { dbg_(__FUNCTION__, __LINE__, ##args); } while (0) +#define info(args...) do { info_(__func__, __LINE__, ##args); } while (0) +#define error(args...) do { error_(__func__, __LINE__, ##args); } while (0) +#define cerror(cond, ...) do { error_(__func__, __LINE__, (cond) != 0, ##args); } while (0) +#define dbg(args...) do { dbg_(__func__, __LINE__, ##args); } while (0) #endif int init(const char *file, const char *cardname); diff --git a/aplay/aplay.c b/aplay/aplay.c index 1a887e4..908093c 100644 --- a/aplay/aplay.c +++ b/aplay/aplay.c @@ -186,13 +186,13 @@ static const struct fmt_capture { #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) #define error(...) do {\ - fprintf(stderr, "%s: %s:%d: ", command, __FUNCTION__, __LINE__); \ + fprintf(stderr, "%s: %s:%d: ", command, __func__, __LINE__); \ fprintf(stderr, __VA_ARGS__); \ putc('\n', stderr); \ } while (0) #else #define error(args...) do {\ - fprintf(stderr, "%s: %s:%d: ", command, __FUNCTION__, __LINE__); \ + fprintf(stderr, "%s: %s:%d: ", command, __func__, __LINE__); \ fprintf(stderr, ##args); \ putc('\n', stderr); \ } while (0) -- 2.25.0

3 11

[alsa-devel] [PATCH] ASoC: dt-bindings: stm32: convert i2s to json-schema
by Olivier Moysan 05 Feb '20

05 Feb '20

Convert the STM32 I2S bindings to DT schema format using json-schema. Signed-off-by: Olivier Moysan <olivier.moysan(a)st.com> --- The items for dma-names and clock-names properties are all mandatory, but may be provided in any order. The syntax used for these properties allows to avoid order constraint. --- .../bindings/sound/st,stm32-i2s.txt | 62 ------------- .../bindings/sound/st,stm32-i2s.yaml | 91 +++++++++++++++++++ 2 files changed, 91 insertions(+), 62 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/st,stm32-i2s.txt create mode 100644 Documentation/devicetree/bindings/sound/st,stm32-i2s.yaml diff --git a/Documentation/devicetree/bindings/sound/st,stm32-i2s.txt b/Documentation/devicetree/bindings/sound/st,stm32-i2s.txt deleted file mode 100644 index cbf24bcd1b8d..000000000000 --- a/Documentation/devicetree/bindings/sound/st,stm32-i2s.txt +++ /dev/null @@ -1,62 +0,0 @@ -STMicroelectronics STM32 SPI/I2S Controller - -The SPI/I2S block supports I2S/PCM protocols when configured on I2S mode. -Only some SPI instances support I2S. - -Required properties: - - compatible: Must be "st,stm32h7-i2s" - - reg: Offset and length of the device's register set. - - interrupts: Must contain the interrupt line id. - - clocks: Must contain phandle and clock specifier pairs for each entry - in clock-names. - - clock-names: Must contain "i2sclk", "pclk", "x8k" and "x11k". - "i2sclk": clock which feeds the internal clock generator - "pclk": clock which feeds the peripheral bus interface - "x8k": I2S parent clock for sampling rates multiple of 8kHz. - "x11k": I2S parent clock for sampling rates multiple of 11.025kHz. - - dmas: DMA specifiers for tx and rx dma. - See Documentation/devicetree/bindings/dma/stm32-dma.txt. - - dma-names: Identifier for each DMA request line. Must be "tx" and "rx". - - pinctrl-names: should contain only value "default" - - pinctrl-0: see Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.yaml - -Optional properties: - - resets: Reference to a reset controller asserting the reset controller - -The device node should contain one 'port' child node with one child 'endpoint' -node, according to the bindings defined in Documentation/devicetree/bindings/ -graph.txt. - -Example: -sound_card { - compatible = "audio-graph-card"; - dais = <&i2s2_port>; -}; - -i2s2: audio-controller@40003800 { - compatible = "st,stm32h7-i2s"; - reg = <0x40003800 0x400>; - interrupts = <36>; - clocks = <&rcc PCLK1>, <&rcc SPI2_CK>, <&rcc PLL1_Q>, <&rcc PLL2_P>; - clock-names = "pclk", "i2sclk", "x8k", "x11k"; - dmas = <&dmamux2 2 39 0x400 0x1>, - <&dmamux2 3 40 0x400 0x1>; - dma-names = "rx", "tx"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_i2s2>; - - i2s2_port: port@0 { - cpu_endpoint: endpoint { - remote-endpoint = <&codec_endpoint>; - format = "i2s"; - }; - }; -}; - -audio-codec { - codec_port: port@0 { - codec_endpoint: endpoint { - remote-endpoint = <&cpu_endpoint>; - }; - }; -}; diff --git a/Documentation/devicetree/bindings/sound/st,stm32-i2s.yaml b/Documentation/devicetree/bindings/sound/st,stm32-i2s.yaml new file mode 100644 index 000000000000..cdfb375c7a14 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/st,stm32-i2s.yaml @@ -0,0 +1,91 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/st,stm32-i2s.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: STMicroelectronics STM32 SPI/I2S Controller + +maintainers: + - Olivier Moysan <olivier.moysan(a)st.com> + +description: + The SPI/I2S block supports I2S/PCM protocols when configured on I2S mode. + Only some SPI instances support I2S. + +properties: + compatible: + enum: + - st,stm32h7-i2s + + "#sound-dai-cells": + const: 0 + + reg: + maxItems: 1 + + clocks: + items: + - description: clock feeding the peripheral bus interface. + - description: clock feeding the internal clock generator. + - description: I2S parent clock for sampling rates multiple of 8kHz. + - description: I2S parent clock for sampling rates multiple of 11.025kHz. + + clock-names: + items: + - enum: [ pclk, i2sclk, x8k, x11k ] + - enum: [ pclk, i2sclk, x8k, x11k ] + - enum: [ pclk, i2sclk, x8k, x11k ] + - enum: [ pclk, i2sclk, x8k, x11k ] + allOf: + - $ref: /schemas/types.yaml#/definitions/string-array + + interrupts: + maxItems: 1 + + dmas: + items: + - description: audio capture DMA. + - description: audio playback DMA. + + dma-names: + items: + - enum: [ rx, tx ] + - enum: [ rx, tx ] + allOf: + - $ref: /schemas/types.yaml#/definitions/string-array + + resets: + maxItems: 1 + +required: + - compatible + - "#sound-dai-cells" + - reg + - clocks + - clock-names + - interrupts + - dmas + - dma-names + +additionalProperties: false + +examples: + - | + #include <dt-bindings/interrupt-controller/arm-gic.h> + #include <dt-bindings/clock/stm32mp1-clks.h> + i2s2: audio-controller@4000b000 { + compatible = "st,stm32h7-i2s"; + #sound-dai-cells = <0>; + reg = <0x4000b000 0x400>; + clocks = <&rcc SPI2>, <&rcc SPI2_K>, <&rcc PLL3_Q>, <&rcc PLL3_R>; + clock-names = "pclk", "i2sclk", "x8k", "x11k"; + interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>; + dmas = <&dmamux1 39 0x400 0x01>, + <&dmamux1 40 0x400 0x01>; + dma-names = "rx", "tx"; + pinctrl-names = "default"; + pinctrl-0 = <&i2s2_pins_a>; + }; + +... -- 2.17.1

2 1

[alsa-devel] [GIT PULL] ASoC fixes for v5.6
by Mark Brown 05 Feb '20

05 Feb '20

The following changes since commit d8e2e0d2491e78f3f7b451c3a93ba29950efe2cf: ASoC: soc-core: remove null_snd_soc_ops (2020-01-23 12:20:06 +0000) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v5.6-2 for you to fetch changes up to 42b716359beca10684195fd6e93a74ecd8ca8003: ASoC: wcd934x: Add missing COMMON_CLK dependency (2020-02-04 11:22:30 +0000) ---------------------------------------------------------------- ASoC: Fixes for v5.6 A collection of updates for bugs fixed since the initial pull request, the most important one being the addition of COMMON_CLK for wcd934x which is needed for MFD to be merged. ---------------------------------------------------------------- Akshu Agrawal (1): ASoC: amd: Fix simultaneous playback and capture Bard Liao (1): ASoC: intel: soc-acpi-intel-icl-match: fix rt715 ADR Guennadi Liakhovetski (2): ASoC: SOF: fix an Oops, caused by invalid topology ASoC: Intel: consistent HDMI codec probing code Jon Hunter (1): ASoC: tegra: Revert 24 and 32 bit support Kai Vehmanen (3): ASoC: SOF: Intel: refactor i915_get/put functions ASoC: SOF: Intel: do not disable i915 power during probe ASoC: SOF: trace: fix unconditional free in trace release Marek Szyprowski (1): ASoC: max98090: silence lockdep warning Nathan Chancellor (1): ASoC: rt1015: Remove unnecessary const Oder Chiou (1): MAINTAINERS: Remove the Bard Liao from the MAINTAINERS of Realtek CODECs Pan Xiuli (1): ASoC: SOF: pci: add missing default_fw_name of JasperLake Pierre-Louis Bossart (2): ASoC: SOF: core: free trace on errors ASoC: SOF: core: release resources on errors in probe_continue Ravulapati Vishnu vardhan rao (1): ASoC: amd: Fix for Subsequent Playback issue. Srinivas Kandagatla (1): ASoC: wcd934x: Add missing COMMON_CLK dependency Takashi Iwai (4): ASoC: rt1308-sdw: Add __maybe_unused to PM callbacks ASoC: rt700: Add __maybe_unused to PM callbacks ASoC: rt711: Add __maybe_unused to PM callbacks ASoC: rt715: Add __maybe_unused to PM callbacks Yong Zhi (1): ASoC: SOF: Intel: add PCI ID for JasperLake MAINTAINERS | 1 - sound/soc/amd/raven/acp3x-i2s.c | 12 ++++--- sound/soc/amd/raven/acp3x-pcm-dma.c | 14 ++++----- sound/soc/codecs/Kconfig | 1 + sound/soc/codecs/max98090.c | 3 +- sound/soc/codecs/rt1015.c | 2 +- sound/soc/codecs/rt1308-sdw.c | 4 +-- sound/soc/codecs/rt700-sdw.c | 4 +-- sound/soc/codecs/rt711-sdw.c | 4 +-- sound/soc/codecs/rt715-sdw.c | 4 +-- sound/soc/intel/boards/bxt_da7219_max98357a.c | 14 ++++----- sound/soc/intel/boards/bxt_rt298.c | 14 ++++----- sound/soc/intel/boards/cml_rt1011_rt5682.c | 13 ++++---- sound/soc/intel/boards/glk_rt5682_max98357a.c | 16 +++++----- sound/soc/intel/boards/sof_rt5682.c | 15 ++++----- sound/soc/intel/common/soc-acpi-intel-icl-match.c | 2 +- sound/soc/sof/core.c | 38 ++++++++++------------- sound/soc/sof/intel/hda-codec.c | 21 ++++--------- sound/soc/sof/intel/hda.c | 3 +- sound/soc/sof/intel/hda.h | 7 ++--- sound/soc/sof/pcm.c | 10 ++++++ sound/soc/sof/pm.c | 4 +++ sound/soc/sof/sof-pci-dev.c | 3 ++ sound/soc/sof/trace.c | 7 +++-- sound/soc/tegra/tegra30_i2s.c | 25 +++------------ 25 files changed, 118 insertions(+), 123 deletions(-)

2 5

[alsa-devel] [PATCH] ASoC: wcd934x: Add missing COMMON_CLK dependency to SND_SOC_ALL_CODECS
by Geert Uytterhoeven 05 Feb '20

05 Feb '20

Just adding a dependency on COMMON_CLK to SND_SOC_WCD934X is not sufficient, as enabling SND_SOC_ALL_CODECS will still select it, breaking the build later: WARNING: unmet direct dependencies detected for SND_SOC_WCD934X Depends on [n]: SOUND [=m] && !UML && SND [=m] && SND_SOC [=m] && COMMON_CLK [=n] && MFD_WCD934X [=m] Selected by [m]: - SND_SOC_ALL_CODECS [=m] && SOUND [=m] && !UML && SND [=m] && SND_SOC [=m] && COMPILE_TEST [=y] && MFD_WCD934X [=m] ... ERROR: "of_clk_add_provider" [sound/soc/codecs/snd-soc-wcd934x.ko] undefined! ERROR: "of_clk_src_simple_get" [sound/soc/codecs/snd-soc-wcd934x.ko] undefined! ERROR: "clk_hw_register" [sound/soc/codecs/snd-soc-wcd934x.ko] undefined! ERROR: "__clk_get_name" [sound/soc/codecs/snd-soc-wcd934x.ko] undefined! Fix this by adding the missing dependency to SND_SOC_ALL_CODECS Fixes: 42b716359beca106 ("ASoC: wcd934x: Add missing COMMON_CLK dependency") Signed-off-by: Geert Uytterhoeven <geert(a)linux-m68k.org> --- Seen with e.g. m68k/allmodconfig. --- sound/soc/codecs/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 2865148659600346..7e90f5d830971309 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -214,7 +214,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_UDA134X select SND_SOC_UDA1380 if I2C select SND_SOC_WCD9335 if SLIMBUS - select SND_SOC_WCD934X if MFD_WCD934X + select SND_SOC_WCD934X if MFD_WCD934X && COMMON_CLK select SND_SOC_WL1273 if MFD_WL1273_CORE select SND_SOC_WM0010 if SPI_MASTER select SND_SOC_WM1250_EV1 if I2C -- 2.17.1

3 3

[alsa-devel] [PATCH 0/3] ASoC: mediatek: mt8173-rt5650: HDMI jack reporting
by Tzung-Bi Shih 05 Feb '20

05 Feb '20

The series supports HDMI jack reporting to mt8173-rt5650. The 1st patch is less related. It stops running in probe() if failed to register audio driver. The 2nd patch supports jack reporting in DRM driver. The 3rd patch supports jack reporting in mt8173-rt5650 ASoC machine driver. Tzung-Bi Shih (3): drm/mediatek: exit earlier if failed to register audio driver drm/mediatek: support HDMI jack status reporting ASoC: mediatek: mt8173-rt5650: support HDMI jack reporting drivers/gpu/drm/mediatek/mtk_hdmi.c | 52 ++++++++++++++++++++--- sound/soc/mediatek/mt8173/mt8173-rt5650.c | 17 +++++++- 2 files changed, 63 insertions(+), 6 deletions(-) -- 2.25.0.341.g760bfbb309-goog

1 3

[alsa-devel] alsa-gobject: Add support workflow of Github Actions
by GitHub pull_request - opened 05 Feb '20

05 Feb '20

alsa-project/alsa-gobject pull request #5 was opened from takaswie: Github Actions is tool to automate software development workflows for CI/CD. This tool has a remarkable point to share 'action' in repositories in github, which is a unit of processing defined by users. The users write and push 'workflow' with the 'action' into repository in github.com. When any workflow file is added to 'default' branch, the automation runs[2]. The defined actions run on virtual machine in Microsoft Azure (Standard_DS2_v2 as of today[2]). Three types of operating system are available: Windows, MacOS and Linux (Ubuntu). On the MacOS and Linux machine, 'sudo' is available to setup host environment for CI/CD, as well as Docker container is supported on the host. This commit adds a workflow file to automate build test. In this automation, Fedora 32 in Docker container and Ubuntu 19.10 in LXD container as build environments in Linux host. The automation is triggered in each 'push' and 'pull_request' event. The result is available in 'Actions' tab of repository page in github.com. [1] https://help.github.com/en/actions/automating-your-workflow-with-github-act… [2] https://help.github.com/en/actions/automating-your-workflow-with-github-act… [3] https://help.github.com/en/actions/automating-your-workflow-with-github-act… Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> Request URL : https://github.com/alsa-project/alsa-gobject/pull/5 Patch URL : https://github.com/alsa-project/alsa-gobject/pull/5.patch Repository URL: https://github.com/alsa-project/alsa-gobject

1 0

[alsa-devel] [PATCH v2] ASoC: wcd934x: Add missing COMMON_CLK dependency
by Srinivas Kandagatla 05 Feb '20

05 Feb '20

Looks like some platforms are not yet using COMMON CLK. PowerPC allyesconfig failed with below error in next ld: sound/soc/codecs/wcd934x.o:(.toc+0x0): undefined reference to `of_clk_src_simple_get' ld: sound/soc/codecs/wcd934x.o: in function `.wcd934x_codec_probe': wcd934x.c:(.text.wcd934x_codec_probe+0x3d4): undefined reference to `.__clk_get_name' ld: wcd934x.c:(.text.wcd934x_codec_probe+0x438): undefined reference to `.clk_hw_register' ld: wcd934x.c:(.text.wcd934x_codec_probe+0x474): undefined reference to `.of_clk_add_provider' Add the missing COMMON_CLK dependency to fix this errors. Reported-by: Stephen Rothwell <sfr(a)canb.auug.org.au> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> --- Changes since v1: - Rebased on top of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git next branch sound/soc/codecs/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index c9eb683bd1b0..286514865960 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -1334,6 +1334,7 @@ config SND_SOC_WCD9335 config SND_SOC_WCD934X tristate "WCD9340/WCD9341 Codec" + depends on COMMON_CLK depends on MFD_WCD934X help The WCD9340/9341 is a audio codec IC Integrated in -- 2.21.0

4 3