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

[alsa-devel] [PATCH] ASoC: soc-core: tidyup for CONFIG_DEBUG_FS
by Kuninori Morimoto 11 Dec '19

11 Dec '19

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> soc-core.c has 2 #ifdef CONFIG_DEBUG_FS, but we can merge these. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/soc-core.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 51a404f..3eb874c 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -45,11 +45,6 @@ #define NAME_SIZE 32 -#ifdef CONFIG_DEBUG_FS -struct dentry *snd_soc_debugfs_root; -EXPORT_SYMBOL_GPL(snd_soc_debugfs_root); -#endif - static DEFINE_MUTEX(client_mutex); static LIST_HEAD(component_list); static LIST_HEAD(unbind_card_list); @@ -133,6 +128,9 @@ static const struct attribute_group *soc_dev_attr_groups[] = { }; #ifdef CONFIG_DEBUG_FS +struct dentry *snd_soc_debugfs_root; +EXPORT_SYMBOL_GPL(snd_soc_debugfs_root); + static void soc_init_component_debugfs(struct snd_soc_component *component) { if (!component->card->debugfs_card_root) -- 2.7.4

2 1

[alsa-devel] [PATCH v4 00/11] soundwire: update ASoC interfaces
by Pierre-Louis Bossart 11 Dec '19

11 Dec '19

We need new fields in existing structures to a) deal with race conditions on codec probe/enumeration b) allow for multi-step ACPI scan/probe/startup on Intel plaforms c) deal with MSI issues using a single handler/threads for all audio interrupts d) deal with access to registers shared across multiple links on Intel platforms These structures for a) will be used by the SOF driver as well as codec drivers. The b) c) and d) cases are only for the Intel-specific implementation. To avoid conflicts between ASoC and Soundwire trees, these 11 patches are provided out-of-order, before the functionality enabled in these header files is added in follow-up patch series which can be applied separately in the ASoC and Soundwire trees. As discussed earlier, Vinod would need to provide an immutable tag for Mark Brown, and the integration on the ASoC side of SOF changes and new codecs drivers can proceed in parallel with SoundWire core changes. I had multiple offline discussions with Vinod/Mark/Takashi on how to proceed withe volume of SoundWire changes. Now that v5.5-rc1 is out we should go ahead with these interface changes. The next patchset has not changed, the series "[PATCH v3 00/15] soundwire: intel: implement new ASoC interfaces" can still be reviewed. An update for the series "[PATCH v3 00/22] soundwire: code hardening and suspend-resume support" will be provided later this week (one last minute issue to fix) Comments and feedback welcome ~Pierre Changes since v3: Reordered code and added kernel doc comments Added prototypes and fields needed to deal with SoundWire interrupts in a single handler/thread, following what is already done on the DSP side. Added mutex to control access to registers shared across links Added initial definitions for clock stop support on Intel platforms. Depending on power and latency requirements, different "quirks" can be supported. Changes since v2: Added new field to deal with a race condition leading to a timeout when the codec goes through a pm_runtime suspend/resume transition while the Master remains active. Clarified commit messages with detailed explanations what those race conditions are and why the changes were introduced. Reordered fields for Intel routines Added kernel-doc definitions for structures Modified the patch subjects to make the mapping between interface definition and implementation straightforward. Changes since v1 (no feedback received since October 23) additional initialization_complete utility to help codec drivers with their resume operation, waiting for the enumeration to complete is not always enough. Bard Liao (2): soundwire: intel: update headers for interrupts soundwire: intel: add link_list to handle interrupts with a single thread Pierre-Louis Bossart (7): soundwire: sdw_slave: add probe_complete structure and new fields soundwire: sdw_slave: add enumeration_complete structure soundwire: sdw_slave: add initialization_complete definition soundwire: sdw_slave: track unattach_request to handle all init sequences soundwire: intel: update interfaces between ASoC and SoundWire soundwire: intel: add mutex for shared SHIM register access soundwire: intel: add clock stop quirks Rander Wang (2): soundwire: intel: update stream callbacks for hwparams/free stream operations soundwire: intel: add prototype for WAKEEN interrupt processing drivers/soundwire/intel.c | 20 ++-- drivers/soundwire/intel.h | 13 ++- drivers/soundwire/intel_init.c | 31 ++---- include/linux/soundwire/sdw.h | 19 ++++ include/linux/soundwire/sdw_intel.h | 154 ++++++++++++++++++++++++++-- 5 files changed, 194 insertions(+), 43 deletions(-) base-commit: e42617b825f8073569da76dc4510bfa019b1c35a -- 2.20.1

2 13

Re: [alsa-devel] [v6, 5/6] ASoC: sgtl5000: Fix of unmute outputs on probe
by Alison Wang 11 Dec '19

11 Dec '19

Hi, Oleksandr, I have a question about this patch. Could you give me some ideas? Thanks. In this patch, snd_soc_component_update_bits is used instead of snd_soc_component_write. Although EN_HP_ZCD and EN_ADC_ZCD are enabled in ANA_CTRL register, MUTE_LO, MUTE_HP and MUTE_ADC bits are remained as the default value. It causes LO, HP and ADC are all muted after driver probe. BTW, in the original code, snd_soc_component_write is used and MUTE_LO, MUTE_HP and MUTE_ADC are all set as zero (unmute). I saw the above phenomenon on the latest linux-next. For LO and HP are muted, no sound can be heard. Best Regards, Alison Wang > Subject: [v6,5/6] ASoC: sgtl5000: Fix of unmute outputs on probe > > To enable "zero cross detect" for ADC/HP, change HP_ZCD_EN/ADC_ZCD_EN > bits only instead of writing the whole CHIP_ANA_CTRL register. > > Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov(a)toradex.com> > Reviewed-by: Marcel Ziswiler <marcel.ziswiler(a)toradex.com> > Reviewed-by: Igor Opaniuk <igor.opaniuk(a)toradex.com> > Reviewed-by: Fabio Estevam <festevam(a)gmail.com> > > --- > > Changes in v6: None > Changes in v5: None > Changes in v4: None > Changes in v3: None > Changes in v2: > - Fix patch formatting > > sound/soc/codecs/sgtl5000.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > > diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index > b65232521ea8..23f4ae2f0723 100644 > --- a/sound/soc/codecs/sgtl5000.c > +++ b/sound/soc/codecs/sgtl5000.c > @@ -1453,6 +1453,7 @@ static int sgtl5000_probe(struct > snd_soc_component *component) > int ret; > u16 reg; > struct sgtl5000_priv *sgtl5000 = > snd_soc_component_get_drvdata(component); > + unsigned int zcd_mask = SGTL5000_HP_ZCD_EN | > SGTL5000_ADC_ZCD_EN; > > /* power up sgtl5000 */ > ret = sgtl5000_set_power_regs(component); > @@ -1480,9 +1481,8 @@ static int sgtl5000_probe(struct > snd_soc_component *component) > 0x1f); > snd_soc_component_write(component, SGTL5000_CHIP_PAD_STRENGTH, > reg); > > - snd_soc_component_write(component, SGTL5000_CHIP_ANA_CTRL, > - SGTL5000_HP_ZCD_EN | > - SGTL5000_ADC_ZCD_EN); > + snd_soc_component_update_bits(component, > SGTL5000_CHIP_ANA_CTRL, > + zcd_mask, zcd_mask); > > snd_soc_component_update_bits(component, > SGTL5000_CHIP_MIC_CTRL, > SGTL5000_BIAS_R_MASK, >

1 0

[alsa-devel] [PATCH] ALSA: hda/realtek - Line-out jack doesn't work on a Dell AIO
by Hui Wang 11 Dec '19

11 Dec '19

After applying the fixup ALC274_FIXUP_DELL_AIO_LINEOUT_VERB, the Line-out jack works well. And instead of adding a new set of pin definition in the pin_fixup_tbl, we put a more generic matching entry in the fallback_pin_fixup_tbl. Cc: <stable(a)vger.kernel.org> Signed-off-by: Hui Wang <hui.wang(a)canonical.com> --- sound/pci/hda/patch_realtek.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 6d6e34b3b3aa..dbfafee97931 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -7643,11 +7643,6 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { {0x1a, 0x90a70130}, {0x1b, 0x90170110}, {0x21, 0x03211020}), - SND_HDA_PIN_QUIRK(0x10ec0274, 0x1028, "Dell", ALC274_FIXUP_DELL_AIO_LINEOUT_VERB, - {0x12, 0xb7a60130}, - {0x13, 0xb8a61140}, - {0x16, 0x90170110}, - {0x21, 0x04211020}), SND_HDA_PIN_QUIRK(0x10ec0280, 0x103c, "HP", ALC280_FIXUP_HP_GPIO4, {0x12, 0x90a60130}, {0x14, 0x90170110}, @@ -7841,6 +7836,9 @@ static const struct snd_hda_pin_quirk alc269_fallback_pin_fixup_tbl[] = { SND_HDA_PIN_QUIRK(0x10ec0236, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE, {0x19, 0x40000000}, {0x1a, 0x40000000}), + SND_HDA_PIN_QUIRK(0x10ec0274, 0x1028, "Dell", ALC274_FIXUP_DELL_AIO_LINEOUT_VERB, + {0x19, 0x40000000}, + {0x1a, 0x40000000}), {} }; -- 2.17.1

2 1

[alsa-devel] [alsa-lib][PATCH] ucm: setup conf_format after getting ALSA_CONFIG_UCM_VAR successfully
by libin.yang＠linux.intel.com 11 Dec '19

11 Dec '19

From: Libin Yang <libin.yang(a)linux.intel.com> Set the conf_format to 1 after getting ALSA_CONFIG_UCM_VAR successfully. Otherwise, the conf_format is not set in this scenario. Signed-off-by: Libin Yang <libin.yang(a)linux.intel.com> --- src/ucm/parser.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/ucm/parser.c b/src/ucm/parser.c index ba50027..d61124a 100644 --- a/src/ucm/parser.c +++ b/src/ucm/parser.c @@ -89,6 +89,8 @@ static void configuration_filename(snd_use_case_mgr_t *uc_mgr, env = getenv(ALSA_CONFIG_UCM2_VAR); if (env == NULL) { env = getenv(ALSA_CONFIG_UCM_VAR); + if (env) + uc_mgr->conf_format = 1; } else { uc_mgr->conf_format = 2; } -- 2.7.4

1 0

[alsa-devel] [PATCH 00/23] ALSA: Drop superfluous ioctl PCM ops (for 5.6)
by Takashi Iwai 11 Dec '19

11 Dec '19

Hi, this is another series of patches targeted to 5.6 kernel. This one is applied on top of the previous series for managed allocation, and again specific to non-ASoC drivers in sound/*. For ASoC and other subsystems, another patchset will be submitted later. The changes are pretty simple, just removing the snd_pcm_lib_ioctl entries that became superfluous. Takashi === Takashi Iwai (23): ALSA: aoa: Drop superfluous ioctl PCM ops ALSA: arm: Drop superfluous ioctl PCM ops ALSA: atmel: Drop superfluous ioctl PCM ops ALSA: drivers: Drop superfluous ioctl PCM ops ALSA: firewire: Drop superfluous ioctl PCM ops ALSA: es1688: Drop superfluous ioctl PCM ops ALSA: isa: Drop superfluous ioctl PCM ops ALSA: mips: Drop superfluous ioctl PCM ops ALSA: parisc: Drop superfluous ioctl PCM ops ALSA: intel8x0: Drop superfluous ioctl PCM ops ALSA: via82xx: Drop superfluous ioctl PCM ops ALSA: atiixp: Drop superfluous ioctl PCM ops ALSA: asihpi: Drop superfluous ioctl PCM ops ALSA: trident: Drop superfluous ioctl PCM ops ALSA: pci: Drop superfluous ioctl PCM ops ALSA: pcmcia: Drop superfluous ioctl PCM ops ALSA: ppc: Drop superfluous ioctl PCM ops ALSA: sh: Drop superfluous ioctl PCM ops ALSA: sparc: Drop superfluous ioctl PCM ops ALSA: spi: Drop superfluous ioctl PCM ops ALSA: usb: Drop superfluous ioctl PCM ops ALSA: x86: Drop superfluous ioctl PCM ops ALSA: xen: Drop superfluous ioctl PCM ops sound/aoa/soundbus/i2sbus/pcm.c | 2 -- sound/arm/aaci.c | 2 -- sound/arm/pxa2xx-ac97.c | 1 - sound/atmel/ac97c.c | 2 -- sound/drivers/aloop.c | 1 - sound/drivers/dummy.c | 2 -- sound/drivers/ml403-ac97cr.c | 2 -- sound/drivers/pcsp/pcsp_lib.c | 1 - sound/drivers/vx/vx_pcm.c | 2 -- sound/firewire/bebob/bebob_pcm.c | 2 -- sound/firewire/dice/dice-pcm.c | 2 -- sound/firewire/digi00x/digi00x-pcm.c | 2 -- sound/firewire/fireface/ff-pcm.c | 2 -- sound/firewire/fireworks/fireworks_pcm.c | 2 -- sound/firewire/isight.c | 1 - sound/firewire/motu/motu-pcm.c | 2 -- sound/firewire/oxfw/oxfw-pcm.c | 2 -- sound/firewire/tascam/tascam-pcm.c | 2 -- sound/isa/ad1816a/ad1816a_lib.c | 2 -- sound/isa/es1688/es1688_lib.c | 8 -------- sound/isa/es18xx.c | 2 -- sound/isa/gus/gus_pcm.c | 2 -- sound/isa/msnd/msnd.c | 2 -- sound/isa/sb/emu8000_pcm.c | 1 - sound/isa/sb/sb16_main.c | 2 -- sound/isa/sb/sb8_main.c | 2 -- sound/isa/wss/wss_lib.c | 2 -- sound/mips/hal2.c | 2 -- sound/mips/sgio2audio.c | 3 --- sound/parisc/harmony.c | 2 -- sound/pci/ad1889.c | 2 -- sound/pci/ali5451/ali5451.c | 4 ---- sound/pci/als300.c | 2 -- sound/pci/als4000.c | 2 -- sound/pci/asihpi/asihpi.c | 17 ----------------- sound/pci/atiixp.c | 3 --- sound/pci/atiixp_modem.c | 2 -- sound/pci/au88x0/au88x0_pcm.c | 1 - sound/pci/aw2/aw2-alsa.c | 2 -- sound/pci/azt3328.c | 3 --- sound/pci/bt87x.c | 1 - sound/pci/ca0106/ca0106_main.c | 8 -------- sound/pci/cmipci.c | 5 ----- sound/pci/cs4281.c | 2 -- sound/pci/cs46xx/cs46xx_lib.c | 10 ---------- sound/pci/cs5535audio/cs5535audio_pcm.c | 2 -- sound/pci/ctxfi/ctpcm.c | 2 -- sound/pci/echoaudio/echoaudio.c | 4 ---- sound/pci/emu10k1/emu10k1x.c | 2 -- sound/pci/emu10k1/emupcm.c | 6 ------ sound/pci/emu10k1/p16v.c | 2 -- sound/pci/ens1370.c | 3 --- sound/pci/es1938.c | 2 -- sound/pci/es1968.c | 2 -- sound/pci/fm801.c | 2 -- sound/pci/hda/hda_controller.c | 1 - sound/pci/ice1712/ice1712.c | 5 ----- sound/pci/ice1712/ice1724.c | 5 ----- sound/pci/intel8x0.c | 12 ------------ sound/pci/intel8x0m.c | 2 -- sound/pci/lola/lola_pcm.c | 1 - sound/pci/lx6464es/lx6464es.c | 2 -- sound/pci/maestro3.c | 2 -- sound/pci/mixart/mixart.c | 2 -- sound/pci/nm256/nm256.c | 2 -- sound/pci/oxygen/oxygen_pcm.c | 6 ------ sound/pci/pcxhr/pcxhr.c | 1 - sound/pci/riptide/riptide.c | 2 -- sound/pci/rme32.c | 8 -------- sound/pci/rme96.c | 4 ---- sound/pci/sis7019.c | 2 -- sound/pci/sonicvibes.c | 2 -- sound/pci/trident/trident_main.c | 31 ------------------------------- sound/pci/via82xx.c | 5 ----- sound/pci/via82xx_modem.c | 2 -- sound/pci/ymfpci/ymfpci_main.c | 5 ----- sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c | 1 - sound/ppc/pmac.c | 2 -- sound/ppc/snd_ps3.c | 1 - sound/sh/aica.c | 1 - sound/sh/sh_dac_audio.c | 1 - sound/sparc/amd7930.c | 2 -- sound/sparc/cs4231.c | 2 -- sound/sparc/dbri.c | 1 - sound/spi/at73c213.c | 1 - sound/usb/6fire/pcm.c | 1 - sound/usb/caiaq/audio.c | 1 - sound/usb/hiface/pcm.c | 1 - sound/usb/line6/capture.c | 1 - sound/usb/line6/playback.c | 1 - sound/usb/misc/ua101.c | 2 -- sound/usb/pcm.c | 2 -- sound/usb/usx2y/usbusx2yaudio.c | 1 - sound/usb/usx2y/usx2yhwdeppcm.c | 1 - sound/x86/intel_hdmi_audio.c | 1 - sound/xen/xen_snd_front_alsa.c | 2 -- 96 files changed, 281 deletions(-) -- 2.16.4

2 26

[alsa-devel] [PATCH AUTOSEL 4.4 56/71] ASoC: rt5677: Mark reg RT5677_PWR_ANLG2 as volatile
by Sasha Levin 10 Dec '19

10 Dec '19

From: Ben Zhang <benzh(a)chromium.org> [ Upstream commit eabf424f7b60246c76dcb0ea6f1e83ef9abbeaa6 ] The codec dies when RT5677_PWR_ANLG2(MX-64h) is set to 0xACE1 while it's streaming audio over SPI. The DSP firmware turns on PLL2 (MX-64 bit 8) when SPI streaming starts. However regmap does not believe that register can change by itself. When BST1 (bit 15) is turned on with regmap_update_bits(), it doesn't read the register first before write, so PLL2 power bit is cleared by accident. Marking MX-64h as volatile in regmap solved the issue. Signed-off-by: Ben Zhang <benzh(a)chromium.org> Signed-off-by: Curtis Malainey <cujomalainey(a)chromium.org> Link: https://lore.kernel.org/r/20191106011335.223061-6-cujomalainey@chromium.org Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/codecs/rt5677.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/codecs/rt5677.c b/sound/soc/codecs/rt5677.c index 69d987a9935c9..90f8173123f6c 100644 --- a/sound/soc/codecs/rt5677.c +++ b/sound/soc/codecs/rt5677.c @@ -295,6 +295,7 @@ static bool rt5677_volatile_register(struct device *dev, unsigned int reg) case RT5677_I2C_MASTER_CTRL7: case RT5677_I2C_MASTER_CTRL8: case RT5677_HAP_GENE_CTRL2: + case RT5677_PWR_ANLG2: /* Modified by DSP firmware */ case RT5677_PWR_DSP_ST: case RT5677_PRIV_DATA: case RT5677_PLL1_CTRL2: -- 2.20.1

1 0

[alsa-devel] [PATCH AUTOSEL 4.4 33/71] ALSA: hda - Fix pending unsol events at shutdown
by Sasha Levin 10 Dec '19

10 Dec '19

From: Takashi Iwai <tiwai(a)suse.de> [ Upstream commit ca58f55108fee41d87c9123f85ad4863e5de7f45 ] This is an alternative fix attemp for the issue reported in the commit caa8422d01e9 ("ALSA: hda: Flush interrupts on disabling") that was reverted later due to regressions. Instead of tweaking the hardware disablement order and the enforced irq flushing, do calling cancel_work_sync() of the unsol work early enough, and explicitly ignore the unsol events during the shutdown by checking the bus->shutdown flag. Fixes: caa8422d01e9 ("ALSA: hda: Flush interrupts on disabling") Cc: Chris Wilson <chris(a)chris-wilson.co.uk> Link: https://lore.kernel.org/r/s5h1ruxt9cz.wl-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/pci/hda/hda_bind.c | 4 ++++ sound/pci/hda/hda_intel.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/sound/pci/hda/hda_bind.c b/sound/pci/hda/hda_bind.c index 7ea201c05e5da..d0d6dfbfcfdf8 100644 --- a/sound/pci/hda/hda_bind.c +++ b/sound/pci/hda/hda_bind.c @@ -42,6 +42,10 @@ static void hda_codec_unsol_event(struct hdac_device *dev, unsigned int ev) { struct hda_codec *codec = container_of(dev, struct hda_codec, core); + /* ignore unsol events during shutdown */ + if (codec->bus->shutdown) + return; + if (codec->patch_ops.unsol_event) codec->patch_ops.unsol_event(codec, ev); } diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index ef8955abd9186..3e3277100f08a 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -1310,8 +1310,11 @@ static int azx_free(struct azx *chip) static int azx_dev_disconnect(struct snd_device *device) { struct azx *chip = device->device_data; + struct hdac_bus *bus = azx_bus(chip); chip->bus.shutdown = 1; + cancel_work_sync(&bus->unsol_work); + return 0; } -- 2.20.1

1 0

[alsa-devel] [PATCH AUTOSEL 4.9 69/91] ASoC: rt5677: Mark reg RT5677_PWR_ANLG2 as volatile
by Sasha Levin 10 Dec '19

10 Dec '19

From: Ben Zhang <benzh(a)chromium.org> [ Upstream commit eabf424f7b60246c76dcb0ea6f1e83ef9abbeaa6 ] The codec dies when RT5677_PWR_ANLG2(MX-64h) is set to 0xACE1 while it's streaming audio over SPI. The DSP firmware turns on PLL2 (MX-64 bit 8) when SPI streaming starts. However regmap does not believe that register can change by itself. When BST1 (bit 15) is turned on with regmap_update_bits(), it doesn't read the register first before write, so PLL2 power bit is cleared by accident. Marking MX-64h as volatile in regmap solved the issue. Signed-off-by: Ben Zhang <benzh(a)chromium.org> Signed-off-by: Curtis Malainey <cujomalainey(a)chromium.org> Link: https://lore.kernel.org/r/20191106011335.223061-6-cujomalainey@chromium.org Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/codecs/rt5677.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/codecs/rt5677.c b/sound/soc/codecs/rt5677.c index 65ac4518ad060..49ab26e69f2fc 100644 --- a/sound/soc/codecs/rt5677.c +++ b/sound/soc/codecs/rt5677.c @@ -305,6 +305,7 @@ static bool rt5677_volatile_register(struct device *dev, unsigned int reg) case RT5677_I2C_MASTER_CTRL7: case RT5677_I2C_MASTER_CTRL8: case RT5677_HAP_GENE_CTRL2: + case RT5677_PWR_ANLG2: /* Modified by DSP firmware */ case RT5677_PWR_DSP_ST: case RT5677_PRIV_DATA: case RT5677_ASRC_22: -- 2.20.1

1 0

[alsa-devel] [PATCH AUTOSEL 4.9 50/91] ALSA: timer: Limit max amount of slave instances
by Sasha Levin 10 Dec '19

10 Dec '19

From: Takashi Iwai <tiwai(a)suse.de> [ Upstream commit fdea53fe5de532969a332d6e5e727f2ad8bf084d ] The fuzzer tries to open the timer instances as much as possible, and this may cause a system hiccup easily. We've already introduced the cap for the max number of available instances for the h/w timers, and we should put such a limit also to the slave timers, too. This patch introduces the limit to the multiple opened slave timers. The upper limit is hard-coded to 1000 for now, which should suffice for any practical usages up to now. Link: https://lore.kernel.org/r/20191106154257.5853-1-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/core/timer.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sound/core/timer.c b/sound/core/timer.c index e944d27f79c34..f8a4b2a2f8f6b 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c @@ -87,6 +87,9 @@ static LIST_HEAD(snd_timer_slave_list); /* lock for slave active lists */ static DEFINE_SPINLOCK(slave_active_lock); +#define MAX_SLAVE_INSTANCES 1000 +static int num_slaves; + static DEFINE_MUTEX(register_mutex); static int snd_timer_free(struct snd_timer *timer); @@ -265,6 +268,10 @@ int snd_timer_open(struct snd_timer_instance **ti, err = -EINVAL; goto unlock; } + if (num_slaves >= MAX_SLAVE_INSTANCES) { + err = -EBUSY; + goto unlock; + } timeri = snd_timer_instance_new(owner, NULL); if (!timeri) { err = -ENOMEM; @@ -274,6 +281,7 @@ int snd_timer_open(struct snd_timer_instance **ti, timeri->slave_id = tid->device; timeri->flags |= SNDRV_TIMER_IFLG_SLAVE; list_add_tail(&timeri->open_list, &snd_timer_slave_list); + num_slaves++; err = snd_timer_check_slave(timeri); if (err < 0) { snd_timer_close_locked(timeri, &card_dev_to_put); @@ -363,6 +371,8 @@ static int snd_timer_close_locked(struct snd_timer_instance *timeri, struct snd_timer_instance *slave, *tmp; list_del(&timeri->open_list); + if (timeri->flags & SNDRV_TIMER_IFLG_SLAVE) + num_slaves--; /* force to stop the timer */ snd_timer_stop(timeri); -- 2.20.1

1 0

[alsa-devel] [PATCH AUTOSEL 4.9 43/91] ALSA: hda - Fix pending unsol events at shutdown
by Sasha Levin 10 Dec '19

10 Dec '19

From: Takashi Iwai <tiwai(a)suse.de> [ Upstream commit ca58f55108fee41d87c9123f85ad4863e5de7f45 ] This is an alternative fix attemp for the issue reported in the commit caa8422d01e9 ("ALSA: hda: Flush interrupts on disabling") that was reverted later due to regressions. Instead of tweaking the hardware disablement order and the enforced irq flushing, do calling cancel_work_sync() of the unsol work early enough, and explicitly ignore the unsol events during the shutdown by checking the bus->shutdown flag. Fixes: caa8422d01e9 ("ALSA: hda: Flush interrupts on disabling") Cc: Chris Wilson <chris(a)chris-wilson.co.uk> Link: https://lore.kernel.org/r/s5h1ruxt9cz.wl-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/pci/hda/hda_bind.c | 4 ++++ sound/pci/hda/hda_intel.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/sound/pci/hda/hda_bind.c b/sound/pci/hda/hda_bind.c index 7ea201c05e5da..d0d6dfbfcfdf8 100644 --- a/sound/pci/hda/hda_bind.c +++ b/sound/pci/hda/hda_bind.c @@ -42,6 +42,10 @@ static void hda_codec_unsol_event(struct hdac_device *dev, unsigned int ev) { struct hda_codec *codec = container_of(dev, struct hda_codec, core); + /* ignore unsol events during shutdown */ + if (codec->bus->shutdown) + return; + if (codec->patch_ops.unsol_event) codec->patch_ops.unsol_event(codec, ev); } diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index f2f1d9fd848c8..3234e9ca02cec 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -1275,8 +1275,11 @@ static int azx_free(struct azx *chip) static int azx_dev_disconnect(struct snd_device *device) { struct azx *chip = device->device_data; + struct hdac_bus *bus = azx_bus(chip); chip->bus.shutdown = 1; + cancel_work_sync(&bus->unsol_work); + return 0; } -- 2.20.1

1 0

[alsa-devel] [PATCH AUTOSEL 4.14 104/130] ASoC: Intel: kbl_rt5663_rt5514_max98927: Add dmic format constraint
by Sasha Levin 10 Dec '19

10 Dec '19

From: Yu-Hsuan Hsu <yuhsuan(a)chromium.org> [ Upstream commit e2db787bdcb4f2722ecf410168f0583764634e45 ] On KBL platform, the microphone is attached to external codec(rt5514) instead of PCH. However, TDM slot between PCH and codec is 16 bits only. In order to avoid setting wrong format, we should add a constraint to force to use 16 bits format forever. Signed-off-by: Yu-Hsuan Hsu <yuhsuan(a)chromium.org> Acked-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Link: https://lore.kernel.org/r/20190923162940.199580-1-yuhsuan@chromium.org Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c index 41cb1fefbd427..405196283688c 100644 --- a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c +++ b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c @@ -422,6 +422,9 @@ static int kabylake_dmic_startup(struct snd_pcm_substream *substream) snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS, dmic_constraints); + runtime->hw.formats = SNDRV_PCM_FMTBIT_S16_LE; + snd_pcm_hw_constraint_msbits(runtime, 0, 16, 16); + return snd_pcm_hw_constraint_list(substream->runtime, 0, SNDRV_PCM_HW_PARAM_RATE, &constraints_rates); } -- 2.20.1

1 0

[alsa-devel] [PATCH AUTOSEL 4.14 103/130] ASoC: rt5677: Mark reg RT5677_PWR_ANLG2 as volatile
by Sasha Levin 10 Dec '19

10 Dec '19

From: Ben Zhang <benzh(a)chromium.org> [ Upstream commit eabf424f7b60246c76dcb0ea6f1e83ef9abbeaa6 ] The codec dies when RT5677_PWR_ANLG2(MX-64h) is set to 0xACE1 while it's streaming audio over SPI. The DSP firmware turns on PLL2 (MX-64 bit 8) when SPI streaming starts. However regmap does not believe that register can change by itself. When BST1 (bit 15) is turned on with regmap_update_bits(), it doesn't read the register first before write, so PLL2 power bit is cleared by accident. Marking MX-64h as volatile in regmap solved the issue. Signed-off-by: Ben Zhang <benzh(a)chromium.org> Signed-off-by: Curtis Malainey <cujomalainey(a)chromium.org> Link: https://lore.kernel.org/r/20191106011335.223061-6-cujomalainey@chromium.org Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/codecs/rt5677.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/codecs/rt5677.c b/sound/soc/codecs/rt5677.c index 1cd20b88a3a9c..82ee8f4b965be 100644 --- a/sound/soc/codecs/rt5677.c +++ b/sound/soc/codecs/rt5677.c @@ -297,6 +297,7 @@ static bool rt5677_volatile_register(struct device *dev, unsigned int reg) case RT5677_I2C_MASTER_CTRL7: case RT5677_I2C_MASTER_CTRL8: case RT5677_HAP_GENE_CTRL2: + case RT5677_PWR_ANLG2: /* Modified by DSP firmware */ case RT5677_PWR_DSP_ST: case RT5677_PRIV_DATA: case RT5677_ASRC_22: -- 2.20.1

1 0

[alsa-devel] [PATCH AUTOSEL 4.14 080/130] ALSA: timer: Limit max amount of slave instances
by Sasha Levin 10 Dec '19

10 Dec '19

From: Takashi Iwai <tiwai(a)suse.de> [ Upstream commit fdea53fe5de532969a332d6e5e727f2ad8bf084d ] The fuzzer tries to open the timer instances as much as possible, and this may cause a system hiccup easily. We've already introduced the cap for the max number of available instances for the h/w timers, and we should put such a limit also to the slave timers, too. This patch introduces the limit to the multiple opened slave timers. The upper limit is hard-coded to 1000 for now, which should suffice for any practical usages up to now. Link: https://lore.kernel.org/r/20191106154257.5853-1-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/core/timer.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sound/core/timer.c b/sound/core/timer.c index c60dfd52e8a6d..22589a073423b 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c @@ -88,6 +88,9 @@ static LIST_HEAD(snd_timer_slave_list); /* lock for slave active lists */ static DEFINE_SPINLOCK(slave_active_lock); +#define MAX_SLAVE_INSTANCES 1000 +static int num_slaves; + static DEFINE_MUTEX(register_mutex); static int snd_timer_free(struct snd_timer *timer); @@ -266,6 +269,10 @@ int snd_timer_open(struct snd_timer_instance **ti, err = -EINVAL; goto unlock; } + if (num_slaves >= MAX_SLAVE_INSTANCES) { + err = -EBUSY; + goto unlock; + } timeri = snd_timer_instance_new(owner, NULL); if (!timeri) { err = -ENOMEM; @@ -275,6 +282,7 @@ int snd_timer_open(struct snd_timer_instance **ti, timeri->slave_id = tid->device; timeri->flags |= SNDRV_TIMER_IFLG_SLAVE; list_add_tail(&timeri->open_list, &snd_timer_slave_list); + num_slaves++; err = snd_timer_check_slave(timeri); if (err < 0) { snd_timer_close_locked(timeri, &card_dev_to_put); @@ -364,6 +372,8 @@ static int snd_timer_close_locked(struct snd_timer_instance *timeri, struct snd_timer_instance *slave, *tmp; list_del(&timeri->open_list); + if (timeri->flags & SNDRV_TIMER_IFLG_SLAVE) + num_slaves--; /* force to stop the timer */ snd_timer_stop(timeri); -- 2.20.1

1 0

[alsa-devel] [PATCH AUTOSEL 4.14 060/130] ALSA: hda - Fix pending unsol events at shutdown
by Sasha Levin 10 Dec '19

10 Dec '19

From: Takashi Iwai <tiwai(a)suse.de> [ Upstream commit ca58f55108fee41d87c9123f85ad4863e5de7f45 ] This is an alternative fix attemp for the issue reported in the commit caa8422d01e9 ("ALSA: hda: Flush interrupts on disabling") that was reverted later due to regressions. Instead of tweaking the hardware disablement order and the enforced irq flushing, do calling cancel_work_sync() of the unsol work early enough, and explicitly ignore the unsol events during the shutdown by checking the bus->shutdown flag. Fixes: caa8422d01e9 ("ALSA: hda: Flush interrupts on disabling") Cc: Chris Wilson <chris(a)chris-wilson.co.uk> Link: https://lore.kernel.org/r/s5h1ruxt9cz.wl-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/pci/hda/hda_bind.c | 4 ++++ sound/pci/hda/hda_intel.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/sound/pci/hda/hda_bind.c b/sound/pci/hda/hda_bind.c index 8db1890605f60..c175b2cf63f77 100644 --- a/sound/pci/hda/hda_bind.c +++ b/sound/pci/hda/hda_bind.c @@ -42,6 +42,10 @@ static void hda_codec_unsol_event(struct hdac_device *dev, unsigned int ev) { struct hda_codec *codec = container_of(dev, struct hda_codec, core); + /* ignore unsol events during shutdown */ + if (codec->bus->shutdown) + return; + if (codec->patch_ops.unsol_event) codec->patch_ops.unsol_event(codec, ev); } diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 96e9b3944b925..890793ad85ca1 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -1450,8 +1450,11 @@ static int azx_free(struct azx *chip) static int azx_dev_disconnect(struct snd_device *device) { struct azx *chip = device->device_data; + struct hdac_bus *bus = azx_bus(chip); chip->bus.shutdown = 1; + cancel_work_sync(&bus->unsol_work); + return 0; } -- 2.20.1

1 0

[alsa-devel] [PATCH AUTOSEL 4.19 161/177] ASoC: Intel: bytcr_rt5640: Update quirk for Acer Switch 10 SW5-012 2-in-1
by Sasha Levin 10 Dec '19

10 Dec '19

From: Hans de Goede <hdegoede(a)redhat.com> [ Upstream commit 0bb887709eb16bdc4b5baddd8337abf3de72917f ] When the Acer Switch 10 SW5-012 quirk was added we did not have jack-detection support yet; and the builtin microphone selection of the original quirk is wrong too. Fix the microphone-input quirk and add jack-detection info so that the internal-microphone and headphone/set jack on the Switch 10 work properly. Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> Reviewed-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> Acked-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Link: https://lore.kernel.org/r/20191119145138.59162-1-hdegoede@redhat.com Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/intel/boards/bytcr_rt5640.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c index b6dc524830b21..6acd5dd599dc4 100644 --- a/sound/soc/intel/boards/bytcr_rt5640.c +++ b/sound/soc/intel/boards/bytcr_rt5640.c @@ -414,10 +414,12 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = { DMI_MATCH(DMI_SYS_VENDOR, "Acer"), DMI_MATCH(DMI_PRODUCT_NAME, "Aspire SW5-012"), }, - .driver_data = (void *)(BYT_RT5640_IN1_MAP | - BYT_RT5640_MCLK_EN | - BYT_RT5640_SSP0_AIF1), - + .driver_data = (void *)(BYT_RT5640_DMIC1_MAP | + BYT_RT5640_JD_SRC_JD2_IN4N | + BYT_RT5640_OVCD_TH_2000UA | + BYT_RT5640_OVCD_SF_0P75 | + BYT_RT5640_SSP0_AIF1 | + BYT_RT5640_MCLK_EN), }, { .matches = { -- 2.20.1

1 0

[alsa-devel] [PATCH AUTOSEL 4.19 160/177] ASoC: wm5100: add missed pm_runtime_disable
by Sasha Levin 10 Dec '19

10 Dec '19

From: Chuhong Yuan <hslester96(a)gmail.com> [ Upstream commit b1176bbb70866f24099cd2720283c7219fb4a81c ] The driver forgets to call pm_runtime_disable in remove and probe failure. Add the calls to fix it. Signed-off-by: Chuhong Yuan <hslester96(a)gmail.com> Acked-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> Link: https://lore.kernel.org/r/20191118073707.28298-1-hslester96@gmail.com Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/codecs/wm5100.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c index ba89d9d711f76..b793701aafcda 100644 --- a/sound/soc/codecs/wm5100.c +++ b/sound/soc/codecs/wm5100.c @@ -2620,6 +2620,7 @@ static int wm5100_i2c_probe(struct i2c_client *i2c, return ret; err_reset: + pm_runtime_disable(&i2c->dev); if (i2c->irq) free_irq(i2c->irq, wm5100); wm5100_free_gpio(i2c); @@ -2643,6 +2644,7 @@ static int wm5100_i2c_remove(struct i2c_client *i2c) { struct wm5100_priv *wm5100 = i2c_get_clientdata(i2c); + pm_runtime_disable(&i2c->dev); if (i2c->irq) free_irq(i2c->irq, wm5100); wm5100_free_gpio(i2c); -- 2.20.1

1 0

[alsa-devel] [PATCH AUTOSEL 4.19 158/177] ASoC: wm2200: add missed operations in remove and probe failure
by Sasha Levin 10 Dec '19

10 Dec '19

From: Chuhong Yuan <hslester96(a)gmail.com> [ Upstream commit 2dab09be49a1e7a4dd13cb47d3a1441a2ef33a87 ] This driver misses calls to pm_runtime_disable and regulator_bulk_disable in remove and a call to free_irq in probe failure. Add the calls to fix it. Signed-off-by: Chuhong Yuan <hslester96(a)gmail.com> Link: https://lore.kernel.org/r/20191118073633.28237-1-hslester96@gmail.com Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/codecs/wm2200.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sound/soc/codecs/wm2200.c b/sound/soc/codecs/wm2200.c index deff651615042..0a3b746fb909b 100644 --- a/sound/soc/codecs/wm2200.c +++ b/sound/soc/codecs/wm2200.c @@ -2413,6 +2413,8 @@ static int wm2200_i2c_probe(struct i2c_client *i2c, err_pm_runtime: pm_runtime_disable(&i2c->dev); + if (i2c->irq) + free_irq(i2c->irq, wm2200); err_reset: if (wm2200->pdata.reset) gpio_set_value_cansleep(wm2200->pdata.reset, 0); @@ -2429,12 +2431,15 @@ static int wm2200_i2c_remove(struct i2c_client *i2c) { struct wm2200_priv *wm2200 = i2c_get_clientdata(i2c); + pm_runtime_disable(&i2c->dev); if (i2c->irq) free_irq(i2c->irq, wm2200); if (wm2200->pdata.reset) gpio_set_value_cansleep(wm2200->pdata.reset, 0); if (wm2200->pdata.ldo_ena) gpio_set_value_cansleep(wm2200->pdata.ldo_ena, 0); + regulator_bulk_disable(ARRAY_SIZE(wm2200->core_supplies), + wm2200->core_supplies); return 0; } -- 2.20.1

1 0

[alsa-devel] [PATCH AUTOSEL 4.19 151/177] ASoC: wm8904: fix regcache handling
by Sasha Levin 10 Dec '19

10 Dec '19

From: Michael Walle <michael(a)walle.cc> [ Upstream commit e9149b8c00d25dbaef1aa174fc604bed207e576d ] The current code assumes that the power is turned off in SND_SOC_BIAS_OFF. If there are no actual regulator the codec isn't turned off and the registers are not reset to their default values but the regcache is still marked as dirty. Thus a value might not be written to the hardware if it is set to the default value. Do a software reset before turning off the power to make sure the registers are always reset to their default states. Signed-off-by: Michael Walle <michael(a)walle.cc> Acked-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> Link: https://lore.kernel.org/r/20191112223629.21867-1-michael@walle.cc Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/codecs/wm8904.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c index 1965635ec07c7..d14e851b91605 100644 --- a/sound/soc/codecs/wm8904.c +++ b/sound/soc/codecs/wm8904.c @@ -1902,6 +1902,7 @@ static int wm8904_set_bias_level(struct snd_soc_component *component, snd_soc_component_update_bits(component, WM8904_BIAS_CONTROL_0, WM8904_BIAS_ENA, 0); + snd_soc_component_write(component, WM8904_SW_RESET_AND_ID, 0); regcache_cache_only(wm8904->regmap, true); regcache_mark_dirty(wm8904->regmap); -- 2.20.1

1 0

[alsa-devel] [PATCH AUTOSEL 4.19 138/177] ASoC: Intel: kbl_rt5663_rt5514_max98927: Add dmic format constraint
by Sasha Levin 10 Dec '19

10 Dec '19

From: Yu-Hsuan Hsu <yuhsuan(a)chromium.org> [ Upstream commit e2db787bdcb4f2722ecf410168f0583764634e45 ] On KBL platform, the microphone is attached to external codec(rt5514) instead of PCH. However, TDM slot between PCH and codec is 16 bits only. In order to avoid setting wrong format, we should add a constraint to force to use 16 bits format forever. Signed-off-by: Yu-Hsuan Hsu <yuhsuan(a)chromium.org> Acked-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Link: https://lore.kernel.org/r/20190923162940.199580-1-yuhsuan@chromium.org Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c index b8a03f58ac8cc..f36e33a147287 100644 --- a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c +++ b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c @@ -423,6 +423,9 @@ static int kabylake_dmic_startup(struct snd_pcm_substream *substream) snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS, dmic_constraints); + runtime->hw.formats = SNDRV_PCM_FMTBIT_S16_LE; + snd_pcm_hw_constraint_msbits(runtime, 0, 16, 16); + return snd_pcm_hw_constraint_list(substream->runtime, 0, SNDRV_PCM_HW_PARAM_RATE, &constraints_rates); } -- 2.20.1

1 0

[alsa-devel] [PATCH AUTOSEL 4.19 136/177] ASoC: rt5677: Mark reg RT5677_PWR_ANLG2 as volatile
by Sasha Levin 10 Dec '19

10 Dec '19

From: Ben Zhang <benzh(a)chromium.org> [ Upstream commit eabf424f7b60246c76dcb0ea6f1e83ef9abbeaa6 ] The codec dies when RT5677_PWR_ANLG2(MX-64h) is set to 0xACE1 while it's streaming audio over SPI. The DSP firmware turns on PLL2 (MX-64 bit 8) when SPI streaming starts. However regmap does not believe that register can change by itself. When BST1 (bit 15) is turned on with regmap_update_bits(), it doesn't read the register first before write, so PLL2 power bit is cleared by accident. Marking MX-64h as volatile in regmap solved the issue. Signed-off-by: Ben Zhang <benzh(a)chromium.org> Signed-off-by: Curtis Malainey <cujomalainey(a)chromium.org> Link: https://lore.kernel.org/r/20191106011335.223061-6-cujomalainey@chromium.org Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/codecs/rt5677.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/codecs/rt5677.c b/sound/soc/codecs/rt5677.c index 9b7a1833d3316..71b7b881df396 100644 --- a/sound/soc/codecs/rt5677.c +++ b/sound/soc/codecs/rt5677.c @@ -297,6 +297,7 @@ static bool rt5677_volatile_register(struct device *dev, unsigned int reg) case RT5677_I2C_MASTER_CTRL7: case RT5677_I2C_MASTER_CTRL8: case RT5677_HAP_GENE_CTRL2: + case RT5677_PWR_ANLG2: /* Modified by DSP firmware */ case RT5677_PWR_DSP_ST: case RT5677_PRIV_DATA: case RT5677_ASRC_22: -- 2.20.1

1 0

[alsa-devel] [PATCH AUTOSEL 4.19 130/177] soundwire: intel: fix PDI/stream mapping for Bulk
by Sasha Levin 10 Dec '19

10 Dec '19

From: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> [ Upstream commit c134f914e9f55b7817e2bae625ec0e5f1379f7cd ] The previous formula is incorrect for PDI0/1, the mapping is not linear but has a discontinuity between PDI1 and PDI2. This change has no effect on PCM PDIs (same mapping). Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Link: https://lore.kernel.org/r/20191022232948.17156-1-pierre-louis.bossart@linux… Signed-off-by: Vinod Koul <vkoul(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- drivers/soundwire/intel.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c index 29bc99c4a7b66..e49d3c810677a 100644 --- a/drivers/soundwire/intel.c +++ b/drivers/soundwire/intel.c @@ -352,7 +352,10 @@ intel_pdi_shim_configure(struct sdw_intel *sdw, struct sdw_cdns_pdi *pdi) unsigned int link_id = sdw->instance; int pdi_conf = 0; - pdi->intel_alh_id = (link_id * 16) + pdi->num + 5; + /* the Bulk and PCM streams are not contiguous */ + pdi->intel_alh_id = (link_id * 16) + pdi->num + 3; + if (pdi->num >= 2) + pdi->intel_alh_id += 2; /* * Program stream parameters to stream SHIM register @@ -381,7 +384,10 @@ intel_pdi_alh_configure(struct sdw_intel *sdw, struct sdw_cdns_pdi *pdi) unsigned int link_id = sdw->instance; unsigned int conf; - pdi->intel_alh_id = (link_id * 16) + pdi->num + 5; + /* the Bulk and PCM streams are not contiguous */ + pdi->intel_alh_id = (link_id * 16) + pdi->num + 3; + if (pdi->num >= 2) + pdi->intel_alh_id += 2; /* Program Stream config ALH register */ conf = intel_readl(alh, SDW_ALH_STRMZCFG(pdi->intel_alh_id)); -- 2.20.1

1 0

[alsa-devel] [PATCH AUTOSEL 4.19 106/177] ALSA: timer: Limit max amount of slave instances
by Sasha Levin 10 Dec '19

10 Dec '19

From: Takashi Iwai <tiwai(a)suse.de> [ Upstream commit fdea53fe5de532969a332d6e5e727f2ad8bf084d ] The fuzzer tries to open the timer instances as much as possible, and this may cause a system hiccup easily. We've already introduced the cap for the max number of available instances for the h/w timers, and we should put such a limit also to the slave timers, too. This patch introduces the limit to the multiple opened slave timers. The upper limit is hard-coded to 1000 for now, which should suffice for any practical usages up to now. Link: https://lore.kernel.org/r/20191106154257.5853-1-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/core/timer.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sound/core/timer.c b/sound/core/timer.c index 86a31e69fc7d9..b5dc51030316a 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c @@ -88,6 +88,9 @@ static LIST_HEAD(snd_timer_slave_list); /* lock for slave active lists */ static DEFINE_SPINLOCK(slave_active_lock); +#define MAX_SLAVE_INSTANCES 1000 +static int num_slaves; + static DEFINE_MUTEX(register_mutex); static int snd_timer_free(struct snd_timer *timer); @@ -266,6 +269,10 @@ int snd_timer_open(struct snd_timer_instance **ti, err = -EINVAL; goto unlock; } + if (num_slaves >= MAX_SLAVE_INSTANCES) { + err = -EBUSY; + goto unlock; + } timeri = snd_timer_instance_new(owner, NULL); if (!timeri) { err = -ENOMEM; @@ -275,6 +282,7 @@ int snd_timer_open(struct snd_timer_instance **ti, timeri->slave_id = tid->device; timeri->flags |= SNDRV_TIMER_IFLG_SLAVE; list_add_tail(&timeri->open_list, &snd_timer_slave_list); + num_slaves++; err = snd_timer_check_slave(timeri); if (err < 0) { snd_timer_close_locked(timeri, &card_dev_to_put); @@ -364,6 +372,8 @@ static int snd_timer_close_locked(struct snd_timer_instance *timeri, struct snd_timer_instance *slave, *tmp; list_del(&timeri->open_list); + if (timeri->flags & SNDRV_TIMER_IFLG_SLAVE) + num_slaves--; /* force to stop the timer */ snd_timer_stop(timeri); -- 2.20.1

1 0

[alsa-devel] [PATCH AUTOSEL 4.19 086/177] ALSA: hda/hdmi - implement mst_no_extra_pcms flag
by Sasha Levin 10 Dec '19

10 Dec '19

From: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> [ Upstream commit 2a2edfbbfee47947dd05f5860c66c0e80ee5e09d ] To support the DP-MST multiple streams via single connector feature, the HDMI driver was extended with the concept of backup PCMs. See commit 9152085defb6 ("ALSA: hda - add DP MST audio support"). This implementation works fine with snd_hda_intel.c as PCM topology is fully managed within the single driver. When the HDA codec driver is used from ASoC components, the concept of backup PCMs no longer fits. For ASoC topologies, the physical HDMI converters are presented as backend DAIs and these should match with hardware capabilities. The ASoC topology may define arbitrary PCMs (i.e. frontend DAIs) and have processing elements before eventual routing to the HDMI BE DAIs. With backup PCMs, the link between FE and BE DAIs would become dynamic and change when monitors are (un)plugged. This would lead to modifying the topology every time hotplug events happen, which is not currently possible in ASoC and there does not seem to be any obvious benefits from this design. To overcome above problems and enable the HDMI driver to be used from ASoC, this patch adds a new mode (mst_no_extra_pcms flags) to patch_hdmi.c. In this mode, the codec driver does not assume the backup PCMs to be created. Signed-off-by: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> Reviewed-by: Takashi Iwai <tiwai(a)suse.de> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Link: https://lore.kernel.org/r/20191029134017.18901-2-kai.vehmanen@linux.intel.c… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/pci/hda/hda_codec.h | 1 + sound/pci/hda/patch_hdmi.c | 19 ++++++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h index 2003403ce1c82..199927694aeff 100644 --- a/sound/pci/hda/hda_codec.h +++ b/sound/pci/hda/hda_codec.h @@ -262,6 +262,7 @@ struct hda_codec { unsigned int force_pin_prefix:1; /* Add location prefix */ unsigned int link_down_at_suspend:1; /* link down at runtime suspend */ unsigned int relaxed_resume:1; /* don't resume forcibly for jack */ + unsigned int mst_no_extra_pcms:1; /* no backup PCMs for DP-MST */ #ifdef CONFIG_PM unsigned long power_on_acct; diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index c827a2a89cc3d..9d5e3c8d62b93 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -2063,15 +2063,24 @@ static bool is_hdmi_pcm_attached(struct hdac_device *hdac, int pcm_idx) static int generic_hdmi_build_pcms(struct hda_codec *codec) { struct hdmi_spec *spec = codec->spec; - int idx; + int idx, pcm_num; /* * for non-mst mode, pcm number is the same as before - * for DP MST mode, pcm number is (nid number + dev_num - 1) - * dev_num is the device entry number in a pin - * + * for DP MST mode without extra PCM, pcm number is same + * for DP MST mode with extra PCMs, pcm number is + * (nid number + dev_num - 1) + * dev_num is the device entry number in a pin */ - for (idx = 0; idx < spec->num_nids + spec->dev_num - 1; idx++) { + + if (codec->mst_no_extra_pcms) + pcm_num = spec->num_nids; + else + pcm_num = spec->num_nids + spec->dev_num - 1; + + codec_dbg(codec, "hdmi: pcm_num set to %d\n", pcm_num); + + for (idx = 0; idx < pcm_num; idx++) { struct hda_pcm *info; struct hda_pcm_stream *pstr; -- 2.20.1

1 0

[alsa-devel] [PATCH AUTOSEL 4.19 082/177] ALSA: hda - Fix pending unsol events at shutdown
by Sasha Levin 10 Dec '19

10 Dec '19

From: Takashi Iwai <tiwai(a)suse.de> [ Upstream commit ca58f55108fee41d87c9123f85ad4863e5de7f45 ] This is an alternative fix attemp for the issue reported in the commit caa8422d01e9 ("ALSA: hda: Flush interrupts on disabling") that was reverted later due to regressions. Instead of tweaking the hardware disablement order and the enforced irq flushing, do calling cancel_work_sync() of the unsol work early enough, and explicitly ignore the unsol events during the shutdown by checking the bus->shutdown flag. Fixes: caa8422d01e9 ("ALSA: hda: Flush interrupts on disabling") Cc: Chris Wilson <chris(a)chris-wilson.co.uk> Link: https://lore.kernel.org/r/s5h1ruxt9cz.wl-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/pci/hda/hda_bind.c | 4 ++++ sound/pci/hda/hda_intel.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/sound/pci/hda/hda_bind.c b/sound/pci/hda/hda_bind.c index 8db1890605f60..c175b2cf63f77 100644 --- a/sound/pci/hda/hda_bind.c +++ b/sound/pci/hda/hda_bind.c @@ -42,6 +42,10 @@ static void hda_codec_unsol_event(struct hdac_device *dev, unsigned int ev) { struct hda_codec *codec = container_of(dev, struct hda_codec, core); + /* ignore unsol events during shutdown */ + if (codec->bus->shutdown) + return; + if (codec->patch_ops.unsol_event) codec->patch_ops.unsol_event(codec, ev); } diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 0b24c5ce2fd6a..d63fea5d1c929 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -1492,8 +1492,11 @@ static int azx_free(struct azx *chip) static int azx_dev_disconnect(struct snd_device *device) { struct azx *chip = device->device_data; + struct hdac_bus *bus = azx_bus(chip); chip->bus.shutdown = 1; + cancel_work_sync(&bus->unsol_work); + return 0; } -- 2.20.1

1 0

[alsa-devel] [PATCH AUTOSEL 5.4 322/350] ASoC: soc-pcm: check symmetry before hw_params
by Sasha Levin 10 Dec '19

10 Dec '19

From: Shengjiu Wang <shengjiu.wang(a)nxp.com> [ Upstream commit 5cca59516de5df9de6bdecb328dd55fb5bcccb41 ] This reverts commit 957ce0c6b8a1f (ASoC: soc-pcm: check symmetry after hw_params). That commit cause soc_pcm_params_symmetry can't take effect. cpu_dai->rate, cpu_dai->channels and cpu_dai->sample_bits are updated in the middle of soc_pcm_hw_params, so move soc_pcm_params_symmetry to the end of soc_pcm_hw_params is not a good solution, for judgement of symmetry in the function is always true. FIXME: According to the comments of that commit, I think the case described in the commit should disable symmetric_rates in Back-End, rather than changing the position of soc_pcm_params_symmetry. Signed-off-by: Shengjiu Wang <shengjiu.wang(a)nxp.com> Link: https://lore.kernel.org/r/1573555602-5403-1-git-send-email-shengjiu.wang@nx… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/soc-pcm.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index cdce96a3051bf..a6e96cf1d8ff9 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -877,6 +877,11 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream, int i, ret = 0; mutex_lock_nested(&rtd->card->pcm_mutex, rtd->card->pcm_subclass); + + ret = soc_pcm_params_symmetry(substream, params); + if (ret) + goto out; + if (rtd->dai_link->ops->hw_params) { ret = rtd->dai_link->ops->hw_params(substream, params); if (ret < 0) { @@ -958,9 +963,6 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream, } component = NULL; - ret = soc_pcm_params_symmetry(substream, params); - if (ret) - goto component_err; out: mutex_unlock(&rtd->card->pcm_mutex); return ret; -- 2.20.1

1 0

[alsa-devel] [PATCH AUTOSEL 5.4 311/350] ASoC: Intel: bytcr_rt5640: Update quirk for Acer Switch 10 SW5-012 2-in-1
by Sasha Levin 10 Dec '19

10 Dec '19

From: Hans de Goede <hdegoede(a)redhat.com> [ Upstream commit 0bb887709eb16bdc4b5baddd8337abf3de72917f ] When the Acer Switch 10 SW5-012 quirk was added we did not have jack-detection support yet; and the builtin microphone selection of the original quirk is wrong too. Fix the microphone-input quirk and add jack-detection info so that the internal-microphone and headphone/set jack on the Switch 10 work properly. Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> Reviewed-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> Acked-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Link: https://lore.kernel.org/r/20191119145138.59162-1-hdegoede@redhat.com Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/intel/boards/bytcr_rt5640.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c index 9c1aa4ec9cba4..dd2b5ad086591 100644 --- a/sound/soc/intel/boards/bytcr_rt5640.c +++ b/sound/soc/intel/boards/bytcr_rt5640.c @@ -405,10 +405,12 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = { DMI_MATCH(DMI_SYS_VENDOR, "Acer"), DMI_MATCH(DMI_PRODUCT_NAME, "Aspire SW5-012"), }, - .driver_data = (void *)(BYT_RT5640_IN1_MAP | - BYT_RT5640_MCLK_EN | - BYT_RT5640_SSP0_AIF1), - + .driver_data = (void *)(BYT_RT5640_DMIC1_MAP | + BYT_RT5640_JD_SRC_JD2_IN4N | + BYT_RT5640_OVCD_TH_2000UA | + BYT_RT5640_OVCD_SF_0P75 | + BYT_RT5640_SSP0_AIF1 | + BYT_RT5640_MCLK_EN), }, { .matches = { -- 2.20.1

1 0

[alsa-devel] [PATCH AUTOSEL 5.4 304/350] ASoC: wm5100: add missed pm_runtime_disable
by Sasha Levin 10 Dec '19

10 Dec '19

From: Chuhong Yuan <hslester96(a)gmail.com> [ Upstream commit b1176bbb70866f24099cd2720283c7219fb4a81c ] The driver forgets to call pm_runtime_disable in remove and probe failure. Add the calls to fix it. Signed-off-by: Chuhong Yuan <hslester96(a)gmail.com> Acked-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> Link: https://lore.kernel.org/r/20191118073707.28298-1-hslester96@gmail.com Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/codecs/wm5100.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c index 4af0e519e6235..91cc63c5a51fa 100644 --- a/sound/soc/codecs/wm5100.c +++ b/sound/soc/codecs/wm5100.c @@ -2617,6 +2617,7 @@ static int wm5100_i2c_probe(struct i2c_client *i2c, return ret; err_reset: + pm_runtime_disable(&i2c->dev); if (i2c->irq) free_irq(i2c->irq, wm5100); wm5100_free_gpio(i2c); @@ -2640,6 +2641,7 @@ static int wm5100_i2c_remove(struct i2c_client *i2c) { struct wm5100_priv *wm5100 = i2c_get_clientdata(i2c); + pm_runtime_disable(&i2c->dev); if (i2c->irq) free_irq(i2c->irq, wm5100); wm5100_free_gpio(i2c); -- 2.20.1

1 0

[alsa-devel] [PATCH AUTOSEL 5.4 302/350] ASoC: wm2200: add missed operations in remove and probe failure
by Sasha Levin 10 Dec '19

10 Dec '19

From: Chuhong Yuan <hslester96(a)gmail.com> [ Upstream commit 2dab09be49a1e7a4dd13cb47d3a1441a2ef33a87 ] This driver misses calls to pm_runtime_disable and regulator_bulk_disable in remove and a call to free_irq in probe failure. Add the calls to fix it. Signed-off-by: Chuhong Yuan <hslester96(a)gmail.com> Link: https://lore.kernel.org/r/20191118073633.28237-1-hslester96@gmail.com Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/codecs/wm2200.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sound/soc/codecs/wm2200.c b/sound/soc/codecs/wm2200.c index cf64e109c6587..7b087d94141bd 100644 --- a/sound/soc/codecs/wm2200.c +++ b/sound/soc/codecs/wm2200.c @@ -2410,6 +2410,8 @@ static int wm2200_i2c_probe(struct i2c_client *i2c, err_pm_runtime: pm_runtime_disable(&i2c->dev); + if (i2c->irq) + free_irq(i2c->irq, wm2200); err_reset: if (wm2200->pdata.reset) gpio_set_value_cansleep(wm2200->pdata.reset, 0); @@ -2426,12 +2428,15 @@ static int wm2200_i2c_remove(struct i2c_client *i2c) { struct wm2200_priv *wm2200 = i2c_get_clientdata(i2c); + pm_runtime_disable(&i2c->dev); if (i2c->irq) free_irq(i2c->irq, wm2200); if (wm2200->pdata.reset) gpio_set_value_cansleep(wm2200->pdata.reset, 0); if (wm2200->pdata.ldo_ena) gpio_set_value_cansleep(wm2200->pdata.ldo_ena, 0); + regulator_bulk_disable(ARRAY_SIZE(wm2200->core_supplies), + wm2200->core_supplies); return 0; } -- 2.20.1

1 0

[alsa-devel] [PATCH AUTOSEL 5.4 292/350] ASoC: wm8904: fix regcache handling
by Sasha Levin 10 Dec '19

10 Dec '19

From: Michael Walle <michael(a)walle.cc> [ Upstream commit e9149b8c00d25dbaef1aa174fc604bed207e576d ] The current code assumes that the power is turned off in SND_SOC_BIAS_OFF. If there are no actual regulator the codec isn't turned off and the registers are not reset to their default values but the regcache is still marked as dirty. Thus a value might not be written to the hardware if it is set to the default value. Do a software reset before turning off the power to make sure the registers are always reset to their default states. Signed-off-by: Michael Walle <michael(a)walle.cc> Acked-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> Link: https://lore.kernel.org/r/20191112223629.21867-1-michael@walle.cc Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/codecs/wm8904.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c index bcb3c9d5abf0c..9e8c564f6e9c4 100644 --- a/sound/soc/codecs/wm8904.c +++ b/sound/soc/codecs/wm8904.c @@ -1917,6 +1917,7 @@ static int wm8904_set_bias_level(struct snd_soc_component *component, snd_soc_component_update_bits(component, WM8904_BIAS_CONTROL_0, WM8904_BIAS_ENA, 0); + snd_soc_component_write(component, WM8904_SW_RESET_AND_ID, 0); regcache_cache_only(wm8904->regmap, true); regcache_mark_dirty(wm8904->regmap); -- 2.20.1

1 0

[alsa-devel] [PATCH AUTOSEL 5.4 269/350] ASoC: Intel: kbl_rt5663_rt5514_max98927: Add dmic format constraint
by Sasha Levin 10 Dec '19

10 Dec '19

From: Yu-Hsuan Hsu <yuhsuan(a)chromium.org> [ Upstream commit e2db787bdcb4f2722ecf410168f0583764634e45 ] On KBL platform, the microphone is attached to external codec(rt5514) instead of PCH. However, TDM slot between PCH and codec is 16 bits only. In order to avoid setting wrong format, we should add a constraint to force to use 16 bits format forever. Signed-off-by: Yu-Hsuan Hsu <yuhsuan(a)chromium.org> Acked-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Link: https://lore.kernel.org/r/20190923162940.199580-1-yuhsuan@chromium.org Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c index 74dda8784f1a0..67b276a65a8d2 100644 --- a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c +++ b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c @@ -400,6 +400,9 @@ static int kabylake_dmic_startup(struct snd_pcm_substream *substream) snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS, dmic_constraints); + runtime->hw.formats = SNDRV_PCM_FMTBIT_S16_LE; + snd_pcm_hw_constraint_msbits(runtime, 0, 16, 16); + return snd_pcm_hw_constraint_list(substream->runtime, 0, SNDRV_PCM_HW_PARAM_RATE, &constraints_rates); } -- 2.20.1

1 0

[alsa-devel] [PATCH AUTOSEL 5.4 265/350] ASoC: rt5677: Mark reg RT5677_PWR_ANLG2 as volatile
by Sasha Levin 10 Dec '19

10 Dec '19

From: Ben Zhang <benzh(a)chromium.org> [ Upstream commit eabf424f7b60246c76dcb0ea6f1e83ef9abbeaa6 ] The codec dies when RT5677_PWR_ANLG2(MX-64h) is set to 0xACE1 while it's streaming audio over SPI. The DSP firmware turns on PLL2 (MX-64 bit 8) when SPI streaming starts. However regmap does not believe that register can change by itself. When BST1 (bit 15) is turned on with regmap_update_bits(), it doesn't read the register first before write, so PLL2 power bit is cleared by accident. Marking MX-64h as volatile in regmap solved the issue. Signed-off-by: Ben Zhang <benzh(a)chromium.org> Signed-off-by: Curtis Malainey <cujomalainey(a)chromium.org> Link: https://lore.kernel.org/r/20191106011335.223061-6-cujomalainey@chromium.org Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/codecs/rt5677.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/codecs/rt5677.c b/sound/soc/codecs/rt5677.c index 315a3d39bc091..8bc9450da79cf 100644 --- a/sound/soc/codecs/rt5677.c +++ b/sound/soc/codecs/rt5677.c @@ -298,6 +298,7 @@ static bool rt5677_volatile_register(struct device *dev, unsigned int reg) case RT5677_I2C_MASTER_CTRL7: case RT5677_I2C_MASTER_CTRL8: case RT5677_HAP_GENE_CTRL2: + case RT5677_PWR_ANLG2: /* Modified by DSP firmware */ case RT5677_PWR_DSP_ST: case RT5677_PRIV_DATA: case RT5677_ASRC_22: -- 2.20.1

1 0

[alsa-devel] [PATCH AUTOSEL 5.4 253/350] soundwire: intel: fix PDI/stream mapping for Bulk
by Sasha Levin 10 Dec '19

10 Dec '19

From: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> [ Upstream commit c134f914e9f55b7817e2bae625ec0e5f1379f7cd ] The previous formula is incorrect for PDI0/1, the mapping is not linear but has a discontinuity between PDI1 and PDI2. This change has no effect on PCM PDIs (same mapping). Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Link: https://lore.kernel.org/r/20191022232948.17156-1-pierre-louis.bossart@linux… Signed-off-by: Vinod Koul <vkoul(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- drivers/soundwire/intel.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c index 13c54eac0cc3e..d1839707128a8 100644 --- a/drivers/soundwire/intel.c +++ b/drivers/soundwire/intel.c @@ -479,7 +479,10 @@ intel_pdi_shim_configure(struct sdw_intel *sdw, struct sdw_cdns_pdi *pdi) unsigned int link_id = sdw->instance; int pdi_conf = 0; - pdi->intel_alh_id = (link_id * 16) + pdi->num + 5; + /* the Bulk and PCM streams are not contiguous */ + pdi->intel_alh_id = (link_id * 16) + pdi->num + 3; + if (pdi->num >= 2) + pdi->intel_alh_id += 2; /* * Program stream parameters to stream SHIM register @@ -508,7 +511,10 @@ intel_pdi_alh_configure(struct sdw_intel *sdw, struct sdw_cdns_pdi *pdi) unsigned int link_id = sdw->instance; unsigned int conf; - pdi->intel_alh_id = (link_id * 16) + pdi->num + 5; + /* the Bulk and PCM streams are not contiguous */ + pdi->intel_alh_id = (link_id * 16) + pdi->num + 3; + if (pdi->num >= 2) + pdi->intel_alh_id += 2; /* Program Stream config ALH register */ conf = intel_readl(alh, SDW_ALH_STRMZCFG(pdi->intel_alh_id)); -- 2.20.1

1 0

[alsa-devel] [PATCH AUTOSEL 5.4 214/350] ALSA: timer: Limit max amount of slave instances
by Sasha Levin 10 Dec '19

10 Dec '19

From: Takashi Iwai <tiwai(a)suse.de> [ Upstream commit fdea53fe5de532969a332d6e5e727f2ad8bf084d ] The fuzzer tries to open the timer instances as much as possible, and this may cause a system hiccup easily. We've already introduced the cap for the max number of available instances for the h/w timers, and we should put such a limit also to the slave timers, too. This patch introduces the limit to the multiple opened slave timers. The upper limit is hard-coded to 1000 for now, which should suffice for any practical usages up to now. Link: https://lore.kernel.org/r/20191106154257.5853-1-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/core/timer.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sound/core/timer.c b/sound/core/timer.c index 59ae21b0bb936..013f0e69ff0f7 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c @@ -74,6 +74,9 @@ static LIST_HEAD(snd_timer_slave_list); /* lock for slave active lists */ static DEFINE_SPINLOCK(slave_active_lock); +#define MAX_SLAVE_INSTANCES 1000 +static int num_slaves; + static DEFINE_MUTEX(register_mutex); static int snd_timer_free(struct snd_timer *timer); @@ -252,6 +255,10 @@ int snd_timer_open(struct snd_timer_instance **ti, err = -EINVAL; goto unlock; } + if (num_slaves >= MAX_SLAVE_INSTANCES) { + err = -EBUSY; + goto unlock; + } timeri = snd_timer_instance_new(owner, NULL); if (!timeri) { err = -ENOMEM; @@ -261,6 +268,7 @@ int snd_timer_open(struct snd_timer_instance **ti, timeri->slave_id = tid->device; timeri->flags |= SNDRV_TIMER_IFLG_SLAVE; list_add_tail(&timeri->open_list, &snd_timer_slave_list); + num_slaves++; err = snd_timer_check_slave(timeri); if (err < 0) { snd_timer_close_locked(timeri, &card_dev_to_put); @@ -356,6 +364,8 @@ static int snd_timer_close_locked(struct snd_timer_instance *timeri, } list_del(&timeri->open_list); + if (timeri->flags & SNDRV_TIMER_IFLG_SLAVE) + num_slaves--; /* force to stop the timer */ snd_timer_stop(timeri); -- 2.20.1

1 0

[alsa-devel] [PATCH AUTOSEL 5.4 208/350] ASoC: SOF: topology: set trigger order for FE DAI link
by Sasha Levin 10 Dec '19

10 Dec '19

From: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> [ Upstream commit 5eee2b3f60065a2530d13f28e771be48b989eb4c ] Set trigger order for FE DAI links to SND_SOC_DPCM_TRIGGER_POST to trigger the BE DAI's before the FE DAI's. This prevents the xruns seen on playback pipelines using the link DMA. Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Link: https://lore.kernel.org/r/20191104224812.3393-3-ranjani.sridharan@linux.int… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/sof/topology.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c index 4452594c2e17a..fa299e0781561 100644 --- a/sound/soc/sof/topology.c +++ b/sound/soc/sof/topology.c @@ -2828,6 +2828,10 @@ static int sof_link_load(struct snd_soc_component *scomp, int index, if (!link->no_pcm) { link->nonatomic = true; + /* set trigger order */ + link->trigger[0] = SND_SOC_DPCM_TRIGGER_POST; + link->trigger[1] = SND_SOC_DPCM_TRIGGER_POST; + /* nothing more to do for FE dai links */ return 0; } -- 2.20.1

1 0

[alsa-devel] [PATCH AUTOSEL 5.4 195/350] ALSA: pcm: Fix missing check of the new non-cached buffer type
by Sasha Levin 10 Dec '19

10 Dec '19

From: Takashi Iwai <tiwai(a)suse.de> [ Upstream commit 6111fd2370eecae9f11bfdc08ba097e0b51fcfd3 ] The check for the mmap support via hw_support_mmap() function misses the case where the device is with SNDRV_DMA_TYPE_DEV_UC, which should have been treated equally as SNDRV_DMA_TYPE_DEV. Let's fix it. Note that this bug doesn't hit any practical problem, because SNDRV_DMA_TYPE_DEV_UC is used only for x86-specific drivers (snd-hda-intel and snd-intel8x0) for the specific platforms that need the non-cached buffers. And, on such platforms, hw_support_mmap() already returns true in anyway. That's the reason I didn't put Cc-to-stable mark here. This is only for any theoretical future extension. Fixes: 425da159707b ("ALSA: pcm: use dma_can_mmap() to check if a device supports dma_mmap_*") Fixes: 42e748a0b325 ("ALSA: memalloc: Add non-cached buffer type") Link: https://lore.kernel.org/r/20191104101115.27311-1-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/core/pcm_native.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 91c6ad58729fe..c3a139436ac26 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -222,7 +222,8 @@ static bool hw_support_mmap(struct snd_pcm_substream *substream) return false; if (substream->ops->mmap || - substream->dma_buffer.dev.type != SNDRV_DMA_TYPE_DEV) + (substream->dma_buffer.dev.type != SNDRV_DMA_TYPE_DEV && + substream->dma_buffer.dev.type != SNDRV_DMA_TYPE_DEV_UC)) return true; return dma_can_mmap(substream->dma_buffer.dev.dev); -- 2.20.1

1 0

[alsa-devel] [PATCH AUTOSEL 5.4 191/350] ALSA: bebob: expand sleep just after breaking connections for protocol version 1
by Sasha Levin 10 Dec '19

10 Dec '19

From: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> [ Upstream commit d3eabe939aee3ffd5b133766a932629a9746298c ] As long as I investigated, some devices with BeBoB protocol version 1 can be freezed during several hundreds milliseconds after breaking connections. When accessing during the freezed time, any transaction is corrupted. In the worst case, the device is going to reboot. I can see this issue in: * Roland FA-66 * M-Audio FireWire Solo This commit expands sleep just after breaking connections to avoid the freezed time as much as possible. I note that the freeze/reboot behaviour is similar to below models: * Focusrite Saffire Pro 10 I/O * Focusrite Saffire Pro 26 I/O The above models certainly reboot after breaking connections. Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> Link: https://lore.kernel.org/r/20191101131323.17300-2-o-takashi@sakamocchi.jp Signed-off-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/firewire/bebob/bebob_stream.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sound/firewire/bebob/bebob_stream.c b/sound/firewire/bebob/bebob_stream.c index 6c1497d9f52ba..ce07ea0d4e71d 100644 --- a/sound/firewire/bebob/bebob_stream.c +++ b/sound/firewire/bebob/bebob_stream.c @@ -415,15 +415,16 @@ static int make_both_connections(struct snd_bebob *bebob) return 0; } -static void -break_both_connections(struct snd_bebob *bebob) +static void break_both_connections(struct snd_bebob *bebob) { cmp_connection_break(&bebob->in_conn); cmp_connection_break(&bebob->out_conn); - /* These models seems to be in transition state for a longer time. */ - if (bebob->maudio_special_quirk != NULL) - msleep(200); + // These models seem to be in transition state for a longer time. When + // accessing in the state, any transactions is corrupted. In the worst + // case, the device is going to reboot. + if (bebob->version < 2) + msleep(600); } static int -- 2.20.1

1 0

[alsa-devel] [PATCH AUTOSEL 5.4 179/350] ALSA: hda/hdmi - implement mst_no_extra_pcms flag
by Sasha Levin 10 Dec '19

10 Dec '19

From: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> [ Upstream commit 2a2edfbbfee47947dd05f5860c66c0e80ee5e09d ] To support the DP-MST multiple streams via single connector feature, the HDMI driver was extended with the concept of backup PCMs. See commit 9152085defb6 ("ALSA: hda - add DP MST audio support"). This implementation works fine with snd_hda_intel.c as PCM topology is fully managed within the single driver. When the HDA codec driver is used from ASoC components, the concept of backup PCMs no longer fits. For ASoC topologies, the physical HDMI converters are presented as backend DAIs and these should match with hardware capabilities. The ASoC topology may define arbitrary PCMs (i.e. frontend DAIs) and have processing elements before eventual routing to the HDMI BE DAIs. With backup PCMs, the link between FE and BE DAIs would become dynamic and change when monitors are (un)plugged. This would lead to modifying the topology every time hotplug events happen, which is not currently possible in ASoC and there does not seem to be any obvious benefits from this design. To overcome above problems and enable the HDMI driver to be used from ASoC, this patch adds a new mode (mst_no_extra_pcms flags) to patch_hdmi.c. In this mode, the codec driver does not assume the backup PCMs to be created. Signed-off-by: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> Reviewed-by: Takashi Iwai <tiwai(a)suse.de> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Link: https://lore.kernel.org/r/20191029134017.18901-2-kai.vehmanen@linux.intel.c… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- include/sound/hda_codec.h | 1 + sound/pci/hda/patch_hdmi.c | 19 ++++++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/include/sound/hda_codec.h b/include/sound/hda_codec.h index 9a0393cf024c2..ac18f428eda6c 100644 --- a/include/sound/hda_codec.h +++ b/include/sound/hda_codec.h @@ -254,6 +254,7 @@ struct hda_codec { unsigned int force_pin_prefix:1; /* Add location prefix */ unsigned int link_down_at_suspend:1; /* link down at runtime suspend */ unsigned int relaxed_resume:1; /* don't resume forcibly for jack */ + unsigned int mst_no_extra_pcms:1; /* no backup PCMs for DP-MST */ #ifdef CONFIG_PM unsigned long power_on_acct; diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index d14f6684737d0..b8579cd218098 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -2075,15 +2075,24 @@ static bool is_hdmi_pcm_attached(struct hdac_device *hdac, int pcm_idx) static int generic_hdmi_build_pcms(struct hda_codec *codec) { struct hdmi_spec *spec = codec->spec; - int idx; + int idx, pcm_num; /* * for non-mst mode, pcm number is the same as before - * for DP MST mode, pcm number is (nid number + dev_num - 1) - * dev_num is the device entry number in a pin - * + * for DP MST mode without extra PCM, pcm number is same + * for DP MST mode with extra PCMs, pcm number is + * (nid number + dev_num - 1) + * dev_num is the device entry number in a pin */ - for (idx = 0; idx < spec->num_nids + spec->dev_num - 1; idx++) { + + if (codec->mst_no_extra_pcms) + pcm_num = spec->num_nids; + else + pcm_num = spec->num_nids + spec->dev_num - 1; + + codec_dbg(codec, "hdmi: pcm_num set to %d\n", pcm_num); + + for (idx = 0; idx < pcm_num; idx++) { struct hda_pcm *info; struct hda_pcm_stream *pstr; -- 2.20.1

1 0

[alsa-devel] [PATCH AUTOSEL 5.4 170/350] ALSA: hda - Fix pending unsol events at shutdown
by Sasha Levin 10 Dec '19

10 Dec '19

From: Takashi Iwai <tiwai(a)suse.de> [ Upstream commit ca58f55108fee41d87c9123f85ad4863e5de7f45 ] This is an alternative fix attemp for the issue reported in the commit caa8422d01e9 ("ALSA: hda: Flush interrupts on disabling") that was reverted later due to regressions. Instead of tweaking the hardware disablement order and the enforced irq flushing, do calling cancel_work_sync() of the unsol work early enough, and explicitly ignore the unsol events during the shutdown by checking the bus->shutdown flag. Fixes: caa8422d01e9 ("ALSA: hda: Flush interrupts on disabling") Cc: Chris Wilson <chris(a)chris-wilson.co.uk> Link: https://lore.kernel.org/r/s5h1ruxt9cz.wl-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/pci/hda/hda_bind.c | 4 ++++ sound/pci/hda/hda_intel.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/sound/pci/hda/hda_bind.c b/sound/pci/hda/hda_bind.c index 8272b50b83493..6a85645663759 100644 --- a/sound/pci/hda/hda_bind.c +++ b/sound/pci/hda/hda_bind.c @@ -43,6 +43,10 @@ static void hda_codec_unsol_event(struct hdac_device *dev, unsigned int ev) { struct hda_codec *codec = container_of(dev, struct hda_codec, core); + /* ignore unsol events during shutdown */ + if (codec->bus->shutdown) + return; + if (codec->patch_ops.unsol_event) codec->patch_ops.unsol_event(codec, ev); } diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index c52419376c748..86a416cdeb296 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -1382,8 +1382,11 @@ static int azx_free(struct azx *chip) static int azx_dev_disconnect(struct snd_device *device) { struct azx *chip = device->device_data; + struct hdac_bus *bus = azx_bus(chip); chip->bus.shutdown = 1; + cancel_work_sync(&bus->unsol_work); + return 0; } -- 2.20.1

1 0

[alsa-devel] [PATCH AUTOSEL 5.4 138/350] ASoC: soc-pcm: fixup dpcm_prune_paths() loop continue
by Sasha Levin 10 Dec '19

10 Dec '19

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> [ Upstream commit bed646dc3f7bcec91178c278deaf969cce0700a8 ] dpcm_prune_paths() is checking widget at 2 parts. (A) is for CPU, (B) is for Codec. If we focus to (A) part, continue at (a) is for (1) loop. But, if we focus to (B) part, continue at (b) is for (2) loop, not for (1). This is bug. This patch fixup this issue. static int dpcm_prune_paths(...) { ... (1) for_each_dpcm_be(fe, stream, dpcm) { ... ^ widget = dai_get_widget(...); | (A) if (widget && widget_in_list(...)) | (a) continue; v ^ (2) for_each_rtd_codec_dai(...) { | widget = dai_get_widget(...); (B) | if (widget && widget_in_list(...)) v (b) continue; } ... Fixes: 2e5894d73789 ("ASoC: pcm: Add support for DAI multicodec") Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Link: https://lore.kernel.org/r/87blui64mf.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/soc-pcm.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index b600d3eaaf5cd..cdce96a3051bf 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -1385,6 +1385,7 @@ static int dpcm_prune_paths(struct snd_soc_pcm_runtime *fe, int stream, struct snd_soc_dapm_widget *widget; struct snd_soc_dai *dai; int prune = 0; + int do_prune; /* Destroy any old FE <--> BE connections */ for_each_dpcm_be(fe, stream, dpcm) { @@ -1398,13 +1399,16 @@ static int dpcm_prune_paths(struct snd_soc_pcm_runtime *fe, int stream, continue; /* is there a valid CODEC DAI widget for this BE */ + do_prune = 1; for_each_rtd_codec_dai(dpcm->be, i, dai) { widget = dai_get_widget(dai, stream); /* prune the BE if it's no longer in our active list */ if (widget && widget_in_list(list, widget)) - continue; + do_prune = 0; } + if (!do_prune) + continue; dev_dbg(fe->dev, "ASoC: pruning %s BE %s for %s\n", stream ? "capture" : "playback", -- 2.20.1

1 0

[alsa-devel] [PATCH AUTOSEL 5.4 088/350] ASoC: SOF: enable sync_write in hdac_bus
by Sasha Levin 10 Dec '19

10 Dec '19

From: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> [ Upstream commit f3416e7144f5d4ba0fc5dcef6ebfff891266c46a ] Align SOF HDA implementation with snd-hda-intel driver and enable sync_write flag for all supported Intel platforms in SOF. When set, a sync is issued after each verb write. Sync after write has helped to overcome intermittent delays in system resume flow on Intel Coffee Lake systems, and most recently probe errors related to the HDMI codec on Ice Lake systems. Matches the snd-hda-intel driver change done in commit 2756d9143aa5 ("ALSA: hda - Fix intermittent CORB/RIRB stall on Intel chips"). Signed-off-by: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Link: https://lore.kernel.org/r/20191008164443.1358-2-pierre-louis.bossart@linux.… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/sof/intel/hda.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c index 06e84679087bc..5a5163eef2ef4 100644 --- a/sound/soc/sof/intel/hda.c +++ b/sound/soc/sof/intel/hda.c @@ -268,6 +268,7 @@ static int hda_init(struct snd_sof_dev *sdev) bus->use_posbuf = 1; bus->bdl_pos_adj = 0; + bus->sync_write = 1; mutex_init(&hbus->prepare_mutex); hbus->pci = pci; -- 2.20.1

1 0

Re: [alsa-devel] [PATCH v3 03/15] soc: tegra: Add Tegra PMC clock registrations into PMC driver
by Dmitry Osipenko 10 Dec '19

10 Dec '19

10.12.2019 22:18, Sowjanya Komatineni пишет: > > On 12/10/19 10:30 AM, Dmitry Osipenko wrote: >> 10.12.2019 20:48, Sowjanya Komatineni пишет: >>> On 12/10/19 9:41 AM, Dmitry Osipenko wrote: >>>> 09.12.2019 23:46, Sowjanya Komatineni пишет: >>>>> On 12/9/19 12:12 PM, Dmitry Osipenko wrote: >>>>>> 08.12.2019 00:36, Sowjanya Komatineni пишет: >>>>>>> On 12/7/19 11:59 AM, Sowjanya Komatineni wrote: >>>>>>>> On 12/7/19 8:00 AM, Dmitry Osipenko wrote: >>>>>>>>> 07.12.2019 18:53, Dmitry Osipenko пишет: >>>>>>>>>> 07.12.2019 18:47, Dmitry Osipenko пишет: >>>>>>>>>>> 07.12.2019 17:28, Dmitry Osipenko пишет: >>>>>>>>>>>> 06.12.2019 05:48, Sowjanya Komatineni пишет: >>>>>>>>>>>>> Tegra210 and prior Tegra PMC has clk_out_1, clk_out_2, >>>>>>>>>>>>> clk_out_3 >>>>>>>>>>>>> with >>>>>>>>>>>>> mux and gate for each of these clocks. >>>>>>>>>>>>> >>>>>>>>>>>>> Currently these PMC clocks are registered by Tegra clock >>>>>>>>>>>>> driver >>>>>>>>>>>>> using >>>>>>>>>>>>> clk_register_mux and clk_register_gate by passing PMC base >>>>>>>>>>>>> address >>>>>>>>>>>>> and register offsets and PMC programming for these clocks >>>>>>>>>>>>> happens >>>>>>>>>>>>> through direct PMC access by the clock driver. >>>>>>>>>>>>> >>>>>>>>>>>>> With this, when PMC is in secure mode any direct PMC access >>>>>>>>>>>>> from the >>>>>>>>>>>>> non-secure world does not go through and these clocks will >>>>>>>>>>>>> not be >>>>>>>>>>>>> functional. >>>>>>>>>>>>> >>>>>>>>>>>>> This patch adds these clocks registration with PMC as a clock >>>>>>>>>>>>> provider >>>>>>>>>>>>> for these clocks. clk_ops callback implementations for these >>>>>>>>>>>>> clocks >>>>>>>>>>>>> uses tegra_pmc_readl and tegra_pmc_writel which supports PMC >>>>>>>>>>>>> programming >>>>>>>>>>>>> in secure mode and non-secure mode. >>>>>>>>>>>>> >>>>>>>>>>>>> Signed-off-by: Sowjanya Komatineni <skomatineni(a)nvidia.com> >>>>>>>>>>>>> --- >>>>>>>>>>> [snip] >>>>>>>>>>> >>>>>>>>>>>>> + >>>>>>>>>>>>> +static const struct clk_ops pmc_clk_gate_ops = { >>>>>>>>>>>>> + .is_enabled = pmc_clk_is_enabled, >>>>>>>>>>>>> + .enable = pmc_clk_enable, >>>>>>>>>>>>> + .disable = pmc_clk_disable, >>>>>>>>>>>>> +}; >>>>>>>>>>>> What's the benefit of separating GATE from the MUX? >>>>>>>>>>>> >>>>>>>>>>>> I think it could be a single clock. >>>>>>>>>>> According to TRM: >>>>>>>>>>> >>>>>>>>>>> 1. GATE and MUX are separate entities. >>>>>>>>>>> >>>>>>>>>>> 2. GATE is the parent of MUX (see PMC's CLK_OUT paths diagram in >>>>>>>>>>> TRM). >>>>>>>>>>> >>>>>>>>>>> 3. PMC doesn't gate EXTPERIPH clock but could "force-enable" it, >>>>>>>>>>> correct? >>>>>>> Was following existing clk-tegra-pmc as I am not sure of reason for >>>>>>> having these clocks registered as separate mux and gate clocks. >>>>>>> >>>>>>> Yes, PMC clocks can be registered as single clock and can use >>>>>>> clk_ops >>>>>>> for set/get parent and enable/disable. >>>>>>> >>>>>>> enable/disable of PMC clocks is for force-enable to force the >>>>>>> clock to >>>>>>> run regardless of ACCEPT_REQ or INVERT_REQ. >>>>>>> >>>>>>>>>> 4. clk_m_div2/4 are internal PMC OSC dividers and thus these >>>>>>>>>> clocks >>>>>>>>>> should belong to PMC. >>>>>>>>> Also, it should be "osc" and not "clk_m". >>>>>>>> I followed the same parents as it were in existing clk-tegra-pmc >>>>>>>> driver. >>>>>>>> >>>>>>>> Yeah they are wrong and they should be from osc and not clk_m. >>>>>>>> >>>>>>>> Will fix in next version. >>>>>>>> >>>>>> Could you please describe the full EXTPERIPH clock topology and >>>>>> how the >>>>>> pinmux configuration is related to it all? >>>>>> >>>>>> What is internal to the Tegra chip and what are the external outputs? >>>>>> >>>>>> Is it possible to bypass PMC on T30+ for the EXTPERIPH clocks? >>>>> PMC CLK1/2/3 possible sources are OSC_DIV1, OSC_DIV2, OSC_DIV4, >>>>> EXTPERIPH from CAR. >>>>> >>>>> OSC_DIV1/2/4 are with internal dividers at the OSC Pads >>>>> >>>>> EXTPERIPH is from CAR and it has reset and enable controls along with >>>>> clock source selections to choose one of the PLLA_OUT0, CLK_S, >>>>> PLLP_OUT0, CLK_M, PLLE_OUT0 >>>> Are you sure that EXTPERIPH has a reset? What will it reset? Why it's >>>> not documented in TRM? >>> Yes, Extperiph1/2/3 has RST part of CAR RST_DEVICES_V bits 24/25/26 >> Are these bits not documented in a public TRMs? I checked >> T30/114/124/210 TRMs and CLK_RST_CONTROLLER_RST_DEVICES_V_0 doesn't have >> those bits in the docs. >> > Yeah these bits are missing in all Tegra TRM docs. Will request for > having EXTPERIPH reset bits to be updated in TRM... Thanks

1 0

Re: [alsa-devel] [PATCH v3 03/15] soc: tegra: Add Tegra PMC clock registrations into PMC driver
by Dmitry Osipenko 10 Dec '19

10 Dec '19

10.12.2019 20:48, Sowjanya Komatineni пишет: > > On 12/10/19 9:41 AM, Dmitry Osipenko wrote: >> 09.12.2019 23:46, Sowjanya Komatineni пишет: >>> On 12/9/19 12:12 PM, Dmitry Osipenko wrote: >>>> 08.12.2019 00:36, Sowjanya Komatineni пишет: >>>>> On 12/7/19 11:59 AM, Sowjanya Komatineni wrote: >>>>>> On 12/7/19 8:00 AM, Dmitry Osipenko wrote: >>>>>>> 07.12.2019 18:53, Dmitry Osipenko пишет: >>>>>>>> 07.12.2019 18:47, Dmitry Osipenko пишет: >>>>>>>>> 07.12.2019 17:28, Dmitry Osipenko пишет: >>>>>>>>>> 06.12.2019 05:48, Sowjanya Komatineni пишет: >>>>>>>>>>> Tegra210 and prior Tegra PMC has clk_out_1, clk_out_2, clk_out_3 >>>>>>>>>>> with >>>>>>>>>>> mux and gate for each of these clocks. >>>>>>>>>>> >>>>>>>>>>> Currently these PMC clocks are registered by Tegra clock driver >>>>>>>>>>> using >>>>>>>>>>> clk_register_mux and clk_register_gate by passing PMC base address >>>>>>>>>>> and register offsets and PMC programming for these clocks happens >>>>>>>>>>> through direct PMC access by the clock driver. >>>>>>>>>>> >>>>>>>>>>> With this, when PMC is in secure mode any direct PMC access >>>>>>>>>>> from the >>>>>>>>>>> non-secure world does not go through and these clocks will not be >>>>>>>>>>> functional. >>>>>>>>>>> >>>>>>>>>>> This patch adds these clocks registration with PMC as a clock >>>>>>>>>>> provider >>>>>>>>>>> for these clocks. clk_ops callback implementations for these >>>>>>>>>>> clocks >>>>>>>>>>> uses tegra_pmc_readl and tegra_pmc_writel which supports PMC >>>>>>>>>>> programming >>>>>>>>>>> in secure mode and non-secure mode. >>>>>>>>>>> >>>>>>>>>>> Signed-off-by: Sowjanya Komatineni <skomatineni(a)nvidia.com> >>>>>>>>>>> --- >>>>>>>>> [snip] >>>>>>>>> >>>>>>>>>>> + >>>>>>>>>>> +static const struct clk_ops pmc_clk_gate_ops = { >>>>>>>>>>> + .is_enabled = pmc_clk_is_enabled, >>>>>>>>>>> + .enable = pmc_clk_enable, >>>>>>>>>>> + .disable = pmc_clk_disable, >>>>>>>>>>> +}; >>>>>>>>>> What's the benefit of separating GATE from the MUX? >>>>>>>>>> >>>>>>>>>> I think it could be a single clock. >>>>>>>>> According to TRM: >>>>>>>>> >>>>>>>>> 1. GATE and MUX are separate entities. >>>>>>>>> >>>>>>>>> 2. GATE is the parent of MUX (see PMC's CLK_OUT paths diagram in >>>>>>>>> TRM). >>>>>>>>> >>>>>>>>> 3. PMC doesn't gate EXTPERIPH clock but could "force-enable" it, >>>>>>>>> correct? >>>>> Was following existing clk-tegra-pmc as I am not sure of reason for >>>>> having these clocks registered as separate mux and gate clocks. >>>>> >>>>> Yes, PMC clocks can be registered as single clock and can use clk_ops >>>>> for set/get parent and enable/disable. >>>>> >>>>> enable/disable of PMC clocks is for force-enable to force the clock to >>>>> run regardless of ACCEPT_REQ or INVERT_REQ. >>>>> >>>>>>>> 4. clk_m_div2/4 are internal PMC OSC dividers and thus these clocks >>>>>>>> should belong to PMC. >>>>>>> Also, it should be "osc" and not "clk_m". >>>>>> I followed the same parents as it were in existing clk-tegra-pmc >>>>>> driver. >>>>>> >>>>>> Yeah they are wrong and they should be from osc and not clk_m. >>>>>> >>>>>> Will fix in next version. >>>>>> >>>> Could you please describe the full EXTPERIPH clock topology and how the >>>> pinmux configuration is related to it all? >>>> >>>> What is internal to the Tegra chip and what are the external outputs? >>>> >>>> Is it possible to bypass PMC on T30+ for the EXTPERIPH clocks? >>> PMC CLK1/2/3 possible sources are OSC_DIV1, OSC_DIV2, OSC_DIV4, >>> EXTPERIPH from CAR. >>> >>> OSC_DIV1/2/4 are with internal dividers at the OSC Pads >>> >>> EXTPERIPH is from CAR and it has reset and enable controls along with >>> clock source selections to choose one of the PLLA_OUT0, CLK_S, >>> PLLP_OUT0, CLK_M, PLLE_OUT0 >> Are you sure that EXTPERIPH has a reset? What will it reset? Why it's >> not documented in TRM? > Yes, Extperiph1/2/3 has RST part of CAR RST_DEVICES_V bits 24/25/26 Are these bits not documented in a public TRMs? I checked T30/114/124/210 TRMs and CLK_RST_CONTROLLER_RST_DEVICES_V_0 doesn't have those bits in the docs. >>> So, PMC CLK1/2/4 possible parents are OSC_DIV1, OSC_DIV2, OSC_DIV4, EXTERN. >>> >>> >>> CLK1/2/3 also has Pinmux to route EXTPERIPH output on to these pins. >> Could you please clarify what are "these" pins? Perhaps you meant the >> EXTERN pin of PMC? > By CLK1/2/3 pins, I am referring to CLK_OUT_1/2/3 pins from Tegra I see now what you meant, thanks. [snip}

1 0

Re: [alsa-devel] [PATCH v3 03/15] soc: tegra: Add Tegra PMC clock registrations into PMC driver
by Dmitry Osipenko 10 Dec '19

10 Dec '19

09.12.2019 23:46, Sowjanya Komatineni пишет: > > On 12/9/19 12:12 PM, Dmitry Osipenko wrote: >> 08.12.2019 00:36, Sowjanya Komatineni пишет: >>> On 12/7/19 11:59 AM, Sowjanya Komatineni wrote: >>>> On 12/7/19 8:00 AM, Dmitry Osipenko wrote: >>>>> 07.12.2019 18:53, Dmitry Osipenko пишет: >>>>>> 07.12.2019 18:47, Dmitry Osipenko пишет: >>>>>>> 07.12.2019 17:28, Dmitry Osipenko пишет: >>>>>>>> 06.12.2019 05:48, Sowjanya Komatineni пишет: >>>>>>>>> Tegra210 and prior Tegra PMC has clk_out_1, clk_out_2, clk_out_3 >>>>>>>>> with >>>>>>>>> mux and gate for each of these clocks. >>>>>>>>> >>>>>>>>> Currently these PMC clocks are registered by Tegra clock driver >>>>>>>>> using >>>>>>>>> clk_register_mux and clk_register_gate by passing PMC base address >>>>>>>>> and register offsets and PMC programming for these clocks happens >>>>>>>>> through direct PMC access by the clock driver. >>>>>>>>> >>>>>>>>> With this, when PMC is in secure mode any direct PMC access >>>>>>>>> from the >>>>>>>>> non-secure world does not go through and these clocks will not be >>>>>>>>> functional. >>>>>>>>> >>>>>>>>> This patch adds these clocks registration with PMC as a clock >>>>>>>>> provider >>>>>>>>> for these clocks. clk_ops callback implementations for these >>>>>>>>> clocks >>>>>>>>> uses tegra_pmc_readl and tegra_pmc_writel which supports PMC >>>>>>>>> programming >>>>>>>>> in secure mode and non-secure mode. >>>>>>>>> >>>>>>>>> Signed-off-by: Sowjanya Komatineni <skomatineni(a)nvidia.com> >>>>>>>>> --- >>>>>>> [snip] >>>>>>> >>>>>>>>> + >>>>>>>>> +static const struct clk_ops pmc_clk_gate_ops = { >>>>>>>>> + .is_enabled = pmc_clk_is_enabled, >>>>>>>>> + .enable = pmc_clk_enable, >>>>>>>>> + .disable = pmc_clk_disable, >>>>>>>>> +}; >>>>>>>> What's the benefit of separating GATE from the MUX? >>>>>>>> >>>>>>>> I think it could be a single clock. >>>>>>> According to TRM: >>>>>>> >>>>>>> 1. GATE and MUX are separate entities. >>>>>>> >>>>>>> 2. GATE is the parent of MUX (see PMC's CLK_OUT paths diagram in >>>>>>> TRM). >>>>>>> >>>>>>> 3. PMC doesn't gate EXTPERIPH clock but could "force-enable" it, >>>>>>> correct? >>> Was following existing clk-tegra-pmc as I am not sure of reason for >>> having these clocks registered as separate mux and gate clocks. >>> >>> Yes, PMC clocks can be registered as single clock and can use clk_ops >>> for set/get parent and enable/disable. >>> >>> enable/disable of PMC clocks is for force-enable to force the clock to >>> run regardless of ACCEPT_REQ or INVERT_REQ. >>> >>>>>> 4. clk_m_div2/4 are internal PMC OSC dividers and thus these clocks >>>>>> should belong to PMC. >>>>> Also, it should be "osc" and not "clk_m". >>>> I followed the same parents as it were in existing clk-tegra-pmc >>>> driver. >>>> >>>> Yeah they are wrong and they should be from osc and not clk_m. >>>> >>>> Will fix in next version. >>>> >> Could you please describe the full EXTPERIPH clock topology and how the >> pinmux configuration is related to it all? >> >> What is internal to the Tegra chip and what are the external outputs? >> >> Is it possible to bypass PMC on T30+ for the EXTPERIPH clocks? > > PMC CLK1/2/3 possible sources are OSC_DIV1, OSC_DIV2, OSC_DIV4, > EXTPERIPH from CAR. > > OSC_DIV1/2/4 are with internal dividers at the OSC Pads > > EXTPERIPH is from CAR and it has reset and enable controls along with > clock source selections to choose one of the PLLA_OUT0, CLK_S, > PLLP_OUT0, CLK_M, PLLE_OUT0 Are you sure that EXTPERIPH has a reset? What will it reset? Why it's not documented in TRM? > So, PMC CLK1/2/4 possible parents are OSC_DIV1, OSC_DIV2, OSC_DIV4, EXTERN. > > > CLK1/2/3 also has Pinmux to route EXTPERIPH output on to these pins. Could you please clarify what are "these" pins? Perhaps you meant the EXTERN pin of PMC? > When EXTERN output clock is selected for these PMC clocks thru > CLKx_SRC_SEL, output clock is from driver by EXTPERIPH from CAR via > Pinmux logic or driven as per CLKx_SRC_SEL bypassing pinmux based on > CLKx_ACCEPT_REQ bit. > > > PMC Clock control register has bit CLKx_ACCEPT_REQ > When CLKx_ACCEPT_REQ = 0, output clock driver is from by EXTPERIPH > through the pinmux > When CLKx_ACCEPT_REQ = 1, output clock is based on CLKx_SRC_SEL bits > (OSC_DIV1/2/4 and EXTPERIPH clock bypassing the pinmux) > > FORCE_EN bit in PMC CLock control register forces the clock to run > regardless of this. Okay.

1 0

[alsa-devel] [PATCH] ALSA: pcm: Fill silence on buffers at hw_params
by Takashi Iwai 10 Dec '19

10 Dec '19

The current PCM code doesn't initialize explicitly the buffers allocated for PCM streams, hence it might leak some uninitialized kernel data by mmapping or reading the buffer before actually reading or writing. Since this is a common problem, let's initialize the data on the buffers each hw_params properly. For that, an existing helper function is exposed as snd_pcm_fill_silence_frames() and call it from snd_pcm_hw_params(). Reported-and-tested-by: Lionel Koenig <lionel.koenig(a)gmail.com> Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/core/pcm_lib.c | 13 ++++--------- sound/core/pcm_local.h | 2 ++ sound/core/pcm_native.c | 3 +++ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c index 2236b5e0c1f2..3c63324b8bb7 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c @@ -30,9 +30,6 @@ #define trace_applptr(substream, prev, curr) #endif -static int fill_silence_frames(struct snd_pcm_substream *substream, - snd_pcm_uframes_t off, snd_pcm_uframes_t frames); - /* * fill ring buffer with silence * runtime->silence_start: starting pointer to silence area @@ -100,7 +97,7 @@ void snd_pcm_playback_silence(struct snd_pcm_substream *substream, snd_pcm_ufram ofs = runtime->silence_start % runtime->buffer_size; while (frames > 0) { transfer = ofs + frames > runtime->buffer_size ? runtime->buffer_size - ofs : frames; - err = fill_silence_frames(substream, ofs, transfer); + err = snd_pcm_fill_silence_frames(substream, ofs, transfer); snd_BUG_ON(err < 0); runtime->silence_filled += transfer; frames -= transfer; @@ -1945,8 +1942,6 @@ static int fill_silence(struct snd_pcm_substream *substream, int channel, { struct snd_pcm_runtime *runtime = substream->runtime; - if (substream->stream != SNDRV_PCM_STREAM_PLAYBACK) - return 0; if (substream->ops->fill_silence) return substream->ops->fill_silence(substream, channel, hwoff, bytes); @@ -2030,10 +2025,10 @@ static int noninterleaved_copy(struct snd_pcm_substream *substream, } /* fill silence on the given buffer position; - * called from snd_pcm_playback_silence() + * called from snd_pcm_playback_silence() and snd_pcm_hw_params() */ -static int fill_silence_frames(struct snd_pcm_substream *substream, - snd_pcm_uframes_t off, snd_pcm_uframes_t frames) +int snd_pcm_fill_silence_frames(struct snd_pcm_substream *substream, + snd_pcm_uframes_t off, snd_pcm_uframes_t frames) { if (substream->runtime->access == SNDRV_PCM_ACCESS_RW_INTERLEAVED || substream->runtime->access == SNDRV_PCM_ACCESS_MMAP_INTERLEAVED) diff --git a/sound/core/pcm_local.h b/sound/core/pcm_local.h index 384efd002984..ac4f455b1fff 100644 --- a/sound/core/pcm_local.h +++ b/sound/core/pcm_local.h @@ -34,6 +34,8 @@ int snd_pcm_update_hw_ptr(struct snd_pcm_substream *substream); void snd_pcm_playback_silence(struct snd_pcm_substream *substream, snd_pcm_uframes_t new_hw_ptr); +int snd_pcm_fill_silence_frames(struct snd_pcm_substream *substream, + snd_pcm_uframes_t off, snd_pcm_uframes_t frames); static inline snd_pcm_uframes_t snd_pcm_avail(struct snd_pcm_substream *substream) diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 1fe581167b7b..d6f270c639b4 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -739,6 +739,9 @@ static int snd_pcm_hw_params(struct snd_pcm_substream *substream, while (runtime->boundary * 2 <= LONG_MAX - runtime->buffer_size) runtime->boundary *= 2; + /* clear the buffer once for avoiding information leaks */ + snd_pcm_fill_silence_frames(substream, 0, runtime->period_size); + snd_pcm_timer_resolution_change(substream); snd_pcm_set_state(substream, SNDRV_PCM_STATE_SETUP); -- 2.16.4

1 1

[alsa-devel] [PATCH] ALSA: hda/hdmi - Fix duplicate unref of pci_dev
by Lukas Wunner 10 Dec '19

10 Dec '19

Nicholas Johnson reports a null pointer deref as well as a refcount underflow upon hot-removal of a Thunderbolt-attached AMD eGPU. He's bisected the issue down to commit 586bc4aab878 ("ALSA: hda/hdmi - fix vgaswitcheroo detection for AMD"). The commit iterates over PCI devices using pci_get_class() and unreferences each device found, even though pci_get_class() subsequently unreferences the device as well. Fix it. Fixes: 586bc4aab878 ("ALSA: hda/hdmi - fix vgaswitcheroo detection for AMD") Link: https://lore.kernel.org/r/PSXP216MB0438BFEAA0617283A834E11580580@PSXP216MB0… Reported-and-tested-by: Nicholas Johnson <nicholas.johnson-opensource(a)outlook.com.au> Signed-off-by: Lukas Wunner <lukas(a)wunner.de> Cc: Mika Westerberg <mika.westerberg(a)linux.intel.com> Cc: Alexander Deucher <alexander.deucher(a)amd.com> Cc: Bjorn Helgaas <helgaas(a)kernel.org> --- sound/pci/hda/hda_intel.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 35b4526f0d28..b856b89378ac 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -1419,7 +1419,6 @@ static bool atpx_present(void) return true; } } - pci_dev_put(pdev); } return false; } -- 2.24.0

4 9

[alsa-devel] [PATCH 5.6 00/71] ALSA: Use managed buffer allocation
by Takashi Iwai 10 Dec '19

10 Dec '19

Hi, we already got a PCM core extension in 5.5-rc1 for allocating / releasing the PCM buffers implicitly, so called managed buffer allocation mode. This patch set is to apply this new mode for the actual (non-ASoC) drivers. The patches for ASoC and the other subsystems will follow in later patch sets. Also, other PCM API changes will follow later, too. This won't change anything from the functional POV, but merely cleanups. Takashi === Takashi Iwai (71): ALSA: aoa: Use managed buffer allocation ALSA: aaci: Use managed buffer allocation ALSA: atmel: Use managed buffer allocation ALSA: aloop: Use managed buffer allocation ALSA: dummy: Use managed buffer allocation ALSA: ml403: Use managed buffer allocation ALSA: pcsp: Use managed buffer allocation ALSA: vx: Use managed buffer allocation ALSA: firewire: Use managed buffer allocation ALSA: ad1816a: Use managed buffer allocation ALSA: cmi8330: Use managed buffer allocation ALSA: es1688: Use managed buffer allocation ALSA: es18xx: Use managed buffer allocation ALSA: sb: Use managed buffer allocation ALSA: gus: Use managed buffer allocation ALSA: wss: Use managed buffer allocation ALSA: mips: Use managed buffer allocation ALSA: parisc: Use managed buffer allocation ALSA: ad1889: Use managed buffer allocation ALSA: ali5451: Use managed buffer allocation ALSA: als300: Use managed buffer allocation ALSA: als4000: Use managed buffer allocation ALSA: asihpi: Use managed buffer allocation ALSA: atiixp: Use managed buffer allocation ALSA: au88x0: Use managed buffer allocation ALSA: aw2: Use managed buffer allocation ALSA: azt3328: Use managed buffer allocation ALSA: bt87x: Use managed buffer allocation ALSA: ca0106: Use managed buffer allocation ALSA: cmipci: Use managed buffer allocation ALSA: cs4281: Use managed buffer allocation ALSA: cs5535: Use managed buffer allocation ALSA: ctxfi: Use managed buffer allocation ALSA: echoaudio: Use managed buffer allocation ALSA: emu10k1x: Use managed buffer allocation ALSA: emu10k1: Use managed buffer allocation ALSA: ens137x: Use managed buffer allocation ALSA: es1938: Use managed buffer allocation ALSA: fm801: Use managed buffer allocation ALSA: hda: Use managed buffer allocation ALSA: ice1712: Use managed buffer allocation ALSA: ice1724: Use managed buffer allocation ALSA: intel8x0: Use managed buffer allocation ALSA: lola: Use managed buffer allocation ALSA: lx6464es: Use managed buffer allocation ALSA: maestro3: Use managed buffer allocation ALSA: mixart: Use managed buffer allocation ALSA: oxygen: Use managed buffer allocation ALSA: pcxhr: Use managed buffer allocation ALSA: riptide: Use managed buffer allocation ALSA: rme32: Use managed buffer allocation ALSA: sis7019: Use managed buffer allocation ALSA: sonicvibes: Use managed buffer allocation ALSA: trident: Use managed buffer allocation ALSA: via82xx: Use managed buffer allocation ALSA: ymfpci: Use managed buffer allocation ALSA: pdaudiocf: Use managed buffer allocation ALSA: pmac: Use managed buffer allocation ALSA: ps3: Use managed buffer allocation ALSA: aica: Use managed buffer allocation ALSA: sh: Use managed buffer allocation ALSA: sparc: Use managed buffer allocation ALSA: spi: Use managed buffer allocation ALSA: 6fire: Use managed buffer allocation ALSA: caiaq: Use managed buffer allocation ALSA: hiface: Use managed buffer allocation ALSA: line6: Use managed buffer allocation ALSA: ua101: Use managed buffer allocation ALSA: usx2y: Use managed buffer allocation ALSA: usb-audio: Use managed buffer allocation ALSA: hdml-lpe-audio: Use managed buffer allocation sound/aoa/soundbus/i2sbus/pcm.c | 11 +------ sound/arm/aaci.c | 40 +++++++++-------------- sound/atmel/ac97c.c | 20 ++---------- sound/drivers/aloop.c | 12 ++----- sound/drivers/dummy.c | 14 ++------ sound/drivers/ml403-ac97cr.c | 29 +++-------------- sound/drivers/pcsp/pcsp_lib.c | 17 ++++------ sound/drivers/vx/vx_pcm.c | 27 ++------------- sound/firewire/bebob/bebob_pcm.c | 11 ++----- sound/firewire/dice/dice-pcm.c | 13 +++----- sound/firewire/digi00x/digi00x-pcm.c | 11 ++----- sound/firewire/fireface/ff-pcm.c | 9 ++--- sound/firewire/fireworks/fireworks_pcm.c | 11 ++----- sound/firewire/isight.c | 10 ++---- sound/firewire/motu/motu-pcm.c | 11 ++----- sound/firewire/oxfw/oxfw-pcm.c | 17 +++------- sound/firewire/tascam/tascam-pcm.c | 11 ++----- sound/isa/ad1816a/ad1816a_lib.c | 20 ++---------- sound/isa/cmi8330.c | 5 ++- sound/isa/es1688/es1688_lib.c | 20 ++---------- sound/isa/es18xx.c | 24 +++----------- sound/isa/gus/gus_pcm.c | 28 +++++----------- sound/isa/sb/sb16_main.c | 21 ++---------- sound/isa/sb/sb8_main.c | 21 ++---------- sound/isa/wss/wss_lib.c | 23 ++----------- sound/mips/hal2.c | 25 ++------------ sound/mips/sgio2audio.c | 20 ++---------- sound/parisc/harmony.c | 18 +++------- sound/pci/ad1889.c | 24 ++------------ sound/pci/ali5451/ali5451.c | 30 ++--------------- sound/pci/als300.c | 23 ++----------- sound/pci/als4000.c | 23 ++----------- sound/pci/asihpi/asihpi.c | 10 ++---- sound/pci/atiixp.c | 14 +++----- sound/pci/atiixp_modem.c | 9 ++--- sound/pci/au88x0/au88x0_pcm.c | 15 ++------- sound/pci/aw2/aw2-alsa.c | 45 +++++++------------------ sound/pci/azt3328.c | 30 +++-------------- sound/pci/bt87x.c | 14 +++----- sound/pci/ca0106/ca0106_main.c | 56 ++++---------------------------- sound/pci/cmipci.c | 36 ++++++-------------- sound/pci/cs4281.c | 20 ++---------- sound/pci/cs5535audio/cs5535audio_pcm.c | 12 +++---- sound/pci/ctxfi/ctpcm.c | 15 +++------ sound/pci/echoaudio/echoaudio.c | 19 +++-------- sound/pci/emu10k1/emu10k1x.c | 15 ++++----- sound/pci/emu10k1/emupcm.c | 41 ++++------------------- sound/pci/emu10k1/p16v.c | 48 ++++----------------------- sound/pci/ens1370.c | 27 +++------------ sound/pci/es1938.c | 28 ++-------------- sound/pci/fm801.c | 20 ++---------- sound/pci/hda/hda_controller.c | 13 +++----- sound/pci/ice1712/ice1712.c | 42 +++++------------------- sound/pci/ice1712/ice1724.c | 25 +++++--------- sound/pci/intel8x0.c | 11 +++---- sound/pci/intel8x0m.c | 23 +++---------- sound/pci/lola/lola_pcm.c | 11 +++---- sound/pci/lx6464es/lx6464es.c | 14 ++------ sound/pci/maestro3.c | 9 ++--- sound/pci/mixart/mixart.c | 14 +++----- sound/pci/oxygen/oxygen_pcm.c | 52 +++++++++++++---------------- sound/pci/pcxhr/pcxhr.c | 31 ++++-------------- sound/pci/riptide/riptide.c | 10 +++--- sound/pci/rme32.c | 35 ++++---------------- sound/pci/sis7019.c | 25 ++------------ sound/pci/sonicvibes.c | 20 ++---------- sound/pci/trident/trident_main.c | 49 +++++++++++----------------- sound/pci/via82xx.c | 45 ++++++++++--------------- sound/pci/via82xx_modem.c | 9 ++--- sound/pci/ymfpci/ymfpci_main.c | 33 +++++-------------- sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c | 25 ++------------ sound/ppc/pmac.c | 28 ++-------------- sound/ppc/snd_ps3.c | 28 +++------------- sound/sh/aica.c | 29 +++-------------- sound/sh/sh_dac_audio.c | 20 ++---------- sound/sparc/amd7930.c | 20 ++---------- sound/sparc/cs4231.c | 17 ++-------- sound/sparc/dbri.c | 13 ++------ sound/spi/at73c213.c | 11 ++----- sound/usb/6fire/pcm.c | 17 +--------- sound/usb/caiaq/audio.c | 13 ++------ sound/usb/hiface/pcm.c | 18 ++-------- sound/usb/line6/pcm.c | 13 ++------ sound/usb/misc/ua101.c | 23 +++---------- sound/usb/pcm.c | 15 +++------ sound/usb/usx2y/usbusx2yaudio.c | 26 +++++---------- sound/usb/usx2y/usx2yhwdeppcm.c | 18 +++++----- sound/x86/intel_hdmi_audio.c | 16 ++++----- 88 files changed, 402 insertions(+), 1492 deletions(-) -- 2.16.4

2 76

[alsa-devel] [PATCH for-5.6 0/2] usb:gadget: ALSA PCM API updates
by Takashi Iwai 10 Dec '19

10 Dec '19

Hi, this is a patch set to adapt the latest ALSA PCM API to staging drivers. Basically these are merely cleanups, as shown in diffstat, and there should be no functional changes. As the corresponding ALSA PCM API change is found in 5.5-rc1, please apply these on 5.5-rc1 or later. Or if you prefer, I can merge them through sound tree, too. Let me know. thanks, Takashi === Takashi Iwai (2): usb: gadget: u_audio: Use managed buffer allocation usb: gadget: u_audio: Drop superfluous ioctl PCM ops drivers/usb/gadget/function/u_audio.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) -- 2.16.4

1 2

[alsa-devel] [PATCH 0/2] ASoC: topology: fix error handling
by Pierre-Louis Bossart 10 Dec '19

10 Dec '19

Two additional patches from Dragos to deal with errors with bad topologies, reviewed on GitHub last week. https://github.com/thesofproject/linux/pull/1598 Thanks Dragos! Dragos Tarcatu (2): ASoC: topology: Check return value for snd_soc_add_dai_link() ASoC: topology: Check return value for soc_tplg_pcm_create() sound/soc/soc-topology.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) -- 2.20.1

2 4

[alsa-devel] [PATCH] ASoC: simple-card: Don't create separate link when platform is present
by Daniel Baluta 10 Dec '19

10 Dec '19

In normal sound case all DAIs are detected as CPU-Codec. simple_dai_link_of supports the presence of a platform but it counts it as a CPU DAI resulting in the creation of an extra link. Adding a platform property to a link description like: simple-audio-card,dai-link { cpu { sound-dai = <&sai1>; }; plat { sound-dai = <&dsp>; }; codec { sound-dai = <&wm8960>; } will result in the creation of two links: * sai1 <-> wm8960 * dsp <-> wm8960 which is obviously not what we want. We just want one single link with: * sai1 <-> wm8960 (and platform set to dsp). Signed-off-by: Daniel Baluta <daniel.baluta(a)nxp.com> --- sound/soc/generic/simple-card.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index 10b82bf043d1..55e9f8800b3e 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -371,6 +371,7 @@ static int simple_for_each_link(struct asoc_simple_priv *priv, do { struct asoc_simple_data adata; struct device_node *codec; + struct device_node *plat; struct device_node *np; int num = of_get_child_count(node); @@ -381,6 +382,9 @@ static int simple_for_each_link(struct asoc_simple_priv *priv, ret = -ENODEV; goto error; } + /* get platform */ + plat = of_get_child_by_name(node, is_top ? + PREFIX "plat" : "plat"); /* get convert-xxx property */ memset(&adata, 0, sizeof(adata)); @@ -389,6 +393,8 @@ static int simple_for_each_link(struct asoc_simple_priv *priv, /* loop for all CPU/Codec node */ for_each_child_of_node(node, np) { + if (plat == np) + continue; /* * It is DPCM * if it has many CPUs, -- 2.17.1

3 2

[alsa-devel] [PATCH 0/8] ASoC: SOF: improvements for v5.6
by Pierre-Louis Bossart 10 Dec '19

10 Dec '19

Mix of new interfaces for firmware functionality (channel map, ASRC), corrections to loader code, BYT/CHT improvements w/ BYT-CR support, HDaudio codec mask and CometLake machine driver detection. Amery Song (1): ASoC: Intel: common: work-around incorrect ACPI HID for CML boards Curtis Malainey (1): ASoC: SOF: Intel: split cht and byt debug window sizes Kai Vehmanen (1): ASoC: SOF: Intel: add codec_mask module parameter Karol Trzcinski (2): ASoC: SOF: loader: snd_sof_fw_parse_ext_data log warning on unknown header ASoC: SOF: loader: fix snd_sof_fw_parse_ext_data Pierre-Louis Bossart (1): ASoC: SOF: Intel: byt: fixup topology filename for BYT-CR Seppo Ingalsuo (1): ASoC: SOF: Add asynchronous sample rate converter topology support Slawomir Blauciak (1): ASoC: SOF: ipc: channel map structures include/sound/sof/channel_map.h | 61 +++++++++++++++ include/sound/sof/topology.h | 27 +++++++ include/uapi/sound/sof/abi.h | 2 +- include/uapi/sound/sof/tokens.h | 6 ++ .../intel/common/soc-acpi-intel-cml-match.c | 41 ++++++---- sound/soc/sof/intel/byt.c | 54 ++++++++++++- sound/soc/sof/intel/hda-ctrl.c | 13 ++++ sound/soc/sof/loader.c | 7 +- sound/soc/sof/topology.c | 78 +++++++++++++++++++ 9 files changed, 265 insertions(+), 24 deletions(-) create mode 100644 include/sound/sof/channel_map.h -- 2.20.1

2 16

[alsa-devel] [PATCH v2 00/15][resend] ASoC: soc-core cleanup step6
by Kuninori Morimoto 10 Dec '19

10 Dec '19

Hi Mark These are resend of v2 of soc-core cleanup step6. These doesn't add new features. Kuninori Morimoto (15): ASoC: soc-core: remove dai_link_list ASoC: soc-core: remove snd_soc_disconnect_sync() ASoC: soc-core: remove snd_soc_get_dai_substream() ASoC: soc-core: move snd_soc_get_pcm_runtime() ASoC: soc-core: find rtd via dai_link pointer at snd_soc_get_pcm_runtime() ASoC: soc-core: move snd_soc_find_dai_link() ASoC: soc-core: rename snd_soc_add_dai_link() to snd_soc_add_pcm_runtime() ASoC: soc-core: rename snd_soc_remove_dai_link() to snd_soc_remove_pcm_runtime() ASoC: soc-core: move soc_link_dai_pcm_new() ASoC: soc-core: rename soc_link_dai_pcm_new() to soc_dai_pcm_new() ASoC: soc-core: move soc_link_init() ASoC: soc-core: add missing return value check for soc_link_init() ASoC: soc-core: rename soc_link_init() to soc_init_pcm_runtime() ASoC: soc-core: soc_set_name_prefix(): tidyup loop condition ASoC: soc-core: soc_set_name_prefix(): get component device_node at out of loop include/sound/soc.h | 22 +-- sound/soc/fsl/fsl-asoc-card.c | 2 +- sound/soc/pxa/mioa701_wm9713.c | 2 +- sound/soc/samsung/bells.c | 12 +- sound/soc/samsung/littlemill.c | 10 +- sound/soc/samsung/snow.c | 2 +- sound/soc/samsung/speyside.c | 4 +- sound/soc/samsung/tm2_wm5110.c | 6 +- sound/soc/samsung/tobermory.c | 6 +- sound/soc/sh/rcar/core.c | 2 - sound/soc/soc-core.c | 339 ++++++++++++++++------------------------- sound/soc/soc-topology.c | 47 +++++- sound/soc/tegra/tegra_wm8903.c | 2 +- 13 files changed, 204 insertions(+), 252 deletions(-) -- 2.7.4

2 30

[alsa-devel] broonie-sound/for-next bisection: boot on rk3399-gru-kevin
by kernelci.org bot 10 Dec '19

10 Dec '19

* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * This automated bisection report was sent to you on the basis * * that you may be involved with the breaking commit it has * * found. No manual investigation has been done to verify it, * * and the root cause of the problem may be somewhere else. * * * * If you do send a fix, please include this trailer: * * Reported-by: "kernelci.org bot" <bot(a)kernelci.org> * * * * Hope this helps! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * broonie-sound/for-next bisection: boot on rk3399-gru-kevin Summary: Start: 3778790e1d13 Merge branch 'asoc-5.6' into asoc-next Details: https://kernelci.org/boot/id/5deef68acb72c66093960f08 Plain log: https://storage.kernelci.org//broonie-sound/for-next/v5.5-rc1-46-g3778790e1… HTML log: https://storage.kernelci.org//broonie-sound/for-next/v5.5-rc1-46-g3778790e1… Result: abe3b6727b65 ASoC: cs42l51: add dac mux widget in codec routes Checks: revert: PASS verify: PASS Parameters: Tree: broonie-sound URL: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git Branch: for-next Target: rk3399-gru-kevin CPU arch: arm64 Lab: lab-collabora Compiler: gcc-8 Config: defconfig Test suite: boot Breaking commit found: ------------------------------------------------------------------------------- commit abe3b6727b653307c27870a2d4ecbf9de4e914a5 Author: Olivier Moysan <olivier.moysan(a)st.com> Date: Tue Dec 3 15:16:27 2019 +0100 ASoC: cs42l51: add dac mux widget in codec routes Add "DAC mux" DAPM widget in CS42l51 audio codec routes, to support DAC mux control and to remove error trace "DAC Mux has no paths" at widget creation. Note: ADC path of DAC mux is not routed in this patch. Signed-off-by: Olivier Moysan <olivier.moysan(a)st.com> Link: https://lore.kernel.org/r/20191203141627.29471-1-olivier.moysan@st.com Signed-off-by: Mark Brown <broonie(a)kernel.org> diff --git a/sound/soc/codecs/cs42l51.c b/sound/soc/codecs/cs42l51.c index 55408c8fcb4e..e47758e4fb36 100644 --- a/sound/soc/codecs/cs42l51.c +++ b/sound/soc/codecs/cs42l51.c @@ -214,12 +214,10 @@ static const struct snd_soc_dapm_widget cs42l51_dapm_widgets[] = { SND_SOC_DAPM_ADC_E("Right ADC", "Right HiFi Capture", CS42L51_POWER_CTL1, 2, 1, cs42l51_pdn_event, SND_SOC_DAPM_PRE_POST_PMD), - SND_SOC_DAPM_DAC_E("Left DAC", "Left HiFi Playback", - CS42L51_POWER_CTL1, 5, 1, - cs42l51_pdn_event, SND_SOC_DAPM_PRE_POST_PMD), - SND_SOC_DAPM_DAC_E("Right DAC", "Right HiFi Playback", - CS42L51_POWER_CTL1, 6, 1, - cs42l51_pdn_event, SND_SOC_DAPM_PRE_POST_PMD), + SND_SOC_DAPM_DAC_E("Left DAC", NULL, CS42L51_POWER_CTL1, 5, 1, + cs42l51_pdn_event, SND_SOC_DAPM_PRE_POST_PMD), + SND_SOC_DAPM_DAC_E("Right DAC", NULL, CS42L51_POWER_CTL1, 6, 1, + cs42l51_pdn_event, SND_SOC_DAPM_PRE_POST_PMD), /* analog/mic */ SND_SOC_DAPM_INPUT("AIN1L"), @@ -255,6 +253,12 @@ static const struct snd_soc_dapm_route cs42l51_routes[] = { {"HPL", NULL, "Left DAC"}, {"HPR", NULL, "Right DAC"}, + {"Right DAC", NULL, "DAC Mux"}, + {"Left DAC", NULL, "DAC Mux"}, + + {"DAC Mux", "Direct PCM", "Playback"}, + {"DAC Mux", "DSP PCM", "Playback"}, + {"Left ADC", NULL, "Left PGA"}, {"Right ADC", NULL, "Right PGA"}, ------------------------------------------------------------------------------- Git bisection log: ------------------------------------------------------------------------------- git bisect start # good: [e42617b825f8073569da76dc4510bfa019b1c35a] Linux 5.5-rc1 git bisect good e42617b825f8073569da76dc4510bfa019b1c35a # bad: [3778790e1d1329223601c63602286ad1d73c480f] Merge branch 'asoc-5.6' into asoc-next git bisect bad 3778790e1d1329223601c63602286ad1d73c480f # bad: [3e62579436c6a7fc35de7318e6c5f495b8d0046c] ASoC: SOF: core: modify the signature for snd_sof_create_page_table git bisect bad 3e62579436c6a7fc35de7318e6c5f495b8d0046c # good: [62d5ae4cafb7ffeeec6ba2dd1814cafeeea7dd8f] ASoC: max98090: save and restore SHDN when changing sensitive registers git bisect good 62d5ae4cafb7ffeeec6ba2dd1814cafeeea7dd8f # bad: [bc9a665581b3c6c82c9220a47f6573b49ce2df0b] ASoC: fix soc-core.c kernel-doc warning git bisect bad bc9a665581b3c6c82c9220a47f6573b49ce2df0b # bad: [abe3b6727b653307c27870a2d4ecbf9de4e914a5] ASoC: cs42l51: add dac mux widget in codec routes git bisect bad abe3b6727b653307c27870a2d4ecbf9de4e914a5 # good: [49df1e3925824cf44e590daac635974270185841] ASoC: rsnd: Calculate DALIGN inversion at run-time git bisect good 49df1e3925824cf44e590daac635974270185841 # first bad commit: [abe3b6727b653307c27870a2d4ecbf9de4e914a5] ASoC: cs42l51: add dac mux widget in codec routes -------------------------------------------------------------------------------

2 1

[alsa-devel] [PATCH] ASoC: cs42l42: add missed regulator_bulk_disable in remove and fix probe failure
by Chuhong Yuan 10 Dec '19

10 Dec '19

The driver forgets to call regulator_bulk_disable() in remove like that in probe failure. Besides, some failed branches in probe do not handle failure correctly. Add the missed call and revise wrong direct returns to fix it. Fixes: 2c394ca79604b ("ASoC: Add support for CS42L42 codec") Signed-off-by: Chuhong Yuan <hslester96(a)gmail.com> --- sound/soc/codecs/cs42l42.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/sound/soc/codecs/cs42l42.c b/sound/soc/codecs/cs42l42.c index 5125bb9b37b5..96b3cff50ce9 100644 --- a/sound/soc/codecs/cs42l42.c +++ b/sound/soc/codecs/cs42l42.c @@ -1796,8 +1796,10 @@ static int cs42l42_i2c_probe(struct i2c_client *i2c_client, /* Reset the Device */ cs42l42->reset_gpio = devm_gpiod_get_optional(&i2c_client->dev, "reset", GPIOD_OUT_LOW); - if (IS_ERR(cs42l42->reset_gpio)) - return PTR_ERR(cs42l42->reset_gpio); + if (IS_ERR(cs42l42->reset_gpio)) { + ret = PTR_ERR(cs42l42->reset_gpio); + goto err_disable; + } if (cs42l42->reset_gpio) { dev_dbg(&i2c_client->dev, "Found reset GPIO\n"); @@ -1831,13 +1833,13 @@ static int cs42l42_i2c_probe(struct i2c_client *i2c_client, dev_err(&i2c_client->dev, "CS42L42 Device ID (%X). Expected %X\n", devid, CS42L42_CHIP_ID); - return ret; + goto err_disable; } ret = regmap_read(cs42l42->regmap, CS42L42_REVID, &reg); if (ret < 0) { dev_err(&i2c_client->dev, "Get Revision ID failed\n"); - return ret; + goto err_disable; } dev_info(&i2c_client->dev, @@ -1863,7 +1865,7 @@ static int cs42l42_i2c_probe(struct i2c_client *i2c_client, if (i2c_client->dev.of_node) { ret = cs42l42_handle_device_data(i2c_client, cs42l42); if (ret != 0) - return ret; + goto err_disable; } /* Setup headset detection */ @@ -1892,6 +1894,8 @@ static int cs42l42_i2c_remove(struct i2c_client *i2c_client) /* Hold down reset */ gpiod_set_value_cansleep(cs42l42->reset_gpio, 0); + regulator_bulk_disable(ARRAY_SIZE(cs42l42->supplies), + cs42l42->supplies); return 0; } -- 2.24.0

2 5

[alsa-devel] [PATCH 1/3] treewide: Fix -Wformat=2 warnings
by Rosen Penev 10 Dec '19

10 Dec '19

Allows the compiler to check these formats at compile time. Fixed several such warnings. Signed-off-by: Rosen Penev <rosenp(a)gmail.com> --- include/use-case.h | 1 + src/error.c | 2 ++ src/input.c | 6 ++++-- src/output.c | 6 ++++-- src/pcm/pcm.c | 4 ++-- src/pcm/pcm_direct.c | 2 +- src/pcm/pcm_file.c | 6 +++--- src/topology/builder.c | 3 ++- src/ucm/ucm_local.h | 2 ++ 9 files changed, 21 insertions(+), 11 deletions(-) diff --git a/include/use-case.h b/include/use-case.h index 2efcb4d8..3f0cf58e 100644 --- a/include/use-case.h +++ b/include/use-case.h @@ -188,6 +188,7 @@ typedef struct snd_use_case_mgr snd_use_case_mgr_t; * \param ... Optional arguments for sprintf like format * \return Allocated string identifier or NULL on error */ +__attribute__((format(printf, 1, 2))) char *snd_use_case_identifier(const char *fmt, ...); /** diff --git a/src/error.c b/src/error.c index 2e617f87..ad281411 100644 --- a/src/error.c +++ b/src/error.c @@ -95,6 +95,7 @@ snd_local_error_handler_t snd_lib_error_set_local(snd_local_error_handler_t func * \ref snd_lib_error_set_local, it is called. Otherwise, prints the error * message including location to \c stderr. */ +__attribute__((format(printf, 5, 6))) static void snd_lib_error_default(const char *file, int line, const char *function, int err, const char *fmt, ...) { va_list arg; @@ -149,6 +150,7 @@ const char *snd_asoundlib_version(void) /* * internal error handling */ +__attribute__((format(printf, 5, 6))) static void snd_err_msg_default(const char *file, int line, const char *function, int err, const char *fmt, ...) { va_list arg; diff --git a/src/input.c b/src/input.c index 35324f1f..c204fe7b 100644 --- a/src/input.c +++ b/src/input.c @@ -132,6 +132,7 @@ static int snd_input_stdio_close(snd_input_t *input ATTRIBUTE_UNUSED) return 0; } +__attribute__((format(scanf, 2, 0))) static int snd_input_stdio_scan(snd_input_t *input, const char *format, va_list args) { snd_input_stdio_t *stdio = input->private_data; @@ -144,7 +145,7 @@ static char *snd_input_stdio_gets(snd_input_t *input, char *str, size_t size) snd_input_stdio_t *stdio = input->private_data; return fgets(str, (int) size, stdio->fp); } - + static int snd_input_stdio_getc(snd_input_t *input) { snd_input_stdio_t *stdio = input->private_data; @@ -236,6 +237,7 @@ static int snd_input_buffer_close(snd_input_t *input) return 0; } +__attribute__((format(scanf, 2, 0))) static int snd_input_buffer_scan(snd_input_t *input, const char *format, va_list args) { snd_input_buffer_t *buffer = input->private_data; @@ -262,7 +264,7 @@ static char *snd_input_buffer_gets(snd_input_t *input, char *str, size_t size) *str = '\0'; return str; } - + static int snd_input_buffer_getc(snd_input_t *input) { snd_input_buffer_t *buffer = input->private_data; diff --git a/src/output.c b/src/output.c index 7e3a91b3..935ab003 100644 --- a/src/output.c +++ b/src/output.c @@ -141,6 +141,7 @@ static int snd_output_stdio_close(snd_output_t *output) return 0; } +__attribute__((format(printf, 2, 0))) static int snd_output_stdio_print(snd_output_t *output, const char *format, va_list args) { snd_output_stdio_t *stdio = output->private_data; @@ -152,7 +153,7 @@ static int snd_output_stdio_puts(snd_output_t *output, const char *str) snd_output_stdio_t *stdio = output->private_data; return fputs(str, stdio->fp); } - + static int snd_output_stdio_putc(snd_output_t *output, int c) { snd_output_stdio_t *stdio = output->private_data; @@ -268,6 +269,7 @@ static int snd_output_buffer_need(snd_output_t *output, size_t size) return buffer->alloc - buffer->size; } +__attribute__((format(printf, 2, 0))) static int snd_output_buffer_print(snd_output_t *output, const char *format, va_list args) { snd_output_buffer_t *buffer = output->private_data; @@ -304,7 +306,7 @@ static int snd_output_buffer_puts(snd_output_t *output, const char *str) buffer->size += size; return size; } - + static int snd_output_buffer_putc(snd_output_t *output, int c) { snd_output_buffer_t *buffer = output->private_data; diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c index 1064044c..09dfe967 100644 --- a/src/pcm/pcm.c +++ b/src/pcm/pcm.c @@ -8241,7 +8241,7 @@ int snd_pcm_chmap_print(const snd_pcm_chmap_t *map, size_t maxlen, char *buf) return -ENOMEM; } if (map->pos[i] & SND_CHMAP_DRIVER_SPEC) - len += snprintf(buf + len, maxlen - len, "%d", p); + len += snprintf(buf + len, maxlen - len, "%u", p); else { const char *name = chmap_names[p]; if (name) @@ -8249,7 +8249,7 @@ int snd_pcm_chmap_print(const snd_pcm_chmap_t *map, size_t maxlen, char *buf) "%s", name); else len += snprintf(buf + len, maxlen - len, - "Ch%d", p); + "Ch%u", p); } if (len >= maxlen) return -ENOMEM; diff --git a/src/pcm/pcm_direct.c b/src/pcm/pcm_direct.c index 54d99005..719e1692 100644 --- a/src/pcm/pcm_direct.c +++ b/src/pcm/pcm_direct.c @@ -1406,7 +1406,7 @@ int snd_pcm_direct_initialize_poll_fd(snd_pcm_direct_t *dmix) SNDERR("unable to info for slave pcm"); return ret; } - sprintf(name, "hw:CLASS=%i,SCLASS=0,CARD=%i,DEV=%i,SUBDEV=%i", + sprintf(name, "hw:CLASS=%i,SCLASS=0,CARD=%i,DEV=%u,SUBDEV=%u", (int)SND_TIMER_CLASS_PCM, snd_pcm_info_get_card(&info), snd_pcm_info_get_device(&info), diff --git a/src/pcm/pcm_file.c b/src/pcm/pcm_file.c index a02b2dc0..c874e863 100644 --- a/src/pcm/pcm_file.c +++ b/src/pcm/pcm_file.c @@ -155,7 +155,7 @@ static int snd_pcm_file_replace_fname(snd_pcm_file_t *file, char **new_fname_p) next char */ switch (*(++old_index_ch)) { case RATE_KEY: - snprintf(value, sizeof(value), "%d", + snprintf(value, sizeof(value), "%u", pcm->rate); err = snd_pcm_file_append_value(&new_fname, &new_index_ch, &new_len, value); @@ -164,7 +164,7 @@ static int snd_pcm_file_replace_fname(snd_pcm_file_t *file, char **new_fname_p) break; case CHANNELS_KEY: - snprintf(value, sizeof(value), "%d", + snprintf(value, sizeof(value), "%u", pcm->channels); err = snd_pcm_file_append_value(&new_fname, &new_index_ch, &new_len, value); @@ -173,7 +173,7 @@ static int snd_pcm_file_replace_fname(snd_pcm_file_t *file, char **new_fname_p) break; case BWIDTH_KEY: - snprintf(value, sizeof(value), "%d", + snprintf(value, sizeof(value), "%u", pcm->frame_bits/pcm->channels); err = snd_pcm_file_append_value(&new_fname, &new_index_ch, &new_len, value); diff --git a/src/topology/builder.c b/src/topology/builder.c index 5ae3ae89..3adbad45 100644 --- a/src/topology/builder.c +++ b/src/topology/builder.c @@ -21,6 +21,7 @@ #include "tplg_local.h" /* verbose output detailing each object size and file position */ +__attribute__((format(printf, 2, 3))) static void verbose(snd_tplg_t *tplg, const char *fmt, ...) { int offset; @@ -244,7 +245,7 @@ static int write_manifest_data(snd_tplg_t *tplg) return ret; } - verbose(tplg, "manifest : write %d bytes\n", sizeof(tplg->manifest)); + verbose(tplg, "manifest : write %zu bytes\n", sizeof(tplg->manifest)); ret = write(tplg->out_fd, &tplg->manifest, sizeof(tplg->manifest)); if (ret < 0) { SNDERR("error: failed to write manifest %d\n", ret); diff --git a/src/ucm/ucm_local.h b/src/ucm/ucm_local.h index ba961507..696a60dc 100644 --- a/src/ucm/ucm_local.h +++ b/src/ucm/ucm_local.h @@ -246,7 +246,9 @@ struct snd_use_case_mgr { #define uc_dbg(fmt, arg...) do { } while (0) #endif +__attribute__((format(printf, 1, 2))) void uc_mgr_error(const char *fmt, ...); +__attribute__((format(printf, 1, 2))) void uc_mgr_stdout(const char *fmt, ...); int uc_mgr_config_load(int format, const char *file, snd_config_t **cfg); -- 2.23.0

1 2

[alsa-devel] [PATCH 00/55] ALSA: Support PCM sync_stop
by Takashi Iwai 10 Dec '19

10 Dec '19

Hi, this is the last episode of the trilogy of PCM enhancements for non-ASoC drivers. Basically this either adds the setup for card->sync_irq and removes the superfluous synchronize_irq() calls, or replaces the synchronization code with the new sync_irq PCM ops. For the explanation about PCM ssync_stop and card sync_irq, see the commits: 1e850beea2781d30418743dd99250291cef37919 ALSA: pcm: Add the support for sync-stop operation fabb26dcd104027b971c018275fe40f2ebe09ae3 ALSA: pcm: Add card sync_irq field thanks, Takashi === Takashi Iwai (55): ALSA: ad1889: Support PCM sync_stop ALSA: ali5451: Support PCM sync_stop ALSA: als300: Support PCM sync_stop ALSA: atiixp: Support PCM sync_stop ALSA: au88x0: Support PCM sync_stop ALSA: aw2: Support PCM sync_stop ALSA: azt3328: Support PCM sync_stop ALSA: bt87x: Support PCM sync_stop ALSA: ca0106: Support PCM sync_stop ALSA: cmipci: Support PCM sync_stop ALSA: cs4281: Support PCM sync_stop ALSA: cs46xx: Support PCM sync_stop ALSA: cs5535audio: Support PCM sync_stop ALSA: ctxfi: Support PCM sync_stop ALSA: echoaudio: Support PCM sync_stop ALSA: emu10k1: Support PCM sync_stop ALSA: ens137x: Support PCM sync_stop ALSA: es1938: Support PCM sync_stop ALSA: es1968: Support PCM sync_stop ALSA: fm801: Support PCM sync_stop ALSA: hda: Support PCM sync_stop ALSA: ice1712: Support PCM sync_stop ALSA: ice1724: Support PCM sync_stop ALSA: intel8x0: Support PCM sync_stop ALSA: korg1212: Support PCM sync_stop ALSA: lola: Support PCM sync_stop ALSA: maestro3: Support PCM sync_stop ALSA: nm256: Support PCM sync_stop ALSA: oxygen: Support PCM sync_stop ALSA: riptide: Support PCM sync_stop ALSA: rme32: Support PCM sync_stop ALSA: rme96: Support PCM sync_stop ALSA: rme9652: Support PCM sync_stop ALSA: sis7019: Support PCM sync_stop ALSA: sonicvibes: Support PCM sync_stop ALSA: trident: Support PCM sync_stop ALSA: via82xx: Support PCM sync_stop ALSA: ymfpci: Support PCM sync_stop ALSA: ad1816a: Support PCM sync_stop ALSA: es1688: Support PCM sync_stop ALSA: es18xx: Support PCM sync_stop ALSA: gus: Support PCM sync_stop ALSA: msnd: Support PCM sync_stop ALSA: opl3sa2: Support PCM sync_stop ALSA: opti9xx: Support PCM sync_stop ALSA: sb: Support PCM sync_stop ALSA: wavefront: Support PCM sync_stop ALSA: wss: Support PCM sync_stop ALSA: lx6464es: Support PCM sync_stop ALSA: mixart: Support PCM sync_stop ALSA: pcxhr: Support PCM sync_stop ALSA: vx222: Support PCM sync_stop ALSA: pdaudiocf: Support PCM sync_stop ALSA: vxpocket: Support PCM sync_stop ALSA: usb-audio: Support PCM sync_stop sound/isa/ad1816a/ad1816a_lib.c | 1 + sound/isa/es1688/es1688_lib.c | 1 + sound/isa/es18xx.c | 1 + sound/isa/gus/gus_main.c | 1 + sound/isa/gus/gusmax.c | 3 ++- sound/isa/gus/interwave.c | 1 + sound/isa/msnd/msnd_pinnacle.c | 1 + sound/isa/opl3sa2.c | 1 + sound/isa/opti9xx/opti92x-ad1848.c | 1 + sound/isa/sb/sb_common.c | 1 + sound/isa/wavefront/wavefront.c | 1 + sound/isa/wss/wss_lib.c | 1 + sound/pci/ad1889.c | 2 +- sound/pci/ali5451/ali5451.c | 3 +-- sound/pci/als300.c | 2 +- sound/pci/atiixp.c | 2 +- sound/pci/atiixp_modem.c | 2 +- sound/pci/au88x0/au88x0.c | 1 + sound/pci/aw2/aw2-alsa.c | 1 + sound/pci/azt3328.c | 2 +- sound/pci/bt87x.c | 2 +- sound/pci/ca0106/ca0106_main.c | 1 + sound/pci/cmipci.c | 1 + sound/pci/cs4281.c | 5 +---- sound/pci/cs46xx/cs46xx_lib.c | 1 + sound/pci/cs5535audio/cs5535audio.c | 2 +- sound/pci/ctxfi/cthw20k1.c | 4 +--- sound/pci/ctxfi/cthw20k2.c | 1 + sound/pci/echoaudio/echoaudio.c | 3 +++ sound/pci/emu10k1/emu10k1_main.c | 1 + sound/pci/emu10k1/emu10k1x.c | 1 + sound/pci/ens1370.c | 4 +--- sound/pci/es1938.c | 3 +++ sound/pci/es1968.c | 3 +-- sound/pci/fm801.c | 1 + sound/pci/hda/hda_intel.c | 4 +++- sound/pci/hda/hda_tegra.c | 4 +--- sound/pci/ice1712/ice1712.c | 2 +- sound/pci/ice1712/ice1724.c | 2 +- sound/pci/intel8x0.c | 4 +++- sound/pci/intel8x0m.c | 3 +++ sound/pci/korg1212/korg1212.c | 1 + sound/pci/lola/lola.c | 2 +- sound/pci/lx6464es/lx6464es.c | 1 + sound/pci/maestro3.c | 1 + sound/pci/mixart/mixart.c | 1 + sound/pci/nm256/nm256.c | 2 ++ sound/pci/oxygen/oxygen_lib.c | 2 +- sound/pci/pcxhr/pcxhr.c | 1 + sound/pci/riptide/riptide.c | 1 + sound/pci/rme32.c | 1 + sound/pci/rme96.c | 1 + sound/pci/rme9652/hdsp.c | 1 + sound/pci/rme9652/hdspm.c | 1 + sound/pci/rme9652/rme9652.c | 1 + sound/pci/sis7019.c | 1 + sound/pci/sonicvibes.c | 1 + sound/pci/trident/trident_main.c | 1 + sound/pci/via82xx.c | 3 +-- sound/pci/via82xx_modem.c | 3 +-- sound/pci/vx222/vx222.c | 1 + sound/pci/ymfpci/ymfpci_main.c | 1 + sound/pcmcia/pdaudiocf/pdaudiocf.c | 1 + sound/pcmcia/vx/vxpocket.c | 1 + sound/usb/pcm.c | 37 +++++++++++++++++++++++++------------ 65 files changed, 101 insertions(+), 47 deletions(-) -- 2.16.4

1 55

[alsa-devel] [PATCH][resend] ASoC: simple-card: switch to yaml base Documentation
by Kuninori Morimoto 10 Dec '19

10 Dec '19

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> This patch switches from .txt base to .yaml base Document. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- .../devicetree/bindings/sound/simple-card.txt | 351 --------------- .../devicetree/bindings/sound/simple-card.yaml | 472 +++++++++++++++++++++ 2 files changed, 472 insertions(+), 351 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/simple-card.txt create mode 100644 Documentation/devicetree/bindings/sound/simple-card.yaml diff --git a/Documentation/devicetree/bindings/sound/simple-card.txt b/Documentation/devicetree/bindings/sound/simple-card.txt deleted file mode 100644 index 79954cd6..0000000 --- a/Documentation/devicetree/bindings/sound/simple-card.txt +++ /dev/null @@ -1,351 +0,0 @@ -Simple-Card: - -Simple-Card specifies audio DAI connections of SoC <-> codec. - -Required properties: - -- compatible : "simple-audio-card" - -Optional properties: - -- simple-audio-card,name : User specified audio sound card name, one string - property. -- simple-audio-card,widgets : Please refer to widgets.txt. -- simple-audio-card,routing : A list of the connections between audio components. - Each entry is a pair of strings, the first being the - connection's sink, the second being the connection's - source. -- simple-audio-card,mclk-fs : Multiplication factor between stream rate and codec - mclk. When defined, mclk-fs property defined in - dai-link sub nodes are ignored. -- simple-audio-card,hp-det-gpio : Reference to GPIO that signals when - headphones are attached. -- simple-audio-card,mic-det-gpio : Reference to GPIO that signals when - a microphone is attached. -- simple-audio-card,aux-devs : List of phandles pointing to auxiliary devices, such - as amplifiers, to be added to the sound card. -- simple-audio-card,pin-switches : List of strings containing the widget names for - which pin switches must be created. - -Optional subnodes: - -- simple-audio-card,dai-link : Container for dai-link level - properties and the CPU and CODEC - sub-nodes. This container may be - omitted when the card has only one - DAI link. See the examples and the - section below. - -Dai-link subnode properties and subnodes: - -If dai-link subnode is omitted and the subnode properties are directly -under "sound"-node the subnode property and subnode names have to be -prefixed with "simple-audio-card,"-prefix. - -Required dai-link subnodes: - -- cpu : CPU sub-node -- codec : CODEC sub-node - -Optional dai-link subnode properties: - -- format : CPU/CODEC common audio format. - "i2s", "right_j", "left_j" , "dsp_a" - "dsp_b", "ac97", "pdm", "msb", "lsb" -- frame-master : Indicates dai-link frame master. - phandle to a cpu or codec subnode. -- bitclock-master : Indicates dai-link bit clock master. - phandle to a cpu or codec subnode. -- bitclock-inversion : bool property. Add this if the - dai-link uses bit clock inversion. -- frame-inversion : bool property. Add this if the - dai-link uses frame clock inversion. -- mclk-fs : Multiplication factor between stream - rate and codec mclk, applied only for - the dai-link. - -For backward compatibility the frame-master and bitclock-master -properties can be used as booleans in codec subnode to indicate if the -codec is the dai-link frame or bit clock master. In this case there -should be no dai-link node, the same properties should not be present -at sound-node level, and the bitclock-inversion and frame-inversion -properties should also be placed in the codec node if needed. - -Required CPU/CODEC subnodes properties: - -- sound-dai : phandle and port of CPU/CODEC - -Optional CPU/CODEC subnodes properties: - -- dai-tdm-slot-num : Please refer to tdm-slot.txt. -- dai-tdm-slot-width : Please refer to tdm-slot.txt. -- clocks / system-clock-frequency : specify subnode's clock if needed. - it can be specified via "clocks" if system has - clock node (= common clock), or "system-clock-frequency" - (if system doens't support common clock) - If a clock is specified, it is - enabled with clk_prepare_enable() - in dai startup() and disabled with - clk_disable_unprepare() in dai - shutdown(). - If a clock is specified and a - multiplication factor is given with - mclk-fs, the clock will be set to the - calculated mclk frequency when the - stream starts. -- system-clock-direction-out : specifies clock direction as 'out' on - initialization. It is useful for some aCPUs with - fixed clocks. - -------------------------------------------- -Example 1 - single DAI link: -------------------------------------------- - -sound { - compatible = "simple-audio-card"; - simple-audio-card,name = "VF610-Tower-Sound-Card"; - simple-audio-card,format = "left_j"; - simple-audio-card,bitclock-master = <&dailink0_master>; - simple-audio-card,frame-master = <&dailink0_master>; - simple-audio-card,widgets = - "Microphone", "Microphone Jack", - "Headphone", "Headphone Jack", - "Speaker", "External Speaker"; - simple-audio-card,routing = - "MIC_IN", "Microphone Jack", - "Headphone Jack", "HP_OUT", - "External Speaker", "LINE_OUT"; - - simple-audio-card,cpu { - sound-dai = <&sh_fsi2 0>; - }; - - dailink0_master: simple-audio-card,codec { - sound-dai = <&ak4648>; - clocks = <&osc>; - }; -}; - -&i2c0 { - ak4648: ak4648@12 { - #sound-dai-cells = <0>; - compatible = "asahi-kasei,ak4648"; - reg = <0x12>; - }; -}; - -sh_fsi2: sh_fsi2@ec230000 { - #sound-dai-cells = <1>; - compatible = "renesas,sh_fsi2"; - reg = <0xec230000 0x400>; - interrupt-parent = <&gic>; - interrupts = <0 146 0x4>; -}; - -------------------------------------------- -Example 2 - many DAI links: -------------------------------------------- - -sound { - compatible = "simple-audio-card"; - simple-audio-card,name = "Cubox Audio"; - - simple-audio-card,dai-link@0 { /* I2S - HDMI */ - reg = <0>; - format = "i2s"; - cpu { - sound-dai = <&audio1 0>; - }; - codec { - sound-dai = <&tda998x 0>; - }; - }; - - simple-audio-card,dai-link@1 { /* S/PDIF - HDMI */ - reg = <1>; - cpu { - sound-dai = <&audio1 1>; - }; - codec { - sound-dai = <&tda998x 1>; - }; - }; - - simple-audio-card,dai-link@2 { /* S/PDIF - S/PDIF */ - reg = <2>; - cpu { - sound-dai = <&audio1 1>; - }; - codec { - sound-dai = <&spdif_codec>; - }; - }; -}; - -------------------------------------------- -Example 3 - route audio from IMX6 SSI2 through TLV320DAC3100 codec -through TPA6130A2 amplifier to headphones: -------------------------------------------- - -&i2c0 { - codec: tlv320dac3100@18 { - compatible = "ti,tlv320dac3100"; - ... - } - - amp: tpa6130a2@60 { - compatible = "ti,tpa6130a2"; - ... - } -} - -sound { - compatible = "simple-audio-card"; - ... - simple-audio-card,widgets = - "Headphone", "Headphone Jack"; - simple-audio-card,routing = - "Headphone Jack", "HPLEFT", - "Headphone Jack", "HPRIGHT", - "LEFTIN", "HPL", - "RIGHTIN", "HPR"; - simple-audio-card,aux-devs = <&amp>; - simple-audio-card,cpu { - sound-dai = <&ssi2>; - }; - simple-audio-card,codec { - sound-dai = <&codec>; - clocks = ... - }; -}; - -------------------------------------------- -Example 4. Sampling Rate Conversion -------------------------------------------- - -sound { - compatible = "simple-audio-card"; - - simple-audio-card,name = "rsnd-ak4643"; - simple-audio-card,format = "left_j"; - simple-audio-card,bitclock-master = <&sndcodec>; - simple-audio-card,frame-master = <&sndcodec>; - - simple-audio-card,convert-rate = <48000>; - - simple-audio-card,prefix = "ak4642"; - simple-audio-card,routing = "ak4642 Playback", "DAI0 Playback", - "DAI0 Capture", "ak4642 Capture"; - - sndcpu: simple-audio-card,cpu { - sound-dai = <&rcar_sound>; - }; - - sndcodec: simple-audio-card,codec { - sound-dai = <&ak4643>; - system-clock-frequency = <11289600>; - }; -}; - -------------------------------------------- -Example 5. 2 CPU 1 Codec (Mixing) -------------------------------------------- -sound { - compatible = "simple-audio-card"; - - simple-audio-card,name = "rsnd-ak4643"; - simple-audio-card,format = "left_j"; - simple-audio-card,bitclock-master = <&dpcmcpu>; - simple-audio-card,frame-master = <&dpcmcpu>; - - simple-audio-card,routing = "ak4642 Playback", "DAI0 Playback", - "ak4642 Playback", "DAI1 Playback"; - - dpcmcpu: cpu@0 { - sound-dai = <&rcar_sound 0>; - }; - - cpu@1 { - sound-dai = <&rcar_sound 1>; - }; - - codec { - prefix = "ak4642"; - sound-dai = <&ak4643>; - clocks = <&audio_clock>; - }; -}; - -------------------------------------------- -Example 6 - many DAI links with DPCM: -------------------------------------------- - -CPU0 ------ ak4613 -CPU1 ------ PCM3168A-p /* DPCM 1ch/2ch */ -CPU2 --/ /* DPCM 3ch/4ch */ -CPU3 --/ /* DPCM 5ch/6ch */ -CPU4 --/ /* DPCM 7ch/8ch */ -CPU5 ------ PCM3168A-c - -sound { - compatible = "simple-audio-card"; - - simple-audio-card,routing = - "pcm3168a Playback", "DAI1 Playback", - "pcm3168a Playback", "DAI2 Playback", - "pcm3168a Playback", "DAI3 Playback", - "pcm3168a Playback", "DAI4 Playback"; - - simple-audio-card,dai-link@0 { - format = "left_j"; - bitclock-master = <&sndcpu0>; - frame-master = <&sndcpu0>; - - sndcpu0: cpu { - sound-dai = <&rcar_sound 0>; - }; - codec { - sound-dai = <&ak4613>; - }; - }; - simple-audio-card,dai-link@1 { - format = "i2s"; - bitclock-master = <&sndcpu1>; - frame-master = <&sndcpu1>; - - convert-channels = <8>; /* TDM Split */ - - sndcpu1: cpu@0 { - sound-dai = <&rcar_sound 1>; - }; - cpu@1 { - sound-dai = <&rcar_sound 2>; - }; - cpu@2 { - sound-dai = <&rcar_sound 3>; - }; - cpu@3 { - sound-dai = <&rcar_sound 4>; - }; - codec { - mclk-fs = <512>; - prefix = "pcm3168a"; - dai-tdm-slot-num = <8>; - sound-dai = <&pcm3168a 0>; - }; - }; - simple-audio-card,dai-link@2 { - format = "i2s"; - bitclock-master = <&sndcpu2>; - frame-master = <&sndcpu2>; - - sndcpu2: cpu { - sound-dai = <&rcar_sound 5>; - }; - codec { - mclk-fs = <512>; - prefix = "pcm3168a"; - sound-dai = <&pcm3168a 1>; - }; - }; -}; diff --git a/Documentation/devicetree/bindings/sound/simple-card.yaml b/Documentation/devicetree/bindings/sound/simple-card.yaml new file mode 100644 index 0000000..ac3975f --- /dev/null +++ b/Documentation/devicetree/bindings/sound/simple-card.yaml @@ -0,0 +1,472 @@ +# SPDX-License-Identifier: GPL-2.0 +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/simple-card.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Simple Audio Card Driver Device Tree Bindings + +maintainers: + - Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> + +definitions: + + frame-master: + description: Indicates dai-link frame master. + $ref: /schemas/types.yaml#/definitions/phandle-array + + bitclock-master: + description: Indicates dai-link bit clock master + $ref: /schemas/types.yaml#/definitions/phandle-array + + frame-inversion: + description: dai-link uses frame clock inversion + $ref: /schemas/types.yaml#/definitions/flag + + bitclock-inversion: + description: dai-link uses bit clock inversion + $ref: /schemas/types.yaml#/definitions/flag + + mclk-fs: + description: | + Multiplication factor between stream rate and codec mclk. + When defined, mclk-fs property defined in dai-link sub nodes are ignored. + $ref: /schemas/types.yaml#/definitions/uint32 + + hp-det-gpio: + description: | + Reference to GPIO that signals when headphones are attached. + $ref: /schemas/types.yaml#/definitions/phandle + + aux-devs: + description: | + List of phandles pointing to auxiliary devices, such + as amplifiers, to be added to the sound card. + $ref: /schemas/types.yaml#/definitions/phandle-array + + mic-det-gpio: + description: | + Reference to GPIO that signals when a microphone is attached. + $ref: /schemas/types.yaml#/definitions/phandle + + convert-rate: + description: CPU to Codec rate convert. + $ref: /schemas/types.yaml#/definitions/uint32 + + convert-channels: + description: CPU to Codec rate channels. + $ref: /schemas/types.yaml#/definitions/uint32 + + prefix: + description: "device name prefix" + $ref: /schemas/types.yaml#/definitions/string + + pin-switches: + description: the widget names for which pin switches must be created. + $ref: /schemas/types.yaml#/definitions/string-array + + format: + description: audio format. + oneOf: + - items: + enum: + - i2s + - right_j + - left_j + - dsp_a + - dsp_b + - ac97 + - pdm + - msb + - lsb + + dai: + type: object + properties: + sound-dai: + $ref: /schemas/types.yaml#/definitions/phandle-array + + # common properties + mclk-fs: + $ref: "#/definitions/mclk-fs" + prefix: + $ref: "#/definitions/prefix" + frame-inversion: + $ref: "#/definitions/frame-inversion" + bitclock-inversion: + $ref: "#/definitions/bitclock-inversion" + frame-master: + $ref: /schemas/types.yaml#/definitions/flag + bitclock-master: + $ref: /schemas/types.yaml#/definitions/flag + + dai-tdm-slot-num: + description: see tdm-slot.txt. + $ref: /schemas/types.yaml#/definitions/uint32 + dai-tdm-slot-width: + description: see tdm-slot.txt. + $ref: /schemas/types.yaml#/definitions/uint32 + clocks: + description: | + If a clock is specified and a multiplication factor is given with + mclk-fs, the clock will be set to the calculated mclk frequency + when the stream starts. + $ref: /schemas/types.yaml#/definitions/phandle-array + system-clock-frequency: + description: | + If a clock is specified and a multiplication factor is given with + mclk-fs, the clock will be set to the calculated mclk frequency + when the stream starts. + $ref: /schemas/types.yaml#/definitions/uint32 + system-clock-direction-out: + description: | + specifies clock direction as 'out' on initialization. + It is useful for some aCPUs with fixed clocks. + $ref: /schemas/types.yaml#/definitions/flag + required: + - sound-dai + +properties: + compatible: + contains: + enum: + - simple-audio-card + - simple-scu-audio-card + + "#address-cells": true + "#size-cells": true + + simple-audio-card,name: + description: User specified audio sound card name. + $ref: /schemas/types.yaml#/definitions/string + + simple-audio-card,widgets: + description: User specified audio sound card name. + $ref: /schemas/types.yaml#/definitions/non-unique-string-array + + simple-audio-card,routing: + description: | + A list of the connections between audio components. + Each entry is a pair of strings, the first being the + connection's sink, the second being the connection's source. + $ref: /schemas/types.yaml#/definitions/non-unique-string-array + +patternProperties: + "^simple-audio-card,cpu.*": + description: CPU node + $ref: "#/definitions/dai" + "^simple-audio-card,codec.*": + description: CPU node + $ref: "#/definitions/dai" + + # common properties + "^simple-audio-card,frame-master$": + $ref: "#/definitions/frame-master" + "^simple-audio-card,bitclock-master$": + $ref: "#/definitions/bitclock-master" + "^simple-audio-card,frame-inversion$": + $ref: "#/definitions/frame-inversion" + "^simple-audio-card,bitclock-inversion$": + $ref: "#/definitions/bitclock-inversion" + "^simple-audio-card,format$": + $ref: "#/definitions/format" + "^simple-audio-card,mclk-fs$": + $ref: "#/definitions/mclk-fs" + "^simple-audio-card,hp-det-gpio$": + $ref: "#/definitions/hp-det-gpio" + "^simple-audio-card,mic-det-gpio$": + $ref: "#/definitions/mic-det-gpio" + "^simple-audio-card,aux-devs$": + $ref: "#/definitions/aux-devs" + "^simple-audio-card,convert-rate$": + $ref: "#/definitions/convert-rate" + "^simple-audio-card,convert-channels$": + $ref: "#/definitions/convert-channels" + "^simple-audio-card,prefix$": + $ref: "#/definitions/prefix" + "^simple-audio-card,pin-switches$": + $ref: "#/definitions/pin-switches" + + "^simple-audio-card,dai-link": + description: | + Container for dai-link level properties and the CPU and CODEC sub-nodes. + This container may be omitted when the card has only one DAI link. + type: object + properties: + reg: + $ref: /schemas/types.yaml#/definitions/uint32 + + # common properties + frame-master: + $ref: "#/definitions/frame-master" + bitclock-master: + $ref: "#/definitions/bitclock-master" + frame-inversion: + $ref: "#/definitions/frame-inversion" + bitclock-inversion: + $ref: "#/definitions/bitclock-inversion" + format: + $ref: "#/definitions/format" + mclk-fs: + $ref: "#/definitions/mclk-fs" + hp-det-gpio: + $ref: "#/definitions/hp-det-gpio" + mic-det-gpio: + $ref: "#/definitions/mic-det-gpio" + aux-devs: + $ref: "#/definitions/aux-devs" + convert-rate: + $ref: "#/definitions/convert-rate" + convert-channels: + $ref: "#/definitions/convert-channels" + prefix: + $ref: "#/definitions/prefix" + pin-switches: + $ref: "#/definitions/pin-switches" + + patternProperties: + "^cpu.*": + $ref: "#/definitions/dai" + "^codec.*": + $ref: "#/definitions/dai" + additionalProperties: false + +required: + - compatible + +additionalProperties: false + +examples: +#-------------------- +# single DAI link +#-------------------- + - | + sound { + compatible = "simple-audio-card"; + simple-audio-card,name = "VF610-Tower-Sound-Card"; + simple-audio-card,format = "left_j"; + simple-audio-card,bitclock-master = <&dailink0_master>; + simple-audio-card,frame-master = <&dailink0_master>; + simple-audio-card,widgets = + "Microphone", "Microphone Jack", + "Headphone", "Headphone Jack", + "Speaker", "External Speaker"; + simple-audio-card,routing = + "MIC_IN", "Microphone Jack", + "Headphone Jack", "HP_OUT", + "External Speaker", "LINE_OUT"; + + simple-audio-card,cpu { + sound-dai = <&sh_fsi2 0>; + }; + + dailink0_master: simple-audio-card,codec { + sound-dai = <&ak4648>; + clocks = <&osc>; + }; + }; + +#-------------------- +# Multi DAI links +#-------------------- + - | + sound { + compatible = "simple-audio-card"; + simple-audio-card,name = "Cubox Audio"; + + #address-cells = <1>; + #size-cells = <0>; + + simple-audio-card,dai-link@0 { /* I2S - HDMI */ + reg = <0>; + format = "i2s"; + cpu { + sound-dai = <&audio0>; + }; + codec { + sound-dai = <&tda998x0>; + }; + }; + + simple-audio-card,dai-link@1 { /* S/PDIF - HDMI */ + reg = <1>; + cpu { + sound-dai = <&audio1>; + }; + codec { + sound-dai = <&tda998x1>; + }; + }; + + simple-audio-card,dai-link@2 { /* S/PDIF - S/PDIF */ + reg = <2>; + cpu { + sound-dai = <&audio2>; + }; + codec { + sound-dai = <&spdif_codec>; + }; + }; + }; + +#-------------------- +# route audio from IMX6 SSI2 through TLV320DAC3100 codec +# through TPA6130A2 amplifier to headphones: +#-------------------- + - | + sound { + compatible = "simple-audio-card"; + + simple-audio-card,widgets = + "Headphone", "Headphone Jack"; + simple-audio-card,routing = + "Headphone Jack", "HPLEFT", + "Headphone Jack", "HPRIGHT", + "LEFTIN", "HPL", + "RIGHTIN", "HPR"; + simple-audio-card,aux-devs = <&amp>; + simple-audio-card,cpu { + sound-dai = <&ssi2>; + }; + simple-audio-card,codec { + sound-dai = <&codec>; + clocks = <&clocks>; + }; + }; + +#-------------------- +# Sampling Rate Conversion +#-------------------- + - | + sound { + compatible = "simple-audio-card"; + + simple-audio-card,name = "rsnd-ak4643"; + simple-audio-card,format = "left_j"; + simple-audio-card,bitclock-master = <&sndcodec>; + simple-audio-card,frame-master = <&sndcodec>; + + simple-audio-card,convert-rate = <48000>; + + simple-audio-card,prefix = "ak4642"; + simple-audio-card,routing = "ak4642 Playback", "DAI0 Playback", + "DAI0 Capture", "ak4642 Capture"; + + sndcpu: simple-audio-card,cpu { + sound-dai = <&rcar_sound>; + }; + + sndcodec: simple-audio-card,codec { + sound-dai = <&ak4643>; + system-clock-frequency = <11289600>; + }; + }; + +#-------------------- +# 2 CPU 1 Codec (Mixing) +#-------------------- + - | + sound { + compatible = "simple-audio-card"; + + simple-audio-card,name = "rsnd-ak4643"; + simple-audio-card,format = "left_j"; + simple-audio-card,bitclock-master = <&dpcmcpu>; + simple-audio-card,frame-master = <&dpcmcpu>; + + simple-audio-card,convert-rate = <48000>; + simple-audio-card,convert-channels = <2>; + + simple-audio-card,routing = "ak4642 Playback", "DAI0 Playback", + "ak4642 Playback", "DAI1 Playback"; + + dpcmcpu: simple-audio-card,cpu@0 { + sound-dai = <&rcar_sound 0>; + }; + + simple-audio-card,cpu@1 { + sound-dai = <&rcar_sound 1>; + }; + + simple-audio-card,codec { + prefix = "ak4642"; + sound-dai = <&ak4643>; + clocks = <&audio_clock>; + }; + }; + +#-------------------- +# Multi DAI links with DPCM: +# +# CPU0 ------ ak4613 +# CPU1 ------ PCM3168A-p /* DPCM 1ch/2ch */ +# CPU2 --/ /* DPCM 3ch/4ch */ +# CPU3 --/ /* DPCM 5ch/6ch */ +# CPU4 --/ /* DPCM 7ch/8ch */ +# CPU5 ------ PCM3168A-c +#-------------------- + - | + sound { + compatible = "simple-audio-card"; + + simple-audio-card,routing = + "pcm3168a Playback", "DAI1 Playback", + "pcm3168a Playback", "DAI2 Playback", + "pcm3168a Playback", "DAI3 Playback", + "pcm3168a Playback", "DAI4 Playback"; + + simple-audio-card,dai-link@0 { + format = "left_j"; + bitclock-master = <&sndcpu0>; + frame-master = <&sndcpu0>; + + sndcpu0: cpu { + sound-dai = <&rcar_sound 0>; + }; + codec { + sound-dai = <&ak4613>; + }; + }; + + simple-audio-card,dai-link@1 { + format = "i2s"; + bitclock-master = <&sndcpu1>; + frame-master = <&sndcpu1>; + + convert-channels = <8>; /* TDM Split */ + + sndcpu1: cpu@0 { + sound-dai = <&rcar_sound 1>; + }; + cpu@1 { + sound-dai = <&rcar_sound 2>; + }; + cpu@2 { + sound-dai = <&rcar_sound 3>; + }; + cpu@3 { + sound-dai = <&rcar_sound 4>; + }; + codec { + mclk-fs = <512>; + prefix = "pcm3168a"; + dai-tdm-slot-num = <8>; + sound-dai = <&pcm3168a 0>; + }; + }; + + simple-audio-card,dai-link@2 { + format = "i2s"; + bitclock-master = <&sndcpu2>; + frame-master = <&sndcpu2>; + + sndcpu2: cpu { + sound-dai = <&rcar_sound 5>; + }; + codec { + mclk-fs = <512>; + prefix = "pcm3168a"; + sound-dai = <&pcm3168a 1>; + }; + }; + }; -- 2.7.4

1 0

[alsa-devel] [PATCH][resend] ASoC: renesas, rsnd: switch to yaml base Documentation
by Kuninori Morimoto 10 Dec '19

10 Dec '19

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> This patch switches from .txt base to .yaml base Document. It is still keeping detail explanations at .txt Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- .../devicetree/bindings/sound/renesas,rsnd.txt | 518 -------------------- .../devicetree/bindings/sound/renesas,rsnd.yaml | 527 +++++++++++++++++++++ 2 files changed, 527 insertions(+), 518 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/renesas,rsnd.yaml diff --git a/Documentation/devicetree/bindings/sound/renesas,rsnd.txt b/Documentation/devicetree/bindings/sound/renesas,rsnd.txt index 797fd03..b731f16 100644 --- a/Documentation/devicetree/bindings/sound/renesas,rsnd.txt +++ b/Documentation/devicetree/bindings/sound/renesas,rsnd.txt @@ -253,521 +253,3 @@ This is example of TDM 6ch. Driver can automatically switches TDM <-> stereo mode in this case. see "Example: simple sound card for TDM" - -============================================= -Required properties: -============================================= - -- compatible : "renesas,rcar_sound-<soctype>", fallbacks - "renesas,rcar_sound-gen1" if generation1, and - "renesas,rcar_sound-gen2" if generation2 (or RZ/G1) - "renesas,rcar_sound-gen3" if generation3 (or RZ/G2) - Examples with soctypes are: - - "renesas,rcar_sound-r8a7743" (RZ/G1M) - - "renesas,rcar_sound-r8a7744" (RZ/G1N) - - "renesas,rcar_sound-r8a7745" (RZ/G1E) - - "renesas,rcar_sound-r8a77470" (RZ/G1C) - - "renesas,rcar_sound-r8a774a1" (RZ/G2M) - - "renesas,rcar_sound-r8a774b1" (RZ/G2N) - - "renesas,rcar_sound-r8a774c0" (RZ/G2E) - - "renesas,rcar_sound-r8a7778" (R-Car M1A) - - "renesas,rcar_sound-r8a7779" (R-Car H1) - - "renesas,rcar_sound-r8a7790" (R-Car H2) - - "renesas,rcar_sound-r8a7791" (R-Car M2-W) - - "renesas,rcar_sound-r8a7793" (R-Car M2-N) - - "renesas,rcar_sound-r8a7794" (R-Car E2) - - "renesas,rcar_sound-r8a7795" (R-Car H3) - - "renesas,rcar_sound-r8a7796" (R-Car M3-W) - - "renesas,rcar_sound-r8a77965" (R-Car M3-N) - - "renesas,rcar_sound-r8a77990" (R-Car E3) - - "renesas,rcar_sound-r8a77995" (R-Car D3) -- reg : Should contain the register physical address. - required register is - SRU/ADG/SSI if generation1 - SRU/ADG/SSIU/SSI/AUDIO-DMAC-periperi if generation2/generation3 - Select extended AUDIO-DMAC-periperi address if SoC has it, - otherwise select normal AUDIO-DMAC-periperi address. -- reg-names : Should contain the register names. - scu/adg/ssi if generation1 - scu/adg/ssiu/ssi/audmapp if generation2/generation3 -- rcar_sound,ssi : Should contain SSI feature. - The number of SSI subnode should be same as HW. - see below for detail. -- rcar_sound,ssiu : Should contain SSIU feature. - The number of SSIU subnode should be same as HW. - see below for detail. -- rcar_sound,src : Should contain SRC feature. - The number of SRC subnode should be same as HW. - see below for detail. -- rcar_sound,ctu : Should contain CTU feature. - The number of CTU subnode should be same as HW. - see below for detail. -- rcar_sound,mix : Should contain MIX feature. - The number of MIX subnode should be same as HW. - see below for detail. -- rcar_sound,dvc : Should contain DVC feature. - The number of DVC subnode should be same as HW. - see below for detail. -- rcar_sound,dai : DAI contents. - The number of DAI subnode should be same as HW. - see below for detail. -- #sound-dai-cells : it must be 0 if your system is using single DAI - it must be 1 if your system is using multi DAI -- clocks : References to SSI/SRC/MIX/CTU/DVC/AUDIO_CLK clocks. -- clock-names : List of necessary clock names. - "ssi-all", "ssi.X", "src.X", "mix.X", "ctu.X", - "dvc.X", "clk_a", "clk_b", "clk_c", "clk_i" - -Optional properties: -- #clock-cells : it must be 0 if your system has audio_clkout - it must be 1 if your system has audio_clkout0/1/2/3 -- clock-frequency : for all audio_clkout0/1/2/3 -- clkout-lr-asynchronous : boolean property. it indicates that audio_clkoutn - is asynchronizes with lr-clock. -- resets : References to SSI resets. -- reset-names : List of valid reset names. - "ssi-all", "ssi.X" - -SSI subnode properties: -- interrupts : Should contain SSI interrupt for PIO transfer -- shared-pin : if shared clock pin -- pio-transfer : use PIO transfer mode -- no-busif : BUSIF is not ussed when [mem -> SSI] via DMA case -- dma : Should contain Audio DMAC entry -- dma-names : SSI case "rx" (=playback), "tx" (=capture) - Deprecated: see SSIU subnode properties - SSIU case "rxu" (=playback), "txu" (=capture) - -SSIU subnode properties: -- dma : Should contain Audio DMAC entry -- dma-names : "rx" (=playback), "tx" (=capture) - -SRC subnode properties: -- dma : Should contain Audio DMAC entry -- dma-names : "rx" (=playback), "tx" (=capture) - -DVC subnode properties: -- dma : Should contain Audio DMAC entry -- dma-names : "tx" (=playback/capture) - -DAI subnode properties: -- playback : list of playback modules -- capture : list of capture modules - - -============================================= -Example: -============================================= - -rcar_sound: sound@ec500000 { - #sound-dai-cells = <1>; - compatible = "renesas,rcar_sound-r8a7791", "renesas,rcar_sound-gen2"; - reg = <0 0xec500000 0 0x1000>, /* SCU */ - <0 0xec5a0000 0 0x100>, /* ADG */ - <0 0xec540000 0 0x1000>, /* SSIU */ - <0 0xec541000 0 0x1280>, /* SSI */ - <0 0xec740000 0 0x200>; /* Audio DMAC peri peri*/ - reg-names = "scu", "adg", "ssiu", "ssi", "audmapp"; - - clocks = <&mstp10_clks R8A7790_CLK_SSI_ALL>, - <&mstp10_clks R8A7790_CLK_SSI9>, <&mstp10_clks R8A7790_CLK_SSI8>, - <&mstp10_clks R8A7790_CLK_SSI7>, <&mstp10_clks R8A7790_CLK_SSI6>, - <&mstp10_clks R8A7790_CLK_SSI5>, <&mstp10_clks R8A7790_CLK_SSI4>, - <&mstp10_clks R8A7790_CLK_SSI3>, <&mstp10_clks R8A7790_CLK_SSI2>, - <&mstp10_clks R8A7790_CLK_SSI1>, <&mstp10_clks R8A7790_CLK_SSI0>, - <&mstp10_clks R8A7790_CLK_SCU_SRC9>, <&mstp10_clks R8A7790_CLK_SCU_SRC8>, - <&mstp10_clks R8A7790_CLK_SCU_SRC7>, <&mstp10_clks R8A7790_CLK_SCU_SRC6>, - <&mstp10_clks R8A7790_CLK_SCU_SRC5>, <&mstp10_clks R8A7790_CLK_SCU_SRC4>, - <&mstp10_clks R8A7790_CLK_SCU_SRC3>, <&mstp10_clks R8A7790_CLK_SCU_SRC2>, - <&mstp10_clks R8A7790_CLK_SCU_SRC1>, <&mstp10_clks R8A7790_CLK_SCU_SRC0>, - <&mstp10_clks R8A7790_CLK_SCU_DVC0>, <&mstp10_clks R8A7790_CLK_SCU_DVC1>, - <&audio_clk_a>, <&audio_clk_b>, <&audio_clk_c>, <&m2_clk>; - clock-names = "ssi-all", - "ssi.9", "ssi.8", "ssi.7", "ssi.6", "ssi.5", - "ssi.4", "ssi.3", "ssi.2", "ssi.1", "ssi.0", - "src.9", "src.8", "src.7", "src.6", "src.5", - "src.4", "src.3", "src.2", "src.1", "src.0", - "dvc.0", "dvc.1", - "clk_a", "clk_b", "clk_c", "clk_i"; - - rcar_sound,dvc { - dvc0: dvc-0 { - dmas = <&audma0 0xbc>; - dma-names = "tx"; - }; - dvc1: dvc-1 { - dmas = <&audma0 0xbe>; - dma-names = "tx"; - }; - }; - - rcar_sound,mix { - mix0: mix-0 { }; - mix1: mix-1 { }; - }; - - rcar_sound,ctu { - ctu00: ctu-0 { }; - ctu01: ctu-1 { }; - ctu02: ctu-2 { }; - ctu03: ctu-3 { }; - ctu10: ctu-4 { }; - ctu11: ctu-5 { }; - ctu12: ctu-6 { }; - ctu13: ctu-7 { }; - }; - - rcar_sound,src { - src0: src-0 { - interrupts = <0 352 IRQ_TYPE_LEVEL_HIGH>; - dmas = <&audma0 0x85>, <&audma1 0x9a>; - dma-names = "rx", "tx"; - }; - src1: src-1 { - interrupts = <0 353 IRQ_TYPE_LEVEL_HIGH>; - dmas = <&audma0 0x87>, <&audma1 0x9c>; - dma-names = "rx", "tx"; - }; - src2: src-2 { - interrupts = <0 354 IRQ_TYPE_LEVEL_HIGH>; - dmas = <&audma0 0x89>, <&audma1 0x9e>; - dma-names = "rx", "tx"; - }; - src3: src-3 { - interrupts = <0 355 IRQ_TYPE_LEVEL_HIGH>; - dmas = <&audma0 0x8b>, <&audma1 0xa0>; - dma-names = "rx", "tx"; - }; - src4: src-4 { - interrupts = <0 356 IRQ_TYPE_LEVEL_HIGH>; - dmas = <&audma0 0x8d>, <&audma1 0xb0>; - dma-names = "rx", "tx"; - }; - src5: src-5 { - interrupts = <0 357 IRQ_TYPE_LEVEL_HIGH>; - dmas = <&audma0 0x8f>, <&audma1 0xb2>; - dma-names = "rx", "tx"; - }; - src6: src-6 { - interrupts = <0 358 IRQ_TYPE_LEVEL_HIGH>; - dmas = <&audma0 0x91>, <&audma1 0xb4>; - dma-names = "rx", "tx"; - }; - src7: src-7 { - interrupts = <0 359 IRQ_TYPE_LEVEL_HIGH>; - dmas = <&audma0 0x93>, <&audma1 0xb6>; - dma-names = "rx", "tx"; - }; - src8: src-8 { - interrupts = <0 360 IRQ_TYPE_LEVEL_HIGH>; - dmas = <&audma0 0x95>, <&audma1 0xb8>; - dma-names = "rx", "tx"; - }; - src9: src-9 { - interrupts = <0 361 IRQ_TYPE_LEVEL_HIGH>; - dmas = <&audma0 0x97>, <&audma1 0xba>; - dma-names = "rx", "tx"; - }; - }; - - rcar_sound,ssiu { - ssiu00: ssiu-0 { - dmas = <&audma0 0x15>, <&audma1 0x16>; - dma-names = "rx", "tx"; - }; - ssiu01: ssiu-1 { - dmas = <&audma0 0x35>, <&audma1 0x36>; - dma-names = "rx", "tx"; - }; - - ... - - ssiu95: ssiu-49 { - dmas = <&audma0 0xA5>, <&audma1 0xA6>; - dma-names = "rx", "tx"; - }; - ssiu96: ssiu-50 { - dmas = <&audma0 0xA7>, <&audma1 0xA8>; - dma-names = "rx", "tx"; - }; - ssiu97: ssiu-51 { - dmas = <&audma0 0xA9>, <&audma1 0xAA>; - dma-names = "rx", "tx"; - }; - }; - - rcar_sound,ssi { - ssi0: ssi-0 { - interrupts = <0 370 IRQ_TYPE_LEVEL_HIGH>; - dmas = <&audma0 0x01>, <&audma1 0x02>; - dma-names = "rx", "tx"; - }; - ssi1: ssi-1 { - interrupts = <0 371 IRQ_TYPE_LEVEL_HIGH>; - dmas = <&audma0 0x03>, <&audma1 0x04>; - dma-names = "rx", "tx"; - }; - - ... - - ssi8: ssi-8 { - interrupts = <0 378 IRQ_TYPE_LEVEL_HIGH>; - dmas = <&audma0 0x11>, <&audma1 0x12>; - dma-names = "rx", "tx"; - }; - ssi9: ssi-9 { - interrupts = <0 379 IRQ_TYPE_LEVEL_HIGH>; - dmas = <&audma0 0x13>, <&audma1 0x14>; - dma-names = "rx", "tx"; - }; - }; - - rcar_sound,dai { - dai0 { - playback = <&ssi5 &src5>; - capture = <&ssi6>; - }; - dai1 { - playback = <&ssi3>; - }; - dai2 { - capture = <&ssi4>; - }; - dai3 { - playback = <&ssi7>; - }; - dai4 { - capture = <&ssi8>; - }; - }; -}; - -============================================= -Example: simple sound card -============================================= - - rsnd_ak4643: sound { - compatible = "simple-audio-card"; - - simple-audio-card,format = "left_j"; - simple-audio-card,bitclock-master = <&sndcodec>; - simple-audio-card,frame-master = <&sndcodec>; - - sndcpu: simple-audio-card,cpu { - sound-dai = <&rcar_sound>; - }; - - sndcodec: simple-audio-card,codec { - sound-dai = <&ak4643>; - clocks = <&audio_clock>; - }; - }; - -&rcar_sound { - pinctrl-0 = <&sound_pins &sound_clk_pins>; - pinctrl-names = "default"; - - /* Single DAI */ - #sound-dai-cells = <0>; - - - rcar_sound,dai { - dai0 { - playback = <&ssi0 &src2 &dvc0>; - capture = <&ssi1 &src3 &dvc1>; - }; - }; -}; - -&ssi1 { - shared-pin; -}; - -============================================= -Example: simple sound card for Asynchronous mode -============================================= - -sound { - compatible = "simple-scu-audio-card"; - ... - /* - * SRC Asynchronous mode setting - * Playback: - * All input data will be converted to 48kHz - * Capture: - * Inputed 48kHz data will be converted to - * system specified Hz - */ - simple-audio-card,convert-rate = <48000>; - ... - simple-audio-card,cpu { - sound-dai = <&rcar_sound>; - }; - simple-audio-card,codec { - ... - }; -}; - -============================================= -Example: simple sound card for channel convert -============================================= - -sound { - compatible = "simple-scu-audio-card"; - ... - /* - * CTU setting - * All input data will be converted to 2ch - * as output data - */ - simple-audio-card,convert-channels = <2>; - ... - simple-audio-card,cpu { - sound-dai = <&rcar_sound>; - }; - simple-audio-card,codec { - ... - }; -}; - -============================================= -Example: simple sound card for MIXer -============================================= - -sound { - compatible = "simple-scu-audio-card"; - ... - simple-audio-card,cpu@0 { - sound-dai = <&rcar_sound 0>; - }; - simple-audio-card,cpu@1 { - sound-dai = <&rcar_sound 1>; - }; - simple-audio-card,codec { - ... - }; -}; - -&rcar_sound { - ... - rcar_sound,dai { - dai0 { - playback = <&src1 &ctu02 &mix0 &dvc0 &ssi0>; - }; - dai1 { - playback = <&src2 &ctu03 &mix0 &dvc0 &ssi0>; - }; - }; -}; - -============================================= -Example: simple sound card for TDM -============================================= - -rsnd_tdm: sound { - compatible = "simple-audio-card"; - - simple-audio-card,format = "left_j"; - simple-audio-card,bitclock-master = <&sndcodec>; - simple-audio-card,frame-master = <&sndcodec>; - - sndcpu: simple-audio-card,cpu { - sound-dai = <&rcar_sound>; - dai-tdm-slot-num = <6>; - }; - - sndcodec: simple-audio-card,codec { - sound-dai = <&xxx>; - }; -}; - -============================================= -Example: simple sound card for TDM Split -============================================= - -sound_card: sound { - compatible = "audio-graph-scu-card"; - prefix = "xxxx"; - routing = "xxxx Playback", "DAI0 Playback", - "xxxx Playback", "DAI1 Playback", - "xxxx Playback", "DAI2 Playback", - "xxxx Playback", "DAI3 Playback"; - convert-channels = <8>; /* TDM Split */ - - dais = <&rsnd_port0 /* playback ch1/ch2 */ - &rsnd_port1 /* playback ch3/ch4 */ - &rsnd_port2 /* playback ch5/ch6 */ - &rsnd_port3 /* playback ch7/ch8 */ - >; -}; - -audio-codec { - ... - port { - codec_0: endpoint@1 { - remote-endpoint = <&rsnd_ep0>; - }; - codec_1: endpoint@2 { - remote-endpoint = <&rsnd_ep1>; - }; - codec_2: endpoint@3 { - remote-endpoint = <&rsnd_ep2>; - }; - codec_3: endpoint@4 { - remote-endpoint = <&rsnd_ep3>; - }; - }; -}; - -&rcar_sound { - ... - ports { - rsnd_port0: port@0 { - rsnd_ep0: endpoint { - remote-endpoint = <&codec_0>; - ... - playback = <&ssiu30 &ssi3>; - }; - }; - rsnd_port1: port@1 { - rsnd_ep1: endpoint { - remote-endpoint = <&codec_1>; - ... - playback = <&ssiu31 &ssi3>; - }; - }; - rsnd_port2: port@2 { - rsnd_ep2: endpoint { - remote-endpoint = <&codec_2>; - ... - playback = <&ssiu32 &ssi3>; - }; - }; - rsnd_port3: port@3 { - rsnd_ep3: endpoint { - remote-endpoint = <&codec_3>; - ... - playback = <&ssiu33 &ssi3>; - }; - }; - }; -}; - -============================================= -Example: simple sound card for Multi channel -============================================= - -&rcar_sound { - pinctrl-0 = <&sound_pins &sound_clk_pins>; - pinctrl-names = "default"; - - /* Single DAI */ - #sound-dai-cells = <0>; - - - rcar_sound,dai { - dai0 { - playback = <&ssi0 &ssi1 &ssi2 &src0 &dvc0>; - }; - }; -}; diff --git a/Documentation/devicetree/bindings/sound/renesas,rsnd.yaml b/Documentation/devicetree/bindings/sound/renesas,rsnd.yaml new file mode 100644 index 0000000..5fb036c --- /dev/null +++ b/Documentation/devicetree/bindings/sound/renesas,rsnd.yaml @@ -0,0 +1,527 @@ +# SPDX-License-Identifier: GPL-2.0 +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/renesas,rsnd.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Renesas R-Car Sound Driver Device Tree Bindings + +maintainers: + - Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> + +properties: + $nodename: + pattern: "^sound@.*" + + compatible: + oneOf: + # for Gen1 SoC + - items: + - enum: + - renesas,rcar_sound-r8a7778 # R-Car M1A + - renesas,rcar_sound-r8a7779 # R-Car H1 + - enum: + - renesas,rcar_sound-gen1 + # for Gen2 SoC + - items: + - enum: + - renesas,rcar_sound-r8a7743 # RZ/G1M + - renesas,rcar_sound-r8a7744 # RZ/G1N + - renesas,rcar_sound-r8a7745 # RZ/G1E + - renesas,rcar_sound-r8a77470 # RZ/G1C + - renesas,rcar_sound-r8a7790 # R-Car H2 + - renesas,rcar_sound-r8a7791 # R-Car M2-W + - renesas,rcar_sound-r8a7793 # R-Car M2-N + - renesas,rcar_sound-r8a7794 # R-Car E2 + - enum: + - renesas,rcar_sound-gen2 + # for Gen3 SoC + - items: + - enum: + - renesas,rcar_sound-r8a774a1 # RZ/G2M + - renesas,rcar_sound-r8a774b1 # RZ/G2N + - renesas,rcar_sound-r8a774c0 # RZ/G2E + - renesas,rcar_sound-r8a7795 # R-Car H3 + - renesas,rcar_sound-r8a7796 # R-Car M3-W + - renesas,rcar_sound-r8a77965 # R-Car M3-N + - renesas,rcar_sound-r8a77990 # R-Car E3 + - renesas,rcar_sound-r8a77995 # R-Car D3 + - enum: + - renesas,rcar_sound-gen3 + # for Generic + - items: + - enum: + - renesas,rcar_sound-gen1 + - renesas,rcar_sound-gen2 + - renesas,rcar_sound-gen3 + + reg: + minItems: 3 # Gen1 + maxItems: 5 # Gen2/Gen3 + + reg-names: + description: | + Should contain the register names. + scu/adg/ssi if generation1 + scu/adg/ssiu/ssi/audmapp if generation2/generation3 + minItems: 3 # Gen1 + maxItems: 5 # Gen2/Gen3 + allOf: + - items: + enum: + - scu + - adg + - ssiu + - ssi + - audmapp + + "#sound-dai-cells": + description: | + it must be 0 if your system is using single DAI + it must be 1 if your system is using multi DAIs + enum: [0, 1] + + "#clock-cells": + description: | + it must be 0 if your system has audio_clkout + it must be 1 if your system has audio_clkout0/1/2/3 + enum: [0, 1] + + clock-frequency: + description: for audio_clkout0/1/2/3 + $ref: /schemas/types.yaml#/definitions/uint32-array + + clkout-lr-asynchronous: + description: audio_clkoutn is asynchronizes with lr-clock. + $ref: /schemas/types.yaml#/definitions/flag + + power-domains: true + + resets: + description: References to SSI resets + $ref: /schemas/types.yaml#/definitions/phandle-array + + reset-names: + description: List of valid reset names. + allOf: + - items: + enum: + - ssi-all + - ssi.9 + - ssi.8 + - ssi.7 + - ssi.6 + - ssi.5 + - ssi.4 + - ssi.3 + - ssi.2 + - ssi.1 + - ssi.0 + + clocks: + $ref: /schemas/types.yaml#/definitions/phandle-array + description: References to SSI/SRC/MIX/CTU/DVC/AUDIO_CLK clocks. + + clock-names: + description: List of necessary clock names. + allOf: + - items: + enum: + - ssi-all + - ssi.9 + - ssi.8 + - ssi.7 + - ssi.6 + - ssi.5 + - ssi.4 + - ssi.3 + - ssi.2 + - ssi.1 + - ssi.0 + - src.9 + - src.8 + - src.7 + - src.6 + - src.5 + - src.4 + - src.3 + - src.2 + - src.1 + - src.0 + - mix.1 + - mix.0 + - ctu.1 + - ctu.0 + - dvc.1 + - dvc.0 + - clk_a + - clk_b + - clk_c + - clk_i + + # For OF-graph + port: + description: OF-Graph subnode + type: object + properties: + reg: + $ref: /schemas/types.yaml#/definitions/uint32 + endpoint: + type: object + properties: + remote-endpoint: + $ref: /schemas/types.yaml#/definitions/phandle-array + dai-format: + $ref: "simple-card.yaml#/definitions/format" + playback: + $ref: /schemas/types.yaml#/definitions/phandle-array + capture: + $ref: /schemas/types.yaml#/definitions/phandle-array + required: + - remote-endpoint + + # For multi OF-graph + ports: + description: multi OF-Graph subnode + type: object + patternProperties: + "port.*": + $ref: "#properties/port" + +patternProperties: + "^rcar_sound,dvc$": + description: DVC subnode. + type: object + patternProperties: + "dvc.*": + type: object + properties: + dmas: + $ref: /schemas/types.yaml#/definitions/phandle-array + dma-names: + const: "tx" + required: + - dmas + - dma-names + additionalProperties: false + + "^rcar_sound,mix$": + description: MIX subnode. + type: object + patternProperties: + "mix.*": + type: object + additionalProperties: false + + "^rcar_sound,ctu$": + description: CTU subnode. + type: object + patternProperties: + "ctu.*": + type: object + additionalProperties: false + + "^rcar_sound,src$": + description: SRC subnode. + type: object + patternProperties: + "src.*": + type: object + properties: + interrupts: + maxItems: 1 + dmas: + $ref: /schemas/types.yaml#/definitions/phandle-array + dma-names: + allOf: + - items: + enum: + - tx + - rx + if: + properties: + status: + const: "ok" + then: + required: + - interrupts + - dmas + - dma-names + additionalProperties: false + + "^rcar_sound,ssiu$": + description: SSIU subnode. + type: object + patternProperties: + "ssiu.*": + type: object + properties: + dmas: + $ref: /schemas/types.yaml#/definitions/phandle-array + dma-names: + allOf: + - items: + enum: + - tx + - rx + required: + - dmas + - dma-names + additionalProperties: false + + "^rcar_sound,ssi$": + description: SSI subnode. + type: object + patternProperties: + "ssi.*": + type: object + properties: + interrupts: + maxItems: 1 + dmas: + $ref: /schemas/types.yaml#/definitions/phandle-array + dma-names: + allOf: + - items: + enum: + - tx + - rx + - txu # if no ssiu node + - rxu # if no ssiu node + + shared-pin: + description: shared clock pin + $ref: /schemas/types.yaml#/definitions/flag + pio-transfer: + description: PIO transfer mode + $ref: /schemas/types.yaml#/definitions/flag + no-busif: + description: BUSIF is not used when [mem -> SSI] via DMA case + $ref: /schemas/types.yaml#/definitions/flag + required: + - interrupts + - dmas + - dma-names + additionalProperties: false + + # For DAI base + "^rcar_sound,dai$": + description: DAI subnode. + type: object + patternProperties: + "dai.*": + type: object + properties: + playback: + $ref: /schemas/types.yaml#/definitions/phandle-array + capture: + $ref: /schemas/types.yaml#/definitions/phandle-array + anyOf: + - required: + - playback + - required: + - capture + additionalProperties: false + +required: + - compatible + - reg + - reg-names + - clocks + - clock-names + - "#sound-dai-cells" + +additionalProperties: false + +examples: + - | + rcar_sound: sound@ec500000 { + #sound-dai-cells = <1>; + compatible = "renesas,rcar_sound-r8a7790", "renesas,rcar_sound-gen2"; + reg = <0 0xec500000 0 0x1000>, /* SCU */ + <0 0xec5a0000 0 0x100>, /* ADG */ + <0 0xec540000 0 0x1000>, /* SSIU */ + <0 0xec541000 0 0x1280>, /* SSI */ + <0 0xec740000 0 0x200>; /* Audio DMAC peri peri*/ + reg-names = "scu", "adg", "ssiu", "ssi", "audmapp"; + + clocks = <&mstp10_clks 1005>, /* SSI-ALL */ + <&mstp10_clks 1006>, <&mstp10_clks 1007>, /* SSI9, SSI8 */ + <&mstp10_clks 1008>, <&mstp10_clks 1009>, /* SSI7, SSI6 */ + <&mstp10_clks 1010>, <&mstp10_clks 1011>, /* SSI5, SSI4 */ + <&mstp10_clks 1012>, <&mstp10_clks 1013>, /* SSI3, SSI2 */ + <&mstp10_clks 1014>, <&mstp10_clks 1015>, /* SSI1, SSI0 */ + <&mstp10_clks 1022>, <&mstp10_clks 1023>, /* SRC9, SRC8 */ + <&mstp10_clks 1024>, <&mstp10_clks 1025>, /* SRC7, SRC6 */ + <&mstp10_clks 1026>, <&mstp10_clks 1027>, /* SRC5, SRC4 */ + <&mstp10_clks 1028>, <&mstp10_clks 1029>, /* SRC3, SRC2 */ + <&mstp10_clks 1030>, <&mstp10_clks 1031>, /* SRC1, SRC0 */ + <&mstp10_clks 1020>, <&mstp10_clks 1021>, /* DVC0, DVC1 */ + <&mstp10_clks 1020>, <&mstp10_clks 1021>, /* CLKA, CLKB */ + <&mstp10_clks 1019>, <&mstp10_clks 1018>; /* CLKC, CLKI */ + + clock-names = "ssi-all", + "ssi.9", "ssi.8", + "ssi.7", "ssi.6", + "ssi.5", "ssi.4", + "ssi.3", "ssi.2", + "ssi.1", "ssi.0", + "src.9", "src.8", + "src.7", "src.6", + "src.5", "src.4", + "src.3", "src.2", + "src.1", "src.0", + "dvc.0", "dvc.1", + "clk_a", "clk_b", + "clk_c", "clk_i"; + + rcar_sound,dvc { + dvc0: dvc-0 { + dmas = <&audma0 0xbc>; + dma-names = "tx"; + }; + dvc1: dvc-1 { + dmas = <&audma0 0xbe>; + dma-names = "tx"; + }; + }; + + + rcar_sound,mix { + mix0: mix-0 { }; + mix1: mix-1 { }; + }; + + rcar_sound,ctu { + ctu00: ctu-0 { }; + ctu01: ctu-1 { }; + ctu02: ctu-2 { }; + ctu03: ctu-3 { }; + ctu10: ctu-4 { }; + ctu11: ctu-5 { }; + ctu12: ctu-6 { }; + ctu13: ctu-7 { }; + }; + + rcar_sound,src { + src0: src-0 { + status = "disabled"; + }; + src1: src-1 { + interrupts = <0 353 0>; + dmas = <&audma0 0x87>, <&audma1 0x9c>; + dma-names = "rx", "tx"; + }; + /* skip after src-2 */ + }; + + rcar_sound,ssiu { + ssiu00: ssiu-0 { + dmas = <&audma0 0x15>, <&audma1 0x16>; + dma-names = "rx", "tx"; + }; + ssiu01: ssiu-1 { + dmas = <&audma0 0x35>, <&audma1 0x36>; + dma-names = "rx", "tx"; + }; + /* skip after ssiu-2 */ + }; + + rcar_sound,ssi { + ssi0: ssi-0 { + interrupts = <0 370 1>; + dmas = <&audma0 0x01>, <&audma1 0x02>; + dma-names = "rx", "tx"; + }; + ssi1: ssi-1 { + interrupts = <0 371 1>; + dmas = <&audma0 0x03>, <&audma1 0x04>; + dma-names = "rx", "tx"; + }; + /* skip other ssi-2 */ + }; + + /* DAI base */ + rcar_sound,dai { + dai0 { + playback = <&ssi5 &src5>; + capture = <&ssi6>; + }; + dai1 { + playback = <&ssi3>; + }; + dai2 { + capture = <&ssi4>; + }; + dai3 { + playback = <&ssi7>; + }; + dai4 { + capture = <&ssi8>; + }; + }; + + /* OF-Graph */ + port { + rsnd_endpoint: endpoint { + remote-endpoint = <&codec_endpoint>; + + dai-format = "left_j"; + bitclock-master = <&rsnd_endpoint0>; + frame-master = <&rsnd_endpoint0>; + + playback = <&ssi0 &src0 &dvc0>; + capture = <&ssi1 &src1 &dvc1>; + }; + }; + + /* Multi OF-Graph */ + ports { + #address-cells = <1>; + #size-cells = <0>; + rsnd_port0: port@0 { + reg = <0>; + rsnd_endpoint0: endpoint { + remote-endpoint = <&codec_endpoint1>; + + dai-format = "left_j"; + bitclock-master = <&rsnd_endpoint0>; + frame-master = <&rsnd_endpoint0>; + + playback = <&ssi0 &src0 &dvc0>; + capture = <&ssi1 &src1 &dvc1>; + }; + }; + rsnd_port1: port@1 { + reg = <1>; + rsnd_endpoint1: endpoint { + remote-endpoint = <&codec_endpoint2>; + + dai-format = "i2s"; + playback = <&ssi0 &src0 &dvc0>; + capture = <&ssi1 &src1 &dvc1>; + }; + }; + }; + }; + + + codec { + ports { + port@0 { + codec_endpoint: endpoint { + remote-endpoint = <&rsnd_endpoint>; + }; + }; + port@1 { + codec_endpoint1: endpoint { + remote-endpoint = <&rsnd_endpoint0>; + }; + }; + port@2 { + codec_endpoint2: endpoint { + remote-endpoint = <&rsnd_endpoint1>; + }; + }; + }; + }; -- 2.7.4

1 0

Re: [alsa-devel] [PATCH v3 08/15] ASoC: tegra: Add audio mclk control through clk_out_1 and extern1
by Dmitry Osipenko 10 Dec '19

10 Dec '19

10.12.2019 02:05, Sowjanya Komatineni пишет: > > On 12/9/19 12:06 PM, Dmitry Osipenko wrote: >> 07.12.2019 22:20, Sowjanya Komatineni пишет: >>> On 12/7/19 6:58 AM, Dmitry Osipenko wrote: >>>> 06.12.2019 05:48, Sowjanya Komatineni пишет: >>>>> Current ASoC driver uses extern1 as cdev1 clock from Tegra30 onwards >>>>> through device tree. >>>>> >>>>> Actual audio mclk is clk_out_1 and to use PLLA for mclk rate control, >>>>> need to clk_out_1_mux parent to extern1 and extern1 parent to >>>>> PLLA_OUT0. >>>>> >>>>> Currently Tegra clock driver init sets the parents and enables both >>>>> clk_out_1 and extern1 clocks. But these clocks parent and enables >>>>> should >>>>> be controlled by ASoC driver. >>>>> >>>>> Clock parents can be specified in device tree using assigned-clocks >>>>> and assigned-clock-parents. >>>>> >>>>> To enable audio mclk, both clk_out_1 and extern1 clocks need to be >>>>> enabled. >>>>> >>>>> This patch configures parents for clk_out_1 and extern1 clocks if >>>>> device >>>>> tree does not specify clock parents inorder to support old device tree >>>>> and controls mclk using both clk_out_1 and extern1 clocks. >>>>> >>>>> Signed-off-by: Sowjanya Komatineni <skomatineni(a)nvidia.com> >>>>> --- >>>>> sound/soc/tegra/tegra_asoc_utils.c | 66 >>>>> ++++++++++++++++++++++++++++++++++++++ >>>>> sound/soc/tegra/tegra_asoc_utils.h | 1 + >>>>> 2 files changed, 67 insertions(+) >>>>> >>>>> diff --git a/sound/soc/tegra/tegra_asoc_utils.c >>>>> b/sound/soc/tegra/tegra_asoc_utils.c >>>>> index 536a578e9512..8e3a3740df7c 100644 >>>>> --- a/sound/soc/tegra/tegra_asoc_utils.c >>>>> +++ b/sound/soc/tegra/tegra_asoc_utils.c >>>>> @@ -60,6 +60,7 @@ int tegra_asoc_utils_set_rate(struct >>>>> tegra_asoc_utils_data *data, int srate, >>>>> data->set_mclk = 0; >>>>> clk_disable_unprepare(data->clk_cdev1); >>>>> + clk_disable_unprepare(data->clk_extern1); >>>>> clk_disable_unprepare(data->clk_pll_a_out0); >>>>> clk_disable_unprepare(data->clk_pll_a); >>>>> @@ -89,6 +90,14 @@ int tegra_asoc_utils_set_rate(struct >>>>> tegra_asoc_utils_data *data, int srate, >>>>> return err; >>>>> } >>>>> + if (!IS_ERR_OR_NULL(data->clk_extern1)) { >>>>> + err = clk_prepare_enable(data->clk_extern1); >>>>> + if (err) { >>>>> + dev_err(data->dev, "Can't enable extern1: %d\n", err); >>>>> + return err; >>>>> + } >>>>> + } >>>>> + >>>>> err = clk_prepare_enable(data->clk_cdev1); >>>>> if (err) { >>>>> dev_err(data->dev, "Can't enable cdev1: %d\n", err); >>>>> @@ -109,6 +118,7 @@ int tegra_asoc_utils_set_ac97_rate(struct >>>>> tegra_asoc_utils_data *data) >>>>> int err; >>>>> clk_disable_unprepare(data->clk_cdev1); >>>>> + clk_disable_unprepare(data->clk_extern1); >>>>> clk_disable_unprepare(data->clk_pll_a_out0); >>>>> clk_disable_unprepare(data->clk_pll_a); >>>>> @@ -142,6 +152,14 @@ int tegra_asoc_utils_set_ac97_rate(struct >>>>> tegra_asoc_utils_data *data) >>>>> return err; >>>>> } >>>>> + if (!IS_ERR_OR_NULL(data->clk_extern1)) { >>>>> + err = clk_prepare_enable(data->clk_extern1); >>>>> + if (err) { >>>>> + dev_err(data->dev, "Can't enable extern1: %d\n", err); >>>>> + return err; >>>>> + } >>>>> + } >>>> Why this is needed given that clk_extern1 is either a child of MCLK or >>>> MCLK itself (on T20)? The child clocks are enabled when the parent is >>>> enabled. >>> For T30 and later, clk_extern1 is one of the source for clk_out_1_mux. >>> clk_extern1 is in CAR and it has its own gate and mux. >>> >>> As audio mclk related clocks (clk_out_1, clk_out_1_mux, and extern1) are >>> moved into ASoC driver from clock driver >>> >>> need to enable extern1 gate as well along with clk_out1 for T30 through >>> T210. >>> >>> Just FYI, extern1 enable here happens only when data->clk_extern1 is >>> available which is for T30 onwards. >> clk_out_1 is the parent of extern1, thus extern1 is enabled by the clk >> core whenever clk_out_1 is enabled because data->clk_cdev1=clk_out_1. An >> I missing something? >> >> [snip] > extern1 is the parent for clk_out_1. explained extern1 clock path to > clk_out in reply to your comment in other patch of this series. Right, I meant extern1 the parent of clk_out_1, sorry for the confusion. So when clk_out_1 (child) is enabled, extern1 (parent) is enabled as well. I'll take a closer look at the other email tomorrow.

1 0

Re: [alsa-devel] [PATCH v3 03/15] soc: tegra: Add Tegra PMC clock registrations into PMC driver
by Dmitry Osipenko 09 Dec '19

09 Dec '19

08.12.2019 00:36, Sowjanya Komatineni пишет: > > On 12/7/19 11:59 AM, Sowjanya Komatineni wrote: >> >> On 12/7/19 8:00 AM, Dmitry Osipenko wrote: >>> 07.12.2019 18:53, Dmitry Osipenko пишет: >>>> 07.12.2019 18:47, Dmitry Osipenko пишет: >>>>> 07.12.2019 17:28, Dmitry Osipenko пишет: >>>>>> 06.12.2019 05:48, Sowjanya Komatineni пишет: >>>>>>> Tegra210 and prior Tegra PMC has clk_out_1, clk_out_2, clk_out_3 >>>>>>> with >>>>>>> mux and gate for each of these clocks. >>>>>>> >>>>>>> Currently these PMC clocks are registered by Tegra clock driver >>>>>>> using >>>>>>> clk_register_mux and clk_register_gate by passing PMC base address >>>>>>> and register offsets and PMC programming for these clocks happens >>>>>>> through direct PMC access by the clock driver. >>>>>>> >>>>>>> With this, when PMC is in secure mode any direct PMC access from the >>>>>>> non-secure world does not go through and these clocks will not be >>>>>>> functional. >>>>>>> >>>>>>> This patch adds these clocks registration with PMC as a clock >>>>>>> provider >>>>>>> for these clocks. clk_ops callback implementations for these clocks >>>>>>> uses tegra_pmc_readl and tegra_pmc_writel which supports PMC >>>>>>> programming >>>>>>> in secure mode and non-secure mode. >>>>>>> >>>>>>> Signed-off-by: Sowjanya Komatineni <skomatineni(a)nvidia.com> >>>>>>> --- >>>>> [snip] >>>>> >>>>>>> + >>>>>>> +static const struct clk_ops pmc_clk_gate_ops = { >>>>>>> + .is_enabled = pmc_clk_is_enabled, >>>>>>> + .enable = pmc_clk_enable, >>>>>>> + .disable = pmc_clk_disable, >>>>>>> +}; >>>>>> What's the benefit of separating GATE from the MUX? >>>>>> >>>>>> I think it could be a single clock. >>>>> According to TRM: >>>>> >>>>> 1. GATE and MUX are separate entities. >>>>> >>>>> 2. GATE is the parent of MUX (see PMC's CLK_OUT paths diagram in TRM). >>>>> >>>>> 3. PMC doesn't gate EXTPERIPH clock but could "force-enable" it, >>>>> correct? > > Was following existing clk-tegra-pmc as I am not sure of reason for > having these clocks registered as separate mux and gate clocks. > > Yes, PMC clocks can be registered as single clock and can use clk_ops > for set/get parent and enable/disable. > > enable/disable of PMC clocks is for force-enable to force the clock to > run regardless of ACCEPT_REQ or INVERT_REQ. > >>>> 4. clk_m_div2/4 are internal PMC OSC dividers and thus these clocks >>>> should belong to PMC. >>> Also, it should be "osc" and not "clk_m". >> >> I followed the same parents as it were in existing clk-tegra-pmc driver. >> >> Yeah they are wrong and they should be from osc and not clk_m. >> >> Will fix in next version. >> Could you please describe the full EXTPERIPH clock topology and how the pinmux configuration is related to it all? What is internal to the Tegra chip and what are the external outputs? Is it possible to bypass PMC on T30+ for the EXTPERIPH clocks?

1 0

Re: [alsa-devel] [PATCH v3 08/15] ASoC: tegra: Add audio mclk control through clk_out_1 and extern1
by Dmitry Osipenko 09 Dec '19

09 Dec '19

07.12.2019 22:20, Sowjanya Komatineni пишет: > > On 12/7/19 6:58 AM, Dmitry Osipenko wrote: >> 06.12.2019 05:48, Sowjanya Komatineni пишет: >>> Current ASoC driver uses extern1 as cdev1 clock from Tegra30 onwards >>> through device tree. >>> >>> Actual audio mclk is clk_out_1 and to use PLLA for mclk rate control, >>> need to clk_out_1_mux parent to extern1 and extern1 parent to PLLA_OUT0. >>> >>> Currently Tegra clock driver init sets the parents and enables both >>> clk_out_1 and extern1 clocks. But these clocks parent and enables should >>> be controlled by ASoC driver. >>> >>> Clock parents can be specified in device tree using assigned-clocks >>> and assigned-clock-parents. >>> >>> To enable audio mclk, both clk_out_1 and extern1 clocks need to be >>> enabled. >>> >>> This patch configures parents for clk_out_1 and extern1 clocks if device >>> tree does not specify clock parents inorder to support old device tree >>> and controls mclk using both clk_out_1 and extern1 clocks. >>> >>> Signed-off-by: Sowjanya Komatineni <skomatineni(a)nvidia.com> >>> --- >>> sound/soc/tegra/tegra_asoc_utils.c | 66 >>> ++++++++++++++++++++++++++++++++++++++ >>> sound/soc/tegra/tegra_asoc_utils.h | 1 + >>> 2 files changed, 67 insertions(+) >>> >>> diff --git a/sound/soc/tegra/tegra_asoc_utils.c >>> b/sound/soc/tegra/tegra_asoc_utils.c >>> index 536a578e9512..8e3a3740df7c 100644 >>> --- a/sound/soc/tegra/tegra_asoc_utils.c >>> +++ b/sound/soc/tegra/tegra_asoc_utils.c >>> @@ -60,6 +60,7 @@ int tegra_asoc_utils_set_rate(struct >>> tegra_asoc_utils_data *data, int srate, >>> data->set_mclk = 0; >>> clk_disable_unprepare(data->clk_cdev1); >>> + clk_disable_unprepare(data->clk_extern1); >>> clk_disable_unprepare(data->clk_pll_a_out0); >>> clk_disable_unprepare(data->clk_pll_a); >>> @@ -89,6 +90,14 @@ int tegra_asoc_utils_set_rate(struct >>> tegra_asoc_utils_data *data, int srate, >>> return err; >>> } >>> + if (!IS_ERR_OR_NULL(data->clk_extern1)) { >>> + err = clk_prepare_enable(data->clk_extern1); >>> + if (err) { >>> + dev_err(data->dev, "Can't enable extern1: %d\n", err); >>> + return err; >>> + } >>> + } >>> + >>> err = clk_prepare_enable(data->clk_cdev1); >>> if (err) { >>> dev_err(data->dev, "Can't enable cdev1: %d\n", err); >>> @@ -109,6 +118,7 @@ int tegra_asoc_utils_set_ac97_rate(struct >>> tegra_asoc_utils_data *data) >>> int err; >>> clk_disable_unprepare(data->clk_cdev1); >>> + clk_disable_unprepare(data->clk_extern1); >>> clk_disable_unprepare(data->clk_pll_a_out0); >>> clk_disable_unprepare(data->clk_pll_a); >>> @@ -142,6 +152,14 @@ int tegra_asoc_utils_set_ac97_rate(struct >>> tegra_asoc_utils_data *data) >>> return err; >>> } >>> + if (!IS_ERR_OR_NULL(data->clk_extern1)) { >>> + err = clk_prepare_enable(data->clk_extern1); >>> + if (err) { >>> + dev_err(data->dev, "Can't enable extern1: %d\n", err); >>> + return err; >>> + } >>> + } >> Why this is needed given that clk_extern1 is either a child of MCLK or >> MCLK itself (on T20)? The child clocks are enabled when the parent is >> enabled. > > For T30 and later, clk_extern1 is one of the source for clk_out_1_mux. > clk_extern1 is in CAR and it has its own gate and mux. > > As audio mclk related clocks (clk_out_1, clk_out_1_mux, and extern1) are > moved into ASoC driver from clock driver > > need to enable extern1 gate as well along with clk_out1 for T30 through > T210. > > Just FYI, extern1 enable here happens only when data->clk_extern1 is > available which is for T30 onwards. clk_out_1 is the parent of extern1, thus extern1 is enabled by the clk core whenever clk_out_1 is enabled because data->clk_cdev1=clk_out_1. An I missing something? [snip]

1 0

[alsa-devel] [PATCH] ASoC: core: only flush inited work during free
by Curtis Malainey 09 Dec '19

09 Dec '19

There are many paths to soc_free_pcm_runtime which can both have and have not yet inited the workqueue yet. When we flush the queue when we have not yet inited the queue we cause warnings to be printed. An example is soc_cleanup_card_resources which is called by snd_soc_bind_card which has multiple failure points before and after soc_link_init -> soc_new_pcm which is where the queue is inited. Signed-off-by: Curtis Malainey <cujomalainey(a)chromium.org> --- sound/soc/soc-core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 062653ab03a37..3bf702b874a6d 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -419,7 +419,8 @@ static void soc_free_pcm_runtime(struct snd_soc_pcm_runtime *rtd) list_del(&rtd->list); - flush_delayed_work(&rtd->delayed_work); + if (delayed_work_pending(&rtd->delayed_work)) + flush_delayed_work(&rtd->delayed_work); snd_soc_pcm_component_free(rtd); /* -- 2.24.0.393.g34dc348eaf-goog

4 6

[alsa-devel] [PATCH 0/3] ASoC: Intel: sof_rt5682: add TigerLake support
by Pierre-Louis Bossart 09 Dec '19

09 Dec '19

This patchset extends the existing machine driver to support TigerLake, the main change being for HDMI streams (4 instead of 3). Sathyanarayana Nujella (3): ASoC: intel: sof_rt5682: Add quirk for number of HDMI DAI's ASoC: intel: sof_rt5682: Add support for tgl-max98357a-rt5682 ASoC: Intel: common: Add mach table for tgl-max98357a-rt5682 sound/soc/intel/boards/sof_rt5682.c | 34 +++++++++++++++++-- .../intel/common/soc-acpi-intel-tgl-match.c | 13 +++++++ 2 files changed, 44 insertions(+), 3 deletions(-) -- 2.20.1

2 6

[alsa-devel] [PATCH 0/3] ASoC: Intel: SOF: use common HDMI driver
by Pierre-Louis Bossart 09 Dec '19

09 Dec '19

By default make sure all SOF-based solutions use the common HDMI driver. The hdac_hdmi solution is only supported for devices based on the SST driver. This change was merged two weeks ago in the SOF tree and no regressions were observed. Kai Vehmanen (3): ASoC: SOF: Intel: make common HDMI driver default ASoC: Intel: boards: make common HDMI driver the default for SOF ASoC: hdac_hdmi: Drop support for Icelake sound/soc/codecs/hdac_hdmi.c | 63 +++++----------------------------- sound/soc/intel/boards/Kconfig | 5 +++ sound/soc/sof/intel/Kconfig | 1 + 3 files changed, 15 insertions(+), 54 deletions(-) -- 2.20.1

2 6

[alsa-devel] [PATCH v2 0/2] ASoC: mediatek: common: refine mtk_afe_fe_hw_params
by Eason Yen 09 Dec '19

09 Dec '19

This patch is to add more helpers to control mtk_memif dma_address/format/pbuf_size And refine hw_params and hw_prepare by these helpers. v2 changes: split patch v1 to two seprated patches for different purpose. v1 changes: 1. patchwork list: https://mailman.alsa-project.org/pipermail/alsa-devel/2019-November/158394.… Eason Yen (2): ASoC: mediatek: common: add some helpers to control mtk_memif ASoC: mediatek: common: refine hw_params and hw_prepare sound/soc/mediatek/common/mtk-afe-fe-dai.c | 359 +++++++++++++++++++++++------ sound/soc/mediatek/common/mtk-afe-fe-dai.h | 16 ++ sound/soc/mediatek/common/mtk-base-afe.h | 28 ++- 3 files changed, 336 insertions(+), 67 deletions(-) -- 1.9.1

2 4

[alsa-devel] [PATCH] ASoC: tlv320aic31xx: Add HP output driver pop reduction controls
by Nikita Yushchenko 09 Dec '19

09 Dec '19

HP output driver has two parameters that can be configured to reduce pop noise: power-on delay and ramp-up step time. Two new kcontrols have been added to set these parameters. Signed-off-by: Nikita Yushchenko <nikita.yoush(a)cogentembedded.com> --- sound/soc/codecs/tlv320aic31xx.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/sound/soc/codecs/tlv320aic31xx.c b/sound/soc/codecs/tlv320aic31xx.c index 67323188afd2..740e75032f36 100644 --- a/sound/soc/codecs/tlv320aic31xx.c +++ b/sound/soc/codecs/tlv320aic31xx.c @@ -263,6 +263,19 @@ static SOC_ENUM_SINGLE_DECL(cm_m_enum, AIC31XX_MICPGAMI, 6, mic_select_text); static SOC_ENUM_SINGLE_DECL(mic1lm_m_enum, AIC31XX_MICPGAMI, 4, mic_select_text); +static const char * const hp_poweron_time_text[] = { + "0us", "15.3us", "153us", "1.53ms", "15.3ms", "76.2ms", + "153ms", "304ms", "610ms", "1.22s", "3.04s", "6.1s" }; + +static SOC_ENUM_SINGLE_DECL(hp_poweron_time_enum, AIC31XX_HPPOP, 3, + hp_poweron_time_text); + +static const char * const hp_rampup_step_text[] = { + "0ms", "0.98ms", "1.95ms", "3.9ms" }; + +static SOC_ENUM_SINGLE_DECL(hp_rampup_step_enum, AIC31XX_HPPOP, 1, + hp_rampup_step_text); + static const DECLARE_TLV_DB_SCALE(dac_vol_tlv, -6350, 50, 0); static const DECLARE_TLV_DB_SCALE(adc_fgain_tlv, 0, 10, 0); static const DECLARE_TLV_DB_SCALE(adc_cgain_tlv, -2000, 50, 0); @@ -286,6 +299,9 @@ static const struct snd_kcontrol_new common31xx_snd_controls[] = { SOC_DOUBLE_R_TLV("HP Analog Playback Volume", AIC31XX_LANALOGHPL, AIC31XX_RANALOGHPR, 0, 0x7F, 1, hp_vol_tlv), + + SOC_ENUM("HP Output Driver Power-On time", hp_poweron_time_enum), + SOC_ENUM("HP Output Driver Ramp-up step", hp_rampup_step_enum), }; static const struct snd_kcontrol_new aic31xx_snd_controls[] = { -- 2.20.1

2 5

[alsa-devel] [PATCH] ASoC: fsl_sai: add IRQF_SHARED
by Michael Walle 09 Dec '19

09 Dec '19

The LS1028A SoC uses the same interrupt line for adjacent SAIs. Use IRQF_SHARED to be able to use these SAIs simultaneously. Signed-off-by: Michael Walle <michael(a)walle.cc> --- sound/soc/fsl/fsl_sai.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c index b517e4bc1b87..8c3ea7300972 100644 --- a/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c @@ -958,7 +958,8 @@ static int fsl_sai_probe(struct platform_device *pdev) if (irq < 0) return irq; - ret = devm_request_irq(&pdev->dev, irq, fsl_sai_isr, 0, np->name, sai); + ret = devm_request_irq(&pdev->dev, irq, fsl_sai_isr, IRQF_SHARED, + np->name, sai); if (ret) { dev_err(&pdev->dev, "failed to claim irq %u\n", irq); return ret; -- 2.20.1

5 6

[alsa-devel] [PATCH] ASoC: tlv320aic31xx: Add Volume Soft Stepping control
by Nikita Yushchenko 09 Dec '19

09 Dec '19

Chip supports soft stepping of volume changes and it is enabled by default. This patch adds a control for it, so it could be either made slower (two sample periods per step instead of one), or disabled. Signed-off-by: Nikita Yushchenko <nikita.yoush(a)cogentembedded.com> --- sound/soc/codecs/tlv320aic31xx.c | 8 ++++++++ sound/soc/codecs/tlv320aic31xx.h | 3 --- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/tlv320aic31xx.c b/sound/soc/codecs/tlv320aic31xx.c index d6c462f21370..31daa60695bd 100644 --- a/sound/soc/codecs/tlv320aic31xx.c +++ b/sound/soc/codecs/tlv320aic31xx.c @@ -275,6 +275,12 @@ static const char * const hp_rampup_step_text[] = { static SOC_ENUM_SINGLE_DECL(hp_rampup_step_enum, AIC31XX_HPPOP, 1, hp_rampup_step_text); +static const char * const vol_soft_step_mode_text[] = { + "fast", "slow", "disabled" }; + +static SOC_ENUM_SINGLE_DECL(vol_soft_step_mode_enum, AIC31XX_DACSETUP, 0, + vol_soft_step_mode_text); + static const DECLARE_TLV_DB_SCALE(dac_vol_tlv, -6350, 50, 0); static const DECLARE_TLV_DB_SCALE(adc_fgain_tlv, 0, 10, 0); static const DECLARE_TLV_DB_SCALE(adc_cgain_tlv, -2000, 50, 0); @@ -306,6 +312,8 @@ static const struct snd_kcontrol_new common31xx_snd_controls[] = { */ SOC_ENUM("HP Output Driver Power-On time", hp_poweron_time_enum), SOC_ENUM("HP Output Driver Ramp-up step", hp_rampup_step_enum), + + SOC_ENUM("Volume Soft Stepping", vol_soft_step_mode_enum), }; static const struct snd_kcontrol_new aic31xx_snd_controls[] = { diff --git a/sound/soc/codecs/tlv320aic31xx.h b/sound/soc/codecs/tlv320aic31xx.h index 83a8c7604cc3..0523884cee74 100644 --- a/sound/soc/codecs/tlv320aic31xx.h +++ b/sound/soc/codecs/tlv320aic31xx.h @@ -218,9 +218,6 @@ struct aic31xx_pdata { #define AIC31XX_GPIO1_ADC_MOD_CLK 0x10 #define AIC31XX_GPIO1_SDOUT 0x11 -/* AIC31XX_DACSETUP */ -#define AIC31XX_SOFTSTEP_MASK GENMASK(1, 0) - /* AIC31XX_DACMUTE */ #define AIC31XX_DACMUTE_MASK GENMASK(3, 2) -- 2.20.1

2 1

[alsa-devel] [PATCH] ASoC: rsnd: Calculate DALIGN inversion at run-time
by Geert Uytterhoeven 09 Dec '19

09 Dec '19

There is no need to store the inverted DALIGN values in the table, as they can easily be calculated at run-time. This also protects against the introduction of inconsistencies between normal and inverted values by a future table modification. Reorder the two subexpressions in the AND check, to perform the least expensive check first. Signed-off-by: Geert Uytterhoeven <geert+renesas(a)glider.be> --- Compile-tested only. Interestingly, this decreases code size on arm64, but increases on arm32 (both gcc version 7.4.0 (Ubuntu/Linaro 7.4.0-1ubuntu1~18.04.1)). arm32: text data bss dec hex filename 16186 276 84 16546 40a2 sound/soc/sh/rcar/core.o.orig 16194 276 84 16554 40aa sound/soc/sh/rcar/core.o arm64: text data bss dec hex filename 17426 392 104 17922 4602 sound/soc/sh/rcar/core.o.orig 17414 392 104 17910 45f6 sound/soc/sh/rcar/core.o --- sound/soc/sh/rcar/core.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index 399dc6e9bde5b042..d20f03dfdee66643 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -376,20 +376,15 @@ u32 rsnd_get_adinr_bit(struct rsnd_mod *mod, struct rsnd_dai_stream *io) */ u32 rsnd_get_dalign(struct rsnd_mod *mod, struct rsnd_dai_stream *io) { - static const u32 dalign_values[8][2] = { - {0x76543210, 0x67452301}, - {0x00000032, 0x00000023}, - {0x00007654, 0x00006745}, - {0x00000076, 0x00000067}, - {0xfedcba98, 0xefcdab89}, - {0x000000ba, 0x000000ab}, - {0x0000fedc, 0x0000efcd}, - {0x000000fe, 0x000000ef}, + static const u32 dalign_values[8] = { + 0x76543210, 0x00000032, 0x00007654, 0x00000076, + 0xfedcba98, 0x000000ba, 0x0000fedc, 0x000000fe, }; - int id = 0, inv; + int id = 0; struct rsnd_mod *ssiu = rsnd_io_to_mod_ssiu(io); struct rsnd_mod *target; struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io); + u32 dalign; /* * *Hardware* L/R and *Software* L/R are inverted for 16bit data. @@ -425,15 +420,15 @@ u32 rsnd_get_dalign(struct rsnd_mod *mod, struct rsnd_dai_stream *io) if (mod == ssiu) id = rsnd_mod_id_sub(mod); - /* Non target mod or non 16bit needs normal DALIGN */ - if ((snd_pcm_format_width(runtime->format) != 16) || - (mod != target)) - inv = 0; - /* Target mod needs inverted DALIGN when 16bit */ - else - inv = 1; + dalign = dalign_values[id]; + + if (mod == target && snd_pcm_format_width(runtime->format) == 16) { + /* Target mod needs inverted DALIGN when 16bit */ + dalign = (dalign & 0xf0f0f0f0) >> 4 | + (dalign & 0x0f0f0f0f) << 4; + } - return dalign_values[id][inv]; + return dalign; } u32 rsnd_get_busif_shift(struct rsnd_dai_stream *io, struct rsnd_mod *mod) -- 2.17.1

4 3

[alsa-devel] [PATCH] ASoC: cs42l51: add dac mux widget in codec routes
by Olivier Moysan 09 Dec '19

09 Dec '19

Add "DAC mux" DAPM widget in CS42l51 audio codec routes, to support DAC mux control and to remove error trace "DAC Mux has no paths" at widget creation. Note: ADC path of DAC mux is not routed in this patch. Signed-off-by: Olivier Moysan <olivier.moysan(a)st.com> --- sound/soc/codecs/cs42l51.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/cs42l51.c b/sound/soc/codecs/cs42l51.c index 55408c8fcb4e..e47758e4fb36 100644 --- a/sound/soc/codecs/cs42l51.c +++ b/sound/soc/codecs/cs42l51.c @@ -214,12 +214,10 @@ static const struct snd_soc_dapm_widget cs42l51_dapm_widgets[] = { SND_SOC_DAPM_ADC_E("Right ADC", "Right HiFi Capture", CS42L51_POWER_CTL1, 2, 1, cs42l51_pdn_event, SND_SOC_DAPM_PRE_POST_PMD), - SND_SOC_DAPM_DAC_E("Left DAC", "Left HiFi Playback", - CS42L51_POWER_CTL1, 5, 1, - cs42l51_pdn_event, SND_SOC_DAPM_PRE_POST_PMD), - SND_SOC_DAPM_DAC_E("Right DAC", "Right HiFi Playback", - CS42L51_POWER_CTL1, 6, 1, - cs42l51_pdn_event, SND_SOC_DAPM_PRE_POST_PMD), + SND_SOC_DAPM_DAC_E("Left DAC", NULL, CS42L51_POWER_CTL1, 5, 1, + cs42l51_pdn_event, SND_SOC_DAPM_PRE_POST_PMD), + SND_SOC_DAPM_DAC_E("Right DAC", NULL, CS42L51_POWER_CTL1, 6, 1, + cs42l51_pdn_event, SND_SOC_DAPM_PRE_POST_PMD), /* analog/mic */ SND_SOC_DAPM_INPUT("AIN1L"), @@ -255,6 +253,12 @@ static const struct snd_soc_dapm_route cs42l51_routes[] = { {"HPL", NULL, "Left DAC"}, {"HPR", NULL, "Right DAC"}, + {"Right DAC", NULL, "DAC Mux"}, + {"Left DAC", NULL, "DAC Mux"}, + + {"DAC Mux", "Direct PCM", "Playback"}, + {"DAC Mux", "DSP PCM", "Playback"}, + {"Left ADC", NULL, "Left PGA"}, {"Right ADC", NULL, "Right PGA"}, -- 2.17.1

2 3

[alsa-devel] [PATCH] ASoC: ti: davinci-mcasp: Improve the sysclk selection
by Peter Ujfalusi 09 Dec '19

09 Dec '19

When McASP is master the bclk can be generated from two main source: AUXCLK: functional clock for McASP or AHCLK: from external source or internal mux in dra7x family With this patch it is possible to select between the two source. The patch is not breaking existing machine drivers since historically the clk_id was ignored and left as 0 in all cases. When output clock is configured - which can be only the AHCLK, we select the AUXCLK as source for the internal HCLK. In this case the HCLK rate is the same as the output clock. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)ti.com> --- sound/soc/ti/davinci-mcasp.c | 35 ++++++++++++++++++++++++++++------- sound/soc/ti/davinci-mcasp.h | 4 ++++ 2 files changed, 32 insertions(+), 7 deletions(-) diff --git a/sound/soc/ti/davinci-mcasp.c b/sound/soc/ti/davinci-mcasp.c index 8e5371801d88..e1e937eb1dc1 100644 --- a/sound/soc/ti/davinci-mcasp.c +++ b/sound/soc/ti/davinci-mcasp.c @@ -664,18 +664,39 @@ static int davinci_mcasp_set_sysclk(struct snd_soc_dai *dai, int clk_id, struct davinci_mcasp *mcasp = snd_soc_dai_get_drvdata(dai); pm_runtime_get_sync(mcasp->dev); - if (dir == SND_SOC_CLOCK_OUT) { + + if (dir == SND_SOC_CLOCK_IN) { + switch (clk_id) { + case MCASP_CLK_HCLK_AHCLK: + mcasp_clr_bits(mcasp, DAVINCI_MCASP_AHCLKXCTL_REG, + AHCLKXE); + mcasp_clr_bits(mcasp, DAVINCI_MCASP_AHCLKRCTL_REG, + AHCLKRE); + clear_bit(PIN_BIT_AHCLKX, &mcasp->pdir); + break; + case MCASP_CLK_HCLK_AUXCLK: + mcasp_set_bits(mcasp, DAVINCI_MCASP_AHCLKXCTL_REG, + AHCLKXE); + mcasp_set_bits(mcasp, DAVINCI_MCASP_AHCLKRCTL_REG, + AHCLKRE); + set_bit(PIN_BIT_AHCLKX, &mcasp->pdir); + break; + default: + dev_err(mcasp->dev, "Invalid clk id: %d\n", clk_id); + goto out; + } + } else { + /* Select AUXCLK as HCLK */ mcasp_set_bits(mcasp, DAVINCI_MCASP_AHCLKXCTL_REG, AHCLKXE); mcasp_set_bits(mcasp, DAVINCI_MCASP_AHCLKRCTL_REG, AHCLKRE); set_bit(PIN_BIT_AHCLKX, &mcasp->pdir); - } else { - mcasp_clr_bits(mcasp, DAVINCI_MCASP_AHCLKXCTL_REG, AHCLKXE); - mcasp_clr_bits(mcasp, DAVINCI_MCASP_AHCLKRCTL_REG, AHCLKRE); - clear_bit(PIN_BIT_AHCLKX, &mcasp->pdir); } - + /* + * When AHCLK X/R is selected to be output it means that the HCLK is + * the same clock - coming via AUXCLK. + */ mcasp->sysclk_freq = freq; - +out: pm_runtime_put(mcasp->dev); return 0; } diff --git a/sound/soc/ti/davinci-mcasp.h b/sound/soc/ti/davinci-mcasp.h index bc705d6ca48b..5de2b8a31061 100644 --- a/sound/soc/ti/davinci-mcasp.h +++ b/sound/soc/ti/davinci-mcasp.h @@ -295,6 +295,10 @@ #define NUMEVT(x) (((x) & 0xFF) << 8) #define NUMDMA_MASK (0xFF) +/* Source of High-frequency transmit/receive clock */ +#define MCASP_CLK_HCLK_AHCLK 0 /* AHCLKX/R */ +#define MCASP_CLK_HCLK_AUXCLK 1 /* Internal functional clock */ + /* clock divider IDs */ #define MCASP_CLKDIV_AUXCLK 0 /* HCLK divider from AUXCLK */ #define MCASP_CLKDIV_BCLK 1 /* BCLK divider from HCLK */ -- Peter Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

2 1

[alsa-devel] [PATCH] ASoC: SOF: Intel: hda: solve MSI issues by merging ipc and stream irq handlers
by Pierre-Louis Bossart 09 Dec '19

09 Dec '19

From: Bard Liao <yung-chuan.liao(a)linux.intel.com> The existing code uses two handlers for a shared edge-based MSI interrupts. In corner cases, interrupts are lost, leading to IPC timeouts. Those timeouts do not appear in legacy mode. This patch merges the two handlers and threads into a single one, and simplifies the mask/unmask operations by using a single top-level mask (Global Interrupt Enable). The handler only checks for interrupt sources using the Global Interrupt Status (GIS) field, and all the actual work happens in the thread. This also enables us to remove the use of spin locks. Stream events are prioritized over IPC ones. This patch was tested with HDaudio and SoundWire platforms, and all known IPC timeout issues are solved in MSI mode. The SoundWire-specific patches will be provided in follow-up patches, where the SoundWire interrupts are handled in the same thread as IPC and stream interrupts. Signed-off-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/soc/sof/intel/apl.c | 1 - sound/soc/sof/intel/cnl.c | 5 --- sound/soc/sof/intel/hda-ipc.c | 23 +++-------- sound/soc/sof/intel/hda-stream.c | 20 ++++----- sound/soc/sof/intel/hda.c | 69 ++++++++++++++++++++++---------- sound/soc/sof/intel/hda.h | 11 ++--- 6 files changed, 70 insertions(+), 59 deletions(-) diff --git a/sound/soc/sof/intel/apl.c b/sound/soc/sof/intel/apl.c index 9e4d859b4dba..aeed1422900b 100644 --- a/sound/soc/sof/intel/apl.c +++ b/sound/soc/sof/intel/apl.c @@ -42,7 +42,6 @@ const struct snd_sof_dsp_ops sof_apl_ops = { .block_write = sof_block_write, /* doorbell */ - .irq_handler = hda_dsp_ipc_irq_handler, .irq_thread = hda_dsp_ipc_irq_thread, /* ipc */ diff --git a/sound/soc/sof/intel/cnl.c b/sound/soc/sof/intel/cnl.c index 3541063ba84c..6b44f6d02082 100644 --- a/sound/soc/sof/intel/cnl.c +++ b/sound/soc/sof/intel/cnl.c @@ -107,10 +107,6 @@ static irqreturn_t cnl_ipc_irq_thread(int irq, void *context) "nothing to do in IPC IRQ thread\n"); } - /* re-enable IPC interrupt */ - snd_sof_dsp_update_bits(sdev, HDA_DSP_BAR, HDA_DSP_REG_ADSPIC, - HDA_DSP_ADSPIC_IPC, HDA_DSP_ADSPIC_IPC); - return IRQ_HANDLED; } @@ -232,7 +228,6 @@ const struct snd_sof_dsp_ops sof_cnl_ops = { .block_write = sof_block_write, /* doorbell */ - .irq_handler = hda_dsp_ipc_irq_handler, .irq_thread = cnl_ipc_irq_thread, /* ipc */ diff --git a/sound/soc/sof/intel/hda-ipc.c b/sound/soc/sof/intel/hda-ipc.c index 0fd2153c1769..1837f66e361f 100644 --- a/sound/soc/sof/intel/hda-ipc.c +++ b/sound/soc/sof/intel/hda-ipc.c @@ -230,22 +230,15 @@ irqreturn_t hda_dsp_ipc_irq_thread(int irq, void *context) "nothing to do in IPC IRQ thread\n"); } - /* re-enable IPC interrupt */ - snd_sof_dsp_update_bits(sdev, HDA_DSP_BAR, HDA_DSP_REG_ADSPIC, - HDA_DSP_ADSPIC_IPC, HDA_DSP_ADSPIC_IPC); - return IRQ_HANDLED; } -/* is this IRQ for ADSP ? - we only care about IPC here */ -irqreturn_t hda_dsp_ipc_irq_handler(int irq, void *context) +/* Check if an IPC IRQ occurred */ +bool hda_dsp_check_ipc_irq(struct snd_sof_dev *sdev) { - struct snd_sof_dev *sdev = context; - int ret = IRQ_NONE; + bool ret = false; u32 irq_status; - spin_lock(&sdev->hw_lock); - /* store status */ irq_status = snd_sof_dsp_read(sdev, HDA_DSP_BAR, HDA_DSP_REG_ADSPIS); dev_vdbg(sdev->dev, "irq handler: irq_status:0x%x\n", irq_status); @@ -255,16 +248,10 @@ irqreturn_t hda_dsp_ipc_irq_handler(int irq, void *context) goto out; /* IPC message ? */ - if (irq_status & HDA_DSP_ADSPIS_IPC) { - /* disable IPC interrupt */ - snd_sof_dsp_update_bits_unlocked(sdev, HDA_DSP_BAR, - HDA_DSP_REG_ADSPIC, - HDA_DSP_ADSPIC_IPC, 0); - ret = IRQ_WAKE_THREAD; - } + if (irq_status & HDA_DSP_ADSPIS_IPC) + ret = true; out: - spin_unlock(&sdev->hw_lock); return ret; } diff --git a/sound/soc/sof/intel/hda-stream.c b/sound/soc/sof/intel/hda-stream.c index 92643a801f4f..c0ab9bb2a797 100644 --- a/sound/soc/sof/intel/hda-stream.c +++ b/sound/soc/sof/intel/hda-stream.c @@ -550,22 +550,23 @@ int hda_dsp_stream_hw_free(struct snd_sof_dev *sdev, return 0; } -irqreturn_t hda_dsp_stream_interrupt(int irq, void *context) +bool hda_dsp_check_stream_irq(struct snd_sof_dev *sdev) { - struct hdac_bus *bus = context; - int ret = IRQ_WAKE_THREAD; + struct hdac_bus *bus = sof_to_bus(sdev); + bool ret = false; u32 status; - spin_lock(&bus->reg_lock); + /* The function can be called at irq thread, so use spin_lock_irq */ + spin_lock_irq(&bus->reg_lock); status = snd_hdac_chip_readl(bus, INTSTS); dev_vdbg(bus->dev, "stream irq, INTSTS status: 0x%x\n", status); - /* Register inaccessible, ignore it.*/ - if (status == 0xffffffff) - ret = IRQ_NONE; + /* if Register inaccessible, ignore it.*/ + if (status != 0xffffffff) + ret = true; - spin_unlock(&bus->reg_lock); + spin_unlock_irq(&bus->reg_lock); return ret; } @@ -603,7 +604,8 @@ static bool hda_dsp_stream_check(struct hdac_bus *bus, u32 status) irqreturn_t hda_dsp_stream_threaded_handler(int irq, void *context) { - struct hdac_bus *bus = context; + struct snd_sof_dev *sdev = context; + struct hdac_bus *bus = sof_to_bus(sdev); #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA) u32 rirb_status; #endif diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c index 84279f43576c..8d27846d9048 100644 --- a/sound/soc/sof/intel/hda.c +++ b/sound/soc/sof/intel/hda.c @@ -402,6 +402,49 @@ static const struct sof_intel_dsp_desc return chip_info; } +static irqreturn_t hda_dsp_interrupt_handler(int irq, void *context) +{ + struct snd_sof_dev *sdev = context; + + /* + * Get global interrupt status. It includes all hardware interrupt + * sources in the Intel HD Audio controller. + */ + if (snd_sof_dsp_read(sdev, HDA_DSP_HDA_BAR, SOF_HDA_INTSTS) & + SOF_HDA_INTSTS_GIS) { + + /* disable GIE interrupt */ + snd_sof_dsp_update_bits(sdev, HDA_DSP_HDA_BAR, + SOF_HDA_INTCTL, + SOF_HDA_INT_GLOBAL_EN, + 0); + + return IRQ_WAKE_THREAD; + } + + return IRQ_NONE; +} + +static irqreturn_t hda_dsp_interrupt_thread(int irq, void *context) +{ + struct snd_sof_dev *sdev = context; + + /* deal with streams and controller first */ + if (hda_dsp_check_stream_irq(sdev)) + hda_dsp_stream_threaded_handler(irq, sdev); + + if (hda_dsp_check_ipc_irq(sdev)) + sof_ops(sdev)->irq_thread(irq, sdev); + + /* enable GIE interrupt */ + snd_sof_dsp_update_bits(sdev, HDA_DSP_HDA_BAR, + SOF_HDA_INTCTL, + SOF_HDA_INT_GLOBAL_EN, + SOF_HDA_INT_GLOBAL_EN); + + return IRQ_HANDLED; +} + int hda_dsp_probe(struct snd_sof_dev *sdev) { struct pci_dev *pci = to_pci_dev(sdev->dev); @@ -506,9 +549,7 @@ int hda_dsp_probe(struct snd_sof_dev *sdev) */ if (hda_use_msi && pci_alloc_irq_vectors(pci, 1, 1, PCI_IRQ_MSI) > 0) { dev_info(sdev->dev, "use msi interrupt mode\n"); - hdev->irq = pci_irq_vector(pci, 0); - /* ipc irq number is the same of hda irq */ - sdev->ipc_irq = hdev->irq; + sdev->ipc_irq = pci_irq_vector(pci, 0); /* initialised to "false" by kzalloc() */ sdev->msi_enabled = true; } @@ -519,28 +560,17 @@ int hda_dsp_probe(struct snd_sof_dev *sdev) * in IO-APIC mode, hda->irq and ipc_irq are using the same * irq number of pci->irq */ - hdev->irq = pci->irq; sdev->ipc_irq = pci->irq; } - dev_dbg(sdev->dev, "using HDA IRQ %d\n", hdev->irq); - ret = request_threaded_irq(hdev->irq, hda_dsp_stream_interrupt, - hda_dsp_stream_threaded_handler, - IRQF_SHARED, "AudioHDA", bus); - if (ret < 0) { - dev_err(sdev->dev, "error: failed to register HDA IRQ %d\n", - hdev->irq); - goto free_irq_vector; - } - dev_dbg(sdev->dev, "using IPC IRQ %d\n", sdev->ipc_irq); - ret = request_threaded_irq(sdev->ipc_irq, hda_dsp_ipc_irq_handler, - sof_ops(sdev)->irq_thread, IRQF_SHARED, - "AudioDSP", sdev); + ret = request_threaded_irq(sdev->ipc_irq, hda_dsp_interrupt_handler, + hda_dsp_interrupt_thread, + IRQF_SHARED, "AudioDSP", sdev); if (ret < 0) { dev_err(sdev->dev, "error: failed to register IPC IRQ %d\n", sdev->ipc_irq); - goto free_hda_irq; + goto free_irq_vector; } pci_set_master(pci); @@ -571,8 +601,6 @@ int hda_dsp_probe(struct snd_sof_dev *sdev) free_ipc_irq: free_irq(sdev->ipc_irq, sdev); -free_hda_irq: - free_irq(hdev->irq, bus); free_irq_vector: if (sdev->msi_enabled) pci_free_irq_vectors(pci); @@ -618,7 +646,6 @@ int hda_dsp_remove(struct snd_sof_dev *sdev) SOF_HDA_PPCTL_GPROCEN, 0); free_irq(sdev->ipc_irq, sdev); - free_irq(hda->irq, bus); if (sdev->msi_enabled) pci_free_irq_vectors(pci); diff --git a/sound/soc/sof/intel/hda.h b/sound/soc/sof/intel/hda.h index 97c3fcb23d15..01529c7058f3 100644 --- a/sound/soc/sof/intel/hda.h +++ b/sound/soc/sof/intel/hda.h @@ -43,11 +43,14 @@ /* SOF_HDA_GCTL register bist */ #define SOF_HDA_GCTL_RESET BIT(0) -/* SOF_HDA_INCTL and SOF_HDA_INTSTS regs */ +/* SOF_HDA_INCTL regs */ #define SOF_HDA_INT_GLOBAL_EN BIT(31) #define SOF_HDA_INT_CTRL_EN BIT(30) #define SOF_HDA_INT_ALL_STREAM 0xff +/* SOF_HDA_INTSTS regs */ +#define SOF_HDA_INTSTS_GIS BIT(31) + #define SOF_HDA_MAX_CAPS 10 #define SOF_HDA_CAP_ID_OFF 16 #define SOF_HDA_CAP_ID_MASK GENMASK(SOF_HDA_CAP_ID_OFF + 11,\ @@ -406,8 +409,6 @@ struct sof_intel_hda_dev { /* the maximum number of streams (playback + capture) supported */ u32 stream_max; - int irq; - /* PM related */ bool l1_support_changed;/* during suspend, is L1SEN changed or not */ @@ -511,11 +512,12 @@ int hda_dsp_stream_hw_params(struct snd_sof_dev *sdev, struct snd_pcm_hw_params *params); int hda_dsp_stream_trigger(struct snd_sof_dev *sdev, struct hdac_ext_stream *stream, int cmd); -irqreturn_t hda_dsp_stream_interrupt(int irq, void *context); irqreturn_t hda_dsp_stream_threaded_handler(int irq, void *context); int hda_dsp_stream_setup_bdl(struct snd_sof_dev *sdev, struct snd_dma_buffer *dmab, struct hdac_stream *stream); +bool hda_dsp_check_ipc_irq(struct snd_sof_dev *sdev); +bool hda_dsp_check_stream_irq(struct snd_sof_dev *sdev); struct hdac_ext_stream * hda_dsp_stream_get(struct snd_sof_dev *sdev, int direction); @@ -540,7 +542,6 @@ void hda_dsp_ipc_get_reply(struct snd_sof_dev *sdev); int hda_dsp_ipc_get_mailbox_offset(struct snd_sof_dev *sdev); int hda_dsp_ipc_get_window_offset(struct snd_sof_dev *sdev, u32 id); -irqreturn_t hda_dsp_ipc_irq_handler(int irq, void *context); irqreturn_t hda_dsp_ipc_irq_thread(int irq, void *context); int hda_dsp_ipc_cmd_done(struct snd_sof_dev *sdev, int dir); -- 2.20.1

2 1

[alsa-devel] [PATCH] ASoC: fix soc-core.c kernel-doc warning
by Randy Dunlap 09 Dec '19

09 Dec '19

From: Randy Dunlap <rdunlap(a)infradead.org> Fix a kernel-doc warning in soc-core.c by adding notation for @legacy_dai_naming. ../sound/soc/soc-core.c:2509: warning: Function parameter or member 'legacy_dai_naming' not described in 'snd_soc_register_dai' Signed-off-by: Randy Dunlap <rdunlap(a)infradead.org> Cc: Liam Girdwood <lgirdwood(a)gmail.com> Cc: Mark Brown <broonie(a)kernel.org> Cc: alsa-devel(a)alsa-project.org --- sound/soc/soc-core.c | 2 ++ 1 file changed, 2 insertions(+) --- linux-next-20191209.orig/sound/soc/soc-core.c +++ linux-next-20191209/sound/soc/soc-core.c @@ -2508,6 +2508,8 @@ EXPORT_SYMBOL_GPL(snd_soc_unregister_dai * * @component: The component the DAIs are registered for * @dai_drv: DAI driver to use for the DAI + * @legacy_dai_naming: if %true, use legacy single-name format; + * if %false, use multiple-name format; * * Topology can use this API to register DAIs when probing a component. * These DAIs's widgets will be freed in the card cleanup and the DAIs

2 1

[alsa-devel] [PATCH v2] ASoC: hdmi-codec: re-introduce mutex locking again
by Jerome Brunet 09 Dec '19

09 Dec '19

The dai codec needs to ensure that on one dai is used at any time. This is currently protected by bit atomic operation. With this change, it done with a mutex instead. This change is not about functionality or efficiency. It is done with the hope that it help maintainability in the future. Suggested-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Jerome Brunet <jbrunet(a)baylibre.com> --- sound/soc/codecs/hdmi-codec.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c index f8b5b960e597..543363102d03 100644 --- a/sound/soc/codecs/hdmi-codec.c +++ b/sound/soc/codecs/hdmi-codec.c @@ -274,7 +274,8 @@ struct hdmi_codec_priv { uint8_t eld[MAX_ELD_BYTES]; struct snd_pcm_chmap *chmap_info; unsigned int chmap_idx; - unsigned long busy; + struct mutex lock; + bool busy; struct snd_soc_jack *jack; unsigned int jack_status; }; @@ -390,9 +391,10 @@ static int hdmi_codec_startup(struct snd_pcm_substream *substream, struct hdmi_codec_priv *hcp = snd_soc_dai_get_drvdata(dai); int ret = 0; - ret = test_and_set_bit(0, &hcp->busy); - if (ret) { + mutex_lock(&hcp->lock); + if (hcp->busy) { dev_err(dai->dev, "Only one simultaneous stream supported!\n"); + mutex_unlock(&hcp->lock); return -EINVAL; } @@ -405,21 +407,21 @@ static int hdmi_codec_startup(struct snd_pcm_substream *substream, if (hcp->hcd.ops->get_eld) { ret = hcp->hcd.ops->get_eld(dai->dev->parent, hcp->hcd.data, hcp->eld, sizeof(hcp->eld)); + if (ret) + goto err; + + ret = snd_pcm_hw_constraint_eld(substream->runtime, hcp->eld); + if (ret) + goto err; - if (!ret) { - ret = snd_pcm_hw_constraint_eld(substream->runtime, - hcp->eld); - if (ret) - goto err; - } /* Select chmap supported */ hdmi_codec_eld_chmap(hcp); } - return 0; + + hcp->busy = true; err: - /* Release the exclusive lock on error */ - clear_bit(0, &hcp->busy); + mutex_unlock(&hcp->lock); return ret; } @@ -431,7 +433,9 @@ static void hdmi_codec_shutdown(struct snd_pcm_substream *substream, hcp->chmap_idx = HDMI_CODEC_CHMAP_IDX_UNKNOWN; hcp->hcd.ops->audio_shutdown(dai->dev->parent, hcp->hcd.data); - clear_bit(0, &hcp->busy); + mutex_lock(&hcp->lock); + hcp->busy = false; + mutex_unlock(&hcp->lock); } static int hdmi_codec_hw_params(struct snd_pcm_substream *substream, @@ -811,6 +815,8 @@ static int hdmi_codec_probe(struct platform_device *pdev) return -ENOMEM; hcp->hcd = *hcd; + mutex_init(&hcp->lock); + daidrv = devm_kcalloc(dev, dai_count, sizeof(*daidrv), GFP_KERNEL); if (!daidrv) return -ENOMEM; -- 2.23.0

2 1

[alsa-devel] [PATCH v2 00/13] ASoC: SOF: initial cleanup for DT and multi-client support
by Pierre-Louis Bossart 09 Dec '19

09 Dec '19

This series does not add new functionality but introduces a better code partition to support machine drivers in Device Tree, as well as a 'componentization' of the PCM/topology parts needed for multi-client support. This cleanup was merged in the SOF tree and tested extensively with no regressions identified. Thanks Ranjani and Daniel for combining your proposals in a single change. Changes since v1: Rebased on top of Jaroslav's HDaudio changes (added in this series as discussed with Mark) Daniel Baluta (2): ASoC: SOF: Make creation of machine device from SOF core optional ASoC: SOF: Remove unused drv_name in sof_pdata Jaroslav Kysela (3): ASoC: intel/skl/hda - export number of digital microphones via control components ASoC: Intel - use control components to describe card config ASoC: Intel - do not describe I/O configuration in the long card name Ranjani Sridharan (8): ASoC: SOF: topology: remove snd_sof_init_topology() ASoC: SOF: core: modify the signature for snd_sof_create_page_table ASoC: SOF: core: move check for runtime callbacks to core ASoC: SOF: Introduce default_fw_filename member in sof_dev_desc ASoC: SOF: partition audio-related parts from SOF core ASoC: SOF: intel: hda: Modify signature for hda_codec_probe_bus() ASoC: SOF: remove nocodec_fw_filename ASoC: SOF: nocodec: Amend arguments for sof_nocodec_setup() include/sound/sof.h | 8 +- sound/soc/intel/boards/Kconfig | 13 + sound/soc/intel/boards/bytcht_es8316.c | 13 +- sound/soc/intel/boards/bytcr_rt5640.c | 10 + sound/soc/intel/boards/bytcr_rt5651.c | 22 +- sound/soc/intel/boards/skl_hda_dsp_generic.c | 8 + sound/soc/sof/Makefile | 2 +- sound/soc/sof/control.c | 55 +-- sound/soc/sof/core.c | 244 +--------- sound/soc/sof/intel/apl.c | 7 + sound/soc/sof/intel/bdw.c | 33 ++ sound/soc/sof/intel/byt.c | 45 ++ sound/soc/sof/intel/cnl.c | 7 + sound/soc/sof/intel/hda-codec.c | 16 +- sound/soc/sof/intel/hda-dai.c | 1 + sound/soc/sof/intel/hda-pcm.c | 4 +- sound/soc/sof/intel/hda-stream.c | 1 + sound/soc/sof/intel/hda.c | 228 ++++++---- sound/soc/sof/intel/hda.h | 8 +- sound/soc/sof/ipc.c | 16 +- sound/soc/sof/nocodec.c | 12 - sound/soc/sof/ops.h | 34 ++ sound/soc/sof/pcm.c | 131 +++--- sound/soc/sof/pm.c | 219 +-------- sound/soc/sof/sof-acpi-dev.c | 39 +- sound/soc/sof/sof-audio.c | 445 +++++++++++++++++++ sound/soc/sof/sof-audio.h | 211 +++++++++ sound/soc/sof/sof-of-dev.c | 24 +- sound/soc/sof/sof-pci-dev.c | 47 +- sound/soc/sof/sof-priv.h | 202 +-------- sound/soc/sof/topology.c | 374 ++++++++-------- sound/soc/sof/trace.c | 4 +- sound/soc/sof/utils.c | 60 +++ 33 files changed, 1380 insertions(+), 1163 deletions(-) create mode 100644 sound/soc/sof/sof-audio.c create mode 100644 sound/soc/sof/sof-audio.h -- 2.20.1

2 26

[alsa-devel] [PATCH] ALSA: hda/ca0132 - add missed snd_hda_gen_parse_auto_config
by Chuhong Yuan 09 Dec '19

09 Dec '19

It is found that all usages of snd_hda_parse_pin_defcfg() are followed with snd_hda_gen_parse_auto_config() except here. This should be a miss and needs to add the missed call. Signed-off-by: Chuhong Yuan <hslester96(a)gmail.com> --- sound/pci/hda/patch_ca0132.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c index b7a1abb3e231..ea1187a13241 100644 --- a/sound/pci/hda/patch_ca0132.c +++ b/sound/pci/hda/patch_ca0132.c @@ -24,6 +24,7 @@ #include "hda_local.h" #include "hda_auto_parser.h" #include "hda_jack.h" +#include "hda_generic.h" #include "ca0132_regs.h" @@ -8844,6 +8845,10 @@ static int patch_ca0132(struct hda_codec *codec) if (err < 0) goto error; + err = snd_hda_gen_parse_auto_config(codec, &spec->autocfg); + if (err < 0) + goto error; + return 0; error: -- 2.24.0

2 1

[alsa-devel] [PATCH] ASoC: tas2552: add missed regulator_bulk_disable in remove
by Chuhong Yuan 09 Dec '19

09 Dec '19

The driver forgets to call regulator_bulk_disable() in remove like that in probe failure. Add the missed call to fix it. Signed-off-by: Chuhong Yuan <hslester96(a)gmail.com> --- sound/soc/codecs/tas2552.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/codecs/tas2552.c b/sound/soc/codecs/tas2552.c index 56671f21cfe5..0e19ec76aae0 100644 --- a/sound/soc/codecs/tas2552.c +++ b/sound/soc/codecs/tas2552.c @@ -616,6 +616,9 @@ static void tas2552_component_remove(struct snd_soc_component *component) pm_runtime_put(component->dev); gpiod_set_value(tas2552->enable_gpio, 0); + + regulator_bulk_disable(ARRAY_SIZE(tas2552->supplies), + tas2552->supplies); }; #ifdef CONFIG_PM -- 2.24.0

2 1

[alsa-devel] [PATCH] ASoC: cs35l32: add missed regulator_bulk_disable in remove
by Chuhong Yuan 09 Dec '19

09 Dec '19

The driver forgets to call regulator_bulk_disable() in remove like that in probe failure. Add the missed call to fix it. Signed-off-by: Chuhong Yuan <hslester96(a)gmail.com> --- sound/soc/codecs/cs35l32.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/codecs/cs35l32.c b/sound/soc/codecs/cs35l32.c index 3a644a35c464..be8159bd8ec8 100644 --- a/sound/soc/codecs/cs35l32.c +++ b/sound/soc/codecs/cs35l32.c @@ -501,6 +501,8 @@ static int cs35l32_i2c_remove(struct i2c_client *i2c_client) /* Hold down reset */ gpiod_set_value_cansleep(cs35l32->reset_gpio, 0); + regulator_bulk_disable(ARRAY_SIZE(cs35l32->supplies), + cs35l32->supplies); return 0; } -- 2.24.0

2 1

[alsa-devel] [PATCH] firewire-motu: fix double unlocked 'motu->mutex'
by Takashi Sakamoto 09 Dec '19

09 Dec '19

Mutex is doubly unlocked in some error path of pcm.open. This commit fixes ALSA firewire-motu driver in Linux kernel v5.5. Reported-by: kbuild test robot <lkp(a)intel.com> Reported-by: Dan Carpenter <dan.carpenter(a)oracle.com> Fixes: 3fd80b200388 ("ALSA: firewire-motu: use the same size of period for PCM substream in AMDTP streams") Fixes: 0f5482e7875b ("ALSA: firewire-motu: share PCM buffer size for both direction") Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- sound/firewire/motu/motu-pcm.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/sound/firewire/motu/motu-pcm.c b/sound/firewire/motu/motu-pcm.c index 349b4d09e84f..005970931030 100644 --- a/sound/firewire/motu/motu-pcm.c +++ b/sound/firewire/motu/motu-pcm.c @@ -177,18 +177,14 @@ static int pcm_open(struct snd_pcm_substream *substream) err = snd_pcm_hw_constraint_minmax(substream->runtime, SNDRV_PCM_HW_PARAM_PERIOD_SIZE, frames_per_period, frames_per_period); - if (err < 0) { - mutex_unlock(&motu->mutex); + if (err < 0) goto err_locked; - } err = snd_pcm_hw_constraint_minmax(substream->runtime, SNDRV_PCM_HW_PARAM_BUFFER_SIZE, frames_per_buffer, frames_per_buffer); - if (err < 0) { - mutex_unlock(&motu->mutex); + if (err < 0) goto err_locked; - } } } -- 2.20.1

2 2

[alsa-devel] [PATCH v2 1/2] ALSA: core: add snd_pcm_format_by_name()
by Daniel Mack 08 Dec '19

08 Dec '19

Add a new function to look up PCM format codes by name. This can be used by ASoC drivers to look up formats through device-tree properties, for instance. Signed-off-by: Daniel Mack <daniel(a)zonque.org> --- include/sound/pcm.h | 1 + sound/core/pcm.c | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/include/sound/pcm.h b/include/sound/pcm.h index 8a89fa6fdd5e..1bfde6f2f180 100644 --- a/include/sound/pcm.h +++ b/include/sound/pcm.h @@ -1339,6 +1339,7 @@ static inline void snd_pcm_limit_isa_dma_size(int dma, size_t *max) (IEC958_AES3_CON_FS_48000<<24)) const char *snd_pcm_format_name(snd_pcm_format_t format); +int snd_pcm_format_by_name(const char *name, snd_pcm_format_t *format); /** * snd_pcm_stream_str - Get a string naming the direction of a stream diff --git a/sound/core/pcm.c b/sound/core/pcm.c index 9a72d641743d..c02d8df4f92b 100644 --- a/sound/core/pcm.c +++ b/sound/core/pcm.c @@ -225,6 +225,29 @@ const char *snd_pcm_format_name(snd_pcm_format_t format) } EXPORT_SYMBOL_GPL(snd_pcm_format_name); +/** + * snd_pcm_format_by_name - Return the PCM format code for the given name + * @name: PCM format name ('S16_LE', 'S24_3LE', ...) + * @format: Pointer to returned PCM format code + * + * The string comparison is done in a case-insensitive way. + * + * Return: 0 on success, or -ENOENT if the given format is not valid. + */ +int snd_pcm_format_by_name(const char *name, snd_pcm_format_t *format) +{ + int i; + + for (i = 0; i < ARRAY_SIZE(snd_pcm_format_names); i++) + if (strcasecmp(name, snd_pcm_format_names[i]) == 0) { + *format = i; + return 0; + } + + return -ENOENT; +} +EXPORT_SYMBOL_GPL(snd_pcm_format_by_name); + #ifdef CONFIG_SND_VERBOSE_PROCFS #define STATE(v) [SNDRV_PCM_STATE_##v] = #v -- 2.23.0

2 3

[alsa-devel] [PATCH] ALSA: echoaudio: simplify get_audio_levels
by Olof Johansson 08 Dec '19

08 Dec '19

The loop optimizer seems to go astray here, and produces some warnings that don't seem valid. Still, the code can be simplified -- just clear the whole array at the beginning, and fill in whatever values are valid on the platform. Warnings before this change (GCC 8.2.0 ARM allmodconfig): In file included from ../sound/pci/echoaudio/gina24.c:115: ../sound/pci/echoaudio/echoaudio.c: In function 'snd_echo_vumeters_get': ../sound/pci/echoaudio/echoaudio_dsp.c:647:9: warning: iteration 1073741824 invokes undefined behavior [-Waggressive-loop-optimizations] In file included from ../sound/pci/echoaudio/layla24.c:112: ../sound/pci/echoaudio/echoaudio.c: In function 'snd_echo_vumeters_get': ../sound/pci/echoaudio/echoaudio_dsp.c:658:9: warning: iteration 1073741824 invokes undefined behavior [-Waggressive-loop-optimizations] ../sound/pci/echoaudio/echoaudio_dsp.c:647:9: warning: iteration 1073741824 invokes undefined behavior [-Waggressive-loop-optimizations] Signed-off-by: Olof Johansson <olof(a)lixom.net> --- sound/pci/echoaudio/echoaudio_dsp.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/sound/pci/echoaudio/echoaudio_dsp.c b/sound/pci/echoaudio/echoaudio_dsp.c index 50d4a87a6bb34..f02f5b1568dee 100644 --- a/sound/pci/echoaudio/echoaudio_dsp.c +++ b/sound/pci/echoaudio/echoaudio_dsp.c @@ -635,36 +635,30 @@ This function assumes there are no more than 16 in/out busses or pipes Meters is an array [3][16][2] of long. */ static void get_audio_meters(struct echoaudio *chip, long *meters) { - int i, m, n; + unsigned int i, m, n; - m = 0; - n = 0; - for (i = 0; i < num_busses_out(chip); i++, m++) { + for (i = 0 ; i < 96; i++) + meters[i] = 0; + + for (m = 0, n = 0, i = 0; i < num_busses_out(chip); i++, m++) { meters[n++] = chip->comm_page->vu_meter[m]; meters[n++] = chip->comm_page->peak_meter[m]; } - for (; n < 32; n++) - meters[n] = 0; #ifdef ECHOCARD_ECHO3G m = E3G_MAX_OUTPUTS; /* Skip unused meters */ #endif - for (i = 0; i < num_busses_in(chip); i++, m++) { + for (n = 32, i = 0; i < num_busses_in(chip); i++, m++) { meters[n++] = chip->comm_page->vu_meter[m]; meters[n++] = chip->comm_page->peak_meter[m]; } - for (; n < 64; n++) - meters[n] = 0; - #ifdef ECHOCARD_HAS_VMIXER - for (i = 0; i < num_pipes_out(chip); i++, m++) { + for (n = 64, i = 0; i < num_pipes_out(chip); i++, m++) { meters[n++] = chip->comm_page->vu_meter[m]; meters[n++] = chip->comm_page->peak_meter[m]; } #endif - for (; n < 96; n++) - meters[n] = 0; } -- 2.11.0

2 1

Re: [alsa-devel] [PATCH v3 06/15] clk: tegra: Remove tegra_pmc_clk_init along with clk ids
by Dmitry Osipenko 08 Dec '19

08 Dec '19

07.12.2019 22:35, Sowjanya Komatineni пишет: > > On 12/7/19 7:04 AM, Dmitry Osipenko wrote: >> 07.12.2019 17:43, Dmitry Osipenko пишет: >>> 07.12.2019 17:33, Dmitry Osipenko пишет: >>>> 06.12.2019 05:48, Sowjanya Komatineni пишет: >>>>> Current Tegra clock driver registers PMC clocks clk_out_1, clk_out_2, >>>>> clk_out_3 and blink output in tegra_pmc_init() which does direct Tegra >>>>> PMC access during clk_ops and these PMC register read and write access >>>>> will not happen when PMC is in secure mode. >>>>> >>>>> Any direct PMC register access from non-secure world will not go >>>>> through and all the PMC clocks and blink control are done in Tegra PMC >>>>> driver with PMC as clock provider. >>>>> >>>>> This patch removes tegra_pmc_clk_init along with corresponding clk ids >>>>> from Tegra clock driver. >>>>> >>>>> Signed-off-by: Sowjanya Komatineni <skomatineni(a)nvidia.com> >>>>> --- >>>> [snip] >>>> >>>>> @@ -1230,9 +1222,6 @@ static struct tegra_clk_init_table >>>>> init_table[] __initdata = { >>>>> { TEGRA30_CLK_PLL_A, TEGRA30_CLK_CLK_MAX, 564480000, 1 }, >>>>> { TEGRA30_CLK_PLL_A_OUT0, TEGRA30_CLK_CLK_MAX, 11289600, 1 }, >>>>> { TEGRA30_CLK_EXTERN1, TEGRA30_CLK_PLL_A_OUT0, 0, 1 }, >>>> Perhaps these clocks do not need to be always-enabled? >>>> >>>> [snip] >>>> >>> Also, EXTERN1 parent configuration should be moved to the audio >>> driver/device-tree as well. >> Ah, I missed that it's done in the patch #10. > Yes its done in Patch#10 >> >>> Maybe it even makes sense to move the whole configuration, including >>> PLLA. I don't see why clk driver need to do something for the audio >>> driver. > > Current ASoC driver already takes care of PLLA rate and enables. > > So PLLA init can be removed from clock driver too. I didn't went through > complete audio driver to be confident to remove this. > > But PLLA is needed for i2s clock also and currently I2S driver takes > care of only I2S clock rate using PLLA as parent set by clock driver and > clock driver enables PLLA earlier to have it ready by the time both I2S > driver and ASoC driver . I2S could use assigned-clocks, but probably it's not really necessary and predefined configuration in the clk driver is good enough. At least PLLA doesn't need to be always-enabled since audio drivers enable it when necessary.

1 0

[alsa-devel] [PATCH v3] ASoC: intel: Add Broadwell rt5650 machine driver
by Curtis Malainey 06 Dec '19

06 Dec '19

From: Ben Zhang <benzh(a)chromium.org> Add machine driver for Broadwell + rt5650. Signed-off-by: Bard Liao <bardliao(a)realtek.com> Signed-off-by: Ben Zhang <benzh(a)chromium.org> Signed-off-by: Mac Chiang <mac.chiang(a)intel.com> Signed-off-by: Jon Flatley <jflat(a)chromium.org> Signed-off-by: Curtis Malainey <cujomalainey(a)chromium.org> --- v2 (Curtis): * Addressed Pierre's comments * Added SOF dependencies * Added platform override * Fixed Kconfig * Moved to devm register v3: * Removed THIS_MODULE * Added PM Ops sound/soc/intel/boards/Kconfig | 12 + sound/soc/intel/boards/Makefile | 2 + sound/soc/intel/boards/bdw-rt5650.c | 319 ++++++++++++++++++ .../common/soc-acpi-intel-hsw-bdw-match.c | 7 + 4 files changed, 340 insertions(+) create mode 100644 sound/soc/intel/boards/bdw-rt5650.c diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig index 6c9fd9ad566ed..de613ae5052bf 100644 --- a/sound/soc/intel/boards/Kconfig +++ b/sound/soc/intel/boards/Kconfig @@ -31,6 +31,18 @@ endif ## SND_SOC_INTEL_HASWELL if SND_SOC_INTEL_HASWELL || SND_SOC_SOF_BROADWELL +config SND_SOC_INTEL_BDW_RT5650_MACH + tristate "Broadwell with RT5650 codec" + depends on I2C + depends on I2C_DESIGNWARE_PLATFORM || COMPILE_TEST + depends on X86_INTEL_LPSS || COMPILE_TEST + select SND_SOC_RT5645 + help + This adds the ASoC machine driver for Intel Broadwell platforms with + the RT5650 codec. + Say Y if you have such a device. + If unsure select "N". + config SND_SOC_INTEL_BDW_RT5677_MACH tristate "Broadwell with RT5677 codec" depends on I2C diff --git a/sound/soc/intel/boards/Makefile b/sound/soc/intel/boards/Makefile index ba1aa89db09d5..4efb3689503f8 100644 --- a/sound/soc/intel/boards/Makefile +++ b/sound/soc/intel/boards/Makefile @@ -2,6 +2,7 @@ snd-soc-sst-haswell-objs := haswell.o snd-soc-sst-byt-rt5640-mach-objs := byt-rt5640.o snd-soc-sst-byt-max98090-mach-objs := byt-max98090.o +snd-soc-sst-bdw-rt5650-mach-objs := bdw-rt5650.o snd-soc-sst-bdw-rt5677-mach-objs := bdw-rt5677.o snd-soc-sst-broadwell-objs := broadwell.o snd-soc-sst-bxt-da7219_max98357a-objs := bxt_da7219_max98357a.o hda_dsp_common.o @@ -37,6 +38,7 @@ obj-$(CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON) += snd-soc-sst-bxt-da721 obj-$(CONFIG_SND_SOC_INTEL_BXT_RT298_MACH) += snd-soc-sst-bxt-rt298.o obj-$(CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH) += snd-soc-sst-glk-rt5682_max98357a.o obj-$(CONFIG_SND_SOC_INTEL_BROADWELL_MACH) += snd-soc-sst-broadwell.o +obj-$(CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH) += snd-soc-sst-bdw-rt5650-mach.o obj-$(CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH) += snd-soc-sst-bdw-rt5677-mach.o obj-$(CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH) += snd-soc-sst-bytcr-rt5640.o obj-$(CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH) += snd-soc-sst-bytcr-rt5651.o diff --git a/sound/soc/intel/boards/bdw-rt5650.c b/sound/soc/intel/boards/bdw-rt5650.c new file mode 100644 index 0000000000000..274b21680d624 --- /dev/null +++ b/sound/soc/intel/boards/bdw-rt5650.c @@ -0,0 +1,319 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * ASoC machine driver for Intel Broadwell platforms with RT5650 codec + * + * Copyright 2019, The Chromium OS Authors. All rights reserved. + */ + +#include <linux/delay.h> +#include <linux/gpio/consumer.h> +#include <linux/module.h> +#include <linux/platform_device.h> +#include <sound/core.h> +#include <sound/jack.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include <sound/soc.h> +#include <sound/soc-acpi.h> + +#include "../common/sst-dsp.h" +#include "../haswell/sst-haswell-ipc.h" + +#include "../../codecs/rt5645.h" + +struct bdw_rt5650_priv { + struct gpio_desc *gpio_hp_en; + struct snd_soc_component *component; +}; + +static const struct snd_soc_dapm_widget bdw_rt5650_widgets[] = { + SND_SOC_DAPM_HP("Headphone", NULL), + SND_SOC_DAPM_SPK("Speaker", NULL), + SND_SOC_DAPM_MIC("Headset Mic", NULL), + SND_SOC_DAPM_MIC("DMIC Pair1", NULL), + SND_SOC_DAPM_MIC("DMIC Pair2", NULL), +}; + +static const struct snd_soc_dapm_route bdw_rt5650_map[] = { + /* Speakers */ + {"Speaker", NULL, "SPOL"}, + {"Speaker", NULL, "SPOR"}, + + /* Headset jack connectors */ + {"Headphone", NULL, "HPOL"}, + {"Headphone", NULL, "HPOR"}, + {"IN1P", NULL, "Headset Mic"}, + {"IN1N", NULL, "Headset Mic"}, + + /* Digital MICs + * DMIC Pair1 are the two DMICs connected on the DMICN1 connector. + * DMIC Pair2 are the two DMICs connected on the DMICN2 connector. + * Facing the camera, DMIC Pair1 are on the left side, DMIC Pair2 + * are on the right side. + */ + {"DMIC L1", NULL, "DMIC Pair1"}, + {"DMIC R1", NULL, "DMIC Pair1"}, + {"DMIC L2", NULL, "DMIC Pair2"}, + {"DMIC R2", NULL, "DMIC Pair2"}, + + /* CODEC BE connections */ + {"SSP0 CODEC IN", NULL, "AIF1 Capture"}, + {"AIF1 Playback", NULL, "SSP0 CODEC OUT"}, +}; + +static const struct snd_kcontrol_new bdw_rt5650_controls[] = { + SOC_DAPM_PIN_SWITCH("Speaker"), + SOC_DAPM_PIN_SWITCH("Headphone"), + SOC_DAPM_PIN_SWITCH("Headset Mic"), + SOC_DAPM_PIN_SWITCH("DMIC Pair1"), + SOC_DAPM_PIN_SWITCH("DMIC Pair2"), +}; + + +static struct snd_soc_jack headphone_jack; +static struct snd_soc_jack mic_jack; + +static struct snd_soc_jack_pin headphone_jack_pin = { + .pin = "Headphone", + .mask = SND_JACK_HEADPHONE, +}; + +static struct snd_soc_jack_pin mic_jack_pin = { + .pin = "Headset Mic", + .mask = SND_JACK_MICROPHONE, +}; + +static int broadwell_ssp0_fixup(struct snd_soc_pcm_runtime *rtd, + struct snd_pcm_hw_params *params) +{ + struct snd_interval *rate = hw_param_interval(params, + SNDRV_PCM_HW_PARAM_RATE); + struct snd_interval *channels = hw_param_interval(params, + SNDRV_PCM_HW_PARAM_CHANNELS); + + /* The ADSP will covert the FE rate to 48k, max 4-channels */ + rate->min = rate->max = 48000; + channels->min = 2; + channels->max = 4; + + /* set SSP0 to 24 bit */ + snd_mask_set(&params->masks[SNDRV_PCM_HW_PARAM_FORMAT - + SNDRV_PCM_HW_PARAM_FIRST_MASK], + SNDRV_PCM_FORMAT_S24_LE); + return 0; +} + +static int bdw_rt5650_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_dai *codec_dai = rtd->codec_dai; + int ret; + + /* Workaround: set codec PLL to 19.2MHz that PLL source is + * from MCLK(24MHz) to conform 2.4MHz DMIC clock. + */ + ret = snd_soc_dai_set_pll(codec_dai, 0, RT5645_PLL1_S_MCLK, + 24000000, 19200000); + if (ret < 0) { + dev_err(rtd->dev, "can't set codec pll: %d\n", ret); + return ret; + } + + /* The actual MCLK freq is 24MHz. The codec is told that MCLK is + * 24.576MHz to satisfy the requirement of rl6231_get_clk_info. + * ASRC is enabled on AD and DA filters to ensure good audio quality. + */ + ret = snd_soc_dai_set_sysclk(codec_dai, RT5645_SCLK_S_PLL1, 24576000, + SND_SOC_CLOCK_IN); + if (ret < 0) { + dev_err(rtd->dev, "can't set codec sysclk configuration\n"); + return ret; + } + + return ret; +} + +static struct snd_soc_ops bdw_rt5650_ops = { + .hw_params = bdw_rt5650_hw_params, +}; + +#if !IS_ENABLED(CONFIG_SND_SOC_SOF_BROADWELL) +static int bdw_rt5650_rtd_init(struct snd_soc_pcm_runtime *rtd) +{ + struct snd_soc_component *component = + snd_soc_rtdcom_lookup(rtd, DRV_NAME); + struct sst_pdata *pdata = dev_get_platdata(component->dev); + struct sst_hsw *broadwell = pdata->dsp; + int ret; + + /* Set ADSP SSP port settings + * clock_divider = 4 means BCLK = MCLK/5 = 24MHz/5 = 4.8MHz + */ + ret = sst_hsw_device_set_config(broadwell, SST_HSW_DEVICE_SSP_0, + SST_HSW_DEVICE_MCLK_FREQ_24_MHZ, + SST_HSW_DEVICE_TDM_CLOCK_MASTER, 4); + if (ret < 0) { + dev_err(rtd->dev, "error: failed to set device config\n"); + return ret; + } + + return 0; +} +#endif + +static int bdw_rt5650_init(struct snd_soc_pcm_runtime *rtd) +{ + struct bdw_rt5650_priv *bdw_rt5650 = + snd_soc_card_get_drvdata(rtd->card); + struct snd_soc_component *component = rtd->codec_dai->component; + struct snd_soc_dai *codec_dai = rtd->codec_dai; + int ret; + + /* Enable codec ASRC function for Stereo DAC/Stereo1 ADC/DMIC/I2S1. + * The ASRC clock source is clk_i2s1_asrc. + */ + rt5645_sel_asrc_clk_src(component, + RT5645_DA_STEREO_FILTER | + RT5645_DA_MONO_L_FILTER | + RT5645_DA_MONO_R_FILTER | + RT5645_AD_STEREO_FILTER | + RT5645_AD_MONO_L_FILTER | + RT5645_AD_MONO_R_FILTER, + RT5645_CLK_SEL_I2S1_ASRC); + + /* TDM 4 slots 24 bit, set Rx & Tx bitmask to 4 active slots */ + ret = snd_soc_dai_set_tdm_slot(codec_dai, 0xF, 0xF, 4, 24); + + if (ret < 0) { + dev_err(rtd->dev, "can't set codec TDM slot %d\n", ret); + return ret; + } + + /* Create and initialize headphone jack */ + if (snd_soc_card_jack_new(rtd->card, "Headphone Jack", + SND_JACK_HEADPHONE, &headphone_jack, + &headphone_jack_pin, 1)) { + dev_err(component->dev, "Can't create headphone jack\n"); + } + + /* Create and initialize mic jack */ + if (snd_soc_card_jack_new(rtd->card, "Mic Jack", SND_JACK_MICROPHONE, + &mic_jack, &mic_jack_pin, 1)) { + dev_err(component->dev, "Can't create mic jack\n"); + } + + rt5645_set_jack_detect(component, &headphone_jack, &mic_jack, NULL); + + bdw_rt5650->component = component; + + return 0; +} + +/* broadwell digital audio interface glue - connects codec <--> CPU */ +SND_SOC_DAILINK_DEF(dummy, + DAILINK_COMP_ARRAY(COMP_DUMMY())); + +SND_SOC_DAILINK_DEF(fe, + DAILINK_COMP_ARRAY(COMP_CPU("System Pin"))); + +SND_SOC_DAILINK_DEF(platform, + DAILINK_COMP_ARRAY(COMP_PLATFORM("haswell-pcm-audio"))); + +SND_SOC_DAILINK_DEF(be, + DAILINK_COMP_ARRAY(COMP_CODEC("i2c-10EC5650:00", "rt5645-aif1"))); + +static struct snd_soc_dai_link bdw_rt5650_dais[] = { + /* Front End DAI links */ + { + .name = "System PCM", + .stream_name = "System Playback", + .dynamic = 1, +#if !IS_ENABLED(CONFIG_SND_SOC_SOF_BROADWELL) + .init = bdw_rt5650_rtd_init, +#endif + .trigger = { + SND_SOC_DPCM_TRIGGER_POST, + SND_SOC_DPCM_TRIGGER_POST + }, + .dpcm_playback = 1, + .dpcm_capture = 1, + SND_SOC_DAILINK_REG(fe, dummy, platform), + }, + + /* Back End DAI links */ + { + /* SSP0 - Codec */ + .name = "Codec", + .id = 0, + .no_pcm = 1, + .dai_fmt = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBS_CFS, + .ignore_suspend = 1, + .ignore_pmdown_time = 1, + .be_hw_params_fixup = broadwell_ssp0_fixup, + .ops = &bdw_rt5650_ops, + .dpcm_playback = 1, + .dpcm_capture = 1, + .init = bdw_rt5650_init, + SND_SOC_DAILINK_REG(dummy, be, dummy), + }, +}; + +/* ASoC machine driver for Broadwell DSP + RT5650 */ +static struct snd_soc_card bdw_rt5650_card = { + .name = "bdw-rt5650", + .owner = THIS_MODULE, + .dai_link = bdw_rt5650_dais, + .num_links = ARRAY_SIZE(bdw_rt5650_dais), + .dapm_widgets = bdw_rt5650_widgets, + .num_dapm_widgets = ARRAY_SIZE(bdw_rt5650_widgets), + .dapm_routes = bdw_rt5650_map, + .num_dapm_routes = ARRAY_SIZE(bdw_rt5650_map), + .controls = bdw_rt5650_controls, + .num_controls = ARRAY_SIZE(bdw_rt5650_controls), + .fully_routed = true, +}; + +static int bdw_rt5650_probe(struct platform_device *pdev) +{ + struct bdw_rt5650_priv *bdw_rt5650; + struct snd_soc_acpi_mach *mach; + int ret; + + bdw_rt5650_card.dev = &pdev->dev; + + /* Allocate driver private struct */ + bdw_rt5650 = devm_kzalloc(&pdev->dev, sizeof(struct bdw_rt5650_priv), + GFP_KERNEL); + if (!bdw_rt5650) + return -ENOMEM; + + /* override plaform name, if required */ + mach = (&pdev->dev)->platform_data; + ret = snd_soc_fixup_dai_links_platform_name(&bdw_rt5650_card, + mach->mach_params.platform); + + if (ret) + return ret; + + snd_soc_card_set_drvdata(&bdw_rt5650_card, bdw_rt5650); + + return devm_snd_soc_register_card(&pdev->dev, &bdw_rt5650_card); +} + +static struct platform_driver bdw_rt5650_audio = { + .probe = bdw_rt5650_probe, + .driver = { + .name = "bdw-rt5650", + .pm = &snd_soc_pm_ops, + }, +}; + +module_platform_driver(bdw_rt5650_audio) + +/* Module information */ +MODULE_AUTHOR("Ben Zhang <benzh(a)chromium.org>"); +MODULE_DESCRIPTION("Intel Broadwell RT5650 machine driver"); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:bdw-rt5650"); diff --git a/sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c b/sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c index 34eb0baaa9517..35958553652ec 100644 --- a/sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c @@ -29,6 +29,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_broadwell_machines[] = { .sof_fw_filename = "sof-bdw.ri", .sof_tplg_filename = "sof-bdw-rt286.tplg", }, + { + .id = "10EC5650", + .drv_name = "bdw-rt5650", + .fw_filename = "intel/IntcSST2.bin", + .sof_fw_filename = "sof-bdw.ri", + .sof_tplg_filename = "sof-bdw-rt5650.tplg", + }, { .id = "RT5677CE", .drv_name = "bdw-rt5677", -- 2.24.0.393.g34dc348eaf-goog

3 2

[alsa-devel] [PATCH] ASoC: wm5100: add missed regulator_bulk_disable
by Chuhong Yuan 06 Dec '19

06 Dec '19

The driver forgets to call regulator_bulk_disable() in remove like that in probe failure. Add the missed call to fix it. Signed-off-by: Chuhong Yuan <hslester96(a)gmail.com> --- sound/soc/codecs/wm5100.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c index 91cc63c5a51f..d985b2061169 100644 --- a/sound/soc/codecs/wm5100.c +++ b/sound/soc/codecs/wm5100.c @@ -2653,6 +2653,8 @@ static int wm5100_i2c_remove(struct i2c_client *i2c) gpio_set_value_cansleep(wm5100->pdata.ldo_ena, 0); gpio_free(wm5100->pdata.ldo_ena); } + regulator_bulk_disable(ARRAY_SIZE(wm5100->core_supplies), + wm5100->core_supplies); return 0; } -- 2.24.0

2 1

[alsa-devel] Headset button mapping in the kernel
by Curtis Malainey 06 Dec '19

06 Dec '19

Hello ALSA Devs, I am looking to get some feedback/ideas on a possible change to headset button mapping. Locally we are carrying patches that implement the mappings in the machine driver (which we understand you do not want upstream.) We are looking to see if we can add a new API (something like a sysfs path potentially) to have userspace pass in the mapping, if it chooses to, so the mapping can still be done in the kernel. That way we can carry just the config locally and remove some of the kernel patches we are carrying locally. Thanks. Curtis

5 9

[alsa-devel] [PATCH v2] ASoC: intel: Add Broadwell rt5650 machine driver
by Curtis Malainey 05 Dec '19

05 Dec '19

From: Ben Zhang <benzh(a)chromium.org> Add machine driver for Broadwell + rt5650. v2 (Curtis): * Addressed Pierre's comments * Added SOF dependencies * Added platform override * Fixed Kconfig * Moved to devm register Signed-off-by: Bard Liao <bardliao(a)realtek.com> Signed-off-by: Ben Zhang <benzh(a)chromium.org> Signed-off-by: Mac Chiang <mac.chiang(a)intel.com> Signed-off-by: Jon Flatley <jflat(a)chromium.org> Signed-off-by: Curtis Malainey <cujomalainey(a)chromium.org> --- sound/soc/intel/boards/Kconfig | 12 + sound/soc/intel/boards/Makefile | 2 + sound/soc/intel/boards/bdw-rt5650.c | 319 ++++++++++++++++++ .../common/soc-acpi-intel-hsw-bdw-match.c | 7 + 4 files changed, 340 insertions(+) create mode 100644 sound/soc/intel/boards/bdw-rt5650.c diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig index 6c9fd9ad566ed..de613ae5052bf 100644 --- a/sound/soc/intel/boards/Kconfig +++ b/sound/soc/intel/boards/Kconfig @@ -31,6 +31,18 @@ endif ## SND_SOC_INTEL_HASWELL if SND_SOC_INTEL_HASWELL || SND_SOC_SOF_BROADWELL +config SND_SOC_INTEL_BDW_RT5650_MACH + tristate "Broadwell with RT5650 codec" + depends on I2C + depends on I2C_DESIGNWARE_PLATFORM || COMPILE_TEST + depends on X86_INTEL_LPSS || COMPILE_TEST + select SND_SOC_RT5645 + help + This adds the ASoC machine driver for Intel Broadwell platforms with + the RT5650 codec. + Say Y if you have such a device. + If unsure select "N". + config SND_SOC_INTEL_BDW_RT5677_MACH tristate "Broadwell with RT5677 codec" depends on I2C diff --git a/sound/soc/intel/boards/Makefile b/sound/soc/intel/boards/Makefile index ba1aa89db09d5..4efb3689503f8 100644 --- a/sound/soc/intel/boards/Makefile +++ b/sound/soc/intel/boards/Makefile @@ -2,6 +2,7 @@ snd-soc-sst-haswell-objs := haswell.o snd-soc-sst-byt-rt5640-mach-objs := byt-rt5640.o snd-soc-sst-byt-max98090-mach-objs := byt-max98090.o +snd-soc-sst-bdw-rt5650-mach-objs := bdw-rt5650.o snd-soc-sst-bdw-rt5677-mach-objs := bdw-rt5677.o snd-soc-sst-broadwell-objs := broadwell.o snd-soc-sst-bxt-da7219_max98357a-objs := bxt_da7219_max98357a.o hda_dsp_common.o @@ -37,6 +38,7 @@ obj-$(CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON) += snd-soc-sst-bxt-da721 obj-$(CONFIG_SND_SOC_INTEL_BXT_RT298_MACH) += snd-soc-sst-bxt-rt298.o obj-$(CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH) += snd-soc-sst-glk-rt5682_max98357a.o obj-$(CONFIG_SND_SOC_INTEL_BROADWELL_MACH) += snd-soc-sst-broadwell.o +obj-$(CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH) += snd-soc-sst-bdw-rt5650-mach.o obj-$(CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH) += snd-soc-sst-bdw-rt5677-mach.o obj-$(CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH) += snd-soc-sst-bytcr-rt5640.o obj-$(CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH) += snd-soc-sst-bytcr-rt5651.o diff --git a/sound/soc/intel/boards/bdw-rt5650.c b/sound/soc/intel/boards/bdw-rt5650.c new file mode 100644 index 0000000000000..5279dcaa034a7 --- /dev/null +++ b/sound/soc/intel/boards/bdw-rt5650.c @@ -0,0 +1,319 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * ASoC machine driver for Intel Broadwell platforms with RT5650 codec + * + * Copyright 2019, The Chromium OS Authors. All rights reserved. + */ + +#include <linux/delay.h> +#include <linux/gpio/consumer.h> +#include <linux/module.h> +#include <linux/platform_device.h> +#include <sound/core.h> +#include <sound/jack.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include <sound/soc.h> +#include <sound/soc-acpi.h> + +#include "../common/sst-dsp.h" +#include "../haswell/sst-haswell-ipc.h" + +#include "../../codecs/rt5645.h" + +struct bdw_rt5650_priv { + struct gpio_desc *gpio_hp_en; + struct snd_soc_component *component; +}; + +static const struct snd_soc_dapm_widget bdw_rt5650_widgets[] = { + SND_SOC_DAPM_HP("Headphone", NULL), + SND_SOC_DAPM_SPK("Speaker", NULL), + SND_SOC_DAPM_MIC("Headset Mic", NULL), + SND_SOC_DAPM_MIC("DMIC Pair1", NULL), + SND_SOC_DAPM_MIC("DMIC Pair2", NULL), +}; + +static const struct snd_soc_dapm_route bdw_rt5650_map[] = { + /* Speakers */ + {"Speaker", NULL, "SPOL"}, + {"Speaker", NULL, "SPOR"}, + + /* Headset jack connectors */ + {"Headphone", NULL, "HPOL"}, + {"Headphone", NULL, "HPOR"}, + {"IN1P", NULL, "Headset Mic"}, + {"IN1N", NULL, "Headset Mic"}, + + /* Digital MICs + * DMIC Pair1 are the two DMICs connected on the DMICN1 connector. + * DMIC Pair2 are the two DMICs connected on the DMICN2 connector. + * Facing the camera, DMIC Pair1 are on the left side, DMIC Pair2 + * are on the right side. + */ + {"DMIC L1", NULL, "DMIC Pair1"}, + {"DMIC R1", NULL, "DMIC Pair1"}, + {"DMIC L2", NULL, "DMIC Pair2"}, + {"DMIC R2", NULL, "DMIC Pair2"}, + + /* CODEC BE connections */ + {"SSP0 CODEC IN", NULL, "AIF1 Capture"}, + {"AIF1 Playback", NULL, "SSP0 CODEC OUT"}, +}; + +static const struct snd_kcontrol_new bdw_rt5650_controls[] = { + SOC_DAPM_PIN_SWITCH("Speaker"), + SOC_DAPM_PIN_SWITCH("Headphone"), + SOC_DAPM_PIN_SWITCH("Headset Mic"), + SOC_DAPM_PIN_SWITCH("DMIC Pair1"), + SOC_DAPM_PIN_SWITCH("DMIC Pair2"), +}; + + +static struct snd_soc_jack headphone_jack; +static struct snd_soc_jack mic_jack; + +static struct snd_soc_jack_pin headphone_jack_pin = { + .pin = "Headphone", + .mask = SND_JACK_HEADPHONE, +}; + +static struct snd_soc_jack_pin mic_jack_pin = { + .pin = "Headset Mic", + .mask = SND_JACK_MICROPHONE, +}; + +static int broadwell_ssp0_fixup(struct snd_soc_pcm_runtime *rtd, + struct snd_pcm_hw_params *params) +{ + struct snd_interval *rate = hw_param_interval(params, + SNDRV_PCM_HW_PARAM_RATE); + struct snd_interval *channels = hw_param_interval(params, + SNDRV_PCM_HW_PARAM_CHANNELS); + + /* The ADSP will covert the FE rate to 48k, max 4-channels */ + rate->min = rate->max = 48000; + channels->min = 2; + channels->max = 4; + + /* set SSP0 to 24 bit */ + snd_mask_set(&params->masks[SNDRV_PCM_HW_PARAM_FORMAT - + SNDRV_PCM_HW_PARAM_FIRST_MASK], + SNDRV_PCM_FORMAT_S24_LE); + return 0; +} + +static int bdw_rt5650_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_dai *codec_dai = rtd->codec_dai; + int ret; + + /* Workaround: set codec PLL to 19.2MHz that PLL source is + * from MCLK(24MHz) to conform 2.4MHz DMIC clock. + */ + ret = snd_soc_dai_set_pll(codec_dai, 0, RT5645_PLL1_S_MCLK, + 24000000, 19200000); + if (ret < 0) { + dev_err(rtd->dev, "can't set codec pll: %d\n", ret); + return ret; + } + + /* The actual MCLK freq is 24MHz. The codec is told that MCLK is + * 24.576MHz to satisfy the requirement of rl6231_get_clk_info. + * ASRC is enabled on AD and DA filters to ensure good audio quality. + */ + ret = snd_soc_dai_set_sysclk(codec_dai, RT5645_SCLK_S_PLL1, 24576000, + SND_SOC_CLOCK_IN); + if (ret < 0) { + dev_err(rtd->dev, "can't set codec sysclk configuration\n"); + return ret; + } + + return ret; +} + +static struct snd_soc_ops bdw_rt5650_ops = { + .hw_params = bdw_rt5650_hw_params, +}; + +#if !IS_ENABLED(CONFIG_SND_SOC_SOF_BROADWELL) +static int bdw_rt5650_rtd_init(struct snd_soc_pcm_runtime *rtd) +{ + struct snd_soc_component *component = + snd_soc_rtdcom_lookup(rtd, DRV_NAME); + struct sst_pdata *pdata = dev_get_platdata(component->dev); + struct sst_hsw *broadwell = pdata->dsp; + int ret; + + /* Set ADSP SSP port settings + * clock_divider = 4 means BCLK = MCLK/5 = 24MHz/5 = 4.8MHz + */ + ret = sst_hsw_device_set_config(broadwell, SST_HSW_DEVICE_SSP_0, + SST_HSW_DEVICE_MCLK_FREQ_24_MHZ, + SST_HSW_DEVICE_TDM_CLOCK_MASTER, 4); + if (ret < 0) { + dev_err(rtd->dev, "error: failed to set device config\n"); + return ret; + } + + return 0; +} +#endif + +static int bdw_rt5650_init(struct snd_soc_pcm_runtime *rtd) +{ + struct bdw_rt5650_priv *bdw_rt5650 = + snd_soc_card_get_drvdata(rtd->card); + struct snd_soc_component *component = rtd->codec_dai->component; + struct snd_soc_dai *codec_dai = rtd->codec_dai; + int ret; + + /* Enable codec ASRC function for Stereo DAC/Stereo1 ADC/DMIC/I2S1. + * The ASRC clock source is clk_i2s1_asrc. + */ + rt5645_sel_asrc_clk_src(component, + RT5645_DA_STEREO_FILTER | + RT5645_DA_MONO_L_FILTER | + RT5645_DA_MONO_R_FILTER | + RT5645_AD_STEREO_FILTER | + RT5645_AD_MONO_L_FILTER | + RT5645_AD_MONO_R_FILTER, + RT5645_CLK_SEL_I2S1_ASRC); + + /* TDM 4 slots 24 bit, set Rx & Tx bitmask to 4 active slots */ + ret = snd_soc_dai_set_tdm_slot(codec_dai, 0xF, 0xF, 4, 24); + + if (ret < 0) { + dev_err(rtd->dev, "can't set codec TDM slot %d\n", ret); + return ret; + } + + /* Create and initialize headphone jack */ + if (snd_soc_card_jack_new(rtd->card, "Headphone Jack", + SND_JACK_HEADPHONE, &headphone_jack, + &headphone_jack_pin, 1)) { + dev_err(component->dev, "Can't create headphone jack\n"); + } + + /* Create and initialize mic jack */ + if (snd_soc_card_jack_new(rtd->card, "Mic Jack", SND_JACK_MICROPHONE, + &mic_jack, &mic_jack_pin, 1)) { + dev_err(component->dev, "Can't create mic jack\n"); + } + + rt5645_set_jack_detect(component, &headphone_jack, &mic_jack, NULL); + + bdw_rt5650->component = component; + + return 0; +} + +/* broadwell digital audio interface glue - connects codec <--> CPU */ +SND_SOC_DAILINK_DEF(dummy, + DAILINK_COMP_ARRAY(COMP_DUMMY())); + +SND_SOC_DAILINK_DEF(fe, + DAILINK_COMP_ARRAY(COMP_CPU("System Pin"))); + +SND_SOC_DAILINK_DEF(platform, + DAILINK_COMP_ARRAY(COMP_PLATFORM("haswell-pcm-audio"))); + +SND_SOC_DAILINK_DEF(be, + DAILINK_COMP_ARRAY(COMP_CODEC("i2c-10EC5650:00", "rt5645-aif1"))); + +static struct snd_soc_dai_link bdw_rt5650_dais[] = { + /* Front End DAI links */ + { + .name = "System PCM", + .stream_name = "System Playback", + .dynamic = 1, +#if !IS_ENABLED(CONFIG_SND_SOC_SOF_BROADWELL) + .init = bdw_rt5650_rtd_init, +#endif + .trigger = { + SND_SOC_DPCM_TRIGGER_POST, + SND_SOC_DPCM_TRIGGER_POST + }, + .dpcm_playback = 1, + .dpcm_capture = 1, + SND_SOC_DAILINK_REG(fe, dummy, platform), + }, + + /* Back End DAI links */ + { + /* SSP0 - Codec */ + .name = "Codec", + .id = 0, + .no_pcm = 1, + .dai_fmt = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBS_CFS, + .ignore_suspend = 1, + .ignore_pmdown_time = 1, + .be_hw_params_fixup = broadwell_ssp0_fixup, + .ops = &bdw_rt5650_ops, + .dpcm_playback = 1, + .dpcm_capture = 1, + .init = bdw_rt5650_init, + SND_SOC_DAILINK_REG(dummy, be, dummy), + }, +}; + +/* ASoC machine driver for Broadwell DSP + RT5650 */ +static struct snd_soc_card bdw_rt5650_card = { + .name = "bdw-rt5650", + .owner = THIS_MODULE, + .dai_link = bdw_rt5650_dais, + .num_links = ARRAY_SIZE(bdw_rt5650_dais), + .dapm_widgets = bdw_rt5650_widgets, + .num_dapm_widgets = ARRAY_SIZE(bdw_rt5650_widgets), + .dapm_routes = bdw_rt5650_map, + .num_dapm_routes = ARRAY_SIZE(bdw_rt5650_map), + .controls = bdw_rt5650_controls, + .num_controls = ARRAY_SIZE(bdw_rt5650_controls), + .fully_routed = true, +}; + +static int bdw_rt5650_probe(struct platform_device *pdev) +{ + struct bdw_rt5650_priv *bdw_rt5650; + struct snd_soc_acpi_mach *mach; + int ret; + + bdw_rt5650_card.dev = &pdev->dev; + + /* Allocate driver private struct */ + bdw_rt5650 = devm_kzalloc(&pdev->dev, sizeof(struct bdw_rt5650_priv), + GFP_KERNEL); + if (!bdw_rt5650) + return -ENOMEM; + + /* override plaform name, if required */ + mach = (&pdev->dev)->platform_data; + ret = snd_soc_fixup_dai_links_platform_name(&bdw_rt5650_card, + mach->mach_params.platform); + + if (ret) + return ret; + + snd_soc_card_set_drvdata(&bdw_rt5650_card, bdw_rt5650); + + return devm_snd_soc_register_card(&pdev->dev, &bdw_rt5650_card); +} + +static struct platform_driver bdw_rt5650_audio = { + .probe = bdw_rt5650_probe, + .driver = { + .name = "bdw-rt5650", + .owner = THIS_MODULE, + }, +}; + +module_platform_driver(bdw_rt5650_audio) + +/* Module information */ +MODULE_AUTHOR("Ben Zhang <benzh(a)chromium.org>"); +MODULE_DESCRIPTION("Intel Broadwell RT5650 machine driver"); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:bdw-rt5650"); diff --git a/sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c b/sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c index 34eb0baaa9517..35958553652ec 100644 --- a/sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c @@ -29,6 +29,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_broadwell_machines[] = { .sof_fw_filename = "sof-bdw.ri", .sof_tplg_filename = "sof-bdw-rt286.tplg", }, + { + .id = "10EC5650", + .drv_name = "bdw-rt5650", + .fw_filename = "intel/IntcSST2.bin", + .sof_fw_filename = "sof-bdw.ri", + .sof_tplg_filename = "sof-bdw-rt5650.tplg", + }, { .id = "RT5677CE", .drv_name = "bdw-rt5677", -- 2.24.0.393.g34dc348eaf-goog

5 6

[alsa-devel] [PATCH 0/2] ASoC: fixup topology dai_link remove issue
by Kuninori Morimoto 05 Dec '19

05 Dec '19

Hi Mark Cc Pierre-Louis, Takashi-san Currently, I'm focusing to ASoC cleanup / balance-up. But, it found more unbalance issue, and Intel noticed about it. These patches fix dai_link remove issue on topology. I want to get Acked-by or Reviewed-by from Takashi-san for 2) patch if possible. These are already tested by Intel CI, and all issues were solved. (https://github.com/thesofproject/linux/pull/1504) Extra Tested-by / Reviewed-by are very welcome from Intel Kuninori Morimoto (2): 1) ASoC: soc-component: tidyup snd_soc_pcm_component_new/free() parameter 2) ASoC: soc-pcm: remove soc_pcm_private_free() include/sound/soc-component.h | 4 ++-- sound/soc/soc-component.c | 8 +++----- sound/soc/soc-core.c | 19 +++++++++++-------- sound/soc/soc-pcm.c | 12 +----------- 4 files changed, 17 insertions(+), 26 deletions(-) -- 2.7.4

5 11

[alsa-devel] [PATCH v14 6/7] ASoC: amd: Added ACP3x system resume and runtime pm
by Ravulapati Vishnu vardhan rao 05 Dec '19

05 Dec '19

When system wide suspend happens, ACP will be powered off and when system resumes,for audio usecase to continue,all the runtime configuration data needs to be programmed again. Added resume pm call back to ACP pm ops and also added runtime PM operations for ACP3x PCM platform device. Device will enter into D3 state when there is no activity on audio I2S lines. Signed-off-by: Ravulapati Vishnu vardhan rao <Vishnuvardhanrao.Ravulapati(a)amd.com> --- sound/soc/amd/raven/acp3x-pcm-dma.c | 146 +----------------------------- sound/soc/amd/raven/acp3x.h | 7 ++ sound/soc/amd/raven/pci-acp3x.c | 173 ++++++++++++++++++++++++++++++++++-- 3 files changed, 178 insertions(+), 148 deletions(-) diff --git a/sound/soc/amd/raven/acp3x-pcm-dma.c b/sound/soc/amd/raven/acp3x-pcm-dma.c index 7a107ea..916f0d8 100644 --- a/sound/soc/amd/raven/acp3x-pcm-dma.c +++ b/sound/soc/amd/raven/acp3x-pcm-dma.c @@ -58,106 +58,6 @@ static const struct snd_pcm_hardware acp3x_pcm_hardware_capture = { .periods_max = CAPTURE_MAX_NUM_PERIODS, }; -static int acp3x_power_on(void __iomem *acp3x_base, bool on) -{ - u16 val, mask; - u32 timeout; - - if (on == true) { - val = 1; - mask = ACP3x_POWER_ON; - } else { - val = 0; - mask = ACP3x_POWER_OFF; - } - - rv_writel(val, acp3x_base + mmACP_PGFSM_CONTROL); - timeout = 0; - while (true) { - val = rv_readl(acp3x_base + mmACP_PGFSM_STATUS); - if ((val & ACP3x_POWER_OFF_IN_PROGRESS) == mask) - break; - if (timeout > 100) { - pr_err("ACP3x power state change failure\n"); - return -ENODEV; - } - timeout++; - cpu_relax(); - } - return 0; -} - -static int acp3x_reset(void __iomem *acp3x_base) -{ - u32 val, timeout; - - rv_writel(1, acp3x_base + mmACP_SOFT_RESET); - timeout = 0; - while (true) { - val = rv_readl(acp3x_base + mmACP_SOFT_RESET); - if ((val & ACP3x_SOFT_RESET__SoftResetAudDone_MASK) || - timeout > 100) { - if (val & ACP3x_SOFT_RESET__SoftResetAudDone_MASK) - break; - return -ENODEV; - } - timeout++; - cpu_relax(); - } - - rv_writel(0, acp3x_base + mmACP_SOFT_RESET); - timeout = 0; - while (true) { - val = rv_readl(acp3x_base + mmACP_SOFT_RESET); - if (!val || timeout > 100) { - if (!val) - break; - return -ENODEV; - } - timeout++; - cpu_relax(); - } - return 0; -} - -static int acp3x_init(void __iomem *acp3x_base) -{ - int ret; - - /* power on */ - ret = acp3x_power_on(acp3x_base, true); - if (ret) { - pr_err("ACP3x power on failed\n"); - return ret; - } - /* Reset */ - ret = acp3x_reset(acp3x_base); - if (ret) { - pr_err("ACP3x reset failed\n"); - return ret; - } - return 0; -} - -static int acp3x_deinit(void __iomem *acp3x_base) -{ - int ret; - - /* Reset */ - ret = acp3x_reset(acp3x_base); - if (ret) { - pr_err("ACP3x reset failed\n"); - return ret; - } - /* power off */ - ret = acp3x_power_on(acp3x_base, false); - if (ret) { - pr_err("ACP3x power off failed\n"); - return ret; - } - return 0; -} - static irqreturn_t i2s_irq_handler(int irq, void *dev_id) { struct i2s_dev_data *rv_i2s_data; @@ -502,7 +402,7 @@ static int acp3x_audio_probe(struct platform_device *pdev) struct resource *res; struct i2s_dev_data *adata; unsigned int irqflags; - int status, ret; + int status; if (!pdev->dev.platform_data) { dev_err(&pdev->dev, "platform_data not retrieved\n"); @@ -534,53 +434,28 @@ static int acp3x_audio_probe(struct platform_device *pdev) adata->i2s_irq = res->start; dev_set_drvdata(&pdev->dev, adata); - /* Initialize ACP */ - status = acp3x_init(adata->acp3x_base); - if (status) - return -ENODEV; - status = devm_snd_soc_register_component(&pdev->dev, &acp3x_i2s_component, NULL, 0); if (status) { dev_err(&pdev->dev, "Fail to register acp i2s component\n"); - ret = -ENODEV; - goto dev_err; + return -ENODEV; } status = devm_request_irq(&pdev->dev, adata->i2s_irq, i2s_irq_handler, irqflags, "ACP3x_I2S_IRQ", adata); if (status) { dev_err(&pdev->dev, "ACP3x I2S IRQ request failed\n"); - ret = -ENODEV; - goto dev_err; + return -ENODEV; } pm_runtime_set_autosuspend_delay(&pdev->dev, 5000); pm_runtime_use_autosuspend(&pdev->dev); pm_runtime_enable(&pdev->dev); return 0; - -dev_err: - status = acp3x_deinit(adata->acp3x_base); - if (status) - dev_err(&pdev->dev, "ACP de-init failed\n"); - else - dev_dbg(&pdev->dev, "ACP de-initialized\n"); - return ret; } static int acp3x_audio_remove(struct platform_device *pdev) { - struct i2s_dev_data *adata; - int ret; - - adata = dev_get_drvdata(&pdev->dev); - ret = acp3x_deinit(adata->acp3x_base); - if (ret) - dev_err(&pdev->dev, "ACP de-init failed\n"); - else - dev_dbg(&pdev->dev, "ACP de-initialized\n"); - pm_runtime_disable(&pdev->dev); return 0; } @@ -588,15 +463,11 @@ static int acp3x_audio_remove(struct platform_device *pdev) static int acp3x_resume(struct device *dev) { struct i2s_dev_data *adata; - int status; u32 val, reg_val, frmt_val; reg_val = 0; frmt_val = 0; adata = dev_get_drvdata(dev); - status = acp3x_init(adata->acp3x_base); - if (status) - return -ENODEV; if (adata->play_stream && adata->play_stream->runtime) { struct i2s_stream_instance *rtd = @@ -643,14 +514,8 @@ static int acp3x_resume(struct device *dev) static int acp3x_pcm_runtime_suspend(struct device *dev) { struct i2s_dev_data *adata; - int status; adata = dev_get_drvdata(dev); - status = acp3x_deinit(adata->acp3x_base); - if (status) - dev_err(dev, "ACP de-init failed\n"); - else - dev_dbg(dev, "ACP de-initialized\n"); rv_writel(0, adata->acp3x_base + mmACP_EXTERNAL_INTR_ENB); @@ -660,12 +525,9 @@ static int acp3x_pcm_runtime_suspend(struct device *dev) static int acp3x_pcm_runtime_resume(struct device *dev) { struct i2s_dev_data *adata; - int status; adata = dev_get_drvdata(dev); - status = acp3x_init(adata->acp3x_base); - if (status) - return -ENODEV; + rv_writel(1, adata->acp3x_base + mmACP_EXTERNAL_INTR_ENB); return 0; } diff --git a/sound/soc/amd/raven/acp3x.h b/sound/soc/amd/raven/acp3x.h index 3c28644..b64f8b0 100644 --- a/sound/soc/amd/raven/acp3x.h +++ b/sound/soc/amd/raven/acp3x.h @@ -68,6 +68,13 @@ #define SLOT_WIDTH_16 0x10 #define SLOT_WIDTH_24 0x18 #define SLOT_WIDTH_32 0x20 +#define ACP_PGFSM_CNTL_POWER_ON_MASK 0x01 +#define ACP_PGFSM_CNTL_POWER_OFF_MASK 0x00 +#define ACP_PGFSM_STATUS_MASK 0x03 +#define ACP_POWERED_ON 0x00 +#define ACP_POWER_ON_IN_PROGRESS 0x01 +#define ACP_POWERED_OFF 0x02 +#define ACP_POWER_OFF_IN_PROGRESS 0x03 struct acp3x_platform_info { u16 play_i2s_instance; diff --git a/sound/soc/amd/raven/pci-acp3x.c b/sound/soc/amd/raven/pci-acp3x.c index 94f5f21..934f975 100644 --- a/sound/soc/amd/raven/pci-acp3x.c +++ b/sound/soc/amd/raven/pci-acp3x.c @@ -9,6 +9,9 @@ #include <linux/io.h> #include <linux/platform_device.h> #include <linux/interrupt.h> +#include <linux/pm_runtime.h> +#include <linux/delay.h> +#include <sound/pcm.h> #include "acp3x.h" @@ -19,6 +22,109 @@ struct acp3x_dev_data { struct platform_device *pdev[ACP3x_DEVS]; }; +static int acp3x_power_on(void __iomem *acp3x_base) +{ + u32 val; + int timeout; + + val = rv_readl(acp3x_base + mmACP_PGFSM_STATUS); + + if (val == 0) + return val; + + if (!((val & ACP_PGFSM_STATUS_MASK) == + ACP_POWER_ON_IN_PROGRESS)) + rv_writel(ACP_PGFSM_CNTL_POWER_ON_MASK, + acp3x_base + mmACP_PGFSM_CONTROL); + timeout = 0; + while (++timeout < 500) { + val = rv_readl(acp3x_base + mmACP_PGFSM_STATUS); + if (!val) + return 0; + udelay(1); + } + return -ETIMEDOUT; +} + +static int acp3x_power_off(void __iomem *acp3x_base) +{ + u32 val; + int timeout; + + rv_writel(ACP_PGFSM_CNTL_POWER_OFF_MASK, + acp3x_base + mmACP_PGFSM_CONTROL); + timeout = 0; + while (++timeout < 500) { + val = rv_readl(acp3x_base + mmACP_PGFSM_STATUS); + if ((val & ACP_PGFSM_STATUS_MASK) == ACP_POWERED_OFF) + return 0; + udelay(1); + } + return -ETIMEDOUT; +} + +static int acp3x_reset(void __iomem *acp3x_base) +{ + u32 val; + int timeout; + + rv_writel(1, acp3x_base + mmACP_SOFT_RESET); + timeout = 0; + while (++timeout < 500) { + val = rv_readl(acp3x_base + mmACP_SOFT_RESET); + if (val & ACP3x_SOFT_RESET__SoftResetAudDone_MASK) + break; + cpu_relax(); + } + rv_writel(0, acp3x_base + mmACP_SOFT_RESET); + timeout = 0; + while (++timeout < 500) { + val = rv_readl(acp3x_base + mmACP_SOFT_RESET); + if (!val) + return 0; + cpu_relax(); + } + return -ETIMEDOUT; +} + +static int acp3x_init(void __iomem *acp3x_base) +{ + int ret; + + /* power on */ + ret = acp3x_power_on(acp3x_base); + if (ret) { + pr_err("ACP3x power on failed\n"); + return ret; + } + /* Reset */ + ret = acp3x_reset(acp3x_base); + if (ret) { + pr_err("ACP3x reset failed\n"); + return ret; + } + return 0; +} + +static int acp3x_deinit(void __iomem *acp3x_base) +{ + int ret; + + /* Reset */ + ret = acp3x_reset(acp3x_base); + if (ret) { + pr_err("ACP3x reset failed\n"); + return ret; + } + /* power off */ + ret = acp3x_power_off(acp3x_base); + if (ret) { + pr_err("ACP3x power off failed\n"); + return ret; + } + return 0; +} + static int snd_acp3x_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) { @@ -64,6 +170,9 @@ static int snd_acp3x_probe(struct pci_dev *pci, } pci_set_master(pci); pci_set_drvdata(pci, adata); + ret = acp3x_init(adata->acp3x_base); + if (ret) + goto disable_msi; val = rv_readl(adata->acp3x_base + mmACP_I2S_PIN_CONFIG); switch (val) { @@ -73,7 +182,7 @@ static int snd_acp3x_probe(struct pci_dev *pci, GFP_KERNEL); if (!adata->res) { ret = -ENOMEM; - goto disable_msi; + goto de_init; } adata->res[0].name = "acp3x_i2s_iomem"; @@ -118,7 +227,7 @@ static int snd_acp3x_probe(struct pci_dev *pci, pdevinfo[2].parent = &pci->dev; pdevinfo[2].num_res = 1; pdevinfo[2].res = &adata->res[2]; - for (i = 0; i < ACP3x_DEVS ; i++) { + for (i = 0; i < ACP3x_DEVS; i++) { adata->pdev[i] = platform_device_register_full(&pdevinfo[i]); if (IS_ERR(adata->pdev[i])) { @@ -134,12 +243,20 @@ static int snd_acp3x_probe(struct pci_dev *pci, ret = -ENODEV; goto disable_msi; } + pm_runtime_set_autosuspend_delay(&pci->dev, 5000); + pm_runtime_use_autosuspend(&pci->dev); + pm_runtime_set_active(&pci->dev); + pm_runtime_put_noidle(&pci->dev); + pm_runtime_enable(&pci->dev); return 0; unregister_devs: if (val == I2S_MODE) - for (i = 0 ; i < ACP3x_DEVS ; i++) + for (i = 0; i < ACP3x_DEVS; i++) platform_device_unregister(adata->pdev[i]); +de_init: + if (acp3x_deinit(adata->acp3x_base)) + dev_err(&pci->dev, "ACP de-init failed\n"); disable_msi: pci_disable_msi(pci); release_regions: @@ -150,15 +267,56 @@ static int snd_acp3x_probe(struct pci_dev *pci, return ret; } +static int snd_acp3x_suspend(struct device *dev) +{ + int ret; + struct acp3x_dev_data *adata; + + adata = dev_get_drvdata(dev); + ret = acp3x_deinit(adata->acp3x_base); + if (ret) + dev_err(dev, "ACP de-init failed\n"); + else + dev_dbg(dev, "ACP de-initialized\n"); + + return 0; +} + +static int snd_acp3x_resume(struct device *dev) +{ + int ret; + struct acp3x_dev_data *adata; + + adata = dev_get_drvdata(dev); + ret = acp3x_init(adata->acp3x_base); + if (ret) { + dev_err(dev, "ACP init failed\n"); + return ret; + } + return 0; +} + +static const struct dev_pm_ops acp3x_pm = { + .runtime_suspend = snd_acp3x_suspend, + .runtime_resume = snd_acp3x_resume, + .resume = snd_acp3x_resume, +}; + static void snd_acp3x_remove(struct pci_dev *pci) { - struct acp3x_dev_data *adata = pci_get_drvdata(pci); - int i; + struct acp3x_dev_data *adata; + int i, ret; + adata = pci_get_drvdata(pci); if (adata->acp3x_audio_mode == ACP3x_I2S_MODE) { - for (i = 0 ; i < ACP3x_DEVS ; i++) + for (i = 0; i < ACP3x_DEVS; i++) platform_device_unregister(adata->pdev[i]); } + ret = acp3x_deinit(adata->acp3x_base); + if (ret) + dev_err(&pci->dev, "ACP de-init failed\n"); + pm_runtime_disable(&pci->dev); + pm_runtime_get_noresume(&pci->dev); pci_disable_msi(pci); pci_release_regions(pci); pci_disable_device(pci); @@ -177,6 +335,9 @@ static struct pci_driver acp3x_driver = { .id_table = snd_acp3x_ids, .probe = snd_acp3x_probe, .remove = snd_acp3x_remove, + .driver = { + .pm = &acp3x_pm, + } }; module_pci_driver(acp3x_driver); -- 2.7.4

1 0

[alsa-devel] [PATCH v14 5/7] ASoC: amd: Handle ACP3x I2S-SP Interrupts.
by Ravulapati Vishnu vardhan rao 05 Dec '19

05 Dec '19

Enabled support for I2S-SP interrupt handling. Previous to this implementation, driver supports only interrupts on BT instance. Signed-off-by: Ravulapati Vishnu vardhan rao <Vishnuvardhanrao.Ravulapati(a)amd.com> --- sound/soc/amd/raven/acp3x-pcm-dma.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sound/soc/amd/raven/acp3x-pcm-dma.c b/sound/soc/amd/raven/acp3x-pcm-dma.c index 14ef38e..7a107ea 100644 --- a/sound/soc/amd/raven/acp3x-pcm-dma.c +++ b/sound/soc/amd/raven/acp3x-pcm-dma.c @@ -177,6 +177,13 @@ static irqreturn_t i2s_irq_handler(int irq, void *dev_id) snd_pcm_period_elapsed(rv_i2s_data->play_stream); play_flag = 1; } + if ((val & BIT(I2S_TX_THRESHOLD)) && + rv_i2s_data->i2ssp_play_stream) { + rv_writel(BIT(I2S_TX_THRESHOLD), + rv_i2s_data->acp3x_base + mmACP_EXTERNAL_INTR_STAT); + snd_pcm_period_elapsed(rv_i2s_data->i2ssp_play_stream); + play_flag = 1; + } if ((val & BIT(BT_RX_THRESHOLD)) && rv_i2s_data->capture_stream) { rv_writel(BIT(BT_RX_THRESHOLD), rv_i2s_data->acp3x_base + @@ -184,6 +191,13 @@ static irqreturn_t i2s_irq_handler(int irq, void *dev_id) snd_pcm_period_elapsed(rv_i2s_data->capture_stream); cap_flag = 1; } + if ((val & BIT(I2S_RX_THRESHOLD)) && + rv_i2s_data->i2ssp_capture_stream) { + rv_writel(BIT(I2S_RX_THRESHOLD), + rv_i2s_data->acp3x_base + mmACP_EXTERNAL_INTR_STAT); + snd_pcm_period_elapsed(rv_i2s_data->i2ssp_capture_stream); + cap_flag = 1; + } if (play_flag | cap_flag) return IRQ_HANDLED; -- 2.7.4

1 0

[alsa-devel] [PATCH v14 4/7] ASoC: amd: add ACP3x TDM mode support
by Ravulapati Vishnu vardhan rao 05 Dec '19

05 Dec '19

ACP3x I2S (CPU DAI) can act in normal I2S and TDM modes. Added support for TDM mode. Desired mode can be selected from ASoC machine driver. Signed-off-by: Ravulapati Vishnu vardhan rao <Vishnuvardhanrao.Ravulapati(a)amd.com> --- sound/soc/amd/raven/acp3x-i2s.c | 28 ++++++++++++++++++++++------ sound/soc/amd/raven/acp3x.h | 1 + 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/sound/soc/amd/raven/acp3x-i2s.c b/sound/soc/amd/raven/acp3x-i2s.c index 7f05782..0856e0c 100644 --- a/sound/soc/amd/raven/acp3x-i2s.c +++ b/sound/soc/amd/raven/acp3x-i2s.c @@ -43,7 +43,7 @@ static int acp3x_i2s_set_tdm_slot(struct snd_soc_dai *cpu_dai, u32 tx_mask, u32 rx_mask, int slots, int slot_width) { struct i2s_dev_data *adata; - u32 val, reg_val, frmt_val, frm_len; + u32 val, reg_val, frmt_reg, frm_len; u16 slot_len; adata = snd_soc_dai_get_drvdata(cpu_dai); @@ -70,15 +70,31 @@ static int acp3x_i2s_set_tdm_slot(struct snd_soc_dai *cpu_dai, frm_len = FRM_LEN | (slots << 15) | (slot_len << 18); if (adata->substream_type == SNDRV_PCM_STREAM_PLAYBACK) { - reg_val = mmACP_BTTDM_ITER; - frmt_val = mmACP_BTTDM_TXFRMT; + switch (adata->i2s_instance) { + case I2S_BT_INSTANCE: + reg_val = mmACP_BTTDM_ITER; + frmt_reg = mmACP_BTTDM_TXFRMT; + break; + case I2S_SP_INSTANCE: + default: + reg_val = mmACP_I2STDM_ITER; + frmt_reg = mmACP_I2STDM_TXFRMT; + } } else { - reg_val = mmACP_BTTDM_IRER; - frmt_val = mmACP_BTTDM_RXFRMT; + switch (adata->i2s_instance) { + case I2S_BT_INSTANCE: + reg_val = mmACP_BTTDM_IRER; + frmt_reg = mmACP_BTTDM_RXFRMT; + break; + case I2S_SP_INSTANCE: + default: + reg_val = mmACP_I2STDM_IRER; + frmt_reg = mmACP_I2STDM_RXFRMT; + } } val = rv_readl(adata->acp3x_base + reg_val); rv_writel(val | 0x2, adata->acp3x_base + reg_val); - rv_writel(frm_len, adata->acp3x_base + frmt_val); + rv_writel(frm_len, adata->acp3x_base + frmt_reg); adata->tdm_fmt = frm_len; return 0; } diff --git a/sound/soc/amd/raven/acp3x.h b/sound/soc/amd/raven/acp3x.h index ed1acbc..3c28644 100644 --- a/sound/soc/amd/raven/acp3x.h +++ b/sound/soc/amd/raven/acp3x.h @@ -78,6 +78,7 @@ struct acp3x_platform_info { struct i2s_dev_data { bool tdm_mode; unsigned int i2s_irq; + u16 i2s_instance; u32 tdm_fmt; u32 substream_type; void __iomem *acp3x_base; -- 2.7.4

1 0

[alsa-devel] [PATCH v14 3/7] ASoC: amd: Enabling I2S instance in DMA and DAI
by Ravulapati Vishnu vardhan rao 05 Dec '19

05 Dec '19

This patch adds I2S SP support in ACP PCM DMA and DAI. Added I2S support in DMA and DAI probe,its hw_params handling its open and close functionalities. This enables to open and close on the SP instance for playback and capture. Signed-off-by: Ravulapati Vishnu vardhan rao <Vishnuvardhanrao.Ravulapati(a)amd.com> --- sound/soc/amd/raven/acp3x-i2s.c | 123 ++++++++++++++++---- sound/soc/amd/raven/acp3x-pcm-dma.c | 217 +++++++++++++++++++++++++----------- sound/soc/amd/raven/acp3x.h | 77 ++++++++++--- 3 files changed, 312 insertions(+), 105 deletions(-) diff --git a/sound/soc/amd/raven/acp3x-i2s.c b/sound/soc/amd/raven/acp3x-i2s.c index cdc1c61..7f05782 100644 --- a/sound/soc/amd/raven/acp3x-i2s.c +++ b/sound/soc/amd/raven/acp3x-i2s.c @@ -28,10 +28,10 @@ static int acp3x_i2s_set_fmt(struct snd_soc_dai *cpu_dai, mode = fmt & SND_SOC_DAIFMT_FORMAT_MASK; switch (mode) { case SND_SOC_DAIFMT_I2S: - adata->tdm_mode = false; + adata->tdm_mode = TDM_DISABLE; break; case SND_SOC_DAIFMT_DSP_A: - adata->tdm_mode = true; + adata->tdm_mode = TDM_ENABLE; break; default: return -EINVAL; @@ -87,10 +87,22 @@ static int acp3x_i2s_hwparams(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) { struct i2s_stream_instance *rtd; + struct snd_soc_pcm_runtime *prtd; + struct snd_soc_card *card; + struct acp3x_platform_info *pinfo; u32 val; u32 reg_val; + prtd = substream->private_data; rtd = substream->runtime->private_data; + card = prtd->card; + pinfo = snd_soc_card_get_drvdata(card); + if (pinfo) { + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + rtd->i2s_instance = pinfo->play_i2s_instance; + else + rtd->i2s_instance = pinfo->cap_i2s_instance; + } /* These values are as per Hardware Spec */ switch (params_format(params)) { @@ -110,11 +122,25 @@ static int acp3x_i2s_hwparams(struct snd_pcm_substream *substream, default: return -EINVAL; } - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) - reg_val = mmACP_BTTDM_ITER; - else - reg_val = mmACP_BTTDM_IRER; - + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + reg_val = mmACP_BTTDM_ITER; + break; + case I2S_SP_INSTANCE: + default: + reg_val = mmACP_I2STDM_ITER; + } + } else { + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + reg_val = mmACP_BTTDM_IRER; + break; + case I2S_SP_INSTANCE: + default: + reg_val = mmACP_I2STDM_IRER; + } + } val = rv_readl(rtd->acp3x_base + reg_val); val = val | (rtd->xfer_resolution << 3); rv_writel(val, rtd->acp3x_base + reg_val); @@ -125,10 +151,21 @@ static int acp3x_i2s_trigger(struct snd_pcm_substream *substream, int cmd, struct snd_soc_dai *dai) { struct i2s_stream_instance *rtd; - u32 val, period_bytes; - int ret, reg_val; + struct snd_soc_pcm_runtime *prtd; + struct snd_soc_card *card; + struct acp3x_platform_info *pinfo; + u32 ret, val, period_bytes, reg_val, ier_val, water_val; + prtd = substream->private_data; rtd = substream->runtime->private_data; + card = prtd->card; + pinfo = snd_soc_card_get_drvdata(card); + if (pinfo) { + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + rtd->i2s_instance = pinfo->play_i2s_instance; + else + rtd->i2s_instance = pinfo->cap_i2s_instance; + } period_bytes = frames_to_bytes(substream->runtime, substream->runtime->period_size); switch (cmd) { @@ -138,31 +175,75 @@ static int acp3x_i2s_trigger(struct snd_pcm_substream *substream, rtd->bytescount = acp_get_byte_count(rtd, substream->stream); if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { - reg_val = mmACP_BTTDM_ITER; - rv_writel(period_bytes, rtd->acp3x_base + - mmACP_BT_TX_INTR_WATERMARK_SIZE); + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + water_val = + mmACP_BT_TX_INTR_WATERMARK_SIZE; + reg_val = mmACP_BTTDM_ITER; + ier_val = mmACP_BTTDM_IER; + break; + case I2S_SP_INSTANCE: + default: + water_val = + mmACP_I2S_TX_INTR_WATERMARK_SIZE; + reg_val = mmACP_I2STDM_ITER; + ier_val = mmACP_I2STDM_IER; + } } else { - reg_val = mmACP_BTTDM_IRER; - rv_writel(period_bytes, rtd->acp3x_base + - mmACP_BT_RX_INTR_WATERMARK_SIZE); + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + water_val = + mmACP_BT_RX_INTR_WATERMARK_SIZE; + reg_val = mmACP_BTTDM_IRER; + ier_val = mmACP_BTTDM_IER; + break; + case I2S_SP_INSTANCE: + default: + water_val = + mmACP_I2S_RX_INTR_WATERMARK_SIZE; + reg_val = mmACP_I2STDM_IRER; + ier_val = mmACP_I2STDM_IER; + } } + rv_writel(period_bytes, rtd->acp3x_base + water_val); val = rv_readl(rtd->acp3x_base + reg_val); val = val | BIT(0); rv_writel(val, rtd->acp3x_base + reg_val); - rv_writel(1, rtd->acp3x_base + mmACP_BTTDM_IER); + rv_writel(1, rtd->acp3x_base + ier_val); + ret = 0; break; case SNDRV_PCM_TRIGGER_STOP: case SNDRV_PCM_TRIGGER_SUSPEND: case SNDRV_PCM_TRIGGER_PAUSE_PUSH: - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) - reg_val = mmACP_BTTDM_ITER; - else - reg_val = mmACP_BTTDM_IRER; + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + reg_val = mmACP_BTTDM_ITER; + ier_val = mmACP_BTTDM_IER; + break; + case I2S_SP_INSTANCE: + default: + reg_val = mmACP_I2STDM_ITER; + ier_val = mmACP_I2STDM_IER; + } + } else { + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + reg_val = mmACP_BTTDM_IRER; + ier_val = mmACP_BTTDM_IER; + break; + case I2S_SP_INSTANCE: + default: + reg_val = mmACP_I2STDM_IRER; + ier_val = mmACP_I2STDM_IER; + } + } val = rv_readl(rtd->acp3x_base + reg_val); val = val & ~BIT(0); rv_writel(val, rtd->acp3x_base + reg_val); - rv_writel(0, rtd->acp3x_base + mmACP_BTTDM_IER); + rv_writel(0, rtd->acp3x_base + ier_val); + ret = 0; break; default: ret = -EINVAL; diff --git a/sound/soc/amd/raven/acp3x-pcm-dma.c b/sound/soc/amd/raven/acp3x-pcm-dma.c index 3150516..14ef38e 100644 --- a/sound/soc/amd/raven/acp3x-pcm-dma.c +++ b/sound/soc/amd/raven/acp3x-pcm-dma.c @@ -194,15 +194,31 @@ static irqreturn_t i2s_irq_handler(int irq, void *dev_id) static void config_acp3x_dma(struct i2s_stream_instance *rtd, int direction) { u16 page_idx; - u32 low, high, val, acp_fifo_addr; - dma_addr_t addr = rtd->dma_addr; + u32 low, high, val, acp_fifo_addr, reg_fifo_addr; + u32 reg_ringbuf_size, reg_dma_size, reg_fifo_size; + dma_addr_t addr; - /* 8 scratch registers used to map one 64 bit address */ - if (direction == SNDRV_PCM_STREAM_PLAYBACK) - val = 0; - else - val = rtd->num_pages * 8; + addr = rtd->dma_addr; + if (direction == SNDRV_PCM_STREAM_PLAYBACK) { + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + val = ACP_SRAM_BT_PB_PTE_OFFSET; + break; + case I2S_SP_INSTANCE: + default: + val = ACP_SRAM_SP_PB_PTE_OFFSET; + } + } else { + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + val = ACP_SRAM_BT_CP_PTE_OFFSET; + break; + case I2S_SP_INSTANCE: + default: + val = ACP_SRAM_SP_CP_PTE_OFFSET; + } + } /* Group Enable */ rv_writel(ACP_SRAM_PTE_OFFSET | BIT(31), rtd->acp3x_base + mmACPAXI2AXI_ATU_BASE_ADDR_GRP_1); @@ -224,38 +240,61 @@ static void config_acp3x_dma(struct i2s_stream_instance *rtd, int direction) } if (direction == SNDRV_PCM_STREAM_PLAYBACK) { - /* Config ringbuffer */ - rv_writel(MEM_WINDOW_START, rtd->acp3x_base + - mmACP_BT_TX_RINGBUFADDR); - rv_writel(MAX_BUFFER, rtd->acp3x_base + - mmACP_BT_TX_RINGBUFSIZE); - rv_writel(DMA_SIZE, rtd->acp3x_base + mmACP_BT_TX_DMA_SIZE); - - /* Config audio fifo */ - acp_fifo_addr = ACP_SRAM_PTE_OFFSET + (rtd->num_pages * 8) - + PLAYBACK_FIFO_ADDR_OFFSET; - rv_writel(acp_fifo_addr, rtd->acp3x_base + - mmACP_BT_TX_FIFOADDR); - rv_writel(FIFO_SIZE, rtd->acp3x_base + mmACP_BT_TX_FIFOSIZE); + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + reg_ringbuf_size = mmACP_BT_TX_RINGBUFSIZE; + reg_dma_size = mmACP_BT_TX_DMA_SIZE; + acp_fifo_addr = ACP_SRAM_PTE_OFFSET + + BT_PB_FIFO_ADDR_OFFSET; + reg_fifo_addr = mmACP_BT_TX_FIFOADDR; + reg_fifo_size = mmACP_BT_TX_FIFOSIZE; + rv_writel(I2S_BT_TX_MEM_WINDOW_START, + rtd->acp3x_base + mmACP_BT_TX_RINGBUFADDR); + break; + + case I2S_SP_INSTANCE: + default: + reg_ringbuf_size = mmACP_I2S_TX_RINGBUFSIZE; + reg_dma_size = mmACP_I2S_TX_DMA_SIZE; + acp_fifo_addr = ACP_SRAM_PTE_OFFSET + + SP_PB_FIFO_ADDR_OFFSET; + reg_fifo_addr = mmACP_I2S_TX_FIFOADDR; + reg_fifo_size = mmACP_I2S_TX_FIFOSIZE; + rv_writel(I2S_SP_TX_MEM_WINDOW_START, + rtd->acp3x_base + mmACP_I2S_TX_RINGBUFADDR); + } } else { - /* Config ringbuffer */ - rv_writel(MEM_WINDOW_START + MAX_BUFFER, rtd->acp3x_base + - mmACP_BT_RX_RINGBUFADDR); - rv_writel(MAX_BUFFER, rtd->acp3x_base + - mmACP_BT_RX_RINGBUFSIZE); - rv_writel(DMA_SIZE, rtd->acp3x_base + mmACP_BT_RX_DMA_SIZE); - - /* Config audio fifo */ - acp_fifo_addr = ACP_SRAM_PTE_OFFSET + - (rtd->num_pages * 8) + CAPTURE_FIFO_ADDR_OFFSET; - rv_writel(acp_fifo_addr, rtd->acp3x_base + - mmACP_BT_RX_FIFOADDR); - rv_writel(FIFO_SIZE, rtd->acp3x_base + mmACP_BT_RX_FIFOSIZE); - } + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + reg_ringbuf_size = mmACP_BT_RX_RINGBUFSIZE; + reg_dma_size = mmACP_BT_RX_DMA_SIZE; + acp_fifo_addr = ACP_SRAM_PTE_OFFSET + + BT_CAPT_FIFO_ADDR_OFFSET; + reg_fifo_addr = mmACP_BT_RX_FIFOADDR; + reg_fifo_size = mmACP_BT_RX_FIFOSIZE; + rv_writel(I2S_BT_RX_MEM_WINDOW_START, + rtd->acp3x_base + mmACP_BT_RX_RINGBUFADDR); + break; - /* Enable watermark/period interrupt to host */ - rv_writel(BIT(BT_TX_THRESHOLD) | BIT(BT_RX_THRESHOLD), - rtd->acp3x_base + mmACP_EXTERNAL_INTR_CNTL); + case I2S_SP_INSTANCE: + default: + reg_ringbuf_size = mmACP_I2S_RX_RINGBUFSIZE; + reg_dma_size = mmACP_I2S_RX_DMA_SIZE; + acp_fifo_addr = ACP_SRAM_PTE_OFFSET + + SP_CAPT_FIFO_ADDR_OFFSET; + reg_fifo_addr = mmACP_I2S_RX_FIFOADDR; + reg_fifo_size = mmACP_I2S_RX_FIFOSIZE; + rv_writel(I2S_SP_RX_MEM_WINDOW_START, + rtd->acp3x_base + mmACP_I2S_RX_RINGBUFADDR); + } + } + rv_writel(MAX_BUFFER, rtd->acp3x_base + reg_ringbuf_size); + rv_writel(DMA_SIZE, rtd->acp3x_base + reg_dma_size); + rv_writel(acp_fifo_addr, rtd->acp3x_base + reg_fifo_addr); + rv_writel(FIFO_SIZE, rtd->acp3x_base + reg_fifo_size); + rv_writel(BIT(I2S_RX_THRESHOLD) | BIT(BT_RX_THRESHOLD) + | BIT(I2S_TX_THRESHOLD) | BIT(BT_TX_THRESHOLD), + rtd->acp3x_base + mmACP_EXTERNAL_INTR_CNTL); } static int acp3x_dma_open(struct snd_soc_component *component, @@ -288,17 +327,21 @@ static int acp3x_dma_open(struct snd_soc_component *component, return ret; } - if (!adata->play_stream && !adata->capture_stream) + if (!adata->play_stream && !adata->capture_stream && + adata->i2ssp_play_stream && !adata->i2ssp_capture_stream) rv_writel(1, adata->acp3x_base + mmACP_EXTERNAL_INTR_ENB); - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { adata->play_stream = substream; - else + adata->i2ssp_play_stream = substream; + } else { adata->capture_stream = substream; + adata->i2ssp_capture_stream = substream; + } i2s_data->acp3x_base = adata->acp3x_base; runtime->private_data = i2s_data; - return 0; + return ret; } @@ -306,16 +349,28 @@ static int acp3x_dma_hw_params(struct snd_soc_component *component, struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_pcm_runtime *runtime; struct i2s_stream_instance *rtd; + struct snd_soc_pcm_runtime *prtd; + struct snd_soc_card *card; + struct acp3x_platform_info *pinfo; int status; u64 size; - runtime = substream->runtime; - rtd = substream->private_data; + prtd = substream->private_data; + card = prtd->card; + pinfo = snd_soc_card_get_drvdata(card); + rtd = substream->runtime->private_data; if (!rtd) return -EINVAL; + if (pinfo) + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + rtd->i2s_instance = pinfo->play_i2s_instance; + else + rtd->i2s_instance = pinfo->cap_i2s_instance; + else + pr_err("pinfo failed\n"); + size = params_buffer_bytes(params); status = snd_pcm_lib_malloc_pages(substream, size); if (status < 0) @@ -336,12 +391,25 @@ static int acp3x_dma_hw_params(struct snd_soc_component *component, static snd_pcm_uframes_t acp3x_dma_pointer(struct snd_soc_component *component, struct snd_pcm_substream *substream) { + struct snd_soc_pcm_runtime *prtd; + struct snd_soc_card *card; + struct acp3x_platform_info *pinfo; struct i2s_stream_instance *rtd; u32 pos; u32 buffersize; u64 bytescount; + prtd = substream->private_data; + card = prtd->card; rtd = substream->runtime->private_data; + pinfo = snd_soc_card_get_drvdata(card); + if (pinfo) { + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + rtd->i2s_instance = pinfo->play_i2s_instance; + else + rtd->i2s_instance = pinfo->cap_i2s_instance; + } + buffersize = frames_to_bytes(substream->runtime, substream->runtime->buffer_size); bytescount = acp_get_byte_count(rtd, substream->stream); @@ -386,15 +454,19 @@ static int acp3x_dma_close(struct snd_soc_component *component, component = snd_soc_rtdcom_lookup(prtd, DRV_NAME); adata = dev_get_drvdata(component->dev); - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { adata->play_stream = NULL; - else + adata->i2ssp_play_stream = NULL; + } else { adata->capture_stream = NULL; + adata->i2ssp_capture_stream = NULL; + } /* Disable ACP irq, when the current stream is being closed and * another stream is also not active. */ - if (!adata->play_stream && !adata->capture_stream) + if (!adata->play_stream && !adata->capture_stream && + !adata->i2ssp_play_stream && !adata->i2ssp_capture_stream) rv_writel(0, adata->acp3x_base + mmACP_EXTERNAL_INTR_ENB); return 0; } @@ -503,8 +575,10 @@ static int acp3x_resume(struct device *dev) { struct i2s_dev_data *adata; int status; - u32 val; + u32 val, reg_val, frmt_val; + reg_val = 0; + frmt_val = 0; adata = dev_get_drvdata(dev); status = acp3x_init(adata->acp3x_base); if (status) @@ -514,32 +588,39 @@ static int acp3x_resume(struct device *dev) struct i2s_stream_instance *rtd = adata->play_stream->runtime->private_data; config_acp3x_dma(rtd, SNDRV_PCM_STREAM_PLAYBACK); - rv_writel((rtd->xfer_resolution << 3), - rtd->acp3x_base + mmACP_BTTDM_ITER); - if (adata->tdm_mode == true) { - rv_writel(adata->tdm_fmt, adata->acp3x_base + - mmACP_BTTDM_TXFRMT); - val = rv_readl(adata->acp3x_base + mmACP_BTTDM_ITER); - rv_writel((val | 0x2), adata->acp3x_base + - mmACP_BTTDM_ITER); + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + reg_val = mmACP_BTTDM_ITER; + frmt_val = mmACP_BTTDM_TXFRMT; + break; + case I2S_SP_INSTANCE: + default: + reg_val = mmACP_I2STDM_ITER; + frmt_val = mmACP_I2STDM_TXFRMT; } + rv_writel((rtd->xfer_resolution << 3), rtd->acp3x_base + reg_val); } - if (adata->capture_stream && adata->capture_stream->runtime) { struct i2s_stream_instance *rtd = adata->capture_stream->runtime->private_data; config_acp3x_dma(rtd, SNDRV_PCM_STREAM_CAPTURE); - rv_writel((rtd->xfer_resolution << 3), - rtd->acp3x_base + mmACP_BTTDM_IRER); - if (adata->tdm_mode == true) { - rv_writel(adata->tdm_fmt, adata->acp3x_base + - mmACP_BTTDM_RXFRMT); - val = rv_readl(adata->acp3x_base + mmACP_BTTDM_IRER); - rv_writel((val | 0x2), adata->acp3x_base + - mmACP_BTTDM_IRER); + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + reg_val = mmACP_BTTDM_IRER; + frmt_val = mmACP_BTTDM_RXFRMT; + break; + case I2S_SP_INSTANCE: + default: + reg_val = mmACP_I2STDM_IRER; + frmt_val = mmACP_I2STDM_RXFRMT; } + rv_writel((rtd->xfer_resolution << 3), rtd->acp3x_base + reg_val); + } + if (adata->tdm_mode == TDM_ENABLE) { + rv_writel(adata->tdm_fmt, adata->acp3x_base + frmt_val); + val = rv_readl(adata->acp3x_base + reg_val); + rv_writel(val | 0x2, adata->acp3x_base + reg_val); } - rv_writel(1, adata->acp3x_base + mmACP_EXTERNAL_INTR_ENB); return 0; } @@ -549,8 +630,8 @@ static int acp3x_pcm_runtime_suspend(struct device *dev) { struct i2s_dev_data *adata; int status; - adata = dev_get_drvdata(dev); + adata = dev_get_drvdata(dev); status = acp3x_deinit(adata->acp3x_base); if (status) dev_err(dev, "ACP de-init failed\n"); @@ -566,8 +647,8 @@ static int acp3x_pcm_runtime_resume(struct device *dev) { struct i2s_dev_data *adata; int status; - adata = dev_get_drvdata(dev); + adata = dev_get_drvdata(dev); status = acp3x_init(adata->acp3x_base); if (status) return -ENODEV; diff --git a/sound/soc/amd/raven/acp3x.h b/sound/soc/amd/raven/acp3x.h index a6c6d63..ed1acbc 100644 --- a/sound/soc/amd/raven/acp3x.h +++ b/sound/soc/amd/raven/acp3x.h @@ -7,6 +7,12 @@ #include "chip_offset_byte.h" +#define I2S_SP_INSTANCE 0x01 +#define I2S_BT_INSTANCE 0x02 + +#define TDM_ENABLE 1 +#define TDM_DISABLE 0 + #define ACP3x_DEVS 3 #define ACP3x_PHY_BASE_ADDRESS 0x1240000 #define ACP3x_I2S_MODE 0 @@ -17,8 +23,11 @@ #define ACP3x_BT_TDM_REG_START 0x1242800 #define ACP3x_BT_TDM_REG_END 0x1242810 #define I2S_MODE 0x04 +#define I2S_RX_THRESHOLD 27 +#define I2S_TX_THRESHOLD 28 #define BT_TX_THRESHOLD 26 #define BT_RX_THRESHOLD 25 +#define ACP_ERR_INTR_MASK 29 #define ACP3x_POWER_ON 0x00 #define ACP3x_POWER_ON_IN_PROGRESS 0x01 #define ACP3x_POWER_OFF 0x02 @@ -26,19 +35,28 @@ #define ACP3x_SOFT_RESET__SoftResetAudDone_MASK 0x00010001 #define ACP_SRAM_PTE_OFFSET 0x02050000 +#define ACP_SRAM_SP_PB_PTE_OFFSET 0x0 +#define ACP_SRAM_SP_CP_PTE_OFFSET 0x100 +#define ACP_SRAM_BT_PB_PTE_OFFSET 0x200 +#define ACP_SRAM_BT_CP_PTE_OFFSET 0x300 #define PAGE_SIZE_4K_ENABLE 0x2 -#define MEM_WINDOW_START 0x4000000 -#define PLAYBACK_FIFO_ADDR_OFFSET 0x400 -#define CAPTURE_FIFO_ADDR_OFFSET 0x500 +#define I2S_SP_TX_MEM_WINDOW_START 0x4000000 +#define I2S_SP_RX_MEM_WINDOW_START 0x4020000 +#define I2S_BT_TX_MEM_WINDOW_START 0x4040000 +#define I2S_BT_RX_MEM_WINDOW_START 0x4060000 +#define SP_PB_FIFO_ADDR_OFFSET 0x500 +#define SP_CAPT_FIFO_ADDR_OFFSET 0x700 +#define BT_PB_FIFO_ADDR_OFFSET 0x900 +#define BT_CAPT_FIFO_ADDR_OFFSET 0xB00 #define PLAYBACK_MIN_NUM_PERIODS 2 #define PLAYBACK_MAX_NUM_PERIODS 8 -#define PLAYBACK_MAX_PERIOD_SIZE 16384 -#define PLAYBACK_MIN_PERIOD_SIZE 4096 +#define PLAYBACK_MAX_PERIOD_SIZE 8192 +#define PLAYBACK_MIN_PERIOD_SIZE 1024 #define CAPTURE_MIN_NUM_PERIODS 2 #define CAPTURE_MAX_NUM_PERIODS 8 -#define CAPTURE_MAX_PERIOD_SIZE 16384 -#define CAPTURE_MIN_PERIOD_SIZE 4096 +#define CAPTURE_MAX_PERIOD_SIZE 8192 +#define CAPTURE_MIN_PERIOD_SIZE 1024 #define MAX_BUFFER (PLAYBACK_MAX_PERIOD_SIZE * PLAYBACK_MAX_NUM_PERIODS) #define MIN_BUFFER MAX_BUFFER @@ -65,14 +83,20 @@ struct i2s_dev_data { void __iomem *acp3x_base; struct snd_pcm_substream *play_stream; struct snd_pcm_substream *capture_stream; + struct snd_pcm_substream *i2ssp_play_stream; + struct snd_pcm_substream *i2ssp_capture_stream; }; struct i2s_stream_instance { u16 num_pages; + u16 i2s_instance; + u16 capture_channel; + u16 direction; u16 channels; u32 xfer_resolution; - u64 bytescount; + u32 val; dma_addr_t dma_addr; + u64 bytescount; void __iomem *acp3x_base; }; @@ -92,15 +116,36 @@ static inline u64 acp_get_byte_count(struct i2s_stream_instance *rtd, u64 byte_count; if (direction == SNDRV_PCM_STREAM_PLAYBACK) { - byte_count = rv_readl(rtd->acp3x_base + - mmACP_BT_TX_LINEARPOSITIONCNTR_HIGH); - byte_count |= rv_readl(rtd->acp3x_base + - mmACP_BT_TX_LINEARPOSITIONCNTR_LOW); + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + byte_count = rv_readl(rtd->acp3x_base + + mmACP_BT_TX_LINEARPOSITIONCNTR_HIGH); + byte_count |= rv_readl(rtd->acp3x_base + + mmACP_BT_TX_LINEARPOSITIONCNTR_LOW); + break; + case I2S_SP_INSTANCE: + default: + byte_count = rv_readl(rtd->acp3x_base + + mmACP_I2S_TX_LINEARPOSITIONCNTR_HIGH); + byte_count |= rv_readl(rtd->acp3x_base + + mmACP_I2S_TX_LINEARPOSITIONCNTR_LOW); + } + } else { - byte_count = rv_readl(rtd->acp3x_base + - mmACP_BT_RX_LINEARPOSITIONCNTR_HIGH); - byte_count |= rv_readl(rtd->acp3x_base + - mmACP_BT_RX_LINEARPOSITIONCNTR_LOW); + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + byte_count = rv_readl(rtd->acp3x_base + + mmACP_BT_RX_LINEARPOSITIONCNTR_HIGH); + byte_count |= rv_readl(rtd->acp3x_base + + mmACP_BT_RX_LINEARPOSITIONCNTR_LOW); + break; + case I2S_SP_INSTANCE: + default: + byte_count = rv_readl(rtd->acp3x_base + + mmACP_I2S_RX_LINEARPOSITIONCNTR_HIGH); + byte_count |= rv_readl(rtd->acp3x_base + + mmACP_I2S_RX_LINEARPOSITIONCNTR_LOW); + } } return byte_count; } -- 2.7.4

1 0

[alsa-devel] [PATCH v14 1/7] ASoC: amd:Create multiple I2S platform device endpoint
by Ravulapati Vishnu vardhan rao 05 Dec '19

05 Dec '19

Creates Platform Device endpoints for multiple I2S instances: SP and BT endpoints device. Pass PCI resources like MMIO, irq to the platform devices. Signed-off-by: Ravulapati Vishnu vardhan rao <Vishnuvardhanrao.Ravulapati(a)amd.com> Reviewed-by: Dan Carpenter <dan.carpenter(a)oracle.com> --- sound/soc/amd/raven/acp3x.h | 5 +++ sound/soc/amd/raven/pci-acp3x.c | 95 +++++++++++++++++++++++++++-------------- 2 files changed, 68 insertions(+), 32 deletions(-) diff --git a/sound/soc/amd/raven/acp3x.h b/sound/soc/amd/raven/acp3x.h index 4f2cadd..2f15fe1 100644 --- a/sound/soc/amd/raven/acp3x.h +++ b/sound/soc/amd/raven/acp3x.h @@ -7,10 +7,15 @@ #include "chip_offset_byte.h" +#define ACP3x_DEVS 3 #define ACP3x_PHY_BASE_ADDRESS 0x1240000 #define ACP3x_I2S_MODE 0 #define ACP3x_REG_START 0x1240000 #define ACP3x_REG_END 0x1250200 +#define ACP3x_I2STDM_REG_START 0x1242400 +#define ACP3x_I2STDM_REG_END 0x1242410 +#define ACP3x_BT_TDM_REG_START 0x1242800 +#define ACP3x_BT_TDM_REG_END 0x1242810 #define I2S_MODE 0x04 #define BT_TX_THRESHOLD 26 #define BT_RX_THRESHOLD 25 diff --git a/sound/soc/amd/raven/pci-acp3x.c b/sound/soc/amd/raven/pci-acp3x.c index facec24..94f5f21 100644 --- a/sound/soc/amd/raven/pci-acp3x.c +++ b/sound/soc/amd/raven/pci-acp3x.c @@ -16,17 +16,17 @@ struct acp3x_dev_data { void __iomem *acp3x_base; bool acp3x_audio_mode; struct resource *res; - struct platform_device *pdev; + struct platform_device *pdev[ACP3x_DEVS]; }; static int snd_acp3x_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) { - int ret; - u32 addr, val; struct acp3x_dev_data *adata; - struct platform_device_info pdevinfo; + struct platform_device_info pdevinfo[ACP3x_DEVS]; unsigned int irqflags; + int ret, i; + u32 addr, val; if (pci_enable_device(pci)) { dev_err(&pci->dev, "pci_enable_device failed\n"); @@ -56,10 +56,11 @@ static int snd_acp3x_probe(struct pci_dev *pci, irqflags = 0; addr = pci_resource_start(pci, 0); - adata->acp3x_base = ioremap(addr, pci_resource_len(pci, 0)); + adata->acp3x_base = devm_ioremap(&pci->dev, addr, + pci_resource_len(pci, 0)); if (!adata->acp3x_base) { ret = -ENOMEM; - goto release_regions; + goto disable_msi; } pci_set_master(pci); pci_set_drvdata(pci, adata); @@ -68,11 +69,11 @@ static int snd_acp3x_probe(struct pci_dev *pci, switch (val) { case I2S_MODE: adata->res = devm_kzalloc(&pci->dev, - sizeof(struct resource) * 2, + sizeof(struct resource) * 4, GFP_KERNEL); if (!adata->res) { ret = -ENOMEM; - goto unmap_mmio; + goto disable_msi; } adata->res[0].name = "acp3x_i2s_iomem"; @@ -80,40 +81,67 @@ static int snd_acp3x_probe(struct pci_dev *pci, adata->res[0].start = addr; adata->res[0].end = addr + (ACP3x_REG_END - ACP3x_REG_START); - adata->res[1].name = "acp3x_i2s_irq"; - adata->res[1].flags = IORESOURCE_IRQ; - adata->res[1].start = pci->irq; - adata->res[1].end = pci->irq; + adata->res[1].name = "acp3x_i2s_sp"; + adata->res[1].flags = IORESOURCE_MEM; + adata->res[1].start = addr + ACP3x_I2STDM_REG_START; + adata->res[1].end = addr + ACP3x_I2STDM_REG_END; + + adata->res[2].name = "acp3x_i2s_bt"; + adata->res[2].flags = IORESOURCE_MEM; + adata->res[2].start = addr + ACP3x_BT_TDM_REG_START; + adata->res[2].end = addr + ACP3x_BT_TDM_REG_END; + + adata->res[3].name = "acp3x_i2s_irq"; + adata->res[3].flags = IORESOURCE_IRQ; + adata->res[3].start = pci->irq; + adata->res[3].end = adata->res[3].start; adata->acp3x_audio_mode = ACP3x_I2S_MODE; memset(&pdevinfo, 0, sizeof(pdevinfo)); - pdevinfo.name = "acp3x_rv_i2s"; - pdevinfo.id = 0; - pdevinfo.parent = &pci->dev; - pdevinfo.num_res = 2; - pdevinfo.res = adata->res; - pdevinfo.data = &irqflags; - pdevinfo.size_data = sizeof(irqflags); - - adata->pdev = platform_device_register_full(&pdevinfo); - if (IS_ERR(adata->pdev)) { - dev_err(&pci->dev, "cannot register %s device\n", - pdevinfo.name); - ret = PTR_ERR(adata->pdev); - goto unmap_mmio; + pdevinfo[0].name = "acp3x_rv_i2s_dma"; + pdevinfo[0].id = 0; + pdevinfo[0].parent = &pci->dev; + pdevinfo[0].num_res = 4; + pdevinfo[0].res = &adata->res[0]; + pdevinfo[0].data = &irqflags; + pdevinfo[0].size_data = sizeof(irqflags); + + pdevinfo[1].name = "acp3x_i2s_playcap"; + pdevinfo[1].id = 0; + pdevinfo[1].parent = &pci->dev; + pdevinfo[1].num_res = 1; + pdevinfo[1].res = &adata->res[1]; + + pdevinfo[2].name = "acp3x_i2s_playcap"; + pdevinfo[2].id = 1; + pdevinfo[2].parent = &pci->dev; + pdevinfo[2].num_res = 1; + pdevinfo[2].res = &adata->res[2]; + for (i = 0; i < ACP3x_DEVS ; i++) { + adata->pdev[i] = + platform_device_register_full(&pdevinfo[i]); + if (IS_ERR(adata->pdev[i])) { + dev_err(&pci->dev, "cannot register %s device\n", + pdevinfo[i].name); + ret = PTR_ERR(adata->pdev[i]); + goto unregister_devs; + } } break; default: dev_err(&pci->dev, "Invalid ACP audio mode : %d\n", val); ret = -ENODEV; - goto unmap_mmio; + goto disable_msi; } return 0; -unmap_mmio: +unregister_devs: + if (val == I2S_MODE) + for (i = 0 ; i < ACP3x_DEVS ; i++) + platform_device_unregister(adata->pdev[i]); +disable_msi: pci_disable_msi(pci); - iounmap(adata->acp3x_base); release_regions: pci_release_regions(pci); disable_pci: @@ -125,10 +153,12 @@ static int snd_acp3x_probe(struct pci_dev *pci, static void snd_acp3x_remove(struct pci_dev *pci) { struct acp3x_dev_data *adata = pci_get_drvdata(pci); + int i; - platform_device_unregister(adata->pdev); - iounmap(adata->acp3x_base); - + if (adata->acp3x_audio_mode == ACP3x_I2S_MODE) { + for (i = 0 ; i < ACP3x_DEVS ; i++) + platform_device_unregister(adata->pdev[i]); + } pci_disable_msi(pci); pci_release_regions(pci); pci_disable_device(pci); @@ -151,6 +181,7 @@ static struct pci_driver acp3x_driver = { module_pci_driver(acp3x_driver); +MODULE_AUTHOR("Vishnuvardhanrao.Ravulapati(a)amd.com"); MODULE_AUTHOR("Maruthi.Bayyavarapu(a)amd.com"); MODULE_DESCRIPTION("AMD ACP3x PCI driver"); MODULE_LICENSE("GPL v2"); -- 2.7.4

1 0

Re: [alsa-devel] snd-bebob : from kernel 4.13 to 5.3.19 and .20
by Takashi Sakamoto 05 Dec '19

05 Dec '19

Hi, On Wed, Oct 30, 2019 at 10:40:18AM +0100, Jean-Paul Argudo wrote: > > I'll install Eoan kernel and test my devices. > > (but I don't have Saffire and Saffire LE...) I'd like you to wait > > for my test report. > > What I can say is that with kernel 4.13 under Ubunto Disco everything > was fine :-( I install Eoan (linux-image-5.3.0-19-generic:5.3.0-19.20) and test ALSA bebob driver with my test devices: - Yamaha GO46 (DM1000 ASIC) - M-Audio FireWire Solo (DM1000 ASIC) - Behringer FCA610 (DM1500 ASIC) - Focusrite SaffirePro 26 I/O (DM1000E) However I don't find similar discontinuities. This means that you encounter model-specific issue as regression I didn't realized. For my information, would you please get output from nodes on procfs? * /proc/asound/cardX/firewire/clock * /proc/asound/cardX/firewire/firmware * /proc/asound/cardX/firewire/formation Additionally, please install 'gir1.2-hinawa-2.0' package, then clone below remote repository: * https://github.com/takaswie/hinawa-utils This repository includes two scripts to get information from the device: * hinawa-bebob-parser * hinawa-bebob-connection-cui When your device is detected as sound card '2' and your device is also detected as '/dev/fw1', execute below: $ ./hinawa-bebob-connection-cui 2 graph-connections $ ./hinawa-bebob-parser 1 2 > At startup it lights green ok, but no sound is playable, then the > lights turn orange (like it is when it's not working), I hear a > "relay sound" (a electric clic of a relay), then, the Saffire LE > disapears from the sound menu in Ubuntu sound menu. Once your device is detected and ALSA bebob driver bound to it, pulseaudio detects it and start PCM substream to get capabilities of the device. In your case, the PCM substream is corrupted by the discontinuity. Then pulseaudio give up to use the device. As a result, sound menu drops entry of the device. I guess that the color of LED corresponds to the packet streaming. On Wed, Oct 30, 2019 at 11:12:01AM +0100, Jean-Paul Argudo wrote: > But something new and maybe interesting for you : > > Oct 30 09:25:25 deiphobe pulseaudio[2589]: E: [alsa-sink-BeBoB] alsa-sink.c: ALSA woke us up to write new data to the device, but there was actually nothing to write. > Oct 30 09:25:25 deiphobe pulseaudio[2589]: E: [alsa-sink-BeBoB] alsa- sink.c: Most likely this is a bug in the ALSA driver 'snd_bebob'. Please report this issue to the ALSA developers. > Oct 30 09:25:25 deiphobe pulseaudio[2589]: E: [alsa-sink-BeBoB] alsa-sink.c: We were woken up with POLLOUT set -- however a subsequent snd_pcm_avail() returned 0 or another value < min_avail. Practically these logs can be ignored. (I work to suppress the above lines in development period for Linux kernel v5.5.) > **And in kern.log** : at the beggining in the boot sequence (?), > between FS-cache lines and usb ones: > > Oct 27 21:54:36 deiphobe kernel: [ 8.742105] FS-Cache: N-key=[8] '020001bdc0a800fe' > > Oct 27 21:54:40 deiphobe kernel: [ 12.768168] usb 3-4.1: reset high- speed USB device number 5 using xhci_hcd > Oct 27 21:54:45 deiphobe kernel: [ 18.294126] snd-bebob fw1.0: transaction failed: no ack > Oct 27 21:54:45 deiphobe kernel: [ 18.294167] snd-bebob fw1.0: fail to get section type for isoc out plug 0: -5 > Oct 27 21:54:45 deiphobe kernel: [ 18.294172] snd-bebob fw1.0: fail to run AMDTP slave stream:-5 > Oct 27 21:54:45 deiphobe kernel: [ 18.306399] firewire_ohci 0000:05:01.0: DMA context still active (0x00000411) > Oct 27 21:54:45 deiphobe kernel: [ 18.318425] firewire_ohci 0000:05:01.0: DMA context still active (0x00000411) > Oct 27 21:54:47 deiphobe kernel: [ 20.311440] irq_handler: 20 callbacks suppressed > Oct 27 21:54:47 deiphobe kernel: [ 20.311441] firewire_ohci 0000:05:01.0: isochronous cycle inconsistent > Oct 27 21:54:48 deiphobe kernel: [ 21.322730] firewire_core 0000:05:01.0: phy config: new root=ffc1, gap_count=5 > > Oct 27 21:54:50 deiphobe kernel: [ 22.970251] rfkill: input handler disabled > Oct 27 20:55:10 deiphobe kernel: [ 42.697284] usb 3-4.1: reset high- speed USB device number 5 using xhci_hcd IEEE 1394 bus 'bus-reset' state. Just before/after the bus-reset, any functionality easily fails. It's better to plug-in the device enough after bootup. Regards Takashi Sakamoto

3 4

[alsa-devel] [PATCH 1/2] ALSA: core: add snd_pcm_format_by_name()
by Daniel Mack 05 Dec '19

05 Dec '19

Add a new function to look up PCM format codes by name. This can be used by ASoC drivers to look up formats through device-tree properties, for instance. Signed-off-by: Daniel Mack <daniel(a)zonque.org> --- include/sound/pcm.h | 1 + sound/core/pcm.c | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/include/sound/pcm.h b/include/sound/pcm.h index bbe6eb1ff5d2..ce398caf12ba 100644 --- a/include/sound/pcm.h +++ b/include/sound/pcm.h @@ -1339,6 +1339,7 @@ static inline void snd_pcm_limit_isa_dma_size(int dma, size_t *max) #define PCM_RUNTIME_CHECK(sub) snd_BUG_ON(!(sub) || !(sub)->runtime) const char *snd_pcm_format_name(snd_pcm_format_t format); +snd_pcm_format_t snd_pcm_format_by_name(const char *name); /** * snd_pcm_stream_str - Get a string naming the direction of a stream diff --git a/sound/core/pcm.c b/sound/core/pcm.c index 9a72d641743d..248f2dca7a12 100644 --- a/sound/core/pcm.c +++ b/sound/core/pcm.c @@ -225,6 +225,18 @@ const char *snd_pcm_format_name(snd_pcm_format_t format) } EXPORT_SYMBOL_GPL(snd_pcm_format_name); +snd_pcm_format_t snd_pcm_format_by_name(const char *name) +{ + int i; + + for (i = 0; i < ARRAY_SIZE(snd_pcm_format_names); i++) + if (strcasecmp(name, snd_pcm_format_names[i]) == 0) + return i; + + return -ENOENT; +} +EXPORT_SYMBOL_GPL(snd_pcm_format_by_name); + #ifdef CONFIG_SND_VERBOSE_PROCFS #define STATE(v) [SNDRV_PCM_STATE_##v] = #v -- 2.23.0

3 4

[alsa-devel] [ANNOUNCE] fcplay: compressed audio test utility
by Vinod Koul 05 Dec '19

05 Dec '19

Hello, I have forked the cplay test app into fcplay which is a different repo [1] licensed as LGPLv2.1. The reason for fork was me getting sick of seeing the tool miss sync word for mp3 and no support for other formats which I wanted to test. But I was lazy to start exploring all media formats and write a parser for them so I have used libavcodec to the job for me which is GPL. The fcplay links to libavcodec to get compressed audio parameters and then uses tinycompress to send data to sound card. It supports mp3 (no more complaints about sync words) and Flac. I will add more formats, wma etc are in the list along with gapless audio playback and support for new changes coming to gapless audio playback as discussed in audio meeting at Lyon. As usual patches are welcome. Jaroslav, can we add to alsa-project github as well? Thanks -- ~Vinod

2 6

[alsa-devel] fcplay: initial addition
by GitHub pull_request - opened 05 Dec '19

05 Dec '19

alsa-project/tinycompress pull request #3 was opened from vinodkoul: This tool was forked from tinycompress cplay. The fork was required due to this linking against libavcodec which is GPL. This uses libav APIs to parse the compressed files and send the audio stream to compressed device using tinycompress APIs Right now it supports only playback on MP3 (no problems now not finding sync word) and flac files. Tested-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> Signed-off-by: Vinod Koul <vkoul(a)kernel.org> Request URL : https://github.com/alsa-project/tinycompress/pull/3 Patch URL : https://github.com/alsa-project/tinycompress/pull/3.patch Repository URL: https://github.com/alsa-project/tinycompress

1 0

[alsa-devel] [RESEND PATCH] ASoC: intel: Add Broadwell rt5650 machine driver
by Curtis Malainey 05 Dec '19

05 Dec '19

From: Ben Zhang <benzh(a)chromium.org> Add machine driver for Broadwell + rt5650. Signed-off-by: Bard Liao <bardliao(a)realtek.com> Signed-off-by: Ben Zhang <benzh(a)chromium.org> Signed-off-by: Mac Chiang <mac.chiang(a)intel.com> Signed-off-by: Jon Flatley <jflat(a)chromium.org> Signed-off-by: Curtis Malainey <cujomalainey(a)chromium.org> --- sound/soc/intel/boards/Kconfig | 11 + sound/soc/intel/boards/Makefile | 2 + sound/soc/intel/boards/bdw-rt5650.c | 310 ++++++++++++++++++ .../common/soc-acpi-intel-hsw-bdw-match.c | 5 + 4 files changed, 328 insertions(+) create mode 100644 sound/soc/intel/boards/bdw-rt5650.c diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig index 6c9fd9ad566ed..5f31fadd2e1a1 100644 --- a/sound/soc/intel/boards/Kconfig +++ b/sound/soc/intel/boards/Kconfig @@ -31,6 +31,17 @@ endif ## SND_SOC_INTEL_HASWELL if SND_SOC_INTEL_HASWELL || SND_SOC_SOF_BROADWELL +config SND_SOC_INTEL_BDW_RT5650_MACH + tristate "Broadwell with RT5650 codec" + depends on SND_SOC_INTEL_SST && X86_INTEL_LPSS && DW_DMAC + select SND_COMPRESS_OFFLOAD + select SND_SOC_RT5645 + help + This adds the ASoC machine driver for Intel Broadwell platforms with + the RT5650 codec. + Say Y if you have such a device + If unsure select "N". + config SND_SOC_INTEL_BDW_RT5677_MACH tristate "Broadwell with RT5677 codec" depends on I2C diff --git a/sound/soc/intel/boards/Makefile b/sound/soc/intel/boards/Makefile index ba1aa89db09d5..4efb3689503f8 100644 --- a/sound/soc/intel/boards/Makefile +++ b/sound/soc/intel/boards/Makefile @@ -2,6 +2,7 @@ snd-soc-sst-haswell-objs := haswell.o snd-soc-sst-byt-rt5640-mach-objs := byt-rt5640.o snd-soc-sst-byt-max98090-mach-objs := byt-max98090.o +snd-soc-sst-bdw-rt5650-mach-objs := bdw-rt5650.o snd-soc-sst-bdw-rt5677-mach-objs := bdw-rt5677.o snd-soc-sst-broadwell-objs := broadwell.o snd-soc-sst-bxt-da7219_max98357a-objs := bxt_da7219_max98357a.o hda_dsp_common.o @@ -37,6 +38,7 @@ obj-$(CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON) += snd-soc-sst-bxt-da721 obj-$(CONFIG_SND_SOC_INTEL_BXT_RT298_MACH) += snd-soc-sst-bxt-rt298.o obj-$(CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH) += snd-soc-sst-glk-rt5682_max98357a.o obj-$(CONFIG_SND_SOC_INTEL_BROADWELL_MACH) += snd-soc-sst-broadwell.o +obj-$(CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH) += snd-soc-sst-bdw-rt5650-mach.o obj-$(CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH) += snd-soc-sst-bdw-rt5677-mach.o obj-$(CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH) += snd-soc-sst-bytcr-rt5640.o obj-$(CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH) += snd-soc-sst-bytcr-rt5651.o diff --git a/sound/soc/intel/boards/bdw-rt5650.c b/sound/soc/intel/boards/bdw-rt5650.c new file mode 100644 index 0000000000000..df8be71dfd72e --- /dev/null +++ b/sound/soc/intel/boards/bdw-rt5650.c @@ -0,0 +1,310 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * ASoC machine driver for Intel Broadwell platforms with RT5650 codec + * + * Copyright 2019, The Chromium OS Authors. All rights reserved. + */ + +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/gpio/consumer.h> +#include <linux/delay.h> +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/soc.h> +#include <sound/pcm_params.h> +#include <sound/jack.h> + +#include "../common/sst-dsp.h" +#include "../haswell/sst-haswell-ipc.h" + +#include "../../codecs/rt5645.h" + +struct bdw_rt5650_priv { + struct gpio_desc *gpio_hp_en; + struct snd_soc_component *component; +}; + +static const struct snd_soc_dapm_widget bdw_rt5650_widgets[] = { + SND_SOC_DAPM_HP("Headphone", NULL), + SND_SOC_DAPM_SPK("Speaker", NULL), + SND_SOC_DAPM_MIC("Headset Mic", NULL), + SND_SOC_DAPM_MIC("DMIC Pair1", NULL), + SND_SOC_DAPM_MIC("DMIC Pair2", NULL), +}; + +static const struct snd_soc_dapm_route bdw_rt5650_map[] = { + /* Speakers */ + {"Speaker", NULL, "SPOL"}, + {"Speaker", NULL, "SPOR"}, + + /* Headset jack connectors */ + {"Headphone", NULL, "HPOL"}, + {"Headphone", NULL, "HPOR"}, + {"IN1P", NULL, "Headset Mic"}, + {"IN1N", NULL, "Headset Mic"}, + + /* Digital MICs + * DMIC Pair1 are the two DMICs connected on the DMICN1 connector. + * DMIC Pair2 are the two DMICs connected on the DMICN2 connector. + * Facing the camera, DMIC Pair1 are on the left side, DMIC Pair2 + * are on the right side. + */ + {"DMIC L1", NULL, "DMIC Pair1"}, + {"DMIC R1", NULL, "DMIC Pair1"}, + {"DMIC L2", NULL, "DMIC Pair2"}, + {"DMIC R2", NULL, "DMIC Pair2"}, + + /* CODEC BE connections */ + {"SSP0 CODEC IN", NULL, "AIF1 Capture"}, + {"AIF1 Playback", NULL, "SSP0 CODEC OUT"}, +}; + +static const struct snd_kcontrol_new bdw_rt5650_controls[] = { + SOC_DAPM_PIN_SWITCH("Speaker"), + SOC_DAPM_PIN_SWITCH("Headphone"), + SOC_DAPM_PIN_SWITCH("Headset Mic"), + SOC_DAPM_PIN_SWITCH("DMIC Pair1"), + SOC_DAPM_PIN_SWITCH("DMIC Pair2"), +}; + + +static struct snd_soc_jack headphone_jack; +static struct snd_soc_jack mic_jack; + +static struct snd_soc_jack_pin headphone_jack_pin = { + .pin = "Headphone", + .mask = SND_JACK_HEADPHONE, +}; + +static struct snd_soc_jack_pin mic_jack_pin = { + .pin = "Headset Mic", + .mask = SND_JACK_MICROPHONE, +}; + +static int broadwell_ssp0_fixup(struct snd_soc_pcm_runtime *rtd, + struct snd_pcm_hw_params *params) +{ + struct snd_interval *rate = hw_param_interval(params, + SNDRV_PCM_HW_PARAM_RATE); + struct snd_interval *channels = hw_param_interval(params, + SNDRV_PCM_HW_PARAM_CHANNELS); + + /* The ADSP will covert the FE rate to 48k, max 4-channels */ + rate->min = rate->max = 48000; + channels->min = 2; + channels->max = 4; + + /* set SSP0 to 24 bit */ + snd_mask_set(&params->masks[SNDRV_PCM_HW_PARAM_FORMAT - + SNDRV_PCM_HW_PARAM_FIRST_MASK], + SNDRV_PCM_FORMAT_S24_LE); + return 0; +} + +static int bdw_rt5650_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_dai *codec_dai = rtd->codec_dai; + int ret; + + /* Workaround: set codec PLL to 19.2MHz that PLL source is + * from MCLK(24MHz) to conform 2.4MHz DMIC clock. + */ + ret = snd_soc_dai_set_pll(codec_dai, 0, RT5645_PLL1_S_MCLK, + 24000000, 19200000); + if (ret < 0) { + dev_err(rtd->dev, "can't set codec pll: %d\n", ret); + return ret; + } + + /* The actual MCLK freq is 24MHz. The codec is told that MCLK is + * 24.576MHz to satisfy the requirement of rl6231_get_clk_info. + * ASRC is enabled on AD and DA filters to ensure good audio quality. + */ + ret = snd_soc_dai_set_sysclk(codec_dai, RT5645_SCLK_S_PLL1, 24576000, + SND_SOC_CLOCK_IN); + if (ret < 0) { + dev_err(rtd->dev, "can't set codec sysclk configuration\n"); + return ret; + } + + return ret; +} + +static struct snd_soc_ops bdw_rt5650_ops = { + .hw_params = bdw_rt5650_hw_params, +}; + +static int bdw_rt5650_rtd_init(struct snd_soc_pcm_runtime *rtd) +{ + struct snd_soc_component *component = + snd_soc_rtdcom_lookup(rtd, DRV_NAME); + struct sst_pdata *pdata = dev_get_platdata(component->dev); + struct sst_hsw *broadwell = pdata->dsp; + int ret; + + /* Set ADSP SSP port settings + * clock_divider = 4 means BCLK = MCLK/5 = 24MHz/5 = 4.8MHz + */ + ret = sst_hsw_device_set_config(broadwell, SST_HSW_DEVICE_SSP_0, + SST_HSW_DEVICE_MCLK_FREQ_24_MHZ, + SST_HSW_DEVICE_TDM_CLOCK_MASTER, 4); + if (ret < 0) { + dev_err(rtd->dev, "error: failed to set device config\n"); + return ret; + } + + return 0; +} + +static int bdw_rt5650_init(struct snd_soc_pcm_runtime *rtd) +{ + struct bdw_rt5650_priv *bdw_rt5650 = + snd_soc_card_get_drvdata(rtd->card); + struct snd_soc_component *component = rtd->codec_dai->component; + struct snd_soc_dai *codec_dai = rtd->codec_dai; + int ret; + + /* Enable codec ASRC function for Stereo DAC/Stereo1 ADC/DMIC/I2S1. + * The ASRC clock source is clk_i2s1_asrc. + */ + rt5645_sel_asrc_clk_src(component, + RT5645_DA_STEREO_FILTER | + RT5645_DA_MONO_L_FILTER | + RT5645_DA_MONO_R_FILTER | + RT5645_AD_STEREO_FILTER | + RT5645_AD_MONO_L_FILTER | + RT5645_AD_MONO_R_FILTER, + RT5645_CLK_SEL_I2S1_ASRC); + + /* TDM 4 slots 24 bit, set Rx & Tx bitmask to 4 active slots */ + ret = snd_soc_dai_set_tdm_slot(codec_dai, 0xF, 0xF, 4, 24); + + if (ret < 0) { + dev_err(rtd->dev, "can't set codec TDM slot %d\n", ret); + return ret; + } + + /* Create and initialize headphone jack */ + if (snd_soc_card_jack_new(rtd->card, "Headphone Jack", + SND_JACK_HEADPHONE, &headphone_jack, + &headphone_jack_pin, 1)) { + dev_err(component->dev, "Can't create headphone jack\n"); + } + + /* Create and initialize mic jack */ + if (snd_soc_card_jack_new(rtd->card, "Mic Jack", SND_JACK_MICROPHONE, + &mic_jack, &mic_jack_pin, 1)) { + dev_err(component->dev, "Can't create mic jack\n"); + } + + rt5645_set_jack_detect(component, &headphone_jack, &mic_jack, NULL); + + bdw_rt5650->component = component; + + return 0; +} + +/* broadwell digital audio interface glue - connects codec <--> CPU */ +SND_SOC_DAILINK_DEF(dummy, + DAILINK_COMP_ARRAY(COMP_DUMMY())); + +SND_SOC_DAILINK_DEF(fe, + DAILINK_COMP_ARRAY(COMP_CPU("System Pin"))); + +SND_SOC_DAILINK_DEF(platform, + DAILINK_COMP_ARRAY(COMP_PLATFORM("haswell-pcm-audio"))); + +SND_SOC_DAILINK_DEF(be, + DAILINK_COMP_ARRAY(COMP_CODEC("i2c-10EC5650:00", "rt5645-aif1"))); + +static struct snd_soc_dai_link bdw_rt5650_dais[] = { + /* Front End DAI links */ + { + .name = "System PCM", + .stream_name = "System Playback", + .dynamic = 1, + .init = bdw_rt5650_rtd_init, + .trigger = { + SND_SOC_DPCM_TRIGGER_POST, + SND_SOC_DPCM_TRIGGER_POST + }, + .dpcm_playback = 1, + .dpcm_capture = 1, + SND_SOC_DAILINK_REG(fe, dummy, platform), + }, + + /* Back End DAI links */ + { + /* SSP0 - Codec */ + .name = "Codec", + .id = 0, + .no_pcm = 1, + .dai_fmt = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBS_CFS, + .ignore_suspend = 1, + .ignore_pmdown_time = 1, + .be_hw_params_fixup = broadwell_ssp0_fixup, + .ops = &bdw_rt5650_ops, + .dpcm_playback = 1, + .dpcm_capture = 1, + .init = bdw_rt5650_init, + SND_SOC_DAILINK_REG(dummy, be, dummy), + }, +}; + +/* ASoC machine driver for Broadwell DSP + RT5650 */ +static struct snd_soc_card bdw_rt5650_card = { + .name = "bdw-rt5650", + .owner = THIS_MODULE, + .dai_link = bdw_rt5650_dais, + .num_links = ARRAY_SIZE(bdw_rt5650_dais), + .dapm_widgets = bdw_rt5650_widgets, + .num_dapm_widgets = ARRAY_SIZE(bdw_rt5650_widgets), + .dapm_routes = bdw_rt5650_map, + .num_dapm_routes = ARRAY_SIZE(bdw_rt5650_map), + .controls = bdw_rt5650_controls, + .num_controls = ARRAY_SIZE(bdw_rt5650_controls), + .fully_routed = true, +}; + +static int bdw_rt5650_probe(struct platform_device *pdev) +{ + struct bdw_rt5650_priv *bdw_rt5650; + + bdw_rt5650_card.dev = &pdev->dev; + + /* Allocate driver private struct */ + bdw_rt5650 = devm_kzalloc(&pdev->dev, sizeof(struct bdw_rt5650_priv), + GFP_KERNEL); + if (!bdw_rt5650) + return -ENOMEM; + snd_soc_card_set_drvdata(&bdw_rt5650_card, bdw_rt5650); + + return snd_soc_register_card(&bdw_rt5650_card); +} + +static int bdw_rt5650_remove(struct platform_device *pdev) +{ + snd_soc_unregister_card(&bdw_rt5650_card); + return 0; +} + +static struct platform_driver bdw_rt5650_audio = { + .probe = bdw_rt5650_probe, + .remove = bdw_rt5650_remove, + .driver = { + .name = "bdw-rt5650", + .owner = THIS_MODULE, + }, +}; + +module_platform_driver(bdw_rt5650_audio) + +/* Module information */ +MODULE_AUTHOR("Ben Zhang <benzh(a)chromium.org>"); +MODULE_DESCRIPTION("Intel Broadwell RT5650 machine driver"); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:bdw-rt5650"); diff --git a/sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c b/sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c index 34eb0baaa9517..cae1e559ec79b 100644 --- a/sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c @@ -29,6 +29,11 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_broadwell_machines[] = { .sof_fw_filename = "sof-bdw.ri", .sof_tplg_filename = "sof-bdw-rt286.tplg", }, + { + .id = "10EC5650", + .drv_name = "bdw-rt5650", + .fw_filename = "intel/IntcSST2.bin", + }, { .id = "RT5677CE", .drv_name = "bdw-rt5677", -- 2.24.0.393.g34dc348eaf-goog

3 4

[alsa-devel] [PATCH resend] ASoC: fsl_audmix: add missed pm_runtime_disable
by Chuhong Yuan 05 Dec '19

05 Dec '19

The driver forgets to call pm_runtime_disable in probe failure and remove. Add the missed calls to fix it. Signed-off-by: Chuhong Yuan <hslester96(a)gmail.com> --- sound/soc/fsl/fsl_audmix.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sound/soc/fsl/fsl_audmix.c b/sound/soc/fsl/fsl_audmix.c index a1db1bce330f..5faecbeb5497 100644 --- a/sound/soc/fsl/fsl_audmix.c +++ b/sound/soc/fsl/fsl_audmix.c @@ -505,15 +505,20 @@ static int fsl_audmix_probe(struct platform_device *pdev) ARRAY_SIZE(fsl_audmix_dai)); if (ret) { dev_err(dev, "failed to register ASoC DAI\n"); - return ret; + goto err_disable_pm; } priv->pdev = platform_device_register_data(dev, mdrv, 0, NULL, 0); if (IS_ERR(priv->pdev)) { ret = PTR_ERR(priv->pdev); dev_err(dev, "failed to register platform %s: %d\n", mdrv, ret); + goto err_disable_pm; } + return 0; + +err_disable_pm: + pm_runtime_disable(dev); return ret; } @@ -521,6 +526,8 @@ static int fsl_audmix_remove(struct platform_device *pdev) { struct fsl_audmix *priv = dev_get_drvdata(&pdev->dev); + pm_runtime_disable(&pdev->dev); + if (priv->pdev) platform_device_unregister(priv->pdev); -- 2.24.0

2 1

[alsa-devel] KASAN: slab-out-of-bounds Read in linear_transfer (3)
by syzbot 04 Dec '19

04 Dec '19

Hello, syzbot found the following crash on: HEAD commit: 76bb8b05 Merge tag 'kbuild-v5.5' of git://git.kernel.org/p.. git tree: upstream console output: https://syzkaller.appspot.com/x/log.txt?x=1416a90ee00000 kernel config: https://syzkaller.appspot.com/x/.config?x=dd226651cb0f364b dashboard link: https://syzkaller.appspot.com/bug?extid=f153bde47a62e0b05f83 compiler: gcc (GCC) 9.0.0 20181231 (experimental) syz repro: https://syzkaller.appspot.com/x/repro.syz?x=10fe9e41e00000 C reproducer: https://syzkaller.appspot.com/x/repro.c?x=1522042ae00000 The bug was bisected to: commit 65766ee0bf7fe8b3be80e2e1c3ef54ad59b29476 Author: Takashi Iwai <tiwai(a)suse.de> Date: Fri Nov 9 10:59:45 2018 +0000 ALSA: oss: Use kvzalloc() for local buffer allocations bisection log: https://syzkaller.appspot.com/x/bisect.txt?x=1727742ae00000 final crash: https://syzkaller.appspot.com/x/report.txt?x=14a7742ae00000 console output: https://syzkaller.appspot.com/x/log.txt?x=10a7742ae00000 IMPORTANT: if you fix the bug, please add the following tag to the commit: Reported-by: syzbot+f153bde47a62e0b05f83(a)syzkaller.appspotmail.com Fixes: 65766ee0bf7f ("ALSA: oss: Use kvzalloc() for local buffer allocations") ================================================================== BUG: KASAN: slab-out-of-bounds in memcpy include/linux/string.h:380 [inline] BUG: KASAN: slab-out-of-bounds in do_convert sound/core/oss/linear.c:48 [inline] BUG: KASAN: slab-out-of-bounds in convert sound/core/oss/linear.c:81 [inline] BUG: KASAN: slab-out-of-bounds in linear_transfer sound/core/oss/linear.c:110 [inline] BUG: KASAN: slab-out-of-bounds in linear_transfer+0x6de/0x970 sound/core/oss/linear.c:88 Read of size 1 at addr ffff8880a3eb5540 by task syz-executor567/8984 CPU: 0 PID: 8984 Comm: syz-executor567 Not tainted 5.4.0-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0x197/0x210 lib/dump_stack.c:118 print_address_description.constprop.0.cold+0xd4/0x30b mm/kasan/report.c:374 __kasan_report.cold+0x1b/0x41 mm/kasan/report.c:506 kasan_report+0x12/0x20 mm/kasan/common.c:638 check_memory_region_inline mm/kasan/generic.c:185 [inline] check_memory_region+0x134/0x1a0 mm/kasan/generic.c:192 memcpy+0x24/0x50 mm/kasan/common.c:124 memcpy include/linux/string.h:380 [inline] do_convert sound/core/oss/linear.c:48 [inline] convert sound/core/oss/linear.c:81 [inline] linear_transfer sound/core/oss/linear.c:110 [inline] linear_transfer+0x6de/0x970 sound/core/oss/linear.c:88 snd_pcm_plug_read_transfer+0x197/0x2e0 sound/core/oss/pcm_plugin.c:651 snd_pcm_oss_read2+0x1f0/0x3f0 sound/core/oss/pcm_oss.c:1460 snd_pcm_oss_read1 sound/core/oss/pcm_oss.c:1517 [inline] snd_pcm_oss_read+0x548/0x6a0 sound/core/oss/pcm_oss.c:2741 __vfs_read+0x8a/0x110 fs/read_write.c:425 vfs_read+0x1f0/0x440 fs/read_write.c:461 ksys_read+0x14f/0x290 fs/read_write.c:587 __do_sys_read fs/read_write.c:597 [inline] __se_sys_read fs/read_write.c:595 [inline] __x64_sys_read+0x73/0xb0 fs/read_write.c:595 do_syscall_64+0xfa/0x790 arch/x86/entry/common.c:294 entry_SYSCALL_64_after_hwframe+0x49/0xbe RIP: 0033:0x445a99 Code: e8 dc bd 02 00 48 83 c4 18 c3 0f 1f 80 00 00 00 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 0f 83 cb 11 fc ff c3 66 2e 0f 1f 84 00 00 00 00 RSP: 002b:00007f2955880ce8 EFLAGS: 00000246 ORIG_RAX: 0000000000000000 RAX: ffffffffffffffda RBX: 00000000006dbc28 RCX: 0000000000445a99 RDX: 0000000000001000 RSI: 0000000020000380 RDI: 0000000000000003 RBP: 00000000006dbc20 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 00000000006dbc2c R13: 00007ffd9643eb4f R14: 00007f29558819c0 R15: 20c49ba5e353f7cf Allocated by task 8984: save_stack+0x23/0x90 mm/kasan/common.c:71 set_track mm/kasan/common.c:79 [inline] __kasan_kmalloc mm/kasan/common.c:512 [inline] __kasan_kmalloc.constprop.0+0xcf/0xe0 mm/kasan/common.c:485 kasan_kmalloc+0x9/0x10 mm/kasan/common.c:526 __do_kmalloc_node mm/slab.c:3616 [inline] __kmalloc_node+0x4e/0x70 mm/slab.c:3623 kmalloc_node include/linux/slab.h:579 [inline] kvmalloc_node+0x68/0x100 mm/util.c:574 kvmalloc include/linux/mm.h:655 [inline] kvzalloc include/linux/mm.h:663 [inline] snd_pcm_plugin_alloc+0x585/0x770 sound/core/oss/pcm_plugin.c:70 snd_pcm_plug_alloc+0x146/0x330 sound/core/oss/pcm_plugin.c:129 snd_pcm_oss_change_params_locked+0x210f/0x3750 sound/core/oss/pcm_oss.c:1024 snd_pcm_oss_change_params+0x7b/0xd0 sound/core/oss/pcm_oss.c:1087 snd_pcm_oss_get_active_substream+0x136/0x190 sound/core/oss/pcm_oss.c:1104 snd_pcm_oss_get_rate sound/core/oss/pcm_oss.c:1754 [inline] snd_pcm_oss_set_rate sound/core/oss/pcm_oss.c:1746 [inline] snd_pcm_oss_ioctl+0x1794/0x33a0 sound/core/oss/pcm_oss.c:2593 vfs_ioctl fs/ioctl.c:47 [inline] file_ioctl fs/ioctl.c:545 [inline] do_vfs_ioctl+0x977/0x14e0 fs/ioctl.c:732 ksys_ioctl+0xab/0xd0 fs/ioctl.c:749 __do_sys_ioctl fs/ioctl.c:756 [inline] __se_sys_ioctl fs/ioctl.c:754 [inline] __x64_sys_ioctl+0x73/0xb0 fs/ioctl.c:754 do_syscall_64+0xfa/0x790 arch/x86/entry/common.c:294 entry_SYSCALL_64_after_hwframe+0x49/0xbe Freed by task 0: (stack is not available) The buggy address belongs to the object at ffff8880a3eb5500 which belongs to the cache kmalloc-64 of size 64 The buggy address is located 0 bytes to the right of 64-byte region [ffff8880a3eb5500, ffff8880a3eb5540) The buggy address belongs to the page: page:ffffea00028fad40 refcount:1 mapcount:0 mapping:ffff8880aa400380 index:0x0 raw: 00fffe0000000200 ffffea00027da7c8 ffff8880aa401348 ffff8880aa400380 raw: 0000000000000000 ffff8880a3eb5000 0000000100000020 0000000000000000 page dumped because: kasan: bad access detected Memory state around the buggy address: ffff8880a3eb5400: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc ffff8880a3eb5480: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc > ffff8880a3eb5500: 00 00 00 00 00 00 00 00 fc fc fc fc fc fc fc fc ^ ffff8880a3eb5580: 00 00 00 00 00 fc fc fc fc fc fc fc fc fc fc fc ffff8880a3eb5600: 00 00 00 00 00 fc fc fc fc fc fc fc fc fc fc fc ================================================================== --- This bug is generated by a bot. It may contain errors. See https://goo.gl/tpsmEJ for more information about syzbot. syzbot engineers can be reached at syzkaller(a)googlegroups.com. syzbot will keep track of this bug report. See: https://goo.gl/tpsmEJ#status for how to communicate with syzbot. For information about bisection process see: https://goo.gl/tpsmEJ#bisection syzbot can test patches for this bug, for details see: https://goo.gl/tpsmEJ#testing-patches

2 1

[alsa-devel] [PATCH] ALSA: pcm: oss: Avoid potential buffer overflows
by Takashi Iwai 04 Dec '19

04 Dec '19

syzkaller reported an invalid access in PCM OSS read, and this seems to be an overflow of the internal buffer allocated for a plugin. Since the rate plugin adjusts its transfer size dynamically, the calculation for the chained plugin might be bigger than the given buffer size in some extreme cases, which lead to such an buffer overflow as caught by KASAN. Fix it by limiting the max transfer size properly by checking against the destination size in each plugin transfer callback. Reported-by: syzbot+f153bde47a62e0b05f83(a)syzkaller.appspotmail.com Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/core/oss/linear.c | 2 ++ sound/core/oss/mulaw.c | 2 ++ sound/core/oss/route.c | 2 ++ 3 files changed, 6 insertions(+) diff --git a/sound/core/oss/linear.c b/sound/core/oss/linear.c index 2045697f449d..797d838a2f9e 100644 --- a/sound/core/oss/linear.c +++ b/sound/core/oss/linear.c @@ -107,6 +107,8 @@ static snd_pcm_sframes_t linear_transfer(struct snd_pcm_plugin *plugin, } } #endif + if (frames > dst_channels[0].frames) + frames = dst_channels[0].frames; convert(plugin, src_channels, dst_channels, frames); return frames; } diff --git a/sound/core/oss/mulaw.c b/sound/core/oss/mulaw.c index 7915564bd394..3788906421a7 100644 --- a/sound/core/oss/mulaw.c +++ b/sound/core/oss/mulaw.c @@ -269,6 +269,8 @@ static snd_pcm_sframes_t mulaw_transfer(struct snd_pcm_plugin *plugin, } } #endif + if (frames > dst_channels[0].frames) + frames = dst_channels[0].frames; data = (struct mulaw_priv *)plugin->extra_data; data->func(plugin, src_channels, dst_channels, frames); return frames; diff --git a/sound/core/oss/route.c b/sound/core/oss/route.c index c8171f5783c8..72dea04197ef 100644 --- a/sound/core/oss/route.c +++ b/sound/core/oss/route.c @@ -57,6 +57,8 @@ static snd_pcm_sframes_t route_transfer(struct snd_pcm_plugin *plugin, return -ENXIO; if (frames == 0) return 0; + if (frames > dst_channels[0].frames) + frames = dst_channels[0].frames; nsrcs = plugin->src_format.channels; ndsts = plugin->dst_format.channels; -- 2.16.4

1 0

[alsa-devel] [PATCH v2] ASoC: core: Init pcm runtime work early to avoid warnings
by Curtis Malainey 04 Dec '19

04 Dec '19

There are cases where we fail before we reach soc_new_pcm which would init the workqueue. When we fail we attempt to flush the queue which generates warnings from the workqueue subsystem when we have not inited the queue. Solution is to use a proxy function to get around this issue. Signed-off-by: Curtis Malainey <cujomalainey(a)chromium.org> Cc: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Curtis Malainey <cujomalainey(a)chromium.org> --- include/sound/soc.h | 1 + sound/soc/soc-compress.c | 6 ++---- sound/soc/soc-core.c | 10 ++++++++++ sound/soc/soc-pcm.c | 11 ++++------- 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index c28a1ed5e8df9..2628967998264 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -1150,6 +1150,7 @@ struct snd_soc_pcm_runtime { unsigned int num_codecs; struct delayed_work delayed_work; + void (*close_delayed_work_func)(struct snd_soc_pcm_runtime *rtd); #ifdef CONFIG_DEBUG_FS struct dentry *debugfs_dpcm_root; #endif diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c index 61f230324164d..6615ef64c7f55 100644 --- a/sound/soc/soc-compress.c +++ b/sound/soc/soc-compress.c @@ -214,10 +214,8 @@ static int soc_compr_open_fe(struct snd_compr_stream *cstream) * This is to ensure there are no pops or clicks in between any music tracks * due to DAPM power cycling. */ -static void close_delayed_work(struct work_struct *work) +static void close_delayed_work(struct snd_soc_pcm_runtime *rtd) { - struct snd_soc_pcm_runtime *rtd = - container_of(work, struct snd_soc_pcm_runtime, delayed_work.work); struct snd_soc_dai *codec_dai = rtd->codec_dai; mutex_lock_nested(&rtd->card->pcm_mutex, rtd->card->pcm_subclass); @@ -929,7 +927,7 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num) } /* DAPM dai link stream work */ - INIT_DELAYED_WORK(&rtd->delayed_work, close_delayed_work); + rtd->close_delayed_work_func = close_delayed_work; rtd->compr = compr; compr->private_data = rtd; diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 062653ab03a37..0e2e628302f1d 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -435,6 +435,15 @@ static void soc_free_pcm_runtime(struct snd_soc_pcm_runtime *rtd) device_unregister(rtd->dev); } +static void close_delayed_work(struct work_struct *work) { + struct snd_soc_pcm_runtime *rtd = + container_of(work, struct snd_soc_pcm_runtime, + delayed_work.work); + + if (rtd->close_delayed_work_func) + rtd->close_delayed_work_func(rtd); +} + static struct snd_soc_pcm_runtime *soc_new_pcm_runtime( struct snd_soc_card *card, struct snd_soc_dai_link *dai_link) { @@ -470,6 +479,7 @@ static struct snd_soc_pcm_runtime *soc_new_pcm_runtime( rtd->dev = dev; dev_set_drvdata(dev, rtd); + INIT_DELAYED_WORK(&rtd->delayed_work, close_delayed_work); /* * for rtd->codec_dais diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 01eb8700c3de5..b78f6ff2b1d3f 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -637,10 +637,8 @@ static int soc_pcm_open(struct snd_pcm_substream *substream) * This is to ensure there are no pops or clicks in between any music tracks * due to DAPM power cycling. */ -static void close_delayed_work(struct work_struct *work) +static void close_delayed_work(struct snd_soc_pcm_runtime *rtd) { - struct snd_soc_pcm_runtime *rtd = - container_of(work, struct snd_soc_pcm_runtime, delayed_work.work); struct snd_soc_dai *codec_dai = rtd->codec_dais[0]; mutex_lock_nested(&rtd->card->pcm_mutex, rtd->card->pcm_subclass); @@ -660,7 +658,7 @@ static void close_delayed_work(struct work_struct *work) mutex_unlock(&rtd->card->pcm_mutex); } -static void codec2codec_close_delayed_work(struct work_struct *work) +static void codec2codec_close_delayed_work(struct snd_soc_pcm_runtime *rtd) { /* * Currently nothing to do for c2c links @@ -2974,10 +2972,9 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num) /* DAPM dai link stream work */ if (rtd->dai_link->params) - INIT_DELAYED_WORK(&rtd->delayed_work, - codec2codec_close_delayed_work); + rtd->close_delayed_work_func = codec2codec_close_delayed_work; else - INIT_DELAYED_WORK(&rtd->delayed_work, close_delayed_work); + rtd->close_delayed_work_func = close_delayed_work; pcm->nonatomic = rtd->dai_link->nonatomic; rtd->pcm = pcm; -- 2.24.0.393.g34dc348eaf-goog

3 2

[alsa-devel] [PATCH] ASoC: Intel: bytcr_rt5640: Update quirk for Teclast X89
by Hans de Goede 04 Dec '19

04 Dec '19

When the Teclast X89 quirk was added we did not have jack-detection support yet. Note the over-current detection limit is set to 2mA instead of the usual 1.5mA because this tablet tends to give false-positive button-presses when it is set to 1.5mA. Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- sound/soc/intel/boards/bytcr_rt5640.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c index dd2b5ad08659..243f683bc02a 100644 --- a/sound/soc/intel/boards/bytcr_rt5640.c +++ b/sound/soc/intel/boards/bytcr_rt5640.c @@ -707,13 +707,17 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = { BYT_RT5640_MCLK_EN), }, { + /* Teclast X89 */ .matches = { DMI_MATCH(DMI_BOARD_VENDOR, "TECLAST"), DMI_MATCH(DMI_BOARD_NAME, "tPAD"), }, .driver_data = (void *)(BYT_RT5640_IN3_MAP | - BYT_RT5640_MCLK_EN | - BYT_RT5640_SSP0_AIF1), + BYT_RT5640_JD_SRC_JD1_IN4P | + BYT_RT5640_OVCD_TH_2000UA | + BYT_RT5640_OVCD_SF_1P0 | + BYT_RT5640_SSP0_AIF1 | + BYT_RT5640_MCLK_EN), }, { /* Toshiba Satellite Click Mini L9W-B */ .matches = { -- 2.23.0

3 2

[alsa-devel] [PATCH v4 1/2] ASoC: dt-bindings: fsl_asrc: add compatible string for imx8qm & imx8qxp
by Shengjiu Wang 04 Dec '19

04 Dec '19

Add compatible string "fsl,imx8qm-asrc" for imx8qm platform, "fsl,imx8qxp-asrc" for imx8qxp platform. There are two asrc modules in imx8qm & imx8qxp, the clock mapping is different for each other, so add new property "fsl,asrc-clk-map" to distinguish them. Signed-off-by: Shengjiu Wang <shengjiu.wang(a)nxp.com> --- changes in v2 -none changes in v3 -use only one compatible string "fsl,imx8qm-asrc", -add new property "fsl,asrc-clk-map". changes in v4 -add "fsl,imx8qxp-asrc" Documentation/devicetree/bindings/sound/fsl,asrc.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/sound/fsl,asrc.txt b/Documentation/devicetree/bindings/sound/fsl,asrc.txt index 1d4d9f938689..f4481779e8f2 100644 --- a/Documentation/devicetree/bindings/sound/fsl,asrc.txt +++ b/Documentation/devicetree/bindings/sound/fsl,asrc.txt @@ -8,7 +8,8 @@ three substreams within totally 10 channels. Required properties: - - compatible : Contains "fsl,imx35-asrc" or "fsl,imx53-asrc". + - compatible : Contains "fsl,imx35-asrc", "fsl,imx53-asrc", + "fsl,imx8qm-asrc", "fsl,imx8qxp-asrc" - reg : Offset and length of the register set for the device. @@ -35,6 +36,11 @@ Required properties: - fsl,asrc-width : Defines a mutual sample width used by DPCM Back Ends. + - fsl,asrc-clk-map : Defines clock map used in driver. which is required + by imx8qm/imx8qxp platform + <0> - select the map for asrc0 in imx8qm/imx8qxp + <1> - select the map for asrc1 in imx8qm/imx8qxp + Optional properties: - big-endian : If this property is absent, the little endian mode -- 2.21.0

3 3

[alsa-devel] utils/alsa.m4: fix atopology detection without alsatest
by GitHub pull_request - opened 04 Dec '19

04 Dec '19

alsa-project/alsa-lib pull request #16 was opened from ffontaine: Since commit 75d393a563efb578c79364a277087c6326267f52, alsa-utils fails to build with --disable-alsatest because atopology is not detected Fixes: - http://autobuild.buildroot.org/results/d0fb760669b02b813115af04adcf24530d35… Signed-off-by: Fabrice Fontaine <fontaine.fabrice(a)gmail.com> Request URL : https://github.com/alsa-project/alsa-lib/pull/16 Patch URL : https://github.com/alsa-project/alsa-lib/pull/16.patch Repository URL: https://github.com/alsa-project/alsa-lib

1 0

[alsa-devel] [PATCH] ASoC: snd-sof-pci - add model parameter and pass it to HDA codec driver
by Jaroslav Kysela 03 Dec '19

03 Dec '19

It may be useful to pass the specific model to the generic HDA codec routines like the legacy HDA driver (snd-hda-intel) allows. The model name "sofbus" is tricky anyway. Signed-off-by: Jaroslav Kysela <perex(a)perex.cz> Cc: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Cc: Mark Brown <broonie(a)kernel.org> --- include/sound/sof.h | 1 + sound/soc/sof/intel/hda.c | 2 +- sound/soc/sof/sof-pci-dev.c | 5 +++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/include/sound/sof.h b/include/sound/sof.h index 479101736ee0..a62686baa95d 100644 --- a/include/sound/sof.h +++ b/include/sound/sof.h @@ -25,6 +25,7 @@ struct snd_sof_pdata { const char *drv_name; const char *name; const char *platform; + const char *modelname; struct device *dev; diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c index 91bd88fddac7..ccb640bacc99 100644 --- a/sound/soc/sof/intel/hda.c +++ b/sound/soc/sof/intel/hda.c @@ -271,7 +271,7 @@ static int hda_init(struct snd_sof_dev *sdev) mutex_init(&hbus->prepare_mutex); hbus->pci = pci; hbus->mixer_assigned = -1; - hbus->modelname = "sofbus"; + hbus->modelname = sdev->pdata->modelname; /* initialise hdac bus */ bus->addr = pci_resource_start(pci, 0); diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c index bbeffd932de7..c01ad85aad2a 100644 --- a/sound/soc/sof/sof-pci-dev.c +++ b/sound/soc/sof/sof-pci-dev.c @@ -34,6 +34,10 @@ static int sof_pci_debug; module_param_named(sof_pci_debug, sof_pci_debug, int, 0444); MODULE_PARM_DESC(sof_pci_debug, "SOF PCI debug options (0x0 all off)"); +static char *model; +module_param(model, charp, 0444); +MODULE_PARM_DESC(model, "Use the given HDA board model."); + #define SOF_PCI_DISABLE_PM_RUNTIME BIT(0) #if IS_ENABLED(CONFIG_SND_SOC_SOF_APOLLOLAKE) @@ -326,6 +330,7 @@ static int sof_pci_probe(struct pci_dev *pci, sof_pdata->desc = (struct sof_dev_desc *)pci_id->driver_data; sof_pdata->dev = dev; sof_pdata->platform = dev_name(dev); + sof_pdata->modelname = model; /* alternate fw and tplg filenames ? */ if (fw_path) -- 2.20.1

3 4

[alsa-devel] Integrating Texes Instruments PCM1860 ADC
by Umar Dockrat 03 Dec '19

03 Dec '19

Good Day, I have been struggling with the integration of a PCM1860 ADC for audio recording. I have created a "sound card" board that contains both a PCM5102A (DAC) and PCM1860 (ADC). The main processor is an Omega Onion 2 which is based on MediaTek MT7688 SoC device. I am struggling with creating the device tree as the Kernel currently has reference to the PCM186X where X is 2,3,4 or 5 but not the more simple PCM1860. The difference between the PCM1860 and the PCM186X is that the PCM1860 does not have I2C control and is HW configured using pull up/down. https://www.kernel.org/doc/Documentation/devicetree/bindings/sound/pcm186x.… I have tried multiple device tree setup's and have only got the DAC working when configured in isolation, as soon as I add any reference to the ADC then both DAC and ADC are not recognised. This DTSI allows the DAC to function https://pastebin.com/z9H67DHd There are my attempts at including the DAC and ADC: https://pastebin.com/RLsKNsiR https://pastebin.com/rmJVcCz1 Please can someone assist with the correct way to integrate this ADC device? Any suggestions on how to properly debug this further is also really appreciated. Thanks, UFD

1 0

[alsa-devel] a52 plugin + ffmpeg with libswresample
by Giovanni Harting 03 Dec '19

03 Dec '19

Hello, I'm working on restoring functionality to the a52 plugin. ALSA build with ffmpeg without (deprecated) libavresample does not build this plugin, since libavresample is missing. Archlinux for example does not build with libavresample anymore [1], therefore a52 is missing in alsa-plugins builds since that change happened. I ported rate-lav to libswresample, which seems to work well after a month of daily use. The oddity is that a config file (asoundrc, [2]), that worked fine with alsa-lib 1.1.6, does not work with 1.1.7+. I could not find a change that causes this. I traced it down to _snd_pcm_rate_open() in pcm/pcm_rate.c, where keywords from within pcm {} are passed into, where it fails with "Unknown field card" (for example). I worked around it by filtering out all keywords [3], but that feels a little unclean. Is there a proper way to fix this? I'm not familiar with ALSA's config parsing. I'll submit patches for both once I figured out how to fix this. [1] https://bugs.archlinux.org/task/60586 [2] pcm.a52 { @args [CARD] @args.CARD { type string } type rate slave { pcm { type a52 bitrate 640 channels 6 card $CARD } rate 48000 format S16_LE } } [3] if (strcmp(id, "bitrate") == 0 || strcmp(id, "rate") == 0 || strcmp(id, "card") == 0 || strcmp(id, "channels") == 0 || strcmp(id, "format") == 0) { continue; }

2 2

[alsa-devel] [PATCH alsa-lib] ucm: Do not fail to parse configs on cards with an empty CardComponents lists
by Hans de Goede 03 Dec '19

03 Dec '19

Since the UCM profiles for all Bay- and Cherry-Trail SST cards have been moved over to UCM2, parsing them fails with: ALSA lib ucm_subs.c:220:(uc_mgr_get_substituted_value) variable '${CardComponents}' is not defined in this context! This completely breaks audio support on all Bay- and Cherry-Trail devices. This is caused by these non-SOF ASoC using cards having an empty CardComponents list. Which in itself is fine, but is rejected by the ucm_subs.c code. This commit changes the ucm_subs code to accept an empty string as a valid value for CardComponents restoring audio functionality on these boards. Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- src/ucm/ucm_subs.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/ucm/ucm_subs.c b/src/ucm/ucm_subs.c index 00afa9e3..90e395f0 100644 --- a/src/ucm/ucm_subs.c +++ b/src/ucm/ucm_subs.c @@ -25,6 +25,7 @@ */ #include "ucm_local.h" +#include <stdbool.h> #include <sys/stat.h> #include <limits.h> @@ -145,10 +146,11 @@ static char *rval_sysfs(snd_use_case_mgr_t *uc_mgr ATTRIBUTE_UNUSED, const char return strdup(path); } -#define MATCH_VARIABLE(name, id, fcn) \ +#define MATCH_VARIABLE(name, id, fcn, empty_ok) \ if (strncmp((name), (id), sizeof(id) - 1) == 0) { \ rval = fcn(uc_mgr); \ idsize = sizeof(id) - 1; \ + allow_empty = (empty_ok); \ goto __rval; \ } @@ -189,12 +191,14 @@ int uc_mgr_get_substituted_value(snd_use_case_mgr_t *uc_mgr, while (*value) { if (*value == '$' && *(value+1) == '{') { - MATCH_VARIABLE(value, "${ConfName}", rval_conf_name); - MATCH_VARIABLE(value, "${CardId}", rval_card_id); - MATCH_VARIABLE(value, "${CardDriver}", rval_card_driver); - MATCH_VARIABLE(value, "${CardName}", rval_card_name); - MATCH_VARIABLE(value, "${CardLongName}", rval_card_longname); - MATCH_VARIABLE(value, "${CardComponents}", rval_card_components); + bool allow_empty = false; + + MATCH_VARIABLE(value, "${ConfName}", rval_conf_name, false); + MATCH_VARIABLE(value, "${CardId}", rval_card_id, false); + MATCH_VARIABLE(value, "${CardDriver}", rval_card_driver, false); + MATCH_VARIABLE(value, "${CardName}", rval_card_name, false); + MATCH_VARIABLE(value, "${CardLongName}", rval_card_longname, false); + MATCH_VARIABLE(value, "${CardComponents}", rval_card_components, true); MATCH_VARIABLE2(value, "${env:", rval_env); MATCH_VARIABLE2(value, "${sys:", rval_sysfs); err = -EINVAL; @@ -208,7 +212,7 @@ int uc_mgr_get_substituted_value(snd_use_case_mgr_t *uc_mgr, } goto __error; __rval: - if (rval == NULL || rval[0] == '\0') { + if (rval == NULL || (!allow_empty && rval[0] == '\0')) { free(rval); strncpy(r, value, idsize); r[idsize] = '\0'; -- 2.23.0

2 1

[alsa-devel] Build failure without alsa-topology
by GitHub issues - opened 03 Dec '19

03 Dec '19

alsa-project/alsa-utils issue #33 was opened from ffontaine: Commit c8fdd38c74de2e8b7b2b5a4576787d5e9b4ae807 breaks build of alsa-utils on buildroot because $(ALSA_TOPOLOGY_LIBS) is set to an empty value by https://github.com/alsa-project/alsa-lib/commits/master/utils/alsa.m4 if --enable-alsa-topology is not passed: ``` /home/br-user/autobuild/run/instance-0/output/host/bin/arm-linux-gnueabihf-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O2 -o alsatplg topology.o -lasound -lm -ldl -lpthread topology.o: In function `main': topology.c:(.text.startup+0x184): undefined reference to `snd_tplg_new' topology.c:(.text.startup+0x194): undefined reference to `snd_tplg_verbose' topology.c:(.text.startup+0x1a4): undefined reference to `snd_tplg_build_file' topology.c:(.text.startup+0x1b4): undefined reference to `snd_tplg_free' topology.c:(.text.startup+0x218): undefined reference to `snd_tplg_free' ``` More information can be found here: http://autobuild.buildroot.org/results/d0f/d0fb760669b02b813115af04adcf2453… Issue URL : https://github.com/alsa-project/alsa-utils/issues/33 Repository URL: https://github.com/alsa-project/alsa-utils

1 0

[alsa-devel] [PATCH 0/3] Add NAU8812 support
by Marco Felsch 03 Dec '19

03 Dec '19

Hi, this small series adds the documentation and support for the nau8812 devices. The exisiting nau8810 driver can handle both devices so we only need to add the dt-bindings and inform the user by adapting the Kconfig entry. Futhermore the series adds the support for the aux-port control. @John Hsu Please can you verify that register accesses to the aux-port control bits don't affect the nau8810 devices? I don't have such a device but the documentations says that those register fields are just '0'ed. So I assume the nau8810 devices ignore such writes. Marco Felsch (2): dt-bindings: ASoC: add nau8812 documentation ASoC: nau8810: add support for nau8812 Thomas Fehrenbacher (1): ASoC: nau8810: add aux input control, available on NAU8812 Documentation/devicetree/bindings/sound/nau8810.txt | 2 +- sound/soc/codecs/Kconfig | 2 +- sound/soc/codecs/nau8810.c | 9 +++++++++ sound/soc/codecs/nau8810.h | 2 ++ 4 files changed, 13 insertions(+), 2 deletions(-) -- 2.20.1

4 9

[alsa-devel] src/ucm/main.c: fix build without mixer
by GitHub pull_request - opened 03 Dec '19

03 Dec '19

alsa-project/alsa-lib pull request #15 was opened from ffontaine: Commit 4ce38a5ff466d18039b2606938f866ea3a6c9f3c breaks the build without mixer on: CCLD libasound.la /home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/8.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: ucm/.libs/libucm.a(main.o): in function `snd_use_case_set': main.c:(.text+0x185c): undefined reference to `snd_mixer_selem_id_parse' Fixes: - http://autobuild.buildroot.org/results/4d91c9f82a2a61c50c457a851073b85cc09e… Signed-off-by: Fabrice Fontaine <fontaine.fabrice(a)gmail.com> Request URL : https://github.com/alsa-project/alsa-lib/pull/15 Patch URL : https://github.com/alsa-project/alsa-lib/pull/15.patch Repository URL: https://github.com/alsa-project/alsa-lib

1 0

[alsa-devel] [PATCH] ASoC: core: Init pcm runtime work early to avoid warnings
by Curtis Malainey 03 Dec '19

03 Dec '19

There are cases where we fail before we reach soc_new_pcm which would init the workqueue. When we fail we attempt to flush the queue which generates warnings from the workqueue subsystem when we have not inited the queue. Solution is to use a proxy function to get around this issue. Signed-off-by: Curtis Malainey <cujomalainey(a)chromium.org> Cc: Takashi Iwai <tiwai(a)suse.de> --- include/sound/soc.h | 1 + sound/soc/soc-core.c | 10 ++++++++++ sound/soc/soc-pcm.c | 11 ++++------- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index c28a1ed5e8df9..2628967998264 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -1150,6 +1150,7 @@ struct snd_soc_pcm_runtime { unsigned int num_codecs; struct delayed_work delayed_work; + void (*close_delayed_work_func)(struct snd_soc_pcm_runtime *rtd); #ifdef CONFIG_DEBUG_FS struct dentry *debugfs_dpcm_root; #endif diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 062653ab03a37..0e2e628302f1d 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -435,6 +435,15 @@ static void soc_free_pcm_runtime(struct snd_soc_pcm_runtime *rtd) device_unregister(rtd->dev); } +static void close_delayed_work(struct work_struct *work) { + struct snd_soc_pcm_runtime *rtd = + container_of(work, struct snd_soc_pcm_runtime, + delayed_work.work); + + if (rtd->close_delayed_work_func) + rtd->close_delayed_work_func(rtd); +} + static struct snd_soc_pcm_runtime *soc_new_pcm_runtime( struct snd_soc_card *card, struct snd_soc_dai_link *dai_link) { @@ -470,6 +479,7 @@ static struct snd_soc_pcm_runtime *soc_new_pcm_runtime( rtd->dev = dev; dev_set_drvdata(dev, rtd); + INIT_DELAYED_WORK(&rtd->delayed_work, close_delayed_work); /* * for rtd->codec_dais diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 01eb8700c3de5..b78f6ff2b1d3f 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -637,10 +637,8 @@ static int soc_pcm_open(struct snd_pcm_substream *substream) * This is to ensure there are no pops or clicks in between any music tracks * due to DAPM power cycling. */ -static void close_delayed_work(struct work_struct *work) +static void close_delayed_work(struct snd_soc_pcm_runtime *rtd) { - struct snd_soc_pcm_runtime *rtd = - container_of(work, struct snd_soc_pcm_runtime, delayed_work.work); struct snd_soc_dai *codec_dai = rtd->codec_dais[0]; mutex_lock_nested(&rtd->card->pcm_mutex, rtd->card->pcm_subclass); @@ -660,7 +658,7 @@ static void close_delayed_work(struct work_struct *work) mutex_unlock(&rtd->card->pcm_mutex); } -static void codec2codec_close_delayed_work(struct work_struct *work) +static void codec2codec_close_delayed_work(struct snd_soc_pcm_runtime *rtd) { /* * Currently nothing to do for c2c links @@ -2974,10 +2972,9 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num) /* DAPM dai link stream work */ if (rtd->dai_link->params) - INIT_DELAYED_WORK(&rtd->delayed_work, - codec2codec_close_delayed_work); + rtd->close_delayed_work_func = codec2codec_close_delayed_work; else - INIT_DELAYED_WORK(&rtd->delayed_work, close_delayed_work); + rtd->close_delayed_work_func = close_delayed_work; pcm->nonatomic = rtd->dai_link->nonatomic; rtd->pcm = pcm; -- 2.24.0.393.g34dc348eaf-goog

3 2

[alsa-devel] [PATCH] ASoC: da7219: remove SRM lock check retry
by Brent Lu 03 Dec '19

03 Dec '19

For platforms not able to provide WCLK in the PREPARED runtime state, it takes 400ms for codec driver to print the message "SRM failed to lock" in the da7219_dai_event() function which is called when DAPM widgets are powering up. The latency penalty to audio input/output is too much so the retry (8 times) and delay (50ms each retry) are removed. Another reason is current Cold output latency requirement in Android CDD is 500ms but will be reduced to 200ms for 2021 platforms. With the 400ms latency it would be difficult to pass the Android CTS test. Signed-off-by: Brent Lu <brent.lu(a)intel.com> --- sound/soc/codecs/da7219.c | 3 ++- sound/soc/codecs/da7219.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/da7219.c b/sound/soc/codecs/da7219.c index f83a6ea..042e701 100644 --- a/sound/soc/codecs/da7219.c +++ b/sound/soc/codecs/da7219.c @@ -833,7 +833,8 @@ static int da7219_dai_event(struct snd_soc_dapm_widget *w, srm_lock = true; } else { ++i; - msleep(50); + if (i < DA7219_SRM_CHECK_RETRIES) + msleep(50); } } while ((i < DA7219_SRM_CHECK_RETRIES) && (!srm_lock)); diff --git a/sound/soc/codecs/da7219.h b/sound/soc/codecs/da7219.h index 88b67fe..3149986 100644 --- a/sound/soc/codecs/da7219.h +++ b/sound/soc/codecs/da7219.h @@ -770,7 +770,7 @@ #define DA7219_PLL_INDIV_36_TO_54_MHZ_VAL 16 /* SRM */ -#define DA7219_SRM_CHECK_RETRIES 8 +#define DA7219_SRM_CHECK_RETRIES 1 /* System Controller */ #define DA7219_SYS_STAT_CHECK_RETRIES 6 -- 2.7.4

4 8

[alsa-devel] [PATCH] ALSA: hda: hdmi - Keep old slot assignment behavior for Intel platforms
by Takashi Iwai 03 Dec '19

03 Dec '19

The commit 609f5485344b ("ALSA: hda: hdmi - preserve non-MST PCM routing for Intel platforms") tried to restore the old behavior wrt assignment of the PCM slot for Intel platforms, but this didn't do it right. As found in the later discussion, even on non-MST, a positive pipe id is passed, which is equivalent with dev_id on Intel. This patch reverts the previous attempt and applies a simpler workaround instead. Actually, for Intel platforms, we can handle as if per_pin->dev_id=0, assign the primary slot at the first try. This assures the compatible behavior with the previous versions regarding the slot assignment. Fixes: 609f5485344b ("ALSA: hda: hdmi - preserve non-MST PCM routing for Intel platforms") Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/patch_hdmi.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index ed4e98a1057a..78647ee02339 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -1348,21 +1348,18 @@ static int hdmi_find_pcm_slot(struct hdmi_spec *spec, * with the legacy static per_pin-pcm assignment that existed in the * days before DP-MST. * + * Intel DP-MST prefers this legacy behavior for compatibility, too. + * * per_pin of m!=0 prefers to get pcm=(num_nids + (m - 1)). */ - if (per_pin->dev_id == 0) { + if (per_pin->dev_id == 0 || spec->intel_hsw_fixup) { if (!test_bit(per_pin->pin_nid_idx, &spec->pcm_bitmap)) return per_pin->pin_nid_idx; } else { i = spec->num_nids + (per_pin->dev_id - 1); if (i < spec->pcm_used && !(test_bit(i, &spec->pcm_bitmap))) return i; - - /* keep legacy assignment for dev_id>0 on Intel platforms */ - if (spec->intel_hsw_fixup) - if (!test_bit(per_pin->pin_nid_idx, &spec->pcm_bitmap)) - return per_pin->pin_nid_idx; } /* have a second try; check the area over num_nids */ -- 2.16.4

2 1

[alsa-devel] [PATCH 1/2] ALSA: hda: hdmi - fix kernel oops caused by invalid PCM idx
by Kai Vehmanen 03 Dec '19

03 Dec '19

Add additional check in hdmi_find_pcm_slot() to not return a pcm index that points to unallocated pcm. This could happen if codec driver is set up in codec->mst_no_extra_pcms mode. On some platforms, this leads to a kernel oops in snd_ctl_notify(), called via update_eld(). BugLink: https://github.com/thesofproject/linux/issues/1536 Fixes: 5398e94fb753 ALSA: hda - Add DP-MST support for NVIDIA codecs Signed-off-by: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> --- sound/pci/hda/patch_hdmi.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 373ca99b7a2f..c3940c197122 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -1335,24 +1335,24 @@ static int hdmi_find_pcm_slot(struct hdmi_spec *spec, int i; /* - * generic_hdmi_build_pcms() allocates (num_nids + dev_num - 1) - * number of pcms. + * generic_hdmi_build_pcms() may allocate extra PCMs on some + * platforms (with maximum of 'num_nids + dev_num - 1') * * The per_pin of pin_nid_idx=n and dev_id=m prefers to get pcm-n * if m==0. This guarantees that dynamic pcm assignments are compatible - * with the legacy static per_pin-pmc assignment that existed in the + * with the legacy static per_pin-pcm assignment that existed in the * days before DP-MST. * * per_pin of m!=0 prefers to get pcm=(num_nids + (m - 1)). */ - if (per_pin->dev_id == 0 && - !test_bit(per_pin->pin_nid_idx, &spec->pcm_bitmap)) - return per_pin->pin_nid_idx; - - if (per_pin->dev_id != 0 && - !(test_bit(spec->num_nids + (per_pin->dev_id - 1), - &spec->pcm_bitmap))) { - return spec->num_nids + (per_pin->dev_id - 1); + + if (per_pin->dev_id == 0) { + if (!test_bit(per_pin->pin_nid_idx, &spec->pcm_bitmap)) + return per_pin->pin_nid_idx; + } else { + i = spec->num_nids + (per_pin->dev_id - 1); + if (i < spec->pcm_used && !(test_bit(i, &spec->pcm_bitmap))) + return i; } /* have a second try; check the area over num_nids */ -- 2.17.1

3 12

[alsa-devel] [PATCH] ASoC: Intel: sst: Add missing include <linux/io.h>
by YueHaibing 03 Dec '19

03 Dec '19

Fix build error: sound/soc/intel/atom/sst/sst.c: In function intel_sst_interrupt_mrfld: sound/soc/intel/atom/sst/sst.c:93:5: error: implicit declaration of function memcpy_fromio; did you mean memcpy32_fromio? [-Werror=implicit-function-declaration] memcpy_fromio(msg->mailbox_data, ^~~~~~~~~~~~~ memcpy32_fromio Reported-by: Hulk Robot <hulkci(a)huawei.com> Signed-off-by: YueHaibing <yuehaibing(a)huawei.com> --- sound/soc/intel/atom/sst/sst.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/intel/atom/sst/sst.c b/sound/soc/intel/atom/sst/sst.c index fbecbb7..68bcec5 100644 --- a/sound/soc/intel/atom/sst/sst.c +++ b/sound/soc/intel/atom/sst/sst.c @@ -14,6 +14,7 @@ #include <linux/module.h> #include <linux/fs.h> #include <linux/interrupt.h> +#include <linux/io.h> #include <linux/firmware.h> #include <linux/pm_runtime.h> #include <linux/pm_qos.h> -- 2.7.4

3 2

[alsa-devel] alsa-utils say -c is sched_idle, but actually set sched_rr (BUG?)
by tommy 03 Dec '19

03 Dec '19

Hi, I'm not subscribed to the list. I was looking for uses of SCHED_IDLE in software in general when I stubled upon this. Although I have no personal interest in asla development, I thought it would be nice to report it here. alsa-project/alsa-utils commit 611249ae26f435429dbe1894e210704a723ee277 says: alsactl: add --nice and --sched-idle options The state management can run at low priority, add --nice and --sched-idle options to set the scheduler. Everywhere in the code it says SCHED_IDLE *except* for the actual call to sched_setscheduler() which instead sets the policy to SCHED_RR. I have looked twice to see that I don't miss anything obvious, and suspect this is an error, or that there should be a comment that explains this oddity. Kind regards, Tommy

2 1

[alsa-devel] [PATCH v12 3/6] ASoC: amd: Enabling I2S instance in DMA and DAI
by Ravulapati Vishnu vardhan rao 03 Dec '19

03 Dec '19

This patch adds I2S SP support in ACP PCM DMA and DAI. Added I2S support in DMA and DAI probe,its hw_params handling its open and close functionalities. This enables to open and close on the SP instance for playback and capture. Signed-off-by: Ravulapati Vishnu vardhan rao <Vishnuvardhanrao.Ravulapati(a)amd.com> --- sound/soc/amd/raven/acp3x-i2s.c | 123 +++++++++++++++++---- sound/soc/amd/raven/acp3x-pcm-dma.c | 214 ++++++++++++++++++++++++------------ sound/soc/amd/raven/acp3x.h | 77 ++++++++++--- 3 files changed, 309 insertions(+), 105 deletions(-) diff --git a/sound/soc/amd/raven/acp3x-i2s.c b/sound/soc/amd/raven/acp3x-i2s.c index cdc1c61..7f05782 100644 --- a/sound/soc/amd/raven/acp3x-i2s.c +++ b/sound/soc/amd/raven/acp3x-i2s.c @@ -28,10 +28,10 @@ static int acp3x_i2s_set_fmt(struct snd_soc_dai *cpu_dai, mode = fmt & SND_SOC_DAIFMT_FORMAT_MASK; switch (mode) { case SND_SOC_DAIFMT_I2S: - adata->tdm_mode = false; + adata->tdm_mode = TDM_DISABLE; break; case SND_SOC_DAIFMT_DSP_A: - adata->tdm_mode = true; + adata->tdm_mode = TDM_ENABLE; break; default: return -EINVAL; @@ -87,10 +87,22 @@ static int acp3x_i2s_hwparams(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) { struct i2s_stream_instance *rtd; + struct snd_soc_pcm_runtime *prtd; + struct snd_soc_card *card; + struct acp3x_platform_info *pinfo; u32 val; u32 reg_val; + prtd = substream->private_data; rtd = substream->runtime->private_data; + card = prtd->card; + pinfo = snd_soc_card_get_drvdata(card); + if (pinfo) { + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + rtd->i2s_instance = pinfo->play_i2s_instance; + else + rtd->i2s_instance = pinfo->cap_i2s_instance; + } /* These values are as per Hardware Spec */ switch (params_format(params)) { @@ -110,11 +122,25 @@ static int acp3x_i2s_hwparams(struct snd_pcm_substream *substream, default: return -EINVAL; } - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) - reg_val = mmACP_BTTDM_ITER; - else - reg_val = mmACP_BTTDM_IRER; - + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + reg_val = mmACP_BTTDM_ITER; + break; + case I2S_SP_INSTANCE: + default: + reg_val = mmACP_I2STDM_ITER; + } + } else { + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + reg_val = mmACP_BTTDM_IRER; + break; + case I2S_SP_INSTANCE: + default: + reg_val = mmACP_I2STDM_IRER; + } + } val = rv_readl(rtd->acp3x_base + reg_val); val = val | (rtd->xfer_resolution << 3); rv_writel(val, rtd->acp3x_base + reg_val); @@ -125,10 +151,21 @@ static int acp3x_i2s_trigger(struct snd_pcm_substream *substream, int cmd, struct snd_soc_dai *dai) { struct i2s_stream_instance *rtd; - u32 val, period_bytes; - int ret, reg_val; + struct snd_soc_pcm_runtime *prtd; + struct snd_soc_card *card; + struct acp3x_platform_info *pinfo; + u32 ret, val, period_bytes, reg_val, ier_val, water_val; + prtd = substream->private_data; rtd = substream->runtime->private_data; + card = prtd->card; + pinfo = snd_soc_card_get_drvdata(card); + if (pinfo) { + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + rtd->i2s_instance = pinfo->play_i2s_instance; + else + rtd->i2s_instance = pinfo->cap_i2s_instance; + } period_bytes = frames_to_bytes(substream->runtime, substream->runtime->period_size); switch (cmd) { @@ -138,31 +175,75 @@ static int acp3x_i2s_trigger(struct snd_pcm_substream *substream, rtd->bytescount = acp_get_byte_count(rtd, substream->stream); if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { - reg_val = mmACP_BTTDM_ITER; - rv_writel(period_bytes, rtd->acp3x_base + - mmACP_BT_TX_INTR_WATERMARK_SIZE); + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + water_val = + mmACP_BT_TX_INTR_WATERMARK_SIZE; + reg_val = mmACP_BTTDM_ITER; + ier_val = mmACP_BTTDM_IER; + break; + case I2S_SP_INSTANCE: + default: + water_val = + mmACP_I2S_TX_INTR_WATERMARK_SIZE; + reg_val = mmACP_I2STDM_ITER; + ier_val = mmACP_I2STDM_IER; + } } else { - reg_val = mmACP_BTTDM_IRER; - rv_writel(period_bytes, rtd->acp3x_base + - mmACP_BT_RX_INTR_WATERMARK_SIZE); + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + water_val = + mmACP_BT_RX_INTR_WATERMARK_SIZE; + reg_val = mmACP_BTTDM_IRER; + ier_val = mmACP_BTTDM_IER; + break; + case I2S_SP_INSTANCE: + default: + water_val = + mmACP_I2S_RX_INTR_WATERMARK_SIZE; + reg_val = mmACP_I2STDM_IRER; + ier_val = mmACP_I2STDM_IER; + } } + rv_writel(period_bytes, rtd->acp3x_base + water_val); val = rv_readl(rtd->acp3x_base + reg_val); val = val | BIT(0); rv_writel(val, rtd->acp3x_base + reg_val); - rv_writel(1, rtd->acp3x_base + mmACP_BTTDM_IER); + rv_writel(1, rtd->acp3x_base + ier_val); + ret = 0; break; case SNDRV_PCM_TRIGGER_STOP: case SNDRV_PCM_TRIGGER_SUSPEND: case SNDRV_PCM_TRIGGER_PAUSE_PUSH: - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) - reg_val = mmACP_BTTDM_ITER; - else - reg_val = mmACP_BTTDM_IRER; + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + reg_val = mmACP_BTTDM_ITER; + ier_val = mmACP_BTTDM_IER; + break; + case I2S_SP_INSTANCE: + default: + reg_val = mmACP_I2STDM_ITER; + ier_val = mmACP_I2STDM_IER; + } + } else { + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + reg_val = mmACP_BTTDM_IRER; + ier_val = mmACP_BTTDM_IER; + break; + case I2S_SP_INSTANCE: + default: + reg_val = mmACP_I2STDM_IRER; + ier_val = mmACP_I2STDM_IER; + } + } val = rv_readl(rtd->acp3x_base + reg_val); val = val & ~BIT(0); rv_writel(val, rtd->acp3x_base + reg_val); - rv_writel(0, rtd->acp3x_base + mmACP_BTTDM_IER); + rv_writel(0, rtd->acp3x_base + ier_val); + ret = 0; break; default: ret = -EINVAL; diff --git a/sound/soc/amd/raven/acp3x-pcm-dma.c b/sound/soc/amd/raven/acp3x-pcm-dma.c index f8ad7ce..77f2ed5 100644 --- a/sound/soc/amd/raven/acp3x-pcm-dma.c +++ b/sound/soc/amd/raven/acp3x-pcm-dma.c @@ -194,15 +194,31 @@ static irqreturn_t i2s_irq_handler(int irq, void *dev_id) static void config_acp3x_dma(struct i2s_stream_instance *rtd, int direction) { u16 page_idx; - u32 low, high, val, acp_fifo_addr; - dma_addr_t addr = rtd->dma_addr; + u32 low, high, val, acp_fifo_addr, reg_fifo_addr; + u32 reg_ringbuf_size, reg_dma_size, reg_fifo_size; + dma_addr_t addr; - /* 8 scratch registers used to map one 64 bit address */ - if (direction == SNDRV_PCM_STREAM_PLAYBACK) - val = 0; - else - val = rtd->num_pages * 8; + addr = rtd->dma_addr; + if (direction == SNDRV_PCM_STREAM_PLAYBACK) { + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + val = ACP_SRAM_BT_PB_PTE_OFFSET; + break; + case I2S_SP_INSTANCE: + default: + val = ACP_SRAM_SP_PB_PTE_OFFSET; + } + } else { + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + val = ACP_SRAM_BT_CP_PTE_OFFSET; + break; + case I2S_SP_INSTANCE: + default: + val = ACP_SRAM_SP_CP_PTE_OFFSET; + } + } /* Group Enable */ rv_writel(ACP_SRAM_PTE_OFFSET | BIT(31), rtd->acp3x_base + mmACPAXI2AXI_ATU_BASE_ADDR_GRP_1); @@ -224,38 +240,61 @@ static void config_acp3x_dma(struct i2s_stream_instance *rtd, int direction) } if (direction == SNDRV_PCM_STREAM_PLAYBACK) { - /* Config ringbuffer */ - rv_writel(MEM_WINDOW_START, rtd->acp3x_base + - mmACP_BT_TX_RINGBUFADDR); - rv_writel(MAX_BUFFER, rtd->acp3x_base + - mmACP_BT_TX_RINGBUFSIZE); - rv_writel(DMA_SIZE, rtd->acp3x_base + mmACP_BT_TX_DMA_SIZE); - - /* Config audio fifo */ - acp_fifo_addr = ACP_SRAM_PTE_OFFSET + (rtd->num_pages * 8) - + PLAYBACK_FIFO_ADDR_OFFSET; - rv_writel(acp_fifo_addr, rtd->acp3x_base + - mmACP_BT_TX_FIFOADDR); - rv_writel(FIFO_SIZE, rtd->acp3x_base + mmACP_BT_TX_FIFOSIZE); + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + reg_ringbuf_size = mmACP_BT_TX_RINGBUFSIZE; + reg_dma_size = mmACP_BT_TX_DMA_SIZE; + acp_fifo_addr = ACP_SRAM_PTE_OFFSET + + BT_PB_FIFO_ADDR_OFFSET; + reg_fifo_addr = mmACP_BT_TX_FIFOADDR; + reg_fifo_size = mmACP_BT_TX_FIFOSIZE; + rv_writel(I2S_BT_TX_MEM_WINDOW_START, + rtd->acp3x_base + mmACP_BT_TX_RINGBUFADDR); + break; + + case I2S_SP_INSTANCE: + default: + reg_ringbuf_size = mmACP_I2S_TX_RINGBUFSIZE; + reg_dma_size = mmACP_I2S_TX_DMA_SIZE; + acp_fifo_addr = ACP_SRAM_PTE_OFFSET + + SP_PB_FIFO_ADDR_OFFSET; + reg_fifo_addr = mmACP_I2S_TX_FIFOADDR; + reg_fifo_size = mmACP_I2S_TX_FIFOSIZE; + rv_writel(I2S_SP_TX_MEM_WINDOW_START, + rtd->acp3x_base + mmACP_I2S_TX_RINGBUFADDR); + } } else { - /* Config ringbuffer */ - rv_writel(MEM_WINDOW_START + MAX_BUFFER, rtd->acp3x_base + - mmACP_BT_RX_RINGBUFADDR); - rv_writel(MAX_BUFFER, rtd->acp3x_base + - mmACP_BT_RX_RINGBUFSIZE); - rv_writel(DMA_SIZE, rtd->acp3x_base + mmACP_BT_RX_DMA_SIZE); - - /* Config audio fifo */ - acp_fifo_addr = ACP_SRAM_PTE_OFFSET + - (rtd->num_pages * 8) + CAPTURE_FIFO_ADDR_OFFSET; - rv_writel(acp_fifo_addr, rtd->acp3x_base + - mmACP_BT_RX_FIFOADDR); - rv_writel(FIFO_SIZE, rtd->acp3x_base + mmACP_BT_RX_FIFOSIZE); - } + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + reg_ringbuf_size = mmACP_BT_RX_RINGBUFSIZE; + reg_dma_size = mmACP_BT_RX_DMA_SIZE; + acp_fifo_addr = ACP_SRAM_PTE_OFFSET + + BT_CAPT_FIFO_ADDR_OFFSET; + reg_fifo_addr = mmACP_BT_RX_FIFOADDR; + reg_fifo_size = mmACP_BT_RX_FIFOSIZE; + rv_writel(I2S_BT_RX_MEM_WINDOW_START, + rtd->acp3x_base + mmACP_BT_RX_RINGBUFADDR); + break; - /* Enable watermark/period interrupt to host */ - rv_writel(BIT(BT_TX_THRESHOLD) | BIT(BT_RX_THRESHOLD), - rtd->acp3x_base + mmACP_EXTERNAL_INTR_CNTL); + case I2S_SP_INSTANCE: + default: + reg_ringbuf_size = mmACP_I2S_RX_RINGBUFSIZE; + reg_dma_size = mmACP_I2S_RX_DMA_SIZE; + acp_fifo_addr = ACP_SRAM_PTE_OFFSET + + SP_CAPT_FIFO_ADDR_OFFSET; + reg_fifo_addr = mmACP_I2S_RX_FIFOADDR; + reg_fifo_size = mmACP_I2S_RX_FIFOSIZE; + rv_writel(I2S_SP_RX_MEM_WINDOW_START, + rtd->acp3x_base + mmACP_I2S_RX_RINGBUFADDR); + } + } + rv_writel(MAX_BUFFER, rtd->acp3x_base + reg_ringbuf_size); + rv_writel(DMA_SIZE, rtd->acp3x_base + reg_dma_size); + rv_writel(acp_fifo_addr, rtd->acp3x_base + reg_fifo_addr); + rv_writel(FIFO_SIZE, rtd->acp3x_base + reg_fifo_size); + rv_writel(BIT(I2S_RX_THRESHOLD) | BIT(BT_RX_THRESHOLD) + | BIT(I2S_TX_THRESHOLD) | BIT(BT_TX_THRESHOLD), + rtd->acp3x_base + mmACP_EXTERNAL_INTR_CNTL); } static int acp3x_dma_open(struct snd_soc_component *component, @@ -288,17 +327,21 @@ static int acp3x_dma_open(struct snd_soc_component *component, return ret; } - if (!adata->play_stream && !adata->capture_stream) + if (!adata->play_stream && !adata->capture_stream && + adata->i2ssp_play_stream && !adata->i2ssp_capture_stream) rv_writel(1, adata->acp3x_base + mmACP_EXTERNAL_INTR_ENB); - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { adata->play_stream = substream; - else + adata->i2ssp_play_stream = substream; + } else { adata->capture_stream = substream; + adata->i2ssp_capture_stream = substream; + } i2s_data->acp3x_base = adata->acp3x_base; runtime->private_data = i2s_data; - return 0; + return ret; } @@ -306,16 +349,28 @@ static int acp3x_dma_hw_params(struct snd_soc_component *component, struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_pcm_runtime *runtime; struct i2s_stream_instance *rtd; + struct snd_soc_pcm_runtime *prtd; + struct snd_soc_card *card; + struct acp3x_platform_info *pinfo; int status; u64 size; - runtime = substream->runtime; - rtd = substream->private_data; + prtd = substream->private_data; + card = prtd->card; + pinfo = snd_soc_card_get_drvdata(card); + rtd = substream->runtime->private_data; if (!rtd) return -EINVAL; + if (pinfo) + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + rtd->i2s_instance = pinfo->play_i2s_instance; + else + rtd->i2s_instance = pinfo->cap_i2s_instance; + else + pr_err("pinfo failed\n"); + size = params_buffer_bytes(params); status = snd_pcm_lib_malloc_pages(substream, size); if (status < 0) @@ -336,12 +391,25 @@ static int acp3x_dma_hw_params(struct snd_soc_component *component, static snd_pcm_uframes_t acp3x_dma_pointer(struct snd_soc_component *component, struct snd_pcm_substream *substream) { + struct snd_soc_pcm_runtime *prtd; + struct snd_soc_card *card; + struct acp3x_platform_info *pinfo; struct i2s_stream_instance *rtd; u32 pos; u32 buffersize; u64 bytescount; + prtd = substream->private_data; + card = prtd->card; rtd = substream->runtime->private_data; + pinfo = snd_soc_card_get_drvdata(card); + if (pinfo) { + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + rtd->i2s_instance = pinfo->play_i2s_instance; + else + rtd->i2s_instance = pinfo->cap_i2s_instance; + } + buffersize = frames_to_bytes(substream->runtime, substream->runtime->buffer_size); bytescount = acp_get_byte_count(rtd, substream->stream); @@ -386,15 +454,19 @@ static int acp3x_dma_close(struct snd_soc_component *component, component = snd_soc_rtdcom_lookup(prtd, DRV_NAME); adata = dev_get_drvdata(component->dev); - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { adata->play_stream = NULL; - else + adata->i2ssp_play_stream = NULL; + } else { adata->capture_stream = NULL; + adata->i2ssp_capture_stream = NULL; + } /* Disable ACP irq, when the current stream is being closed and * another stream is also not active. */ - if (!adata->play_stream && !adata->capture_stream) + if (!adata->play_stream && !adata->capture_stream && + !adata->i2ssp_play_stream && !adata->i2ssp_capture_stream) rv_writel(0, adata->acp3x_base + mmACP_EXTERNAL_INTR_ENB); return 0; } @@ -503,7 +575,7 @@ static int acp3x_resume(struct device *dev) { struct i2s_dev_data *adata; int status; - u32 val; + u32 val, reg_val, frmt_val; adata = dev_get_drvdata(dev); status = acp3x_init(adata->acp3x_base); @@ -514,32 +586,38 @@ static int acp3x_resume(struct device *dev) struct i2s_stream_instance *rtd = adata->play_stream->runtime->private_data; config_acp3x_dma(rtd, SNDRV_PCM_STREAM_PLAYBACK); - rv_writel((rtd->xfer_resolution << 3), - rtd->acp3x_base + mmACP_BTTDM_ITER); - if (adata->tdm_mode == true) { - rv_writel(adata->tdm_fmt, adata->acp3x_base + - mmACP_BTTDM_TXFRMT); - val = rv_readl(adata->acp3x_base + mmACP_BTTDM_ITER); - rv_writel((val | 0x2), adata->acp3x_base + - mmACP_BTTDM_ITER); + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + reg_val = mmACP_BTTDM_ITER; + frmt_val = mmACP_BTTDM_TXFRMT; + break; + case I2S_SP_INSTANCE: + default: + reg_val = mmACP_I2STDM_ITER; + frmt_val = mmACP_I2STDM_TXFRMT; } } - if (adata->capture_stream && adata->capture_stream->runtime) { struct i2s_stream_instance *rtd = adata->capture_stream->runtime->private_data; config_acp3x_dma(rtd, SNDRV_PCM_STREAM_CAPTURE); - rv_writel((rtd->xfer_resolution << 3), - rtd->acp3x_base + mmACP_BTTDM_IRER); - if (adata->tdm_mode == true) { - rv_writel(adata->tdm_fmt, adata->acp3x_base + - mmACP_BTTDM_RXFRMT); - val = rv_readl(adata->acp3x_base + mmACP_BTTDM_IRER); - rv_writel((val | 0x2), adata->acp3x_base + - mmACP_BTTDM_IRER); + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + reg_val = mmACP_BTTDM_IRER; + frmt_val = mmACP_BTTDM_RXFRMT; + break; + case I2S_SP_INSTANCE: + default: + reg_val = mmACP_I2STDM_IRER; + frmt_val = mmACP_I2STDM_RXFRMT; } } - + rv_writel((rtd->xfer_resolution << 3), rtd->acp3x_base + reg_val); + if (adata->tdm_mode == TDM_ENABLE) { + rv_writel(adata->tdm_fmt, adata->acp3x_base + frmt_val); + val = rv_readl(adata->acp3x_base + reg_val); + rv_writel(val | 0x2, adata->acp3x_base + reg_val); + } rv_writel(1, adata->acp3x_base + mmACP_EXTERNAL_INTR_ENB); return 0; } @@ -549,8 +627,8 @@ static int acp3x_pcm_runtime_suspend(struct device *dev) { struct i2s_dev_data *adata; int status; - adata = dev_get_drvdata(dev); + adata = dev_get_drvdata(dev); status = acp3x_deinit(adata->acp3x_base); if (status) dev_err(dev, "ACP de-init failed\n"); @@ -566,8 +644,8 @@ static int acp3x_pcm_runtime_resume(struct device *dev) { struct i2s_dev_data *adata; int status; - adata = dev_get_drvdata(dev); + adata = dev_get_drvdata(dev); status = acp3x_init(adata->acp3x_base); if (status) return -ENODEV; diff --git a/sound/soc/amd/raven/acp3x.h b/sound/soc/amd/raven/acp3x.h index a6c6d63..ed1acbc 100644 --- a/sound/soc/amd/raven/acp3x.h +++ b/sound/soc/amd/raven/acp3x.h @@ -7,6 +7,12 @@ #include "chip_offset_byte.h" +#define I2S_SP_INSTANCE 0x01 +#define I2S_BT_INSTANCE 0x02 + +#define TDM_ENABLE 1 +#define TDM_DISABLE 0 + #define ACP3x_DEVS 3 #define ACP3x_PHY_BASE_ADDRESS 0x1240000 #define ACP3x_I2S_MODE 0 @@ -17,8 +23,11 @@ #define ACP3x_BT_TDM_REG_START 0x1242800 #define ACP3x_BT_TDM_REG_END 0x1242810 #define I2S_MODE 0x04 +#define I2S_RX_THRESHOLD 27 +#define I2S_TX_THRESHOLD 28 #define BT_TX_THRESHOLD 26 #define BT_RX_THRESHOLD 25 +#define ACP_ERR_INTR_MASK 29 #define ACP3x_POWER_ON 0x00 #define ACP3x_POWER_ON_IN_PROGRESS 0x01 #define ACP3x_POWER_OFF 0x02 @@ -26,19 +35,28 @@ #define ACP3x_SOFT_RESET__SoftResetAudDone_MASK 0x00010001 #define ACP_SRAM_PTE_OFFSET 0x02050000 +#define ACP_SRAM_SP_PB_PTE_OFFSET 0x0 +#define ACP_SRAM_SP_CP_PTE_OFFSET 0x100 +#define ACP_SRAM_BT_PB_PTE_OFFSET 0x200 +#define ACP_SRAM_BT_CP_PTE_OFFSET 0x300 #define PAGE_SIZE_4K_ENABLE 0x2 -#define MEM_WINDOW_START 0x4000000 -#define PLAYBACK_FIFO_ADDR_OFFSET 0x400 -#define CAPTURE_FIFO_ADDR_OFFSET 0x500 +#define I2S_SP_TX_MEM_WINDOW_START 0x4000000 +#define I2S_SP_RX_MEM_WINDOW_START 0x4020000 +#define I2S_BT_TX_MEM_WINDOW_START 0x4040000 +#define I2S_BT_RX_MEM_WINDOW_START 0x4060000 +#define SP_PB_FIFO_ADDR_OFFSET 0x500 +#define SP_CAPT_FIFO_ADDR_OFFSET 0x700 +#define BT_PB_FIFO_ADDR_OFFSET 0x900 +#define BT_CAPT_FIFO_ADDR_OFFSET 0xB00 #define PLAYBACK_MIN_NUM_PERIODS 2 #define PLAYBACK_MAX_NUM_PERIODS 8 -#define PLAYBACK_MAX_PERIOD_SIZE 16384 -#define PLAYBACK_MIN_PERIOD_SIZE 4096 +#define PLAYBACK_MAX_PERIOD_SIZE 8192 +#define PLAYBACK_MIN_PERIOD_SIZE 1024 #define CAPTURE_MIN_NUM_PERIODS 2 #define CAPTURE_MAX_NUM_PERIODS 8 -#define CAPTURE_MAX_PERIOD_SIZE 16384 -#define CAPTURE_MIN_PERIOD_SIZE 4096 +#define CAPTURE_MAX_PERIOD_SIZE 8192 +#define CAPTURE_MIN_PERIOD_SIZE 1024 #define MAX_BUFFER (PLAYBACK_MAX_PERIOD_SIZE * PLAYBACK_MAX_NUM_PERIODS) #define MIN_BUFFER MAX_BUFFER @@ -65,14 +83,20 @@ struct i2s_dev_data { void __iomem *acp3x_base; struct snd_pcm_substream *play_stream; struct snd_pcm_substream *capture_stream; + struct snd_pcm_substream *i2ssp_play_stream; + struct snd_pcm_substream *i2ssp_capture_stream; }; struct i2s_stream_instance { u16 num_pages; + u16 i2s_instance; + u16 capture_channel; + u16 direction; u16 channels; u32 xfer_resolution; - u64 bytescount; + u32 val; dma_addr_t dma_addr; + u64 bytescount; void __iomem *acp3x_base; }; @@ -92,15 +116,36 @@ static inline u64 acp_get_byte_count(struct i2s_stream_instance *rtd, u64 byte_count; if (direction == SNDRV_PCM_STREAM_PLAYBACK) { - byte_count = rv_readl(rtd->acp3x_base + - mmACP_BT_TX_LINEARPOSITIONCNTR_HIGH); - byte_count |= rv_readl(rtd->acp3x_base + - mmACP_BT_TX_LINEARPOSITIONCNTR_LOW); + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + byte_count = rv_readl(rtd->acp3x_base + + mmACP_BT_TX_LINEARPOSITIONCNTR_HIGH); + byte_count |= rv_readl(rtd->acp3x_base + + mmACP_BT_TX_LINEARPOSITIONCNTR_LOW); + break; + case I2S_SP_INSTANCE: + default: + byte_count = rv_readl(rtd->acp3x_base + + mmACP_I2S_TX_LINEARPOSITIONCNTR_HIGH); + byte_count |= rv_readl(rtd->acp3x_base + + mmACP_I2S_TX_LINEARPOSITIONCNTR_LOW); + } + } else { - byte_count = rv_readl(rtd->acp3x_base + - mmACP_BT_RX_LINEARPOSITIONCNTR_HIGH); - byte_count |= rv_readl(rtd->acp3x_base + - mmACP_BT_RX_LINEARPOSITIONCNTR_LOW); + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + byte_count = rv_readl(rtd->acp3x_base + + mmACP_BT_RX_LINEARPOSITIONCNTR_HIGH); + byte_count |= rv_readl(rtd->acp3x_base + + mmACP_BT_RX_LINEARPOSITIONCNTR_LOW); + break; + case I2S_SP_INSTANCE: + default: + byte_count = rv_readl(rtd->acp3x_base + + mmACP_I2S_RX_LINEARPOSITIONCNTR_HIGH); + byte_count |= rv_readl(rtd->acp3x_base + + mmACP_I2S_RX_LINEARPOSITIONCNTR_LOW); + } } return byte_count; } -- 2.7.4

2 1

[alsa-devel] [RESEND PATCH v12 4/6] ASoC: amd: add ACP3x TDM mode support
by Ravulapati Vishnu vardhan rao 03 Dec '19

03 Dec '19

ACP3x I2S (CPU DAI) can act in normal I2S and TDM modes. Added support for TDM mode. Desired mode can be selected from ASoC machine driver. Signed-off-by: Ravulapati Vishnu vardhan rao <Vishnuvardhanrao.Ravulapati(a)amd.com> --- sound/soc/amd/raven/acp3x-i2s.c | 24 ++++++++++++++++++++---- sound/soc/amd/raven/acp3x.h | 1 + 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/sound/soc/amd/raven/acp3x-i2s.c b/sound/soc/amd/raven/acp3x-i2s.c index 7f05782..cea7311 100644 --- a/sound/soc/amd/raven/acp3x-i2s.c +++ b/sound/soc/amd/raven/acp3x-i2s.c @@ -70,11 +70,27 @@ static int acp3x_i2s_set_tdm_slot(struct snd_soc_dai *cpu_dai, frm_len = FRM_LEN | (slots << 15) | (slot_len << 18); if (adata->substream_type == SNDRV_PCM_STREAM_PLAYBACK) { - reg_val = mmACP_BTTDM_ITER; - frmt_val = mmACP_BTTDM_TXFRMT; + switch (adata->i2s_instance) { + case I2S_BT_INSTANCE: + reg_val = mmACP_BTTDM_ITER; + frmt_reg = mmACP_BTTDM_TXFRMT; + break; + case I2S_SP_INSTANCE: + default: + reg_val = mmACP_I2STDM_ITER; + frmt_reg = mmACP_I2STDM_TXFRMT; + } } else { - reg_val = mmACP_BTTDM_IRER; - frmt_val = mmACP_BTTDM_RXFRMT; + switch (adata->i2s_instance) { + case I2S_BT_INSTANCE: + reg_val = mmACP_BTTDM_IRER; + frmt_reg = mmACP_BTTDM_RXFRMT; + break; + case I2S_SP_INSTANCE: + default: + reg_val = mmACP_I2STDM_IRER; + frmt_reg = mmACP_I2STDM_RXFRMT; + } } val = rv_readl(adata->acp3x_base + reg_val); rv_writel(val | 0x2, adata->acp3x_base + reg_val); diff --git a/sound/soc/amd/raven/acp3x.h b/sound/soc/amd/raven/acp3x.h index ed1acbc..3c28644 100644 --- a/sound/soc/amd/raven/acp3x.h +++ b/sound/soc/amd/raven/acp3x.h @@ -78,6 +78,7 @@ struct acp3x_platform_info { struct i2s_dev_data { bool tdm_mode; unsigned int i2s_irq; + u16 i2s_instance; u32 tdm_fmt; u32 substream_type; void __iomem *acp3x_base; -- 2.7.4

2 1

[alsa-devel] [PATCH 01/11] ucm: docs: Add JackName value
by Curtis Malainey 03 Dec '19

03 Dec '19

This field represents the input device name for a jack detection line Signed-off-by: Curtis Malainey <cujomalainey(a)chromium.org> --- include/use-case.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/use-case.h b/include/use-case.h index 5cb4f31c..2051bd40 100644 --- a/include/use-case.h +++ b/include/use-case.h @@ -320,6 +320,8 @@ int snd_use_case_get_list(snd_use_case_mgr_t *uc_mgr, * trick upper software layers to e.g. automatically mute speakers when * headphones are plugged in, but that's application policy * configuration that doesn't belong to UCM configuration files. + * - JackName + * - Input name is the input device name for the jack */ int snd_use_case_get(snd_use_case_mgr_t *uc_mgr, const char *identifier, -- 2.24.0.432.g9d3f5f5b63-goog

4 34

Re: [alsa-devel] [PATCH v5 2/2] watchdog: mtk_wdt: mt8183: Add reset controller
by Guenter Roeck 03 Dec '19

03 Dec '19

On Mon, Nov 25, 2019 at 11:03:50AM +0800, Jiaxin Yu wrote: > From: "yong.liang" <yong.liang(a)mediatek.com> > > Add reset controller API in watchdog driver. > Besides watchdog, MTK toprgu module also provide sub-system (eg, audio, > camera, codec and connectivity) software reset functionality. > > Signed-off-by: yong.liang <yong.liang(a)mediatek.com> > Signed-off-by: jiaxin.yu <jiaxin.yu(a)mediatek.com> > Reviewed-by: Yingjoe Chen <yingjoe.chen(a)mediatek.com> > --- > drivers/watchdog/Kconfig | 1 + > drivers/watchdog/mtk_wdt.c | 111 ++++++++++++++++++++++++++++++++++++- > 2 files changed, 111 insertions(+), 1 deletion(-) > > diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig > index 2e07caab9db2..629249fe5305 100644 > --- a/drivers/watchdog/Kconfig > +++ b/drivers/watchdog/Kconfig > @@ -717,6 +717,7 @@ config MEDIATEK_WATCHDOG > tristate "Mediatek SoCs watchdog support" > depends on ARCH_MEDIATEK || COMPILE_TEST > select WATCHDOG_CORE > + select RESET_CONTROLLER > help > Say Y here to include support for the watchdog timer > in Mediatek SoCs. > diff --git a/drivers/watchdog/mtk_wdt.c b/drivers/watchdog/mtk_wdt.c > index 9c3d0033260d..d29484c7940a 100644 > --- a/drivers/watchdog/mtk_wdt.c > +++ b/drivers/watchdog/mtk_wdt.c > @@ -9,6 +9,9 @@ > * Based on sunxi_wdt.c > */ > > +#include <dt-bindings/reset-controller/mt2712-resets.h> > +#include <dt-bindings/reset-controller/mt8183-resets.h> > +#include <linux/delay.h> > #include <linux/err.h> > #include <linux/init.h> > #include <linux/io.h> > @@ -16,10 +19,12 @@ > #include <linux/module.h> > #include <linux/moduleparam.h> > #include <linux/of.h> > +#include <linux/of_device.h> > #include <linux/platform_device.h> > +#include <linux/reset-controller.h> > +#include <linux/slab.h> > #include <linux/types.h> > #include <linux/watchdog.h> > -#include <linux/delay.h> > > #define WDT_MAX_TIMEOUT 31 > #define WDT_MIN_TIMEOUT 1 > @@ -44,6 +49,9 @@ > #define WDT_SWRST 0x14 > #define WDT_SWRST_KEY 0x1209 > > +#define WDT_SWSYSRST 0x18U > +#define WDT_SWSYS_RST_KEY 0x88000000 > + > #define DRV_NAME "mtk-wdt" > #define DRV_VERSION "1.0" > > @@ -53,8 +61,99 @@ static unsigned int timeout; > struct mtk_wdt_dev { > struct watchdog_device wdt_dev; > void __iomem *wdt_base; > + spinlock_t lock; /* protects WDT_SWSYSRST reg */ > + struct reset_controller_dev rcdev; > +}; > + > +struct mtk_wdt_data { > + int sw_rst_num; > }; > > +static const struct mtk_wdt_data mt2712_data = { > + .sw_rst_num = MT2712_TOPRGU_SW_RST_NUM, > +}; > + > +static const struct mtk_wdt_data mt8183_data = { > + .sw_rst_num = MT8183_TOPRGU_SW_RST_NUM, > +}; The number of resets can be set in .data directly; there is no need for the structures. > + > +static int toprgu_reset_assert(struct reset_controller_dev *rcdev, > + unsigned long id) > +{ > + unsigned int tmp; > + unsigned long flags; > + struct mtk_wdt_dev *data = > + container_of(rcdev, struct mtk_wdt_dev, rcdev); > + > + spin_lock_irqsave(&data->lock, flags); > + > + tmp = __raw_readl(data->wdt_base + WDT_SWSYSRST); > + tmp |= BIT(id); > + tmp |= WDT_SWSYS_RST_KEY; > + writel(tmp, data->wdt_base + WDT_SWSYSRST); > + > + spin_unlock_irqrestore(&data->lock, flags); > + > + return 0; > +} > + > +static int toprgu_reset_deassert(struct reset_controller_dev *rcdev, > + unsigned long id) > +{ > + unsigned int tmp; > + unsigned long flags; > + struct mtk_wdt_dev *data = > + container_of(rcdev, struct mtk_wdt_dev, rcdev); > + > + spin_lock_irqsave(&data->lock, flags); > + > + tmp = __raw_readl(data->wdt_base + WDT_SWSYSRST); > + tmp &= ~BIT(id); > + tmp |= WDT_SWSYS_RST_KEY; > + writel(tmp, data->wdt_base + WDT_SWSYSRST); > + > + spin_unlock_irqrestore(&data->lock, flags); > + > + return 0; > +} There is a lot of duplication in those functions. Only one line is different. I think this is a good example where a helper function with an additional argument indicating set or reset would be helpful. > + > +static int toprgu_reset(struct reset_controller_dev *rcdev, > + unsigned long id) > +{ > + int ret; > + > + ret = toprgu_reset_assert(rcdev, id); > + if (ret) > + return ret; > + > + return toprgu_reset_deassert(rcdev, id); > +} > + > +static const struct reset_control_ops toprgu_reset_ops = { > + .assert = toprgu_reset_assert, > + .deassert = toprgu_reset_deassert, > + .reset = toprgu_reset, > +}; > + > +static int toprgu_register_reset_controller(struct platform_device *pdev, > + int rst_num) > +{ > + int ret; > + struct mtk_wdt_dev *mtk_wdt = platform_get_drvdata(pdev); > + > + spin_lock_init(&mtk_wdt->lock); > + > + mtk_wdt->rcdev.owner = THIS_MODULE; > + mtk_wdt->rcdev.nr_resets = rst_num; > + mtk_wdt->rcdev.ops = &toprgu_reset_ops; > + mtk_wdt->rcdev.of_node = pdev->dev.of_node; > + ret = reset_controller_register(&mtk_wdt->rcdev); > + if (ret != 0) > + dev_err(&pdev->dev, > + "couldn't register wdt reset controller: %d\n", ret); > + return ret; > +} > + > static int mtk_wdt_restart(struct watchdog_device *wdt_dev, > unsigned long action, void *data) > { > @@ -155,6 +254,7 @@ static int mtk_wdt_probe(struct platform_device *pdev) > { > struct device *dev = &pdev->dev; > struct mtk_wdt_dev *mtk_wdt; > + struct mtk_wdt_data *wdt_data; > int err; > > mtk_wdt = devm_kzalloc(dev, sizeof(*mtk_wdt), GFP_KERNEL); > @@ -190,6 +290,13 @@ static int mtk_wdt_probe(struct platform_device *pdev) > dev_info(dev, "Watchdog enabled (timeout=%d sec, nowayout=%d)\n", > mtk_wdt->wdt_dev.timeout, nowayout); > > + wdt_data = (struct mtk_wdt_data *)of_device_get_match_data(dev); > + if (wdt_data) { > + err = toprgu_register_reset_controller(pdev, > + wdt_data->sw_rst_num); > + if (err) > + return err; If this happens, the user will wonder why there was a message "Watchdog enabled", but there is no watchdog. It would be better to call this function before the dev_info() above. Guenter > + } > return 0; > } > > @@ -218,7 +325,9 @@ static int mtk_wdt_resume(struct device *dev) > #endif > > static const struct of_device_id mtk_wdt_dt_ids[] = { > + { .compatible = "mediatek,mt2712-wdt", .data = &mt2712_data }, > { .compatible = "mediatek,mt6589-wdt" }, > + { .compatible = "mediatek,mt8183-wdt", .data = &mt8183_data }, > { /* sentinel */ } > }; > MODULE_DEVICE_TABLE(of, mtk_wdt_dt_ids); > -- > 2.18.0

3 6

[alsa-devel] simple card, asymetrical configuration
by Michael Walle 03 Dec '19

03 Dec '19

Hi Kuninori, there seems to be a problem in the simple-card using the following device tree fragment: sound { compatible = "simple-audio-card"; simple-audio-card,format = "i2s"; [snip] simple-audio-card,bitclock-master = <&dailink0_master>; simple-audio-card,frame-master = <&dailink0_master>; simple-audio-card,cpu@0 { sound-dai = <&sai6>; }; simple-audio-card,cpu@1 { sound-dai = <&sai5>; }; dailink0_master: simple-audio-card,codec { sound-dai = <&wm8904>; }; }; Just for the background, I have hardware with the LS1028A which only have unidirectional SAIs. But two of those SAIs (one for playback and one for capture) are connected to one codec (with a shared bit and frame clock). So I thought the example in the simple-card bindings makes sense for my case. Although I don't really know what "(Mixing)" means. Nevertheless, using the fragment above, the kernel oopses or fails to probe the hardware. I've traced that back to the following: - the count is correct: the kernel reports "link 2, dais 3, ccnf 0". please note the 3 dais here. - but simple_dai_link_of() will always "allocate" two dais from the pool: cpu_dai = dai_props->cpu_dai = &priv->dais[li->dais++]; codec_dai = dai_props->codec_dai = &priv->dais[li->dais++]; While this still works for the first link, the second one will fail because codec_dai will not be valid. Btw, converting that to two explicit dai-link nodes, the dai count will be 4 and it will work. Is my use case correct or should I use the two explicit dai-link nodes? But in any case there seems to be a bug in simple-card. -michael

2 3

[alsa-devel] [PATCH 00/10] ASoC: SOF: initial cleanup for DT and multi-client support
by Pierre-Louis Bossart 03 Dec '19

03 Dec '19

This series does not add new functionality but introduces a better code partition to support machine drivers in Device Tree, as well as a 'componentization' of the PCM/topology parts needed for multi-client support. This cleanup was merged in the SOF tree and tested extensively with no regressions identified. Thanks Ranjani and Daniel for combining your proposals in a single change. Daniel Baluta (2): ASoC: SOF: Make creation of machine device from SOF core optional ASoC: SOF: Remove unused drv_name in sof_pdata Ranjani Sridharan (8): ASoC: SOF: topology: remove snd_sof_init_topology() ASoC: SOF: core: modify the signature for snd_sof_create_page_table ASoC: SOF: core: move check for runtime callbacks to core ASoC: SOF: Introduce default_fw_filename member in sof_dev_desc ASoC: SOF: partition audio-related parts from SOF core ASoC: SOF: intel: hda: Modify signature for hda_codec_probe_bus() ASoC: SOF: remove nocodec_fw_filename ASoC: SOF: nocodec: Amend arguments for sof_nocodec_setup() include/sound/sof.h | 8 +- sound/soc/sof/Makefile | 2 +- sound/soc/sof/control.c | 55 ++-- sound/soc/sof/core.c | 244 +---------------- sound/soc/sof/intel/apl.c | 7 + sound/soc/sof/intel/bdw.c | 33 +++ sound/soc/sof/intel/byt.c | 45 ++++ sound/soc/sof/intel/cnl.c | 7 + sound/soc/sof/intel/hda-codec.c | 16 +- sound/soc/sof/intel/hda-dai.c | 1 + sound/soc/sof/intel/hda-pcm.c | 4 +- sound/soc/sof/intel/hda-stream.c | 1 + sound/soc/sof/intel/hda.c | 227 +++++++++------- sound/soc/sof/intel/hda.h | 8 +- sound/soc/sof/ipc.c | 16 +- sound/soc/sof/nocodec.c | 12 - sound/soc/sof/ops.h | 34 +++ sound/soc/sof/pcm.c | 131 +++++---- sound/soc/sof/pm.c | 219 +-------------- sound/soc/sof/sof-acpi-dev.c | 39 +-- sound/soc/sof/sof-audio.c | 445 +++++++++++++++++++++++++++++++ sound/soc/sof/sof-audio.h | 211 +++++++++++++++ sound/soc/sof/sof-of-dev.c | 24 +- sound/soc/sof/sof-pci-dev.c | 47 +--- sound/soc/sof/sof-priv.h | 202 +------------- sound/soc/sof/topology.c | 374 +++++++++++++------------- sound/soc/sof/trace.c | 4 +- sound/soc/sof/utils.c | 60 +++++ 28 files changed, 1321 insertions(+), 1155 deletions(-) create mode 100644 sound/soc/sof/sof-audio.c create mode 100644 sound/soc/sof/sof-audio.h -- 2.20.1

2 13

[alsa-devel] Integrating Texes Instruments PCM1860 ADC
by Umar Dockrat 02 Dec '19

02 Dec '19

Good Day, I have been struggling with the integration of a PCM1860 ADC for audio recording. I have created a "sound card" board that contains both a PCM5102A (DAC) and PCM1860 (ADC). The main processor is an Omega Onion 2 which is based on MediaTek MT7688 SoC device. I am struggling with creating the device tree as the Kernel currently has reference to the PCM186X where X is 2,3,4 or 5 but not the more simple PCM1860. The difference between the PCM1860 and the PCM186X is that the PCM1860 does not have I2C control and is HW configured using pull up/down. https://www.kernel.org/doc/Documentation/devicetree/bindings/sound/pcm186x.… I have tried multiple device tree setup's and have only got the DAC working when configured in isolation, as soon as I add any reference to the ADC then both DAC and ADC are not recognised. This DTSI allows the DAC to function https://pastebin.com/z9H67DHd There are my attempts at including the DAC and ADC: https://pastebin.com/RLsKNsiR https://pastebin.com/rmJVcCz1 Please can someone assist with the correct way to integrate this ADC device? Any suggestions on how to properly debug this further is also really appreciated. Thanks, UFD

1 0

[alsa-devel] [PATCH v2 00/15] ASoC: soc-core cleanup step6
by Kuninori Morimoto 02 Dec '19

02 Dec '19

Hi Mark These are v2 of soc-core cleanup step6. These doesn't add new features. Kuninori Morimoto (15): ASoC: soc-core: remove dai_link_list ASoC: soc-core: remove snd_soc_disconnect_sync() ASoC: soc-core: remove snd_soc_get_dai_substream() ASoC: soc-core: move snd_soc_get_pcm_runtime() ASoC: soc-core: find rtd via dai_link pointer at snd_soc_get_pcm_runtime() ASoC: soc-core: move snd_soc_find_dai_link() ASoC: soc-core: rename snd_soc_add_dai_link() to snd_soc_add_pcm_runtime() ASoC: soc-core: rename snd_soc_remove_dai_link() to snd_soc_remove_pcm_runtime() ASoC: soc-core: move soc_link_dai_pcm_new() ASoC: soc-core: rename soc_link_dai_pcm_new() to soc_dai_pcm_new() ASoC: soc-core: move soc_link_init() ASoC: soc-core: add missing return value check for soc_link_init() ASoC: soc-core: rename soc_link_init() to soc_init_pcm_runtime() ASoC: soc-core: soc_set_name_prefix(): tidyup loop condition ASoC: soc-core: soc_set_name_prefix(): get component device_node at out of loop include/sound/soc.h | 22 +-- sound/soc/fsl/fsl-asoc-card.c | 2 +- sound/soc/pxa/mioa701_wm9713.c | 2 +- sound/soc/samsung/bells.c | 12 +- sound/soc/samsung/littlemill.c | 10 +- sound/soc/samsung/snow.c | 2 +- sound/soc/samsung/speyside.c | 4 +- sound/soc/samsung/tm2_wm5110.c | 6 +- sound/soc/samsung/tobermory.c | 6 +- sound/soc/sh/rcar/core.c | 2 - sound/soc/soc-core.c | 339 ++++++++++++++++------------------------- sound/soc/soc-topology.c | 47 +++++- sound/soc/tegra/tegra_wm8903.c | 2 +- 13 files changed, 204 insertions(+), 252 deletions(-) -- 2.7.4

2 19

[alsa-devel] [PATCH v13 7/7] ASoC: amd MMAP INTERLEAVED Support
by Ravulapati Vishnu vardhan rao 02 Dec '19

02 Dec '19

Our device support MMAP_INTERLEAVED. Added support for the same. Signed-off-by: Ravulapati Vishnu vardhan rao <Vishnuvardhanrao.Ravulapati(a)amd.com> --- sound/soc/amd/raven/acp3x-pcm-dma.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sound/soc/amd/raven/acp3x-pcm-dma.c b/sound/soc/amd/raven/acp3x-pcm-dma.c index 916f0d8..28a3081 100644 --- a/sound/soc/amd/raven/acp3x-pcm-dma.c +++ b/sound/soc/amd/raven/acp3x-pcm-dma.c @@ -22,6 +22,7 @@ static const struct snd_pcm_hardware acp3x_pcm_hardware_playback = { .info = SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_BATCH | + SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME, .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S24_LE | @@ -42,7 +43,8 @@ static const struct snd_pcm_hardware acp3x_pcm_hardware_capture = { .info = SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_BATCH | - SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME, + SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID | + SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME, .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE, -- 2.7.4

1 0

[alsa-devel] [PATCH v13 6/7] ASoC: amd: Added ACP3x system resume and runtime pm
by Ravulapati Vishnu vardhan rao 02 Dec '19

02 Dec '19

When system wide suspend happens, ACP will be powered off and when system resumes,for audio usecase to continue,all the runtime configuration data needs to be programmed again. Added resume pm call back to ACP pm ops and also added runtime PM operations for ACP3x PCM platform device. Device will enter into D3 state when there is no activity on audio I2S lines. Signed-off-by: Ravulapati Vishnu vardhan rao <Vishnuvardhanrao.Ravulapati(a)amd.com> --- sound/soc/amd/raven/acp3x-pcm-dma.c | 146 +----------------------------- sound/soc/amd/raven/acp3x.h | 7 ++ sound/soc/amd/raven/pci-acp3x.c | 173 ++++++++++++++++++++++++++++++++++-- 3 files changed, 178 insertions(+), 148 deletions(-) diff --git a/sound/soc/amd/raven/acp3x-pcm-dma.c b/sound/soc/amd/raven/acp3x-pcm-dma.c index 7a107ea..916f0d8 100644 --- a/sound/soc/amd/raven/acp3x-pcm-dma.c +++ b/sound/soc/amd/raven/acp3x-pcm-dma.c @@ -58,106 +58,6 @@ static const struct snd_pcm_hardware acp3x_pcm_hardware_capture = { .periods_max = CAPTURE_MAX_NUM_PERIODS, }; -static int acp3x_power_on(void __iomem *acp3x_base, bool on) -{ - u16 val, mask; - u32 timeout; - - if (on == true) { - val = 1; - mask = ACP3x_POWER_ON; - } else { - val = 0; - mask = ACP3x_POWER_OFF; - } - - rv_writel(val, acp3x_base + mmACP_PGFSM_CONTROL); - timeout = 0; - while (true) { - val = rv_readl(acp3x_base + mmACP_PGFSM_STATUS); - if ((val & ACP3x_POWER_OFF_IN_PROGRESS) == mask) - break; - if (timeout > 100) { - pr_err("ACP3x power state change failure\n"); - return -ENODEV; - } - timeout++; - cpu_relax(); - } - return 0; -} - -static int acp3x_reset(void __iomem *acp3x_base) -{ - u32 val, timeout; - - rv_writel(1, acp3x_base + mmACP_SOFT_RESET); - timeout = 0; - while (true) { - val = rv_readl(acp3x_base + mmACP_SOFT_RESET); - if ((val & ACP3x_SOFT_RESET__SoftResetAudDone_MASK) || - timeout > 100) { - if (val & ACP3x_SOFT_RESET__SoftResetAudDone_MASK) - break; - return -ENODEV; - } - timeout++; - cpu_relax(); - } - - rv_writel(0, acp3x_base + mmACP_SOFT_RESET); - timeout = 0; - while (true) { - val = rv_readl(acp3x_base + mmACP_SOFT_RESET); - if (!val || timeout > 100) { - if (!val) - break; - return -ENODEV; - } - timeout++; - cpu_relax(); - } - return 0; -} - -static int acp3x_init(void __iomem *acp3x_base) -{ - int ret; - - /* power on */ - ret = acp3x_power_on(acp3x_base, true); - if (ret) { - pr_err("ACP3x power on failed\n"); - return ret; - } - /* Reset */ - ret = acp3x_reset(acp3x_base); - if (ret) { - pr_err("ACP3x reset failed\n"); - return ret; - } - return 0; -} - -static int acp3x_deinit(void __iomem *acp3x_base) -{ - int ret; - - /* Reset */ - ret = acp3x_reset(acp3x_base); - if (ret) { - pr_err("ACP3x reset failed\n"); - return ret; - } - /* power off */ - ret = acp3x_power_on(acp3x_base, false); - if (ret) { - pr_err("ACP3x power off failed\n"); - return ret; - } - return 0; -} - static irqreturn_t i2s_irq_handler(int irq, void *dev_id) { struct i2s_dev_data *rv_i2s_data; @@ -502,7 +402,7 @@ static int acp3x_audio_probe(struct platform_device *pdev) struct resource *res; struct i2s_dev_data *adata; unsigned int irqflags; - int status, ret; + int status; if (!pdev->dev.platform_data) { dev_err(&pdev->dev, "platform_data not retrieved\n"); @@ -534,53 +434,28 @@ static int acp3x_audio_probe(struct platform_device *pdev) adata->i2s_irq = res->start; dev_set_drvdata(&pdev->dev, adata); - /* Initialize ACP */ - status = acp3x_init(adata->acp3x_base); - if (status) - return -ENODEV; - status = devm_snd_soc_register_component(&pdev->dev, &acp3x_i2s_component, NULL, 0); if (status) { dev_err(&pdev->dev, "Fail to register acp i2s component\n"); - ret = -ENODEV; - goto dev_err; + return -ENODEV; } status = devm_request_irq(&pdev->dev, adata->i2s_irq, i2s_irq_handler, irqflags, "ACP3x_I2S_IRQ", adata); if (status) { dev_err(&pdev->dev, "ACP3x I2S IRQ request failed\n"); - ret = -ENODEV; - goto dev_err; + return -ENODEV; } pm_runtime_set_autosuspend_delay(&pdev->dev, 5000); pm_runtime_use_autosuspend(&pdev->dev); pm_runtime_enable(&pdev->dev); return 0; - -dev_err: - status = acp3x_deinit(adata->acp3x_base); - if (status) - dev_err(&pdev->dev, "ACP de-init failed\n"); - else - dev_dbg(&pdev->dev, "ACP de-initialized\n"); - return ret; } static int acp3x_audio_remove(struct platform_device *pdev) { - struct i2s_dev_data *adata; - int ret; - - adata = dev_get_drvdata(&pdev->dev); - ret = acp3x_deinit(adata->acp3x_base); - if (ret) - dev_err(&pdev->dev, "ACP de-init failed\n"); - else - dev_dbg(&pdev->dev, "ACP de-initialized\n"); - pm_runtime_disable(&pdev->dev); return 0; } @@ -588,15 +463,11 @@ static int acp3x_audio_remove(struct platform_device *pdev) static int acp3x_resume(struct device *dev) { struct i2s_dev_data *adata; - int status; u32 val, reg_val, frmt_val; reg_val = 0; frmt_val = 0; adata = dev_get_drvdata(dev); - status = acp3x_init(adata->acp3x_base); - if (status) - return -ENODEV; if (adata->play_stream && adata->play_stream->runtime) { struct i2s_stream_instance *rtd = @@ -643,14 +514,8 @@ static int acp3x_resume(struct device *dev) static int acp3x_pcm_runtime_suspend(struct device *dev) { struct i2s_dev_data *adata; - int status; adata = dev_get_drvdata(dev); - status = acp3x_deinit(adata->acp3x_base); - if (status) - dev_err(dev, "ACP de-init failed\n"); - else - dev_dbg(dev, "ACP de-initialized\n"); rv_writel(0, adata->acp3x_base + mmACP_EXTERNAL_INTR_ENB); @@ -660,12 +525,9 @@ static int acp3x_pcm_runtime_suspend(struct device *dev) static int acp3x_pcm_runtime_resume(struct device *dev) { struct i2s_dev_data *adata; - int status; adata = dev_get_drvdata(dev); - status = acp3x_init(adata->acp3x_base); - if (status) - return -ENODEV; + rv_writel(1, adata->acp3x_base + mmACP_EXTERNAL_INTR_ENB); return 0; } diff --git a/sound/soc/amd/raven/acp3x.h b/sound/soc/amd/raven/acp3x.h index 3c28644..b64f8b0 100644 --- a/sound/soc/amd/raven/acp3x.h +++ b/sound/soc/amd/raven/acp3x.h @@ -68,6 +68,13 @@ #define SLOT_WIDTH_16 0x10 #define SLOT_WIDTH_24 0x18 #define SLOT_WIDTH_32 0x20 +#define ACP_PGFSM_CNTL_POWER_ON_MASK 0x01 +#define ACP_PGFSM_CNTL_POWER_OFF_MASK 0x00 +#define ACP_PGFSM_STATUS_MASK 0x03 +#define ACP_POWERED_ON 0x00 +#define ACP_POWER_ON_IN_PROGRESS 0x01 +#define ACP_POWERED_OFF 0x02 +#define ACP_POWER_OFF_IN_PROGRESS 0x03 struct acp3x_platform_info { u16 play_i2s_instance; diff --git a/sound/soc/amd/raven/pci-acp3x.c b/sound/soc/amd/raven/pci-acp3x.c index 94f5f21..d46a6d6 100644 --- a/sound/soc/amd/raven/pci-acp3x.c +++ b/sound/soc/amd/raven/pci-acp3x.c @@ -9,6 +9,9 @@ #include <linux/io.h> #include <linux/platform_device.h> #include <linux/interrupt.h> +#include <linux/pm_runtime.h> +#include <linux/delay.h> +#include <sound/pcm.h> #include "acp3x.h" @@ -19,6 +22,109 @@ struct acp3x_dev_data { struct platform_device *pdev[ACP3x_DEVS]; }; +static int acp3x_power_on(void __iomem *acp3x_base) +{ + u32 val; + int timeout; + + val = rv_readl(acp3x_base + mmACP_PGFSM_STATUS); + + if (val == 0) + return val; + + if (!((val & ACP_PGFSM_STATUS_MASK) == + ACP_POWER_ON_IN_PROGRESS)) + rv_writel(ACP_PGFSM_CNTL_POWER_ON_MASK, + acp3x_base + mmACP_PGFSM_CONTROL); + timeout = 0; + while (++timeout < 500) { + val = rv_readl(acp3x_base + mmACP_PGFSM_STATUS); + if (!val) + return 0; + udelay(1); + } + return -ETIMEDOUT; +} + +static int acp3x_power_off(void __iomem *acp3x_base) +{ + u32 val; + int timeout; + + rv_writel(ACP_PGFSM_CNTL_POWER_OFF_MASK, + acp3x_base + mmACP_PGFSM_CONTROL); + timeout = 0; + while (++timeout < 500) { + val = rv_readl(acp3x_base + mmACP_PGFSM_STATUS); + if ((val & ACP_PGFSM_STATUS_MASK) == ACP_POWERED_OFF) + return 0; + udelay(1); + } + return -ETIMEDOUT; +} + +static int acp3x_reset(void __iomem *acp3x_base) +{ + u32 val; + int timeout; + + rv_writel(1, acp3x_base + mmACP_SOFT_RESET); + timeout = 0; + while (++timeout < 500) { + val = rv_readl(acp3x_base + mmACP_SOFT_RESET); + if (val & ACP3x_SOFT_RESET__SoftResetAudDone_MASK) + return 0; + cpu_relax(); + } + rv_writel(0, acp3x_base + mmACP_SOFT_RESET); + timeout = 0; + while (++timeout < 500) { + val = rv_readl(acp3x_base + mmACP_SOFT_RESET); + if (!val) + return 0; + cpu_relax(); + } + return -ETIMEDOUT; +} + +static int acp3x_init(void __iomem *acp3x_base) +{ + int ret; + + /* power on */ + ret = acp3x_power_on(acp3x_base); + if (ret) { + pr_err("ACP3x power on failed\n"); + return ret; + } + /* Reset */ + ret = acp3x_reset(acp3x_base); + if (ret) { + pr_err("ACP3x reset failed\n"); + return ret; + } + return 0; +} + +static int acp3x_deinit(void __iomem *acp3x_base) +{ + int ret; + + /* Reset */ + ret = acp3x_reset(acp3x_base); + if (ret) { + pr_err("ACP3x reset failed\n"); + return ret; + } + /* power off */ + ret = acp3x_power_off(acp3x_base); + if (ret) { + pr_err("ACP3x power off failed\n"); + return ret; + } + return 0; +} + static int snd_acp3x_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) { @@ -64,6 +170,9 @@ static int snd_acp3x_probe(struct pci_dev *pci, } pci_set_master(pci); pci_set_drvdata(pci, adata); + ret = acp3x_init(adata->acp3x_base); + if (ret) + goto disable_msi; val = rv_readl(adata->acp3x_base + mmACP_I2S_PIN_CONFIG); switch (val) { @@ -73,7 +182,7 @@ static int snd_acp3x_probe(struct pci_dev *pci, GFP_KERNEL); if (!adata->res) { ret = -ENOMEM; - goto disable_msi; + goto de_init; } adata->res[0].name = "acp3x_i2s_iomem"; @@ -118,7 +227,7 @@ static int snd_acp3x_probe(struct pci_dev *pci, pdevinfo[2].parent = &pci->dev; pdevinfo[2].num_res = 1; pdevinfo[2].res = &adata->res[2]; - for (i = 0; i < ACP3x_DEVS ; i++) { + for (i = 0; i < ACP3x_DEVS; i++) { adata->pdev[i] = platform_device_register_full(&pdevinfo[i]); if (IS_ERR(adata->pdev[i])) { @@ -134,12 +243,20 @@ static int snd_acp3x_probe(struct pci_dev *pci, ret = -ENODEV; goto disable_msi; } + pm_runtime_set_autosuspend_delay(&pci->dev, 5000); + pm_runtime_use_autosuspend(&pci->dev); + pm_runtime_set_active(&pci->dev); + pm_runtime_put_noidle(&pci->dev); + pm_runtime_enable(&pci->dev); return 0; unregister_devs: if (val == I2S_MODE) - for (i = 0 ; i < ACP3x_DEVS ; i++) + for (i = 0; i < ACP3x_DEVS; i++) platform_device_unregister(adata->pdev[i]); +de_init: + if (acp3x_deinit(adata->acp3x_base)) + dev_err(&pci->dev, "ACP de-init failed\n"); disable_msi: pci_disable_msi(pci); release_regions: @@ -150,15 +267,56 @@ static int snd_acp3x_probe(struct pci_dev *pci, return ret; } +static int snd_acp3x_suspend(struct device *dev) +{ + int ret; + struct acp3x_dev_data *adata; + + adata = dev_get_drvdata(dev); + ret = acp3x_deinit(adata->acp3x_base); + if (ret) + dev_err(dev, "ACP de-init failed\n"); + else + dev_dbg(dev, "ACP de-initialized\n"); + + return 0; +} + +static int snd_acp3x_resume(struct device *dev) +{ + int ret; + struct acp3x_dev_data *adata; + + adata = dev_get_drvdata(dev); + ret = acp3x_init(adata->acp3x_base); + if (ret) { + dev_err(dev, "ACP init failed\n"); + return ret; + } + return 0; +} + +static const struct dev_pm_ops acp3x_pm = { + .runtime_suspend = snd_acp3x_suspend, + .runtime_resume = snd_acp3x_resume, + .resume = snd_acp3x_resume, +}; + static void snd_acp3x_remove(struct pci_dev *pci) { - struct acp3x_dev_data *adata = pci_get_drvdata(pci); - int i; + struct acp3x_dev_data *adata; + int i, ret; + adata = pci_get_drvdata(pci); if (adata->acp3x_audio_mode == ACP3x_I2S_MODE) { - for (i = 0 ; i < ACP3x_DEVS ; i++) + for (i = 0; i < ACP3x_DEVS; i++) platform_device_unregister(adata->pdev[i]); } + ret = acp3x_deinit(adata->acp3x_base); + if (ret) + dev_err(&pci->dev, "ACP de-init failed\n"); + pm_runtime_disable(&pci->dev); + pm_runtime_get_noresume(&pci->dev); pci_disable_msi(pci); pci_release_regions(pci); pci_disable_device(pci); @@ -177,6 +335,9 @@ static struct pci_driver acp3x_driver = { .id_table = snd_acp3x_ids, .probe = snd_acp3x_probe, .remove = snd_acp3x_remove, + .driver = { + .pm = &acp3x_pm, + } }; module_pci_driver(acp3x_driver); -- 2.7.4

1 0

[alsa-devel] [PATCH v13 5/7] ASoC: amd: Handle ACP3x I2S-SP Interrupts.
by Ravulapati Vishnu vardhan rao 02 Dec '19

02 Dec '19

Enabled support for I2S-SP interrupt handling. Previous to this implementation, driver supports only interrupts on BT instance. Signed-off-by: Ravulapati Vishnu vardhan rao <Vishnuvardhanrao.Ravulapati(a)amd.com> --- sound/soc/amd/raven/acp3x-pcm-dma.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sound/soc/amd/raven/acp3x-pcm-dma.c b/sound/soc/amd/raven/acp3x-pcm-dma.c index 14ef38e..7a107ea 100644 --- a/sound/soc/amd/raven/acp3x-pcm-dma.c +++ b/sound/soc/amd/raven/acp3x-pcm-dma.c @@ -177,6 +177,13 @@ static irqreturn_t i2s_irq_handler(int irq, void *dev_id) snd_pcm_period_elapsed(rv_i2s_data->play_stream); play_flag = 1; } + if ((val & BIT(I2S_TX_THRESHOLD)) && + rv_i2s_data->i2ssp_play_stream) { + rv_writel(BIT(I2S_TX_THRESHOLD), + rv_i2s_data->acp3x_base + mmACP_EXTERNAL_INTR_STAT); + snd_pcm_period_elapsed(rv_i2s_data->i2ssp_play_stream); + play_flag = 1; + } if ((val & BIT(BT_RX_THRESHOLD)) && rv_i2s_data->capture_stream) { rv_writel(BIT(BT_RX_THRESHOLD), rv_i2s_data->acp3x_base + @@ -184,6 +191,13 @@ static irqreturn_t i2s_irq_handler(int irq, void *dev_id) snd_pcm_period_elapsed(rv_i2s_data->capture_stream); cap_flag = 1; } + if ((val & BIT(I2S_RX_THRESHOLD)) && + rv_i2s_data->i2ssp_capture_stream) { + rv_writel(BIT(I2S_RX_THRESHOLD), + rv_i2s_data->acp3x_base + mmACP_EXTERNAL_INTR_STAT); + snd_pcm_period_elapsed(rv_i2s_data->i2ssp_capture_stream); + cap_flag = 1; + } if (play_flag | cap_flag) return IRQ_HANDLED; -- 2.7.4

1 0

[alsa-devel] [PATCH v13 4/7] ASoC: amd: add ACP3x TDM mode support
by Ravulapati Vishnu vardhan rao 02 Dec '19

02 Dec '19

ACP3x I2S (CPU DAI) can act in normal I2S and TDM modes. Added support for TDM mode. Desired mode can be selected from ASoC machine driver. Signed-off-by: Ravulapati Vishnu vardhan rao <Vishnuvardhanrao.Ravulapati(a)amd.com> --- sound/soc/amd/raven/acp3x-i2s.c | 28 ++++++++++++++++++++++------ sound/soc/amd/raven/acp3x.h | 1 + 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/sound/soc/amd/raven/acp3x-i2s.c b/sound/soc/amd/raven/acp3x-i2s.c index 7f05782..0856e0c 100644 --- a/sound/soc/amd/raven/acp3x-i2s.c +++ b/sound/soc/amd/raven/acp3x-i2s.c @@ -43,7 +43,7 @@ static int acp3x_i2s_set_tdm_slot(struct snd_soc_dai *cpu_dai, u32 tx_mask, u32 rx_mask, int slots, int slot_width) { struct i2s_dev_data *adata; - u32 val, reg_val, frmt_val, frm_len; + u32 val, reg_val, frmt_reg, frm_len; u16 slot_len; adata = snd_soc_dai_get_drvdata(cpu_dai); @@ -70,15 +70,31 @@ static int acp3x_i2s_set_tdm_slot(struct snd_soc_dai *cpu_dai, frm_len = FRM_LEN | (slots << 15) | (slot_len << 18); if (adata->substream_type == SNDRV_PCM_STREAM_PLAYBACK) { - reg_val = mmACP_BTTDM_ITER; - frmt_val = mmACP_BTTDM_TXFRMT; + switch (adata->i2s_instance) { + case I2S_BT_INSTANCE: + reg_val = mmACP_BTTDM_ITER; + frmt_reg = mmACP_BTTDM_TXFRMT; + break; + case I2S_SP_INSTANCE: + default: + reg_val = mmACP_I2STDM_ITER; + frmt_reg = mmACP_I2STDM_TXFRMT; + } } else { - reg_val = mmACP_BTTDM_IRER; - frmt_val = mmACP_BTTDM_RXFRMT; + switch (adata->i2s_instance) { + case I2S_BT_INSTANCE: + reg_val = mmACP_BTTDM_IRER; + frmt_reg = mmACP_BTTDM_RXFRMT; + break; + case I2S_SP_INSTANCE: + default: + reg_val = mmACP_I2STDM_IRER; + frmt_reg = mmACP_I2STDM_RXFRMT; + } } val = rv_readl(adata->acp3x_base + reg_val); rv_writel(val | 0x2, adata->acp3x_base + reg_val); - rv_writel(frm_len, adata->acp3x_base + frmt_val); + rv_writel(frm_len, adata->acp3x_base + frmt_reg); adata->tdm_fmt = frm_len; return 0; } diff --git a/sound/soc/amd/raven/acp3x.h b/sound/soc/amd/raven/acp3x.h index ed1acbc..3c28644 100644 --- a/sound/soc/amd/raven/acp3x.h +++ b/sound/soc/amd/raven/acp3x.h @@ -78,6 +78,7 @@ struct acp3x_platform_info { struct i2s_dev_data { bool tdm_mode; unsigned int i2s_irq; + u16 i2s_instance; u32 tdm_fmt; u32 substream_type; void __iomem *acp3x_base; -- 2.7.4

1 0

[alsa-devel] [PATCH v13 3/7] ASoC: amd: Enabling I2S instance in DMA and DAI
by Ravulapati Vishnu vardhan rao 02 Dec '19

02 Dec '19

This patch adds I2S SP support in ACP PCM DMA and DAI. Added I2S support in DMA and DAI probe,its hw_params handling its open and close functionalities. This enables to open and close on the SP instance for playback and capture. Signed-off-by: Ravulapati Vishnu vardhan rao <Vishnuvardhanrao.Ravulapati(a)amd.com> --- sound/soc/amd/raven/acp3x-i2s.c | 123 ++++++++++++++++---- sound/soc/amd/raven/acp3x-pcm-dma.c | 217 +++++++++++++++++++++++++----------- sound/soc/amd/raven/acp3x.h | 77 ++++++++++--- 3 files changed, 312 insertions(+), 105 deletions(-) diff --git a/sound/soc/amd/raven/acp3x-i2s.c b/sound/soc/amd/raven/acp3x-i2s.c index cdc1c61..7f05782 100644 --- a/sound/soc/amd/raven/acp3x-i2s.c +++ b/sound/soc/amd/raven/acp3x-i2s.c @@ -28,10 +28,10 @@ static int acp3x_i2s_set_fmt(struct snd_soc_dai *cpu_dai, mode = fmt & SND_SOC_DAIFMT_FORMAT_MASK; switch (mode) { case SND_SOC_DAIFMT_I2S: - adata->tdm_mode = false; + adata->tdm_mode = TDM_DISABLE; break; case SND_SOC_DAIFMT_DSP_A: - adata->tdm_mode = true; + adata->tdm_mode = TDM_ENABLE; break; default: return -EINVAL; @@ -87,10 +87,22 @@ static int acp3x_i2s_hwparams(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) { struct i2s_stream_instance *rtd; + struct snd_soc_pcm_runtime *prtd; + struct snd_soc_card *card; + struct acp3x_platform_info *pinfo; u32 val; u32 reg_val; + prtd = substream->private_data; rtd = substream->runtime->private_data; + card = prtd->card; + pinfo = snd_soc_card_get_drvdata(card); + if (pinfo) { + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + rtd->i2s_instance = pinfo->play_i2s_instance; + else + rtd->i2s_instance = pinfo->cap_i2s_instance; + } /* These values are as per Hardware Spec */ switch (params_format(params)) { @@ -110,11 +122,25 @@ static int acp3x_i2s_hwparams(struct snd_pcm_substream *substream, default: return -EINVAL; } - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) - reg_val = mmACP_BTTDM_ITER; - else - reg_val = mmACP_BTTDM_IRER; - + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + reg_val = mmACP_BTTDM_ITER; + break; + case I2S_SP_INSTANCE: + default: + reg_val = mmACP_I2STDM_ITER; + } + } else { + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + reg_val = mmACP_BTTDM_IRER; + break; + case I2S_SP_INSTANCE: + default: + reg_val = mmACP_I2STDM_IRER; + } + } val = rv_readl(rtd->acp3x_base + reg_val); val = val | (rtd->xfer_resolution << 3); rv_writel(val, rtd->acp3x_base + reg_val); @@ -125,10 +151,21 @@ static int acp3x_i2s_trigger(struct snd_pcm_substream *substream, int cmd, struct snd_soc_dai *dai) { struct i2s_stream_instance *rtd; - u32 val, period_bytes; - int ret, reg_val; + struct snd_soc_pcm_runtime *prtd; + struct snd_soc_card *card; + struct acp3x_platform_info *pinfo; + u32 ret, val, period_bytes, reg_val, ier_val, water_val; + prtd = substream->private_data; rtd = substream->runtime->private_data; + card = prtd->card; + pinfo = snd_soc_card_get_drvdata(card); + if (pinfo) { + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + rtd->i2s_instance = pinfo->play_i2s_instance; + else + rtd->i2s_instance = pinfo->cap_i2s_instance; + } period_bytes = frames_to_bytes(substream->runtime, substream->runtime->period_size); switch (cmd) { @@ -138,31 +175,75 @@ static int acp3x_i2s_trigger(struct snd_pcm_substream *substream, rtd->bytescount = acp_get_byte_count(rtd, substream->stream); if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { - reg_val = mmACP_BTTDM_ITER; - rv_writel(period_bytes, rtd->acp3x_base + - mmACP_BT_TX_INTR_WATERMARK_SIZE); + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + water_val = + mmACP_BT_TX_INTR_WATERMARK_SIZE; + reg_val = mmACP_BTTDM_ITER; + ier_val = mmACP_BTTDM_IER; + break; + case I2S_SP_INSTANCE: + default: + water_val = + mmACP_I2S_TX_INTR_WATERMARK_SIZE; + reg_val = mmACP_I2STDM_ITER; + ier_val = mmACP_I2STDM_IER; + } } else { - reg_val = mmACP_BTTDM_IRER; - rv_writel(period_bytes, rtd->acp3x_base + - mmACP_BT_RX_INTR_WATERMARK_SIZE); + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + water_val = + mmACP_BT_RX_INTR_WATERMARK_SIZE; + reg_val = mmACP_BTTDM_IRER; + ier_val = mmACP_BTTDM_IER; + break; + case I2S_SP_INSTANCE: + default: + water_val = + mmACP_I2S_RX_INTR_WATERMARK_SIZE; + reg_val = mmACP_I2STDM_IRER; + ier_val = mmACP_I2STDM_IER; + } } + rv_writel(period_bytes, rtd->acp3x_base + water_val); val = rv_readl(rtd->acp3x_base + reg_val); val = val | BIT(0); rv_writel(val, rtd->acp3x_base + reg_val); - rv_writel(1, rtd->acp3x_base + mmACP_BTTDM_IER); + rv_writel(1, rtd->acp3x_base + ier_val); + ret = 0; break; case SNDRV_PCM_TRIGGER_STOP: case SNDRV_PCM_TRIGGER_SUSPEND: case SNDRV_PCM_TRIGGER_PAUSE_PUSH: - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) - reg_val = mmACP_BTTDM_ITER; - else - reg_val = mmACP_BTTDM_IRER; + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + reg_val = mmACP_BTTDM_ITER; + ier_val = mmACP_BTTDM_IER; + break; + case I2S_SP_INSTANCE: + default: + reg_val = mmACP_I2STDM_ITER; + ier_val = mmACP_I2STDM_IER; + } + } else { + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + reg_val = mmACP_BTTDM_IRER; + ier_val = mmACP_BTTDM_IER; + break; + case I2S_SP_INSTANCE: + default: + reg_val = mmACP_I2STDM_IRER; + ier_val = mmACP_I2STDM_IER; + } + } val = rv_readl(rtd->acp3x_base + reg_val); val = val & ~BIT(0); rv_writel(val, rtd->acp3x_base + reg_val); - rv_writel(0, rtd->acp3x_base + mmACP_BTTDM_IER); + rv_writel(0, rtd->acp3x_base + ier_val); + ret = 0; break; default: ret = -EINVAL; diff --git a/sound/soc/amd/raven/acp3x-pcm-dma.c b/sound/soc/amd/raven/acp3x-pcm-dma.c index 3150516..14ef38e 100644 --- a/sound/soc/amd/raven/acp3x-pcm-dma.c +++ b/sound/soc/amd/raven/acp3x-pcm-dma.c @@ -194,15 +194,31 @@ static irqreturn_t i2s_irq_handler(int irq, void *dev_id) static void config_acp3x_dma(struct i2s_stream_instance *rtd, int direction) { u16 page_idx; - u32 low, high, val, acp_fifo_addr; - dma_addr_t addr = rtd->dma_addr; + u32 low, high, val, acp_fifo_addr, reg_fifo_addr; + u32 reg_ringbuf_size, reg_dma_size, reg_fifo_size; + dma_addr_t addr; - /* 8 scratch registers used to map one 64 bit address */ - if (direction == SNDRV_PCM_STREAM_PLAYBACK) - val = 0; - else - val = rtd->num_pages * 8; + addr = rtd->dma_addr; + if (direction == SNDRV_PCM_STREAM_PLAYBACK) { + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + val = ACP_SRAM_BT_PB_PTE_OFFSET; + break; + case I2S_SP_INSTANCE: + default: + val = ACP_SRAM_SP_PB_PTE_OFFSET; + } + } else { + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + val = ACP_SRAM_BT_CP_PTE_OFFSET; + break; + case I2S_SP_INSTANCE: + default: + val = ACP_SRAM_SP_CP_PTE_OFFSET; + } + } /* Group Enable */ rv_writel(ACP_SRAM_PTE_OFFSET | BIT(31), rtd->acp3x_base + mmACPAXI2AXI_ATU_BASE_ADDR_GRP_1); @@ -224,38 +240,61 @@ static void config_acp3x_dma(struct i2s_stream_instance *rtd, int direction) } if (direction == SNDRV_PCM_STREAM_PLAYBACK) { - /* Config ringbuffer */ - rv_writel(MEM_WINDOW_START, rtd->acp3x_base + - mmACP_BT_TX_RINGBUFADDR); - rv_writel(MAX_BUFFER, rtd->acp3x_base + - mmACP_BT_TX_RINGBUFSIZE); - rv_writel(DMA_SIZE, rtd->acp3x_base + mmACP_BT_TX_DMA_SIZE); - - /* Config audio fifo */ - acp_fifo_addr = ACP_SRAM_PTE_OFFSET + (rtd->num_pages * 8) - + PLAYBACK_FIFO_ADDR_OFFSET; - rv_writel(acp_fifo_addr, rtd->acp3x_base + - mmACP_BT_TX_FIFOADDR); - rv_writel(FIFO_SIZE, rtd->acp3x_base + mmACP_BT_TX_FIFOSIZE); + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + reg_ringbuf_size = mmACP_BT_TX_RINGBUFSIZE; + reg_dma_size = mmACP_BT_TX_DMA_SIZE; + acp_fifo_addr = ACP_SRAM_PTE_OFFSET + + BT_PB_FIFO_ADDR_OFFSET; + reg_fifo_addr = mmACP_BT_TX_FIFOADDR; + reg_fifo_size = mmACP_BT_TX_FIFOSIZE; + rv_writel(I2S_BT_TX_MEM_WINDOW_START, + rtd->acp3x_base + mmACP_BT_TX_RINGBUFADDR); + break; + + case I2S_SP_INSTANCE: + default: + reg_ringbuf_size = mmACP_I2S_TX_RINGBUFSIZE; + reg_dma_size = mmACP_I2S_TX_DMA_SIZE; + acp_fifo_addr = ACP_SRAM_PTE_OFFSET + + SP_PB_FIFO_ADDR_OFFSET; + reg_fifo_addr = mmACP_I2S_TX_FIFOADDR; + reg_fifo_size = mmACP_I2S_TX_FIFOSIZE; + rv_writel(I2S_SP_TX_MEM_WINDOW_START, + rtd->acp3x_base + mmACP_I2S_TX_RINGBUFADDR); + } } else { - /* Config ringbuffer */ - rv_writel(MEM_WINDOW_START + MAX_BUFFER, rtd->acp3x_base + - mmACP_BT_RX_RINGBUFADDR); - rv_writel(MAX_BUFFER, rtd->acp3x_base + - mmACP_BT_RX_RINGBUFSIZE); - rv_writel(DMA_SIZE, rtd->acp3x_base + mmACP_BT_RX_DMA_SIZE); - - /* Config audio fifo */ - acp_fifo_addr = ACP_SRAM_PTE_OFFSET + - (rtd->num_pages * 8) + CAPTURE_FIFO_ADDR_OFFSET; - rv_writel(acp_fifo_addr, rtd->acp3x_base + - mmACP_BT_RX_FIFOADDR); - rv_writel(FIFO_SIZE, rtd->acp3x_base + mmACP_BT_RX_FIFOSIZE); - } + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + reg_ringbuf_size = mmACP_BT_RX_RINGBUFSIZE; + reg_dma_size = mmACP_BT_RX_DMA_SIZE; + acp_fifo_addr = ACP_SRAM_PTE_OFFSET + + BT_CAPT_FIFO_ADDR_OFFSET; + reg_fifo_addr = mmACP_BT_RX_FIFOADDR; + reg_fifo_size = mmACP_BT_RX_FIFOSIZE; + rv_writel(I2S_BT_RX_MEM_WINDOW_START, + rtd->acp3x_base + mmACP_BT_RX_RINGBUFADDR); + break; - /* Enable watermark/period interrupt to host */ - rv_writel(BIT(BT_TX_THRESHOLD) | BIT(BT_RX_THRESHOLD), - rtd->acp3x_base + mmACP_EXTERNAL_INTR_CNTL); + case I2S_SP_INSTANCE: + default: + reg_ringbuf_size = mmACP_I2S_RX_RINGBUFSIZE; + reg_dma_size = mmACP_I2S_RX_DMA_SIZE; + acp_fifo_addr = ACP_SRAM_PTE_OFFSET + + SP_CAPT_FIFO_ADDR_OFFSET; + reg_fifo_addr = mmACP_I2S_RX_FIFOADDR; + reg_fifo_size = mmACP_I2S_RX_FIFOSIZE; + rv_writel(I2S_SP_RX_MEM_WINDOW_START, + rtd->acp3x_base + mmACP_I2S_RX_RINGBUFADDR); + } + } + rv_writel(MAX_BUFFER, rtd->acp3x_base + reg_ringbuf_size); + rv_writel(DMA_SIZE, rtd->acp3x_base + reg_dma_size); + rv_writel(acp_fifo_addr, rtd->acp3x_base + reg_fifo_addr); + rv_writel(FIFO_SIZE, rtd->acp3x_base + reg_fifo_size); + rv_writel(BIT(I2S_RX_THRESHOLD) | BIT(BT_RX_THRESHOLD) + | BIT(I2S_TX_THRESHOLD) | BIT(BT_TX_THRESHOLD), + rtd->acp3x_base + mmACP_EXTERNAL_INTR_CNTL); } static int acp3x_dma_open(struct snd_soc_component *component, @@ -288,17 +327,21 @@ static int acp3x_dma_open(struct snd_soc_component *component, return ret; } - if (!adata->play_stream && !adata->capture_stream) + if (!adata->play_stream && !adata->capture_stream && + adata->i2ssp_play_stream && !adata->i2ssp_capture_stream) rv_writel(1, adata->acp3x_base + mmACP_EXTERNAL_INTR_ENB); - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { adata->play_stream = substream; - else + adata->i2ssp_play_stream = substream; + } else { adata->capture_stream = substream; + adata->i2ssp_capture_stream = substream; + } i2s_data->acp3x_base = adata->acp3x_base; runtime->private_data = i2s_data; - return 0; + return ret; } @@ -306,16 +349,28 @@ static int acp3x_dma_hw_params(struct snd_soc_component *component, struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_pcm_runtime *runtime; struct i2s_stream_instance *rtd; + struct snd_soc_pcm_runtime *prtd; + struct snd_soc_card *card; + struct acp3x_platform_info *pinfo; int status; u64 size; - runtime = substream->runtime; - rtd = substream->private_data; + prtd = substream->private_data; + card = prtd->card; + pinfo = snd_soc_card_get_drvdata(card); + rtd = substream->runtime->private_data; if (!rtd) return -EINVAL; + if (pinfo) + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + rtd->i2s_instance = pinfo->play_i2s_instance; + else + rtd->i2s_instance = pinfo->cap_i2s_instance; + else + pr_err("pinfo failed\n"); + size = params_buffer_bytes(params); status = snd_pcm_lib_malloc_pages(substream, size); if (status < 0) @@ -336,12 +391,25 @@ static int acp3x_dma_hw_params(struct snd_soc_component *component, static snd_pcm_uframes_t acp3x_dma_pointer(struct snd_soc_component *component, struct snd_pcm_substream *substream) { + struct snd_soc_pcm_runtime *prtd; + struct snd_soc_card *card; + struct acp3x_platform_info *pinfo; struct i2s_stream_instance *rtd; u32 pos; u32 buffersize; u64 bytescount; + prtd = substream->private_data; + card = prtd->card; rtd = substream->runtime->private_data; + pinfo = snd_soc_card_get_drvdata(card); + if (pinfo) { + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + rtd->i2s_instance = pinfo->play_i2s_instance; + else + rtd->i2s_instance = pinfo->cap_i2s_instance; + } + buffersize = frames_to_bytes(substream->runtime, substream->runtime->buffer_size); bytescount = acp_get_byte_count(rtd, substream->stream); @@ -386,15 +454,19 @@ static int acp3x_dma_close(struct snd_soc_component *component, component = snd_soc_rtdcom_lookup(prtd, DRV_NAME); adata = dev_get_drvdata(component->dev); - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { adata->play_stream = NULL; - else + adata->i2ssp_play_stream = NULL; + } else { adata->capture_stream = NULL; + adata->i2ssp_capture_stream = NULL; + } /* Disable ACP irq, when the current stream is being closed and * another stream is also not active. */ - if (!adata->play_stream && !adata->capture_stream) + if (!adata->play_stream && !adata->capture_stream && + !adata->i2ssp_play_stream && !adata->i2ssp_capture_stream) rv_writel(0, adata->acp3x_base + mmACP_EXTERNAL_INTR_ENB); return 0; } @@ -503,8 +575,10 @@ static int acp3x_resume(struct device *dev) { struct i2s_dev_data *adata; int status; - u32 val; + u32 val, reg_val, frmt_val; + reg_val = 0; + frmt_val = 0; adata = dev_get_drvdata(dev); status = acp3x_init(adata->acp3x_base); if (status) @@ -514,32 +588,39 @@ static int acp3x_resume(struct device *dev) struct i2s_stream_instance *rtd = adata->play_stream->runtime->private_data; config_acp3x_dma(rtd, SNDRV_PCM_STREAM_PLAYBACK); - rv_writel((rtd->xfer_resolution << 3), - rtd->acp3x_base + mmACP_BTTDM_ITER); - if (adata->tdm_mode == true) { - rv_writel(adata->tdm_fmt, adata->acp3x_base + - mmACP_BTTDM_TXFRMT); - val = rv_readl(adata->acp3x_base + mmACP_BTTDM_ITER); - rv_writel((val | 0x2), adata->acp3x_base + - mmACP_BTTDM_ITER); + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + reg_val = mmACP_BTTDM_ITER; + frmt_val = mmACP_BTTDM_TXFRMT; + break; + case I2S_SP_INSTANCE: + default: + reg_val = mmACP_I2STDM_ITER; + frmt_val = mmACP_I2STDM_TXFRMT; } + rv_writel((rtd->xfer_resolution << 3), rtd->acp3x_base + reg_val); } - if (adata->capture_stream && adata->capture_stream->runtime) { struct i2s_stream_instance *rtd = adata->capture_stream->runtime->private_data; config_acp3x_dma(rtd, SNDRV_PCM_STREAM_CAPTURE); - rv_writel((rtd->xfer_resolution << 3), - rtd->acp3x_base + mmACP_BTTDM_IRER); - if (adata->tdm_mode == true) { - rv_writel(adata->tdm_fmt, adata->acp3x_base + - mmACP_BTTDM_RXFRMT); - val = rv_readl(adata->acp3x_base + mmACP_BTTDM_IRER); - rv_writel((val | 0x2), adata->acp3x_base + - mmACP_BTTDM_IRER); + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + reg_val = mmACP_BTTDM_IRER; + frmt_val = mmACP_BTTDM_RXFRMT; + break; + case I2S_SP_INSTANCE: + default: + reg_val = mmACP_I2STDM_IRER; + frmt_val = mmACP_I2STDM_RXFRMT; } + rv_writel((rtd->xfer_resolution << 3), rtd->acp3x_base + reg_val); + } + if (adata->tdm_mode == TDM_ENABLE) { + rv_writel(adata->tdm_fmt, adata->acp3x_base + frmt_val); + val = rv_readl(adata->acp3x_base + reg_val); + rv_writel(val | 0x2, adata->acp3x_base + reg_val); } - rv_writel(1, adata->acp3x_base + mmACP_EXTERNAL_INTR_ENB); return 0; } @@ -549,8 +630,8 @@ static int acp3x_pcm_runtime_suspend(struct device *dev) { struct i2s_dev_data *adata; int status; - adata = dev_get_drvdata(dev); + adata = dev_get_drvdata(dev); status = acp3x_deinit(adata->acp3x_base); if (status) dev_err(dev, "ACP de-init failed\n"); @@ -566,8 +647,8 @@ static int acp3x_pcm_runtime_resume(struct device *dev) { struct i2s_dev_data *adata; int status; - adata = dev_get_drvdata(dev); + adata = dev_get_drvdata(dev); status = acp3x_init(adata->acp3x_base); if (status) return -ENODEV; diff --git a/sound/soc/amd/raven/acp3x.h b/sound/soc/amd/raven/acp3x.h index a6c6d63..ed1acbc 100644 --- a/sound/soc/amd/raven/acp3x.h +++ b/sound/soc/amd/raven/acp3x.h @@ -7,6 +7,12 @@ #include "chip_offset_byte.h" +#define I2S_SP_INSTANCE 0x01 +#define I2S_BT_INSTANCE 0x02 + +#define TDM_ENABLE 1 +#define TDM_DISABLE 0 + #define ACP3x_DEVS 3 #define ACP3x_PHY_BASE_ADDRESS 0x1240000 #define ACP3x_I2S_MODE 0 @@ -17,8 +23,11 @@ #define ACP3x_BT_TDM_REG_START 0x1242800 #define ACP3x_BT_TDM_REG_END 0x1242810 #define I2S_MODE 0x04 +#define I2S_RX_THRESHOLD 27 +#define I2S_TX_THRESHOLD 28 #define BT_TX_THRESHOLD 26 #define BT_RX_THRESHOLD 25 +#define ACP_ERR_INTR_MASK 29 #define ACP3x_POWER_ON 0x00 #define ACP3x_POWER_ON_IN_PROGRESS 0x01 #define ACP3x_POWER_OFF 0x02 @@ -26,19 +35,28 @@ #define ACP3x_SOFT_RESET__SoftResetAudDone_MASK 0x00010001 #define ACP_SRAM_PTE_OFFSET 0x02050000 +#define ACP_SRAM_SP_PB_PTE_OFFSET 0x0 +#define ACP_SRAM_SP_CP_PTE_OFFSET 0x100 +#define ACP_SRAM_BT_PB_PTE_OFFSET 0x200 +#define ACP_SRAM_BT_CP_PTE_OFFSET 0x300 #define PAGE_SIZE_4K_ENABLE 0x2 -#define MEM_WINDOW_START 0x4000000 -#define PLAYBACK_FIFO_ADDR_OFFSET 0x400 -#define CAPTURE_FIFO_ADDR_OFFSET 0x500 +#define I2S_SP_TX_MEM_WINDOW_START 0x4000000 +#define I2S_SP_RX_MEM_WINDOW_START 0x4020000 +#define I2S_BT_TX_MEM_WINDOW_START 0x4040000 +#define I2S_BT_RX_MEM_WINDOW_START 0x4060000 +#define SP_PB_FIFO_ADDR_OFFSET 0x500 +#define SP_CAPT_FIFO_ADDR_OFFSET 0x700 +#define BT_PB_FIFO_ADDR_OFFSET 0x900 +#define BT_CAPT_FIFO_ADDR_OFFSET 0xB00 #define PLAYBACK_MIN_NUM_PERIODS 2 #define PLAYBACK_MAX_NUM_PERIODS 8 -#define PLAYBACK_MAX_PERIOD_SIZE 16384 -#define PLAYBACK_MIN_PERIOD_SIZE 4096 +#define PLAYBACK_MAX_PERIOD_SIZE 8192 +#define PLAYBACK_MIN_PERIOD_SIZE 1024 #define CAPTURE_MIN_NUM_PERIODS 2 #define CAPTURE_MAX_NUM_PERIODS 8 -#define CAPTURE_MAX_PERIOD_SIZE 16384 -#define CAPTURE_MIN_PERIOD_SIZE 4096 +#define CAPTURE_MAX_PERIOD_SIZE 8192 +#define CAPTURE_MIN_PERIOD_SIZE 1024 #define MAX_BUFFER (PLAYBACK_MAX_PERIOD_SIZE * PLAYBACK_MAX_NUM_PERIODS) #define MIN_BUFFER MAX_BUFFER @@ -65,14 +83,20 @@ struct i2s_dev_data { void __iomem *acp3x_base; struct snd_pcm_substream *play_stream; struct snd_pcm_substream *capture_stream; + struct snd_pcm_substream *i2ssp_play_stream; + struct snd_pcm_substream *i2ssp_capture_stream; }; struct i2s_stream_instance { u16 num_pages; + u16 i2s_instance; + u16 capture_channel; + u16 direction; u16 channels; u32 xfer_resolution; - u64 bytescount; + u32 val; dma_addr_t dma_addr; + u64 bytescount; void __iomem *acp3x_base; }; @@ -92,15 +116,36 @@ static inline u64 acp_get_byte_count(struct i2s_stream_instance *rtd, u64 byte_count; if (direction == SNDRV_PCM_STREAM_PLAYBACK) { - byte_count = rv_readl(rtd->acp3x_base + - mmACP_BT_TX_LINEARPOSITIONCNTR_HIGH); - byte_count |= rv_readl(rtd->acp3x_base + - mmACP_BT_TX_LINEARPOSITIONCNTR_LOW); + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + byte_count = rv_readl(rtd->acp3x_base + + mmACP_BT_TX_LINEARPOSITIONCNTR_HIGH); + byte_count |= rv_readl(rtd->acp3x_base + + mmACP_BT_TX_LINEARPOSITIONCNTR_LOW); + break; + case I2S_SP_INSTANCE: + default: + byte_count = rv_readl(rtd->acp3x_base + + mmACP_I2S_TX_LINEARPOSITIONCNTR_HIGH); + byte_count |= rv_readl(rtd->acp3x_base + + mmACP_I2S_TX_LINEARPOSITIONCNTR_LOW); + } + } else { - byte_count = rv_readl(rtd->acp3x_base + - mmACP_BT_RX_LINEARPOSITIONCNTR_HIGH); - byte_count |= rv_readl(rtd->acp3x_base + - mmACP_BT_RX_LINEARPOSITIONCNTR_LOW); + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + byte_count = rv_readl(rtd->acp3x_base + + mmACP_BT_RX_LINEARPOSITIONCNTR_HIGH); + byte_count |= rv_readl(rtd->acp3x_base + + mmACP_BT_RX_LINEARPOSITIONCNTR_LOW); + break; + case I2S_SP_INSTANCE: + default: + byte_count = rv_readl(rtd->acp3x_base + + mmACP_I2S_RX_LINEARPOSITIONCNTR_HIGH); + byte_count |= rv_readl(rtd->acp3x_base + + mmACP_I2S_RX_LINEARPOSITIONCNTR_LOW); + } } return byte_count; } -- 2.7.4

1 0

[alsa-devel] [PATCH v13 2/7] ASoC: amd: Refactoring of DAI from DMA driver
by Ravulapati Vishnu vardhan rao 02 Dec '19

02 Dec '19

ASoC: PCM DMA driver should only have dma ops. So Removed all DAI related functionality.Refactoring the PCM DMA diver code.Added new file containing only DAI ops. Signed-off-by: Ravulapati Vishnu vardhan rao <Vishnuvardhanrao.Ravulapati(a)amd.com> --- sound/soc/amd/raven/Makefile | 2 + sound/soc/amd/raven/acp3x-i2s.c | 262 +++++++++++++++++++++++++++++++ sound/soc/amd/raven/acp3x-pcm-dma.c | 302 +++++++----------------------------- sound/soc/amd/raven/acp3x.h | 43 +++++ 4 files changed, 364 insertions(+), 245 deletions(-) create mode 100644 sound/soc/amd/raven/acp3x-i2s.c diff --git a/sound/soc/amd/raven/Makefile b/sound/soc/amd/raven/Makefile index 108d1ac..62c22b6 100644 --- a/sound/soc/amd/raven/Makefile +++ b/sound/soc/amd/raven/Makefile @@ -2,5 +2,7 @@ # Raven Ridge platform Support snd-pci-acp3x-objs := pci-acp3x.o snd-acp3x-pcm-dma-objs := acp3x-pcm-dma.o +snd-acp3x-i2s-objs := acp3x-i2s.o obj-$(CONFIG_SND_SOC_AMD_ACP3x) += snd-pci-acp3x.o obj-$(CONFIG_SND_SOC_AMD_ACP3x) += snd-acp3x-pcm-dma.o +obj-$(CONFIG_SND_SOC_AMD_ACP3x) += snd-acp3x-i2s.o diff --git a/sound/soc/amd/raven/acp3x-i2s.c b/sound/soc/amd/raven/acp3x-i2s.c new file mode 100644 index 0000000..cdc1c61 --- /dev/null +++ b/sound/soc/amd/raven/acp3x-i2s.c @@ -0,0 +1,262 @@ +// SPDX-License-Identifier: GPL-2.0+ +// +// AMD ALSA SoC PCM Driver +// +//Copyright 2016 Advanced Micro Devices, Inc. + +#include <linux/platform_device.h> +#include <linux/module.h> +#include <linux/err.h> +#include <linux/io.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include <sound/soc.h> +#include <sound/soc-dai.h> +#include <linux/dma-mapping.h> + +#include "acp3x.h" + +#define DRV_NAME "acp3x-i2s" + +static int acp3x_i2s_set_fmt(struct snd_soc_dai *cpu_dai, + unsigned int fmt) +{ + struct i2s_dev_data *adata; + int mode; + + adata = snd_soc_dai_get_drvdata(cpu_dai); + mode = fmt & SND_SOC_DAIFMT_FORMAT_MASK; + switch (mode) { + case SND_SOC_DAIFMT_I2S: + adata->tdm_mode = false; + break; + case SND_SOC_DAIFMT_DSP_A: + adata->tdm_mode = true; + break; + default: + return -EINVAL; + } + return 0; +} + +static int acp3x_i2s_set_tdm_slot(struct snd_soc_dai *cpu_dai, + u32 tx_mask, u32 rx_mask, int slots, int slot_width) +{ + struct i2s_dev_data *adata; + u32 val, reg_val, frmt_val, frm_len; + u16 slot_len; + + adata = snd_soc_dai_get_drvdata(cpu_dai); + + /* These values are as per Hardware Spec */ + switch (slot_width) { + case SLOT_WIDTH_8: + slot_len = 8; + break; + case SLOT_WIDTH_16: + slot_len = 16; + break; + case SLOT_WIDTH_24: + slot_len = 24; + break; + case SLOT_WIDTH_32: + slot_len = 0; + break; + default: + return -EINVAL; + } + + /* Enable I2S/BT channels TDM, respective TX/RX frame lengths.*/ + + frm_len = FRM_LEN | (slots << 15) | (slot_len << 18); + if (adata->substream_type == SNDRV_PCM_STREAM_PLAYBACK) { + reg_val = mmACP_BTTDM_ITER; + frmt_val = mmACP_BTTDM_TXFRMT; + } else { + reg_val = mmACP_BTTDM_IRER; + frmt_val = mmACP_BTTDM_RXFRMT; + } + val = rv_readl(adata->acp3x_base + reg_val); + rv_writel(val | 0x2, adata->acp3x_base + reg_val); + rv_writel(frm_len, adata->acp3x_base + frmt_val); + adata->tdm_fmt = frm_len; + return 0; +} + +static int acp3x_i2s_hwparams(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) +{ + struct i2s_stream_instance *rtd; + u32 val; + u32 reg_val; + + rtd = substream->runtime->private_data; + + /* These values are as per Hardware Spec */ + switch (params_format(params)) { + case SNDRV_PCM_FORMAT_U8: + case SNDRV_PCM_FORMAT_S8: + rtd->xfer_resolution = 0x0; + break; + case SNDRV_PCM_FORMAT_S16_LE: + rtd->xfer_resolution = 0x02; + break; + case SNDRV_PCM_FORMAT_S24_LE: + rtd->xfer_resolution = 0x04; + break; + case SNDRV_PCM_FORMAT_S32_LE: + rtd->xfer_resolution = 0x05; + break; + default: + return -EINVAL; + } + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + reg_val = mmACP_BTTDM_ITER; + else + reg_val = mmACP_BTTDM_IRER; + + val = rv_readl(rtd->acp3x_base + reg_val); + val = val | (rtd->xfer_resolution << 3); + rv_writel(val, rtd->acp3x_base + reg_val); + return 0; +} + +static int acp3x_i2s_trigger(struct snd_pcm_substream *substream, + int cmd, struct snd_soc_dai *dai) +{ + struct i2s_stream_instance *rtd; + u32 val, period_bytes; + int ret, reg_val; + + rtd = substream->runtime->private_data; + period_bytes = frames_to_bytes(substream->runtime, + substream->runtime->period_size); + switch (cmd) { + case SNDRV_PCM_TRIGGER_START: + case SNDRV_PCM_TRIGGER_RESUME: + case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: + rtd->bytescount = acp_get_byte_count(rtd, + substream->stream); + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { + reg_val = mmACP_BTTDM_ITER; + rv_writel(period_bytes, rtd->acp3x_base + + mmACP_BT_TX_INTR_WATERMARK_SIZE); + } else { + reg_val = mmACP_BTTDM_IRER; + rv_writel(period_bytes, rtd->acp3x_base + + mmACP_BT_RX_INTR_WATERMARK_SIZE); + } + val = rv_readl(rtd->acp3x_base + reg_val); + val = val | BIT(0); + rv_writel(val, rtd->acp3x_base + reg_val); + rv_writel(1, rtd->acp3x_base + mmACP_BTTDM_IER); + break; + case SNDRV_PCM_TRIGGER_STOP: + case SNDRV_PCM_TRIGGER_SUSPEND: + case SNDRV_PCM_TRIGGER_PAUSE_PUSH: + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + reg_val = mmACP_BTTDM_ITER; + else + reg_val = mmACP_BTTDM_IRER; + + val = rv_readl(rtd->acp3x_base + reg_val); + val = val & ~BIT(0); + rv_writel(val, rtd->acp3x_base + reg_val); + rv_writel(0, rtd->acp3x_base + mmACP_BTTDM_IER); + break; + default: + ret = -EINVAL; + break; + } + + return ret; +} + +static struct snd_soc_dai_ops acp3x_i2s_dai_ops = { + .hw_params = acp3x_i2s_hwparams, + .trigger = acp3x_i2s_trigger, + .set_fmt = acp3x_i2s_set_fmt, + .set_tdm_slot = acp3x_i2s_set_tdm_slot, +}; + +static const struct snd_soc_component_driver acp3x_dai_component = { + .name = "acp3x-i2s", +}; + +static struct snd_soc_dai_driver acp3x_i2s_dai = { + .playback = { + .rates = SNDRV_PCM_RATE_8000_96000, + .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S8 | + SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S24_LE | + SNDRV_PCM_FMTBIT_S32_LE, + .channels_min = 2, + .channels_max = 8, + .rate_min = 8000, + .rate_max = 96000, + }, + .capture = { + .rates = SNDRV_PCM_RATE_8000_48000, + .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S8 | + SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S24_LE | + SNDRV_PCM_FMTBIT_S32_LE, + .channels_min = 2, + .channels_max = 2, + .rate_min = 8000, + .rate_max = 48000, + }, + .ops = &acp3x_i2s_dai_ops, +}; + +static int acp3x_dai_probe(struct platform_device *pdev) +{ + struct resource *res; + struct i2s_dev_data *adata; + int ret; + + adata = devm_kzalloc(&pdev->dev, sizeof(struct i2s_dev_data), + GFP_KERNEL); + if (!adata) + return -ENOMEM; + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!res) { + dev_err(&pdev->dev, "IORESOURCE_MEM FAILED\n"); + return -ENOMEM; + } + adata->acp3x_base = devm_ioremap(&pdev->dev, res->start, + resource_size(res)); + if (IS_ERR(adata->acp3x_base)) + return PTR_ERR(adata->acp3x_base); + + adata->i2s_irq = res->start; + dev_set_drvdata(&pdev->dev, adata); + ret = devm_snd_soc_register_component(&pdev->dev, + &acp3x_dai_component, &acp3x_i2s_dai, 1); + if (ret) { + dev_err(&pdev->dev, "Fail to register acp i2s dai\n"); + return -ENODEV; + } + return 0; +} + +static int acp3x_dai_remove(struct platform_device *pdev) +{ + /* As we use devm_ memory alloc there is nothing TBD here */ + + return 0; +} + +static struct platform_driver acp3x_dai_driver = { + .probe = acp3x_dai_probe, + .remove = acp3x_dai_remove, + .driver = { + .name = "acp3x_i2s_playcap", + }, +}; + +module_platform_driver(acp3x_dai_driver); + +MODULE_AUTHOR("Vishnuvardhanrao.Ravulapati(a)amd.com"); +MODULE_DESCRIPTION("AMD ACP 3.x PCM Driver"); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:" DRV_NAME); diff --git a/sound/soc/amd/raven/acp3x-pcm-dma.c b/sound/soc/amd/raven/acp3x-pcm-dma.c index 60709e3..3150516 100644 --- a/sound/soc/amd/raven/acp3x-pcm-dma.c +++ b/sound/soc/amd/raven/acp3x-pcm-dma.c @@ -18,24 +18,6 @@ #define DRV_NAME "acp3x-i2s-audio" -struct i2s_dev_data { - bool tdm_mode; - unsigned int i2s_irq; - u32 tdm_fmt; - void __iomem *acp3x_base; - struct snd_pcm_substream *play_stream; - struct snd_pcm_substream *capture_stream; -}; - -struct i2s_stream_instance { - u16 num_pages; - u16 channels; - u32 xfer_resolution; - u64 bytescount; - dma_addr_t dma_addr; - void __iomem *acp3x_base; -}; - static const struct snd_pcm_hardware acp3x_pcm_hardware_playback = { .info = SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | @@ -178,10 +160,11 @@ static int acp3x_deinit(void __iomem *acp3x_base) static irqreturn_t i2s_irq_handler(int irq, void *dev_id) { + struct i2s_dev_data *rv_i2s_data; u16 play_flag, cap_flag; u32 val; - struct i2s_dev_data *rv_i2s_data = dev_id; + rv_i2s_data = dev_id; if (!rv_i2s_data) return IRQ_NONE; @@ -278,11 +261,17 @@ static void config_acp3x_dma(struct i2s_stream_instance *rtd, int direction) static int acp3x_dma_open(struct snd_soc_component *component, struct snd_pcm_substream *substream) { - int ret = 0; - struct snd_pcm_runtime *runtime = substream->runtime; - struct i2s_dev_data *adata = dev_get_drvdata(component->dev); - struct i2s_stream_instance *i2s_data = kzalloc(sizeof(struct i2s_stream_instance), - GFP_KERNEL); + struct snd_pcm_runtime *runtime; + struct snd_soc_pcm_runtime *prtd; + struct i2s_dev_data *adata; + struct i2s_stream_instance *i2s_data; + int ret; + + runtime = substream->runtime; + prtd = substream->private_data; + component = snd_soc_rtdcom_lookup(prtd, DRV_NAME); + adata = dev_get_drvdata(component->dev); + i2s_data = kzalloc(sizeof(*i2s_data), GFP_KERNEL); if (!i2s_data) return -EINVAL; @@ -312,33 +301,18 @@ static int acp3x_dma_open(struct snd_soc_component *component, return 0; } -static u64 acp_get_byte_count(struct i2s_stream_instance *rtd, int direction) -{ - u64 byte_count; - - if (direction == SNDRV_PCM_STREAM_PLAYBACK) { - byte_count = rv_readl(rtd->acp3x_base + - mmACP_BT_TX_LINEARPOSITIONCNTR_HIGH); - byte_count |= rv_readl(rtd->acp3x_base + - mmACP_BT_TX_LINEARPOSITIONCNTR_LOW); - } else { - byte_count = rv_readl(rtd->acp3x_base + - mmACP_BT_RX_LINEARPOSITIONCNTR_HIGH); - byte_count |= rv_readl(rtd->acp3x_base + - mmACP_BT_RX_LINEARPOSITIONCNTR_LOW); - } - return byte_count; -} static int acp3x_dma_hw_params(struct snd_soc_component *component, struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { + struct snd_pcm_runtime *runtime; + struct i2s_stream_instance *rtd; int status; u64 size; - struct snd_pcm_runtime *runtime = substream->runtime; - struct i2s_stream_instance *rtd = runtime->private_data; + runtime = substream->runtime; + rtd = substream->private_data; if (!rtd) return -EINVAL; @@ -362,12 +336,12 @@ static int acp3x_dma_hw_params(struct snd_soc_component *component, static snd_pcm_uframes_t acp3x_dma_pointer(struct snd_soc_component *component, struct snd_pcm_substream *substream) { - u32 pos = 0; - u32 buffersize = 0; - u64 bytescount = 0; - struct i2s_stream_instance *rtd = - substream->runtime->private_data; + struct i2s_stream_instance *rtd; + u32 pos; + u32 buffersize; + u64 bytescount; + rtd = substream->runtime->private_data; buffersize = frames_to_bytes(substream->runtime, substream->runtime->buffer_size); bytescount = acp_get_byte_count(rtd, substream->stream); @@ -380,7 +354,10 @@ static snd_pcm_uframes_t acp3x_dma_pointer(struct snd_soc_component *component, static int acp3x_dma_new(struct snd_soc_component *component, struct snd_soc_pcm_runtime *rtd) { - struct device *parent = component->dev->parent; + struct device *parent; + + component = snd_soc_rtdcom_lookup(rtd, DRV_NAME); + parent = component->dev->parent; snd_pcm_lib_preallocate_pages_for_all(rtd->pcm, SNDRV_DMA_TYPE_DEV, parent, MIN_BUFFER, MAX_BUFFER); return 0; @@ -402,8 +379,12 @@ static int acp3x_dma_mmap(struct snd_soc_component *component, static int acp3x_dma_close(struct snd_soc_component *component, struct snd_pcm_substream *substream) { - struct i2s_stream_instance *rtd = substream->runtime->private_data; - struct i2s_dev_data *adata = dev_get_drvdata(component->dev); + struct snd_soc_pcm_runtime *prtd; + struct i2s_dev_data *adata; + + prtd = substream->private_data; + component = snd_soc_rtdcom_lookup(prtd, DRV_NAME); + adata = dev_get_drvdata(component->dev); if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) adata->play_stream = NULL; @@ -415,186 +396,9 @@ static int acp3x_dma_close(struct snd_soc_component *component, */ if (!adata->play_stream && !adata->capture_stream) rv_writel(0, adata->acp3x_base + mmACP_EXTERNAL_INTR_ENB); - kfree(rtd); return 0; } -static int acp3x_dai_i2s_set_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt) -{ - - struct i2s_dev_data *adata = snd_soc_dai_get_drvdata(cpu_dai); - - switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { - case SND_SOC_DAIFMT_I2S: - adata->tdm_mode = false; - break; - case SND_SOC_DAIFMT_DSP_A: - adata->tdm_mode = true; - break; - default: - return -EINVAL; - } - - return 0; -} - -static int acp3x_dai_set_tdm_slot(struct snd_soc_dai *cpu_dai, u32 tx_mask, - u32 rx_mask, int slots, int slot_width) -{ - u32 val = 0; - u16 slot_len; - - struct i2s_dev_data *adata = snd_soc_dai_get_drvdata(cpu_dai); - - switch (slot_width) { - case SLOT_WIDTH_8: - slot_len = 8; - break; - case SLOT_WIDTH_16: - slot_len = 16; - break; - case SLOT_WIDTH_24: - slot_len = 24; - break; - case SLOT_WIDTH_32: - slot_len = 0; - break; - default: - return -EINVAL; - } - - val = rv_readl(adata->acp3x_base + mmACP_BTTDM_ITER); - rv_writel((val | 0x2), adata->acp3x_base + mmACP_BTTDM_ITER); - val = rv_readl(adata->acp3x_base + mmACP_BTTDM_IRER); - rv_writel((val | 0x2), adata->acp3x_base + mmACP_BTTDM_IRER); - - val = (FRM_LEN | (slots << 15) | (slot_len << 18)); - rv_writel(val, adata->acp3x_base + mmACP_BTTDM_TXFRMT); - rv_writel(val, adata->acp3x_base + mmACP_BTTDM_RXFRMT); - - adata->tdm_fmt = val; - return 0; -} - -static int acp3x_dai_i2s_hwparams(struct snd_pcm_substream *substream, - struct snd_pcm_hw_params *params, - struct snd_soc_dai *dai) -{ - u32 val = 0; - struct i2s_stream_instance *rtd = substream->runtime->private_data; - - switch (params_format(params)) { - case SNDRV_PCM_FORMAT_U8: - case SNDRV_PCM_FORMAT_S8: - rtd->xfer_resolution = 0x0; - break; - case SNDRV_PCM_FORMAT_S16_LE: - rtd->xfer_resolution = 0x02; - break; - case SNDRV_PCM_FORMAT_S24_LE: - rtd->xfer_resolution = 0x04; - break; - case SNDRV_PCM_FORMAT_S32_LE: - rtd->xfer_resolution = 0x05; - break; - default: - return -EINVAL; - } - val = rv_readl(rtd->acp3x_base + mmACP_BTTDM_ITER); - val = val | (rtd->xfer_resolution << 3); - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) - rv_writel(val, rtd->acp3x_base + mmACP_BTTDM_ITER); - else - rv_writel(val, rtd->acp3x_base + mmACP_BTTDM_IRER); - - return 0; -} - -static int acp3x_dai_i2s_trigger(struct snd_pcm_substream *substream, - int cmd, struct snd_soc_dai *dai) -{ - int ret = 0; - struct i2s_stream_instance *rtd = substream->runtime->private_data; - u32 val, period_bytes; - - period_bytes = frames_to_bytes(substream->runtime, - substream->runtime->period_size); - switch (cmd) { - case SNDRV_PCM_TRIGGER_START: - case SNDRV_PCM_TRIGGER_RESUME: - case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: - rtd->bytescount = acp_get_byte_count(rtd, substream->stream); - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { - rv_writel(period_bytes, rtd->acp3x_base + - mmACP_BT_TX_INTR_WATERMARK_SIZE); - val = rv_readl(rtd->acp3x_base + mmACP_BTTDM_ITER); - val = val | BIT(0); - rv_writel(val, rtd->acp3x_base + mmACP_BTTDM_ITER); - } else { - rv_writel(period_bytes, rtd->acp3x_base + - mmACP_BT_RX_INTR_WATERMARK_SIZE); - val = rv_readl(rtd->acp3x_base + mmACP_BTTDM_IRER); - val = val | BIT(0); - rv_writel(val, rtd->acp3x_base + mmACP_BTTDM_IRER); - } - rv_writel(1, rtd->acp3x_base + mmACP_BTTDM_IER); - break; - case SNDRV_PCM_TRIGGER_STOP: - case SNDRV_PCM_TRIGGER_SUSPEND: - case SNDRV_PCM_TRIGGER_PAUSE_PUSH: - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { - val = rv_readl(rtd->acp3x_base + mmACP_BTTDM_ITER); - val = val & ~BIT(0); - rv_writel(val, rtd->acp3x_base + mmACP_BTTDM_ITER); - } else { - val = rv_readl(rtd->acp3x_base + mmACP_BTTDM_IRER); - val = val & ~BIT(0); - rv_writel(val, rtd->acp3x_base + mmACP_BTTDM_IRER); - } - rv_writel(0, rtd->acp3x_base + mmACP_BTTDM_IER); - break; - default: - ret = -EINVAL; - break; - } - - return ret; -} - -static struct snd_soc_dai_ops acp3x_dai_i2s_ops = { - .hw_params = acp3x_dai_i2s_hwparams, - .trigger = acp3x_dai_i2s_trigger, - .set_fmt = acp3x_dai_i2s_set_fmt, - .set_tdm_slot = acp3x_dai_set_tdm_slot, -}; - -static struct snd_soc_dai_driver acp3x_i2s_dai_driver = { - .playback = { - .rates = SNDRV_PCM_RATE_8000_96000, - .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S8 | - SNDRV_PCM_FMTBIT_U8 | - SNDRV_PCM_FMTBIT_S24_LE | - SNDRV_PCM_FMTBIT_S32_LE, - .channels_min = 2, - .channels_max = 8, - - .rate_min = 8000, - .rate_max = 96000, - }, - .capture = { - .rates = SNDRV_PCM_RATE_8000_48000, - .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S8 | - SNDRV_PCM_FMTBIT_U8 | - SNDRV_PCM_FMTBIT_S24_LE | - SNDRV_PCM_FMTBIT_S32_LE, - .channels_min = 2, - .channels_max = 2, - .rate_min = 8000, - .rate_max = 48000, - }, - .ops = &acp3x_dai_i2s_ops, -}; - static const struct snd_soc_component_driver acp3x_i2s_component = { .name = DRV_NAME, .open = acp3x_dma_open, @@ -609,10 +413,10 @@ static const struct snd_soc_component_driver acp3x_i2s_component = { static int acp3x_audio_probe(struct platform_device *pdev) { - int status; struct resource *res; struct i2s_dev_data *adata; unsigned int irqflags; + int status, ret; if (!pdev->dev.platform_data) { dev_err(&pdev->dev, "platform_data not retrieved\n"); @@ -622,7 +426,7 @@ static int acp3x_audio_probe(struct platform_device *pdev) res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!res) { - dev_err(&pdev->dev, "IORESOURCE_IRQ FAILED\n"); + dev_err(&pdev->dev, "IORESOURCE_MEM FAILED\n"); return -ENODEV; } @@ -632,6 +436,8 @@ static int acp3x_audio_probe(struct platform_device *pdev) adata->acp3x_base = devm_ioremap(&pdev->dev, res->start, resource_size(res)); + if (!adata->acp3x_base) + return -ENOMEM; res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); if (!res) { @@ -640,52 +446,54 @@ static int acp3x_audio_probe(struct platform_device *pdev) } adata->i2s_irq = res->start; - adata->play_stream = NULL; - adata->capture_stream = NULL; dev_set_drvdata(&pdev->dev, adata); /* Initialize ACP */ status = acp3x_init(adata->acp3x_base); if (status) return -ENODEV; + status = devm_snd_soc_register_component(&pdev->dev, &acp3x_i2s_component, - &acp3x_i2s_dai_driver, 1); + NULL, 0); if (status) { - dev_err(&pdev->dev, "Fail to register acp i2s dai\n"); + dev_err(&pdev->dev, "Fail to register acp i2s component\n"); + ret = -ENODEV; goto dev_err; } status = devm_request_irq(&pdev->dev, adata->i2s_irq, i2s_irq_handler, irqflags, "ACP3x_I2S_IRQ", adata); if (status) { dev_err(&pdev->dev, "ACP3x I2S IRQ request failed\n"); + ret = -ENODEV; goto dev_err; } - pm_runtime_set_autosuspend_delay(&pdev->dev, 10000); + pm_runtime_set_autosuspend_delay(&pdev->dev, 5000); pm_runtime_use_autosuspend(&pdev->dev); pm_runtime_enable(&pdev->dev); return 0; + dev_err: status = acp3x_deinit(adata->acp3x_base); if (status) dev_err(&pdev->dev, "ACP de-init failed\n"); else - dev_info(&pdev->dev, "ACP de-initialized\n"); - /*ignore device status and return driver probe error*/ - return -ENODEV; + dev_dbg(&pdev->dev, "ACP de-initialized\n"); + return ret; } static int acp3x_audio_remove(struct platform_device *pdev) { + struct i2s_dev_data *adata; int ret; - struct i2s_dev_data *adata = dev_get_drvdata(&pdev->dev); + adata = dev_get_drvdata(&pdev->dev); ret = acp3x_deinit(adata->acp3x_base); if (ret) dev_err(&pdev->dev, "ACP de-init failed\n"); else - dev_info(&pdev->dev, "ACP de-initialized\n"); + dev_dbg(&pdev->dev, "ACP de-initialized\n"); pm_runtime_disable(&pdev->dev); return 0; @@ -693,10 +501,11 @@ static int acp3x_audio_remove(struct platform_device *pdev) static int acp3x_resume(struct device *dev) { + struct i2s_dev_data *adata; int status; u32 val; - struct i2s_dev_data *adata = dev_get_drvdata(dev); + adata = dev_get_drvdata(dev); status = acp3x_init(adata->acp3x_base); if (status) return -ENODEV; @@ -738,14 +547,15 @@ static int acp3x_resume(struct device *dev) static int acp3x_pcm_runtime_suspend(struct device *dev) { + struct i2s_dev_data *adata; int status; - struct i2s_dev_data *adata = dev_get_drvdata(dev); + adata = dev_get_drvdata(dev); status = acp3x_deinit(adata->acp3x_base); if (status) dev_err(dev, "ACP de-init failed\n"); else - dev_info(dev, "ACP de-initialized\n"); + dev_dbg(dev, "ACP de-initialized\n"); rv_writel(0, adata->acp3x_base + mmACP_EXTERNAL_INTR_ENB); @@ -754,8 +564,9 @@ static int acp3x_pcm_runtime_suspend(struct device *dev) static int acp3x_pcm_runtime_resume(struct device *dev) { + struct i2s_dev_data *adata; int status; - struct i2s_dev_data *adata = dev_get_drvdata(dev); + adata = dev_get_drvdata(dev); status = acp3x_init(adata->acp3x_base); if (status) @@ -774,13 +585,14 @@ static struct platform_driver acp3x_dma_driver = { .probe = acp3x_audio_probe, .remove = acp3x_audio_remove, .driver = { - .name = "acp3x_rv_i2s", + .name = "acp3x_rv_i2s_dma", .pm = &acp3x_pm_ops, }, }; module_platform_driver(acp3x_dma_driver); +MODULE_AUTHOR("Vishnuvardhanrao.Ravulapati(a)amd.com"); MODULE_AUTHOR("Maruthi.Bayyavarapu(a)amd.com"); MODULE_AUTHOR("Vijendar.Mukunda(a)amd.com"); MODULE_DESCRIPTION("AMD ACP 3.x PCM Driver"); diff --git a/sound/soc/amd/raven/acp3x.h b/sound/soc/amd/raven/acp3x.h index 2f15fe1..a6c6d63 100644 --- a/sound/soc/amd/raven/acp3x.h +++ b/sound/soc/amd/raven/acp3x.h @@ -51,6 +51,30 @@ #define SLOT_WIDTH_24 0x18 #define SLOT_WIDTH_32 0x20 +struct acp3x_platform_info { + u16 play_i2s_instance; + u16 cap_i2s_instance; + u16 capture_channel; +}; + +struct i2s_dev_data { + bool tdm_mode; + unsigned int i2s_irq; + u32 tdm_fmt; + u32 substream_type; + void __iomem *acp3x_base; + struct snd_pcm_substream *play_stream; + struct snd_pcm_substream *capture_stream; +}; + +struct i2s_stream_instance { + u16 num_pages; + u16 channels; + u32 xfer_resolution; + u64 bytescount; + dma_addr_t dma_addr; + void __iomem *acp3x_base; +}; static inline u32 rv_readl(void __iomem *base_addr) { @@ -61,3 +85,22 @@ static inline void rv_writel(u32 val, void __iomem *base_addr) { writel(val, base_addr - ACP3x_PHY_BASE_ADDRESS); } + +static inline u64 acp_get_byte_count(struct i2s_stream_instance *rtd, + int direction) +{ + u64 byte_count; + + if (direction == SNDRV_PCM_STREAM_PLAYBACK) { + byte_count = rv_readl(rtd->acp3x_base + + mmACP_BT_TX_LINEARPOSITIONCNTR_HIGH); + byte_count |= rv_readl(rtd->acp3x_base + + mmACP_BT_TX_LINEARPOSITIONCNTR_LOW); + } else { + byte_count = rv_readl(rtd->acp3x_base + + mmACP_BT_RX_LINEARPOSITIONCNTR_HIGH); + byte_count |= rv_readl(rtd->acp3x_base + + mmACP_BT_RX_LINEARPOSITIONCNTR_LOW); + } + return byte_count; +} -- 2.7.4

1 0

[alsa-devel] [PATCH v13 1/7] ASoC: amd:Create multiple I2S platform device endpoint
by Ravulapati Vishnu vardhan rao 02 Dec '19

02 Dec '19

Creates Platform Device endpoints for multiple I2S instances: SP and BT endpoints device. Pass PCI resources like MMIO, irq to the platform devices. Signed-off-by: Ravulapati Vishnu vardhan rao <Vishnuvardhanrao.Ravulapati(a)amd.com> --- sound/soc/amd/raven/acp3x.h | 5 +++ sound/soc/amd/raven/pci-acp3x.c | 95 +++++++++++++++++++++++++++-------------- 2 files changed, 68 insertions(+), 32 deletions(-) diff --git a/sound/soc/amd/raven/acp3x.h b/sound/soc/amd/raven/acp3x.h index 4f2cadd..2f15fe1 100644 --- a/sound/soc/amd/raven/acp3x.h +++ b/sound/soc/amd/raven/acp3x.h @@ -7,10 +7,15 @@ #include "chip_offset_byte.h" +#define ACP3x_DEVS 3 #define ACP3x_PHY_BASE_ADDRESS 0x1240000 #define ACP3x_I2S_MODE 0 #define ACP3x_REG_START 0x1240000 #define ACP3x_REG_END 0x1250200 +#define ACP3x_I2STDM_REG_START 0x1242400 +#define ACP3x_I2STDM_REG_END 0x1242410 +#define ACP3x_BT_TDM_REG_START 0x1242800 +#define ACP3x_BT_TDM_REG_END 0x1242810 #define I2S_MODE 0x04 #define BT_TX_THRESHOLD 26 #define BT_RX_THRESHOLD 25 diff --git a/sound/soc/amd/raven/pci-acp3x.c b/sound/soc/amd/raven/pci-acp3x.c index facec24..94f5f21 100644 --- a/sound/soc/amd/raven/pci-acp3x.c +++ b/sound/soc/amd/raven/pci-acp3x.c @@ -16,17 +16,17 @@ struct acp3x_dev_data { void __iomem *acp3x_base; bool acp3x_audio_mode; struct resource *res; - struct platform_device *pdev; + struct platform_device *pdev[ACP3x_DEVS]; }; static int snd_acp3x_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) { - int ret; - u32 addr, val; struct acp3x_dev_data *adata; - struct platform_device_info pdevinfo; + struct platform_device_info pdevinfo[ACP3x_DEVS]; unsigned int irqflags; + int ret, i; + u32 addr, val; if (pci_enable_device(pci)) { dev_err(&pci->dev, "pci_enable_device failed\n"); @@ -56,10 +56,11 @@ static int snd_acp3x_probe(struct pci_dev *pci, irqflags = 0; addr = pci_resource_start(pci, 0); - adata->acp3x_base = ioremap(addr, pci_resource_len(pci, 0)); + adata->acp3x_base = devm_ioremap(&pci->dev, addr, + pci_resource_len(pci, 0)); if (!adata->acp3x_base) { ret = -ENOMEM; - goto release_regions; + goto disable_msi; } pci_set_master(pci); pci_set_drvdata(pci, adata); @@ -68,11 +69,11 @@ static int snd_acp3x_probe(struct pci_dev *pci, switch (val) { case I2S_MODE: adata->res = devm_kzalloc(&pci->dev, - sizeof(struct resource) * 2, + sizeof(struct resource) * 4, GFP_KERNEL); if (!adata->res) { ret = -ENOMEM; - goto unmap_mmio; + goto disable_msi; } adata->res[0].name = "acp3x_i2s_iomem"; @@ -80,40 +81,67 @@ static int snd_acp3x_probe(struct pci_dev *pci, adata->res[0].start = addr; adata->res[0].end = addr + (ACP3x_REG_END - ACP3x_REG_START); - adata->res[1].name = "acp3x_i2s_irq"; - adata->res[1].flags = IORESOURCE_IRQ; - adata->res[1].start = pci->irq; - adata->res[1].end = pci->irq; + adata->res[1].name = "acp3x_i2s_sp"; + adata->res[1].flags = IORESOURCE_MEM; + adata->res[1].start = addr + ACP3x_I2STDM_REG_START; + adata->res[1].end = addr + ACP3x_I2STDM_REG_END; + + adata->res[2].name = "acp3x_i2s_bt"; + adata->res[2].flags = IORESOURCE_MEM; + adata->res[2].start = addr + ACP3x_BT_TDM_REG_START; + adata->res[2].end = addr + ACP3x_BT_TDM_REG_END; + + adata->res[3].name = "acp3x_i2s_irq"; + adata->res[3].flags = IORESOURCE_IRQ; + adata->res[3].start = pci->irq; + adata->res[3].end = adata->res[3].start; adata->acp3x_audio_mode = ACP3x_I2S_MODE; memset(&pdevinfo, 0, sizeof(pdevinfo)); - pdevinfo.name = "acp3x_rv_i2s"; - pdevinfo.id = 0; - pdevinfo.parent = &pci->dev; - pdevinfo.num_res = 2; - pdevinfo.res = adata->res; - pdevinfo.data = &irqflags; - pdevinfo.size_data = sizeof(irqflags); - - adata->pdev = platform_device_register_full(&pdevinfo); - if (IS_ERR(adata->pdev)) { - dev_err(&pci->dev, "cannot register %s device\n", - pdevinfo.name); - ret = PTR_ERR(adata->pdev); - goto unmap_mmio; + pdevinfo[0].name = "acp3x_rv_i2s_dma"; + pdevinfo[0].id = 0; + pdevinfo[0].parent = &pci->dev; + pdevinfo[0].num_res = 4; + pdevinfo[0].res = &adata->res[0]; + pdevinfo[0].data = &irqflags; + pdevinfo[0].size_data = sizeof(irqflags); + + pdevinfo[1].name = "acp3x_i2s_playcap"; + pdevinfo[1].id = 0; + pdevinfo[1].parent = &pci->dev; + pdevinfo[1].num_res = 1; + pdevinfo[1].res = &adata->res[1]; + + pdevinfo[2].name = "acp3x_i2s_playcap"; + pdevinfo[2].id = 1; + pdevinfo[2].parent = &pci->dev; + pdevinfo[2].num_res = 1; + pdevinfo[2].res = &adata->res[2]; + for (i = 0; i < ACP3x_DEVS ; i++) { + adata->pdev[i] = + platform_device_register_full(&pdevinfo[i]); + if (IS_ERR(adata->pdev[i])) { + dev_err(&pci->dev, "cannot register %s device\n", + pdevinfo[i].name); + ret = PTR_ERR(adata->pdev[i]); + goto unregister_devs; + } } break; default: dev_err(&pci->dev, "Invalid ACP audio mode : %d\n", val); ret = -ENODEV; - goto unmap_mmio; + goto disable_msi; } return 0; -unmap_mmio: +unregister_devs: + if (val == I2S_MODE) + for (i = 0 ; i < ACP3x_DEVS ; i++) + platform_device_unregister(adata->pdev[i]); +disable_msi: pci_disable_msi(pci); - iounmap(adata->acp3x_base); release_regions: pci_release_regions(pci); disable_pci: @@ -125,10 +153,12 @@ static int snd_acp3x_probe(struct pci_dev *pci, static void snd_acp3x_remove(struct pci_dev *pci) { struct acp3x_dev_data *adata = pci_get_drvdata(pci); + int i; - platform_device_unregister(adata->pdev); - iounmap(adata->acp3x_base); - + if (adata->acp3x_audio_mode == ACP3x_I2S_MODE) { + for (i = 0 ; i < ACP3x_DEVS ; i++) + platform_device_unregister(adata->pdev[i]); + } pci_disable_msi(pci); pci_release_regions(pci); pci_disable_device(pci); @@ -151,6 +181,7 @@ static struct pci_driver acp3x_driver = { module_pci_driver(acp3x_driver); +MODULE_AUTHOR("Vishnuvardhanrao.Ravulapati(a)amd.com"); MODULE_AUTHOR("Maruthi.Bayyavarapu(a)amd.com"); MODULE_DESCRIPTION("AMD ACP3x PCI driver"); MODULE_LICENSE("GPL v2"); -- 2.7.4

1 0

[alsa-devel] [bug report] ASoC: tlv320aic31xx: configure output common-mode voltage
by Dan Carpenter 02 Dec '19

02 Dec '19

Hello Lucas Stach, The patch e48fdb53bd1f: "ASoC: tlv320aic31xx: configure output common-mode voltage" from Nov 18, 2019, leads to the following static checker warning: sound/soc/codecs/tlv320aic31xx.c:1519 aic31xx_configure_ocmv() error: uninitialized symbol 'value'. sound/soc/codecs/tlv320aic31xx.c 1510 static void aic31xx_configure_ocmv(struct aic31xx_priv *priv) 1511 { 1512 struct device *dev = priv->dev; 1513 int dvdd, avdd; 1514 u32 value; 1515 1516 if (dev->fwnode && 1517 fwnode_property_read_u32(dev->fwnode, "ai31xx-ocmv", &value)) { ^^^^^^^^^^^^^^^^^^^^^^^^ This test seems reversed. If fwnode_property_read_u32() fails then "value" can be uninitialized. 1518 /* OCMV setting is forced by DT */ 1519 if (value <= 3) { ^^^^^^^^^^ 1520 priv->ocmv = value; 1521 return; 1522 } 1523 } 1524 1525 avdd = regulator_get_voltage(priv->supplies[3].consumer); 1526 dvdd = regulator_get_voltage(priv->supplies[5].consumer); 1527 regards, dan carpenter

1 0

[alsa-devel] [PATCH] ALSA: usb-audio: Fix Scarlett 6i6 Gen 2 port data
by Geoffrey D. Bennett 02 Dec '19

02 Dec '19

The s6i6_gen2_info.ports[] array had the Mixer and PCM port type entries in the wrong place. Use designators to explicitly specify the array elements being set. Fixes: 9e4d5c1be21f ("ALSA: usb-audio: Scarlett Gen 2 mixer interface") Signed-off-by: Geoffrey D. Bennett <g(a)b4.vu> Reported-by: Jonas Berlin <kernel(a)xkr47.space> Tested-by: Alex Fellows <alex.fellows(a)gmail.com> --- Hi Takashi, Is there something special I need to do to mark this as a bug fix and request this go into 5.4? Thanks, Geoffrey. sound/usb/mixer_scarlett_gen2.c | 36 ++++++++++++++++----------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/sound/usb/mixer_scarlett_gen2.c b/sound/usb/mixer_scarlett_gen2.c index 7d460b1f1735..94b903d95afa 100644 --- a/sound/usb/mixer_scarlett_gen2.c +++ b/sound/usb/mixer_scarlett_gen2.c @@ -261,34 +261,34 @@ static const struct scarlett2_device_info s6i6_gen2_info = { }, .ports = { - { + [SCARLETT2_PORT_TYPE_NONE] = { .id = 0x000, .num = { 1, 0, 8, 8, 8 }, .src_descr = "Off", .src_num_offset = 0, }, - { + [SCARLETT2_PORT_TYPE_ANALOGUE] = { .id = 0x080, .num = { 4, 4, 4, 4, 4 }, .src_descr = "Analogue %d", .src_num_offset = 1, .dst_descr = "Analogue Output %02d Playback" }, - { + [SCARLETT2_PORT_TYPE_SPDIF] = { .id = 0x180, .num = { 2, 2, 2, 2, 2 }, .src_descr = "S/PDIF %d", .src_num_offset = 1, .dst_descr = "S/PDIF Output %d Playback" }, - { + [SCARLETT2_PORT_TYPE_MIX] = { .id = 0x300, .num = { 10, 18, 18, 18, 18 }, .src_descr = "Mix %c", .src_num_offset = 65, .dst_descr = "Mixer Input %02d Capture" }, - { + [SCARLETT2_PORT_TYPE_PCM] = { .id = 0x600, .num = { 6, 6, 6, 6, 6 }, .src_descr = "PCM %d", @@ -317,44 +317,44 @@ static const struct scarlett2_device_info s18i8_gen2_info = { }, .ports = { - { + [SCARLETT2_PORT_TYPE_NONE] = { .id = 0x000, .num = { 1, 0, 8, 8, 4 }, .src_descr = "Off", .src_num_offset = 0, }, - { + [SCARLETT2_PORT_TYPE_ANALOGUE] = { .id = 0x080, .num = { 8, 6, 6, 6, 6 }, .src_descr = "Analogue %d", .src_num_offset = 1, .dst_descr = "Analogue Output %02d Playback" }, - { + [SCARLETT2_PORT_TYPE_SPDIF] = { + .id = 0x180, /* S/PDIF outputs aren't available at 192KHz * but are included in the USB mux I/O * assignment message anyway */ - .id = 0x180, .num = { 2, 2, 2, 2, 2 }, .src_descr = "S/PDIF %d", .src_num_offset = 1, .dst_descr = "S/PDIF Output %d Playback" }, - { + [SCARLETT2_PORT_TYPE_ADAT] = { .id = 0x200, .num = { 8, 0, 0, 0, 0 }, .src_descr = "ADAT %d", .src_num_offset = 1, }, - { + [SCARLETT2_PORT_TYPE_MIX] = { .id = 0x300, .num = { 10, 18, 18, 18, 18 }, .src_descr = "Mix %c", .src_num_offset = 65, .dst_descr = "Mixer Input %02d Capture" }, - { + [SCARLETT2_PORT_TYPE_PCM] = { .id = 0x600, .num = { 20, 18, 18, 14, 10 }, .src_descr = "PCM %d", @@ -387,20 +387,20 @@ static const struct scarlett2_device_info s18i20_gen2_info = { }, .ports = { - { + [SCARLETT2_PORT_TYPE_NONE] = { .id = 0x000, .num = { 1, 0, 8, 8, 6 }, .src_descr = "Off", .src_num_offset = 0, }, - { + [SCARLETT2_PORT_TYPE_ANALOGUE] = { .id = 0x080, .num = { 8, 10, 10, 10, 10 }, .src_descr = "Analogue %d", .src_num_offset = 1, .dst_descr = "Analogue Output %02d Playback" }, - { + [SCARLETT2_PORT_TYPE_SPDIF] = { /* S/PDIF outputs aren't available at 192KHz * but are included in the USB mux I/O * assignment message anyway @@ -411,21 +411,21 @@ static const struct scarlett2_device_info s18i20_gen2_info = { .src_num_offset = 1, .dst_descr = "S/PDIF Output %d Playback" }, - { + [SCARLETT2_PORT_TYPE_ADAT] = { .id = 0x200, .num = { 8, 8, 8, 4, 0 }, .src_descr = "ADAT %d", .src_num_offset = 1, .dst_descr = "ADAT Output %d Playback" }, - { + [SCARLETT2_PORT_TYPE_MIX] = { .id = 0x300, .num = { 10, 18, 18, 18, 18 }, .src_descr = "Mix %c", .src_num_offset = 65, .dst_descr = "Mixer Input %02d Capture" }, - { + [SCARLETT2_PORT_TYPE_PCM] = { .id = 0x600, .num = { 20, 18, 18, 14, 10 }, .src_descr = "PCM %d", -- 2.20.1

3 6

[alsa-devel] regression: aplay -L missing pulse in 1.2.1
by GitHub issues - opened 01 Dec '19

01 Dec '19

alsa-project/alsa-plugins issue #3 was opened from higuita: Before 1.2, `aplay -L` showed a pulse pcm. After the commit https://github.com/alsa-project/alsa-plugins/commit/b0f9c353c7cc9cffb77e7a7… pulse is missing from the pcm list. This may break some apps, war thunder (used fmod) game stopped seeing pulse and only tried to use alsa directly if i comment out the below line in /usr/share/alsa/alsa.conf.d/50-pulseaudio.conf `@args [ DEVICE ]` `aplay -L` show again the pulse pcm another workaround is to add this to the `/etc/asound.conf` : ``` pcm.!pulse { type pulse hint { show on description "PulseAudio Sound Server" } } ``` Issue URL : https://github.com/alsa-project/alsa-plugins/issues/3 Repository URL: https://github.com/alsa-project/alsa-plugins

1 0

[alsa-devel] More USB audio quirks
by Damien Zammit 30 Nov '19

30 Nov '19

Hi all, I asked on a forum for people to post their lsusb -vv output for usb audio devices that were not being detected correctly, and I tried to write some quirks for them. I don't know the current status on whether support has been added, but please someone take a look at: https://discourse.ardour.org/t/providing-assistance-to-devs-for-new-alsa-us… for some more output and my attempts at writing new quirks. Apologies if this is now out of date. Damien

2 1

[alsa-devel] [PATCH alsa-lib] ucm: Use strncmp to avoid access-out-of-boundary
by Chih-Yang Hsia 29 Nov '19

29 Nov '19

From: paulhsia <paulhsia(a)chromium.org> If the length of the identifier is less than the length of the prefix, access-out-of-boundary will occur in memcmp(). Signed-off-by: paulhsia <paulhsia(a)chromium.org> --- src/ucm/main.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/ucm/main.c b/src/ucm/main.c index b0b6ffb3..252e50d9 100644 --- a/src/ucm/main.c +++ b/src/ucm/main.c @@ -61,11 +61,13 @@ static int check_identifier(const char *identifier, const char *prefix) { int len; - if (strcmp(identifier, prefix) == 0) - return 1; len = strlen(prefix); - if (memcmp(identifier, prefix, len) == 0 && identifier[len] == '/') + if (strncmp(identifier, prefix, len) != 0) + return 0; + + if (identifier[len] == 0 || identifier[len] == '/') return 1; + return 0; } -- 2.24.0.393.g34dc348eaf-goog

2 1

[alsa-devel] [PATCH v5 0/2] ASoC: mt8183: fix audio playback slowly after playback
by Jiaxin Yu 29 Nov '19

29 Nov '19

This series patches add reset controller for MT8183, and audio will use it in machine driver during bootup, they depend on the for-next. v5 changes: 1. Add Signed-off-by tag and Reviewed-by tag. v4 changes: 1. Fixed wrong signed-off as correct mail suffix. 2. Fixed patch subject that add patch version. v3 changes: 1. https://patchwork.kernel.org/patch/11164283/ and https://patchwork.kernel.org/patch/11164305/ has been merged. 2. Change the name of mtk_wdt_compatible to mtk_wdt_data. 3. Remove toprgu_reset struct and use mtk_wdt_dev instead. 4. Get the value of sw_rst_num from .h file. 5. Adddd mt2712-resets.h for mt2712. 6. Improve commit message. v2 changes: 1. remove "WIP" that in the title of patches 2. add hyper link for the patch that depends on 3. patchwork list: https://patchwork.kernel.org/cover/11164285/ https://patchwork.kernel.org/patch/11164295/ https://patchwork.kernel.org/patch/11164299/ https://patchwork.kernel.org/patch/11164283/ https://patchwork.kernel.org/patch/11164305/ v1 changes: 1. patchwork list: https://patchwork.kernel.org/cover/11164173/ https://patchwork.kernel.org/patch/11164181/ https://patchwork.kernel.org/patch/11164185/ https://patchwork.kernel.org/patch/11164187/ https://patchwork.kernel.org/patch/11164175/ yong.liang (2): dt-bindings: mediatek: mt8183: Add #reset-cells watchdog: mtk_wdt: mt8183: Add reset controller .../devicetree/bindings/watchdog/mtk-wdt.txt | 10 +- drivers/watchdog/Kconfig | 1 + drivers/watchdog/mtk_wdt.c | 111 +++++++++++++++++- .../reset-controller/mt2712-resets.h | 22 ++++ .../reset-controller/mt8183-resets.h | 15 +++ 5 files changed, 155 insertions(+), 4 deletions(-) create mode 100644 include/dt-bindings/reset-controller/mt2712-resets.h -- 2.18.0

4 8

[alsa-devel] [PATCH] ALSA: hda/realtek - Fix inverted bass GPIO pin on Acer 8951G
by Takashi Iwai 28 Nov '19

28 Nov '19

We've added the bass speaker support on Acer 8951G by the commit 00066e9733f6 ("Add Acer Aspire Ethos 8951G model quirk"), but it seems that the GPIO pin was wrongly set: while the commit turns off the bit to power up the amp, the actual hardware reacts other way round, i.e. GPIO bit on = amp on. So this patch fixes the bug, turning on the GPIO bit 0x02 as default. Since turning on the GPIO bit can be more easily managed with alc_setup_gpio() call, we simplify the quirk code by integrating the GPIO setup into the existing alc662_fixup_aspire_ethos_hp() and dropping the whole ALC669_FIXUP_ACER_ASPIRE_ETHOS_SUBWOOFER quirk. Fixes: 00066e9733f6 ("Add Acer Aspire Ethos 8951G model quirk") Reported-and-tested-by: Sergey 'Jin' Bostandzhyan <jin(a)mediatomb.cc> Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/patch_realtek.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 9f355b2f7d7b..c7a232fd5a5b 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -8427,6 +8427,8 @@ static void alc662_fixup_aspire_ethos_hp(struct hda_codec *codec, case HDA_FIXUP_ACT_PRE_PROBE: snd_hda_jack_detect_enable_callback(codec, 0x1b, alc662_aspire_ethos_mute_speakers); + /* subwoofer needs an extra GPIO setting to become audible */ + alc_setup_gpio(codec, 0x02); break; case HDA_FIXUP_ACT_INIT: /* Make sure to start in a correct state, i.e. if @@ -8509,7 +8511,6 @@ enum { ALC662_FIXUP_USI_HEADSET_MODE, ALC662_FIXUP_LENOVO_MULTI_CODECS, ALC669_FIXUP_ACER_ASPIRE_ETHOS, - ALC669_FIXUP_ACER_ASPIRE_ETHOS_SUBWOOFER, ALC669_FIXUP_ACER_ASPIRE_ETHOS_HEADSET, }; @@ -8841,18 +8842,6 @@ static const struct hda_fixup alc662_fixups[] = { .type = HDA_FIXUP_FUNC, .v.func = alc662_fixup_aspire_ethos_hp, }, - [ALC669_FIXUP_ACER_ASPIRE_ETHOS_SUBWOOFER] = { - .type = HDA_FIXUP_VERBS, - /* subwoofer needs an extra GPIO setting to become audible */ - .v.verbs = (const struct hda_verb[]) { - {0x01, AC_VERB_SET_GPIO_MASK, 0x02}, - {0x01, AC_VERB_SET_GPIO_DIRECTION, 0x02}, - {0x01, AC_VERB_SET_GPIO_DATA, 0x00}, - { } - }, - .chained = true, - .chain_id = ALC669_FIXUP_ACER_ASPIRE_ETHOS_HEADSET - }, [ALC669_FIXUP_ACER_ASPIRE_ETHOS] = { .type = HDA_FIXUP_PINS, .v.pins = (const struct hda_pintbl[]) { @@ -8862,7 +8851,7 @@ static const struct hda_fixup alc662_fixups[] = { { } }, .chained = true, - .chain_id = ALC669_FIXUP_ACER_ASPIRE_ETHOS_SUBWOOFER + .chain_id = ALC669_FIXUP_ACER_ASPIRE_ETHOS_HEADSET }, }; -- 2.16.4

1 0

[alsa-devel] [PATCH] ASoC: intel/skl/hda - export number of digital microphones via control components
by Jaroslav Kysela 28 Nov '19

28 Nov '19

It is required for the auto-detection in the user space (for UCM). Signed-off-by: Jaroslav Kysela <perex(a)perex.cz> Cc: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Cc: Mark Brown <broonie(a)kernel.org> --- sound/soc/intel/boards/skl_hda_dsp_generic.c | 8 ++++++++ sound/soc/sof/intel/hda.c | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/sound/soc/intel/boards/skl_hda_dsp_generic.c b/sound/soc/intel/boards/skl_hda_dsp_generic.c index 4e45901e3a2f..11eaee9ae41f 100644 --- a/sound/soc/intel/boards/skl_hda_dsp_generic.c +++ b/sound/soc/intel/boards/skl_hda_dsp_generic.c @@ -100,6 +100,8 @@ static struct snd_soc_card hda_soc_card = { .late_probe = skl_hda_card_late_probe, }; +static char hda_soc_components[30]; + #define IDISP_DAI_COUNT 3 #define HDAC_DAI_COUNT 2 #define DMIC_DAI_COUNT 2 @@ -183,6 +185,12 @@ static int skl_hda_audio_probe(struct platform_device *pdev) hda_soc_card.dev = &pdev->dev; snd_soc_card_set_drvdata(&hda_soc_card, ctx); + if (mach->mach_params.dmic_num > 0) { + snprintf(hda_soc_components, sizeof(hda_soc_components), + "cfg-dmics:%d", mach->mach_params.dmic_num); + hda_soc_card.components = hda_soc_components; + } + return devm_snd_soc_register_card(&pdev->dev, &hda_soc_card); } diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c index 7dc0018dc4c3..92fffca76af5 100644 --- a/sound/soc/sof/intel/hda.c +++ b/sound/soc/sof/intel/hda.c @@ -351,7 +351,7 @@ static int hda_init_caps(struct snd_sof_dev *sdev) const char *tplg_filename; const char *idisp_str; const char *dmic_str; - int dmic_num; + int dmic_num = 0; int codec_num = 0; int i; #endif @@ -465,6 +465,7 @@ static int hda_init_caps(struct snd_sof_dev *sdev) mach_params->codec_mask = bus->codec_mask; mach_params->platform = dev_name(sdev->dev); mach_params->common_hdmi_codec_drv = hda_codec_use_common_hdmi; + mach_params->dmic_num = dmic_num; } /* create codec instances */ -- 2.20.1

3 7

[alsa-devel] Surround speaker connection on Acer 8951G
by Sergey 'Jin' Bostandzhyan 28 Nov '19

28 Nov '19

Hi, I am not sure if this is the right place to ask or if I should just submit a bugreport, but you guys helped me out with a similar problem about 10 years ago, so I'll try here first. If I'm wrong here, then I apologize, just let me know. I have an Acer Aspire Ethos 8951G notebook which has 6 built in speakers for 5.1 surround sound, it's a Realtek ALC669X. The problem is that only two speakers are recognized by default. I tried fiddling around with hdajackretast and it does make a difference, but I somehow could not find a step-by-step approach on how to figure out what is what and how to map everything correctly, so some guidance would be very much appreciated. I even ended up in situations where I got channels supporting only mute which would influence muting of other channels, I really got lost there.. Here's my alsa-info output: http://alsa-project.org/db/?f=3adde87164f5fc349c3c78b211ee63e416ebf10b It would be great if we could figure it out and make it work by default. Basically that's what we did 10 years ago, back then I had an Acer Aspire 8920G with a ALC889 which had the same problem that got fixed by you and these days it just works out of the box :) Kind regards, Jin

3 22

[alsa-devel] [PATCH] ASoC: rt5682: fix i2c arbitration lost issue
by shumingf＠realtek.com 28 Nov '19

28 Nov '19

From: Shuming Fan <shumingf(a)realtek.com> This patch modified the HW initial setting to fix i2c arbitration lost issue. Signed-off-by: Shuming Fan <shumingf(a)realtek.com> --- sound/soc/codecs/rt5682.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/codecs/rt5682.c b/sound/soc/codecs/rt5682.c index b1713fffa3eb..ae6f6121bc1b 100644 --- a/sound/soc/codecs/rt5682.c +++ b/sound/soc/codecs/rt5682.c @@ -73,6 +73,7 @@ struct rt5682_priv { static const struct reg_sequence patch_list[] = { {RT5682_HP_IMP_SENS_CTRL_19, 0x1000}, {RT5682_DAC_ADC_DIG_VOL1, 0xa020}, + {RT5682_I2C_CTRL, 0x000f}, }; static const struct reg_default rt5682_reg[] = { @@ -2474,6 +2475,7 @@ static void rt5682_calibrate(struct rt5682_priv *rt5682) mutex_lock(&rt5682->calibrate_mutex); rt5682_reset(rt5682->regmap); + regmap_write(rt5682->regmap, RT5682_I2C_CTRL, 0x000f); regmap_write(rt5682->regmap, RT5682_PWR_ANLG_1, 0xa2af); usleep_range(15000, 20000); regmap_write(rt5682->regmap, RT5682_PWR_ANLG_1, 0xf2af); -- 2.24.0

2 1

[alsa-devel] [PATCH] ASoC: AMD: Enable clk in startup intead of hw_params
by Yu-Hsuan Hsu 28 Nov '19

28 Nov '19

Some usages only call startup and shutdown without setting hw_params (e.g. arecord --dump-hw-params). If we don't enable clk in startup, it will cause ref count error because the clk will be disabled in shutdown. For this reason, we should move enabling clk from hw_params to startup. In addition, the hw_params is fixed in this driver(48000 rate, 2 channels, S16_LE format) so we don't need to change the clk rate after the hw_params is set. Signed-off-by: Yu-Hsuan Hsu <yuhsuan(a)chromium.org> --- sound/soc/amd/acp-da7219-max98357a.c | 46 +++++++++------------------- 1 file changed, 14 insertions(+), 32 deletions(-) diff --git a/sound/soc/amd/acp-da7219-max98357a.c b/sound/soc/amd/acp-da7219-max98357a.c index f4ee6798154af5..7a5621e5e2330d 100644 --- a/sound/soc/amd/acp-da7219-max98357a.c +++ b/sound/soc/amd/acp-da7219-max98357a.c @@ -96,14 +96,19 @@ static int cz_da7219_init(struct snd_soc_pcm_runtime *rtd) return 0; } -static int da7219_clk_enable(struct snd_pcm_substream *substream, - int wclk_rate, int bclk_rate) +static int da7219_clk_enable(struct snd_pcm_substream *substream) { int ret = 0; struct snd_soc_pcm_runtime *rtd = substream->private_data; - clk_set_rate(da7219_dai_wclk, wclk_rate); - clk_set_rate(da7219_dai_bclk, bclk_rate); + /* + * Set wclk to 48000 because the rate constraint of this driver is + * 48000. ADAU7002 spec: "The ADAU7002 requires a BCLK rate that is + * minimum of 64x the LRCLK sample rate." DA7219 is the only clk + * source so for all codecs we have to limit bclk to 64X lrclk. + */ + clk_set_rate(da7219_dai_wclk, 48000); + clk_set_rate(da7219_dai_bclk, 48000 * 64); ret = clk_prepare_enable(da7219_dai_bclk); if (ret < 0) { dev_err(rtd->dev, "can't enable master clock %d\n", ret); @@ -156,7 +161,7 @@ static int cz_da7219_play_startup(struct snd_pcm_substream *substream) &constraints_rates); machine->play_i2s_instance = I2S_SP_INSTANCE; - return 0; + return da7219_clk_enable(substream); } static int cz_da7219_cap_startup(struct snd_pcm_substream *substream) @@ -178,7 +183,7 @@ static int cz_da7219_cap_startup(struct snd_pcm_substream *substream) machine->cap_i2s_instance = I2S_SP_INSTANCE; machine->capture_channel = CAP_CHANNEL1; - return 0; + return da7219_clk_enable(substream); } static int cz_max_startup(struct snd_pcm_substream *substream) @@ -199,7 +204,7 @@ static int cz_max_startup(struct snd_pcm_substream *substream) &constraints_rates); machine->play_i2s_instance = I2S_BT_INSTANCE; - return 0; + return da7219_clk_enable(substream); } static int cz_dmic0_startup(struct snd_pcm_substream *substream) @@ -220,7 +225,7 @@ static int cz_dmic0_startup(struct snd_pcm_substream *substream) &constraints_rates); machine->cap_i2s_instance = I2S_BT_INSTANCE; - return 0; + return da7219_clk_enable(substream); } static int cz_dmic1_startup(struct snd_pcm_substream *substream) @@ -242,25 +247,7 @@ static int cz_dmic1_startup(struct snd_pcm_substream *substream) machine->cap_i2s_instance = I2S_SP_INSTANCE; machine->capture_channel = CAP_CHANNEL0; - return 0; -} - -static int cz_da7219_params(struct snd_pcm_substream *substream, - struct snd_pcm_hw_params *params) -{ - int wclk, bclk; - - wclk = params_rate(params); - bclk = wclk * params_channels(params) * - snd_pcm_format_width(params_format(params)); - /* ADAU7002 spec: "The ADAU7002 requires a BCLK rate - * that is minimum of 64x the LRCLK sample rate." - * DA7219 is the only clk source so for all codecs - * we have to limit bclk to 64X lrclk. - */ - if (bclk < (wclk * 64)) - bclk = wclk * 64; - return da7219_clk_enable(substream, wclk, bclk); + return da7219_clk_enable(substream); } static void cz_da7219_shutdown(struct snd_pcm_substream *substream) @@ -271,31 +258,26 @@ static void cz_da7219_shutdown(struct snd_pcm_substream *substream) static const struct snd_soc_ops cz_da7219_play_ops = { .startup = cz_da7219_play_startup, .shutdown = cz_da7219_shutdown, - .hw_params = cz_da7219_params, }; static const struct snd_soc_ops cz_da7219_cap_ops = { .startup = cz_da7219_cap_startup, .shutdown = cz_da7219_shutdown, - .hw_params = cz_da7219_params, }; static const struct snd_soc_ops cz_max_play_ops = { .startup = cz_max_startup, .shutdown = cz_da7219_shutdown, - .hw_params = cz_da7219_params, }; static const struct snd_soc_ops cz_dmic0_cap_ops = { .startup = cz_dmic0_startup, .shutdown = cz_da7219_shutdown, - .hw_params = cz_da7219_params, }; static const struct snd_soc_ops cz_dmic1_cap_ops = { .startup = cz_dmic1_startup, .shutdown = cz_da7219_shutdown, - .hw_params = cz_da7219_params, }; SND_SOC_DAILINK_DEF(designware1, -- 2.24.0.432.g9d3f5f5b63-goog

3 2

[alsa-devel] [PATCH] ASoC: SOF: Intel: BYT: fix a copy/paste mistake in byt_dump()
by Pierre-Louis Bossart 28 Nov '19

28 Nov '19

From: Keyon Jie <yang.jie(a)linux.intel.com> The shim registers in BYT/CHT/BSW are 64bits based, correct the copy/paste (from bdw.c where the shim registers are 32bits based) error in byt_dump(). Fixes: 3a9e204d4e36 ("ASoC: SOF: Intel: Add context data to any IPC timeout") Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/soc/sof/intel/byt.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sound/soc/sof/intel/byt.c b/sound/soc/sof/intel/byt.c index 2abf80b3eb52..b9061b79a57b 100644 --- a/sound/soc/sof/intel/byt.c +++ b/sound/soc/sof/intel/byt.c @@ -145,33 +145,33 @@ static void byt_dump(struct snd_sof_dev *sdev, u32 flags) struct sof_ipc_dsp_oops_xtensa xoops; struct sof_ipc_panic_info panic_info; u32 stack[BYT_STACK_DUMP_SIZE]; - u32 status, panic, imrd, imrx; + u64 status, panic, imrd, imrx; /* now try generic SOF status messages */ - status = snd_sof_dsp_read(sdev, BYT_DSP_BAR, SHIM_IPCD); - panic = snd_sof_dsp_read(sdev, BYT_DSP_BAR, SHIM_IPCX); + status = snd_sof_dsp_read64(sdev, BYT_DSP_BAR, SHIM_IPCD); + panic = snd_sof_dsp_read64(sdev, BYT_DSP_BAR, SHIM_IPCX); byt_get_registers(sdev, &xoops, &panic_info, stack, BYT_STACK_DUMP_SIZE); snd_sof_get_status(sdev, status, panic, &xoops, &panic_info, stack, BYT_STACK_DUMP_SIZE); /* provide some context for firmware debug */ - imrx = snd_sof_dsp_read(sdev, BYT_DSP_BAR, SHIM_IMRX); - imrd = snd_sof_dsp_read(sdev, BYT_DSP_BAR, SHIM_IMRD); + imrx = snd_sof_dsp_read64(sdev, BYT_DSP_BAR, SHIM_IMRX); + imrd = snd_sof_dsp_read64(sdev, BYT_DSP_BAR, SHIM_IMRD); dev_err(sdev->dev, - "error: ipc host -> DSP: pending %s complete %s raw 0x%8.8x\n", + "error: ipc host -> DSP: pending %s complete %s raw 0x%llx\n", (panic & SHIM_IPCX_BUSY) ? "yes" : "no", (panic & SHIM_IPCX_DONE) ? "yes" : "no", panic); dev_err(sdev->dev, - "error: mask host: pending %s complete %s raw 0x%8.8x\n", + "error: mask host: pending %s complete %s raw 0x%llx\n", (imrx & SHIM_IMRX_BUSY) ? "yes" : "no", (imrx & SHIM_IMRX_DONE) ? "yes" : "no", imrx); dev_err(sdev->dev, - "error: ipc DSP -> host: pending %s complete %s raw 0x%8.8x\n", + "error: ipc DSP -> host: pending %s complete %s raw 0x%llx\n", (status & SHIM_IPCD_BUSY) ? "yes" : "no", (status & SHIM_IPCD_DONE) ? "yes" : "no", status); dev_err(sdev->dev, - "error: mask DSP: pending %s complete %s raw 0x%8.8x\n", + "error: mask DSP: pending %s complete %s raw 0x%llx\n", (imrd & SHIM_IMRD_BUSY) ? "yes" : "no", (imrd & SHIM_IMRD_DONE) ? "yes" : "no", imrd); -- 2.20.1

2 1

[alsa-devel] [PATCH] ASoC: SOF: topology: Fix unload for SAI/ESAI
by Pierre-Louis Bossart 28 Nov '19

28 Nov '19

From: Daniel Baluta <daniel.baluta(a)nxp.com> Link unload now fails for ESAI/SAI DAIs with: "error: invalid DAI type 6" because DAI type is not properly handled. Fix this by correctly handling cases where type is ESAI or SAI. Fixes: a4eff5f86c9c5e7 ("ASoC: SOF: imx: Read ESAI parameters and send them to DSP") Signed-off-by: Daniel Baluta <daniel.baluta(a)nxp.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/soc/sof/topology.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c index d82ab981e840..e20b806ec80f 100644 --- a/sound/soc/sof/topology.c +++ b/sound/soc/sof/topology.c @@ -3132,7 +3132,9 @@ static int sof_link_unload(struct snd_soc_component *scomp, case SOF_DAI_INTEL_SSP: case SOF_DAI_INTEL_DMIC: case SOF_DAI_INTEL_ALH: - /* no resource needs to be released for SSP, DMIC and ALH */ + case SOF_DAI_IMX_SAI: + case SOF_DAI_IMX_ESAI: + /* no resource needs to be released for all cases above */ break; case SOF_DAI_INTEL_HDA: ret = sof_link_hda_unload(sdev, link); -- 2.20.1

2 1

[alsa-devel] [PATCH -next] ASoC: rt5677: Fix build error without CONFIG_SPI
by YueHaibing 28 Nov '19

28 Nov '19

If CONFIG_SPI is n, SND_SOC_RT5677_SPI also is n, building fails: sound/soc/codecs/rt5677.o: In function `rt5677_irq': rt5677.c:(.text+0x2dbf): undefined reference to `rt5677_spi_hotword_detected' sound/soc/codecs/rt5677.o: In function `rt5677_dsp_work': rt5677.c:(.text+0x3709): undefined reference to `rt5677_spi_write' This adds stub helpers to fix this. Reported-by: Hulk Robot <hulkci(a)huawei.com> Fixes: 461c623270e4 ("ASoC: rt5677: Load firmware via SPI using delayed work") Signed-off-by: YueHaibing <yuehaibing(a)huawei.com> --- sound/soc/codecs/rt5677-spi.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/sound/soc/codecs/rt5677-spi.h b/sound/soc/codecs/rt5677-spi.h index 3af36ec..088b779 100644 --- a/sound/soc/codecs/rt5677-spi.h +++ b/sound/soc/codecs/rt5677-spi.h @@ -9,9 +9,25 @@ #ifndef __RT5677_SPI_H__ #define __RT5677_SPI_H__ +#if IS_ENABLED(CONFIG_SND_SOC_RT5677_SPI) int rt5677_spi_read(u32 addr, void *rxbuf, size_t len); int rt5677_spi_write(u32 addr, const void *txbuf, size_t len); int rt5677_spi_write_firmware(u32 addr, const struct firmware *fw); void rt5677_spi_hotword_detected(void); +#else +static inline int rt5677_spi_read(u32 addr, void *rxbuf, size_t len) +{ + return -EINVAL; +} +static inline int rt5677_spi_write(u32 addr, const void *txbuf, size_t len) +{ + return -EINVAL; +} +static inline int rt5677_spi_write_firmware(u32 addr, const struct firmware *fw) +{ + return -EINVAL; +} +static inline void rt5677_spi_hotword_detected(void){} +#endif #endif /* __RT5677_SPI_H__ */ -- 2.7.4

3 2

[alsa-devel] [PATCH] ASoC: wm8904: fix automatic sysclk configuration
by Michael Walle 28 Nov '19

28 Nov '19

The simple-card tries to signal the codec to disable rate constraints, see commit 2458adb8f92a ("SoC: simple-card-utils: set 0Hz to sysclk when shutdown"). This wasn't handled by the codec, instead it would set the FLL frequency to 0Hz which isn't working. Since we don't have any rate constraints just ignore this request. Fixes: 13409d27cb39 ("ASoC: wm8904: configure sysclk/FLL automatically") Signed-off-by: Michael Walle <michael(a)walle.cc> --- sound/soc/codecs/wm8904.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c index 7d7ea15d73e0..5ffbaddd6e49 100644 --- a/sound/soc/codecs/wm8904.c +++ b/sound/soc/codecs/wm8904.c @@ -1806,6 +1806,12 @@ static int wm8904_set_sysclk(struct snd_soc_dai *dai, int clk_id, switch (clk_id) { case WM8904_CLK_AUTO: + /* We don't have any rate constraints, so just ignore the + * request to disable constraining. + */ + if (!freq) + return 0; + mclk_freq = clk_get_rate(priv->mclk); /* enable FLL if a different sysclk is desired */ if (mclk_freq != freq) { -- 2.20.1

3 2

[alsa-devel] [PATCH v2 0/3] ASoC: max98090: fix PLL unlocked workaround-related
by Tzung-Bi Shih 28 Nov '19

28 Nov '19

This series is a follow up fix for the question: https://mailman.alsa-project.org/pipermail/alsa-devel/2019-October/157364.h… Changes from v1: ASoC: max98090: remove msleep in PLL unlocked workaround - add more comments https://mailman.alsa-project.org/pipermail/alsa-devel/2019-November/158969.… ASoC: max98090: exit workaround earlier if PLL is locked - "sleep first and then check the status" https://mailman.alsa-project.org/pipermail/alsa-devel/2019-November/158998.… ASoC: max98090: fix possible race conditions - fix typo https://mailman.alsa-project.org/pipermail/alsa-devel/2019-November/158966.… - add more descriptions in commit message Tzung-Bi Shih (3): ASoC: max98090: remove msleep in PLL unlocked workaround ASoC: max98090: exit workaround earlier if PLL is locked ASoC: max98090: fix possible race conditions sound/soc/codecs/max98090.c | 30 +++++++++++++++++++++--------- sound/soc/codecs/max98090.h | 1 - 2 files changed, 21 insertions(+), 10 deletions(-) -- 2.24.0.432.g9d3f5f5b63-goog

3 7

[alsa-devel] [PATCHv2 0/6] ASoC: da7213: support for usage with simple-card
by Sebastian Reichel 28 Nov '19

28 Nov '19

Hi, This extends the da7213 driver to be used with simple-audio-card in combination with a fixed clock. Here is a snippet of the downstream board's DT, that is supposed to be supported by this patchset. --------------------------------------------------------------------- / { sound { compatible = "simple-audio-card"; simple-audio-card,name = "audio-card"; simple-audio-card,format = "i2s"; simple-audio-card,bitclock-master = <&dailink_master>; simple-audio-card,frame-master = <&dailink_master>; simple-audio-card,widgets = "Speaker", "Ext Spk"; simple-audio-card,audio-routing = "Ext Spk", "LINE"; simple-audio-card,cpu { sound-dai = <&ssi1>; }; dailink_master: simple-audio-card,codec { sound-dai = <&codec>; }; }; clk_ext_audio_codec: clock-codec { compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <12288000>; }; }; &i2c1 { codec: audio-codec@1a { compatible = "dlg,da7212"; reg = <0x1a>; #sound-dai-cells = <0>; VDDA-supply = <&reg_2v5_audio>; VDDSP-supply = <&reg_5v0_audio>; VDDMIC-supply = <&reg_3v3_audio>; VDDIO-supply = <&reg_3v3_audio>; clocks = <&clk_ext_audio_codec>; clock-names = "mclk"; }; }; --------------------------------------------------------------------- Changes since PATCHv1: * https://lore.kernel.org/alsa-devel/20191108174843.11227-1-sebastian.reichel… * add patch adding da7212 compatible to DT bindings * update regulator patch, so that VDDA is enabled together with VDDIO while the device is enabled to avoid device reset * update clock patch, so that automatic PLL handling is not enabled when PLL is configured manually * update clock patch, so that automatic PLL is disabled when the device is suspended * update clock patch, so that automatic PLL is configured into bypass mode when possible -- Sebastian Sebastian Reichel (6): ASoC: da7213: Add da7212 DT compatible ASoC: da7213: Add regulator support ASoC: da7213: Provide selectable option ASoC: da7213: Move set_sysclk to codec level ASoC: da7213: Move set_pll to codec level ASoC: da7213: Add default clock handling .../devicetree/bindings/sound/da7213.txt | 8 +- sound/soc/codecs/Kconfig | 3 +- sound/soc/codecs/da7213.c | 171 ++++++++++++++++-- sound/soc/codecs/da7213.h | 11 ++ 4 files changed, 177 insertions(+), 16 deletions(-) -- 2.24.0

3 27

[alsa-devel] Dell headphone has noise on unmute state for ALC236
by Kailang 28 Nov '19

28 Nov '19

Hi Takashi, headphone have noise even the volume is very small. Let it fill up pcbeep hidden register to default value. The issue was gone. The patch as attach file. Many thanks. BR, Kailang

2 1

[alsa-devel] [PATCH v3] ALSA: hda: hdmi - fix regression in connect list handling
by Kai Vehmanen 28 Nov '19

28 Nov '19

Fix regression in how intel_haswell_fixup_connect_list() results are used in hda_read_pin_conn(). Use of snd_hda_get_raw_connections() in hda_read_pin_conn() bypasses the cache and thus also bypasses the overridden pin connection list. On platforms that require the connection list fixup, mux list will be empty and HDMI playback will fail to -EBUSY at open. Fix the regression in hda_read_pinn_conn(). Simplify code as suggested by Takashi Iwai to remove old intel_haswell_fixup_connect_list() and copy the cvt_nid list directly and not use snd_hda_override_conn_list() at all. Fixes: 9c32fea83692 ("ALSA: hda - Add DP-MST support for non-acomp codecs") BugLink: https://github.com/thesofproject/linux/issues/1537 Cc: Nikhil Mahale <nmahale(a)nvidia.com> Signed-off-by: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> --- sound/pci/hda/patch_hdmi.c | 38 ++++++++++++-------------------------- 1 file changed, 12 insertions(+), 26 deletions(-) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 55d20e40a195..373ca99b7a2f 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -1302,6 +1302,7 @@ static int hdmi_read_pin_conn(struct hda_codec *codec, int pin_idx) struct hdmi_spec_per_pin *per_pin = get_pin(spec, pin_idx); hda_nid_t pin_nid = per_pin->pin_nid; int dev_id = per_pin->dev_id; + int conns; if (!(get_wcaps(codec, pin_nid) & AC_WCAP_CONN_LIST)) { codec_warn(codec, @@ -1312,10 +1313,18 @@ static int hdmi_read_pin_conn(struct hda_codec *codec, int pin_idx) snd_hda_set_dev_select(codec, pin_nid, dev_id); + if (spec->intel_hsw_fixup) { + conns = spec->num_cvts; + memcpy(per_pin->mux_nids, spec->cvt_nids, + sizeof(hda_nid_t) * conns); + } else { + conns = snd_hda_get_raw_connections(codec, pin_nid, + per_pin->mux_nids, + HDA_MAX_CONNECTIONS); + } + /* all the device entries on the same pin have the same conn list */ - per_pin->num_mux_nids = - snd_hda_get_raw_connections(codec, pin_nid, per_pin->mux_nids, - HDA_MAX_CONNECTIONS); + per_pin->num_mux_nids = conns; return 0; } @@ -1713,9 +1722,6 @@ static void hdmi_repoll_eld(struct work_struct *work) mutex_unlock(&spec->pcm_lock); } -static void intel_haswell_fixup_connect_list(struct hda_codec *codec, - hda_nid_t nid); - static int hdmi_add_pin(struct hda_codec *codec, hda_nid_t pin_nid) { struct hdmi_spec *spec = codec->spec; @@ -1790,8 +1796,6 @@ static int hdmi_add_pin(struct hda_codec *codec, hda_nid_t pin_nid) per_pin->dev_id = i; per_pin->non_pcm = false; snd_hda_set_dev_select(codec, pin_nid, i); - if (spec->intel_hsw_fixup) - intel_haswell_fixup_connect_list(codec, pin_nid); err = hdmi_read_pin_conn(codec, pin_idx); if (err < 0) return err; @@ -2603,24 +2607,6 @@ static void generic_acomp_init(struct hda_codec *codec, * Intel codec parsers and helpers */ -static void intel_haswell_fixup_connect_list(struct hda_codec *codec, - hda_nid_t nid) -{ - struct hdmi_spec *spec = codec->spec; - hda_nid_t conns[4]; - int nconns; - - nconns = snd_hda_get_raw_connections(codec, nid, conns, - ARRAY_SIZE(conns)); - if (nconns == spec->num_cvts && - !memcmp(conns, spec->cvt_nids, spec->num_cvts * sizeof(hda_nid_t))) - return; - - /* override pins connection list */ - codec_dbg(codec, "hdmi: haswell: override pin connection 0x%x\n", nid); - snd_hda_override_conn_list(codec, nid, spec->num_cvts, spec->cvt_nids); -} - #define INTEL_GET_VENDOR_VERB 0xf81 #define INTEL_SET_VENDOR_VERB 0x781 #define INTEL_EN_DP12 0x02 /* enable DP 1.2 features */ -- 2.17.1

3 2

[alsa-devel] [PATCH v2 00/12] treewide: break dependencies on x86's RM header
by Sean Christopherson 27 Nov '19

27 Nov '19

x86's asm/realmode.h, which defines low level structures, variables and helpers used to bring up APs during SMP boot, ends up getting included in practically every nook and cranny of the kernel because the address used by ACPI for resuming from S3 also happens to be stored in the real mode header, and ACPI bleeds the dependency into its widely included headers. As a result, modifying realmode.h for even the most trivial change to the boot code triggers a full kernel rebuild, which is frustrating to say the least as it some of the most difficult code to get exactly right *and* is also some of the most functionally isolated code in the kernel. To break the kernel's widespread dependency on realmode.h, add a wrapper in the aforementioned ACPI S3 code to access the real mode header instead of derefencing the header directly in asm/acpi.h and thereby exposing it to the world via linux/acpi.h. v2: - Rebased on tip/x86/cleanups, commit b74374fef924 ("x86/setup: Enhance the comments"). - Use acpi_get_wakeup_address() as new function name. [Boris and Pavel] - Capture acpi_get_wakeup_address() in a local address. [Pavel] - Collect acks. I didn't add Rafael's acks on patches 11 and 12 due to the above changes. - Explicitly call out the removal of <asm/realmode.h> from <asm/acpi.h> in patch 12. [Ingo] - Remove superfluous Fixes: tags. [Ard] Patch Synopsis: - Patches 01-09 fix a variety of build errors that arise when patch 12 drops realmode.h from asm/acpi.h. Most of the errors are quite absurb as they have no relation whatsoever to x86's RM boot code, but occur because realmode.h happens to include asm/io.h. - Patch 10 removes a spurious include of realmode.h from an ACPI header. - Patches 11 and 12 implement the wrapper and move it out of acpi.h. Sean Christopherson (12): x86/efi: Explicitly include realmode.h to handle RM trampoline quirk x86/boot: Explicitly include realmode.h to handle RM reservations x86/ftrace: Explicitly include vmalloc.h for set_vm_flush_reset_perms() x86/kprobes: Explicitly include vmalloc.h for set_vm_flush_reset_perms() perf/x86/intel: Explicitly include asm/io.h to use virt_to_phys() efi/capsule-loader: Explicitly include linux/io.h for page_to_phys() virt: vbox: Explicitly include linux/io.h to pick up various defs vmw_balloon: Explicitly include linux/io.h for virt_to_phys() ASoC: Intel: Skylake: Explicitly include linux/io.h for virt_to_phys() x86/ACPI/sleep: Remove an unnecessary include of asm/realmode.h ACPI/sleep: Convert acpi_wakeup_address into a function x86/ACPI/sleep: Move acpi_get_wakeup_address() into sleep.c, remove <asm/realmode.h> from <asm/acpi.h> arch/ia64/include/asm/acpi.h | 5 ++++- arch/ia64/kernel/acpi.c | 2 -- arch/x86/events/intel/ds.c | 1 + arch/x86/include/asm/acpi.h | 3 +-- arch/x86/kernel/acpi/sleep.c | 11 +++++++++++ arch/x86/kernel/acpi/sleep.h | 2 +- arch/x86/kernel/ftrace.c | 1 + arch/x86/kernel/kprobes/core.c | 1 + arch/x86/kernel/setup.c | 1 + arch/x86/platform/efi/quirks.c | 1 + drivers/acpi/sleep.c | 3 +++ drivers/firmware/efi/capsule-loader.c | 1 + drivers/misc/vmw_balloon.c | 1 + drivers/virt/vboxguest/vboxguest_core.c | 1 + drivers/virt/vboxguest/vboxguest_utils.c | 1 + sound/soc/intel/skylake/skl-sst-cldma.c | 1 + 16 files changed, 30 insertions(+), 6 deletions(-) -- 2.24.0

3 16

[alsa-devel] kernel oops related to the new HDA audio handling for DP MST
by Michał Matysiak 27 Nov '19

27 Nov '19

Hi Recently I've encountered this error and as Hans de Goede's request I'm reporting this back to you. This happens while booting my laptop connected to docking station and without using one. kernel: WARNING: CPU: 1 PID: 330 at sound/hda/hdac_component.c:290 snd_hdac_acomp_init+0xde/0x130 [snd_hda_core] There are 2 more "cut here", but they're almost identical so I've only included one in this email. Don't know what will be valuable to you, but I'm willing to help test this and do what I'm told. So, how can I help? More info about this particular kernel and issue, that led to this is at: https://bugzilla.redhat.com/show_bug.cgi?id=1757891 dmesg output: Nov 26 18:05:45 kernel: microcode: microcode updated early to revision 0x2f, date = 2019-02-17 Nov 26 18:05:45 kernel: Linux version 5.4.0-0.rc8.git0.1.rhbz1757891.fc31.x86_64 (mockbuild(a)buildhw-10.phx2.fedoraproject.org) (gcc version 9.2.1 20190827 (Red Hat 9.2.1-1) (GCC)) #1 SMP Wed Nov 20 14:50:34 UTC 2019 Nov 26 18:05:45 kernel: Command line: BOOT_IMAGE=(hd0,gpt2)/vmlinuz-5.4.0-0.rc8.git0.1.rhbz1757891.fc31.x86_64 root=/dev/mapper/fedora-root ro resume=/dev/mapper/fedora-swap rd.lvm.lv=fedora/root rd.luks.uuid=luks-efd8b438-8f56-405a-8cea-88f83ca38d2b rd.lvm.lv=fedora/swap rhgb quiet ... ... ... Nov 26 18:06:16 kernel: ------------[ cut here ]------------ Nov 26 18:06:16 kernel: WARNING: CPU: 0 PID: 461 at sound/hda/hdac_component.c:290 snd_hdac_acomp_init+0xde/0x130 [snd_hda_core] Nov 26 18:06:16 kernel: Modules linked in: intel_rapl_msr intel_rapl_common iwldvm x86_pkg_temp_thermal intel_powerclamp snd_hda_codec_hdmi coretemp mac80211 snd_hda_codec_conexant snd_hda_codec_generic kvm_intel snd_hda_intel libarc4 snd_intel_nhlt kvm mei_wdt iTCO_wdt snd_hda_codec mei_hdcp iwlwifi irqbypass iTCO_vendor_support snd_hda_core intel_cstate snd_hwdep snd_seq intel_uncore snd_seq_device thinkpad_acpi joydev i2c_i801 wmi_bmof intel_rapl_perf snd_pcm pcspkr ledtrig_audio cfg80211 snd_timer mei_me snd mei soundcore lpc_ich rfkill binfmt_misc ip_tables dm_crypt i915 nouveau crct10dif_pclmul crc32_pclmul mxm_wmi crc32c_intel ttm i2c_algo_bit drm_kms_helper ghash_clmulni_intel sdhci_pci cqhci drm sdhci serio_raw e1000e firewire_ohci mmc_core firewire_core crc_itu_t wmi video fuse Nov 26 18:06:16 kernel: CPU: 0 PID: 461 Comm: kworker/0:2 Tainted: G W 5.4.0-0.rc8.git0.1.rhbz1757891.fc31.x86_64 #1 Nov 26 18:06:16 kernel: Hardware name: LENOVO 42844DG/42844DG, BIOS 8BET66WW (1.46 ) 06/14/2018 Nov 26 18:06:16 kernel: Workqueue: events azx_probe_work [snd_hda_intel] Nov 26 18:06:16 kernel: RIP: 0010:snd_hdac_acomp_init+0xde/0x130 [snd_hda_core] Nov 26 18:06:16 kernel: Code: 41 89 c4 85 c0 78 3a 45 31 e4 48 8b 44 24 08 65 48 33 04 25 28 00 00 00 75 22 48 83 c4 10 44 89 e0 5b 5d 41 5c 41 5d 41 5e c3 <0f> 0b 41 bc f0 ff ff ff eb d6 41 bc f4 ff ff ff eb ce e8 6b 7c 5f Nov 26 18:06:16 kernel: RSP: 0018:ffffa5e4002a3c28 EFLAGS: 00010286 Nov 26 18:06:16 kernel: RAX: ffff984ae816a7e8 RBX: ffff984aebf91000 RCX: ffff984aeb50c338 Nov 26 18:06:16 kernel: RDX: 0000000000000001 RSI: 0000000000000282 RDI: 0000000000000282 Nov 26 18:06:16 kernel: RBP: ffff984ae53e4df0 R08: 0000000000000282 R09: ffff984aebe4e738 Nov 26 18:06:16 kernel: R10: ffff984ae778a180 R11: ffffa5e4002a3c0f R12: ffffffffc0c270c0 Nov 26 18:06:16 kernel: R13: ffff984aeb50c0b0 R14: 0000000000000000 R15: 0000000000000001 Nov 26 18:06:16 kernel: FS: 0000000000000000(0000) GS:ffff984aee000000(0000) knlGS:0000000000000000 Nov 26 18:06:16 kernel: CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 Nov 26 18:06:16 kernel: CR2: 00007f3a343e8000 CR3: 000000035360a006 CR4: 00000000000606f0 Nov 26 18:06:16 kernel: Call Trace: Nov 26 18:06:16 kernel: generic_acomp_init+0x71/0x90 [snd_hda_codec_hdmi] Nov 26 18:06:16 kernel: patch_nvhdmi+0x58/0x60 [snd_hda_codec_hdmi] Nov 26 18:06:16 kernel: hda_codec_driver_probe+0x92/0x150 [snd_hda_codec] Nov 26 18:06:16 kernel: really_probe+0x298/0x3c0 Nov 26 18:06:16 kernel: driver_probe_device+0xb6/0x100 Nov 26 18:06:16 kernel: ? driver_allows_async_probing+0x50/0x50 Nov 26 18:06:16 kernel: bus_for_each_drv+0x7e/0xc0 Nov 26 18:06:16 kernel: __device_attach+0xdf/0x160 Nov 26 18:06:16 kernel: bus_probe_device+0x8e/0xa0 Nov 26 18:06:16 kernel: device_add+0x3a2/0x670 Nov 26 18:06:16 kernel: snd_hdac_device_register+0x12/0x60 [snd_hda_core] Nov 26 18:06:16 kernel: snd_hda_codec_configure+0x45/0x150 [snd_hda_codec] Nov 26 18:06:16 kernel: azx_codec_configure+0x2f/0x60 [snd_hda_codec] Nov 26 18:06:16 kernel: azx_probe_continue+0x48c/0x700 [snd_hda_intel] Nov 26 18:06:16 kernel: process_one_work+0x1b0/0x350 Nov 26 18:06:16 kernel: worker_thread+0x50/0x3b0 Nov 26 18:06:16 kernel: kthread+0xfb/0x130 Nov 26 18:06:16 kernel: ? process_one_work+0x350/0x350 Nov 26 18:06:16 kernel: ? kthread_park+0x90/0x90 Nov 26 18:06:16 kernel: ret_from_fork+0x35/0x40 Nov 26 18:06:16 kernel: ---[ end trace 3c8d65bedba62849 ]--- Nov 26 18:06:16 kernel: input: HDA NVidia HDMI/DP,pcm=3 as /devices/pci0000:00/0000:00:01.0/0000:01:00.1/sound/card1/input15 Nov 26 18:06:16 kernel: input: HDA NVidia HDMI/DP,pcm=7 as /devices/pci0000:00/0000:00:01.0/0000:01:00.1/sound/card1/input16 Nov 26 18:06:16 kernel: input: HDA NVidia HDMI/DP,pcm=8 as /devices/pci0000:00/0000:00:01.0/0000:01:00.1/sound/card1/input17 Nov 26 18:06:16 kernel: input: HDA NVidia HDMI/DP,pcm=9 as /devices/pci0000:00/0000:00:01.0/0000:01:00.1/sound/card1/input18 -- Regards, Michał Matysiak

3 13

[alsa-devel] [PATCH v2] ALSA: hda: hdmi - fix regression in connect list handling
by Kai Vehmanen 27 Nov '19

27 Nov '19

Fix regression in how intel_haswell_fixup_connect_list() results are used in hda_read_pin_conn(). Use of snd_hda_get_raw_connections() in hda_read_pin_conn() bypasses the cache and thus also bypasses the overridden pin connection list. On platforms that require the connection list fixup, mux list will be empty and HDMI playback will fail to -EBUSY at open. Fix the regression in hda_read_pinn_conn(). Simplify code as suggested by Takashi Iwai to remove old intel_haswell_fixup_connect_list() and copy the cvt_nid list directly and not use snd_hda_override_conn_list() at all. Fixes: 9c32fea83692 ("ALSA: hda - Add DP-MST support for non-acomp codecs") BugLink: https://github.com/thesofproject/linux/issues/1537 Cc: Nikhil Mahale <nmahale(a)nvidia.com> Signed-off-by: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> --- sound/pci/hda/patch_hdmi.c | 42 +++++++++++--------------------------- 1 file changed, 12 insertions(+), 30 deletions(-) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 55d20e40a195..cad99e1f9222 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -1302,6 +1302,7 @@ static int hdmi_read_pin_conn(struct hda_codec *codec, int pin_idx) struct hdmi_spec_per_pin *per_pin = get_pin(spec, pin_idx); hda_nid_t pin_nid = per_pin->pin_nid; int dev_id = per_pin->dev_id; + int conns; if (!(get_wcaps(codec, pin_nid) & AC_WCAP_CONN_LIST)) { codec_warn(codec, @@ -1312,10 +1313,18 @@ static int hdmi_read_pin_conn(struct hda_codec *codec, int pin_idx) snd_hda_set_dev_select(codec, pin_nid, dev_id); + if (spec->intel_hsw_fixup) { + conns = spec->num_cvts; + memcpy(per_pin->mux_nids, spec->cvt_nids, + sizeof(hda_nid_t) * conns); + } else { + conns = snd_hda_get_raw_connections(codec, pin_nid, + per_pin->mux_nids, + HDA_MAX_CONNECTIONS); + } + /* all the device entries on the same pin have the same conn list */ - per_pin->num_mux_nids = - snd_hda_get_raw_connections(codec, pin_nid, per_pin->mux_nids, - HDA_MAX_CONNECTIONS); + per_pin->num_mux_nids = conns; return 0; } @@ -1713,9 +1722,6 @@ static void hdmi_repoll_eld(struct work_struct *work) mutex_unlock(&spec->pcm_lock); } -static void intel_haswell_fixup_connect_list(struct hda_codec *codec, - hda_nid_t nid); - static int hdmi_add_pin(struct hda_codec *codec, hda_nid_t pin_nid) { struct hdmi_spec *spec = codec->spec; @@ -1790,8 +1796,6 @@ static int hdmi_add_pin(struct hda_codec *codec, hda_nid_t pin_nid) per_pin->dev_id = i; per_pin->non_pcm = false; snd_hda_set_dev_select(codec, pin_nid, i); - if (spec->intel_hsw_fixup) - intel_haswell_fixup_connect_list(codec, pin_nid); err = hdmi_read_pin_conn(codec, pin_idx); if (err < 0) return err; @@ -2599,28 +2603,6 @@ static void generic_acomp_init(struct hda_codec *codec, } } -/* - * Intel codec parsers and helpers - */ - -static void intel_haswell_fixup_connect_list(struct hda_codec *codec, - hda_nid_t nid) -{ - struct hdmi_spec *spec = codec->spec; - hda_nid_t conns[4]; - int nconns; - - nconns = snd_hda_get_raw_connections(codec, nid, conns, - ARRAY_SIZE(conns)); - if (nconns == spec->num_cvts && - !memcmp(conns, spec->cvt_nids, spec->num_cvts * sizeof(hda_nid_t))) - return; - - /* override pins connection list */ - codec_dbg(codec, "hdmi: haswell: override pin connection 0x%x\n", nid); - snd_hda_override_conn_list(codec, nid, spec->num_cvts, spec->cvt_nids); -} - #define INTEL_GET_VENDOR_VERB 0xf81 #define INTEL_SET_VENDOR_VERB 0x781 #define INTEL_EN_DP12 0x02 /* enable DP 1.2 features */ -- 2.17.1

1 0

[alsa-devel] [PATCH] ALSA: hda: hdmi - fix regression in connect list handling
by Kai Vehmanen 27 Nov '19

27 Nov '19

Fix regression in how intel_haswell_fixup_connect_list() results are used in hda_read_pin_conn(). Use of snd_hda_get_raw_connections() in hda_read_pin_conn() bypasses the cache and thus also bypasses the overridden pin connection list. On platforms that require the connection list fixup, mux list will be empty and HDMI playback will fail to -EBUSY at open. Move intel_haswell_fixup_connect_list() call to hda_read_pin_conn() as it's not used elsewhere. Fixes: 9c32fea83692 ("ALSA: hda - Add DP-MST support for non-acomp codecs") BugLink: https://github.com/thesofproject/linux/issues/1537 Cc: Nikhil Mahale <nmahale(a)nvidia.com> Signed-off-by: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> --- sound/pci/hda/patch_hdmi.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 55d20e40a195..c111bdd566c9 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -1293,6 +1293,9 @@ static int hdmi_pcm_open(struct hda_pcm_stream *hinfo, return err; } +static void intel_haswell_fixup_connect_list(struct hda_codec *codec, + hda_nid_t nid); + /* * HDA/HDMI auto parsing */ @@ -1302,6 +1305,7 @@ static int hdmi_read_pin_conn(struct hda_codec *codec, int pin_idx) struct hdmi_spec_per_pin *per_pin = get_pin(spec, pin_idx); hda_nid_t pin_nid = per_pin->pin_nid; int dev_id = per_pin->dev_id; + int conns; if (!(get_wcaps(codec, pin_nid) & AC_WCAP_CONN_LIST)) { codec_warn(codec, @@ -1312,10 +1316,19 @@ static int hdmi_read_pin_conn(struct hda_codec *codec, int pin_idx) snd_hda_set_dev_select(codec, pin_nid, dev_id); + if (spec->intel_hsw_fixup) { + intel_haswell_fixup_connect_list(codec, pin_nid); + conns = snd_hda_get_connections(codec, pin_nid, + per_pin->mux_nids, + HDA_MAX_CONNECTIONS); + } else { + conns = snd_hda_get_raw_connections(codec, pin_nid, + per_pin->mux_nids, + HDA_MAX_CONNECTIONS); + } + /* all the device entries on the same pin have the same conn list */ - per_pin->num_mux_nids = - snd_hda_get_raw_connections(codec, pin_nid, per_pin->mux_nids, - HDA_MAX_CONNECTIONS); + per_pin->num_mux_nids = conns; return 0; } @@ -1713,9 +1726,6 @@ static void hdmi_repoll_eld(struct work_struct *work) mutex_unlock(&spec->pcm_lock); } -static void intel_haswell_fixup_connect_list(struct hda_codec *codec, - hda_nid_t nid); - static int hdmi_add_pin(struct hda_codec *codec, hda_nid_t pin_nid) { struct hdmi_spec *spec = codec->spec; @@ -1790,8 +1800,6 @@ static int hdmi_add_pin(struct hda_codec *codec, hda_nid_t pin_nid) per_pin->dev_id = i; per_pin->non_pcm = false; snd_hda_set_dev_select(codec, pin_nid, i); - if (spec->intel_hsw_fixup) - intel_haswell_fixup_connect_list(codec, pin_nid); err = hdmi_read_pin_conn(codec, pin_idx); if (err < 0) return err; -- 2.17.1

2 3

[alsa-devel] [PATCH] ALSA: aloop: Avoid pointer dereference before null-check
by Andrew Gabbasov 27 Nov '19

27 Nov '19

Static analysis tools (cppcheck and PVS Studio) report an error in loopback_snd_timer_period_elapsed() regarding dpcm_play pointer dereference earlier than its null-check. And although this is a result of a formal check, and the pointer correctness is also protected by having a corresponding bit set in the "running" mask, re-ordering of the lines can imake the code even formally correct and eliminate those static analysis error reports. Fixes: 26c53379f98d ("ALSA: aloop: Support selection of snd_timer instead of jiffies") Reported-by: Eugeniu Rosca <erosca(a)de.adit-jv.com> Signed-off-by: Andrew Gabbasov <andrew_gabbasov(a)mentor.com> --- sound/drivers/aloop.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/drivers/aloop.c b/sound/drivers/aloop.c index 0ebfbe70db00..6bb46423f5ae 100644 --- a/sound/drivers/aloop.c +++ b/sound/drivers/aloop.c @@ -727,10 +727,6 @@ static void loopback_snd_timer_period_elapsed(struct loopback_cable *cable, dpcm_play = cable->streams[SNDRV_PCM_STREAM_PLAYBACK]; dpcm_capt = cable->streams[SNDRV_PCM_STREAM_CAPTURE]; - substream_play = (running & (1 << SNDRV_PCM_STREAM_PLAYBACK)) ? - dpcm_play->substream : NULL; - substream_capt = (running & (1 << SNDRV_PCM_STREAM_CAPTURE)) ? - dpcm_capt->substream : NULL; if (event == SNDRV_TIMER_EVENT_MSTOP) { if (!dpcm_play || @@ -741,6 +737,10 @@ static void loopback_snd_timer_period_elapsed(struct loopback_cable *cable, } } + substream_play = (running & (1 << SNDRV_PCM_STREAM_PLAYBACK)) ? + dpcm_play->substream : NULL; + substream_capt = (running & (1 << SNDRV_PCM_STREAM_CAPTURE)) ? + dpcm_capt->substream : NULL; valid_runtime = (running & (1 << SNDRV_PCM_STREAM_PLAYBACK)) ? dpcm_play->substream->runtime : dpcm_capt->substream->runtime; -- 2.21.0

2 1

[alsa-devel] Multiple LADSPA plugin paths when some of them error
by jimmy＠spalge.com 27 Nov '19

27 Nov '19

Having multiple lookup paths for ladspa plugins is supported by separating them with ":" in a "path" directive on the pcm definition in asoundrc or the LADSPA_PATH environment variable. But if there is an error encountered while looking for the plugin in one of the earlier paths than later ones won't be checked. My use case is that I have a mixed architecture system (moving from 32 to 64 bit) and I need applications of both architectures to do sound stuff. Since the dlopen will always fail for one of them it doesn't quite work as-is (I've patched it locally sufficient for my needs). I think snd_pcm_ladspa_look_for_plugin in src/pcm/pcm_ladspa.c should be changed to not return on errors in the loop but just log a message and proceed.

1 0

[alsa-devel] Converting a non BE to BE inside soc_check_tplg_fes
by Daniel Baluta 26 Nov '19

26 Nov '19

Hi all, I am trying how a non-BE link is converted to a BE link inside soc_check_tplg_fes. soc_check_tplg_fes => for all components that have ignore_machine setup to card name => dai_link->platforms->name = component->name; => dai_link->no_pcm = 1; But the thing is that the link is a true non-DPCM link, than fields like dpcm_playback/dpcm_capture are not set and playback/record substreams are no created. The question is: is this supposed to be working with non-DPCM links?

3 4

[alsa-devel] [PATCH 0/4] add runtime pm support for AMD display audio
by Alex Deucher 26 Nov '19

26 Nov '19

These patches were originally part of a larger set of patches to enabled runtime pm support on the GPU side[1]. However, the patches are useful on their own there are really no dependencies, other than the fact that you need both for runtime pm to kick in on the GPU side. The GPU side will be landing for 5.6; I'd like to land the audio side as well. Thanks, Alex [1]: https://patchwork.freedesktop.org/series/67885/ Alex Deucher (4): ALSA: hda/hdmi - fix vgaswitcheroo detection for AMD ALSA: hda/hdmi - Add new pci ids for AMD GPU display audio ALSA: hda/hdmi - enable runtime pm for newer AMD display audio ALSA: hda/hdmi - enable automatic runtime pm for AMD HDMI codecs by default sound/pci/hda/hda_intel.c | 80 +++++++++++++++++++++++++++++++++++--- sound/pci/hda/patch_hdmi.c | 1 + 2 files changed, 76 insertions(+), 5 deletions(-) -- 2.23.0

2 10

[alsa-devel] Sof upstream
by GitHub pull_request - opened 26 Nov '19

26 Nov '19

alsa-project/alsa-ucm-conf pull request #7 was opened from juimonen: Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/7 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/7.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[alsa-devel] [PATCH 00/12] treewide: break dependencies on x86's RM header
by Sean Christopherson 26 Nov '19

26 Nov '19

x86's asm/realmode.h, which defines low level structures, variables and helpers used to bring up APs during SMP boot, ends up getting included in practically every nook and cranny of the kernel because the address used by ACPI for resuming from S3 also happens to be stored in the real mode header, and ACPI bleeds the dependency into its widely included headers. As a result, modifying realmode.h for even the most trivial change to the boot code triggers a full kernel rebuild, which is frustrating to say the least as it some of the most difficult code to get exactly right *and* is also some of the most functionally isolated code in the kernel. To break the kernel's widespread dependency on realmode.h, add a wrapper in the aforementioned ACPI S3 code to access the real mode header instead of derefencing the header directly in asm/acpi.h and thereby exposing it to the world via linux/acpi.h. Build tested on x86 with allyesconfig and allmodconfig, so hopefully there aren't more build issues lurking, but at this point it wouldn't surprise me in the least if this somehow manages to break the build. Based on tip/master, commit ceceaf1f12ba ("Merge branch 'WIP.x86/cleanups'"). Patch Synopsis: - Patches 01-09 fix a variety of build errors that arise when patch 12 drops realmode.h from asm/acpi.h. Most of the errors are quite absurb as they have no relation whatsoever to x86's RM boot code, but occur because realmode.h happens to include asm/io.h. - Patch 10 removes a spurious include of realmode.h from an ACPI header. - Patches 11 and 12 implement the wrapper and move it out of acpi.h. Sean Christopherson (12): x86/efi: Explicitly include realmode.h to handle RM trampoline quirk x86/boot: Explicitly include realmode.h to handle RM reservations x86/ftrace: Explicitly include vmalloc.h for set_vm_flush_reset_perms() x86/kprobes: Explicitly include vmalloc.h for set_vm_flush_reset_perms() perf/x86/intel: Explicitly include asm/io.h to use virt_to_phys() efi/capsule-loader: Explicitly include linux/io.h for page_to_phys() virt: vbox: Explicitly include linux/io.h to pick up various defs vmw_balloon: Explicitly include linux/io.h for virt_to_phys() ASoC: Intel: Skylake: Explicitly include linux/io.h for virt_to_phys() x86/ACPI/sleep: Remove an unnecessary include of asm/realmode.h ACPI/sleep: Convert acpi_wakeup_address into a function x86/ACPI/sleep: Move acpi_wakeup_address() definition into sleep.c arch/ia64/include/asm/acpi.h | 5 ++++- arch/ia64/kernel/acpi.c | 2 -- arch/x86/events/intel/ds.c | 1 + arch/x86/include/asm/acpi.h | 3 +-- arch/x86/kernel/acpi/sleep.c | 11 +++++++++++ arch/x86/kernel/acpi/sleep.h | 2 +- arch/x86/kernel/ftrace.c | 1 + arch/x86/kernel/kprobes/core.c | 1 + arch/x86/kernel/setup.c | 1 + arch/x86/platform/efi/quirks.c | 1 + drivers/acpi/sleep.c | 4 ++-- drivers/firmware/efi/capsule-loader.c | 1 + drivers/misc/vmw_balloon.c | 1 + drivers/virt/vboxguest/vboxguest_core.c | 1 + drivers/virt/vboxguest/vboxguest_utils.c | 1 + sound/soc/intel/skylake/skl-sst-cldma.c | 1 + 16 files changed, 29 insertions(+), 8 deletions(-) -- 2.24.0

8 28

[alsa-devel] [PATCH] crecord: truncate file to remove content of existing file
by Piotr Maziarz 26 Nov '19

26 Nov '19

Without O_TRUNC overwriting bigger file by smaller one doesn't wipe the old file fully. Signed-off-by: Piotr Maziarz <piotrx.maziarz(a)linux.intel.com> Signed-off-by: Cezary Rojewski <cezary.rojewski(a)intel.com> --- src/utils/crecord.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/crecord.c b/src/utils/crecord.c index 12ad961..abaafea 100644 --- a/src/utils/crecord.c +++ b/src/utils/crecord.c @@ -323,7 +323,7 @@ static void capture_samples(char *name, unsigned int card, unsigned int device, if (!name) { file = STDOUT_FILENO; } else { - file = open(name, O_RDWR | O_CREAT, + file = open(name, O_RDWR | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP); if (file == -1) { fprintf(stderr, "Unable to open file '%s'\n", name); -- 2.7.4

1 0

[alsa-devel] [RESEND PATCH] ALSA: usb-audio: Fix Focusrite Scarlett 6i6 gen1 - input handling
by Jens Verwiebe 25 Nov '19

25 Nov '19

The Scarlett 6i6 has no padding on rear inputs 3/4 but a gainstage. This patch introduces this functionality as to be seen in the mac or windows scarlett control. The correct address could already be found in the dump info, but was never used. Without this patch inputs 3/4 are quite unusable else. The diff is attached as a textfile as i found this preseverves formatting best. Diffed and testcompiled against todays kernel master. Cheers ... Jens Changelog: The Scarlett 6i6 has no padding on rear inputs 3/4 but a gainstage (Lo/Hi). Adding this functionality according to macOS/Win drivers. Signed-off-by: Jens Verwiebe <info at jensverwiebe.de> -- Jens Verwiebe Allerskehre 44 - 22309 Hamburg Tel.: +49 40 68 78 50 mailto: info(a)jensverwiebe.de web: https://www.jensverwiebe.de

2 1

[alsa-devel] [PATCH v5 1/2] ASoC: Intel - use control components to describe card config
by Jaroslav Kysela 25 Nov '19

25 Nov '19

Use the control interface (field 'components' in the info structure) to pass the I/O configuration details. The goal is to replace the card long name with this. Signed-off-by: Jaroslav Kysela <perex(a)perex.cz> Cc: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Cc: Mark Brown <broonie(a)kernel.org> --- sound/soc/intel/boards/bytcht_es8316.c | 9 ++++++++- sound/soc/intel/boards/bytcr_rt5640.c | 6 ++++++ sound/soc/intel/boards/bytcr_rt5651.c | 18 +++++++++++------- 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/sound/soc/intel/boards/bytcht_es8316.c b/sound/soc/intel/boards/bytcht_es8316.c index 46612331f5ea..efa33f30dcac 100644 --- a/sound/soc/intel/boards/bytcht_es8316.c +++ b/sound/soc/intel/boards/bytcht_es8316.c @@ -361,6 +361,7 @@ static struct snd_soc_dai_link byt_cht_es8316_dais[] = { /* SoC card */ static char codec_name[SND_ACPI_I2C_ID_LEN]; static char long_name[50]; /* = "bytcht-es8316-*-spk-*-mic" */ +static char components_string[32]; /* = "cfg-spk:* cfg-mic:* */ static int byt_cht_es8316_suspend(struct snd_soc_card *card) { @@ -572,11 +573,17 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev) } } - /* register the soc card */ + snprintf(components_string, sizeof(components_string), + "cfg-spk:%s cfg-mic:%s", + (quirk & BYT_CHT_ES8316_MONO_SPEAKER) ? "1" : "2", + mic_name[BYT_CHT_ES8316_MAP(quirk)]); + byt_cht_es8316_card.components = components_string; snprintf(long_name, sizeof(long_name), "bytcht-es8316-%s-spk-%s-mic", (quirk & BYT_CHT_ES8316_MONO_SPEAKER) ? "mono" : "stereo", mic_name[BYT_CHT_ES8316_MAP(quirk)]); byt_cht_es8316_card.long_name = long_name; + + /* register the soc card */ snd_soc_card_set_drvdata(&byt_cht_es8316_card, priv); ret = devm_snd_soc_register_card(dev, &byt_cht_es8316_card); diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c index 9c1aa4ec9cba..0170d31e691a 100644 --- a/sound/soc/intel/boards/bytcr_rt5640.c +++ b/sound/soc/intel/boards/bytcr_rt5640.c @@ -1081,6 +1081,7 @@ static char byt_rt5640_codec_name[SND_ACPI_I2C_ID_LEN]; static char byt_rt5640_codec_aif_name[12]; /* = "rt5640-aif[1|2]" */ static char byt_rt5640_cpu_dai_name[10]; /* = "ssp[0|2]-port" */ static char byt_rt5640_long_name[40]; /* = "bytcr-rt5640-*-spk-*-mic" */ +static char byt_rt5640_components[32]; /* = "cfg-spk:* cfg-mic:*" */ static int byt_rt5640_suspend(struct snd_soc_card *card) { @@ -1303,6 +1304,11 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev) } } + snprintf(byt_rt5640_components, sizeof(byt_rt5640_components), + "cfg-spk:%s cfg-mic:%s", + (byt_rt5640_quirk & BYT_RT5640_MONO_SPEAKER) ? "1" : "2", + map_name[BYT_RT5640_MAP(byt_rt5640_quirk)]); + byt_rt5640_card.components = byt_rt5640_components; snprintf(byt_rt5640_long_name, sizeof(byt_rt5640_long_name), "bytcr-rt5640-%s-spk-%s-mic", (byt_rt5640_quirk & BYT_RT5640_MONO_SPEAKER) ? diff --git a/sound/soc/intel/boards/bytcr_rt5651.c b/sound/soc/intel/boards/bytcr_rt5651.c index 4606f6f582d6..80a5674ddb1b 100644 --- a/sound/soc/intel/boards/bytcr_rt5651.c +++ b/sound/soc/intel/boards/bytcr_rt5651.c @@ -798,6 +798,7 @@ static char byt_rt5651_codec_name[SND_ACPI_I2C_ID_LEN]; static char byt_rt5651_codec_aif_name[12]; /* = "rt5651-aif[1|2]" */ static char byt_rt5651_cpu_dai_name[10]; /* = "ssp[0|2]-port" */ static char byt_rt5651_long_name[50]; /* = "bytcr-rt5651-*-spk-*-mic[-swapped-hp]" */ +static char byt_rt5651_components[50]; /* = "cfg-spk:* cfg-mic:*" */ static int byt_rt5651_suspend(struct snd_soc_card *card) { @@ -876,7 +877,6 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) const char *platform_name; struct acpi_device *adev; struct device *codec_dev; - const char *hp_swapped; bool is_bytcr = false; int ret_val = 0; int dai_index = 0; @@ -1080,16 +1080,20 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) } } - if (byt_rt5651_quirk & BYT_RT5651_HP_LR_SWAPPED) - hp_swapped = "-hp-swapped"; - else - hp_swapped = ""; - + snprintf(byt_rt5651_components, sizeof(byt_rt5651_components), + "cfg-spk:%s cfg-mic:%s%s", + (byt_rt5651_quirk & BYT_RT5651_MONO_SPEAKER) ? "1" : "2", + mic_name[BYT_RT5651_MAP(byt_rt5651_quirk)], + (byt_rt5651_quirk & BYT_RT5651_HP_LR_SWAPPED) ? + " cfg-hp:lrswap" : ""); + byt_rt5651_card.components = byt_rt5651_components; snprintf(byt_rt5651_long_name, sizeof(byt_rt5651_long_name), "bytcr-rt5651-%s-spk-%s-mic%s", (byt_rt5651_quirk & BYT_RT5651_MONO_SPEAKER) ? "mono" : "stereo", - mic_name[BYT_RT5651_MAP(byt_rt5651_quirk)], hp_swapped); + mic_name[BYT_RT5651_MAP(byt_rt5651_quirk)], + (byt_rt5651_quirk & BYT_RT5651_HP_LR_SWAPPED) ? + "-hp-swapped" : ""); byt_rt5651_card.long_name = byt_rt5651_long_name; /* override plaform name, if required */ -- 2.20.1

2 2

[alsa-devel] [PATCH] ALSA: hda/realtek - Enable internal speaker of ASUS UX431FLC
by Jian-Hong Pan 25 Nov '19

25 Nov '19

Laptops like ASUS UX431FLC and UX431FL can share the same audio quirks. But UX431FLC needs one more step to enable the internal speaker: Pull the GPIO from CODEC to initialize the AMP. Fixes: 60083f9e94b2 ("ALSA: hda/realtek - Enable internal speaker & headset mic of ASUS UX431FL") Signed-off-by: Jian-Hong Pan <jian-hong(a)endlessm.com> --- sound/pci/hda/patch_realtek.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 80f66ba85f87..eb6894a67302 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -5892,6 +5892,7 @@ enum { ALC299_FIXUP_PREDATOR_SPK, ALC294_FIXUP_ASUS_INTSPK_HEADSET_MIC, ALC256_FIXUP_MEDION_HEADSET_NO_PRESENCE, + ALC294_FIXUP_ASUS_INTSPK_GPIO, }; static const struct hda_fixup alc269_fixups[] = { @@ -6982,6 +6983,13 @@ static const struct hda_fixup alc269_fixups[] = { .chained = true, .chain_id = ALC256_FIXUP_ASUS_HEADSET_MODE }, + [ALC294_FIXUP_ASUS_INTSPK_GPIO] = { + .type = HDA_FIXUP_FUNC, + /* The GPIO must be pulled to initialize the AMP */ + .v.func = alc_fixup_gpio4, + .chained = true, + .chain_id = ALC294_FIXUP_ASUS_INTSPK_HEADSET_MIC + }, }; static const struct snd_pci_quirk alc269_fixup_tbl[] = { @@ -7141,7 +7149,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x1043, 0x1427, "Asus Zenbook UX31E", ALC269VB_FIXUP_ASUS_ZENBOOK), SND_PCI_QUIRK(0x1043, 0x1517, "Asus Zenbook UX31A", ALC269VB_FIXUP_ASUS_ZENBOOK_UX31A), SND_PCI_QUIRK(0x1043, 0x16e3, "ASUS UX50", ALC269_FIXUP_STEREO_DMIC), - SND_PCI_QUIRK(0x1043, 0x17d1, "ASUS UX431FL", ALC294_FIXUP_ASUS_INTSPK_HEADSET_MIC), + SND_PCI_QUIRK(0x1043, 0x17d1, "ASUS UX431FL", ALC294_FIXUP_ASUS_INTSPK_GPIO), SND_PCI_QUIRK(0x1043, 0x18b1, "Asus MJ401TA", ALC256_FIXUP_ASUS_HEADSET_MIC), SND_PCI_QUIRK(0x1043, 0x1a13, "Asus G73Jw", ALC269_FIXUP_ASUS_G73JW), SND_PCI_QUIRK(0x1043, 0x1a30, "ASUS X705UD", ALC256_FIXUP_ASUS_MIC), -- 2.20.1

2 1

[alsa-devel] [GIT PULL] ASoC updates for v5.5
by Mark Brown 25 Nov '19

25 Nov '19

The following changes since commit 976a68f06b2ea49e2ab67a5f84919a8b105db8be: ALSA: usb-audio: Fix incorrect size check for processing/extension units (2019-11-14 18:01:22 +0100) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v5.5-2 for you to fetch changes up to 8c4d2a0bfbd27d030e4652b714cd5a1598f3559b: Merge branch 'asoc-5.5' into asoc-next (2019-11-22 19:56:02 +0000) ---------------------------------------------------------------- ASoC: More updates for v5.5 Some more development work for v5.5. Highlights include: - More cleanups from Morimoto-san. - Trigger word detection for RT5677. ---------------------------------------------------------------- The changelog and diffstat are both messed up by additional changes from Linus' tree that I have, not clear how to fix that with request-pull. Aaron Komisar (1): mac80211: fix scan when operating on DFS channels in ETSI domains Adam Ford (5): ARM: dts: logicpd-torpedo-som: Remove twl_keypad serial: mctrl_gpio: Check for NULL pointer serial: 8250_omap: Fix gpio check for auto RTS/CTS ARM: dts: imx6q-logicpd: Re-Enable SNVS power key ARM: dts: imx6-logicpd: Re-enable SNVS power key Adam Zerella (3): docs: arm64: Fix indentation and doc formatting docs: hwmon: Include 'inspur-ipsps1.rst' into docs hwmon: docs: Extend inspur-ipsps1 title underline Adit Ranadive (1): RDMA/vmw_pvrdma: Free SRQ only once Adrian Hunter (1): perf tools: Fix mode setting in copyfile_mode_ns() Ahmed Zaki (1): mac80211: fix station inactive_time shortly after boot Aidan Yang (1): drm/amd/display: Allow inverted gamma Al Viro (13): Fix the locking in dcache_readdir() and friends shmem: fix LSM options parsing libfs: take cursors out of list when moving past the end of directory xtensa: fix {get,put}_user() for 64bit values autofs: fix a leak in autofs_expire_indirect() ceph: fix RCU case handling in ceph_d_revalidate() ceph: add missing check in d_revalidate snapdir handling cgroup: don't put ERR_PTR() into fc->root exportfs_decode_fh(): negative pinned may become positive without the parent locked audit_get_nd(): don't unlock parent too early ecryptfs: fix unlink and rmdir in face of underlying fs modifications ecryptfs_lookup_interpose(): lower_dentry->d_inode is not stable ecryptfs_lookup_interpose(): lower_dentry->d_parent is not stable either Alain Volmat (1): i2c: stm32f7: remove warning when compiling with W=1 Alan Mikhak (1): irqchip/sifive-plic: Skip contexts except supervisor in plic_init() Alan Somers (1): fuse: Add changelog entries for protocols 7.1 - 7.8 Alan Stern (6): HID: Fix assumption that devices have inputs USB: yurex: Don't retry on unexpected errors USB: Skip endpoints with 0 maxpacket length usb-storage: Revert commit 747668dbc061 ("usb-storage: Set virt_boundary_mask to avoid SG overflows") UAS: Revert commit 3ae62a42090f ("UAS: fix alignment of scatter/gather segments") USB: gadget: Reject endpoints with 0 maxpacket value Aleksa Sarai (1): lib: test_user_copy: style cleanup Aleksander Morgado (2): net: usb: qmi_wwan: add support for DW5821e with eSIM support net: usb: qmi_wwan: add support for Foxconn T77W968 LTE modules Alex Deucher (10): drm/amdgpu/powerplay: fix typo in mvdd table setup Revert "drm/radeon: Fix EEH during kexec" drm/amdgpu/uvd6: fix allocation size in enc ring test (v2) drm/amdgpu/uvd7: fix allocation size in enc ring test (v2) drm/amdgpu/vcn: fix allocation size in enc ring test drm/amdgpu/vce: fix allocation size in enc ring test drm/amdgpu/gmc10: properly set BANK_SELECT and FRAGMENT_SIZE drm/amdgpu/arcturus: properly set BANK_SELECT and FRAGMENT_SIZE drm/amdgpu/renoir: move gfxoff handling into gfx9 module drm/radeon: fix si_enable_smc_cac() failed issue Alex Vesker (3): net/mlx5: DR, Allow insertion of duplicate rules net/mlx5: DR, Fix memory leak in modify action destroy net/mlx5: DR, Fix memory leak during rule creation Alexander Potapenko (2): mm/slub.c: init_on_free=1 should wipe freelist ptr for bulk allocations lib/test_meminit: add a kmem_cache_alloc_bulk() test Alexander Shishkin (11): perf/core: Fix inheritance of aux_output groups perf/aux: Fix AUX output stopping perf/core: Start rejecting the syscall with attr.__reserved_2 set intel_th: gth: Fix the window switching sequence intel_th: msu: Fix an uninitialized mutex intel_th: pci: Add Comet Lake PCH support intel_th: pci: Add Jasper Lake PCH support perf/aux: Fix the aux_output group inheritance fix perf/core: Reattach a misplaced comment perf/aux: Disallow aux_output for kernel events perf/core: Consistently fail fork on allocation failures Alexander Sverdlin (1): net: ethernet: octeon_mgmt: Account for second possible VLAN header Alexander Usyskin (1): mei: avoid FW version request on Ibex Peak and earlier Alexandra Winter (2): s390/qeth: Fix error handling during VNICC initialization s390/qeth: Fix initialization of vnicc cmd masks during set online Alexandre Belloni (3): net: lpc_eth: avoid resetting twice coccinelle: api/devm_platform_ioremap_resource: remove useless script clk: at91: avoid sleeping early Alexandru Ardelean (1): iio: imu: adis16480: make sure provided frequency is positive Alexey Brodkin (1): ARC: perf: Accommodate big-endian CPU Aliasgar Surti (1): xfs: removed unused error variable from xchk_refcountbt_rec Allen Pais (1): scsi: qla2xxx: fix a potential NULL pointer dereference Amelie Delaunay (4): pinctrl: stmfx: fix null pointer on remove ARM: dts: stm32: remove OV5640 pinctrl definition on stm32mp157c-ev1 ARM: dts: stm32: change joystick pinctrl definition on stm32mp157c-ev1 pinctrl: stmfx: fix valid_mask init sequence Andi Kleen (3): perf script brstackinsn: Fix recovery from LBR/binary mismatch perf jevents: Fix period for Intel fixed counters perf evlist: Fix fix for freed id arrays Andrea Mayer (2): seg6: fix srh pointer in get_srh() seg6: fix skb transport_header after decap_and_validate() Andrea Parri (1): x86/hyperv: Set pv_info.name to "Hyper-V" Andreas Klinger (2): iio: adc: hx711: fix bug in sampling of data iio: srf04: fix wrong limitation in distance measuring Andrew Duggan (3): Input: synaptics-rmi4 - disable the relative position IRQ in the F12 driver Input: synaptics-rmi4 - do not consume more data than we have (F11, F12) Input: synaptics-rmi4 - remove unused result_bits mask Andrew Jeffery (4): dt-bindings: pinctrl: aspeed-g6: Rework SD3 function and groups pinctrl: aspeed-g6: Sort pins for sanity pinctrl: aspeed-g6: Fix I2C14 SDA description pinctrl: aspeed-g6: Make SIG_DESC_CLEAR() behave intuitively Andrew Lunn (1): net: usb: lan78xx: Connect PHY before registering MAC Andrew Price (2): gfs2: Fix memory leak when gfs2meta's fs_context is freed gfs2: Fix initialisation of args for remount Andrey Grodzovsky (2): drm/sched: Set error to s_fence if HW job submission failed. drm/amdgpu: If amdgpu_ib_schedule fails return back the error. Andrey Smirnov (6): tty: serial: fsl_lpuart: Fix lpuart_flush_buffer() ARM: dts: am3874-iceboard: Fix 'i2c-mux-idle-disconnect' usage ARM: dts: vf610-zii-scu4-aib: Specify 'i2c-mux-idle-disconnect' HID: logitech-hidpp: split g920_get_config() HID: logitech-hidpp: rework device validation HID: logitech-hidpp: do all FF cleanup in hidpp_ff_destroy() Andy Shevchenko (11): pinctrl: intel: Allocate IRQ chip dynamic platform/x86: intel_punit_ipc: Avoid error message when retrieving IRQ platform/x86: i2c-multi-instantiate: Fail the probe if no IRQ provided gpio: merrifield: Restore use of irq_base gpiolib: Initialize the hardware with a callback gpio: intel-mid: Move hardware initialization to callback gpio: lynxpoint: Move hardware initialization to callback gpio: merrifield: Move hardware initialization to callback gpio: lynxpoint: set default handler to be handle_bad_irq() pinctrl: intel: Avoid potential glitches if pin is in GPIO mode pinctrl: cherryview: Allocate IRQ chip dynamic Aneesh Kumar K.V (1): mm/memunmap: don't access uninitialized memmap in memunmap_pages() Anna Karas (1): drm/i915/tgl: Fix doc not corresponding to code Anshuman Khandual (1): mm/memremap: drop unused SECTION_SIZE and SECTION_MASK Anson Huang (9): soc: imx: imx-scu: Getting UID from SCU should have response tty: serial: imx: Use platform_get_irq_optional() for optional IRQs ARM: dts: imx7s: Correct GPT's ipg clock source arm64: dts: imx8mq: Use correct clock for usdhc's ipg clk arm64: dts: imx8mm: Use correct clock for usdhc's ipg clk arm64: dts: imx8mn: Use correct clock for usdhc's ipg clk net: fec_main: Use platform_get_irq_byname_optional() to avoid error message net: fec_ptp: Use platform_get_irq_xxx_optional() to avoid error message watchdog: imx_sc_wdt: Pretimeout should follow SCU firmware format Anton Eidelman (3): nvme-multipath: fix possible io hang after ctrl reconnect nvme-multipath: remove unused groups_only mode in ana log nvme-multipath: fix crash in nvme_mpath_clear_ctrl_paths Anton Ivanov (1): um-ubd: Entrust re-queue to the upper layers Antonio Borneo (3): ptp: fix typo of "mechanism" in Kconfig help text net: stmmac: fix length of PTP clock's name string net: stmmac: fix disabling flexible PPS output Appana Durga Kedareswara rao (1): can: xilinx_can: Fix flags field initialization for axi can Ard Biesheuvel (5): crypto: arm/aes-ce - build for v8 architecture explicitly crypto: arm/aes-ce - add dependency on AES library nvme: retain split access workaround for capability reads efivar/ssdt: Don't iterate over EFI vars if no SSDT override was specified efi: libstub/arm: Account for firmware reserved memory at the base of RAM Arkadiusz Kubalewski (1): i40e: Fix for ethtool -m issue on X722 NIC Arnaldo Carvalho de Melo (17): tools headers uapi: Sync drm/i915_drm.h with the kernel sources tools headers uapi: Sync asm-generic/mman-common.h with the kernel tools headers uapi: Sync linux/usbdevice_fs.h with the kernel sources tools headers uapi: Sync linux/fs.h with the kernel sources tools headers kvm: Sync kvm headers with the kernel sources perf tools: Propagate get_cpuid() error perf evsel: Fall back to global 'perf_env' in perf_evsel__env() perf annotate: Propagate perf_env__arch() error perf annotate: Fix the signedness of failure returns perf annotate: Propagate the symbol__annotate() error return perf annotate: Fix arch specific ->init() failure errors perf annotate: Return appropriate error code for allocation failures perf annotate: Don't return -1 for error when doing BPF disassembly tools headers kvm: Sync kvm headers with the kernel sources tools headers kvm: Sync kvm headers with the kernel sources tools headers kvm: Sync kvm.h headers with the kernel sources tools headers UAPI: Sync sched.h with the kernel Arnd Bergmann (6): udc: lpc32xx: fix 64-bit compiler warning dynamic_debug: provide dynamic_hex_dump stub usb: dwc3: select CONFIG_REGMAP_MMIO net: dsa: sja1105: improve NET_DSA_SJA1105_TAS dependency watchdog: cpwd: fix build regression ntp/y2038: Remove incorrect time_t truncation Arvind Sankar (2): lib/string: Make memzero_explicit() inline instead of external iommu/vt-d: Return the correct dma mask when we are bypassing the IOMMU Austin Kim (2): fs: cifs: mute -Wunused-const-variable message btrfs: silence maybe-uninitialized warning in clone_range Avri Altman (1): scsi: ufs-bsg: Wake the device before sending raw upiu commands Axel Lin (2): regulator: fixed: Prevent NULL pointer dereference when !CONFIG_OF regulator: ti-abb: Fix timeout in ti_abb_wait_txdone/ti_abb_clear_all_txdone Aya Levin (3): net/mlx5e: Fix ethtool self test: link speed net/mlx5e: Initialize on stack link modes bitmap devlink: Add method for time-stamp on reporter's dump Ayala Beker (1): iwlwifi: fw api: support new API for scan config cmd Baolin Wang (2): dmaengine: sprd: Fix the possible memory leak issue MAINTAINERS: Update the Spreadtrum SoC maintainer Baoquan He (1): memcg: only record foreign writebacks with dirty pages when memcg is not disabled Bard Liao (1): soundwire: intel: fix intel_register_dai PDI offsets and numbers Bard liao (1): ASoC: rt5682: cancel jack_detect_work if hs_jack is set to null Bart Van Assche (3): RDMA/iwcm: Fix a lock inversion issue scsi: ch: Make it possible to open a ch device multiple times again scsi: target: cxgbit: Fix cxgbit_fw4_ack() Bartosz Golaszewski (2): gpiolib: don't clear FLAG_IS_OUT when emulating open-drain/open-source ARM: davinci_all_defconfig: enable GPIO backlight Bastien Nocera (1): USB: rio500: Remove Rio 500 kernel driver Ben Dooks (6): efi: Make unexported efi_rci2_sysfs_init() static PM: sleep: include <linux/pm_runtime.h> for pm_wq kthread: make __kthread_queue_delayed_work static mm: include <linux/huge_mm.h> for is_vma_temporary_stack mm/filemap.c: include <linux/ramfs.h> for generic_file_vm_ops definition soc: imx: gpc: fix initialiser format Ben Dooks (Codethink) (14): davinci_cpdma: make cpdma_chan_split_pool static net: stmmac: make tc_flow_parsers static net: stmmac: fix argument to stmmac_pcs_ctrl_ane() mm/init-mm.c: include <linux/mman.h> for vm_committed_as_batch ipv6: include <net/addrconf.h> for missing declarations timers/sched_clock: Include local timekeeping.h for missing declarations net: mvneta: make stub functions static inline net: hwbm: if CONFIG_NET_HWBM unset, make stub functions static usb: mtu3: fix missing include of mtu3_dr.h usb: cdns3: include host-export,h for cdns3_host_init usb: renesas_usbhs: fix __le16 warnings usb: renesas_usbhs: fix type of buf usb: xhci: fix __le32/__le64 accessors in debugfs code perf/core: Fix missing static inline on perf_cgroup_switch() Ben Hutchings (1): drm/i915/cmdparser: Fix jump whitelist clearing Ben Zhang (7): ASoC: rt5677: Load firmware via SPI using delayed work ASoC: bdw-rt5677: Add a DAI link for rt5677 SPI PCM device ASoC: rt5677: Enable jack detect while DSP is running ASoC: rt5677: Add DAPM audio path for hotword stream ASoC: rt5677: Mark reg RT5677_PWR_ANLG2 as volatile ASoC: rt5677: Stop and restart DSP over suspend/resume ASoC: rt5677: Disable irq at suspend Beni Mahler (1): USB: serial: ftdi_sio: add device IDs for Sienna and Echelon PL-20 Benjamin Coddington (1): SUNRPC: fix race to sk_err after xs_error_report Benjamin Herrenschmidt (1): net: ethernet: ftgmac100: Fix DMA coherency issue with SW checksum Biao Huang (1): net: stmmac: disable/enable ptp_ref_clk in suspend/resume flow Biju Das (1): dt-bindings: serial: sh-sci: Document r8a774b1 bindings Bill Kuzeja (1): xhci: Prevent deadlock when xhci adapter breaks during init Bill O'Donnell (1): xfs: assure zeroed memory buffers for certain kmem allocations Bjorn Andersson (2): arm64: cpufeature: Enable Qualcomm Falkor/Kryo errata 1003 arm64: cpufeature: Enable Qualcomm Falkor errata 1009 for Kryo Björn Töpel (4): samples/bpf: Fix build for task_fd_query_user.c perf tools: Make usage of test_attr__* optional for perf-sys.h samples/bpf: fix build by setting HAVE_ATTR_TEST to zero bpf: Change size to u64 for bpf_map_{area_alloc, charge_init}() Bodo Stroesser (1): scsi: target: core: Do not overwrite CDB byte 1 Boris Ostrovsky (1): x86/xen: Return from panic notifier Brian Foster (3): xfs: log the inode on directory sf to block format change xfs: remove broken error handling on failed attr sf to leaf change xfs: move local to extent inode logging into bmap helper Brian Norris (1): firmware: google: increment VPD key_len properly Brian Vazquez (2): selftests/bpf: test_progs: Don't leak server_fd in tcp_rtt selftests/bpf: test_progs: Don't leak server_fd in test_sockopt_inherit Bruce Chen (1): gpio: eic: sprd: Fix the incorrect EIC offset when toggling Catalin Marinas (3): kmemleak: Do not corrupt the object_list during clean-up arm64: Ensure VM_WRITE|VM_SHARED ptes are clean by default arm64: Do not mask out PTE_RDONLY in pte_same() Chandana Kishori Chiluveru (1): usb: gadget: composite: Fix possible double free memory bug Charles Keepax (1): regulator: lochnagar: Add on_off_delay for VDDCORE Charles Machalow (1): nvme: change nvme_passthru_cmd64 to explicitly mark rsvd Chengguang Xu (1): ocfs2: fix error handling in ocfs2_setattr() Chenwandun (2): zram: fix race between backing_dev_show and backing_dev_store net: aquantia: add an error handling in aq_nic_set_multicast_list Chenyi Qiang (1): KVM: X86: Fix initialization of MSR lists Chris Down (3): mm, memcg: proportional memory.{low,min} reclaim mm, memcg: make memory.emin the baseline for utilisation determination mm, memcg: make scan aggression always exclude protection Chris Goldsworthy (1): of: reserved_mem: add missing of_node_put() for proper ref-counting Chris Packham (1): pinctrl: iproc: allow for error from platform_get_irq() Chris Wilson (15): drm/i915/execlists: Remove incorrect BUG_ON for schedule-out drm/i915: Perform GGTT restore much earlier during resume drm/i915: Don't mix srcu tag and negative error codes drm/i915: Extend Haswell GT1 PSMI workaround to all drm/i915: Verify the engine after acquiring the active.lock drm/i915: Prevent bonded requests from overtaking each other on preemption drm/i915: Mark contents as dirty on a write fault drm/i915/execlists: Drop redundant list_del_init(&rq->sched.link) drm/i915: Only enqueue already completed requests drm/i915: Fixup preempt-to-busy vs reset of a virtual request drm/i915/execlists: Protect peeking at execlists->active drm/i915/gt: execlists->active is serialised by the tasklet drm/i915/execlists: Refactor -EIO markup of hung requests drm/i915/userptr: Never allow userptr into the mappable GGTT drm/i915: Fixup preempt-to-busy vs resubmission of a virtual request Chris von Recklinghausen (1): arm64: Fix kcore macros after 52-bit virtual addressing fallout Christian Borntraeger (1): s390/uaccess: avoid (false positive) compiler warnings Christian Brauner (2): binder: prevent UAF read in print_binder_transaction_log_entry() clone3: validate stack arguments Christian Gmeiner (1): drm/etnaviv: fix dumping of iommuv2 Christian König (4): drm/ttm: fix busy reference in ttm_mem_evict_first drm/ttm: fix handling in ttm_bo_add_mem_to_lru drm/amdgpu: fix potential VM faults drm/amdgpu: fix error handling in amdgpu_bo_list_create Christoph Hellwig (3): serial/sifive: select SERIAL_EARLYCON riscv: cleanup <asm/bug.h> riscv: cleanup do_trap_break Christophe JAILLET (4): tty: serial: owl: Fix the link time qualifier of 'owl_uart_exit()' tty: serial: rda: Fix the link time qualifier of 'rda_uart_exit()' RDMA/core: Fix an error handling path in 'res_get_common_doit()' memstick: jmb38x_ms: Fix an error handling path in 'jmb38x_ms_probe()' Christophe Leroy (1): powerpc/32s: fix allow/prevent_user_access() when crossing segment boundaries. Christophe Roullier (1): ARM: dts: stm32: Fix CAN RAM mapping on stm32mp157c Chuck Lever (1): NFSv4: Fix leak of clp->cl_acceptor string Chuhong Yuan (9): cifs: Fix missed free operations net: ethernet: arc: add the missed clk_disable_unprepare net: fec: add missed clk_disable_unprepare in remove rsxx: add missed destroy_workqueue calls in remove Input: synaptics-rmi4 - destroy F54 poller workqueue when removing net: ep93xx_eth: fix mismatch of request_mem_region in remove net: gemini: add missed free_netdev ASoC: wm2200: add missed operations in remove and probe failure ASoC: wm5100: add missed pm_runtime_disable Claudiu Manoil (2): net: mscc: ocelot: don't handle netdev events for other netdevs net: mscc: ocelot: fix NULL pointer on LAG slave removal Colin Ian King (12): HID: prodikeys: make array keys static const, makes object smaller efi/tpm: Fix sanity check of unsigned tbl_size being less than zero staging: wlan-ng: fix exit return when sme->key_idx >= NUM_WEPKEYS 8250-men-mcb: fix error checking when get_num_ports returns -ENODEV clk: sunxi-ng: a80: fix the zero'ing of bits 16 and 18 qed: fix spelling mistake "queuess" -> "queues" intel_th: msu: Fix missing allocation failure check on a kstrndup intel_th: msu: Fix overflow in shift of an unsigned int can: j1939: fix resource leak of skb on error return paths staging: vboxsf: fix dereference of pointer dentry before it is null checked ice: fix potential infinite loop because loop counter being too small ASoC: tas2770: clean up an indentation issue Cong Wang (2): net_sched: fix backward compatibility for TCA_KIND net_sched: fix backward compatibility for TCA_ACT_KIND Connor Kuehl (1): staging: rtl8188eu: fix null dereference when kzalloc fails Corentin Labbe (2): lib: Remove select of inexistant GENERIC_IO net: ethernet: dwmac-sun8i: Use the correct function in exit path Cristian Birsan (1): usb: gadget: udc: atmel: Fix interrupt storm in FIFO mode. Cristian Marussi (2): kselftest: add capability to skip chosen TARGETS kselftest: exclude failed TARGETS from runlist Curtis Malainey (4): ASoC: rt5677: Allow VAD to be shut on/off at all times ASoC: bdw-rt5677: Turn on MCLK1 for DSP via DAPM ASoC: rt5677: Set ADC clock to use PLL and enable ASRC ASoC: rt5677: Wait for DSP to boot before loading firmware Cédric Le Goater (1): net/ibmvnic: Fix EOI when running in XIVE mode. Dag Moxnes (1): rds: ib: update WR sizes when bringing up connection Damien Le Moal (3): scsi: core: save/restore command resid for error handling block: Fix elv_support_iosched() scsi: sd_zbc: Fix sd_zbc_complete() Dan Carpenter (11): usb: cdns3: Fix use after free in probe error handling usb: typec: tcpm: usb: typec: tcpm: Fix a signedness bug in tcpm_fw_get_caps() pinctrl: ns2: Fix off by one bugs in ns2_pinmux_enable() mm/vmpressure.c: fix a signedness bug in vmpressure_register_event() USB: legousbtower: fix a signedness bug in tower_probe() ACPI: NFIT: Fix unlock on error in scrub_show() RDMA/uverbs: Prevent potential underflow iocost: don't nest spin_lock_irq in ioc_weight_write() netfilter: ipset: Fix an error code in ip_set_sockfn_get() block: drbd: remove a stray unlock in __drbd_send_protocol() net: cdc_ncm: Signedness bug in cdc_ncm_set_dgram_size() Dan Murphy (1): leds: core: Fix leds.h structure documentation Dan Williams (2): libata/ahci: Fix PCS quirk application fs/dax: Fix pmd vs pte conflict detection Daniel Black (1): ACPI: HMAT: ACPI_HMAT_MEMORY_PD_VALID is deprecated since ACPI-6.3 Daniel Borkmann (3): bpf: Fix use after free in subprog's jited symbol removal bpf: Fix use after free in bpf_get_prog_name bpf, doc: Add Andrii as official reviewer to BPF subsystem Daniel Wagner (4): scsi: qla2xxx: Remove WARN_ON_ONCE in qla2x00_status_cont_entry() scsi: lpfc: Check queue pointer before use scsi: lpfc: Honor module parameter lpfc_use_adisc net: usb: lan78xx: Disable interrupts before calling generic_handle_irq() Daniele Palmas (2): USB: serial: option: add Telit FN980 compositions net: usb: qmi_wwan: add Telit 0x1050 composition Darrick J. Wong (1): xfs: change the seconds fields in xfs_bulkstat to signed Dave Airlie (18): Merge tag 'drm-misc-fixes-2019-10-10' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes Merge tag 'drm-fixes-5.4-2019-10-09' of git://people.freedesktop.org/~agd5f/linux into drm-fixes Merge tag 'drm-intel-fixes-2019-10-10' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes Merge tag 'drm-intel-fixes-2019-10-17' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes Merge tag 'drm-fixes-5.4-2019-10-16' of git://people.freedesktop.org/~agd5f/linux into drm-fixes Merge tag 'drm-misc-fixes-2019-10-17' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes Merge tag 'drm-misc-fixes-2019-10-23' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes Merge tag 'drm-fixes-5.4-2019-10-23' of git://people.freedesktop.org/~agd5f/linux into drm-fixes Merge branch 'etnaviv/fixes' of https://git.pengutronix.de/git/lst/linux into drm-fixes Merge tag 'drm-misc-fixes-2019-10-30-1' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes Merge tag 'drm-intel-fixes-2019-10-31' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes Merge tag 'drm-fixes-5.4-2019-10-30' of git://people.freedesktop.org/~agd5f/linux into drm-fixes Merge tag 'drm-misc-fixes-2019-11-07-1' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes Merge tag 'drm-intel-fixes-2019-11-06' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes Merge tag 'drm-fixes-5.4-2019-11-06' of git://people.freedesktop.org/~agd5f/linux into drm-fixes Merge tag 'drm-intel-fixes-2019-11-13' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes Merge tag 'drm-misc-fixes-2019-11-13' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes Merge tag 'drm-fixes-5.4-2019-11-14' of git://people.freedesktop.org/~agd5f/linux into drm-fixes Dave Wysochanski (2): cifs: use cifsInodeInfo->open_file_lock while iterating to avoid a panic cifs: Fix cifsInodeInfo lock_sem deadlock when reconnect occurs Dave Young (1): efi/x86: Do not clean dummy variable in kexec path David Abdurachmanov (1): riscv: fix fs/proc/kcore.c compilation with sparsemem enabled David Ahern (3): net: Update address for vrf and l3mdev in MAINTAINERS selftests: Make l2tp.sh executable ipv4: Fix table id reference in fib_sync_down_addr David Frey (1): iio: light: opt3001: fix mutex unlock race David Hildenbrand (7): drivers/base/memory.c: don't access uninitialized memmaps in soft_offline_page_store() fs/proc/page.c: don't access uninitialized memmaps in fs/proc/page.c mm/memory-failure.c: don't access uninitialized memmaps in memory_failure() mm/memory_hotplug: don't access uninitialized memmaps in shrink_pgdat_span() hugetlbfs: don't access uninitialized memmaps in pfn_range_valid_gigantic() mm/memory_hotplug: fix updating the node span mm/memory_hotplug: fix try_offline_node() David Howells (9): rxrpc: Fix call ref leak rxrpc: Fix trace-after-put looking at the put peer record rxrpc: Fix trace-after-put looking at the put connection record rxrpc: Fix trace-after-put looking at the put call record rxrpc: rxrpc_peer needs to hold a ref on the rxrpc_local record rxrpc: Fix call crypto state cleanup rxrpc: Fix possible NULL pointer access in ICMP handling rxrpc: Fix handling of last subpacket of jumbo packet afs: Fix race in commit bulk status fetch David Rientjes (1): mm, hugetlb: allow hugepage allocations to reclaim as needed David S. Miller (44): Merge branch 'stmmac-fixes' Merge tag 'rxrpc-fixes-20191007' of git://git.kernel.org/.../dhowells/linux-fs Merge git://git.kernel.org/.../bpf/bpf Merge branch 'tcp-address-KCSAN-reports-in-tcp_poll-part-I' Merge branch 'aquantia-fixes' Merge tag 'wireless-drivers-for-davem-2019-10-15' of git://git.kernel.org/.../kvalo/wireless-drivers Merge branch 'mpls-push-pop-fix' Merge branch 'Update-MT7629-to-support-PHYLINK-API' Merge branch 'dpaa2-eth-misc-fixes' Merge branch 'net-bcmgenet-restore-internal-EPHY-support' Merge branch 'vsock-virtio-make-the-credit-mechanism-more-robust' Merge branch 'netem-fix-further-issues-with-packet-corruption' Merge tag 'mlx5-fixes-2019-10-18' of git://git.kernel.org/.../saeed/linux Merge branch 'net-fix-nested-device-bugs' Merge branch 'smc-fixes' Merge branch 'ipv4-fix-route-update-on-metric-change' Merge git://git.kernel.org/.../bpf/bpf Merge git://git.kernel.org/.../pablo/nf Merge branch 'net-avoid-KCSAN-splats' Merge tag 'batadv-net-for-davem-20191025' of git://git.open-mesh.org/linux-merge Merge branch 'VLAN-fixes-for-Ocelot-switch' Merge tag 'mlx5-fixes-2019-10-24' of git://git.kernel.org/.../saeed/linux Merge branch 'hv_netvsc-fix-error-handling-in-netvsc_attach-set_features' Merge tag 'mac80211-for-net-2019-10-31' of git://git.kernel.org/.../jberg/mac80211 Merge tag 'wireless-drivers-2019-11-01' of git://git.kernel.org/.../kvalo/wireless-drivers Merge branch '1GbE' of git://git.kernel.org/.../jkirsher/net-queue Merge branch 'fix-BPF-offload-related-bugs' Merge tag 'linux-can-fixes-for-5.4-20191105' of git://git.kernel.org/.../mkl/linux-can Merge git://git.kernel.org/.../bpf/bpf Merge branch 'net-bcmgenet-restore-internal-EPHY-support' Merge branch 'Bonding-fixes-for-Ocelot-switch' Merge branch 'net-tls-add-a-TX-lock' Merge git://git.kernel.org/.../pablo/nf Merge branch 'stmmac-fixes' Merge tag 'mlx5-fixes-2019-11-06' of git://git.kernel.org/.../saeed/linux Merge tag 'mac80211-for-net-2019-11-08' of git://git.kernel.org/.../jberg/mac80211 Merge branch '40GbE' of git://git.kernel.org/.../jkirsher/net-queue Merge branch 'master' of git://git.kernel.org/.../klassert/ipsec Merge tag 'linux-can-fixes-for-5.4-20191113' of git://git.kernel.org/.../mkl/linux-can Merge tag 'wireless-drivers-2019-11-14' of git://git.kernel.org/.../kvalo/wireless-drivers Merge tag 'linux-can-fixes-for-5.4-20191114' of git://git.kernel.org/.../mkl/linux-can Merge branch 'hns3-fixes' Merge branch 'ptp-Validate-the-ancillary-ioctl-flags-more-carefully' Merge branch 'seg6-fixes-to-Segment-Routing-in-IPv6' David Sterba (2): btrfs: don't needlessly create extent-refs kernel thread btrfs: un-deprecate ioctls START_SYNC and WAIT_SYNC Davide Caratti (3): net: avoid errors when trying to pop MLPS header on non-MPLS packets net/sched: fix corrupted L2 header with MPLS 'push' and 'pop' actions ipvs: don't ignore errors in case refcounting ip_vs module fails Denis Efremov (1): staging: rtl8188eu: fix HighestRate check in odm_ARFBRefresh_8188E() Desnes A. Nunes do Rosario (1): selftests/powerpc: Fix compile error on tlbie_test due to newer gcc Dexuan Cui (2): HID: hyperv: Use in-place iterator API in the channel callback Drivers: hv: vmbus: Fix harmless building warnings without CONFIG_PM_SLEEP Dixit Parmar (1): Input: st1232 - fix reporting multitouch coordinates Dmitry Bogdanov (2): net: aquantia: do not pass lro session with invalid tcp checksum net: aquantia: correctly handle macvlan and multicast coexistence Dmitry Goldin (1): kheaders: substituting --sort in archive creation Dmitry Torokhov (2): pinctrl: cherryview: restore Strago DMI workaround for all versions rt2x00: remove input-polldev.h header Dmytro Linkin (3): net/mlx5e: Determine source port properly for vlan push action net/mlx5e: Remove incorrect match criteria assignment line net/mlx5e: Use correct enum to determine uplink port Dominik Brodowski (1): efi/random: Treat EFI_RNG_PROTOCOL output as bootloader randomness Don Brace (1): scsi: hpsa: add missing hunks in reset-patch Dongsheng Yang (1): rbd: cancel lock_dwork if the wait is interrupted Dotan Barak (1): mlx4_core: fix wrong comment about the reason of subtract one from the max_cqes Doug Berger (8): net: bcmgenet: don't set phydev->link from MAC net: phy: bcm7xxx: define soft_reset for 40nm EPHY net: bcmgenet: soft reset 40nm EPHYs before MAC init net: bcmgenet: reset 40nm EPHY on energy detect arm64: apply ARM64_ERRATUM_845719 workaround for Brahma-B53 core net: bcmgenet: use RGMII loopback for MAC reset Revert "net: bcmgenet: soft reset 40nm EPHYs before MAC init" net: bcmgenet: reapply manual settings to the PHY Douglas Anderson (2): arm64: dts: rockchip: Fix override mode for rk3399-kevin panel MAINTAINERS: kgdb: Add myself as a reviewer for kgdb/kdb Dragos Tarcatu (1): ASoC: SOF: topology: free kcontrol memory on error Eli Britstein (1): net/mlx5: Fix NULL pointer dereference in extended destination Emmanuel Nicolet (1): spufs: fix a crash in spufs_create_root() Eran Ben Elisha (1): net/mlx4_core: Dynamically set guaranteed amount of counters per VF Eric Auger (1): iommu/vt-d: Fix QI_DEV_IOTLB_PFSID and QI_DEV_EIOTLB_PFSID macros Eric Biggers (6): llc: fix sk_buff leak in llc_sap_state_process() llc: fix sk_buff leak in llc_conn_service() llc: fix another potential sk_buff leak in llc_ui_sendmsg() llc: fix sk_buff refcounting in llc_conn_state_process() lib/generic-radix-tree.c: add kmemleak annotations fs/namespace.c: fix use-after-free of mount in mnt_warn_timestamp_expiry() Eric Dumazet (43): bonding: fix potential NULL deref in bond_update_slave_arr netfilter: conntrack: avoid possible false sharing tun: remove possible false sharing in tun_flow_update() net: avoid possible false sharing in sk_leave_memory_pressure() net: add {READ|WRITE}_ONCE() annotations on ->rskq_accept_head tcp: annotate lockless access to tcp_memory_pressure net: silence KCSAN warnings around sk_add_backlog() calls net: annotate sk->sk_rcvlowat lockless reads net: silence KCSAN warnings about sk->sk_backlog.len reads tcp: add rcu protection around tp->fastopen_rsk tcp: annotate tp->rcv_nxt lockless reads tcp: annotate tp->copied_seq lockless reads tcp: annotate tp->write_seq lockless reads tcp: annotate tp->snd_nxt lockless reads tcp: annotate tp->urg_seq lockless reads tcp: annotate sk->sk_rcvbuf lockless reads tcp: annotate sk->sk_sndbuf lockless reads tcp: annotate sk->sk_wmem_queued lockless reads hrtimer: Annotate lockless access to timer->base tcp: fix a possible lockdep splat in tcp_done() net: avoid potential infinite loop in tc_ctl_action() rxrpc: use rcu protection while reading sk->sk_user_data net: ensure correct skb->tstamp in various fragmenters net: reorder 'struct net' fields to avoid false sharing ipv4: fix IPSKB_FRAG_PMTU handling with fragmentation net/flow_dissector: switch to siphash ipvs: move old_secure_tcp into struct netns_ipvs net: add skb_queue_empty_lockless() udp: use skb_queue_empty_lockless() net: use skb_queue_empty_lockless() in poll() handlers net: use skb_queue_empty_lockless() in busy poll contexts net: add READ_ONCE() annotation in __skb_wait_for_more_packets() udp: fix data-race in udp_set_dev_scratch() net: annotate accesses to sk->sk_incoming_cpu net: annotate lockless accesses to sk->sk_napi_id net: increase SOMAXCONN to 4096 tcp: increase tcp_max_syn_backlog max value inet: stop leaking jiffies on the wire powerpc/bpf: Fix tail call implementation dccp: do not leak jiffies on the wire net: prevent load/store tearing on sk->sk_stamp ipv6: fixes rt6_probe() and fib6_nh->last_probe init net: fix data-race in neigh_event_send() Eric Sandeen (1): xfs: remove unused flags arg from xfs_get_aghdr_buf() Eugen Hristev (2): clk: at91: sam9x60: fix programmable clock mmc: sdhci-of-at91: fix quirk2 overwrite Eugeniy Paltsev (2): ARC: [plat-hsdk]: Enable on-board SPI NOR flash IC ARC: [plat-hsdk]: Enable on-boardi SPI ADC IC Evan Green (1): Input: synaptics-rmi4 - avoid processing unknown IRQs Evan Quan (1): drm/amdgpu: register gpu instance before fan boost feature enablment Fabien Parent (2): clocksource/drivers/mediatek: Fix error handling i2c: mt65xx: fix NULL ptr dereference Fabio Estevam (2): ARM: imx_v6_v7_defconfig: Enable CONFIG_DRM_MSM ARM: dts: imx6qdl-sabreauto: Fix storm of accelerometer interrupts Fabrice Gasnier (5): iio: adc: stm32-adc: move registers definitions iio: adc: stm32-adc: fix a race when using several adcs with dma and irq i2c: stm32f7: fix first byte to send in slave mode i2c: stm32f7: fix a race in slave mode with arbitration loss irq iio: adc: stm32-adc: fix stopping dma Faiz Abbas (2): mmc: sdhci-omap: Fix Tuning procedure for temperatures < -20C mmc: cqhci: Commit descriptors before setting the doorbell Felipe Balbi (1): usb: dwc3: gadget: fix race when disabling ep with cancelled xfers Fernando Fernandez Mancera (1): netfilter: nf_tables: fix unexpected EOPNOTSUPP error Filipe Manana (6): Btrfs: fix memory leak due to concurrent append writes with fiemap Btrfs: add missing extents release on file extent cluster relocation error Btrfs: fix qgroup double free after failure to reserve metadata for delalloc Btrfs: check for the full sync flag while holding the inode lock during fsync Btrfs: fix race leading to metadata space leak after task received signal Btrfs: fix log context list corruption after rename exchange operation Florian Fainelli (11): net: dsa: b53: Do not clear existing mirrored port mask net: bcmgenet: Set phydev->dev_flags only for internal PHYs net: bcmgenet: Fix RGMII_MODE_EN value for GENET v1/2/3 Merge tag 'tags/bcm2835-maintainers-next-2019-10-15' into maintainers/next MAINTAINERS: Remove Gregory and Brian for ARCH_BRCMSTB arm64: Brahma-B53 is SSB and spectre v2 safe arm64: apply ARM64_ERRATUM_843419 workaround for Brahma-B53 core net: phylink: Fix phylink_dbg() macro net: dsa: bcm_sf2: Fix IMP setup for port different than 8 MAINTAINERS: Remove Kevin as maintainer of BMIPS generic platforms net: dsa: bcm_sf2: Fix driver removal Florian Westphal (1): bridge: ebtables: don't crash when using dnat target in output chains Florin Chiculita (1): dpaa2-eth: add irq for the dpmac connect/disconnect event Frank Wunderlich (1): mfd: mt6397: Fix probe after changing mt6397-core Frederic Barrat (1): powerpc/powernv/eeh: Fix oops when probing cxl devices Frederic Weisbecker (1): sched/vtime: Fix guest/system mis-accounting on task switch Fuqian Huang (1): xen/grant-table: remove unnecessary printing Geert Uytterhoeven (9): staging: octeon: Use "(uintptr_t)" to cast from pointer to int mmc: renesas_sdhi: Do not use platform_get_irq() to count interrupts mmc: sh_mmcif: Use platform_get_irq_optional() for optional interrupt serial: sh-sci: Use platform_get_irq_optional() for optional interrupts MAINTAINERS: Remove Simon as Renesas SoC Co-Maintainer iommu/ipmmu-vmsa: Only call platform_get_irq() when interrupt is mandatory clocksource/drivers/sh_mtu2: Do not loop using platform_get_irq_by_name() perf/headers: Fix spelling s/EACCESS/EACCES/, s/privilidge/privilege/ fbdev: c2p: Fix link failure on non-inlining George G. Davis (2): selftests: watchdog: Validate optional file argument selftests: watchdog: Add command line option to show watchdog_info Georgi Djakov (1): interconnect: Add locking in icc_set_tag() Gerald Schaefer (1): s390/kaslr: add support for R_390_GLOB_DAT relocation type Gomez Iglesias, Antonio (1): Documentation: Add ITLB_MULTIHIT documentation Greentime Hu (1): RISC-V: fix virtual address overlapped in FIXADDR_START and VMEMMAP_START Greg KH (1): RDMA/cxgb4: Do not dma memory off of the stack Greg Kroah-Hartman (8): Merge tag 'usb-serial-5.4-rc2' of https://git.kernel.org/.../johan/usb-serial into usb-linus Merge tag 'iio-fixes-for-5.4a' of https://git.kernel.org/.../jic23/iio into staging-linus Merge tag 'usb-serial-5.4-rc4' of https://git.kernel.org/.../johan/usb-serial into usb-linus Merge tag 'fixes-for-v5.4-rc5' of git://git.kernel.org/.../balbi/usb into usb-linus Merge tag 'iio-fixes-for-5.4b' of https://git.kernel.org/.../jic23/iio into staging-linus Merge tag 'icc-5.4-rc5' of https://git.linaro.org/people/georgi.djakov/linux into char-misc-linus Merge tag 'thunderbolt-fixes-for-v5.4-1' of git://git.kernel.org/.../westeri/thunderbolt into char-misc-next Merge tag 'soundwire-5.4-rc6' of git://git.kernel.org/.../vkoul/soundwire into char-misc-linus Greg Kurz (1): KVM: PPC: Book3S HV: XIVE: Ensure VP isn't already in use Guangbin Huang (1): net: hns3: add compatible handling for MAC VLAN switch parameter configuration Guillaume Nault (2): netns: fix GFP flags in rtnl_net_notifyid() ipmr: Fix skb headroom in ipmr_get_route(). Guillem Jover (1): aio: Fix io_pgetevents() struct __compat_aio_sigset layout Gustavo A. R. Silva (2): perf annotate: Fix multiple memory and file descriptor leaks usb: udc: lpc32xx: fix bad bit shift operation GwanYeong Kim (1): usbip: tools: Fix read_usb_vudc_device() error path handling Haim Dreyfuss (1): iwlwifi: mvm: force single phy init Haishuang Yan (1): ip6erspan: remove the incorrect mtu limit for ip6erspan Haiyang Zhang (2): hv_netvsc: Fix error handling in netvsc_set_features() hv_netvsc: Fix error handling in netvsc_attach() Halil Pasic (1): s390/cio: fix virtio-ccw DMA without PV Hannes Reinecke (3): scsi: scsi_dh_alua: handle RTPG sense code correctly during state transitions scsi: lpfc: remove left-over BUILD_NVME defines scsi: qla2xxx: fixup incorrect usage of host_byte Hans de Goede (12): driver core: platform: Add platform_get_irq_byname_optional() usb: dwc3: Switch to platform_get_irq_byname_optional() usb: dwc3: Remove dev_err() on platform_get_irq() failure Input: soc_button_array - partial revert of support for newer surface devices iio: adc: axp288: Override TS pin bias current for some models drm/amdgpu: Bail earlier when amdgpu.cik_/si_support is not set to 1 HID: i2c-hid: add Trekstor Primebook C11B to descriptor override pinctrl: cherryview: Fix irq_valid_mask calculation staging: Add VirtualBox guest shared folder (vboxsf) support HID: i2c-hid: Send power-on command after reset i2c: acpi: Force bus speed to 400KHz if a Silead touchscreen is present ASoC: Intel: bytcr_rt5640: Update quirk for Acer Switch 10 SW5-012 2-in-1 Harshad Shirwadkar (1): blk-wbt: fix performance regression in wbt scale_up/scale_down Heikki Krogerus (2): usb: typec: ucsi: ccg: Remove run_isr flag usb: typec: ucsi: displayport: Fix for the mode entering routine Heiko Carstens (1): s390/idle: fix cpu idle time calculation Heiko Stuebner (2): dt-bindings: arm: rockchip: fix Theobroma-System board bindings iommu/rockchip: Don't use platform_get_irq to implicitly count irqs Heiner Kallweit (3): r8169: fix jumbo packet handling on resume from suspend r8169: fix wrong PHY ID issue with RTL8168dp r8169: fix page read in r8168g_mdio_read Helge Deller (3): MAINTAINERS: Add hp_sdc drivers to parisc arch parisc: sysctl.c: Use CONFIG_PARISC instead of __hppa_ define parisc: Fix vmap memory leak in ioremap()/iounmap() Herbert Xu (1): Revert "hwrng: core - Freeze khwrng thread during suspend" Hillf Danton (1): net: openvswitch: free vport unless register_netdevice() succeeds Himanshu Madhani (2): scsi: MAINTAINERS: Update qla2xxx driver scsi: qla2xxx: Initialized mailbox to prevent driver load failure Honggang Li (1): configfs: calculate the depth of parent item Honglei Wang (1): mm: memcg: get number of pages on the LRU list in memcgroup base on lru_zone_size Huacai Chen (1): timekeeping/vsyscall: Update VDSO data unconditionally Huazhong Tan (1): net: hns3: add compatible handling for command HCLGE_OPC_PF_RST_DONE Hugh Cole-Baker (1): arm64: dts: rockchip: fix Rockpro64 RK808 interrupt line Ian Kent (1): vfs: add missing blkdev_put() in get_tree_bdev() Ian Rogers (4): libsubcmd: Make _FORTIFY_SOURCE defines dependent on the feature perf tests: Avoid raising SEGV using an obvious NULL dereference perf docs: Allow man page date to be specified perf llvm: Don't access out-of-scope array Ido Schimmel (3): mlxsw: spectrum_trap: Push Ethernet header before reporting trap netdevsim: Fix use-after-free during device dismantle selftests: mlxsw: Adjust test to recent changes Igor Pylypiv (1): ixgbe: Remove duplicate clear_bit() call Igor Russkikh (2): net: aquantia: temperature retrieval fix net: aquantia: when cleaning hw cache it should be toggled Ilie Halip (1): scripts/tools-support-relr.sh: un-quote variables Ilya Dryomov (1): rbd: silence bogus uninitialized warning in rbd_object_map_update_finish() Ilya Leoshkevich (4): scripts/gdb: fix debugging modules on s390 bpf: Allow narrow loads of bpf_sysctl fields with offset > 0 s390/unwind: fix mixing regs and sp scripts/gdb: fix debugging modules compiled with hot/cold partitioning Imre Deak (2): drm/i915: Avoid HPD poll detect triggering a new detect cycle drm/i915/gen8+: Add RC6 CTX corruption WA Ingo Molnar (3): Merge tag 'perf-urgent-for-mingo-5.4-20191001' of git://git.kernel.org/.../acme/linux into perf/urgent Merge branch 'x86/urgent' into perf/urgent, to pick up new CPU model definitions Merge tag 'perf-urgent-for-mingo-5.4-20191017' of git://git.kernel.org/.../acme/linux into perf/urgent Ioana Ciornei (1): dpaa2-eth: free already allocated channels on probe defer Ioana Radulescu (1): dpaa2-eth: Fix TX FQID values Ivan Khoronzhuk (1): taprio: fix panic while hw offload sched list swap Jack Morgenstein (1): RDMA/cm: Fix memory leak in cm_add/remove_one Jacky.Cao(a)sony.com (1): USB: dummy-hcd: fix power budget for SuperSpeed mode Jacob Keller (8): net: update net_dim documentation after rename igb/igc: use ktime accessors for skb->tstamp net: reject PTP periodic output requests with unsupported flags mv88e6xxx: reject unsupported external timestamp flags dp83640: reject unsupported external timestamp flags igb: reject unsupported external timestamp flags mlx5: reject unsupported external timestamp flags renesas: reject unsupported external timestamp flags Jacob Rasmussen (2): ASoC: rt5645: Fixed buddy jack support. ASoC: rt5645: Fixed typo for buddy jack support. Jae Hyun Yoo (1): i2c: aspeed: fix master pending state handling Jakub Kicinski (15): Merge branch 'llc-fix-sk_buff-refcounting' Merge tag 'mac80211-for-davem-2019-10-08' of git://git.kernel.org/.../jberg/mac80211 Merge branch 's390-qeth-fixes' Merge branch 'smc-fixes' net: netem: fix error path for corrupted GSO frames net: netem: correct the parent's backlog when corrupted packet was dropped Merge branch 'bnxt_en-bug-fixes' MAINTAINERS: remove Dave Watson as TLS maintainer selftests: bpf: Skip write only files in debugfs net: cls_bpf: fix NULL deref on offload filter removal net: fix installing orphaned programs net/tls: fix sk_msg trim on fallback to copy mode net/tls: don't pay attention to sk_write_pending when pushing partial records net/tls: add a TX lock selftests/tls: add test for concurrent recv and send James Erwin (1): IB/hfi1: Ensure full Gen3 speed in a Gen4 system James Morse (3): arm64: Fix incorrect irqflag restore for priority masking for compat arm64: ftrace: Ensure synchronisation in PLT setup for Neoverse-N1 #1542419 EDAC/ghes: Fix Use after free in ghes_edac remove path Jan Beulich (1): x86/apic/32: Avoid bogus LDR warnings Jan Schmidt (1): xhci: Check all endpoints for LPM timeout Janakarajan Natarajan (1): x86/asm: Fix MWAITX C-state hint value Jane Chu (1): mm/memory-failure: poison read receives SIGKILL instead of SIGBUS if mmaped more than once Jani Nikula (1): drm/i915: update rawclk also on resume Jann Horn (1): binder: Don't modify VMA bounds in ->mmap handler Jaroslav Kysela (3): ASoC: add control components management ASoC: improve the DMI long card code in asoc-core ASoC: DMI long name - avoid to add board name if matches with product name Jason Gerecke (1): HID: wacom: generic: Treat serial number and related fields as unsigned Jason Gunthorpe (8): RDMA/mlx5: Do not allow rereg of a ODP MR RDMA/mlx5: Fix a race with mlx5_ib_update_xlt on an implicit MR RDMA/odp: Lift umem_mutex out of ib_umem_odp_unmap_dma_pages() RDMA/mlx5: Order num_pending_prefetch properly with synchronize_srcu RDMA/mlx5: Put live in the correct place for ODP MRs RDMA/mlx5: Add missing synchronize_srcu() for MW cases RDMA/mlx5: Use irq xarray locking for mkey_table mm/mmu_notifiers: use the right return code for WARN_ON Jason Wang (1): vringh: fix copy direction of vringh_iov_push_kern() Javier Martinez Canillas (1): efi/efi_test: Lock down /dev/efi_test and require CAP_SYS_ADMIN Jay Vosburgh (1): bonding: fix state transition issue in link monitoring Jayachandran C (1): MAINTAINERS: update Cavium ThunderX2 maintainers Jean Delvare (1): firmware: dmi: Fix unlikely out-of-bounds read in save_mem_devices Jean-Baptiste Maneyrol (1): iio: imu: inv_mpu6050: fix no data on MPU6050 Jeff Kirsher (1): i40e: Fix receive buffer starvation for AF_XDP Jeff Layton (5): ceph: just skip unrecognized info in ceph_reply_info_extra ceph: don't try to handle hashed dentries in non-O_CREAT atomic_open ceph: return -EINVAL if given fsc mount option on kernel w/o support ceph: take the inode lock before acquiring cap refs ceph: increment/decrement dio counter on async requests Jeffrey Hugo (2): drm/msm/dsi: Implement reset correctly dmaengine: qcom: bam_dma: Fix resource leak Jens Axboe (13): io_uring: only flush workqueues on fileset removal io_uring: fix sequence logic for timeout requests Merge branch 'md-fixes' of https://git.kernel.org/.../song/md into for-linus io_uring: fix up O_NONBLOCK handling for sockets Merge branch 'nvme-5.4' of git://git.infradead.org/nvme into for-linus io_uring: revert "io_uring: optimize submit_and_wait API" io_uring: used cached copies of sq->dropped and cq->overflow io_uring: fix bad inflight accounting for SETUP_IOPOLL|SETUP_SQTHREAD io_uring: don't touch ctx in setup after ring fd install io_uring: ensure we clear io_kiocb->result before each issue Merge branch 'nvme-5.4-rc7' of git://git.infradead.org/nvme into for-linus io_uring: make timeout sequence == 0 mean no sequence io_uring: ensure registered buffer import returns the IO length Jernej Skrabec (2): arm64: dts: allwinner: a64: pine64-plus: Add PHY regulator delay arm64: dts: allwinner: a64: sopine-baseboard: Add PHY regulator delay Jeroen Hofstee (10): can: peak_usb: report bus recovery as well can: c_can: D_CAN: c_can_chip_config(): perform a sofware reset on open can: c_can: C_CAN: add bus recovery events can: rx-offload: can_rx_offload_irq_offload_timestamp(): continue on error can: ti_hecc: ti_hecc_stop(): stop the CPK on down can: ti_hecc: keep MIM and MD set can: ti_hecc: release the mailbox a bit earlier can: ti_hecc: add fifo overflow error reporting can: ti_hecc: properly report state changes can: ti_hecc: add missing state changes Jerry Snitselaar (2): efi/tpm: Only set 'efi_tpm_final_log_size' after successful event log parsing efi/tpm: Return -EINVAL when determining tpm final events log size fails Jessica Yu (2): scripts/nsdeps: use alternative sed delimiter scripts/nsdeps: make sure to pass all module source files to spatch Jia Guo (1): ocfs2: clear zero in unaligned direct IO Jia-Ju Bai (3): fs: ocfs2: fix possible null-pointer dereferences in ocfs2_xa_prepare_entry() fs: ocfs2: fix a possible null-pointer dereference in ocfs2_write_end_nolock() fs: ocfs2: fix a possible null-pointer dereference in ocfs2_info_scan_inode_alloc() Jia-Ye Li (1): staging: exfat: Use kvzalloc() instead of kzalloc() for exfat_sb_info Jiangfeng Xiao (2): net: hisilicon: Fix "Trying to free already-free IRQ" net: hisilicon: Fix ping latency when deal with high throughput Jiaxun Yang (1): MIPS: elf_hwcap: Export userspace ASEs Jim Mattson (4): kvm: x86: Expose RDPID in KVM_GET_SUPPORTED_CPUID KVM: nVMX: Don't leak L1 MMIO regions to L2 kvm: Allocate memslots and buses before calling kvm_arch_init_vm kvm: call kvm_arch_destroy_vm if vm creation fails Jiri Benc (4): selftests/bpf: Set rp_filter in test_flow_dissector selftests/bpf: More compatible nc options in test_lwt_ip_encap bpf: lwtunnel: Fix reroute supplying invalid dst selftests/bpf: More compatible nc options in test_tc_edt Jiri Olsa (2): perf/x86/intel/pt: Fix base for single entry topa perf tools: Fix time sorting Jiri Pirko (3): mlxsw: core: Unpublish devlink parameters during reload devlink: disallow reload operation during device cleanup mlxsw: core: Enable devlink reload only on probe Jiri Slaby (1): stacktrace: Don't skip first entry on noncurrent tasks Jisheng Zhang (1): pinctrl: berlin: as370: fix a typo s/spififib/spdifib Jiufei Xue (1): iocost: check active_list of all the ancestors in iocg_activate() Joakim Zhang (1): can: flexcan: disable completely the ECC mechanism Joao Martins (3): KVM: VMX: Consider PID.PIR to determine if vCPU has pending interrupts KVM: VMX: Do not change PID.NDST when loading a blocked vCPU KVM: VMX: Introduce pi_is_pir_empty() helper Joe Perches (3): net: sctp: Rename fallthrough label to unhandled compiler_attributes.h: Add 'fallthrough' pseudo keyword for switch/case use Documentation/process: Add fallthrough pseudo-keyword Joel Colledge (1): scripts/gdb: fix lx-dmesg when CONFIG_PRINTK_CALLER is set Joel Fernandes (Google) (1): binder: Fix comment headers on binder_alloc_prepare_to_free() Joel Stanley (1): clk: ast2600: Fix enabling of clocks Joerg Roedel (3): Merge branch 'for-joerg/arm-smmu/fixes' of git://git.kernel.org/.../will/linux into iommu/fixes vfio/type1: Initialize resv_msi_base iommu/amd: Check PM_LEVEL_SIZE() condition in locked section Johan Hovold (46): USB: serial: keyspan: fix NULL-derefs on open() and write() USB: microtek: fix info-leak at probe USB: adutux: fix use-after-free on disconnect USB: adutux: fix NULL-derefs on disconnect USB: usblcd: fix I/O after disconnect USB: usblcd: drop redundant disconnect mutex USB: usblcd: drop redundant lcd mutex USB: usblcd: use pr_err() USB: legousbtower: fix slab info leak at probe USB: legousbtower: fix deadlock on disconnect USB: legousbtower: fix potential NULL-deref on disconnect USB: legousbtower: fix open after failed reset request USB: usb-skeleton: fix runtime PM after driver unbind USB: usblp: fix runtime PM after driver unbind USB: serial: fix runtime PM after driver unbind media: stkwebcam: fix runtime PM after driver unbind NFC: pn533: fix use-after-free and memleaks USB: usb-skeleton: fix NULL-deref on disconnect USB: usb-skeleton: fix use-after-free after driver unbind USB: usb-skeleton: drop redundant in-urb check USB: legousbtower: fix use-after-free on release USB: ldusb: fix NULL-derefs on driver unbind USB: adutux: fix use-after-free on release USB: chaoskey: fix use-after-free on release USB: iowarrior: fix use-after-free on disconnect USB: iowarrior: fix use-after-free on release USB: iowarrior: fix use-after-free after driver unbind USB: iowarrior: drop redundant disconnect mutex USB: iowarrior: drop redundant iowarrior mutex USB: iowarrior: use pr_err() USB: yurex: fix NULL-derefs on disconnect USB: ldusb: fix memleak on disconnect USB: legousbtower: fix memleak on disconnect USB: usblp: fix use-after-free on disconnect USB: serial: ti_usb_3410_5052: fix port-close races USB: serial: ti_usb_3410_5052: clean up serial data access USB: ldusb: fix read info leaks s390/zcrypt: fix memleak at release USB: ldusb: fix ring-buffer locking USB: ldusb: use unsigned size format specifiers USB: ldusb: fix control-message timeout USB: serial: whiteheat: fix potential slab corruption USB: serial: whiteheat: fix line-speed endianness can: mcba_usb: fix use-after-free on disconnect can: usb_8dev: fix use-after-free on disconnect can: peak_usb: fix slab info leak Johannes Berg (5): mac80211: accept deauth frames in IBSS mode iwlwifi: pcie: fix indexing in command dump for new HW iwlwifi: pcie: fix rb_allocator workqueue allocation iwlwifi: mvm: handle iwl_mvm_tvqm_enable_txq() error return mac80211: fix ieee80211_txq_setup_flows() failure path Johannes Weiner (2): mm/page_alloc.c: ratelimit allocation failure warnings more aggressively mm: memcontrol: fix network errors from failing __GFP_ATOMIC charges John Donnelly (1): iommu/vt-d: Fix panic after kexec -p for kdump John Garry (1): ACPI: CPPC: Set pcc_data[pcc_ss_id] to NULL in acpi_cppc_processor_exit() John Hubbard (3): mm/gup_benchmark: add a missing "w" to getopt string mm/gup: fix a misnamed "write" argument, and a related bug mm/gup_benchmark: fix MAP_HUGETLB case John Hurley (1): net: sched: prevent duplicate flower rules from tcf_proto destroy race Johnny Huang (3): pinctrl: aspeed-g6: Fix I3C3/I3C4 pinmux configuration pinctrl: aspeed-g6: Fix UART13 group pinmux pinctrl: aspeed-g6: Rename SD3 to EMMC and rework pin groups Jon Bloomfield (10): drm/i915: Rename gen7 cmdparser tables drm/i915: Disable Secure Batches for gen6+ drm/i915: Remove Master tables from cmdparser drm/i915: Add support for mandatory cmdparsing drm/i915: Support ro ppgtt mapped cmdparser shadow buffers drm/i915: Allow parsing of unsized batches drm/i915: Add gen9 BCS cmdparsing drm/i915/cmdparser: Use explicit goto for error paths drm/i915/cmdparser: Add support for backward jumps drm/i915/cmdparser: Ignore Length operands during command matching Jonas Gorski (1): MIPS: bmips: mark exception vectors as char arrays Jonathan Neuschäfer (2): dt-bindings: usb: Fix references to usb-hcd.yaml Documentation: networking: device drivers: Remove stray asterisks Jordan Niethe (1): powerpc/kvm: Fix kvmppc_vcore->in_guest value in kvmhv_switch_to_host Jorge Ramirez-Ortiz (1): watchdog: pm8916_wdt: fix pretimeout registration flow Jose Abreu (14): net: stmmac: selftests: Check if filtering is available before running net: stmmac: gmac4+: Not all Unicast addresses may be available net: stmmac: selftests: Fix L2 Hash Filter test net: stmmac: gmac4: bitrev32 returns u32 net: stmmac: xgmac: bitrev32 returns u32 net: stmmac: selftests: Prevent false positives in filter tests net: stmmac: xgmac: Only get SPH header len if available net: stmmac: xgmac: Fix TSA selection net: stmmac: xgmac: Fix AV Feature detection net: stmmac: xgmac: Disable Flow Control when 1 or more queues are in AV net: stmmac: xgmac: Disable MMC interrupts by default net: stmmac: Fix the packet count in stmmac_rx() net: stmmac: Fix TSO descriptor with Enhanced Addressing net: stmmac: Fix the TX IOC in xmit path Josef Bacik (6): btrfs: fix incorrect updating of log root tree btrfs: allocate new inode in NOFS context btrfs: fix uninitialized ret in ref-verify nbd: protect cmd->status with cmd->lock nbd: handle racing with error'ed out commands btrfs: save i_size to avoid double evaluation of i_size_read in compress_file_range Josh Poimboeuf (1): x86/speculation/taa: Fix printing of TAA_MSG_SMT on IBRS_ALL CPUs José Roberto de Souza (1): drm/i915/dp: Do not switch aux to TBT mode for non-TC ports Jouni Hogander (2): slip: Fix memory leak in slip_open error path slcan: Fix memory leak in error path Jozsef Kadlecsik (1): netfilter: ipset: Fix nla_policies to fully support NL_VALIDATE_STRICT Juergen Gross (2): xen/netback: fix error path of xenvif_connect_data() xen: issue deprecation warning for 32-bit pv guest Julien Grall (2): arm64: cpufeature: Effectively expose FRINT capability to userspace arm64: cpufeature: Treat ID_AA64ZFR0_EL1 as RAZ when SVE is not enabled Julien Thierry (1): arm64: entry.S: Do not preempt from IRQ before all cpufeatures are enabled Jun Lei (2): drm/amd/display: do not synchronize "drr" displays drm/amd/display: add 50us buffer as WA for pstate switch in active Junaid Shahid (2): kvm: Add helper function for creating VM worker threads kvm: x86: mmu: Recovery of shattered NX large pages Junichi Nomura (1): block: check bi_size overflow before merge KP Singh (1): samples/bpf: Add a workaround for asm_inline Kai-Heng Feng (5): xhci: Increase STS_SAVE timeout in xhci_suspend() drm/edid: Add 6 bpc quirk for SDC panel in Lenovo G50 Revert "Input: elantech - enable SMBus on new (2018+) systems" HID: i2c-hid: Remove runtime power management x86/quirks: Disable HPET on Intel Coffe Lake platforms Kaike Wan (4): IB/hfi1: Avoid excessive retry for TID RDMA READ request IB/hfi1: Ensure r_tid_ack is valid before building TID RDMA ACK packet IB/hfi1: Calculate flow weight based on QP MTU for TID RDMA IB/hfi1: TID RDMA WRITE should not return IB_WC_RNR_RETRY_EXC_ERR Kairui Song (1): x86, efi: Never relocate kernel below lowest acceptable address Kalle Valo (1): Merge tag 'iwlwifi-for-kalle-2019-10-09' of git://git.kernel.org/.../iwlwifi/iwlwifi-fixes Kamal Heib (1): RDMA/qedr: Fix reported firmware version Kan Liang (10): x86/cpu: Add Comet Lake to the Intel CPU models header perf/x86/intel: Add Comet Lake CPU support perf/x86/msr: Add Comet Lake CPU support perf/x86/cstate: Add Comet Lake CPU support perf/x86/msr: Add new CPU model numbers for Ice Lake perf/x86/cstate: Update C-state counters for Ice Lake perf/x86/intel: Add Tiger Lake CPU support perf/x86/msr: Add Tiger Lake CPU support perf/x86/cstate: Add Tiger Lake CPU support perf/x86/uncore: Fix event group support Karsten Graul (2): net/smc: receive returns without data net/smc: receive pending data after RCV_SHUTDOWN Kazutoshi Noguchi (1): r8152: add device id for Lenovo ThinkPad USB-C Dock Gen 2 Kees Cook (1): selftests/kselftest/runner.sh: Add 45 second timeout per test Kefeng Wang (2): riscv: Fix implicit declaration of 'page_to_section' riscv: Fix undefined reference to vmemmap_populate_basepages Keith Busch (6): null_blk: Fix zoned command return code nvme-pci: Free tagset if no IO queues nvme: Remove ADMIN_ONLY state nvme: Restart request timers in resetting state nvme: Prevent resets during paused controller state nvme: Wait for reset state when required Kenneth Graunke (1): drm/i915: Whitelist COMMON_SLICE_CHICKEN2 Kevin Hao (2): nvme-pci: Set the prp2 correctly when using more than 4k page dump_stack: avoid the livelock of the dump_lock Kevin Wang (1): drm/amd/swSMU: fix smu workload bit map error Keyon Jie (6): ASoC: SOF: topology: fix missing NULL pointer check ASoC: SOF: Intel: hda: set L1SEN on S0ix suspend ASoC: SOF: PM: add state machine to comments ASoC: SOF: PM: add check before setting d0_substate ASoC: SOF: add helper to check if we should enter d0i3 suspend ASoC: SOF: PM: only suspend to D0I3 when needed Kim Phillips (2): perf/x86/amd/ibs: Fix reading of the IBS OpData register and thus precise RIP validity perf/x86/amd/ibs: Handle erratum #420 only on the affected CPU family (10h) Kiran Gunda (1): regulator: qcom-rpmh: Fix PMIC5 BoB min voltage Kirill A. Shutemov (3): proc/meminfo: fix output alignment mm/thp: fix node page state in split_huge_page_to_list() mm/thp: allow dropping THP from page cache Kishon Vijay Abraham I (1): reset: Fix memory leak in reset_control_array_put() Konstantin Khlebnikov (1): mm/memcontrol: update lruvec counters in mem_cgroup_move_account Krishnamraju Eraparaju (3): RDMA/siw: Fix serialization issue in write_space() RDMA/iwcm: move iw_rem_ref() calls out of spinlock RDMA/siw: free siw_base_qp in kref release routine Krzysztof Kozlowski (1): ASoC: Fix Kconfig indentation Kuninori Morimoto (14): ASoC: fsi: switch to yaml base Documentation ASoC: soc-core: remove soc_is_dai_link_bound() ASoC: soc-core: merge snd_soc_register_dai() and soc_add_dai() ASoC: soc-core: merge snd_soc_unregister_dai() and soc_del_dai() ASoC: soc-core: merge snd_soc_add_dai_link() and soc_bind_dai_link() ASoC: soc-core: merge snd_soc_remove_dai_link() and soc_unbind_dai_link() ASoC: soc-core: merge soc_remove_component() and soc_cleanup_component() ASoC: soc-core: merge snd_soc_bind_card() and snd_soc_instantiate_card() ASoC: soc-core: tidyup soc_probe_aux_devices() ASoC: soc-core: call snd_soc_dapm_shutdown() at soc_cleanup_card_resources() ASoC: soc-core: move snd_soc_unbind_card() next to snd_soc_bind_card() ASoC: soc-core: care card_probed at soc_cleanup_card_resources() ASoC: soc-component: tidyup snd_soc_pcm_component_new/free() parameter ASoC: soc-pcm: remove soc_pcm_private_free() Kurt Van Dijck (1): can: c_can: c_can_poll(): only read status register after status IRQ Kyle Mahlkuch (1): drm/radeon: Fix EEH during kexec Larry Finger (1): rtlwifi: rtl_pci: Fix problem of too small skb->len Lasse Collin (1): lib/xz: fix XZ_DYNALLOC to avoid useless memory reallocations Laura Abbott (2): rtlwifi: Fix potential overflow on P2P code mm: slub: really fix slab walking for init_on_free Laurent Dufour (1): powerpc/pseries: Remove confusing warning message. Laurent Pinchart (5): drm/panel: lg-lb035q02: Fix SPI alias drm/panel: nec-nl8048hl11: Fix SPI alias drm/panel: sony-acx565akm: Fix SPI alias drm/panel: tpo-td028ttec1: Fix SPI alias drm/panel: tpo-td043mtea1: Fix SPI alias Leon Romanovsky (1): RDMA/nldev: Reshuffle the code to avoid need to rebind QP in error path Leonard Crestez (2): interconnect: qcom: Fix icc_onecell_data allocation clk: imx8m: Use SYS_PLL1_800M as intermediate parent of CLK_ARM Li Xu (1): ASoC: wm_adsp: Expose mixer control API Liam Girdwood (2): ASoC: SOF: Intel: Fix CFL and CML FW nocodec binary names. ASoC: SOF: Intel: Fix CFL and CML FW nocodec binary names. Lijun Ou (1): RDMA/hns: Prevent memory leaks of eq->buf_list Linus Torvalds (199): uaccess: implement a proper unsafe_copy_to_user() and switch filldir over to it Merge branch 'akpm' (patches from Andrew) Merge tag 'linux-kselftest-5.4-rc3' of git://git.kernel.org/.../shuah/linux-kselftest Merge tag 'selinux-pr-20191007' of git://git.kernel.org/.../pcmoore/selinux Merge tag 'gpio-v5.4-2' of git://git.kernel.org/.../linusw/linux-gpio Merge tag 'led-fixes-for-5.4-rc3' of git://git.kernel.org/.../j.anaszewski/linux-leds Merge tag 'arm64-fixes' of git://git.kernel.org/.../arm64/linux Merge tag 'for-linus' of git://git.kernel.org/.../rdma/rdma Merge branch 'work.mount3' of git://git.kernel.org/.../viro/vfs Merge branch 'work.dcache' of git://git.kernel.org/.../viro/vfs Merge tag 'for-5.4-rc2-tag' of git://git.kernel.org/.../kdave/linux Merge branch 'linus' of git://git.kernel.org/.../herbert/crypto-2.6 Merge tag 'xfs-5.4-fixes-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux Merge tag 'for-linus-20191010' of git://git.kernel.dk/linux-block Merge tag 'drm-fixes-2019-10-11' of git://anongit.freedesktop.org/drm/drm Merge tag 'hyperv-fixes-signed' of git://git.kernel.org/.../hyperv/linux Merge tag 'modules-for-v5.4-rc3' of git://git.kernel.org/.../jeyu/linux Merge tag '5.4-rc2-smb3' of git://git.samba.org/sfrench/cifs-2.6 Merge tag 'nfs-for-5.4-2' of git://git.linux-nfs.org/projects/anna/linux-nfs Merge tag 's390-5.4-4' of git://git.kernel.org/.../s390/linux Merge tag 'for-linus-5.4-rc3-tag' of git://git.kernel.org/.../xen/tip Merge tag 'powerpc-5.4-3' of git://git.kernel.org/.../powerpc/linux Merge tag 'mips_fixes_5.4_2' of git://git.kernel.org/.../mips/linux Merge tag 'riscv/for-v5.4-rc3' of git://git.kernel.org/.../riscv/linux Merge branch 'core-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge branch 'efi-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge tag 'usb-5.4-rc3' of git://git.kernel.org/.../gregkh/usb Merge tag 'tty-5.4-rc3' of git://git.kernel.org/.../gregkh/tty Merge tag 'staging-5.4-rc3' of git://git.kernel.org/.../gregkh/staging Merge tag 'char-misc-5.4-rc3' of git://git.kernel.org/.../gregkh/char-misc Merge tag 'for-linus-20191012' of git://git.kernel.dk/linux-block Merge tag 'fixes-for-5.4-rc3' of git://git.kernel.org/.../mtd/linux Merge tag 'hwmon-for-v5.4-rc3' of git://git.kernel.org/.../groeck/linux-staging Merge tag 'trace-v5.4-rc2' of git://git.kernel.org/.../rostedt/linux-trace Linux 5.4-rc3 Merge branch 'akpm' (patches from Andrew) Merge branch 'dmi-for-linus' of git://git.kernel.org/.../jdelvare/staging Merge branch 'parisc-5.4-2' of git://git.kernel.org/.../deller/parisc-linux sparc64: disable fast-GUP due to unexplained oopses Merge tag 'scsi-fixes' of git://git.kernel.org/.../jejb/scsi Merge tag 'for_linus' of git://git.kernel.org/.../mst/vhost Merge tag 'gpio-v5.4-3' of git://git.kernel.org/.../linusw/linux-gpio Merge tag 'platform-drivers-x86-v5.4-3' of git://git.infradead.org/linux-platform-drivers-x86 Merge branch 'for-linus' of git://git.kernel.org/.../dtor/input Merge tag 'drm-fixes-2019-10-18' of git://anongit.freedesktop.org/drm/drm Merge tag 'xfs-5.4-fixes-4' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux Merge tag 'xtensa-20191017' of git://github.com/jcmvbkbc/linux-xtensa Merge tag 'arm64-fixes' of git://git.kernel.org/.../arm64/linux Merge tag 'mkp-scsi-postmerge' of git://git.kernel.org/.../mkp/scsi Merge tag 'pm-5.4-rc4' of git://git.kernel.org/.../rafael/linux-pm Merge tag 'acpi-5.4-rc4' of git://git.kernel.org/.../rafael/linux-pm Merge tag 'sound-5.4-rc4' of git://git.kernel.org/.../tiwai/sound Merge tag 'mmc-v5.4-rc1' of git://git.kernel.org/.../ulfh/mmc Merge tag 'copy-struct-from-user-v5.4-rc4' of gitolite.kernel.org:pub/scm/linux/kernel/git/brauner/linux Merge tag 'iommu-fixes-v5.4-rc3' of git://git.kernel.org/.../joro/iommu Merge tag 'for-5.4/dm-fixes' of git://git.kernel.org/.../device-mapper/linux-dm Merge tag 'ceph-for-5.4-rc4' of git://github.com/ceph/ceph-client filldir[64]: remove WARN_ON_ONCE() for bad directory entries Merge tag 'riscv/for-v5.4-rc4' of git://git.kernel.org/.../riscv/linux Merge tag 'for-linus-2019-10-18' of git://git.kernel.dk/linux-block Merge branch 'akpm' (patches from Andrew) Merge git://git.kernel.org/.../netdev/net Merge branch 'core-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge tag 'kbuild-fixes-v5.4-2' of git://git.kernel.org/.../masahiroy/linux-kbuild Linux 5.4-rc4 Merge tag 'pinctrl-v5.4-2' of git://git.kernel.org/.../linusw/linux-pinctrl Merge tag 'for-5.4-rc4-tag' of git://git.kernel.org/.../kdave/linux Merge tag 'edac_urgent_for_5.4' of git://git.kernel.org/.../ras/ras Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm Merge tag 'regulator-fix-v5.4-rc4' of git://git.kernel.org/.../broonie/regulator Merge tag 'vfio-v5.4-rc5' of git://github.com/awilliam/linux-vfio Merge tag 'trace-v5.4-rc3-3' of git://git.kernel.org/.../rostedt/linux-trace Merge tag 'sound-5.4-rc5' of git://git.kernel.org/.../tiwai/sound Merge tag 'mfd-fixes-5.4' of git://git.kernel.org/.../lee/mfd Merge tag 'gfs2-v5.4-rc4.fixes' of git://git.kernel.org/.../gfs2/linux-gfs2 Merge tag 'pm-5.4-rc5' of git://git.kernel.org/.../rafael/linux-pm Merge tag 'acpi-5.4-rc5' of git://git.kernel.org/.../rafael/linux-pm Merge tag 'devicetree-fixes-for-5.4-2' of git://git.kernel.org/.../robh/linux Merge tag 'mmc-v5.4-rc4' of git://git.kernel.org/.../ulfh/mmc Merge tag 'drm-fixes-2019-10-25' of git://anongit.freedesktop.org/drm/drm Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm Merge tag 'armsoc-fixes' of git://git.kernel.org/.../soc/soc Merge tag 'modules-for-v5.4-rc5' of git://git.kernel.org/.../jeyu/linux Merge branch 'for-linus' of git://git.kernel.org/.../dtor/input Merge tag 'scsi-fixes' of git://git.kernel.org/.../jejb/scsi Merge tag 'dax-fix-5.4-rc5' of git://git.kernel.org/.../nvdimm/nvdimm Merge tag 'dma-mapping-5.4-2' of git://git.infradead.org/users/hch/dma-mapping Merge tag 'for-linus-5.4-rc5-tag' of git://git.kernel.org/.../xen/tip Merge tag 's390-5.4-5' of git://git.kernel.org/.../s390/linux Merge tag 'for-linus-2019-10-26' of git://git.kernel.dk/linux-block Merge branch 'i2c/for-current-fixed' of git://git.kernel.org/.../wsa/linux Merge tag 'usb-5.4-rc5' of git://git.kernel.org/.../gregkh/usb Merge tag 'char-misc-5.4-rc5' of git://git.kernel.org/.../gregkh/char-misc Merge tag 'driver-core-5.4-rc5' of git://git.kernel.org/.../gregkh/driver-core Merge tag 'staging-5.4-rc5' of git://git.kernel.org/.../gregkh/staging Merge tag 'tty-5.4-rc5' of git://git.kernel.org/.../gregkh/tty Merge tag 'mips_fixes_5.4_3' of git://git.kernel.org/.../mips/linux Merge tag 'riscv/for-v5.4-rc5-b' of git://git.kernel.org/.../riscv/linux Merge tag '5.4-rc5-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6 Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/.../tip/tip Linux 5.4-rc5 Merge tag 'for_linus' of git://git.kernel.org/.../mst/vhost Merge branch 'for-linus' of git://git.kernel.org/.../hid/hid Merge tag 'arc-5.4-rc6' of git://git.kernel.org/.../vgupta/arc Merge tag 'fuse-fixes-5.4-rc6' of git://git.kernel.org/.../mszeredi/fuse Merge tag 'gfs2-v5.4-rc5.fixes' of git://git.kernel.org/.../gfs2/linux-gfs2 Merge tag 'iommu-fixes-v5.4-rc5' of git://git.kernel.org/.../joro/iommu Merge tag 'dmaengine-fix-5.4-rc6' of git://git.infradead.org/users/vkoul/slave-dma Merge tag 'sound-5.4-rc6' of git://git.kernel.org/.../tiwai/sound Merge tag 'for-linus' of git://git.kernel.org/.../rdma/rdma Merge tag 'pm-5.4-rc6' of git://git.kernel.org/.../rafael/linux-pm Merge tag 'drm-fixes-2019-11-01' of git://anongit.freedesktop.org/drm/drm Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm Merge tag 'arm64-fixes' of git://git.kernel.org/.../arm64/linux Merge branch 'efi-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge branch 'parisc-5.4-3' of git://git.kernel.org/.../deller/parisc-linux Merge tag 'riscv/for-v5.4-rc6' of git://git.kernel.org/.../riscv/linux Merge tag 'for-linus-20191101' of git://git.kernel.dk/linux-block Merge tag 'nfs-for-5.4-3' of git://git.linux-nfs.org/projects/anna/linux-nfs Merge git://git.kernel.org/.../netdev/net Merge tag 's390-5.4-6' of git://git.kernel.org/.../s390/linux Merge tag 'powerpc-5.4-4' of git://git.kernel.org/.../powerpc/linux Merge tag 'scsi-fixes' of git://git.kernel.org/.../jejb/scsi Merge tag 'pwm/for-5.4-rc6' of git://git.kernel.org/.../thierry.reding/linux-pwm Merge tag 'hwmon-for-v5.4-rc6' of git://git.kernel.org/.../groeck/linux-staging Merge tag '5.4-rc6-smb3-fix' of git://git.samba.org/sfrench/cifs-2.6 Merge tag 'usb-5.4-rc6' of git://git.kernel.org/.../gregkh/usb Linux 5.4-rc6 Merge tag 'gpio-v5.4-4' of git://git.kernel.org/.../linusw/linux-gpio Merge tag 'for-linus-2019-11-05' of git://git.kernel.org/.../brauner/linux Merge branch 'akpm' (patches from Andrew) Merge branch 'for-linus' of git://git.kernel.org/.../hid/hid Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/.../clk/linux Merge tag 'drm-fixes-2019-11-08' of git://anongit.freedesktop.org/drm/drm Merge tag 'sound-5.4-rc7' of git://git.kernel.org/.../tiwai/sound Merge tag 'pm-5.4-rc7' of git://git.kernel.org/.../rafael/linux-pm Merge tag 'xarray-5.4' of git://git.infradead.org/users/willy/linux-dax Merge tag 'arm64-fixes' of git://git.kernel.org/.../arm64/linux Merge tag 'modules-for-v5.4-rc7' of git://git.kernel.org/.../jeyu/linux Merge tag 'ceph-for-5.4-rc7' of git://github.com/ceph/ceph-client Merge tag 'pwm/for-5.4-rc7' of git://git.kernel.org/.../thierry.reding/linux-pwm Merge tag 'for-linus-2019-11-08' of git://git.kernel.dk/linux-block Merge git://git.kernel.org/.../netdev/net Merge tag 'linux-watchdog-5.4-rc7' of git://www.linux-watchdog.org/linux-watchdog Merge tag 'for-5.4-rc6-tag' of git://git.kernel.org/.../kdave/linux Merge tag 'pinctrl-v5.4-3' of git://git.kernel.org/.../linusw/linux-pinctrl Merge tag '5.4-rc7-smb3-fix' of git://git.samba.org/sfrench/cifs-2.6 Merge branch 'core-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge tag 'configfs-for-5.4-2' of git://git.infradead.org/users/hch/configfs Merge tag 'char-misc-5.4-rc7' of git://git.kernel.org/.../gregkh/char-misc Merge tag 'staging-5.4-rc7' of git://git.kernel.org/.../gregkh/staging Merge tag 'armsoc-fixes' of git://git.kernel.org/.../soc/soc Linux 5.4-rc7 Merge tag 'scsi-fixes' of git://git.kernel.org/.../jejb/scsi Merge branch 'for-5.4-fixes' of git://git.kernel.org/.../tj/cgroup Merge Intel Gen8/Gen9 graphics fixes from Jon Bloomfield. Merge branch 'x86-pti-for-linus' of git://git.kernel.org/.../tip/tip Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm Remove VirtualBox guest shared folders filesystem Merge tag 'for-5.4-rc7-tag' of git://git.kernel.org/.../kdave/linux Merge branch 'for-linus' of git://git.kernel.org/.../dtor/input Merge tag 'for-linus' of git://git.kernel.org/.../rdma/rdma Merge tag 'kbuild-fixes-v5.4-3' of git://git.kernel.org/.../masahiroy/linux-kbuild Merge branch 'fixes' of git://git.kernel.org/.../viro/vfs Merge tag 'drm-fixes-2019-11-15' of git://anongit.freedesktop.org/drm/drm Merge tag 'sound-5.4-rc8' of git://git.kernel.org/.../tiwai/sound Merge tag 'mmc-v5.4-rc7' of git://git.kernel.org/.../ulfh/mmc Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm Merge tag 'mips_fixes_5.4_4' of git://git.kernel.org/.../mips/linux Merge tag 'arm64-fixes' of git://git.kernel.org/.../arm64/linux Merge tag 'ceph-for-5.4-rc8' of git://github.com/ceph/ceph-client Merge tag 'for-linus-20191115' of git://git.kernel.dk/linux-block Merge branch 'for-linus' of git://git.kernel.org/.../dtor/input Merge branch 'akpm' (patches from Andrew) Merge git://git.kernel.org/.../netdev/net Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge branch 'linus' of git://git.kernel.org/.../herbert/crypto-2.6 Merge branch 'i2c/for-current' of git://git.kernel.org/.../wsa/linux Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge tag 'iommu-fixes-v5.4-rc7' of git://git.kernel.org/.../joro/iommu Linux 5.4-rc8 Linus Walleij (8): Merge tag 'gpio-v5.4-rc2-fixes-for-linus' of git://git.kernel.org/.../brgl/linux into fixes pinctrl: bcm-iproc: Use SPDX header Merge tag 'intel-pinctrl-fixes-v5.4' of git://git.kernel.org/.../pinctrl/intel into fixes Merge tag 'gpio-v5.4-rc5-fixes-for-linus' of git://git.kernel.org/.../brgl/linux into fixes Merge tag 'intel-pinctrl-fixes-v5.4-2' of git://git.kernel.org/.../pinctrl/intel into fixes Revert "gpio: merrifield: Move hardware initialization to callback" Revert "gpio: merrifield: Restore use of irq_base" Revert "gpio: merrifield: Pass irqchip when adding gpiochip" Liran Alon (2): KVM: VMX: Remove specialized handling of unexpected exit-reasons KVM: VMX: Fix comment to specify PID.ON instead of PIR.ON Liu Xiang (1): iommu/arm-smmu: Free context bitmap in the err path of arm_smmu_init_domain_context Lorenzo Bianconi (4): iio: imu: st_lsm6dsx: forbid 0 sensor sensitivity iio: imu: st_lsm6dsx: fix waitime for st_lsm6dsx i2c controller mt76: mt76x2e: disable pcie_aspm by default mt76: dma: fix buffer unmap with non-linear skbs Lu Baolu (1): MAINTAINERS: Update for INTEL IOMMU (VT-d) entry Luc Van Oostenryck (1): kbuild: tell sparse about the $ARCH Luca Coelho (9): iwlwifi: don't access trans_cfg via cfg iwlwifi: fix ACPI table revision checks iwlwifi: exclude GEO SAR support for 3168 iwlwifi: pcie: change qu with jf devices to use qu configuration iwlwifi: pcie: fix merge damage on making QnJ exclusive iwlwifi: pcie: fix PCI ID 0x2720 configs that should be soc iwlwifi: pcie: fix all 9460 entries for qnj iwlwifi: pcie: add workaround for power gating in integrated 22000 iwlwifi: pcie: 0x2720 is qu and 0x30DC is not Lucas Stach (7): arm64: dts: zii-ultra: fix ARM regulator states drm/etnaviv: fix deadlock in GPU coredump drm/etnaviv: reinstate MMUv1 command buffer window check arm64: dts: zii-ultra: fix ARM regulator GPIO handle Input: synaptics-rmi4 - fix video buffer size Input: synaptics-rmi4 - clear IRQ enables for F54 ASoC: tlv320aic31xx: configure output common-mode voltage Luis Henriques (2): ceph: fix use-after-free in __ceph_remove_cap() ceph: don't allow copy_file_range when stripe_count != 1 Lukas Wunner (2): efi/cper: Fix endianness of PCIe class code netfilter: nf_tables: Align nft_expr private data to 64-bit Lukas Zapletal (1): hwmon: (k10temp) Update documentation and add temp2_input info Lyude Paul (2): igb/igc: Don't warn on fatal read failures when the device is removed Input: synaptics - enable RMI mode for X1 Extreme 2nd Generation Magnus Karlsson (4): xsk: Fix crash in poll when device does not support ndo_xsk_wakeup xsk: Fix registration of Rx-only sockets i40e: need_wakeup flag might not be set for Tx ixgbe: need_wakeup flag might not be set for Tx Mahesh Bandewar (2): blackhole_netdev: fix syzkaller reported issue Revert "blackhole_netdev: fix syzkaller reported issue" Manfred Rudigier (2): igb: Enable media autosense for the i350. igb: Fix constant media auto sense switching when no cable is connected Manish Chopra (1): qede: fix NULL pointer deref in __qede_remove() Mans Rullgard (1): net: ethernet: dwmac-sun8i: show message only when switching to promisc Mao Wenan (1): usbip: vhci_hcd indicate failed message Maor Gottlieb (1): net/mlx5e: Replace kfree with kvfree when free vhca stats Marc Kleine-Budde (8): can: rx-offload: can_rx_offload_queue_sorted(): fix error handling, avoid skb mem leak can: rx-offload: can_rx_offload_queue_tail(): fix error handling, avoid skb mem leak can: rx-offload: can_rx_offload_offload_one(): do not increase the skb_queue beyond skb_queue_len_max can: rx-offload: can_rx_offload_offload_one(): increment rx_fifo_errors on queue overflow or OOM can: rx-offload: can_rx_offload_offload_one(): use ERR_PTR() to propagate error value in case of errors can: rx-offload: can_rx_offload_irq_offload_fifo(): continue on error can: flexcan: increase error counters if skb enqueueing via can_rx_offload_queue_sorted() fails can: ti_hecc: ti_hecc_error(): increase error counters if skb enqueueing via can_rx_offload_queue_sorted() fails Marc Zyngier (11): irqchip/sifive-plic: Switch to fasteoi flow arm64: KVM: Trap VM ops when ARM64_WORKAROUND_CAVIUM_TX2_219_TVM is set arm64: Enable workaround for Cavium TX2 erratum 219 when running SMT arm64: Avoid Cavium TX2 erratum 219 when switching TTBR arm64: Allow CAVIUM_TX2_ERRATUM_219 to be selected KVM: arm64: pmu: Fix cycle counter truncation arm64: KVM: Handle PMCR_EL0.LC as RES1 on pure AArch64 systems KVM: arm64: pmu: Set the CHAINED attribute before creating the in-kernel event KVM: arm64: pmu: Reset sample period on overflow handling KVM: Forbid /dev/kvm being opened by a compat task when CONFIG_KVM_COMPAT=n KVM: Add a comment describing the /dev/kvm no_compat handling Marco Felsch (8): regulator: of: fix suspend-min/max-voltage parsing regulator: core: make regulator_register() EPROBE_DEFER aware regulator: da9062: fix suspend_enable/disable preparation gpio: fix getting nonexclusive gpiods from DT Input: da9063 - fix capability and drop KEY_SLEEP iio: light: fix vcnl4000 devicetree hooks iio: light: add missing vcnl4040 of_compatible iio: adc: ad799x: fix probe error handling Marek Behún (1): arm64: dts: armada-3720-turris-mox: convert usb-phy to phy-supply Marek Szyprowski (4): opp: core: Revert "add regulators enable and disable" clk: samsung: exynos5433: Fix error paths clk: samsung: exynos542x: Move G3D subsystem clocks to its sub-CMU clk: samsung: exynos5420: Preserve PLL configuration during suspend/resume Marek Vasut (4): net: dsa: microchip: Do not reinit mutexes on KSZ87xx net: dsa: microchip: Add shared regmap mutex net: phy: micrel: Discern KSZ8051 and KSZ8795 PHYs net: phy: micrel: Update KSZ87xx PHY name Mario Limonciello (1): ACPI: PM: Drop Dell XPS13 9360 from LPS0 Idle _DSM blacklist Mark Brown (4): ata: libahci_platform: Fix regulator_get_optional() misuse ASoC: SOF: Intel: Fix build break Merge branch 'asoc-5.4' into asoc-linus Merge branch 'asoc-5.5' into asoc-next Mark Rutland (4): arm64: mm: avoid virt_to_phys(init_mm.pgd) arm64: mm: fix spurious fault detection arm64: mm: fix inverted PAR_EL1.F check stop_machine: Avoid potential race behaviour Mark Zhang (1): RDMA/nldev: Skip counter if port doesn't match MarkLee (2): net: ethernet: mediatek: Fix MT7629 missing GMII mode support arm: dts: mediatek: Update mt7629 dts to reflect the latest dt-binding Markus Theil (1): nl80211: fix validation of mesh path nexthop Martin Blumenstingl (1): clk: meson: gxbb: let sar_adc_clk_div set the parent clock rate Martin Fuzzey (1): net: phy: smsc: LAN8740: add PHY_RST_AFTER_CLK_EN flag Martin Wilck (1): scsi: qla2xxx: fix NPIV tear down process Marvin Liu (1): virtio_ring: fix stalls for packed rings Masahiro Yamada (10): module: swap the order of symbol.namespace modpost: fix broken sym->namespace for external module builds module: rename __kstrtab_ns_* to __kstrtabns_* to avoid symbol conflict kbuild: fix build error of 'make nsdeps' in clean tree nsdeps: fix hashbang of scripts/nsdeps nsdeps: make generated patches independent of locale doc: move namespaces.rst from kbuild/ to core-api/ ARM: 8908/1: add __always_inline to functions called from __get_user_check() kbuild: update comment about KBUILD_ALLDIRS sparc: vdso: fix build error of vdso32 Masanari Iida (1): staging: exfat: Fix a typo in Kconfig Masashi Honma (1): nl80211: Disallow setting of HT for channel 14 Masayoshi Mizuma (1): arm64/sve: Fix wrong free for task->thread.sve_state Mathias Nyman (5): xhci: Fix false warning message about wrong bounce buffer write length xhci: Prevent device initiated U1/U2 link pm if exit latency is too long xhci: Fix USB 3.1 capability detection on early xHCI 1.1 spec based hosts xhci: Fix NULL pointer dereference in xhci_clear_tt_buffer_complete() xhci: Fix use-after-free regression in xhci clear hub TT implementation Matt Bennett (1): tipc: add back tipc prefix to log messages Matt Roper (3): drm/i915/cml: Add second PCH ID for CMP Revert "drm/i915/ehl: Update MOCS table for EHL" drm/i915/tgl: MOCS table update Matthew Wilcox (Oracle) (5): XArray: Fix xas_next() with a single entry at 0 idr: Fix idr_get_next_ul race with idr_remove radix tree: Remove radix_tree_iter_find idr: Fix integer overflow in idr_for_each_entry idr: Fix idr_alloc_u32 on 32-bit systems Matthias Maennich (3): modpost: delegate updating namespaces to separate function modpost: make updating the symbol namespace explicit symbol namespaces: revert to previous __ksymtab name scheme Matti Vaittinen (1): watchdog: bd70528: Add MODULE_ALIAS to allow module auto loading Mauro Carvalho Chehab (1): bindings: rename links to mason USB2/USB3 DT files Max Filippov (5): xtensa: clean up assembly arguments in uaccess macros xtensa: fix type conversion in __get_user_[no]check xtensa: drop EXPORT_SYMBOL for outs*/ins* xtensa: virt: fix PCI IO ports mapping xtensa: fix change_bit in exclusive access option Max Gurtovoy (3): nvmet-loop: fix possible leakage during error flow nvme-tcp: fix possible leakage during error flow nvme-rdma: fix a segmentation fault during module unload Max Reitz (1): xfs: Fix tail rounding in xfs_alloc_file_space() Maxim Mikityanskiy (1): net/mlx5e: Fix handling of compressed CQEs in case of low NAPI budget Maxime Ripard (4): ARM: dts: sunxi: Revert phy-names removal for ECHI and OHCI dt-bindings: usb: Bring back phy-names dt-bindings: media: sun4i-csi: Drop the module clock ARM: dts: sun7i: Drop the module clock from the device tree Mel Gorman (1): mm, meminit: recalculate pcpu batch and high limits after init completes Miaohe Lin (1): KVM: SVM: Fix potential wrong physical id in avic_handle_ldr_update Miaoqing Pan (1): ath10k: fix latency issue for QCA988x Michael Chan (1): bnxt_en: Fix devlink NVRAM related byte order related issues. Michael Ellerman (1): usercopy: Avoid soft lockups in test_check_nonzero_user() Michael S. Tsirkin (3): tools/virtio: more stubs tools/virtio: xen stub vhost/test: stop device before reset Michael Schmitz (1): scsi: core: Handle drivers which set sg_tablesize to zero Michael Straube (1): staging: exfat: add missing SPDX line to Kconfig Michael Strauss (1): drm/amd/display: Passive DP->HDMI dongle detection fix Michael Tretter (1): macb: propagate errors when getting optional clocks Michael Vassernis (1): mac80211_hwsim: fix incorrect dev_alloc_name failure goto Michael Walle (2): ASoC: wm8904: configure sysclk/FLL automatically ASoC: wm8904: fix regcache handling Michael Zhivich (1): x86/tsc: Respect tsc command line paraemeter for clocksource_tsc_early Michal Hocko (4): kernel/sysctl.c: do not override max_threads provided by userspace x86/tsx: Add config options to set tsx=on|off|auto mm, vmstat: hide /proc/pagetypeinfo from normal users mm, vmstat: reduce zone->lock holding time by /proc/pagetypeinfo Michal Kalderon (1): RDMA/core: Fix use after free and refcnt leak on ndev in_device in iwarp_query_port Michal Simek (1): serial: uartps: Fix uartps_major handling Michal Suchanek (2): soundwire: depend on ACPI soundwire: depend on ACPI || OF Michał Mirosław (1): HID: fix error message in hid_open_report() Mihail Atanassov (2): drm/komeda: Don't flush inactive pipes drm/komeda: Fix typos in komeda_splitter_validate Mika Westerberg (5): bdi: Do not use freezable workqueue Revert "libata, freezer: avoid block device removal while system is frozen" thunderbolt: Read DP IN adapter first two dwords in one go thunderbolt: Fix lockdep circular locking depedency warning thunderbolt: Drop unnecessary read when writing LC command in Ice Lake Mike Christie (1): nbd: verify socket is supported during setup Mike Marciniszyn (1): IB/hfi1: Use a common pad buffer for 9B and 16B packets Mike Rapoport (1): mm: memblock: do not enforce current limit for memblock_phys* family Miklos Szeredi (5): virtio-fs: don't show mount options fuse: don't dereference req->args on finished request fuse: don't advise readdirplus for negative lookup fuse: flush dirty data/metadata before non-truncate setattr fuse: truncate pending writes on O_TRUNC Mikulas Patocka (3): dm snapshot: introduce account_start_copy() and account_end_copy() dm snapshot: rework COW throttling to fix deadlock dm cache: fix bugs when a GFP_NOWAIT allocation fails Mohamad Heib (1): IB/core: Fix wrong iterating on ports Mordechay Goodstein (1): iwlwifi: pcie: don't consider IV len in A-MSDU Naftali Goldstein (1): iwlwifi: mvm: fix race in sync rx queue notification Narendra K (1): efi: Make CONFIG_EFI_RCI2_TABLE selectable on x86 only Nathan Chancellor (1): clk: sunxi: Fix operator precedence in sunxi_divs_clk_setup Navid Emamdoost (17): RDMA/hfi1: Prevent memory leak in sdma_init Staging: fbtft: fix memory leak in fbtft_framebuffer_alloc misc: fastrpc: prevent memory leak in fastrpc_dma_buf_attach staging: vt6655: Fix memory leak in vt6655_probe nl80211: fix memory leak in nl80211_get_ftm_responder_stats iwlwifi: dbg_ini: fix memory leak in alloc_sgtable iwlwifi: pcie: fix memory leaks in iwl_pcie_ctxt_info_gen3_init iio: imu: adis16400: release allocated memory on failure iio: imu: adis16400: fix memory leak virt: vbox: fix memory leak in hgcm_call_preprocess_linaddr net/mlx5: prevent memory leak in mlx5_fpga_conn_create_cq net/mlx5: fix memory leak in mlx5_fw_fatal_reporter_dump drm/v3d: Fix memory leak in v3d_submit_cl_ioctl of: unittest: fix memory leak in unittest_data_add usb: dwc3: pci: prevent memory leak in dwc3_pci_probe wimax: i2400: Fix memory leak in i2400m_op_rfkill_sw_toggle can: gs_usb: gs_can_open(): prevent memory leak Nayna Jain (1): sysfs: Fixes __BIN_ATTR_WO() macro Neil Armstrong (2): clk: meson: g12a: fix cpu clock rate setting clk: meson: g12a: set CLK_MUX_ROUND_CLOSEST on the cpu clock muxes Nicholas Nunley (1): iavf: initialize ITRN registers with correct values Nicholas Piggin (2): scsi: qla2xxx: stop timer in shutdown path powerpc/powernv: Fix CPU idle to be called with IRQs disabled Nick Desaulniers (4): parisc: prefer __section from compiler_attributes.h drm/amdgpu: fix stack alignment ABI mismatch for Clang drm/amdgpu: fix stack alignment ABI mismatch for GCC 7.1+ drm/amdgpu: enable -msse2 for GCC 7.1+ users Nicolas Boichat (1): HID: google: add magnemite/masterball USB ids Nicolas Dichtel (1): netns: fix NLM_F_ECHO mechanism for RTM_NEWNSID Nicolas Saenz Julienne (1): mmc: sdhci-iproc: fix spurious interrupts on Multiblock reads with bcm2711 Nicolin Chen (1): hwmon: (ina3221) Fix read timeout issue Nikhil Badola (1): usb: fsl: Check memory resource before releasing it Nikolay Aleksandrov (1): net: rtnetlink: fix a typo fbd -> fdb Nilkanth Ahirrao (1): ASoC: rsnd: fix DALIGN register for SSIU Nirmoy Das (1): drm/amdgpu: fix memory leak Nishad Kamdar (9): x86: Use the correct SPDX License Identifier in headers net: dsa: microchip: Use the correct style for SPDX License Identifier net: cavium: Use the correct style for SPDX License Identifier net: dsa: sja1105: Use the correct style for SPDX License Identifier net: ethernet: Use the correct style for SPDX License Identifier net: dpaa2: Use the correct style for SPDX License Identifier net: hns3: Use the correct style for SPDX License Identifier octeontx2-af: Use the correct style for SPDX License Identifier net: stmmac: Use the correct style for SPDX License Identifier Noralf Trønnes (3): staging/fbtft: Depend on OF staging/fbtft: Remove fbtft_device staging/fbtft: Remove flexfb Nuno Sá (1): hwmon: Fix HWMON_P_MIN_ALARM mask Okash Khawaja (1): staging: speakup: document sysfs attributes Oleg Nesterov (1): cgroup: freezer: call cgroup_enter_frozen() with preemption disabled in ptrace_stop() Oleksij Rempel (12): can: j1939: fix memory leak if filters was set can: j1939: transport: j1939_session_fresh_new(): make sure EOMA is send with the total message size set can: j1939: transport: j1939_xtp_rx_eoma_one(): Add sanity check for correct total message size can: af_can: export can_sock_destruct() can: j1939: move j1939_priv_put() into sk_destruct callback can: j1939: main: j1939_ndev_to_priv(): avoid crash if can_ml_priv is NULL can: j1939: socket: rework socket locking for j1939_sk_release() and j1939_sk_sendmsg() can: j1939: transport: make sure the aborted session will be deactivated only once can: j1939: make sure socket is held as long as session exists can: j1939: transport: j1939_cancel_active_session(): use hrtimer_try_to_cancel() instead of hrtimer_cancel() can: j1939: j1939_can_recv(): add priv refcounting can: j1939: warn if resources are still linked on destroy Oliver Neukum (5): scsi: sd: Ignore a failure to sync cache due to lack of authorization usb: hso: obey DMA rules in tiocmget CDC-NCM: handle incomplete transfer of MTU Input: ff-memless - kill timer in destroy() ax88172a: fix information leak on short answers Olof Johansson (16): Merge tag 'mvebu-fixes-5.4-1' of git://git.infradead.org/linux-mvebu into arm/fixes Merge tag 'arm-soc/for-5.4/devicetree-arm64-fixes' of https://github.com/Broadcom/stblinux into arm/fixes Merge tag 'omap-for-v5.4/fixes-rc3-signed' of git://git.kernel.org/.../tmlind/linux-omap into arm/fixes Merge tag 'imx-fixes-5.4' of git://git.kernel.org/.../shawnguo/linux into arm/fixes Merge tag 'v5.4-rockchip-dtsfixes1' of git://git.kernel.org/.../mmind/linux-rockchip into arm/fixes Merge tag 'davinci-fixes-for-v5.4' of git://git.kernel.org/.../nsekhar/linux-davinci into arm/fixes Merge tag 'arm-soc/for-5.4/devicetree-fixes' of https://github.com/Broadcom/stblinux into arm/fixes Merge tag 'arm-soc/for-5.4/devicetree-fixes-part2' of https://github.com/Broadcom/stblinux into arm/fixes Merge tag 'sunxi-fixes-for-5.4-1' of https://git.kernel.org/.../sunxi/linux into arm/fixes Merge tag 'omap-for-v5.4/fixes-rc4-signed' of git://git.kernel.org/.../tmlind/linux-omap into arm/fixes Merge tag 'arm-soc/for-5.5/maintainers' of https://github.com/Broadcom/stblinux into arm/fixes Merge tag 'reset-fixes-for-v5.5' of git://git.pengutronix.de/git/pza/linux into arm/fixes Merge tag 'imx-fixes-5.4-2' of git://git.kernel.org/.../shawnguo/linux into arm/fixes Merge tag 'sunxi-fixes-for-5.4-2' of https://git.kernel.org/.../sunxi/linux into arm/fixes Merge tag 'imx-fixes-5.4-3' of git://git.kernel.org/.../shawnguo/linux into arm/fixes Merge tag 'stm32-dt-for-v5.4-fixes-2' of git://git.kernel.org/.../atorgue/stm32 into arm/fixes Ondrej Jirman (2): ARM: dts: sun8i-a83t-tbs-a711: Fix WiFi resume from suspend ARM: sunxi: Fix CPU powerdown on A83T Ondrej Mosnacek (1): selinux: fix context string corruption in convert_context() Pablo Neira Ayuso (7): netfilter: nf_flow_table: set timeout before insertion into hashes netfilter: nf_tables_offload: restore basechain deletion Merge tag 'ipvs-fixes-for-v5.4' of https://git.kernel.org/.../horms/ipvs netfilter: nf_tables_offload: check for register data length mismatches netfilter: nf_tables: bogus EOPNOTSUPP on basechain update netfilter: nf_tables_offload: skip EBUSY on chain update Merge branch 'master' of git://blackhole.kfki.hu/nf Palmer Dabbelt (1): MAINTAINERS: Change to my personal email address Pan Bian (5): NFC: fdp: fix incorrect free object NFC: st21nfca: fix double free nfc: netlink: fix double device reference drop drm/i915/gvt: fix dropping obj reference twice Input: cyttsp4_core - fix use after free bug Paolo Abeni (2): ipv4: fix route update on metric change. selftests: fib_tests: add more tests for metric update Paolo Bonzini (8): kvm: clear kvmclock MSR on reset Merge tag 'kvmarm-fixes-5.4-2' of git://git.kernel.org/.../kvmarm/kvmarm into HEAD Merge tag 'kvm-ppc-fixes-5.4-1' of git://git.kernel.org/.../paulus/powerpc into HEAD KVM: vmx, svm: always run with EFER.NXE=1 when shadow paging is active kvm: mmu: ITLB_MULTIHIT mitigation KVM: Fix NULL-ptr deref after kvm_create_vm fails KVM: fix placement of refcount initialization kvm: x86: disable shattered huge page recovery for PREEMPT_RT. Paolo Valente (1): block, bfq: deschedule empty bfq_queues not referred by any process Parav Pandit (3): IB/core: Use rdma_read_gid_l2_fields to compare GID L2 fields IB/core: Avoid deadlock during netlink message handling net/mlx5: Fix rtable reference leak Pascal Bouwmann (1): iio: fix center temperature of bmc150-accel-core Patrice Chotard (2): ARM: dts: stm32: relax qspi pins slew-rate for stm32mp157 ARM: dts: stm32: relax qspi pins slew-rate for stm32mp157 Patrick Williams (2): pinctrl: armada-37xx: fix control of pins 32 and up pinctrl: armada-37xx: swap polarity on LED group Paul Burton (4): mtd: rawnand: au1550nd: Fix au_read_buf16() prototype MIPS: Disable Loongson MMI instructions for kernel build MAINTAINERS: Use @kernel.org address for Paul Burton MIPS: tlbex: Fix build_restore_pagemask KScratch restore Paul Walmsley (8): riscv: dts: HiFive Unleashed: add default chosen/stdout-path riscv: tlbflush: remove confusing comment on local_flush_tlb_all() riscv: add prototypes for assembly language functions from head.S riscv: init: merge split string literals in preprocessor directive riscv: mark some code and data as file-static riscv: add missing header file includes riscv: fp: add missing __user pointer annotations riscv: for C functions called only from assembly, mark with __visible Paulo Alcantara (SUSE) (1): cifs: Handle -EINPROGRESS only when noblockcnt is set Pavel Begunkov (7): io_uring: fix reversed nonblock flag for link submission io_uring: remove wait loop spurious wakeups io_uring: Fix corrupted user_data io_uring: Fix broken links with offloading io_uring: Fix race for sqes with userspace io_uring: Fix leaked shadow_req io_uring: Fix getting file for timeout Pavel Machek (1): Add my linux-leds branch to MAINTAINERS Pavel Shilovsky (6): CIFS: Gracefully handle QueryInfo errors during open CIFS: Force revalidate inode when dentry is stale CIFS: Force reval dentry if LOOKUP_REVAL flag is set CIFS: Fix retry mid list corruption on reconnects CIFS: Fix use after free of file info structures SMB3: Fix persistent handles reconnect Pavel Tatashin (1): arm64: hibernate: check pgd table allocation Pawan Gupta (9): x86/msr: Add the IA32_TSX_CTRL MSR x86/cpu: Add a helper function x86_read_arch_cap_msr() x86/cpu: Add a "tsx=" cmdline option with TSX disabled by default x86/speculation/taa: Add mitigation for TSX Async Abort x86/speculation/taa: Add sysfs reporting for TSX Async Abort kvm/x86: Export MDS_NO=0 to guests when TSX is enabled x86/tsx: Add "auto" option to the tsx= cmdline parameter x86/speculation/taa: Add documentation for TSX Async Abort x86/cpu: Add Tremont to the cpu vulnerability whitelist Pawel Harlozinski (1): ASoC: Jack: Fix NULL pointer dereference in snd_soc_jack_report Pawel Laszczak (4): usb: cdns3: Fix sheduling with locks held. usb:cdns3: Fix for CV CH9 running with g_zero driver. usb: cdns3: Fix for incorrect DMA mask. usb: cdns3: Fix dequeue implementation. Pelle van Gils (1): drm/amdgpu/powerplay/vega10: allow undervolting in p7 Peter Chen (1): usb: gadget: configfs: fix concurrent issue between composite APIs Peter Jones (2): efi/tpm: Don't access event->count when it isn't mapped efi/tpm: Don't traverse an event log with no events Peter Ujfalusi (8): ARM: davinci: dm365: Fix McBSP dma_slave_map entry clk: ti: dra7-atl-clock: Remove ti_clk_add_alias call ASoC: dmaengine: Use dma_request_chan() directly for channel request ASoC: ti: davinci-mcasp: Use dma_request_chan() directly for channel request ASoC: pcm3168a: Document optional RST gpio ASoC: pcm3168a: Add support for optional RST gpio handling ASoC: dt-bindings: pcm3168a: Update the optional RST gpio for clarity ASoC: pcm3168a: Update the RST gpio handling to align with documentation Peter Zijlstra (3): sched: Fix pick_next_task() vs 'change' pattern race sched/core: Avoid spurious lock dependencies perf/core: Disallow uncore-cgroup events Petr Mladek (1): tracing: Initialize iter->seq after zeroing in tracing_read_pipe() Philip Yang (1): drm/amdgpu: user pages array memory leak fix Philipp Zabel (4): reset: fix of_reset_simple_xlate kerneldoc comment reset: fix of_reset_control_get_count kerneldoc comment reset: fix reset_control_lookup kerneldoc comment reset: fix reset_control_get_exclusive kerneldoc comment Philippe Schenker (1): dt-bindings: fixed-regulator: fix compatible enum Pierre-Eric Pelloux-Prayer (1): drm/amdgpu/sdma5: do not execute 0-sized IBs (v2) Pierre-Louis Bossart (3): soundwire: slave: fix scanf format ASoC: Intel: acpi-match: split CNL tables in three ASoC: SOF: Intel: hda: use fallback for firmware name Potnuri Bharat Teja (3): RDMA/iw_cxgb4: fix SRQ access from dump_qp() iw_cxgb4: fix ECN check on the passive accept RDMA/iw_cxgb4: Avoid freeing skb twice in arp failure case Pragnesh Patel (1): media: dt-bindings: Fix building error for dt_binding_check Prateek Sood (1): tracing: Fix race in perf_trace_buf initialization Qais Yousef (2): sched/core: Fix compilation error when cgroup not selected sched/uclamp: Fix incorrect condition Qian Cai (3): mm/page_alloc.c: fix a crash in free_pages_prepare() mm/slub: fix a deadlock in show_slab_objects() mm/page_owner: don't access uninitialized memmaps when reading /proc/pagetypeinfo Qiang Yu (1): dma-buf/resv: fix exclusive fence get Qu Wenruo (6): btrfs: block-group: Fix a memory leak due to missing btrfs_put_block_group() btrfs: qgroup: Always free PREALLOC META reserve in btrfs_delalloc_release_extents() btrfs: tracepoints: Fix wrong parameter order for qgroup events btrfs: tracepoints: Fix bad entry members of qgroup events btrfs: Consider system chunk array size for new SYSTEM chunks btrfs: tree-checker: Fix wrong check on max devid Quinn Tran (1): scsi: qla2xxx: Fix partial flash write of MBI Radhey Shyam Pandey (2): dmaengine: xilinx_dma: Fix 64-bit simple AXIDMA transfer dmaengine: xilinx_dma: Fix control reg update in vdma_channel_set_config Rafael J. Wysocki (12): cpufreq: Avoid cpufreq_suspend() deadlock on system shutdown PCI: PM: Fix pci_power_up() ACPI: processor: Avoid NULL pointer dereferences at init time Merge branches 'pm-cpufreq' and 'pm-sleep' Merge branch 'acpi-tables' PM: QoS: Introduce frequency QoS cpufreq: Use per-policy frequency QoS PM: QoS: Drop frequency QoS types from device PM QoS Merge branch 'opp/fixes' of git://git.kernel.org/.../vireshk/pm Merge branches 'pm-cpuidle' and 'pm-opp' ACPI: processor: Add QoS requests for all CPUs Merge branch 'pm-cpufreq' Rafi Wiener (1): RDMA/mlx5: Clear old rate limit when closing QP Raju Rangoju (1): cxgb4: request the TX CIDX updates to status page Ralph Campbell (2): mm/debug.c: __dump_page() prints an extra line mm/debug.c: PageAnon() is true for PageKsm() pages Ran Wang (1): arm64: dts: lx2160a: Correct CPU core idle state name Randy Dunlap (14): serial: uartlite: fix exit path null pointer tty: n_hdlc: fix build on SPARC Doc: networking/device_drivers/pensando: fix ionic.rst warnings phylink: fix kernel-doc warnings serial: fix kernel-doc warning in comments fs/direct-io.c: fix kernel-doc warning fs/libfs.c: fix kernel-doc warning fs/fs-writeback.c: fix kernel-doc warning bitmap.h: fix kernel-doc warning and typo xarray.h: fix kernel-doc warning mm/slab.c: fix kernel-doc warning for __ksize() scripts: setlocalversion: fix a bashism net: ethernet: broadcom: have drivers select DIMLIB as needed reset: fix reset_control_ops kerneldoc comment Rayagonda Kokatanur (1): arm64: dts: Fix gpio to pinmux mapping Reinhard Speyerer (1): USB: serial: option: add support for Cinterion CLS8 devices Remi Pommarel (1): iio: adc: meson_saradc: Fix memory allocation order Richard Cochran (7): ptp: Validate requests to enable time stamping of external signals. ptp: Introduce strict checking of external time stamp options. mv88e6xxx: Reject requests to enable time stamping on both edges. dp83640: Reject requests to enable time stamping on both edges. igb: Reject requests that fail to enable time stamping on both edges. mlx5: Reject requests to enable time stamping on both edges. ptp: Extend the test program to check the external time stamp flags. Rick Tseng (1): usb: xhci: wait for CNR controller not ready bit in xhci resume Rob Clark (1): drm/atomic: fix self-refresh helpers crtc state dereference Rob Herring (4): xen: Stop abusing DT of_dma_configure API dt-bindings: riscv: Fix CPU schema errors drm/shmem: Add docbook comments for drm_gem_shmem_object madvise fields dt-bindings: vendor-prefixes: Add 'fsi[ab]' to the list of non-vendor prefixes Roberto Bergantinos Corpas (1): CIFS: avoid using MID 0xFFFF Robin Gong (1): dmaengine: imx-sdma: fix size check for sdma script_number Robin Murphy (3): iommu/io-pgtable-arm: Correct Mali attributes iommu/io-pgtable-arm: Support all Mali configurations drm/panfrost: Don't dereference bogus MMU pointers Rodrigo Vivi (1): Merge tag 'gvt-fixes-2019-11-12' of https://github.com/intel/gvt-linux into drm-intel-fixes Roger Quadros (5): usb: cdns3: gadget: Fix full-speed mode usb: cdns3: fix cdns3_core_init_role() usb: cdns3: Error out if USB_DR_MODE_UNKNOWN in cdns3_core_init_role() usb: cdns3: gadget: Don't manage pullups usb: cdns3: gadget: Fix g_audio use case when connected to Super-Speed host Roi Dayan (2): net/mlx5: Fix flow counter list auto bits struct net/mlx5e: Fix eswitch debug print of max fdb flow Roman Gushchin (4): mm: memcg/slab: fix panic in __free_slab() caused by premature memcg pointer release mm: slab: make page_cgroup_ino() to recognize non-compound slab pages properly mm: memcg: switch to css_tryget() in get_mem_cgroup_from_mm() mm: hugetlb: switch to css_tryget() in hugetlb_cgroup_charge_cgroup() Roman Kagan (1): x86/hyperv: Make vapic support x2apic mode Russell King (4): drivers/amba: fix reset control error handling ARM: mm: fix alignment handler faults under memory pressure ARM: mm: alignment: use "u32" for 32-bit instructions Merge branch 'misc' into fixes Sagi Grimberg (1): nvme: fix possible deadlock when nvme_update_formats fails Salil Mehta (2): net: hns: Fix the stray netpoll locks causing deadlock in NAPI path net: hns3: cleanup of stray struct hns3_link_mode_mapping Sameer Pujar (1): dmaengine: tegra210-adma: fix transfer failure Sami Tolvanen (1): x86/cpu/vmware: Use the full form of INL in VMWARE_PORT Samuel Holland (1): usb: xhci: fix Immediate Data Transfer endianness Sandeep Sheriker Mallikarjun (1): irqchip/atmel-aic5: Add support for sam9x60 irqchip Sanket Parmar (1): usb: cdns3: gadget: reset EP_CLAIMED flag while unloading Sara Sharon (1): cfg80211: fix a bunch of RCU issues in multi-bssid code Sascha Hauer (1): mmc: mxs: fix flags passed to dmaengine_prep_slave_sg Sean Christopherson (3): x86/apic/x2apic: Fix a NULL pointer deref when handling a dying cpu KVM: MMU: Do not treat ZONE_DEVICE pages as being reserved KVM: x86/mmu: Take slots_lock when using kvm_mmu_zap_all_fast() Sean Tranchetti (1): net: qualcomm: rmnet: Fix potential UAF when unregistering Sean Wang (1): net: Update address for MediaTek ethernet driver in MAINTAINERS Sebastian Andrzej Siewior (1): nvme-tcp: Initialize sk->sk_ll_usec only with NET_RX_BUSY_POLL Sebastian Reichel (1): ASoC: Add DA7213 audio codec as selectable option Shakeel Butt (1): mm: memcontrol: fix NULL-ptr deref in percpu stats flush Shannon Nelson (1): ionic: fix stats memory dereference Shengjiu Wang (4): arm64: dts: imx8mm: fix compatible string for sdma arm64: dts: imx8mn: fix compatible string for sdma ASoC: fsl_audmix: Add spin lock to protect tdms ASoC: soc-pcm: check symmetry before hw_params Shiraz, Saleem (1): RDMA/i40iw: Associate ibdev to netdev before IB device registration Shirish S (1): drm/amdgpu: dont schedule jobs while in reset Shuah Khan (3): tools: bpf: Use !building_out_of_srctree to determine srctree selftests: Add kselftest-all and kselftest-install targets tools: gpio: Use !building_out_of_srctree to determine srctree Shuming Fan (1): ASoC: rt5682: fix the charge pump capacitor discharges Shuning Zhang (1): ocfs2: protect extent tree in ocfs2_prepare_inode_for_write() Simon Arlott (1): mailmap: Add Simon Arlott (replacement for expired email address) Sirong Wang (1): RDMA/hns: Correct the value of HNS_ROCE_HEM_CHUNK_LEN Soeren Moch (3): arm64: dts: rockchip: fix RockPro64 vdd-log regulator settings arm64: dts: rockchip: fix RockPro64 sdhci settings arm64: dts: rockchip: fix RockPro64 sdmmc settings Song Liu (6): perf/core: Rework memory accounting in perf_mmap() perf/core: Fix corner case in perf_rotate_context() md/raid0: fix warning message for parameter default_layout kernel/events/uprobes.c: only do FOLL_SPLIT_PMD for uprobe register MAINTAINERS: update information for "MEMORY MANAGEMENT" mm,thp: recheck each page before collapsing file THP Srinivas Kandagatla (1): ASoC: qcom: q6asm: add support to flac config Srinivas Pandruvada (1): cpufreq: intel_pstate: Fix invalid EPB setting Srivatsa S. Bhat (VMware) (2): tracing/hwlat: Report total time spent in all NMIs during the sample tracing/hwlat: Don't ignore outer-loop duration when calculating max_latency Stanislaw Gruszka (1): rt2x00: initialize last_reset Stefan Popa (3): iio: accel: adxl372: Fix/remove limitation for FIFO samples iio: accel: adxl372: Fix push to buffers lost samples iio: accel: adxl372: Perform a reset at start up Stefan Wahren (3): MAINTAINERS: Add BCM2711 to BCM2835 ARCH ARM: dts: bcm2835-rpi-zero-w: Fix bus-width of sdhci ARM: dts: bcm2837-rpi-cm3: Avoid leds-gpio probing issue Stefan-gabriel Mirea (2): tty: serial: linflexuart: Fix magic SysRq handling tty: serial: Fix PORT_LINFLEXUART definition Stefano Brivio (2): ipv4: Return -ENETUNREACH if we can't create route but saddr is valid netfilter: ipset: Copy the right MAC address in hash:ip,mac IPv6 sets Stefano Garzarella (4): vsock/virtio: send a credit update when buffer size is changed vsock/virtio: discard packets if credit is not respected vsock/virtio: remove unused 'work' field from 'struct virtio_vsock_pkt' vsock/virtio: fix sock refcnt holding during the shutdown Steffen Klassert (1): xfrm: Fix memleak on xfrm state destroy Steffen Maier (3): scsi: core: fix missing .cleanup_rq for SCSI hosts without request batching scsi: core: fix dh and multipathing for SCSI hosts without request batching scsi: zfcp: fix reaction on bit error threshold notification Stephan Gerhold (1): NFC: nxp-nci: Fix NULL pointer dereference after I2C communication error Stephane Grosjean (1): can: peak_usb: fix a potential out-of-sync while decoding packets Stephen Boyd (3): Merge tag 'clk-meson-fixes-v5.4-1' of https://github.com/BayLibre/clk-meson into clk-fixes Merge tag 'sunxi-clk-fixes-for-5.4-1' of https://git.kernel.org/.../sunxi/linux into clk-fixes Merge tag 'clk-v5.4-samsung-fixes' of https://git.kernel.org/.../snawrocki/clk into clk-fixes Stephen Rothwell (1): powerpc/64s/radix: Fix build failure with RADIX_MMU=n Steve French (5): smb3: cleanup some recent endian errors spotted by updated sparse smb3: remove noisy debug message and minor cleanup smb3: Fix regression in time handling cifs: clarify comment about timestamp granularity for old servers fix memory leak in large read decrypt offload Steve MacLean (3): perf map: Fix overlapped map handling perf inject jit: Fix JIT_CODE_MOVE filename perf docs: Correct and clarify jitdump spec Steve Wahl (2): x86/boot/64: Make level2_kernel_pgt pages invalid outside kernel area x86/boot/64: Round memory hole size up to next PMD page Steven Price (2): drm/panfrost: Add missing GPU feature registers drm/panfrost: Handle resetting on timeout better Steven Rostedt (VMware) (10): tracefs: Revert ccbd54ff54e8 ("tracefs: Restrict tracefs when the kernel is locked down") ftrace: Get a reference counter for the trace_array on filter files tracing: Get trace_array reference for available_tracers files tracing: Have trace events system open call tracing_open_generic_tr() tracing: Add tracing_check_open_get_tr() tracing: Add locked_down checks to the open calls of files created for tracefs tracing: Do not create tracefs files if tracefs lockdown is in effect recordmcount: Fix nop_mcount() function perf scripting engines: Iterate on tep event arrays directly perf tools: Remove unused trace_find_next_event() Sudarsana Reddy Kalluru (1): qed: Optimize execution time for nvm attributes configuration. Sudeep Holla (1): cpufreq: Cancel policy update work scheduled before freeing Suman Anna (2): ARM: OMAP2+: Plug in device_enable/idle ops for IOMMUs ARM: OMAP2+: Add pdata for OMAP3 ISP IOMMU Suthikulpanit, Suravee (1): iommu/amd: Fix incorrect PASID decoding from event log Suwan Kim (1): usbip: Fix free of unallocated memory in vhci tx Sven Eckelmann (2): batman-adv: Avoid free/alloc race when handling OGM2 buffer batman-adv: Avoid free/alloc race when handling OGM buffer Sven Schnelle (2): parisc: Remove 32-bit DMA enforcement from sba_iommu parisc: fix frame pointer in ftrace_regs_caller() Taehee Yoo (12): net: core: limit nested device depth net: core: add generic lockdep keys bonding: fix unexpected IFF_BONDING bit unset bonding: use dynamic lockdep key instead of subclass team: fix nested locking lockdep warning macsec: fix refcnt leak in module exit routine net: core: add ignore flag to netdev_adjacent structure vxlan: add adjacent link to limit depth level net: remove unnecessary variables and callback virt_wifi: fix refcnt leak in module exit routine bonding: fix using uninitialized mode_lock vxlan: fix unexpected failure of vxlan_changelink() Takashi Iwai (3): staging: bcm2835-audio: Fix draining behavior regression iommu/amd: Apply the same IVRS IOAPIC workaround to Acer Aspire A315-41 ASoC: core: Fix compile warning with CONFIG_DEBUG_FS=n Takeshi Misawa (1): keys: Fix memory leak in copy_net_ns Talel Shenhar (1): irqchip/al-fic: Add support for irq retrigger Tariq Toukan (14): net/mlx5e: Tx, Fix assumption of single WQEBB of NOP in cleanup flow net/mlx5e: Tx, Zero-memset WQE info struct upon update net/mlx5e: kTLS, Release reference on DUMPed fragments in shutdown flow net/mlx5e: kTLS, Size of a Dump WQE is fixed net/mlx5e: kTLS, Save only the frag page to release at completion net/mlx5e: kTLS, Save by-value copy of the record frags net/mlx5e: kTLS, Fix page refcnt leak in TX resync error flow net/mlx5e: kTLS, Fix missing SQ edge fill net/mlx5e: kTLS, Limit DUMP wqe size net/mlx5e: kTLS, Remove unneeded cipher type checks net/mlx5e: kTLS, Save a copy of the crypto info net/mlx5e: kTLS, Enhance TX resync flow net/mlx5e: TX, Fix consumer index of error cqe dump Documentation: TLS: Add missing counter description Tejun Heo (6): writeback: fix use-after-free in finish_writeback_work() blkcg: Fix multiple bugs in blkcg_activate_policy() blk-rq-qos: fix first node deletion of rq_qos_del() net: fix sk_page_frag() recursion from memory reclaim blkcg: make blkcg_print_stat() print stats only for online blkgs cgroup,writeback: don't switch wbs immediately on dead wbs if the memcg is dead Tero Kristo (1): ARM: dts: omap5: fix gpu_cm clock provider name Thiago Jung Bauermann (1): powerpc/prom_init: Undo relocation before entering secure mode Thierry Reding (3): arm64: errata: Update stale comment gpio: max77620: Use correct unit for debounce times Revert "pwm: Let pwm_get_state() return the last implemented state" Thomas Bogendoerfer (7): MIPS: include: Mark __cmpxchg as __always_inline MIPS: include: Mark __xchg as __always_inline MIPS: fw: sni: Fix out of bounds init of o32 stack scsi: sni_53c710: fix compilation error scsi: fix kconfig dependency warning related to 53C700_LE_ON_BE net: i82596: fix dma_alloc_attr for sni_82596 MIPS: SGI-IP27: fix exception handler replication Thomas Gleixner (7): Merge tag 'irqchip-fixes-5.4-1' of git://git.kernel.org/.../maz/arm-platforms into irq/urgent lib/vdso: Make clock_getres() POSIX compliant again Merge tag 'irqchip-fixes-5.4-2' of git://git.kernel.org/.../maz/arm-platforms into irq/urgent Merge git://git.kernel.org/.../torvalds/linux Merge tag 'timers-v5.4-rc6' of https://git.linaro.org/people/daniel.lezcano/linux into timers/urgent x86/dumpstack/64: Don't evaluate exception stacks before setup Merge tag 'perf-urgent-for-mingo-5.4-20191105' of git://git.kernel.org/.../acme/linux into perf/urgent Thomas Hellstrom (3): drm/ttm: Restore ttm prefaulting x86/cpu/vmware: Use the full form of INL in VMWARE_HYPERCALL, for clang/llvm x86/cpu/vmware: Fix platform detection VMWARE_PORT macro Thomas Richter (4): perf vendor events s390: Add JSON transaction for machine type 8561 perf vendor events s390: Use s390 machine name instead of type 8561 perf jvmti: Link against tools/lib/ctype.h to have weak strlcpy() perf/aux: Fix tracking of auxiliary trace buffer allocation Tianci.Yin (4): drm/amdgpu/gfx10: update gfx golden settings drm/amdgpu/gfx10: update gfx golden settings for navi14 drm/amdgpu/gfx10: update gfx golden settings for navi12 drm/amdgpu: add navi14 PCI ID Timo Schlüßler (1): can: mcp251x: mcp251x_restart_work_handler(): Fix potential force_quit race condition Toke Høiland-Jørgensen (3): xdp: Prevent overflow in devmap_hash cost calculation for 32-bit builds xdp: Handle device unregister for devmap_hash map type net/fq_impl: Switch to kvmalloc() for memory allocation Tom Lendacky (1): perf/x86/amd: Change/fix NMI latency mitigation to use a timestamp Tomas Winkler (1): mei: me: add comet point (lake) LP device ids Tomeu Vizoso (1): panfrost: Properly undo pm_runtime_enable when deferring a probe Tomi Valkeinen (1): drm/bridge: tc358767: fix max_tu_symbol value Tony Lindgren (8): ARM: omap2plus_defconfig: Fix selected panels after generic panel changes Merge tag 'fix-missing-panels' into fixes ARM: dts: Use level interrupt for omap4 & 5 wlcore Merge tag 'wlcore-fix' into fixes bus: ti-sysc: Fix watchdog quirk handling Merge branch 'watchdog-fix' into fixes dmaengine: cppi41: Fix cppi41_dma_prep_slave_sg() when idle clk: ti: clkctrl: Fix failed to enable error with double udelay timeout Tony Lu (1): tcp: remove redundant new line from tcp_event_sk_skb Trond Myklebust (7): NFS: Fix O_DIRECT accounting of number of bytes read/written NFS: Remove redundant mirror tracking in O_DIRECT SUNRPC: The TCP back channel mustn't disappear while requests are outstanding SUNRPC: The RDMA back channel mustn't disappear while requests are outstanding SUNRPC: Destroy the back channel when we destroy the host transport NFSv4: Don't allow a cached open with a revoked delegation NFS: Fix an RCU lock leak in nfs4_refresh_delegation_stateid() Tudor Ambarus (1): mtd: spi-nor: Fix direction of the write_sr() transfer Tyler Hicks (1): cpu/speculation: Uninline and export CPU mitigations helpers Tzung-Bi Shih (1): ASoC: core: add SND_SOC_BYTES_E Ulf Magnusson (1): drm/tiny: Kconfig: Remove always-y THERMAL dep. from TINYDRM_REPAPER Ulrich Hecht (1): ravb: implement MTU change while device is up Uma Shankar (1): drm/i915: Lower RM timeout to avoid DSI hard hangs Ursula Braun (7): net/smc: fix SMCD link group creation with VLAN id net/smc: fix closing of fallback SMC sockets net/smc: keep vlan_id for SMC-R in smc_listen_work() net/smc: fix refcounting for non-blocking connect() net/smc: fix ethernet interface refcounting net/smc: fix refcount non-blocking connect() -part 2 net/smc: fix fastopen for non-blocking connect() Uwe Kleine-König (1): pwm: bcm-iproc: Prevent unloading the driver module while in use Valdis Kletnieks (1): staging: exfat - fix SPDX tags.. Valentin Schneider (3): RISC-V: entry: Remove unneeded need_resched() loop sched/topology: Don't try to build empty sched domains sched/topology: Allow sched_asym_cpucapacity to be disabled Valentin Vidic (1): net: usb: sr9800: fix uninitialized local variable Vasily Averin (1): fuse: redundant get_fuse_inode() calls in fuse_writepages_fill() Vasily Khoruzhick (1): arm64: dts: allwinner: a64: Drop PMU node Vasundhara Volam (4): bnxt_en: Fix the size of devlink MSIX parameters. bnxt_en: Adjust the time to wait before polling firmware readiness. bnxt_en: Minor formatting changes in FW devlink_health_reporter bnxt_en: Avoid disabling pci device in bnxt_remove_one() for already disabled device. Ville Syrjälä (4): drm/i915: Bump skl+ max plane width to 5k for linear/x-tiled drm/i915: Favor last VBT child device with conflicting AUX ch/DDC pin drm/i915: Fix PCH reference clock for FDI on HSW/BDW mm/khugepaged: fix might_sleep() warn with CONFIG_HIGHPTE=y Vinayak Menon (1): mm/page_io.c: do not free shared swap slots Vincent Chen (4): riscv: avoid kernel hangs when trapped in BUG() riscv: avoid sending a SIGTRAP to a user thread trapped in WARN() riscv: Correct the handling of unexpected ebreak in do_trap_break() riscv: remove the switch statement in do_trap_break() Vincent Guittot (1): sched/pelt: Fix update of blocked PELT ordering Vincent Prince (1): net: sch_generic: Use pfifo_fast as fallback scheduler for CAN hardware Vincenzo Frascino (6): arm64: vdso32: Fix broken compat vDSO build warnings arm64: vdso: Remove stale files from old assembly implementation arm64: vdso32: Detect binutils support for dmb ishld arm64: vdso32: Remove jump label config option in Makefile lib: vdso: Remove CROSS_COMPILE_COMPAT_VDSO mips: vdso: Fix __arch_get_hw_counter() Vineela Tummalapalli (1): x86/bugs: Add ITLB_MULTIHIT bug infrastructure Vinicius Costa Gomes (2): net: taprio: Fix returning EINVAL when configuring without flags sched: etf: Fix ordering of packets with same txtime Vinod Koul (2): ALSA: compress: add flac decoder params ASoC: qcom: q6asm-dai: add support to flac decoder Viresh Kumar (2): opp: of: drop incorrect lockdep_assert_held() opp: Reinitialize the list_kref before adding the static OPPs again Vishal Kulkarni (1): cxgb4: fix panic when attaching to ULD fail Vitaly Kuznetsov (6): selftests: kvm: synchronize .gitignore to Makefile selftests: kvm: vmx_set_nested_state_test: don't check for VMX support twice selftests: kvm: consolidate VMX support checks selftests: kvm: vmx_dirty_log_test: skip the test when VMX is not supported selftests: kvm: fix sync_regs_test with newer gccs selftests: kvm: fix build with glibc >= 2.30 Vitaly Wool (2): mm/z3fold.c: claim page in the beginning of free zswap: add Vitaly to the maintainers list Vivek Goyal (6): virtio-fs: Change module name to virtiofs.ko virtiofs: Do not end request in submission context virtiofs: No need to check fpq->connected state virtiofs: Set FR_SENT flag only after request has been sent virtiofs: Count pending forgets as in_flight forgets virtiofs: Retry request submission from worker context Vivek Unune (1): arm64: dts: rockchip: Fix usb-c on Hugsun X99 TV Box Vivien Didelot (1): net: dsa: fix switch tree list Vlad Buslov (2): net/mlx5e: Only skip encap flows update when encap init failed net/mlx5e: Don't store direct pointer to action's tunnel info Vladimir Murzin (1): ARM: 8914/1: NOMMU: Fix exc_ret for XIP Vladimir Oltean (4): net: mscc: ocelot: fix vlan_filtering when enslaving to bridge before link is up net: mscc: ocelot: refuse to overwrite the port's native vlan net: mscc: ocelot: fix __ocelot_rmw_ix prototype net: dsa: tag_8021q: Fix dsa_8021q_restore_pvid for an absent pvid Vlastimil Babka (6): mm, sl[ou]b: improve memory accounting mm, sl[aou]b: guarantee natural alignment for kmalloc(power-of-two) mm, page_owner: fix off-by-one error in __set_page_owner_handle() mm, page_owner: decouple freeing stack trace from debug_pagealloc mm, page_owner: rename flag indicating that page is allocated mm, compaction: fix wrong pfn handling in __reset_isolation_pfn() Wanpeng Li (1): KVM: Don't shrink/grow vCPU halt_poll_ns if host side polling is disabled Wei Wang (2): ipv4: fix race condition between route lookup and invalidation selftests: net: reuseport_dualstack: fix uninitalized parameter Wei Yongjun (3): xhci-ext-caps.c: Add missing platform_device_put() on error in xhci_create_intel_xhci_sw_pdev() intel_th: msu: Fix possible memory leak in mode_store() staging: Fix error return code in vboxsf_fill_super() Wen Yang (2): can: dev: add missing of_node_put() after calling of_get_child_by_name() i2c: core: fix use after free in of_i2c_notify Wenpeng Liang (1): RDMA/hns: Correct the value of srq_desc_size Wenwen Wang (1): e1000: fix memory leaks Will Deacon (13): arm64: Mark functions using explicit register variables as '__always_inline' mac80211: Reject malformed SSID elements cfg80211: wext: avoid copying malformed SSIDs arm64: Default to building compat vDSO with clang when CONFIG_CC_IS_CLANG arm64: vdso32: Move definition of COMPATCC into vdso32/Makefile arm64: vdso32: Don't use KBUILD_CPPFLAGS unconditionally arm64: vdso32: Pass '--target' option to clang via VDSO_CAFLAGS arm64: vdso32: Rename COMPATCC to CC_COMPAT arm64: Kconfig: Make CONFIG_COMPAT_VDSO a proper Kconfig option panic: ensure preemption is disabled during panic() arm64: tags: Preserve tags for addresses translated via TTBR1 Merge branch 'errata/tx2-219' into for-next/fixes fjes: Handle workqueue allocation failure William Kucharski (1): mm/vmscan.c: support removing arbitrary sized pages from mapping Xiang Chen (1): scsi: sd: define variable dif as unsigned int instead of bool Xiaochen Shen (2): x86/resctrl: Prevent NULL pointer dereference when reading mondata x86/resctrl: Fix potential lockdep warning Xiaodong Xu (1): xfrm: release device reference for invalid state Xiaojie Yuan (2): drm/amdgpu/sdma5: fix mask value of POLL_REGMEM packet for pipe sync drm/amdgpu: fix null pointer deref in firmware header printing Xiaoyao Li (1): KVM: X86: Reset the three MSR list number variables to 0 in kvm_init_msr_list() Xin Long (4): sctp: add chunks to sk_backlog when the newsk sk_socket is not set sctp: change sctp_prot .no_autobind with true erspan: fix the tun_info options_len check for erspan vxlan: check tun_info options_len properly Xingyu Chen (1): watchdog: meson: Fix the wrong value of left time Xiubo Li (1): nbd: fix possible sysfs duplicate warning Xuewei Zhang (1): sched/fair: Scale bandwidth quota and period without losing quota/period ratio precision Yang Shi (2): mm: thp: handle page cache THP correctly in PageTransCompoundMap mm: mempolicy: fix the wrong return value and potential pages leak of mbind Yang Yingliang (1): arm64: sysreg: fix incorrect definition of SYS_PAR_EL1_F Yangchun Fu (1): gve: Fixes DMA synchronization. Yash Shah (1): RISC-V: Add PCIe I/O BAR memory mapping Yauhen Kharuzhy (1): Input: goodix - add support for 9-bytes reports Yegor Yefremov (1): can: don't use deprecated license identifiers Yi Li (1): ocfs2: fix panic due to ocfs2_wq is null Yi Wang (5): mm: fix -Wmissing-prototypes warnings net: sched: taprio: fix -Wmissing-prototypes warnings posix-cpu-timers: Fix two trivial comments drm/panfrost: fix -Wmissing-prototypes warnings irq/irqdomain: Update __irq_domain_alloc_fwnode() function documentation Yihui ZENG (1): s390/cmm: fix information leak in cmm_timeout_handler() Yinbo Zhu (1): usb: dwc3: remove the call trace of USBx_GFLADJ Yizhuo (1): regulator: pfuze100-regulator: Variable "val" in pfuze100_regulator_probe() could be uninitialized Yonghong Song (1): libbpf: handle symbol versioning properly for libbpf.a Yonglong Liu (3): net: phy: Fix "link partner" information disappear issue net: hns3: fix mis-counting IRQ vector numbers issue net: hns3: fix ETS bandwidth validation bug Yoshihiro Shimoda (4): usb: renesas_usbhs: gadget: Do not discard queues in usb_ep_set_{halt,wedge}() usb: renesas_usbhs: gadget: Fix usb_ep_set_{halt,wedge}() behavior usb: gadget: udc: renesas_usb3: Fix __le16 warnings usb: renesas_usbhs: Fix warnings in usbhsg_recip_handler_std_set_device() Yu-Hsuan Hsu (1): ASoC: Intel: kbl_rt5663_rt5514_max98927: Add dmic format constraint Yuantian Tang (1): arm64: dts: ls1028a: fix a compatible issue YueHaibing (8): scripts: add_namespace: Fix coccicheck failed dm clone: Make __hash_find static act_mirred: Fix mirred_init_module error handling w1: ds250x: Fix build error without CRC16 netdevsim: Fix error handling in nsim_fib_init and nsim_fib_exit iommu/ipmmu-vmsa: Remove dev_err() on platform_get_irq() failure staging: vboxsf: Remove unused including <linux/version.h> mdio_bus: Fix PTR_ERR applied after initialization to constant Yufen Yu (1): scsi: core: try to get module before removing device Yunfeng Ye (4): arm64: armv8_deprecated: Checking return value for memory allocation perf tools: Fix resource leak of closedir() on the error paths perf c2c: Fix memory leak in build_cl_output() perf kmem: Fix memory leak in compact_gfp_flags() Yunhao Tian (1): drm/sun4i: tcon: Set min division of TCON0_DCLK to 1. Yunsheng Lin (1): net: hns3: reallocate SSU' buffer size when pfc_en changes Zenghui Yu (2): irqchip/gic-v3: Fix GIC_LINE_NR accessor irqchip/gic-v3-its: Use the exact ITSList for VMOVP Zhan Liu (2): drm/amd/display: Add ENGINE_ID_DIGD condition check for Navi14 Revert "drm/amd/display: setting the DIG_MODE to the correct value." Zhan liu (2): drm/amd/display: Change Navi14's DWB flag to 1 drm/amd/display: setting the DIG_MODE to the correct value. Zhang Lixu (1): HID: intel-ish-hid: fix wrong error handling in ishtp_cl_alloc_tx_ring() ZhangXiaoxu (1): nfs: Fix nfsi->nrequests count error on nfs_inode_remove_request Zhenfang Wang (1): dmaengine: sprd: Fix the link-list pointer register configuration issue Zhengjun Xing (1): tracing: Fix "gfp_t" format for synthetic events Zhenzhong Duan (2): x86/boot/acpi: Move get_cmdline_acpi_rsdp() under #ifdef guard cpuidle: haltpoll: Take 'idle=' override into account Zygo Blaxell (1): btrfs: fix balance convert to single on 32-bit host CPUs afzal mohammed (1): ARM: 8926/1: v7m: remove register save to stack before svc amy.shih (3): hwmon: (nct7904) Fix the incorrect value of vsen_mask in nct7904_data struct hwmon: (nct7904) Add array fan_alarm and vsen_alarm to store the alarms in nct7904_data struct. hwmon: (nct7904) Fix the incorrect value of vsen_mask & tcpu_mask & temp_mode in nct7904_data struct. changzhu (2): drm/amdgpu: add dummy read by engines for some GCVM status registers in gfx10 drm/amdgpu: add warning for GRBM 1-cycle delay issue in gfx9 chen gong (1): drm/amdgpu: Fix SDMA hang when performing VKexample test kbuild test robot (2): KVM: x86: fix bugon.cocci warnings ASoC: rt5677: rt5677_check_hotword() can be static wenxu (1): netfilter: nft_payload: fix missing check for matching length in offloads yangerkun (2): io_uring: consider the overflow of sequence for timeout req io_uring: fix logic error in io_timeout yu kuai (1): platform/x86: classmate-laptop: remove unused variable yuqi jin (1): net: stmmac: Fix the problem of tso_xmit zhanglin (1): net: Zeroing the structure ethtool_wolinfo in ethtool_get_wol() zhangyi (F) (2): io_uring : correct timeout req sequence when waiting timeout io_uring: correct timeout req sequence when inserting a new entry zhengbin (1): virtiofs: Remove set but not used variable 'fc' zhong jiang (2): iio: Fix an undefied reference error in noa1305_probe mm: fix trying to reclaim unevictable lru page when calling madvise_pageout zhongshiqi (1): dc.c:use kzalloc without test .mailmap | 8 +- CREDITS | 4 + Documentation/ABI/testing/sysfs-devices-system-cpu | 2 + Documentation/admin-guide/cgroup-v2.rst | 20 +- Documentation/admin-guide/hw-vuln/index.rst | 2 + Documentation/admin-guide/hw-vuln/multihit.rst | 163 +++ .../admin-guide/hw-vuln/tsx_async_abort.rst | 276 +++++ Documentation/admin-guide/kernel-parameters.txt | 96 ++ Documentation/arm64/memory.rst | 9 +- Documentation/arm64/silicon-errata.rst | 9 +- Documentation/core-api/index.rst | 1 + Documentation/core-api/memory-allocation.rst | 4 + .../symbol-namespaces.rst} | 0 Documentation/dev-tools/kasan.rst | 3 + Documentation/dev-tools/kselftest.rst | 16 + .../devicetree/bindings/arm/rockchip.yaml | 4 +- .../bindings/interrupt-controller/atmel,aic.txt | 7 +- .../bindings/media/allwinner,sun4i-a10-csi.yaml | 9 +- .../bindings/pinctrl/aspeed,ast2600-pinctrl.yaml | 86 +- .../bindings/regulator/fixed-regulator.yaml | 4 +- Documentation/devicetree/bindings/riscv/cpus.yaml | 29 +- .../bindings/serial/renesas,sci-serial.txt | 2 + .../devicetree/bindings/sound/adi,adau7118.yaml | 85 ++ .../bindings/sound/allwinner,sun4i-a10-codec.yaml | 267 +++++ .../sound/allwinner,sun8i-a23-codec-analog.yaml | 38 + .../devicetree/bindings/sound/arndale.txt | 5 +- .../devicetree/bindings/sound/fsl,mqs.txt | 36 + .../bindings/sound/google,cros-ec-codec.txt | 24 +- .../devicetree/bindings/sound/mt8183-afe-pcm.txt | 6 + .../sound/mt8183-mt6358-ts3a227-max98357.txt | 7 +- .../devicetree/bindings/sound/renesas,fsi.txt | 31 - .../devicetree/bindings/sound/renesas,fsi.yaml | 76 ++ .../devicetree/bindings/sound/renesas,rsnd.txt | 1 + .../bindings/sound/rockchip-max98090.txt | 27 +- Documentation/devicetree/bindings/sound/rt1011.txt | 10 + Documentation/devicetree/bindings/sound/rt5682.txt | 6 + .../devicetree/bindings/sound/samsung,odroid.txt | 54 - .../devicetree/bindings/sound/samsung,odroid.yaml | 91 ++ .../devicetree/bindings/sound/samsung-i2s.txt | 84 -- .../devicetree/bindings/sound/samsung-i2s.yaml | 138 +++ .../devicetree/bindings/sound/sun4i-codec.txt | 94 -- .../bindings/sound/sun8i-codec-analog.txt | 17 - .../devicetree/bindings/sound/tas2562.txt | 34 + .../devicetree/bindings/sound/tas2770.txt | 37 + .../devicetree/bindings/sound/ti,pcm3168a.txt | 8 + .../devicetree/bindings/sound/tlv320aic31xx.txt | 5 + .../devicetree/bindings/usb/amlogic,dwc3.txt | 4 +- .../devicetree/bindings/usb/generic-ehci.yaml | 7 +- .../devicetree/bindings/usb/generic-ohci.yaml | 7 +- .../devicetree/bindings/usb/mediatek,mtk-xhci.txt | 4 +- .../devicetree/bindings/usb/mediatek,mtu3.txt | 4 +- Documentation/devicetree/bindings/usb/usb-hcd.yaml | 5 + Documentation/devicetree/bindings/usb/usb-uhci.txt | 2 +- Documentation/devicetree/bindings/usb/usb-xhci.txt | 4 +- .../devicetree/bindings/vendor-prefixes.yaml | 2 +- Documentation/hwmon/index.rst | 1 + Documentation/hwmon/inspur-ipsps1.rst | 2 +- Documentation/hwmon/k10temp.rst | 18 +- .../networking/device_drivers/intel/e100.rst | 14 +- .../networking/device_drivers/intel/e1000.rst | 12 +- .../networking/device_drivers/intel/e1000e.rst | 14 +- .../networking/device_drivers/intel/fm10k.rst | 10 +- .../networking/device_drivers/intel/i40e.rst | 8 +- .../networking/device_drivers/intel/iavf.rst | 8 +- .../networking/device_drivers/intel/ice.rst | 6 +- .../networking/device_drivers/intel/igb.rst | 12 +- .../networking/device_drivers/intel/igbvf.rst | 6 +- .../networking/device_drivers/intel/ixgbe.rst | 10 +- .../networking/device_drivers/intel/ixgbevf.rst | 6 +- .../networking/device_drivers/pensando/ionic.rst | 10 +- Documentation/networking/ip-sysctl.txt | 11 +- Documentation/networking/net_dim.txt | 36 +- Documentation/networking/tls-offload.rst | 4 + Documentation/process/coding-style.rst | 2 +- Documentation/process/deprecated.rst | 33 +- Documentation/usb/rio.rst | 109 -- Documentation/x86/index.rst | 1 + Documentation/x86/tsx_async_abort.rst | 117 ++ MAINTAINERS | 66 +- Makefile | 16 +- arch/arc/boot/dts/hsdk.dts | 23 + arch/arc/configs/hsdk_defconfig | 6 + arch/arc/kernel/perf_event.c | 4 +- arch/arm/boot/dts/am3874-iceboard.dts | 9 +- arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | 1 + arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi | 8 + arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi | 4 + arch/arm/boot/dts/imx6-logicpd-som.dtsi | 4 + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 8 + arch/arm/boot/dts/imx7s.dtsi | 8 +- arch/arm/boot/dts/logicpd-torpedo-som.dtsi | 4 + arch/arm/boot/dts/mt7629-rfb.dts | 13 +- arch/arm/boot/dts/mt7629.dtsi | 2 - arch/arm/boot/dts/omap4-droid4-xt894.dts | 2 +- arch/arm/boot/dts/omap4-panda-common.dtsi | 2 +- arch/arm/boot/dts/omap4-sdp.dts | 2 +- arch/arm/boot/dts/omap4-var-som-om44-wlan.dtsi | 2 +- arch/arm/boot/dts/omap5-board-common.dtsi | 2 +- arch/arm/boot/dts/omap54xx-clocks.dtsi | 2 +- arch/arm/boot/dts/stm32mp157-pinctrl.dtsi | 8 +- arch/arm/boot/dts/stm32mp157c-ev1.dts | 13 +- arch/arm/boot/dts/stm32mp157c.dtsi | 4 +- arch/arm/boot/dts/sun4i-a10.dtsi | 4 + arch/arm/boot/dts/sun5i.dtsi | 2 + arch/arm/boot/dts/sun6i-a31.dtsi | 4 + arch/arm/boot/dts/sun7i-a20.dtsi | 9 +- arch/arm/boot/dts/sun8i-a23-a33.dtsi | 2 + arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts | 1 + arch/arm/boot/dts/sun8i-a83t.dtsi | 3 + arch/arm/boot/dts/sun8i-r40.dtsi | 4 + arch/arm/boot/dts/sun9i-a80.dtsi | 5 + arch/arm/boot/dts/sunxi-h3-h5.dtsi | 6 + arch/arm/boot/dts/vf610-zii-scu4-aib.dts | 2 + arch/arm/configs/badge4_defconfig | 1 - arch/arm/configs/corgi_defconfig | 1 - arch/arm/configs/davinci_all_defconfig | 1 + arch/arm/configs/imx_v6_v7_defconfig | 1 + arch/arm/configs/omap2plus_defconfig | 12 +- arch/arm/configs/pxa_defconfig | 1 - arch/arm/configs/s3c2410_defconfig | 1 - arch/arm/configs/spitz_defconfig | 1 - arch/arm/crypto/Kconfig | 1 + arch/arm/crypto/aes-ce-core.S | 1 + arch/arm/include/asm/domain.h | 8 +- arch/arm/include/asm/uaccess.h | 4 +- arch/arm/kernel/head-common.S | 5 +- arch/arm/kernel/head-nommu.S | 2 + arch/arm/mach-davinci/dm365.c | 4 +- arch/arm/mach-omap2/pdata-quirks.c | 11 + arch/arm/mach-sunxi/mc_smp.c | 6 +- arch/arm/mm/alignment.c | 70 +- arch/arm/mm/proc-v7m.S | 6 +- arch/arm64/Kconfig | 32 +- arch/arm64/Makefile | 16 - .../boot/dts/allwinner/sun50i-a64-pine64-plus.dts | 9 + .../boot/dts/allwinner/sun50i-a64-pinebook.dts | 2 + .../dts/allwinner/sun50i-a64-sopine-baseboard.dts | 6 + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 11 +- arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 2 + .../dts/broadcom/stingray/stingray-pinctrl.dtsi | 5 +- .../arm64/boot/dts/broadcom/stingray/stingray.dtsi | 3 +- arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts | 2 +- arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 36 +- arch/arm64/boot/dts/freescale/imx8mm.dtsi | 12 +- arch/arm64/boot/dts/freescale/imx8mn.dtsi | 12 +- .../arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi | 6 +- arch/arm64/boot/dts/freescale/imx8mq.dtsi | 4 +- .../boot/dts/marvell/armada-3720-turris-mox.dts | 13 +- arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts | 2 +- arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts | 4 +- arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts | 12 +- arch/arm64/include/asm/asm-uaccess.h | 7 +- arch/arm64/include/asm/atomic_lse.h | 6 +- arch/arm64/include/asm/cpucaps.h | 4 +- arch/arm64/include/asm/cputype.h | 2 + arch/arm64/include/asm/memory.h | 10 +- arch/arm64/include/asm/pgtable-prot.h | 15 +- arch/arm64/include/asm/pgtable.h | 20 - arch/arm64/include/asm/sysreg.h | 2 +- arch/arm64/include/asm/vdso/compat_barrier.h | 2 +- arch/arm64/include/asm/vdso/vsyscall.h | 7 - arch/arm64/include/asm/vdso_datapage.h | 33 - arch/arm64/kernel/armv8_deprecated.c | 5 + arch/arm64/kernel/cpu_errata.c | 101 +- arch/arm64/kernel/cpufeature.c | 16 +- arch/arm64/kernel/entry.S | 9 +- arch/arm64/kernel/ftrace.c | 12 +- arch/arm64/kernel/hibernate.c | 9 +- arch/arm64/kernel/process.c | 50 +- arch/arm64/kernel/vdso32/Makefile | 44 +- arch/arm64/kvm/hyp/switch.c | 69 +- arch/arm64/kvm/sys_regs.c | 4 + arch/arm64/mm/fault.c | 19 +- arch/mips/bcm63xx/prom.c | 2 +- arch/mips/configs/mtx1_defconfig | 1 - arch/mips/configs/rm200_defconfig | 1 - arch/mips/fw/sni/sniprom.c | 2 +- arch/mips/include/asm/bmips.h | 10 +- arch/mips/include/asm/cmpxchg.h | 9 +- arch/mips/include/asm/vdso/gettimeofday.h | 4 +- arch/mips/include/asm/vdso/vsyscall.h | 7 - arch/mips/include/uapi/asm/hwcap.h | 11 + arch/mips/kernel/cpu-probe.c | 33 + arch/mips/kernel/smp-bmips.c | 8 +- arch/mips/loongson64/Platform | 4 + arch/mips/mm/tlbex.c | 23 +- arch/mips/sgi-ip27/Kconfig | 7 - arch/mips/sgi-ip27/ip27-init.c | 21 +- arch/mips/sgi-ip27/ip27-memory.c | 4 - arch/mips/vdso/Makefile | 1 + arch/parisc/include/asm/cache.h | 2 +- arch/parisc/include/asm/ldcw.h | 2 +- arch/parisc/kernel/entry.S | 2 +- arch/parisc/mm/ioremap.c | 12 +- arch/powerpc/include/asm/book3s/32/kup.h | 1 + .../powerpc/include/asm/book3s/64/tlbflush-radix.h | 4 + arch/powerpc/include/asm/elf.h | 3 + arch/powerpc/kernel/prom_init.c | 13 + arch/powerpc/kernel/prom_init_check.sh | 3 +- arch/powerpc/kvm/book3s_hv_rmhandlers.S | 1 + arch/powerpc/kvm/book3s_xive.c | 24 +- arch/powerpc/kvm/book3s_xive.h | 12 + arch/powerpc/kvm/book3s_xive_native.c | 6 +- arch/powerpc/net/bpf_jit_comp64.c | 13 + arch/powerpc/platforms/cell/spufs/inode.c | 1 + arch/powerpc/platforms/powernv/eeh-powernv.c | 2 +- arch/powerpc/platforms/powernv/smp.c | 53 +- arch/powerpc/platforms/pseries/lpar.c | 3 + .../riscv/boot/dts/sifive/hifive-unleashed-a00.dts | 1 + arch/riscv/include/asm/bug.h | 16 +- arch/riscv/include/asm/io.h | 7 + arch/riscv/include/asm/irq.h | 3 + arch/riscv/include/asm/pgtable.h | 28 +- arch/riscv/include/asm/switch_to.h | 1 + arch/riscv/include/asm/tlbflush.h | 4 - arch/riscv/kernel/cpufeature.c | 1 + arch/riscv/kernel/entry.S | 3 +- arch/riscv/kernel/head.h | 21 + arch/riscv/kernel/irq.c | 2 +- arch/riscv/kernel/module-sections.c | 1 + arch/riscv/kernel/process.c | 2 + arch/riscv/kernel/ptrace.c | 4 +- arch/riscv/kernel/reset.c | 1 + arch/riscv/kernel/setup.c | 2 + arch/riscv/kernel/signal.c | 8 +- arch/riscv/kernel/smp.c | 2 + arch/riscv/kernel/smpboot.c | 5 +- arch/riscv/kernel/syscall_table.c | 1 + arch/riscv/kernel/time.c | 1 + arch/riscv/kernel/traps.c | 31 +- arch/riscv/kernel/vdso.c | 3 +- arch/riscv/mm/context.c | 1 + arch/riscv/mm/fault.c | 2 + arch/riscv/mm/init.c | 7 +- arch/riscv/mm/sifive_l2_cache.c | 2 +- arch/s390/boot/startup.c | 14 +- arch/s390/include/asm/uaccess.h | 4 +- arch/s390/include/asm/unwind.h | 1 + arch/s390/kernel/idle.c | 29 +- arch/s390/kernel/machine_kexec_reloc.c | 1 + arch/s390/kernel/unwind_bc.c | 18 +- arch/s390/mm/cmm.c | 12 +- arch/sparc/Kconfig | 1 - arch/sparc/vdso/Makefile | 4 +- arch/um/drivers/ubd_kern.c | 8 +- arch/x86/Kconfig | 45 + arch/x86/boot/compressed/acpi.c | 48 +- arch/x86/boot/compressed/eboot.c | 4 +- arch/x86/boot/compressed/misc.c | 25 +- arch/x86/events/amd/core.c | 30 +- arch/x86/events/amd/ibs.c | 8 +- arch/x86/events/intel/core.c | 4 + arch/x86/events/intel/cstate.c | 44 +- arch/x86/events/intel/pt.c | 2 +- arch/x86/events/intel/uncore.c | 44 +- arch/x86/events/intel/uncore.h | 12 - arch/x86/events/msr.c | 7 + arch/x86/hyperv/hv_apic.c | 20 +- arch/x86/include/asm/cpu_entry_area.h | 2 +- arch/x86/include/asm/cpufeatures.h | 2 + arch/x86/include/asm/intel-family.h | 3 + arch/x86/include/asm/kvm_host.h | 8 +- arch/x86/include/asm/msr-index.h | 16 + arch/x86/include/asm/mwait.h | 2 +- arch/x86/include/asm/nospec-branch.h | 4 +- arch/x86/include/asm/processor.h | 7 + arch/x86/include/asm/pti.h | 2 +- arch/x86/include/asm/uaccess.h | 23 + arch/x86/include/asm/vmware.h | 14 +- arch/x86/kernel/apic/apic.c | 28 +- arch/x86/kernel/apic/x2apic_cluster.c | 3 +- arch/x86/kernel/cpu/Makefile | 2 +- arch/x86/kernel/cpu/bugs.c | 159 ++- arch/x86/kernel/cpu/common.c | 99 +- arch/x86/kernel/cpu/cpu.h | 18 + arch/x86/kernel/cpu/intel.c | 5 + arch/x86/kernel/cpu/mshyperv.c | 4 + arch/x86/kernel/cpu/resctrl/ctrlmondata.c | 4 + arch/x86/kernel/cpu/resctrl/rdtgroup.c | 4 - arch/x86/kernel/cpu/tsx.c | 140 +++ arch/x86/kernel/cpu/vmware.c | 2 +- arch/x86/kernel/dumpstack_64.c | 7 + arch/x86/kernel/early-quirks.c | 2 + arch/x86/kernel/head64.c | 22 +- arch/x86/kernel/process.h | 2 +- arch/x86/kernel/tsc.c | 3 + arch/x86/kvm/cpuid.c | 2 +- arch/x86/kvm/lapic.c | 5 - arch/x86/kvm/lapic.h | 5 + arch/x86/kvm/mmu.c | 282 ++++- arch/x86/kvm/mmu.h | 4 + arch/x86/kvm/paging_tmpl.h | 29 +- arch/x86/kvm/svm.c | 16 +- arch/x86/kvm/vmx/nested.c | 64 +- arch/x86/kvm/vmx/nested.h | 13 +- arch/x86/kvm/vmx/vmx.c | 49 +- arch/x86/kvm/vmx/vmx.h | 11 + arch/x86/kvm/x86.c | 118 +- arch/x86/lib/delay.c | 4 +- arch/x86/platform/efi/efi.c | 3 - arch/x86/xen/enlighten.c | 28 +- arch/x86/xen/enlighten_pv.c | 8 + arch/xtensa/boot/dts/virt.dts | 2 +- arch/xtensa/include/asm/bitops.h | 2 +- arch/xtensa/include/asm/uaccess.h | 94 +- arch/xtensa/kernel/xtensa_ksyms.c | 7 - block/bfq-iosched.c | 32 +- block/bio.c | 2 +- block/blk-cgroup.c | 82 +- block/blk-iocost.c | 12 +- block/blk-rq-qos.c | 14 +- block/blk-rq-qos.h | 17 +- block/blk-wbt.c | 6 +- block/elevator.c | 3 +- drivers/acpi/cppc_acpi.c | 2 +- drivers/acpi/hmat/hmat.c | 2 +- drivers/acpi/nfit/core.c | 2 +- drivers/acpi/processor_driver.c | 9 +- drivers/acpi/processor_perflib.c | 40 +- drivers/acpi/processor_thermal.c | 42 +- drivers/acpi/sleep.c | 13 - drivers/amba/bus.c | 14 +- drivers/android/binder.c | 11 +- drivers/android/binder_alloc.c | 8 +- drivers/android/binder_internal.h | 2 +- drivers/ata/ahci.c | 4 +- drivers/ata/libahci_platform.c | 38 +- drivers/ata/libata-scsi.c | 21 - drivers/base/core.c | 3 + drivers/base/cpu.c | 17 + drivers/base/memory.c | 39 + drivers/base/platform.c | 46 +- drivers/base/power/qos.c | 70 +- drivers/block/drbd/drbd_main.c | 1 - drivers/block/nbd.c | 43 +- drivers/block/null_blk_zoned.c | 3 +- drivers/block/rbd.c | 11 +- drivers/block/rsxx/core.c | 2 + drivers/block/zram/zram_drv.c | 5 +- drivers/bus/ti-sysc.c | 18 +- drivers/char/hw_random/core.c | 5 +- drivers/char/random.c | 4 +- drivers/clk/at91/clk-main.c | 5 +- drivers/clk/at91/sam9x60.c | 1 + drivers/clk/at91/sckc.c | 20 +- drivers/clk/clk-ast2600.c | 7 +- drivers/clk/imx/clk-imx8mm.c | 2 +- drivers/clk/imx/clk-imx8mn.c | 2 +- drivers/clk/meson/g12a.c | 13 +- drivers/clk/meson/gxbb.c | 1 + drivers/clk/samsung/clk-exynos5420.c | 27 +- drivers/clk/samsung/clk-exynos5433.c | 14 +- drivers/clk/sunxi-ng/ccu-sun9i-a80.c | 2 +- drivers/clk/sunxi/clk-sunxi.c | 4 +- drivers/clk/ti/clk-dra7-atl.c | 6 - drivers/clk/ti/clkctrl.c | 5 +- drivers/clocksource/sh_mtu2.c | 16 +- drivers/clocksource/timer-mediatek.c | 10 +- drivers/cpufreq/cpufreq.c | 72 +- drivers/cpufreq/intel_pstate.c | 34 +- drivers/cpufreq/ppc_cbe_cpufreq_pmi.c | 15 +- drivers/cpuidle/cpuidle-haltpoll.c | 4 + drivers/crypto/chelsio/chtls/chtls_cm.c | 2 +- drivers/crypto/chelsio/chtls/chtls_io.c | 2 +- drivers/dma-buf/dma-resv.c | 2 +- drivers/dma/imx-sdma.c | 8 + drivers/dma/qcom/bam_dma.c | 19 + drivers/dma/sprd-dma.c | 27 +- drivers/dma/tegra210-adma.c | 7 + drivers/dma/ti/cppi41.c | 21 +- drivers/dma/xilinx/xilinx_dma.c | 10 +- drivers/edac/ghes_edac.c | 4 + drivers/firmware/dmi_scan.c | 2 +- drivers/firmware/efi/Kconfig | 1 + drivers/firmware/efi/cper.c | 2 +- drivers/firmware/efi/efi.c | 5 +- drivers/firmware/efi/libstub/Makefile | 1 + drivers/firmware/efi/libstub/arm32-stub.c | 16 +- drivers/firmware/efi/libstub/efi-stub-helper.c | 24 +- drivers/firmware/efi/rci2-table.c | 2 +- drivers/firmware/efi/test/efi_test.c | 8 + drivers/firmware/efi/tpm.c | 27 +- drivers/firmware/google/vpd_decode.c | 2 +- drivers/gpio/gpio-eic-sprd.c | 7 +- drivers/gpio/gpio-intel-mid.c | 9 +- drivers/gpio/gpio-lynxpoint.c | 10 +- drivers/gpio/gpio-max77620.c | 6 +- drivers/gpio/gpio-merrifield.c | 28 +- drivers/gpio/gpiolib-of.c | 2 +- drivers/gpio/gpiolib.c | 49 +- drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 21 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 8 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 7 + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 36 + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 36 - drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 38 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 20 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 35 +- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 54 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 13 + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c | 9 + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 9 +- drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 9 + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 9 + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 1 + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 15 +- drivers/gpu/drm/amd/amdgpu/soc15.c | 5 - drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 31 +- drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 33 +- drivers/gpu/drm/amd/display/dc/calcs/Makefile | 19 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 4 + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 24 +- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 6 + .../gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.c | 22 +- drivers/gpu/drm/amd/display/dc/dcn20/Makefile | 19 +- .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 7 +- drivers/gpu/drm/amd/display/dc/dcn21/Makefile | 19 +- drivers/gpu/drm/amd/display/dc/dml/Makefile | 19 +- .../amd/display/dc/dml/dcn20/display_mode_vba_20.c | 3 +- drivers/gpu/drm/amd/display/dc/dsc/Makefile | 19 +- drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 4 +- drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 2 +- .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 2 +- .../gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c | 2 +- drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 2 +- drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 3 +- .../drm/arm/display/komeda/komeda_pipeline_state.c | 4 +- .../gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 11 + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 41 +- drivers/gpu/drm/bridge/tc358767.c | 7 +- drivers/gpu/drm/drm_atomic_helper.c | 15 +- drivers/gpu/drm/drm_edid.c | 3 + drivers/gpu/drm/drm_self_refresh_helper.c | 18 +- drivers/gpu/drm/etnaviv/etnaviv_dump.c | 4 +- drivers/gpu/drm/etnaviv/etnaviv_iommu_v2.c | 6 +- drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 17 +- drivers/gpu/drm/i915/display/intel_bios.c | 22 +- drivers/gpu/drm/i915/display/intel_crt.c | 7 + drivers/gpu/drm/i915/display/intel_display.c | 26 +- drivers/gpu/drm/i915/display/intel_display_power.c | 3 + drivers/gpu/drm/i915/display/intel_dp.c | 12 +- drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 15 + drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 4 +- drivers/gpu/drm/i915/display/intel_hdmi.c | 6 + drivers/gpu/drm/i915/gem/i915_gem_context.c | 5 + drivers/gpu/drm/i915/gem/i915_gem_context_types.h | 7 + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 111 +- drivers/gpu/drm/i915/gem/i915_gem_mman.c | 19 +- drivers/gpu/drm/i915/gem/i915_gem_object.h | 6 + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 3 +- drivers/gpu/drm/i915/gem/i915_gem_pm.c | 3 - drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 1 + drivers/gpu/drm/i915/gt/intel_engine.h | 14 + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 16 +- drivers/gpu/drm/i915/gt/intel_engine_types.h | 13 +- drivers/gpu/drm/i915/gt/intel_gt_pm.c | 8 + drivers/gpu/drm/i915/gt/intel_lrc.c | 164 ++- drivers/gpu/drm/i915/gt/intel_mocs.c | 10 +- drivers/gpu/drm/i915/gt/intel_reset.c | 12 +- drivers/gpu/drm/i915/gt/intel_reset.h | 2 +- drivers/gpu/drm/i915/gt/intel_ringbuffer.c | 2 +- drivers/gpu/drm/i915/gt/intel_workarounds.c | 3 + drivers/gpu/drm/i915/gvt/dmabuf.c | 4 +- drivers/gpu/drm/i915/i915_cmd_parser.c | 435 +++++-- drivers/gpu/drm/i915/i915_drv.c | 12 +- drivers/gpu/drm/i915/i915_drv.h | 33 +- drivers/gpu/drm/i915/i915_gem.c | 19 +- drivers/gpu/drm/i915/i915_gem.h | 6 + drivers/gpu/drm/i915/i915_getparam.c | 2 +- drivers/gpu/drm/i915/i915_reg.h | 10 + drivers/gpu/drm/i915/i915_request.c | 69 +- drivers/gpu/drm/i915/i915_request.h | 2 +- drivers/gpu/drm/i915/intel_pch.c | 1 + drivers/gpu/drm/i915/intel_pch.h | 1 + drivers/gpu/drm/i915/intel_pm.c | 122 +- drivers/gpu/drm/i915/intel_pm.h | 3 + drivers/gpu/drm/i915/selftests/i915_gem.c | 6 + drivers/gpu/drm/msm/dsi/dsi_host.c | 6 +- drivers/gpu/drm/panel/panel-lg-lb035q02.c | 9 +- drivers/gpu/drm/panel/panel-nec-nl8048hl11.c | 9 +- drivers/gpu/drm/panel/panel-sony-acx565akm.c | 9 +- drivers/gpu/drm/panel/panel-tpo-td028ttec1.c | 3 +- drivers/gpu/drm/panel/panel-tpo-td043mtea1.c | 9 +- drivers/gpu/drm/panfrost/panfrost_drv.c | 2 +- drivers/gpu/drm/panfrost/panfrost_gpu.c | 3 + drivers/gpu/drm/panfrost/panfrost_job.c | 16 +- drivers/gpu/drm/panfrost/panfrost_mmu.c | 15 +- drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 1 + drivers/gpu/drm/radeon/radeon_drv.c | 12 +- drivers/gpu/drm/radeon/si_dpm.c | 1 + drivers/gpu/drm/scheduler/sched_main.c | 19 +- drivers/gpu/drm/sun4i/sun4i_tcon.c | 2 +- drivers/gpu/drm/tiny/Kconfig | 1 - drivers/gpu/drm/ttm/ttm_bo.c | 9 +- drivers/gpu/drm/ttm/ttm_bo_vm.c | 16 +- drivers/gpu/drm/v3d/v3d_gem.c | 5 +- drivers/gpu/drm/xen/xen_drm_front.c | 12 +- drivers/hid/hid-axff.c | 11 +- drivers/hid/hid-core.c | 7 +- drivers/hid/hid-dr.c | 12 +- drivers/hid/hid-emsff.c | 12 +- drivers/hid/hid-gaff.c | 12 +- drivers/hid/hid-google-hammer.c | 4 + drivers/hid/hid-holtekff.c | 12 +- drivers/hid/hid-hyperv.c | 56 +- drivers/hid/hid-ids.h | 2 + drivers/hid/hid-lg2ff.c | 12 +- drivers/hid/hid-lg3ff.c | 11 +- drivers/hid/hid-lg4ff.c | 11 +- drivers/hid/hid-lgff.c | 11 +- drivers/hid/hid-logitech-hidpp.c | 248 ++-- drivers/hid/hid-microsoft.c | 12 +- drivers/hid/hid-prodikeys.c | 4 +- drivers/hid/hid-sony.c | 12 +- drivers/hid/hid-tmff.c | 12 +- drivers/hid/hid-zpff.c | 12 +- drivers/hid/i2c-hid/i2c-hid-core.c | 122 +- drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c | 19 + drivers/hid/intel-ish-hid/ishtp/client-buffers.c | 2 +- drivers/hid/wacom.h | 15 + drivers/hid/wacom_wac.c | 10 +- drivers/hv/vmbus_drv.c | 6 + drivers/hwmon/ina3221.c | 2 +- drivers/hwmon/nct7904.c | 40 +- drivers/hwtracing/intel_th/gth.c | 3 + drivers/hwtracing/intel_th/msu.c | 11 +- drivers/hwtracing/intel_th/pci.c | 10 + drivers/i2c/busses/i2c-aspeed.c | 54 +- drivers/i2c/busses/i2c-mt65xx.c | 2 +- drivers/i2c/busses/i2c-stm32f7.c | 21 +- drivers/i2c/i2c-core-acpi.c | 28 +- drivers/i2c/i2c-core-of.c | 4 +- drivers/iio/accel/adxl372.c | 22 +- drivers/iio/accel/bmc150-accel-core.c | 2 +- drivers/iio/adc/ad799x.c | 4 +- drivers/iio/adc/axp288_adc.c | 32 + drivers/iio/adc/hx711.c | 10 +- drivers/iio/adc/meson_saradc.c | 10 +- drivers/iio/adc/stm32-adc-core.c | 70 +- drivers/iio/adc/stm32-adc-core.h | 137 +++ drivers/iio/adc/stm32-adc.c | 113 +- drivers/iio/imu/adis16480.c | 5 +- drivers/iio/imu/adis_buffer.c | 10 +- drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 9 + drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 2 + drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c | 15 +- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 2 + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 28 +- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c | 15 +- drivers/iio/light/Kconfig | 1 + drivers/iio/light/opt3001.c | 6 +- drivers/iio/light/vcnl4000.c | 14 +- drivers/iio/proximity/srf04.c | 29 +- drivers/infiniband/core/cm.c | 3 + drivers/infiniband/core/cma.c | 3 +- drivers/infiniband/core/core_priv.h | 1 + drivers/infiniband/core/device.c | 11 +- drivers/infiniband/core/iwcm.c | 52 +- drivers/infiniband/core/netlink.c | 107 +- drivers/infiniband/core/nldev.c | 14 +- drivers/infiniband/core/security.c | 2 +- drivers/infiniband/core/umem_odp.c | 6 +- drivers/infiniband/core/uverbs.h | 2 +- drivers/infiniband/core/verbs.c | 9 +- drivers/infiniband/hw/cxgb4/cm.c | 30 +- drivers/infiniband/hw/cxgb4/device.c | 7 +- drivers/infiniband/hw/cxgb4/mem.c | 28 +- drivers/infiniband/hw/cxgb4/qp.c | 10 +- drivers/infiniband/hw/hfi1/init.c | 1 - drivers/infiniband/hw/hfi1/pcie.c | 4 +- drivers/infiniband/hw/hfi1/rc.c | 16 +- drivers/infiniband/hw/hfi1/sdma.c | 10 +- drivers/infiniband/hw/hfi1/tid_rdma.c | 62 +- drivers/infiniband/hw/hfi1/tid_rdma.h | 3 +- drivers/infiniband/hw/hfi1/verbs.c | 10 +- drivers/infiniband/hw/hns/hns_roce_hem.h | 2 +- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 6 +- drivers/infiniband/hw/hns/hns_roce_srq.c | 2 +- drivers/infiniband/hw/i40iw/i40iw_verbs.c | 4 + drivers/infiniband/hw/mlx5/devx.c | 58 +- drivers/infiniband/hw/mlx5/mlx5_ib.h | 3 +- drivers/infiniband/hw/mlx5/mr.c | 68 +- drivers/infiniband/hw/mlx5/odp.c | 58 +- drivers/infiniband/hw/mlx5/qp.c | 8 +- drivers/infiniband/hw/qedr/main.c | 2 +- drivers/infiniband/hw/vmw_pvrdma/pvrdma_srq.c | 2 - drivers/infiniband/sw/siw/siw_qp.c | 17 +- drivers/infiniband/sw/siw/siw_verbs.c | 2 - drivers/input/ff-memless.c | 9 + drivers/input/misc/da9063_onkey.c | 5 +- drivers/input/misc/soc_button_array.c | 17 +- drivers/input/mouse/elantech.c | 55 +- drivers/input/mouse/synaptics.c | 1 + drivers/input/rmi4/rmi_driver.c | 6 +- drivers/input/rmi4/rmi_f11.c | 9 +- drivers/input/rmi4/rmi_f12.c | 32 +- drivers/input/rmi4/rmi_f54.c | 5 +- drivers/input/touchscreen/cyttsp4_core.c | 7 - drivers/input/touchscreen/goodix.c | 58 +- drivers/input/touchscreen/st1232.c | 6 +- drivers/interconnect/core.c | 4 + drivers/interconnect/qcom/qcs404.c | 3 +- drivers/interconnect/qcom/sdm845.c | 3 +- drivers/iommu/amd_iommu.c | 12 +- drivers/iommu/amd_iommu_quirks.c | 13 + drivers/iommu/amd_iommu_types.h | 4 +- drivers/iommu/arm-smmu.c | 1 + drivers/iommu/intel-iommu.c | 12 +- drivers/iommu/io-pgtable-arm.c | 58 +- drivers/iommu/ipmmu-vmsa.c | 7 +- drivers/iommu/rockchip-iommu.c | 19 +- drivers/irqchip/irq-al-fic.c | 12 + drivers/irqchip/irq-atmel-aic5.c | 10 + drivers/irqchip/irq-gic-v3-its.c | 21 +- drivers/irqchip/irq-gic-v3.c | 2 +- drivers/irqchip/irq-sifive-plic.c | 33 +- drivers/isdn/capi/capi.c | 2 +- drivers/macintosh/windfarm_cpufreq_clamp.c | 38 +- drivers/md/dm-cache-target.c | 28 +- drivers/md/dm-clone-target.c | 4 +- drivers/md/dm-snap.c | 94 +- drivers/md/raid0.c | 2 +- drivers/media/usb/stkwebcam/stk-webcam.c | 3 +- drivers/memstick/host/jmb38x_ms.c | 2 +- drivers/mfd/mt6397-core.c | 64 +- drivers/misc/fastrpc.c | 1 + drivers/misc/mei/bus-fixup.c | 14 +- drivers/misc/mei/hw-me-regs.h | 3 + drivers/misc/mei/hw-me.c | 21 +- drivers/misc/mei/hw-me.h | 8 +- drivers/misc/mei/mei_dev.h | 4 + drivers/misc/mei/pci-me.c | 13 +- drivers/mmc/host/cqhci.c | 3 +- drivers/mmc/host/mxs-mmc.c | 7 +- drivers/mmc/host/renesas_sdhi_core.c | 31 +- drivers/mmc/host/sdhci-iproc.c | 1 + drivers/mmc/host/sdhci-of-at91.c | 2 +- drivers/mmc/host/sdhci-omap.c | 2 +- drivers/mmc/host/sh_mmcif.c | 6 +- drivers/mtd/nand/raw/au1550nd.c | 5 +- drivers/mtd/spi-nor/spi-nor.c | 2 +- drivers/net/bonding/bond_alb.c | 2 +- drivers/net/bonding/bond_main.c | 74 +- drivers/net/can/c_can/c_can.c | 71 +- drivers/net/can/c_can/c_can.h | 1 + drivers/net/can/dev.c | 1 + drivers/net/can/flexcan.c | 11 +- drivers/net/can/rx-offload.c | 102 +- drivers/net/can/slcan.c | 1 + drivers/net/can/spi/mcp251x.c | 2 +- drivers/net/can/ti_hecc.c | 232 ++-- drivers/net/can/usb/gs_usb.c | 1 + drivers/net/can/usb/mcba_usb.c | 3 +- drivers/net/can/usb/peak_usb/pcan_usb.c | 32 +- drivers/net/can/usb/peak_usb/pcan_usb_core.c | 2 +- drivers/net/can/usb/usb_8dev.c | 3 +- drivers/net/can/xilinx_can.c | 1 - drivers/net/dsa/b53/b53_common.c | 1 - drivers/net/dsa/bcm_sf2.c | 40 +- drivers/net/dsa/microchip/ksz8795.c | 4 - drivers/net/dsa/microchip/ksz8795_spi.c | 7 +- drivers/net/dsa/microchip/ksz9477_i2c.c | 6 +- drivers/net/dsa/microchip/ksz9477_reg.h | 4 +- drivers/net/dsa/microchip/ksz9477_spi.c | 6 +- drivers/net/dsa/microchip/ksz_common.c | 2 +- drivers/net/dsa/microchip/ksz_common.h | 20 +- drivers/net/dsa/mv88e6xxx/ptp.c | 13 + drivers/net/dsa/sja1105/Kconfig | 4 +- drivers/net/dsa/sja1105/sja1105.h | 4 +- drivers/net/dsa/sja1105/sja1105_dynamic_config.h | 4 +- drivers/net/dsa/sja1105/sja1105_ptp.h | 4 +- drivers/net/dsa/sja1105/sja1105_static_config.h | 4 +- drivers/net/dsa/sja1105/sja1105_tas.h | 4 +- drivers/net/ethernet/aquantia/atlantic/aq_main.c | 4 +- drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 34 +- drivers/net/ethernet/aquantia/atlantic/aq_ring.c | 3 +- .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 23 +- .../ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c | 17 +- .../ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h | 7 +- .../aquantia/atlantic/hw_atl/hw_atl_llh_internal.h | 19 + .../aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c | 2 +- drivers/net/ethernet/arc/emac_rockchip.c | 3 + drivers/net/ethernet/broadcom/Kconfig | 4 +- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 10 +- drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 112 +- drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.h | 3 +- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 18 +- drivers/net/ethernet/broadcom/genet/bcmgenet.h | 1 + drivers/net/ethernet/broadcom/genet/bcmmii.c | 44 +- drivers/net/ethernet/broadcom/tg3.c | 4 + drivers/net/ethernet/cadence/macb_main.c | 12 +- drivers/net/ethernet/cavium/common/cavium_ptp.h | 2 +- drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 2 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c | 28 +- drivers/net/ethernet/chelsio/cxgb4/sge.c | 8 +- drivers/net/ethernet/cirrus/ep93xx_eth.c | 5 +- drivers/net/ethernet/cortina/gemini.c | 1 + drivers/net/ethernet/cortina/gemini.h | 2 +- drivers/net/ethernet/faraday/ftgmac100.c | 25 +- drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 60 +- drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.h | 2 +- drivers/net/ethernet/freescale/dpaa2/dpni.h | 5 +- drivers/net/ethernet/freescale/dpaa2/dprtc-cmd.h | 2 +- drivers/net/ethernet/freescale/dpaa2/dprtc.h | 2 +- drivers/net/ethernet/freescale/fec_main.c | 4 +- drivers/net/ethernet/freescale/fec_ptp.c | 4 +- drivers/net/ethernet/google/gve/gve_rx.c | 2 + drivers/net/ethernet/google/gve/gve_tx.c | 24 +- drivers/net/ethernet/hisilicon/hip04_eth.c | 16 +- drivers/net/ethernet/hisilicon/hns/hnae.c | 1 - drivers/net/ethernet/hisilicon/hns/hnae.h | 3 - drivers/net/ethernet/hisilicon/hns/hns_enet.c | 22 +- drivers/net/ethernet/hisilicon/hns3/hnae3.h | 4 +- drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 2 +- drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 5 - .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 2 +- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c | 19 +- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.h | 2 +- .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 55 +- .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 3 +- .../ethernet/hisilicon/hns3/hns3pf/hclge_mdio.h | 2 +- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 11 +- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h | 2 +- .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 28 +- .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 1 + drivers/net/ethernet/i825xx/lasi_82596.c | 4 +- drivers/net/ethernet/i825xx/lib82596.c | 4 +- drivers/net/ethernet/i825xx/sni_82596.c | 4 +- drivers/net/ethernet/ibm/ibmvnic.c | 8 +- drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 7 +- drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 2 + drivers/net/ethernet/intel/i40e/i40e_common.c | 3 +- drivers/net/ethernet/intel/i40e/i40e_xsk.c | 15 +- drivers/net/ethernet/intel/iavf/iavf_main.c | 4 +- drivers/net/ethernet/intel/ice/ice_sched.c | 2 +- drivers/net/ethernet/intel/igb/e1000_82575.c | 2 +- drivers/net/ethernet/intel/igb/igb_main.c | 12 +- drivers/net/ethernet/intel/igb/igb_ptp.c | 17 + drivers/net/ethernet/intel/igc/igc_main.c | 7 +- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 1 - drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 10 +- drivers/net/ethernet/marvell/mvneta_bm.h | 32 +- drivers/net/ethernet/marvell/octeontx2/af/cgx.h | 4 +- .../net/ethernet/marvell/octeontx2/af/cgx_fw_if.h | 4 +- drivers/net/ethernet/marvell/octeontx2/af/common.h | 4 +- drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 4 +- drivers/net/ethernet/marvell/octeontx2/af/npc.h | 4 +- .../ethernet/marvell/octeontx2/af/npc_profile.h | 4 +- drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 4 +- .../net/ethernet/marvell/octeontx2/af/rvu_reg.h | 4 +- .../net/ethernet/marvell/octeontx2/af/rvu_struct.h | 4 +- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 1 + drivers/net/ethernet/mellanox/mlx4/main.c | 6 +- .../net/ethernet/mellanox/mlx4/resource_tracker.c | 42 +- drivers/net/ethernet/mellanox/mlx5/core/en.h | 3 +- .../ethernet/mellanox/mlx5/core/en/hv_vhca_stats.c | 4 +- .../net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 12 +- drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h | 13 +- .../ethernet/mellanox/mlx5/core/en_accel/ktls.c | 2 +- .../ethernet/mellanox/mlx5/core/en_accel/ktls.h | 29 +- .../ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c | 190 +-- .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 13 +- drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 4 +- drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 5 +- .../net/ethernet/mellanox/mlx5/core/en_selftest.c | 15 +- drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 16 +- drivers/net/ethernet/mellanox/mlx5/core/en_stats.h | 10 +- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 36 +- drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 35 +- .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 3 +- .../mellanox/mlx5/core/eswitch_offloads_termtbl.c | 23 +- .../net/ethernet/mellanox/mlx5/core/fpga/conn.c | 4 +- drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 3 +- drivers/net/ethernet/mellanox/mlx5/core/health.c | 2 +- .../net/ethernet/mellanox/mlx5/core/lib/clock.c | 17 + drivers/net/ethernet/mellanox/mlx5/core/mr.c | 8 +- .../mellanox/mlx5/core/steering/dr_action.c | 1 + .../ethernet/mellanox/mlx5/core/steering/dr_rule.c | 12 +- drivers/net/ethernet/mellanox/mlxsw/core.c | 9 +- .../net/ethernet/mellanox/mlxsw/spectrum_trap.c | 1 + drivers/net/ethernet/microchip/lan743x_ptp.c | 4 + drivers/net/ethernet/mscc/ocelot.c | 20 +- drivers/net/ethernet/mscc/ocelot.h | 2 +- drivers/net/ethernet/netronome/nfp/nfp_net_repr.c | 18 - drivers/net/ethernet/nxp/lpc_eth.c | 3 - drivers/net/ethernet/pensando/ionic/ionic_lif.c | 2 + drivers/net/ethernet/pensando/ionic/ionic_lif.h | 2 + drivers/net/ethernet/pensando/ionic/ionic_main.c | 2 + drivers/net/ethernet/pensando/ionic/ionic_stats.c | 29 +- drivers/net/ethernet/qlogic/qed/qed_main.c | 27 +- drivers/net/ethernet/qlogic/qed/qed_sriov.c | 2 +- drivers/net/ethernet/qlogic/qede/qede_main.c | 12 +- drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c | 4 +- drivers/net/ethernet/realtek/r8169_main.c | 42 +- drivers/net/ethernet/renesas/ravb.h | 3 +- drivers/net/ethernet/renesas/ravb_main.c | 26 +- drivers/net/ethernet/renesas/ravb_ptp.c | 11 + drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 5 +- drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 4 +- drivers/net/ethernet/stmicro/stmmac/dwmac5.c | 1 + drivers/net/ethernet/stmicro/stmmac/dwmac5.h | 2 +- drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h | 2 +- .../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 3 +- .../net/ethernet/stmicro/stmmac/dwxgmac2_descs.c | 3 +- drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c | 4 +- drivers/net/ethernet/stmicro/stmmac/hwif.h | 2 +- drivers/net/ethernet/stmicro/stmmac/mmc_core.c | 6 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 85 +- drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 6 +- .../net/ethernet/stmicro/stmmac/stmmac_selftests.c | 137 ++- drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 2 +- drivers/net/ethernet/ti/davinci_cpdma.c | 2 +- drivers/net/fjes/fjes_main.c | 15 +- drivers/net/hamradio/bpqether.c | 22 - drivers/net/hyperv/netvsc_drv.c | 15 +- drivers/net/ipvlan/ipvlan_main.c | 2 - drivers/net/macsec.c | 18 - drivers/net/macvlan.c | 19 - drivers/net/netdevsim/dev.c | 7 + drivers/net/netdevsim/fib.c | 3 +- drivers/net/phy/bcm7xxx.c | 1 + drivers/net/phy/dp83640.c | 16 + drivers/net/phy/mdio_bus.c | 11 +- drivers/net/phy/micrel.c | 42 +- drivers/net/phy/phy-c45.c | 2 + drivers/net/phy/phy.c | 3 - drivers/net/phy/phy_device.c | 11 +- drivers/net/phy/phylink.c | 18 +- drivers/net/phy/smsc.c | 1 + drivers/net/ppp/ppp_generic.c | 2 - drivers/net/slip/slip.c | 1 + drivers/net/team/team.c | 16 +- drivers/net/tun.c | 4 +- drivers/net/usb/ax88172a.c | 2 +- drivers/net/usb/cdc_ether.c | 7 + drivers/net/usb/cdc_ncm.c | 6 +- drivers/net/usb/hso.c | 13 +- drivers/net/usb/lan78xx.c | 17 +- drivers/net/usb/qmi_wwan.c | 4 + drivers/net/usb/r8152.c | 1 + drivers/net/usb/sr9800.c | 2 +- drivers/net/vrf.c | 1 - drivers/net/vxlan.c | 62 +- drivers/net/wimax/i2400m/op-rfkill.c | 2 +- drivers/net/wireless/ath/ath10k/core.c | 15 +- drivers/net/wireless/intel/iwlwifi/fw/acpi.c | 10 +- drivers/net/wireless/intel/iwlwifi/fw/api/scan.h | 22 +- drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 1 + drivers/net/wireless/intel/iwlwifi/fw/file.h | 3 + drivers/net/wireless/intel/iwlwifi/iwl-csr.h | 1 + drivers/net/wireless/intel/iwlwifi/iwl-io.h | 12 +- drivers/net/wireless/intel/iwlwifi/iwl-prph.h | 5 + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 43 +- drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 9 +- drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 6 + drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 40 +- drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 140 ++- .../wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c | 36 +- drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 295 +++-- .../net/wireless/intel/iwlwifi/pcie/trans-gen2.c | 25 + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 25 +- drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c | 20 +- drivers/net/wireless/intersil/hostap/hostap_hw.c | 25 - drivers/net/wireless/mac80211_hwsim.c | 2 +- drivers/net/wireless/mediatek/mt76/Makefile | 2 + drivers/net/wireless/mediatek/mt76/dma.c | 6 +- drivers/net/wireless/mediatek/mt76/mt76.h | 6 +- drivers/net/wireless/mediatek/mt76/mt76x2/pci.c | 2 + drivers/net/wireless/mediatek/mt76/pci.c | 46 + drivers/net/wireless/ralink/rt2x00/rt2x00.h | 1 - drivers/net/wireless/ralink/rt2x00/rt2x00debug.c | 2 +- drivers/net/wireless/realtek/rtlwifi/pci.c | 3 +- drivers/net/wireless/realtek/rtlwifi/ps.c | 6 + drivers/net/wireless/virt_wifi.c | 54 +- drivers/net/xen-netback/interface.c | 1 - drivers/nfc/fdp/i2c.c | 2 +- drivers/nfc/nxp-nci/i2c.c | 6 +- drivers/nfc/pn533/usb.c | 9 +- drivers/nfc/st21nfca/core.c | 1 + drivers/nvme/host/core.c | 94 +- drivers/nvme/host/fabrics.h | 3 +- drivers/nvme/host/multipath.c | 11 +- drivers/nvme/host/nvme.h | 5 +- drivers/nvme/host/pci.c | 83 +- drivers/nvme/host/rdma.c | 16 + drivers/nvme/host/tcp.c | 13 +- drivers/nvme/target/loop.c | 4 +- drivers/of/of_reserved_mem.c | 4 +- drivers/of/unittest.c | 1 + drivers/opp/core.c | 16 +- drivers/opp/of.c | 9 +- drivers/parisc/sba_iommu.c | 8 - drivers/pci/pci.c | 24 +- drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c | 124 +- drivers/pinctrl/aspeed/pinmux-aspeed.h | 3 +- drivers/pinctrl/bcm/pinctrl-iproc-gpio.c | 12 +- drivers/pinctrl/bcm/pinctrl-ns2-mux.c | 4 +- drivers/pinctrl/berlin/pinctrl-as370.c | 2 +- drivers/pinctrl/intel/pinctrl-cherryview.c | 30 +- drivers/pinctrl/intel/pinctrl-intel.c | 48 +- drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 26 +- drivers/pinctrl/pinctrl-stmfx.c | 16 +- drivers/platform/chrome/cros_ec_trace.c | 5 +- drivers/platform/x86/classmate-laptop.c | 12 - drivers/platform/x86/i2c-multi-instantiate.c | 1 + drivers/platform/x86/intel_punit_ipc.c | 3 +- drivers/ptp/Kconfig | 4 +- drivers/ptp/ptp_chardev.c | 20 +- drivers/pwm/core.c | 9 +- drivers/pwm/pwm-bcm-iproc.c | 1 + drivers/regulator/core.c | 13 + drivers/regulator/da9062-regulator.c | 118 +- drivers/regulator/fixed.c | 5 +- drivers/regulator/lochnagar-regulator.c | 1 + drivers/regulator/of_regulator.c | 27 +- drivers/regulator/pfuze100-regulator.c | 8 +- drivers/regulator/qcom-rpmh-regulator.c | 4 +- drivers/regulator/ti-abb-regulator.c | 26 +- drivers/reset/core.c | 5 +- drivers/s390/cio/cio.h | 1 + drivers/s390/cio/css.c | 7 +- drivers/s390/cio/device.c | 2 +- drivers/s390/crypto/zcrypt_api.c | 3 +- drivers/s390/net/qeth_l2_main.c | 23 +- drivers/s390/scsi/zfcp_fsf.c | 16 +- drivers/scsi/Kconfig | 2 +- drivers/scsi/ch.c | 1 - drivers/scsi/device_handler/scsi_dh_alua.c | 21 +- drivers/scsi/hpsa.c | 4 + drivers/scsi/lpfc/lpfc_init.c | 2 - drivers/scsi/lpfc/lpfc_nportdisc.c | 4 +- drivers/scsi/lpfc/lpfc_scsi.c | 2 - drivers/scsi/lpfc/lpfc_sli.c | 2 +- drivers/scsi/qla2xxx/qla_attr.c | 7 +- drivers/scsi/qla2xxx/qla_bsg.c | 6 +- drivers/scsi/qla2xxx/qla_isr.c | 2 - drivers/scsi/qla2xxx/qla_mbx.c | 3 +- drivers/scsi/qla2xxx/qla_mid.c | 8 +- drivers/scsi/qla2xxx/qla_os.c | 16 +- drivers/scsi/scsi_error.c | 3 + drivers/scsi/scsi_lib.c | 7 +- drivers/scsi/scsi_sysfs.c | 11 +- drivers/scsi/sd.c | 6 +- drivers/scsi/sd_zbc.c | 29 +- drivers/scsi/sni_53c710.c | 4 +- drivers/scsi/ufs/ufs_bsg.c | 4 + drivers/soc/imx/gpc.c | 8 +- drivers/soc/imx/soc-imx-scu.c | 2 +- drivers/soundwire/Kconfig | 1 + drivers/soundwire/intel.c | 4 +- drivers/soundwire/slave.c | 3 +- drivers/staging/exfat/Kconfig | 3 +- drivers/staging/exfat/Makefile | 2 +- drivers/staging/exfat/exfat.h | 2 +- drivers/staging/exfat/exfat_blkdev.c | 2 +- drivers/staging/exfat/exfat_cache.c | 2 +- drivers/staging/exfat/exfat_core.c | 2 +- drivers/staging/exfat/exfat_nls.c | 2 +- drivers/staging/exfat/exfat_super.c | 7 +- drivers/staging/exfat/exfat_upcase.c | 2 +- drivers/staging/fbtft/Kconfig | 12 +- drivers/staging/fbtft/Makefile | 4 - drivers/staging/fbtft/fbtft-core.c | 7 +- drivers/staging/fbtft/fbtft_device.c | 1261 -------------------- drivers/staging/fbtft/flexfb.c | 851 ------------- drivers/staging/octeon/ethernet-tx.c | 9 +- drivers/staging/octeon/octeon-stubs.h | 2 +- .../staging/rtl8188eu/hal/hal8188e_rate_adaptive.c | 2 +- drivers/staging/rtl8188eu/os_dep/usb_intf.c | 6 +- drivers/staging/speakup/sysfs-driver-speakup | 369 ++++++ .../vc04_services/bcm2835-audio/bcm2835-pcm.c | 4 +- .../vc04_services/bcm2835-audio/bcm2835-vchiq.c | 1 + drivers/staging/vt6655/device_main.c | 4 +- drivers/staging/wlan-ng/cfg80211.c | 6 +- drivers/target/iscsi/cxgbit/cxgbit_cm.c | 3 +- drivers/target/target_core_device.c | 21 - drivers/thermal/cpu_cooling.c | 14 +- drivers/thunderbolt/nhi_ops.c | 1 - drivers/thunderbolt/switch.c | 28 +- drivers/tty/n_hdlc.c | 5 + drivers/tty/serial/8250/8250_men_mcb.c | 8 +- drivers/tty/serial/8250/8250_omap.c | 5 +- drivers/tty/serial/Kconfig | 1 + drivers/tty/serial/fsl_linflexuart.c | 21 +- drivers/tty/serial/fsl_lpuart.c | 2 +- drivers/tty/serial/imx.c | 4 +- drivers/tty/serial/owl-uart.c | 2 +- drivers/tty/serial/rda-uart.c | 2 +- drivers/tty/serial/serial_core.c | 2 + drivers/tty/serial/serial_mctrl_gpio.c | 3 + drivers/tty/serial/sh-sci.c | 8 +- drivers/tty/serial/uartlite.c | 3 +- drivers/tty/serial/xilinx_uartps.c | 8 +- drivers/usb/cdns3/cdns3-pci-wrap.c | 3 +- drivers/usb/cdns3/core.c | 22 +- drivers/usb/cdns3/ep0.c | 12 +- drivers/usb/cdns3/gadget.c | 78 +- drivers/usb/cdns3/host-export.h | 1 - drivers/usb/cdns3/host.c | 1 + drivers/usb/class/usblp.c | 12 +- drivers/usb/core/config.c | 5 + drivers/usb/dwc3/Kconfig | 1 + drivers/usb/dwc3/core.c | 3 +- drivers/usb/dwc3/drd.c | 7 +- drivers/usb/dwc3/dwc3-pci.c | 2 +- drivers/usb/dwc3/gadget.c | 13 +- drivers/usb/dwc3/host.c | 7 +- drivers/usb/gadget/composite.c | 4 + drivers/usb/gadget/configfs.c | 110 +- drivers/usb/gadget/udc/Kconfig | 2 +- drivers/usb/gadget/udc/atmel_usba_udc.c | 6 +- drivers/usb/gadget/udc/core.c | 11 + drivers/usb/gadget/udc/dummy_hcd.c | 3 +- drivers/usb/gadget/udc/fsl_udc_core.c | 2 +- drivers/usb/gadget/udc/lpc32xx_udc.c | 10 +- drivers/usb/gadget/udc/renesas_usb3.c | 11 +- drivers/usb/host/xhci-debugfs.c | 24 +- drivers/usb/host/xhci-ext-caps.c | 1 + drivers/usb/host/xhci-ring.c | 6 +- drivers/usb/host/xhci.c | 116 +- drivers/usb/image/microtek.c | 4 + drivers/usb/misc/Kconfig | 10 - drivers/usb/misc/Makefile | 1 - drivers/usb/misc/adutux.c | 24 +- drivers/usb/misc/chaoskey.c | 5 +- drivers/usb/misc/iowarrior.c | 48 +- drivers/usb/misc/ldusb.c | 60 +- drivers/usb/misc/legousbtower.c | 63 +- drivers/usb/misc/rio500.c | 554 --------- drivers/usb/misc/rio500_usb.h | 20 - drivers/usb/misc/usblcd.c | 60 +- drivers/usb/misc/yurex.c | 18 +- drivers/usb/mtu3/mtu3_core.c | 1 + drivers/usb/renesas_usbhs/common.c | 12 +- drivers/usb/renesas_usbhs/common.h | 1 + drivers/usb/renesas_usbhs/fifo.c | 2 +- drivers/usb/renesas_usbhs/fifo.h | 1 + drivers/usb/renesas_usbhs/mod_gadget.c | 22 +- drivers/usb/renesas_usbhs/pipe.c | 15 + drivers/usb/renesas_usbhs/pipe.h | 1 + drivers/usb/serial/ftdi_sio.c | 3 + drivers/usb/serial/ftdi_sio_ids.h | 9 + drivers/usb/serial/keyspan.c | 4 +- drivers/usb/serial/option.c | 11 + drivers/usb/serial/ti_usb_3410_5052.c | 12 +- drivers/usb/serial/usb-serial.c | 5 +- drivers/usb/serial/whiteheat.c | 13 +- drivers/usb/serial/whiteheat.h | 2 +- drivers/usb/storage/scsiglue.c | 10 - drivers/usb/storage/uas.c | 20 - drivers/usb/typec/tcpm/tcpm.c | 14 +- drivers/usb/typec/ucsi/displayport.c | 2 + drivers/usb/typec/ucsi/ucsi_ccg.c | 42 +- drivers/usb/usb-skeleton.c | 19 +- drivers/usb/usbip/vhci_hcd.c | 4 +- drivers/usb/usbip/vhci_tx.c | 3 + drivers/vfio/vfio_iommu_type1.c | 2 +- drivers/vhost/test.c | 2 + drivers/vhost/vringh.c | 8 +- drivers/video/fbdev/c2p_core.h | 8 +- drivers/virt/vboxguest/vboxguest_utils.c | 3 +- drivers/virtio/virtio_ring.c | 7 +- drivers/w1/slaves/Kconfig | 1 + drivers/watchdog/bd70528_wdt.c | 1 + drivers/watchdog/cpwd.c | 8 +- drivers/watchdog/imx_sc_wdt.c | 8 +- drivers/watchdog/meson_gxbb_wdt.c | 4 +- drivers/watchdog/pm8916_wdt.c | 15 +- drivers/xen/gntdev.c | 13 +- drivers/xen/grant-table.c | 3 +- drivers/xen/pvcalls-back.c | 2 +- fs/afs/dir.c | 7 +- fs/aio.c | 10 +- fs/autofs/expire.c | 5 +- fs/btrfs/block-group.c | 1 + fs/btrfs/ctree.h | 5 +- fs/btrfs/delalloc-space.c | 7 +- fs/btrfs/disk-io.c | 6 - fs/btrfs/file.c | 56 +- fs/btrfs/inode-map.c | 4 +- fs/btrfs/inode.c | 45 +- fs/btrfs/ioctl.c | 12 +- fs/btrfs/qgroup.c | 4 +- fs/btrfs/ref-verify.c | 2 +- fs/btrfs/relocation.c | 9 +- fs/btrfs/send.c | 2 +- fs/btrfs/space-info.c | 21 + fs/btrfs/tree-checker.c | 8 - fs/btrfs/tree-log.c | 36 +- fs/btrfs/volumes.c | 7 +- fs/ceph/caps.c | 10 +- fs/ceph/dir.c | 15 +- fs/ceph/file.c | 44 +- fs/ceph/inode.c | 1 + fs/ceph/mds_client.c | 21 +- fs/ceph/super.c | 11 +- fs/cifs/cifsfs.c | 30 +- fs/cifs/cifsglob.h | 7 +- fs/cifs/cifsproto.h | 1 + fs/cifs/connect.c | 22 +- fs/cifs/dir.c | 8 +- fs/cifs/file.c | 62 +- fs/cifs/inode.c | 8 +- fs/cifs/netmisc.c | 4 - fs/cifs/smb1ops.c | 3 + fs/cifs/smb2file.c | 2 +- fs/cifs/smb2ops.c | 3 +- fs/cifs/smb2pdu.c | 14 +- fs/cifs/smb2pdu.h | 1 + fs/cifs/smb2proto.h | 4 + fs/cifs/transport.c | 42 +- fs/configfs/symlink.c | 2 +- fs/dax.c | 5 +- fs/direct-io.c | 3 +- fs/ecryptfs/inode.c | 84 +- fs/exportfs/expfs.c | 31 +- fs/fs-writeback.c | 20 +- fs/fuse/Makefile | 3 +- fs/fuse/dev.c | 4 +- fs/fuse/dir.c | 16 +- fs/fuse/file.c | 14 +- fs/fuse/fuse_i.h | 4 + fs/fuse/inode.c | 4 + fs/fuse/virtio_fs.c | 169 ++- fs/gfs2/ops_fstype.c | 21 +- fs/io_uring.c | 386 +++--- fs/libfs.c | 140 +-- fs/namespace.c | 15 +- fs/nfs/delegation.c | 12 +- fs/nfs/delegation.h | 1 + fs/nfs/direct.c | 106 +- fs/nfs/nfs4proc.c | 8 +- fs/nfs/write.c | 5 +- fs/ocfs2/aops.c | 25 +- fs/ocfs2/file.c | 136 ++- fs/ocfs2/ioctl.c | 2 +- fs/ocfs2/journal.c | 3 +- fs/ocfs2/localalloc.c | 3 +- fs/ocfs2/xattr.c | 56 +- fs/proc/meminfo.c | 4 +- fs/proc/page.c | 28 +- fs/readdir.c | 48 +- fs/super.c | 5 +- fs/tracefs/inode.c | 46 +- fs/xfs/libxfs/xfs_ag.c | 5 +- fs/xfs/libxfs/xfs_attr_leaf.c | 21 +- fs/xfs/libxfs/xfs_bmap.c | 6 +- fs/xfs/libxfs/xfs_bmap.h | 3 +- fs/xfs/libxfs/xfs_dir2_block.c | 2 +- fs/xfs/libxfs/xfs_fs.h | 8 +- fs/xfs/scrub/refcount.c | 3 +- fs/xfs/xfs_bmap_util.c | 4 +- fs/xfs/xfs_buf.c | 12 +- fs/xfs/xfs_log.c | 2 +- fs/xfs/xfs_log_recover.c | 2 +- include/acpi/processor.h | 20 +- include/asm-generic/vdso/vsyscall.h | 7 - include/drm/bridge/dw_hdmi.h | 4 + include/drm/drm_gem_shmem_helper.h | 13 + include/drm/drm_self_refresh_helper.h | 3 +- include/dt-bindings/sound/samsung-i2s.h | 12 +- include/linux/bitmap.h | 3 +- include/linux/bpf.h | 4 +- include/linux/can/core.h | 1 + include/linux/compiler_attributes.h | 17 + include/linux/cpu.h | 30 +- include/linux/cpufreq.h | 7 +- include/linux/dynamic_debug.h | 6 + include/linux/efi.h | 18 +- include/linux/export.h | 20 +- include/linux/filter.h | 1 - include/linux/gfp.h | 23 + include/linux/gpio/driver.h | 8 + include/linux/hwmon.h | 2 +- include/linux/idr.h | 2 +- include/linux/if_macvlan.h | 1 - include/linux/if_team.h | 1 + include/linux/if_vlan.h | 11 - include/linux/intel-iommu.h | 6 +- include/linux/kvm_host.h | 7 + include/linux/leds.h | 5 +- include/linux/memcontrol.h | 29 + include/linux/memory.h | 1 + include/linux/micrel_phy.h | 2 +- include/linux/mlx5/mlx5_ifc.h | 3 +- include/linux/mm.h | 5 - include/linux/mm_types.h | 5 + include/linux/netdevice.h | 61 +- include/linux/page-flags.h | 20 +- include/linux/page_ext.h | 10 +- include/linux/perf_event.h | 2 +- include/linux/platform_data/cros_ec_commands.h | 285 ++++- include/linux/platform_data/dma-imx-sdma.h | 3 + include/linux/platform_device.h | 2 + include/linux/pm_qos.h | 56 +- include/linux/radix-tree.h | 18 - include/linux/reset-controller.h | 4 +- include/linux/reset.h | 2 +- include/linux/sched.h | 1 + include/linux/security.h | 1 + include/linux/skbuff.h | 41 +- include/linux/skmsg.h | 9 +- include/linux/slab.h | 4 + include/linux/socket.h | 2 +- include/linux/string.h | 21 +- include/linux/sunrpc/bc_xprt.h | 5 + include/linux/sunrpc/xprtsock.h | 1 + include/linux/sysfs.h | 4 +- include/linux/tcp.h | 6 +- include/linux/tpm_eventlog.h | 16 +- include/linux/uaccess.h | 6 +- include/linux/virtio_vsock.h | 1 - include/linux/xarray.h | 4 +- include/net/bonding.h | 5 +- include/net/busy_poll.h | 6 +- include/net/cfg80211.h | 8 + include/net/devlink.h | 5 +- include/net/flow_dissector.h | 3 +- include/net/fq.h | 2 +- include/net/fq_impl.h | 8 +- include/net/hwbm.h | 10 +- include/net/ip.h | 4 +- include/net/ip_vs.h | 1 + include/net/llc_conn.h | 2 +- include/net/neighbour.h | 4 +- include/net/net_namespace.h | 27 +- include/net/netfilter/nf_tables.h | 3 +- include/net/request_sock.h | 4 +- include/net/sch_generic.h | 4 + include/net/sctp/sctp.h | 5 + include/net/sock.h | 52 +- include/net/tcp.h | 10 +- include/net/tls.h | 5 + include/net/vxlan.h | 1 + include/rdma/ib_verbs.h | 2 +- include/scsi/scsi_eh.h | 1 + include/sound/dmaengine_pcm.h | 5 + include/sound/hda_codec.h | 1 + include/sound/pxa2xx-lib.h | 26 +- include/sound/rt5682.h | 1 + include/sound/simple_card_utils.h | 1 + include/sound/soc-acpi-intel-match.h | 3 + include/sound/soc-acpi.h | 4 + include/sound/soc-component.h | 49 +- include/sound/soc-dpcm.h | 18 +- include/sound/soc.h | 38 +- include/sound/sof.h | 3 + include/sound/sof/dai-imx.h | 34 + include/sound/sof/dai.h | 2 + include/sound/sof/header.h | 2 + include/sound/sof/pm.h | 8 + include/sound/sof/stream.h | 4 +- include/sound/wm8904.h | 2 +- include/trace/events/btrfs.h | 3 +- include/trace/events/rxrpc.h | 18 +- include/trace/events/sock.h | 4 +- include/trace/events/tcp.h | 2 +- include/uapi/linux/can.h | 2 +- include/uapi/linux/can/bcm.h | 2 +- include/uapi/linux/can/error.h | 2 +- include/uapi/linux/can/gw.h | 2 +- include/uapi/linux/can/j1939.h | 2 +- include/uapi/linux/can/netlink.h | 2 +- include/uapi/linux/can/raw.h | 2 +- include/uapi/linux/can/vxcan.h | 2 +- include/uapi/linux/devlink.h | 1 + include/uapi/linux/fuse.h | 37 + include/uapi/linux/nvme_ioctl.h | 1 + include/uapi/linux/ptp_clock.h | 5 +- include/uapi/linux/sched.h | 4 + include/uapi/linux/serial_core.h | 2 +- include/uapi/sound/compress_params.h | 10 + include/uapi/sound/sof/abi.h | 2 +- include/uapi/sound/sof/tokens.h | 11 +- kernel/audit_watch.c | 2 +- kernel/bpf/cgroup.c | 4 +- kernel/bpf/core.c | 2 +- kernel/bpf/devmap.c | 33 +- kernel/bpf/syscall.c | 38 +- kernel/cgroup/cgroup.c | 5 +- kernel/cgroup/cpuset.c | 3 +- kernel/cpu.c | 27 +- kernel/events/core.c | 74 +- kernel/events/uprobes.c | 13 +- kernel/fork.c | 37 +- kernel/freezer.c | 6 - kernel/gen_kheaders.sh | 11 +- kernel/irq/irqdomain.c | 2 +- kernel/kthread.c | 6 +- kernel/panic.c | 1 + kernel/power/main.c | 1 + kernel/power/qos.c | 240 ++++ kernel/sched/core.c | 28 +- kernel/sched/cputime.c | 6 +- kernel/sched/deadline.c | 40 +- kernel/sched/fair.c | 80 +- kernel/sched/idle.c | 9 +- kernel/sched/rt.c | 37 +- kernel/sched/sched.h | 30 +- kernel/sched/stop_task.c | 18 +- kernel/sched/topology.c | 11 +- kernel/signal.c | 2 +- kernel/stacktrace.c | 6 +- kernel/stop_machine.c | 10 +- kernel/sysctl.c | 4 +- kernel/time/hrtimer.c | 8 +- kernel/time/ntp.c | 2 +- kernel/time/posix-cpu-timers.c | 6 +- kernel/time/sched_clock.c | 2 + kernel/time/vsyscall.c | 9 +- kernel/trace/ftrace.c | 55 +- kernel/trace/trace.c | 139 ++- kernel/trace/trace.h | 2 + kernel/trace/trace_dynevent.c | 4 + kernel/trace/trace_event_perf.c | 4 + kernel/trace/trace_events.c | 35 +- kernel/trace/trace_events_hist.c | 15 +- kernel/trace/trace_events_trigger.c | 8 +- kernel/trace/trace_hwlat.c | 4 +- kernel/trace/trace_kprobe.c | 12 +- kernel/trace/trace_printk.c | 7 + kernel/trace/trace_stack.c | 8 + kernel/trace/trace_stat.c | 6 +- kernel/trace/trace_uprobe.c | 11 + lib/Kconfig | 1 - lib/dump_stack.c | 7 +- lib/generic-radix-tree.c | 32 +- lib/idr.c | 31 +- lib/radix-tree.c | 2 +- lib/string.c | 21 - lib/test_meminit.c | 27 + lib/test_user_copy.c | 37 +- lib/test_xarray.c | 24 + lib/vdso/Kconfig | 9 - lib/vdso/gettimeofday.c | 9 +- lib/xarray.c | 4 + lib/xz/xz_dec_lzma2.c | 1 + mm/backing-dev.c | 4 +- mm/compaction.c | 7 +- mm/debug.c | 31 +- mm/filemap.c | 1 + mm/gup.c | 14 +- mm/huge_memory.c | 9 +- mm/hugetlb.c | 5 +- mm/hugetlb_cgroup.c | 2 +- mm/init-mm.c | 1 + mm/khugepaged.c | 35 +- mm/kmemleak.c | 30 +- mm/madvise.c | 16 +- mm/memblock.c | 6 +- mm/memcontrol.c | 48 +- mm/memory-failure.c | 36 +- mm/memory_hotplug.c | 117 +- mm/mempolicy.c | 14 +- mm/memremap.c | 13 +- mm/mmu_notifier.c | 2 +- mm/page_alloc.c | 31 +- mm/page_ext.c | 23 +- mm/page_io.c | 6 +- mm/page_owner.c | 60 +- mm/rmap.c | 1 + mm/shmem.c | 6 + mm/shuffle.c | 2 +- mm/slab.c | 3 + mm/slab.h | 4 +- mm/slab_common.c | 28 +- mm/slob.c | 62 +- mm/slub.c | 88 +- mm/sparse.c | 2 +- mm/truncate.c | 12 + mm/vmpressure.c | 20 +- mm/vmscan.c | 86 +- mm/vmstat.c | 25 +- mm/z3fold.c | 10 +- net/8021q/vlan.c | 1 - net/8021q/vlan_dev.c | 33 - net/atm/common.c | 2 +- net/batman-adv/bat_iv_ogm.c | 61 +- net/batman-adv/bat_v_ogm.c | 41 +- net/batman-adv/hard-interface.c | 2 + net/batman-adv/soft-interface.c | 32 - net/batman-adv/types.h | 7 + net/bluetooth/6lowpan.c | 8 - net/bluetooth/af_bluetooth.c | 4 +- net/bridge/br_device.c | 8 - net/bridge/netfilter/ebt_dnat.c | 19 +- net/bridge/netfilter/nf_conntrack_bridge.c | 5 +- net/caif/caif_socket.c | 2 +- net/can/af_can.c | 3 +- net/can/j1939/main.c | 9 + net/can/j1939/socket.c | 103 +- net/can/j1939/transport.c | 56 +- net/core/datagram.c | 10 +- net/core/dev.c | 623 +++++++--- net/core/dev_addr_lists.c | 12 +- net/core/devlink.c | 45 +- net/core/ethtool.c | 4 +- net/core/filter.c | 8 +- net/core/flow_dissector.c | 38 +- net/core/lwt_bpf.c | 7 +- net/core/net_namespace.c | 23 +- net/core/request_sock.c | 2 +- net/core/rtnetlink.c | 17 +- net/core/skbuff.c | 23 +- net/core/skmsg.c | 20 +- net/core/sock.c | 38 +- net/dccp/ipv4.c | 4 +- net/decnet/af_decnet.c | 2 +- net/dsa/dsa2.c | 2 +- net/dsa/master.c | 5 - net/dsa/slave.c | 12 - net/dsa/tag_8021q.c | 2 +- net/ieee802154/6lowpan/core.c | 8 - net/ipv4/datagram.c | 2 +- net/ipv4/fib_frontend.c | 2 +- net/ipv4/fib_semantics.c | 2 +- net/ipv4/inet_connection_sock.c | 6 +- net/ipv4/inet_diag.c | 2 +- net/ipv4/inet_hashtables.c | 2 +- net/ipv4/ip_gre.c | 4 +- net/ipv4/ip_output.c | 14 +- net/ipv4/ipmr.c | 3 +- net/ipv4/route.c | 11 +- net/ipv4/tcp.c | 79 +- net/ipv4/tcp_diag.c | 5 +- net/ipv4/tcp_fastopen.c | 2 +- net/ipv4/tcp_input.c | 37 +- net/ipv4/tcp_ipv4.c | 36 +- net/ipv4/tcp_minisocks.c | 17 +- net/ipv4/tcp_output.c | 32 +- net/ipv4/tcp_timer.c | 11 +- net/ipv4/udp.c | 29 +- net/ipv6/addrconf_core.c | 1 + net/ipv6/inet6_hashtables.c | 2 +- net/ipv6/ip6_gre.c | 5 +- net/ipv6/ip6_output.c | 3 + net/ipv6/netfilter.c | 3 + net/ipv6/route.c | 13 +- net/ipv6/seg6_local.c | 11 + net/ipv6/tcp_ipv6.c | 18 +- net/ipv6/udp.c | 2 +- net/l2tp/l2tp_eth.c | 1 - net/llc/af_llc.c | 34 +- net/llc/llc_c_ac.c | 8 +- net/llc/llc_conn.c | 69 +- net/llc/llc_if.c | 12 +- net/llc/llc_s_ac.c | 12 +- net/llc/llc_sap.c | 23 +- net/mac80211/main.c | 2 +- net/mac80211/mlme.c | 5 +- net/mac80211/rx.c | 11 +- net/mac80211/scan.c | 30 +- net/mac80211/sta_info.c | 3 +- net/netfilter/ipset/ip_set_core.c | 49 +- net/netfilter/ipset/ip_set_hash_ipmac.c | 2 +- net/netfilter/ipset/ip_set_hash_net.c | 1 + net/netfilter/ipset/ip_set_hash_netnet.c | 1 + net/netfilter/ipvs/ip_vs_app.c | 12 +- net/netfilter/ipvs/ip_vs_ctl.c | 29 +- net/netfilter/ipvs/ip_vs_pe.c | 3 +- net/netfilter/ipvs/ip_vs_sched.c | 3 +- net/netfilter/ipvs/ip_vs_sync.c | 13 +- net/netfilter/nf_conntrack_core.c | 4 +- net/netfilter/nf_flow_table_core.c | 3 +- net/netfilter/nf_tables_api.c | 7 +- net/netfilter/nf_tables_offload.c | 5 +- net/netfilter/nft_bitwise.c | 5 +- net/netfilter/nft_cmp.c | 2 +- net/netfilter/nft_payload.c | 38 + net/netrom/af_netrom.c | 23 - net/nfc/llcp_sock.c | 4 +- net/nfc/netlink.c | 2 - net/openvswitch/actions.c | 5 +- net/openvswitch/datapath.c | 20 +- net/openvswitch/vport-internal_dev.c | 11 +- net/phonet/socket.c | 4 +- net/rds/ib_cm.c | 23 +- net/rose/af_rose.c | 23 - net/rxrpc/ar-internal.h | 2 + net/rxrpc/call_accept.c | 5 +- net/rxrpc/call_object.c | 34 +- net/rxrpc/conn_client.c | 9 +- net/rxrpc/conn_object.c | 13 +- net/rxrpc/conn_service.c | 2 +- net/rxrpc/peer_event.c | 11 +- net/rxrpc/peer_object.c | 16 +- net/rxrpc/recvmsg.c | 24 +- net/rxrpc/sendmsg.c | 3 +- net/sched/act_api.c | 23 +- net/sched/act_mirred.c | 6 +- net/sched/act_mpls.c | 12 +- net/sched/cls_api.c | 119 +- net/sched/cls_bpf.c | 8 +- net/sched/em_meta.c | 4 +- net/sched/sch_api.c | 3 +- net/sched/sch_etf.c | 2 +- net/sched/sch_generic.c | 19 +- net/sched/sch_hhf.c | 8 +- net/sched/sch_netem.c | 11 +- net/sched/sch_sfb.c | 13 +- net/sched/sch_sfq.c | 14 +- net/sched/sch_taprio.c | 11 +- net/sctp/diag.c | 2 +- net/sctp/input.c | 16 +- net/sctp/sm_make_chunk.c | 12 +- net/sctp/socket.c | 12 +- net/smc/af_smc.c | 16 +- net/smc/smc_core.c | 7 +- net/smc/smc_pnet.c | 4 +- net/smc/smc_rx.c | 29 +- net/sunrpc/backchannel_rqst.c | 7 +- net/sunrpc/xprt.c | 5 + net/sunrpc/xprtrdma/backchannel.c | 2 + net/sunrpc/xprtsock.c | 17 +- net/tipc/core.c | 2 - net/tipc/core.h | 6 + net/tipc/socket.c | 12 +- net/tls/tls_device.c | 10 +- net/tls/tls_main.c | 2 + net/tls/tls_sw.c | 30 +- net/unix/af_unix.c | 6 +- net/vmw_vsock/af_vsock.c | 2 +- net/vmw_vsock/virtio_transport_common.c | 25 +- net/wireless/chan.c | 5 + net/wireless/nl80211.c | 4 +- net/wireless/reg.c | 1 + net/wireless/reg.h | 8 - net/wireless/scan.c | 23 +- net/wireless/util.c | 3 +- net/wireless/wext-sme.c | 8 +- net/x25/x25_dev.c | 2 +- net/xdp/xdp_umem.c | 6 + net/xdp/xsk.c | 42 +- net/xfrm/xfrm_input.c | 3 + net/xfrm/xfrm_state.c | 2 + samples/bpf/Makefile | 1 + samples/bpf/asm_goto_workaround.h | 13 +- samples/bpf/task_fd_query_user.c | 1 + .../api/devm_platform_ioremap_resource.cocci | 60 - scripts/coccinelle/misc/add_namespace.cocci | 2 + scripts/gdb/linux/dmesg.py | 16 +- scripts/gdb/linux/symbols.py | 11 +- scripts/gdb/linux/utils.py | 25 +- scripts/mod/modpost.c | 60 +- scripts/mod/modpost.h | 1 + scripts/nsdeps | 10 +- scripts/recordmcount.h | 5 +- scripts/setlocalversion | 2 +- scripts/tools-support-relr.sh | 8 +- security/lockdown/lockdown.c | 1 + security/selinux/ss/services.c | 9 +- sound/arm/pxa2xx-pcm-lib.c | 80 +- sound/core/pcm_dmaengine.c | 83 ++ sound/pci/hda/patch_hdmi.c | 19 +- sound/soc/amd/acp-pcm-dma.c | 63 +- sound/soc/amd/raven/acp3x-pcm-dma.c | 56 +- sound/soc/atmel/atmel-pcm-pdc.c | 48 +- sound/soc/au1x/dbdma2.c | 64 +- sound/soc/au1x/dma.c | 63 +- sound/soc/bcm/cygnus-pcm.c | 56 +- sound/soc/codecs/Kconfig | 44 +- sound/soc/codecs/Makefile | 10 + sound/soc/codecs/adau1761.c | 129 ++ sound/soc/codecs/adau7118-hw.c | 43 + sound/soc/codecs/adau7118-i2c.c | 82 ++ sound/soc/codecs/adau7118.c | 586 +++++++++ sound/soc/codecs/adau7118.h | 24 + sound/soc/codecs/cros_ec_codec.c | 1128 +++++++++++++---- sound/soc/codecs/cx2072x.c | 2 +- sound/soc/codecs/hdac_hda.c | 114 +- sound/soc/codecs/hdac_hda.h | 13 +- sound/soc/codecs/madera.h | 2 + sound/soc/codecs/msm8916-wcd-analog.c | 54 +- sound/soc/codecs/mt6358.c | 105 ++ sound/soc/codecs/pcm3168a.c | 143 ++- sound/soc/codecs/rt1011.c | 249 +++- sound/soc/codecs/rt1011.h | 24 + sound/soc/codecs/rt5514-spi.c | 41 +- sound/soc/codecs/rt5645.c | 19 +- sound/soc/codecs/rt5663.c | 4 +- sound/soc/codecs/rt5677-spi.c | 399 +++++++ sound/soc/codecs/rt5677-spi.h | 1 + sound/soc/codecs/rt5677.c | 445 +++++-- sound/soc/codecs/rt5677.h | 11 +- sound/soc/codecs/rt5682.c | 43 +- sound/soc/codecs/tas2562.c | 590 +++++++++ sound/soc/codecs/tas2562.h | 85 ++ sound/soc/codecs/tas2770.c | 819 +++++++++++++ sound/soc/codecs/tas2770.h | 143 +++ sound/soc/codecs/tlv320aic31xx.c | 45 + sound/soc/codecs/tlv320aic31xx.h | 8 + sound/soc/codecs/tlv320aic32x4.c | 3 + sound/soc/codecs/wcd9335.c | 10 +- sound/soc/codecs/wm2200.c | 5 + sound/soc/codecs/wm5100.c | 2 + sound/soc/codecs/wm8904.c | 73 +- sound/soc/codecs/wm8904.h | 1 + sound/soc/codecs/wm8958-dsp2.c | 22 +- sound/soc/codecs/wm8994.c | 156 ++- sound/soc/codecs/wm8994.h | 10 +- sound/soc/codecs/wm_adsp.c | 81 +- sound/soc/codecs/wm_adsp.h | 4 + sound/soc/dwc/dwc-pcm.c | 48 +- sound/soc/fsl/Kconfig | 10 + sound/soc/fsl/Makefile | 2 + sound/soc/fsl/fsl_asrc.c | 110 +- sound/soc/fsl/fsl_asrc.h | 7 +- sound/soc/fsl/fsl_asrc_dma.c | 120 +- sound/soc/fsl/fsl_audmix.c | 6 + sound/soc/fsl/fsl_audmix.h | 1 + sound/soc/fsl/fsl_dma.c | 54 +- sound/soc/fsl/fsl_esai.c | 12 + sound/soc/fsl/fsl_mqs.c | 335 ++++++ sound/soc/fsl/imx-pcm-fiq.c | 56 +- sound/soc/fsl/mpc5200_dma.c | 51 +- sound/soc/generic/audio-graph-card.c | 4 +- sound/soc/generic/simple-card.c | 4 +- sound/soc/intel/Kconfig | 17 +- sound/soc/intel/atom/sst-mfld-platform-pcm.c | 30 +- sound/soc/intel/baytrail/sst-baytrail-pcm.c | 52 +- sound/soc/intel/boards/Kconfig | 52 +- sound/soc/intel/boards/Makefile | 14 +- sound/soc/intel/boards/bdw-rt5677.c | 51 + sound/soc/intel/boards/bxt_da7219_max98357a.c | 11 + sound/soc/intel/boards/bxt_rt298.c | 11 + sound/soc/intel/boards/bytcr_rt5640.c | 10 +- sound/soc/intel/boards/cht_bsw_rt5645.c | 26 +- sound/soc/intel/boards/cml_rt1011_rt5682.c | 487 ++++++++ sound/soc/intel/boards/glk_rt5682_max98357a.c | 11 + sound/soc/intel/boards/hda_dsp_common.c | 85 ++ sound/soc/intel/boards/hda_dsp_common.h | 32 + .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 149 ++- sound/soc/intel/boards/skl_hda_dsp_common.c | 6 + sound/soc/intel/boards/skl_hda_dsp_common.h | 27 +- sound/soc/intel/boards/skl_hda_dsp_generic.c | 3 +- sound/soc/intel/boards/sof_rt5682.c | 13 +- sound/soc/intel/common/Makefile | 4 +- sound/soc/intel/common/soc-acpi-intel-cfl-match.c | 18 + sound/soc/intel/common/soc-acpi-intel-cml-match.c | 56 + sound/soc/intel/common/soc-acpi-intel-cnl-match.c | 31 - sound/soc/intel/common/soc-acpi-intel-jsl-match.c | 18 + sound/soc/intel/haswell/sst-haswell-pcm.c | 62 +- sound/soc/intel/skylake/skl-pcm.c | 67 +- sound/soc/jz4740/jz4740-i2s.c | 6 +- sound/soc/kirkwood/kirkwood-dma.c | 52 +- sound/soc/mediatek/Kconfig | 1 + .../soc/mediatek/common/mtk-afe-platform-driver.c | 28 +- .../soc/mediatek/common/mtk-afe-platform-driver.h | 10 +- sound/soc/mediatek/common/mtk-btcvsd.c | 76 +- sound/soc/mediatek/mt6797/mt6797-afe-pcm.c | 11 +- sound/soc/mediatek/mt8183/mt8183-afe-pcm.c | 26 +- .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 70 +- sound/soc/meson/axg-fifo.c | 56 +- sound/soc/meson/axg-fifo.h | 20 +- sound/soc/meson/axg-frddr.c | 24 +- sound/soc/meson/axg-toddr.c | 24 +- sound/soc/pxa/mmp-pcm.c | 62 +- sound/soc/pxa/poodle.c | 2 +- sound/soc/pxa/pxa-ssp.c | 14 +- sound/soc/pxa/pxa2xx-ac97.c | 14 +- sound/soc/pxa/pxa2xx-i2s.c | 14 +- sound/soc/pxa/pxa2xx-pcm.c | 14 +- sound/soc/qcom/lpass-platform.c | 70 +- sound/soc/qcom/qdsp6/q6asm-dai.c | 106 +- sound/soc/qcom/qdsp6/q6asm.c | 55 + sound/soc/qcom/qdsp6/q6asm.h | 15 + sound/soc/qcom/qdsp6/q6routing.c | 14 +- sound/soc/rockchip/Kconfig | 3 +- sound/soc/rockchip/rockchip_max98090.c | 313 ++++- sound/soc/samsung/Kconfig | 12 +- sound/soc/samsung/Makefile | 4 +- sound/soc/samsung/arndale.c | 217 ++++ sound/soc/samsung/arndale_rt5631.c | 164 --- sound/soc/samsung/idma.c | 58 +- sound/soc/sh/dma-sh7760.c | 46 +- sound/soc/sh/fsi.c | 31 +- sound/soc/sh/rcar/core.c | 54 +- sound/soc/sh/rcar/dma.c | 30 +- sound/soc/sh/siu_pcm.c | 44 +- sound/soc/soc-component.c | 125 +- sound/soc/soc-compress.c | 52 +- sound/soc/soc-core.c | 1175 +++++++++--------- sound/soc/soc-generic-dmaengine-pcm.c | 165 +-- sound/soc/soc-jack.c | 3 +- sound/soc/soc-ops.c | 11 +- sound/soc/soc-pcm.c | 235 ++-- sound/soc/soc-topology.c | 17 +- sound/soc/soc-utils.c | 11 +- sound/soc/sof/Kconfig | 43 +- sound/soc/sof/control.c | 34 + sound/soc/sof/core.c | 44 +- sound/soc/sof/debug.c | 16 + sound/soc/sof/imx/Kconfig | 8 +- sound/soc/sof/imx/imx8.c | 7 + sound/soc/sof/intel/Kconfig | 50 +- sound/soc/sof/intel/apl.c | 8 + sound/soc/sof/intel/bdw.c | 31 +- sound/soc/sof/intel/byt.c | 44 +- sound/soc/sof/intel/cnl.c | 67 +- sound/soc/sof/intel/hda-codec.c | 22 +- sound/soc/sof/intel/hda-dsp.c | 137 ++- sound/soc/sof/intel/hda-ipc.c | 6 +- sound/soc/sof/intel/hda-ipc.h | 51 + sound/soc/sof/intel/hda-loader.c | 25 +- sound/soc/sof/intel/hda-pcm.c | 15 +- sound/soc/sof/intel/hda-stream.c | 24 +- sound/soc/sof/intel/hda.c | 25 +- sound/soc/sof/intel/hda.h | 23 +- sound/soc/sof/ipc.c | 10 +- sound/soc/sof/ops.h | 10 + sound/soc/sof/pcm.c | 135 ++- sound/soc/sof/pm.c | 130 +- sound/soc/sof/sof-acpi-dev.c | 12 +- sound/soc/sof/sof-pci-dev.c | 88 +- sound/soc/sof/sof-priv.h | 54 +- sound/soc/sof/topology.c | 498 +++++--- sound/soc/sof/trace.c | 17 +- sound/soc/sprd/sprd-pcm-dma.c | 74 +- sound/soc/stm/stm32_adfsdm.c | 42 +- sound/soc/stm/stm32_sai.c | 2 +- sound/soc/stm/stm32_spdifrx.c | 18 +- sound/soc/sunxi/sun4i-codec.c | 6 +- sound/soc/tegra/tegra30_i2s.c | 56 +- sound/soc/ti/davinci-mcasp.c | 2 +- sound/soc/txx9/txx9aclc.c | 48 +- sound/soc/uniphier/aio-dma.c | 51 +- sound/soc/ux500/ux500_msp_i2s.c | 3 +- sound/soc/xilinx/xlnx_formatter_pcm.c | 63 +- sound/soc/xtensa/xtfpga-i2s.c | 30 +- tools/arch/arm/include/uapi/asm/kvm.h | 4 +- tools/arch/arm64/include/uapi/asm/kvm.h | 4 +- tools/arch/s390/include/uapi/asm/kvm.h | 6 + tools/arch/x86/include/uapi/asm/svm.h | 1 + tools/arch/x86/include/uapi/asm/vmx.h | 8 +- tools/bpf/Makefile | 6 +- tools/gpio/Makefile | 6 +- tools/include/uapi/asm-generic/mman-common.h | 3 + tools/include/uapi/drm/i915_drm.h | 1 + tools/include/uapi/linux/fs.h | 55 +- tools/include/uapi/linux/fscrypt.h | 181 +++ tools/include/uapi/linux/kvm.h | 5 + tools/include/uapi/linux/sched.h | 30 +- tools/include/uapi/linux/usbdevice_fs.h | 4 + tools/lib/bpf/Makefile | 33 +- tools/lib/bpf/libbpf_internal.h | 16 + tools/lib/bpf/xsk.c | 4 +- tools/lib/subcmd/Makefile | 8 +- tools/perf/Documentation/asciidoc.conf | 3 + tools/perf/Documentation/jitdump-specification.txt | 4 +- tools/perf/arch/arm/annotate/instructions.c | 4 +- tools/perf/arch/arm64/annotate/instructions.c | 4 +- tools/perf/arch/powerpc/util/header.c | 3 +- tools/perf/arch/s390/annotate/instructions.c | 6 +- tools/perf/arch/s390/util/header.c | 9 +- tools/perf/arch/x86/annotate/instructions.c | 6 +- tools/perf/arch/x86/util/header.c | 3 +- tools/perf/builtin-c2c.c | 14 +- tools/perf/builtin-kmem.c | 1 + tools/perf/builtin-kvm.c | 7 +- tools/perf/builtin-script.c | 6 +- tools/perf/check-headers.sh | 1 + tools/perf/jvmti/Build | 6 +- tools/perf/perf-sys.h | 6 +- .../arch/s390/{cf_m8561 => cf_z15}/basic.json | 0 .../arch/s390/{cf_m8561 => cf_z15}/crypto.json | 0 .../arch/s390/{cf_m8561 => cf_z15}/crypto6.json | 0 .../arch/s390/{cf_m8561 => cf_z15}/extended.json | 0 .../pmu-events/arch/s390/cf_z15/transaction.json | 7 + tools/perf/pmu-events/arch/s390/mapfile.csv | 2 +- tools/perf/pmu-events/jevents.c | 12 +- tools/perf/tests/perf-hooks.c | 3 +- tools/perf/util/annotate.c | 35 +- tools/perf/util/annotate.h | 4 + tools/perf/util/copyfile.c | 8 +- tools/perf/util/evlist.c | 2 +- tools/perf/util/evsel.c | 3 +- tools/perf/util/header.c | 4 +- tools/perf/util/hist.c | 2 +- tools/perf/util/jitdump.c | 6 +- tools/perf/util/llvm-utils.c | 6 +- tools/perf/util/map.c | 3 + tools/perf/util/python.c | 6 + .../perf/util/scripting-engines/trace-event-perl.c | 8 +- .../util/scripting-engines/trace-event-python.c | 9 +- tools/perf/util/trace-event-parse.c | 31 - tools/perf/util/trace-event.h | 2 - tools/perf/util/util.c | 6 +- tools/testing/selftests/Makefile | 19 +- .../selftests/bpf/prog_tests/sockopt_inherit.c | 2 +- tools/testing/selftests/bpf/prog_tests/tcp_rtt.c | 3 +- tools/testing/selftests/bpf/test_flow_dissector.sh | 3 + tools/testing/selftests/bpf/test_lwt_ip_encap.sh | 6 +- tools/testing/selftests/bpf/test_offload.py | 5 + tools/testing/selftests/bpf/test_sysctl.c | 8 +- tools/testing/selftests/bpf/test_tc_edt.sh | 2 +- tools/testing/selftests/drivers/net/mlxsw/vxlan.sh | 8 +- tools/testing/selftests/kselftest/runner.sh | 36 +- tools/testing/selftests/kselftest_install.sh | 4 +- tools/testing/selftests/kvm/.gitignore | 2 + tools/testing/selftests/kvm/include/x86_64/vmx.h | 2 + tools/testing/selftests/kvm/lib/assert.c | 4 +- tools/testing/selftests/kvm/lib/x86_64/vmx.c | 10 + .../testing/selftests/kvm/x86_64/sync_regs_test.c | 21 +- .../kvm/x86_64/vmx_close_while_nested_test.c | 6 +- .../selftests/kvm/x86_64/vmx_dirty_log_test.c | 2 + .../kvm/x86_64/vmx_set_nested_state_test.c | 13 +- .../selftests/kvm/x86_64/vmx_tsc_adjust_test.c | 6 +- tools/testing/selftests/net/fib_tests.sh | 21 + tools/testing/selftests/net/l2tp.sh | 0 tools/testing/selftests/net/reuseport_dualstack.c | 3 +- tools/testing/selftests/net/tls.c | 108 ++ tools/testing/selftests/powerpc/mm/tlbie_test.c | 2 +- tools/testing/selftests/ptp/testptp.c | 53 +- tools/testing/selftests/rtc/settings | 1 + tools/testing/selftests/vm/gup_benchmark.c | 4 +- tools/testing/selftests/watchdog/watchdog-test.c | 27 +- tools/usb/usbip/libsrc/usbip_device_driver.c | 6 +- .../gettimeofday.S => tools/virtio/crypto/hash.h | 0 tools/virtio/linux/dma-mapping.h | 2 + tools/virtio/xen/xen.h | 6 + virt/kvm/arm/pmu.c | 48 +- virt/kvm/kvm_main.c | 238 +++- 1828 files changed, 29811 insertions(+), 15008 deletions(-) create mode 100644 Documentation/admin-guide/hw-vuln/multihit.rst create mode 100644 Documentation/admin-guide/hw-vuln/tsx_async_abort.rst rename Documentation/{kbuild/namespaces.rst => core-api/symbol-namespaces.rst} (100%) create mode 100644 Documentation/devicetree/bindings/sound/adi,adau7118.yaml create mode 100644 Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-codec.yaml create mode 100644 Documentation/devicetree/bindings/sound/allwinner,sun8i-a23-codec-analog.yaml create mode 100644 Documentation/devicetree/bindings/sound/fsl,mqs.txt delete mode 100644 Documentation/devicetree/bindings/sound/renesas,fsi.txt create mode 100644 Documentation/devicetree/bindings/sound/renesas,fsi.yaml delete mode 100644 Documentation/devicetree/bindings/sound/samsung,odroid.txt create mode 100644 Documentation/devicetree/bindings/sound/samsung,odroid.yaml delete mode 100644 Documentation/devicetree/bindings/sound/samsung-i2s.txt create mode 100644 Documentation/devicetree/bindings/sound/samsung-i2s.yaml delete mode 100644 Documentation/devicetree/bindings/sound/sun4i-codec.txt delete mode 100644 Documentation/devicetree/bindings/sound/sun8i-codec-analog.txt create mode 100644 Documentation/devicetree/bindings/sound/tas2562.txt create mode 100644 Documentation/devicetree/bindings/sound/tas2770.txt delete mode 100644 Documentation/usb/rio.rst create mode 100644 Documentation/x86/tsx_async_abort.rst delete mode 100644 arch/arm64/include/asm/vdso_datapage.h create mode 100644 arch/riscv/kernel/head.h create mode 100644 arch/x86/kernel/cpu/tsx.c create mode 100644 drivers/net/wireless/mediatek/mt76/pci.c delete mode 100644 drivers/staging/fbtft/fbtft_device.c delete mode 100644 drivers/staging/fbtft/flexfb.c create mode 100644 drivers/staging/speakup/sysfs-driver-speakup delete mode 100644 drivers/usb/misc/rio500.c delete mode 100644 drivers/usb/misc/rio500_usb.h create mode 100644 include/sound/sof/dai-imx.h delete mode 100644 scripts/coccinelle/api/devm_platform_ioremap_resource.cocci create mode 100644 sound/soc/codecs/adau7118-hw.c create mode 100644 sound/soc/codecs/adau7118-i2c.c create mode 100644 sound/soc/codecs/adau7118.c create mode 100644 sound/soc/codecs/adau7118.h create mode 100644 sound/soc/codecs/tas2562.c create mode 100644 sound/soc/codecs/tas2562.h create mode 100644 sound/soc/codecs/tas2770.c create mode 100644 sound/soc/codecs/tas2770.h create mode 100644 sound/soc/fsl/fsl_mqs.c create mode 100644 sound/soc/intel/boards/cml_rt1011_rt5682.c create mode 100644 sound/soc/intel/boards/hda_dsp_common.c create mode 100644 sound/soc/intel/boards/hda_dsp_common.h create mode 100644 sound/soc/intel/common/soc-acpi-intel-cfl-match.c create mode 100644 sound/soc/intel/common/soc-acpi-intel-cml-match.c create mode 100644 sound/soc/intel/common/soc-acpi-intel-jsl-match.c create mode 100644 sound/soc/samsung/arndale.c delete mode 100644 sound/soc/samsung/arndale_rt5631.c create mode 100644 sound/soc/sof/intel/hda-ipc.h create mode 100644 tools/include/uapi/linux/fscrypt.h rename tools/perf/pmu-events/arch/s390/{cf_m8561 => cf_z15}/basic.json (100%) rename tools/perf/pmu-events/arch/s390/{cf_m8561 => cf_z15}/crypto.json (100%) rename tools/perf/pmu-events/arch/s390/{cf_m8561 => cf_z15}/crypto6.json (100%) rename tools/perf/pmu-events/arch/s390/{cf_m8561 => cf_z15}/extended.json (100%) create mode 100644 tools/perf/pmu-events/arch/s390/cf_z15/transaction.json mode change 100644 => 100755 tools/testing/selftests/net/l2tp.sh create mode 100644 tools/testing/selftests/rtc/settings rename arch/arm64/kernel/vdso/gettimeofday.S => tools/virtio/crypto/hash.h (100%) create mode 100644 tools/virtio/xen/xen.h

2 1

[alsa-devel] [PATCH alsa-lib 1/4] ucm: Fix opening of master-configs by the card's longname
by Hans de Goede 25 Nov '19

25 Nov '19

Prior to commit aba2260ae7b5 ("ucm: switch to ucm2 directory and v2 format, keep backward compatibility"). The filename build in parse_verb_file() was build like this: <prefix>/<uc_mgr->conf_file_name>/<file> Where uc_mgr->conf_file_name would contain either the card_name or the card's longname depending on the detection of a longname based config in uc_mgr_import_master_config(). While the filename used in load_master_config() was build like this: <prefix>/<card_name>/<card_name>.conf And uc_mgr_import_master_config() first calls load_master_config() with the card's longname and if that succeeds it overwrites uc_mgr->conf_file_name with the longname so that the subsequent uses of uc_mgr->conf_file_name in parse_verb_file() correctly use the longname. But the new configuration_filename() helper added in commit aba2260ae7b5 _always_ builds the filename like this: <prefix>/<uc_mgr->conf_file_name>/<file><suffix> This breaks the loading of the master-config by its longname, as when the longname is tried uc_mgr->conf_file_name still contains the card_name. This commit fixes this by adding a dir parameter to configuration_filename() and restoring the old behavior by passing card_name as dir in load_master_config(). Fixes: aba2260ae7b5 ("ucm: switch to ucm2 directory and v2 format, keep backward compatibility") Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- src/ucm/parser.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/ucm/parser.c b/src/ucm/parser.c index ed790dc0..17aab054 100644 --- a/src/ucm/parser.c +++ b/src/ucm/parser.c @@ -76,9 +76,10 @@ static void configuration_filename2(char *fn, size_t fn_len, int format, static void configuration_filename(snd_use_case_mgr_t *uc_mgr, char *fn, size_t fn_len, - const char *file, const char *suffix) + const char *dir, const char *file, + const char *suffix) { - const char *env, *dir; + const char *env; if (uc_mgr->conf_format > 0) { /* known format */ @@ -94,13 +95,11 @@ static void configuration_filename(snd_use_case_mgr_t *uc_mgr, } } if (env) { - snprintf(fn, fn_len, "%s/%s/%s%s", - env, uc_mgr->conf_file_name, file, suffix); + snprintf(fn, fn_len, "%s/%s/%s%s", env, dir, file, suffix); fn[fn_len-1] = '\0'; return; } - dir = uc_mgr->conf_file_name; if (uc_mgr->conf_format > 0) { __format: configuration_filename2(fn, fn_len, uc_mgr->conf_format, @@ -1181,7 +1180,8 @@ static int parse_verb_file(snd_use_case_mgr_t *uc_mgr, } /* open Verb file for reading */ - configuration_filename(uc_mgr, filename, sizeof(filename), file, ""); + configuration_filename(uc_mgr, filename, sizeof(filename), + uc_mgr->conf_file_name, file, ""); err = uc_mgr_config_load(uc_mgr->conf_format, filename, &cfg); if (err < 0) { uc_error("error: failed to open verb file %s : %d", @@ -1576,7 +1576,7 @@ static int load_master_config(snd_use_case_mgr_t *uc_mgr, } configuration_filename(uc_mgr, filename, sizeof(filename), - card_name, ".conf"); + card_name, card_name, ".conf"); /* if the configuration file does not exist, silently return */ if (fcheck && access(filename, R_OK) != 0) -- 2.23.0

3 9

[alsa-devel] [PATCH 00/14] ASoC: soc-core cleanup step6
by Kuninori Morimoto 25 Nov '19

25 Nov '19

Hi Mark These are soc-core cleanup step6. These doesn't add new features. Kuninori Morimoto (14): ASoC: soc-core: remove dai_link_list ASoC: soc-core: remove snd_soc_disconnect_sync() ASoC: soc-core: remove snd_soc_get_dai_substream() ASoC: soc-core: move snd_soc_get_pcm_runtime() ASoC: soc-core: find rtd via dai_link pointer at snd_soc_get_pcm_runtime() ASoC: soc-core: move snd_soc_find_dai_link() ASoC: soc-core: rename snd_soc_add_dai_link() to snd_soc_add_pcm_runtime() ASoC: soc-core: rename snd_soc_remove_dai_link() to snd_soc_remove_pcm_runtime() ASoC: soc-core: move soc_link_dai_pcm_new() ASoC: soc-core: rename soc_link_dai_pcm_new() to soc_dai_pcm_new() ASoC: soc-core: move soc_link_init() ASoC: soc-core: rename soc_link_init() to soc_init_pcm_runtime() ASoC: soc-core: soc_set_name_prefix(): tidyup loop condition ASoC: soc-core: soc_set_name_prefix(): get component device_node at out of loop include/sound/soc.h | 22 +-- sound/soc/fsl/fsl-asoc-card.c | 2 +- sound/soc/pxa/mioa701_wm9713.c | 2 +- sound/soc/samsung/bells.c | 12 +- sound/soc/samsung/littlemill.c | 10 +- sound/soc/samsung/snow.c | 2 +- sound/soc/samsung/speyside.c | 4 +- sound/soc/samsung/tm2_wm5110.c | 6 +- sound/soc/samsung/tobermory.c | 6 +- sound/soc/sh/rcar/core.c | 2 - sound/soc/soc-core.c | 339 ++++++++++++++++------------------------- sound/soc/soc-topology.c | 47 +++++- sound/soc/tegra/tegra_wm8903.c | 2 +- 13 files changed, 204 insertions(+), 252 deletions(-) -- 2.7.4

3 22

[alsa-devel] [sound:for-next 127/148] sound/drivers/aloop.c:313: undefined reference to `snd_timer_close'
by kbuild test robot 24 Nov '19

24 Nov '19

tree: https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git for-next head: 9314e44f455c8b46d08b2d379cb9e8fba5767207 commit: 26c53379f98d22d6a3e50bb146651dc7824334d7 [127/148] ALSA: aloop: Support selection of snd_timer instead of jiffies config: i386-randconfig-f001-20191124 (attached as .config) compiler: gcc-7 (Debian 7.4.0-14) 7.4.0 reproduce: git checkout 26c53379f98d22d6a3e50bb146651dc7824334d7 # save the attached .config to linux build tree make ARCH=i386 If you fix the issue, kindly add following tag Reported-by: kbuild test robot <lkp(a)intel.com> All errors (new ones prefixed by >>): ld: sound/drivers/aloop.o: in function `loopback_snd_timer_close_cable': >> sound/drivers/aloop.c:313: undefined reference to `snd_timer_close' >> ld: sound/drivers/aloop.c:314: undefined reference to `snd_timer_instance_free' ld: sound/drivers/aloop.o: in function `loopback_snd_timer_stop': >> sound/drivers/aloop.c:276: undefined reference to `snd_timer_stop' ld: sound/drivers/aloop.o: in function `loopback_snd_timer_start': >> sound/drivers/aloop.c:237: undefined reference to `snd_timer_start' ld: sound/drivers/aloop.o: in function `loopback_snd_timer_open': >> sound/drivers/aloop.c:1129: undefined reference to `snd_timer_instance_new' >> ld: sound/drivers/aloop.c:1164: undefined reference to `snd_timer_open' ld: sound/drivers/aloop.c:1173: undefined reference to `snd_timer_instance_free' vim +313 sound/drivers/aloop.c 227 228 /* call in cable->lock */ 229 static int loopback_snd_timer_start(struct loopback_pcm *dpcm) 230 { 231 struct loopback_cable *cable = dpcm->cable; 232 int err; 233 234 /* Loopback device has to use same period as timer card. Therefore 235 * wake up for each snd_pcm_period_elapsed() call of timer card. 236 */ > 237 err = snd_timer_start(cable->snd_timer.instance, 1); 238 if (err < 0) { 239 /* do not report error if trying to start but already 240 * running. For example called by opposite substream 241 * of the same cable 242 */ 243 if (err == -EBUSY) 244 return 0; 245 246 pcm_err(dpcm->substream->pcm, 247 "snd_timer_start(%d,%d,%d) failed with %d", 248 cable->snd_timer.id.card, 249 cable->snd_timer.id.device, 250 cable->snd_timer.id.subdevice, 251 err); 252 } 253 254 return err; 255 } 256 257 /* call in cable->lock */ 258 static inline int loopback_jiffies_timer_stop(struct loopback_pcm *dpcm) 259 { 260 del_timer(&dpcm->timer); 261 dpcm->timer.expires = 0; 262 263 return 0; 264 } 265 266 /* call in cable->lock */ 267 static int loopback_snd_timer_stop(struct loopback_pcm *dpcm) 268 { 269 struct loopback_cable *cable = dpcm->cable; 270 int err; 271 272 /* only stop if both devices (playback and capture) are not running */ 273 if (cable->running ^ cable->pause) 274 return 0; 275 > 276 err = snd_timer_stop(cable->snd_timer.instance); 277 if (err < 0) { 278 pcm_err(dpcm->substream->pcm, 279 "snd_timer_stop(%d,%d,%d) failed with %d", 280 cable->snd_timer.id.card, 281 cable->snd_timer.id.device, 282 cable->snd_timer.id.subdevice, 283 err); 284 } 285 286 return err; 287 } 288 289 static inline int loopback_jiffies_timer_stop_sync(struct loopback_pcm *dpcm) 290 { 291 del_timer_sync(&dpcm->timer); 292 293 return 0; 294 } 295 296 /* call in loopback->cable_lock */ 297 static int loopback_snd_timer_close_cable(struct loopback_pcm *dpcm) 298 { 299 struct loopback_cable *cable = dpcm->cable; 300 301 /* snd_timer was not opened */ 302 if (!cable->snd_timer.instance) 303 return 0; 304 305 /* wait till drain tasklet has finished if requested */ 306 tasklet_kill(&cable->snd_timer.event_tasklet); 307 308 /* will only be called from free_cable() when other stream was 309 * already closed. Other stream cannot be reopened as long as 310 * loopback->cable_lock is locked. Therefore no need to lock 311 * cable->lock; 312 */ > 313 snd_timer_close(cable->snd_timer.instance); > 314 snd_timer_instance_free(cable->snd_timer.instance); 315 memset(&cable->snd_timer, 0, sizeof(cable->snd_timer)); 316 317 return 0; 318 } 319 --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org Intel Corporation

3 2

[alsa-devel] [PATCH] ALSA: aloop: Fix dependency on timer API
by Takashi Iwai 24 Nov '19

24 Nov '19

An explicit Kconfig dependency is missing for the recent addition of the timer support. CONFIG_SND_TIMER isn't always selected by SND_PCM. Fixes: 26c53379f98d ("ALSA: aloop: Support selection of snd_timer instead of jiffies") Reported-by: kbuild test robot <lkp(a)intel.com> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/drivers/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/drivers/Kconfig b/sound/drivers/Kconfig index 15d6d46acf9c..577c8e03ec4d 100644 --- a/sound/drivers/Kconfig +++ b/sound/drivers/Kconfig @@ -92,6 +92,7 @@ config SND_DUMMY config SND_ALOOP tristate "Generic loopback driver (PCM)" select SND_PCM + select SND_TIMER help Say 'Y' or 'M' to include support for the PCM loopback device. This module returns played samples back to the user space using -- 2.16.4

1 0

[alsa-devel] [PATCH v2] ASoC: rsnd: fix DALIGN register for SSIU
by Eugeniu Rosca 22 Nov '19

22 Nov '19

From: Nilkanth Ahirrao <anilkanth(a)jp.adit-jv.com> The current driver only sets 0x76543210 and 0x67452301 for DALIGN. This doesn’t work well for TDM split and ex-split mode for all SSIU. This patch programs the DALIGN registers based on the SSIU number. Cc: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Cc: Jiada Wang <jiada_wang(a)mentor.com> Cc: Andrew Gabbasov <andrew_gabbasov(a)mentor.com> Fixes: a914e44693d41b ("ASoC: rsnd: more clear rsnd_get_dalign() for DALIGN") Signed-off-by: Nilkanth Ahirrao <anilkanth(a)jp.adit-jv.com> Signed-off-by: Eugeniu Rosca <erosca(a)de.adit-jv.com> --- v2: - Follow Kuninori Morimoto's suggestion to reuse dalign_values[0][x] - Simplify the code based on Andrew Gabbasov's review finding v1: - https://patchwork.kernel.org/patch/11249769/ --- sound/soc/sh/rcar/core.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index e9596c2096cd..a6c1cf987e6e 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -376,6 +376,17 @@ u32 rsnd_get_adinr_bit(struct rsnd_mod *mod, struct rsnd_dai_stream *io) */ u32 rsnd_get_dalign(struct rsnd_mod *mod, struct rsnd_dai_stream *io) { + static const u32 dalign_values[8][2] = { + {0x76543210, 0x67452301}, + {0x00000032, 0x00000023}, + {0x00007654, 0x00006745}, + {0x00000076, 0x00000067}, + {0xfedcba98, 0xefcdab89}, + {0x000000ba, 0x000000ab}, + {0x0000fedc, 0x0000efcd}, + {0x000000fe, 0x000000ef}, + }; + int id = 0, inv; struct rsnd_mod *ssiu = rsnd_io_to_mod_ssiu(io); struct rsnd_mod *target; struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io); @@ -411,13 +422,18 @@ u32 rsnd_get_dalign(struct rsnd_mod *mod, struct rsnd_dai_stream *io) target = cmd ? cmd : ssiu; } + if (mod == ssiu) + id = rsnd_mod_id_sub(mod); + /* Non target mod or non 16bit needs normal DALIGN */ if ((snd_pcm_format_width(runtime->format) != 16) || (mod != target)) - return 0x76543210; + inv = 0; /* Target mod needs inverted DALIGN when 16bit */ else - return 0x67452301; + inv = 1; + + return dalign_values[id][inv]; } u32 rsnd_get_busif_shift(struct rsnd_dai_stream *io, struct rsnd_mod *mod) -- 2.24.0

3 2

[alsa-devel] [PATCH v2 1/2] ASoC: improve the DMI long card code in asoc-core
by Jaroslav Kysela 22 Nov '19

22 Nov '19

Add append_dmi_string() function and make the code more readable. Signed-off-by: Jaroslav Kysela <perex(a)perex.cz> Cc: Mark Brown <broonie(a)kernel.org> Cc: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/soc/soc-core.c | 66 +++++++++++++++++--------------------------- 1 file changed, 25 insertions(+), 41 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index b4683d4588ee..db56507174bd 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1755,6 +1755,23 @@ static int is_dmi_valid(const char *field) return 1; } +/* + * Append a string to card->dmi_longname with character cleanups. + */ +static void append_dmi_string(struct snd_soc_card *card, const char *str) +{ + char *dst = card->dmi_longname; + size_t dst_len = sizeof(card->dmi_longname); + size_t len; + + len = strlen(dst); + snprintf(dst + len, dst_len - len, "-%s", str); + + len++; /* skip the separator "-" */ + if (len < dst_len) + cleanup_dmi_name(dst + len); +} + /** * snd_soc_set_dmi_name() - Register DMI names to card * @card: The card to register DMI names @@ -1789,61 +1806,36 @@ static int is_dmi_valid(const char *field) int snd_soc_set_dmi_name(struct snd_soc_card *card, const char *flavour) { const char *vendor, *product, *product_version, *board; - size_t longname_buf_size = sizeof(card->snd_card->longname); - size_t len; if (card->long_name) return 0; /* long name already set by driver or from DMI */ - /* make up dmi long name as: vendor.product.version.board */ + /* make up dmi long name as: vendor-product-version-board */ vendor = dmi_get_system_info(DMI_BOARD_VENDOR); if (!vendor || !is_dmi_valid(vendor)) { dev_warn(card->dev, "ASoC: no DMI vendor name!\n"); return 0; } - snprintf(card->dmi_longname, sizeof(card->snd_card->longname), - "%s", vendor); + snprintf(card->dmi_longname, sizeof(card->dmi_longname), "%s", vendor); cleanup_dmi_name(card->dmi_longname); product = dmi_get_system_info(DMI_PRODUCT_NAME); if (product && is_dmi_valid(product)) { - len = strlen(card->dmi_longname); - snprintf(card->dmi_longname + len, - longname_buf_size - len, - "-%s", product); - - len++; /* skip the separator "-" */ - if (len < longname_buf_size) - cleanup_dmi_name(card->dmi_longname + len); + append_dmi_string(card, product); /* * some vendors like Lenovo may only put a self-explanatory * name in the product version field */ product_version = dmi_get_system_info(DMI_PRODUCT_VERSION); - if (product_version && is_dmi_valid(product_version)) { - len = strlen(card->dmi_longname); - snprintf(card->dmi_longname + len, - longname_buf_size - len, - "-%s", product_version); - - len++; - if (len < longname_buf_size) - cleanup_dmi_name(card->dmi_longname + len); - } + if (product_version && is_dmi_valid(product_version)) + append_dmi_string(card, product_version); } board = dmi_get_system_info(DMI_BOARD_NAME); if (board && is_dmi_valid(board)) { - len = strlen(card->dmi_longname); - snprintf(card->dmi_longname + len, - longname_buf_size - len, - "-%s", board); - - len++; - if (len < longname_buf_size) - cleanup_dmi_name(card->dmi_longname + len); + append_dmi_string(card, board); } else if (!product) { /* fall back to using legacy name */ dev_warn(card->dev, "ASoC: no DMI board/product name!\n"); @@ -1851,16 +1843,8 @@ int snd_soc_set_dmi_name(struct snd_soc_card *card, const char *flavour) } /* Add flavour to dmi long name */ - if (flavour) { - len = strlen(card->dmi_longname); - snprintf(card->dmi_longname + len, - longname_buf_size - len, - "-%s", flavour); - - len++; - if (len < longname_buf_size) - cleanup_dmi_name(card->dmi_longname + len); - } + if (flavour) + append_dmi_string(card, flavour); /* set the card long name */ card->long_name = card->dmi_longname; -- 2.20.1

3 7

[alsa-devel] [PATCH AUTOSEL 4.4 4/9] ALSA: pcm: Fix stream lock usage in snd_pcm_period_elapsed()
by Sasha Levin 22 Nov '19

22 Nov '19

From: paulhsia <paulhsia(a)chromium.org> [ Upstream commit f5cdc9d4003a2f66ea57b3edd3e04acc2b1a4439 ] If the nullity check for `substream->runtime` is outside of the lock region, it is possible to have a null runtime in the critical section if snd_pcm_detach_substream is called right before the lock. Signed-off-by: paulhsia <paulhsia(a)chromium.org> Link: https://lore.kernel.org/r/20191112171715.128727-2-paulhsia@chromium.org Signed-off-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/core/pcm_lib.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c index 3ce2b87717623..950730709d28a 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c @@ -1877,11 +1877,14 @@ void snd_pcm_period_elapsed(struct snd_pcm_substream *substream) struct snd_pcm_runtime *runtime; unsigned long flags; - if (PCM_RUNTIME_CHECK(substream)) + if (snd_BUG_ON(!substream)) return; - runtime = substream->runtime; snd_pcm_stream_lock_irqsave(substream, flags); + if (PCM_RUNTIME_CHECK(substream)) + goto _unlock; + runtime = substream->runtime; + if (!snd_pcm_running(substream) || snd_pcm_update_hw_ptr0(substream, 1) < 0) goto _end; @@ -1892,6 +1895,7 @@ void snd_pcm_period_elapsed(struct snd_pcm_substream *substream) #endif _end: kill_fasync(&runtime->fasync, SIGIO, POLL_IN); + _unlock: snd_pcm_stream_unlock_irqrestore(substream, flags); } -- 2.20.1

1 0

[alsa-devel] [PATCH AUTOSEL 4.9 07/13] ALSA: pcm: Fix stream lock usage in snd_pcm_period_elapsed()
by Sasha Levin 22 Nov '19

22 Nov '19

From: paulhsia <paulhsia(a)chromium.org> [ Upstream commit f5cdc9d4003a2f66ea57b3edd3e04acc2b1a4439 ] If the nullity check for `substream->runtime` is outside of the lock region, it is possible to have a null runtime in the critical section if snd_pcm_detach_substream is called right before the lock. Signed-off-by: paulhsia <paulhsia(a)chromium.org> Link: https://lore.kernel.org/r/20191112171715.128727-2-paulhsia@chromium.org Signed-off-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/core/pcm_lib.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c index 3acb373674c37..f09ae7efc6957 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c @@ -1877,11 +1877,14 @@ void snd_pcm_period_elapsed(struct snd_pcm_substream *substream) struct snd_pcm_runtime *runtime; unsigned long flags; - if (PCM_RUNTIME_CHECK(substream)) + if (snd_BUG_ON(!substream)) return; - runtime = substream->runtime; snd_pcm_stream_lock_irqsave(substream, flags); + if (PCM_RUNTIME_CHECK(substream)) + goto _unlock; + runtime = substream->runtime; + if (!snd_pcm_running(substream) || snd_pcm_update_hw_ptr0(substream, 1) < 0) goto _end; @@ -1892,6 +1895,7 @@ void snd_pcm_period_elapsed(struct snd_pcm_substream *substream) #endif _end: kill_fasync(&runtime->fasync, SIGIO, POLL_IN); + _unlock: snd_pcm_stream_unlock_irqrestore(substream, flags); } -- 2.20.1

1 0

[alsa-devel] [PATCH AUTOSEL 4.14 11/21] ALSA: pcm: Fix stream lock usage in snd_pcm_period_elapsed()
by Sasha Levin 22 Nov '19

22 Nov '19

From: paulhsia <paulhsia(a)chromium.org> [ Upstream commit f5cdc9d4003a2f66ea57b3edd3e04acc2b1a4439 ] If the nullity check for `substream->runtime` is outside of the lock region, it is possible to have a null runtime in the critical section if snd_pcm_detach_substream is called right before the lock. Signed-off-by: paulhsia <paulhsia(a)chromium.org> Link: https://lore.kernel.org/r/20191112171715.128727-2-paulhsia@chromium.org Signed-off-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/core/pcm_lib.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c index 729a85a6211d6..80453266a2def 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c @@ -1803,11 +1803,14 @@ void snd_pcm_period_elapsed(struct snd_pcm_substream *substream) struct snd_pcm_runtime *runtime; unsigned long flags; - if (PCM_RUNTIME_CHECK(substream)) + if (snd_BUG_ON(!substream)) return; - runtime = substream->runtime; snd_pcm_stream_lock_irqsave(substream, flags); + if (PCM_RUNTIME_CHECK(substream)) + goto _unlock; + runtime = substream->runtime; + if (!snd_pcm_running(substream) || snd_pcm_update_hw_ptr0(substream, 1) < 0) goto _end; @@ -1818,6 +1821,7 @@ void snd_pcm_period_elapsed(struct snd_pcm_substream *substream) #endif _end: kill_fasync(&runtime->fasync, SIGIO, POLL_IN); + _unlock: snd_pcm_stream_unlock_irqrestore(substream, flags); } EXPORT_SYMBOL(snd_pcm_period_elapsed); -- 2.20.1

1 0

[alsa-devel] [PATCH AUTOSEL 4.19 12/25] ALSA: pcm: Fix stream lock usage in snd_pcm_period_elapsed()
by Sasha Levin 22 Nov '19

22 Nov '19

From: paulhsia <paulhsia(a)chromium.org> [ Upstream commit f5cdc9d4003a2f66ea57b3edd3e04acc2b1a4439 ] If the nullity check for `substream->runtime` is outside of the lock region, it is possible to have a null runtime in the critical section if snd_pcm_detach_substream is called right before the lock. Signed-off-by: paulhsia <paulhsia(a)chromium.org> Link: https://lore.kernel.org/r/20191112171715.128727-2-paulhsia@chromium.org Signed-off-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/core/pcm_lib.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c index 4e6110d778bd2..ad52126d3d22e 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c @@ -1797,11 +1797,14 @@ void snd_pcm_period_elapsed(struct snd_pcm_substream *substream) struct snd_pcm_runtime *runtime; unsigned long flags; - if (PCM_RUNTIME_CHECK(substream)) + if (snd_BUG_ON(!substream)) return; - runtime = substream->runtime; snd_pcm_stream_lock_irqsave(substream, flags); + if (PCM_RUNTIME_CHECK(substream)) + goto _unlock; + runtime = substream->runtime; + if (!snd_pcm_running(substream) || snd_pcm_update_hw_ptr0(substream, 1) < 0) goto _end; @@ -1812,6 +1815,7 @@ void snd_pcm_period_elapsed(struct snd_pcm_substream *substream) #endif _end: kill_fasync(&runtime->fasync, SIGIO, POLL_IN); + _unlock: snd_pcm_stream_unlock_irqrestore(substream, flags); } EXPORT_SYMBOL(snd_pcm_period_elapsed); -- 2.20.1

1 0

[alsa-devel] [PATCH] ASoC: SOF - topology - do not change the link triger order for old firmare
by Jaroslav Kysela 22 Nov '19

22 Nov '19

BugLink: https://github.com/thesofproject/sof/issues/2102 Signed-off-by: Jaroslav Kysela <perex(a)perex.cz> Cc: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Cc: Mark Brown <broonie(a)kernel.org> --- sound/soc/sof/topology.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c index 143b8259a70a..d24268794a03 100644 --- a/sound/soc/sof/topology.c +++ b/sound/soc/sof/topology.c @@ -2935,6 +2935,7 @@ static int sof_link_load(struct snd_soc_component *scomp, int index, struct snd_soc_tplg_private *private = &cfg->priv; struct sof_ipc_dai_config config; struct snd_soc_tplg_hw_config *hw_config; + struct sof_ipc_fw_version *v = &sdev->fw_ready.version; int num_hw_configs; int ret; int i = 0; @@ -2952,9 +2953,12 @@ static int sof_link_load(struct snd_soc_component *scomp, int index, if (!link->no_pcm) { link->nonatomic = true; - /* set trigger order */ - link->trigger[0] = SND_SOC_DPCM_TRIGGER_POST; - link->trigger[1] = SND_SOC_DPCM_TRIGGER_POST; + /* this causes DSP panic on firmware v1.3 */ + if (SOF_ABI_VER(v->major, v->minor, v->micro) > SOF_ABI_VER(3, 7, 0)) { + /* set trigger order */ + link->trigger[0] = SND_SOC_DPCM_TRIGGER_POST; + link->trigger[1] = SND_SOC_DPCM_TRIGGER_POST; + } /* nothing more to do for FE dai links */ return 0; -- 2.20.1

3 2

[alsa-devel] [PATCH 1/2] ALSA: aloop: Remove redundant locking in timer open function
by Andrew Gabbasov 22 Nov '19

22 Nov '19

loopback_parse_timer_id() uses snd_card_ref(), that can lock on mutex, also snd_timer_instance_new() uses non-atomic allocation, that can sleep. So, both functions can not be called from loopback_snd_timer_open() with cable->lock spinlock locked. Moreover, most part of loopback_snd_timer_open() function body works when the opposite stream of the same cable does not yet exist, and the current stream is not yet completely open and can't be running, so existing locking of loopback->cable_lock mutex is enough to protect from conflicts with simultaneous opening or closing. Locking of cable->lock spinlock is not needed in this case. Fixes: 26c53379f98d ("ALSA: aloop: Support selection of snd_timer instead of jiffies") Signed-off-by: Andrew Gabbasov <andrew_gabbasov(a)mentor.com> --- sound/drivers/aloop.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/sound/drivers/aloop.c b/sound/drivers/aloop.c index 1408403f727a..6408932f5f72 100644 --- a/sound/drivers/aloop.c +++ b/sound/drivers/aloop.c @@ -1107,20 +1107,18 @@ static int loopback_snd_timer_open(struct loopback_pcm *dpcm) struct snd_timer_instance *timeri; struct loopback_cable *cable = dpcm->cable; - spin_lock_irq(&cable->lock); - /* check if timer was already opened. It is only opened once * per playback and capture subdevice (aka cable). */ if (cable->snd_timer.instance) - goto unlock; + goto exit; err = loopback_parse_timer_id(dpcm->loopback->timer_source, &tid); if (err < 0) { pcm_err(dpcm->substream->pcm, "Parsing timer source \'%s\' failed with %d", dpcm->loopback->timer_source, err); - goto unlock; + goto exit; } cable->snd_timer.stream = dpcm->substream->stream; @@ -1129,7 +1127,7 @@ static int loopback_snd_timer_open(struct loopback_pcm *dpcm) timeri = snd_timer_instance_new(dpcm->loopback->card->id); if (!timeri) { err = -ENOMEM; - goto unlock; + goto exit; } /* The callback has to be called from another tasklet. If * SNDRV_TIMER_IFLG_FAST is specified it will be called from the @@ -1148,10 +1146,9 @@ static int loopback_snd_timer_open(struct loopback_pcm *dpcm) tasklet_init(&cable->snd_timer.event_tasklet, loopback_snd_timer_tasklet, (unsigned long)timeri); - /* snd_timer_close() and snd_timer_open() should not be called with - * locked spinlock because both functions can block on a mutex. The - * mutex loopback->cable_lock is kept locked. Therefore snd_timer_open() - * cannot be called a second time by the other device of the same cable. + /* The mutex loopback->cable_lock is kept locked. + * Therefore snd_timer_open() cannot be called a second time + * by the other device of the same cable. * Therefore the following issue cannot happen: * [proc1] Call loopback_timer_open() -> * Unlock cable->lock for snd_timer_close/open() call @@ -1160,9 +1157,7 @@ static int loopback_snd_timer_open(struct loopback_pcm *dpcm) * [proc1] Call snd_timer_open() and overwrite running timer * instance */ - spin_unlock_irq(&cable->lock); err = snd_timer_open(timeri, &cable->snd_timer.id, current->pid); - spin_lock_irq(&cable->lock); if (err < 0) { pcm_err(dpcm->substream->pcm, "snd_timer_open (%d,%d,%d) failed with %d", @@ -1171,14 +1166,12 @@ static int loopback_snd_timer_open(struct loopback_pcm *dpcm) cable->snd_timer.id.subdevice, err); snd_timer_instance_free(timeri); - goto unlock; + goto exit; } cable->snd_timer.instance = timeri; -unlock: - spin_unlock_irq(&cable->lock); - +exit: return err; } -- 2.21.0

2 3

Re: [alsa-devel] [PATCH v5 0/7] ALSA: aloop: Support sound timer as clock source instead of jiffies
by Andrew Gabbasov 22 Nov '19

22 Nov '19

Hello Takashi, > -----Original Message----- > From: Takashi Iwai [mailto:tiwai@suse.de] > Sent: Wednesday, November 20, 2019 9:49 PM > To: Gabbasov, Andrew > Cc: alsa-devel(a)alsa-project.org; linux-kernel(a)vger.kernel.org; Jaroslav > Kysela; Takashi Iwai; Timo Wischer > Subject: Re: [PATCH v5 0/7] ALSA: aloop: Support sound timer as clock > source instead of jiffies > > On Wed, 20 Nov 2019 18:49:48 +0100, > Andrew Gabbasov wrote: > > > > This patch set is an updated version of patches by Timo Wischer: > > https://mailman.alsa-project.org/pipermail/alsa-devel/2019- > March/146871.html > > > > This patch set is required for forwarding audio data between a HW sound > > card and an aloop device without the usage of an asynchronous sample rate > > converter. > > > > Most of sound and timers related code is kept the same as in previous > set. > > The code, related to snd_pcm_link() functionality and its using for > > timer source setting, is removed (as rejected earlier). The changes in > this > > update are mainly related to the parameters handling and some cleanup. > > > > The timer source can be initially selected by "timer_source" kernel > module > > parameter. It is supposed to have the following format: > > [<pref>:](<card name>|<card idx>)[{.,}<dev idx>[{.,}<subdev idx>]] > > For example: "hw:I82801AAICH.1.0", or "1.1", or just "I82801AAICH". > > (Prefix is ignored, just allowed here to be able to use the strings, > > the user got used to). > > Although the parsing function recognizes both '.' and ',' as a separator, > > module parameters handling routines use ',' to separate parameters for > > different module instances (array elements), so we have to use '.' > > to separate device and subdevice numbers from the card name or number > > in module parameters. > > Empty string indicates using jiffies as a timer source. > > > > Besides "static" selection of timer source at module load time, > > it is possible to dynamically change it via sound "info" interface > > (using "/proc/asound/<card>/timer_source" file in read-write mode. > > The contents of this file is used as a timer source string for > > a particular loopback card, e.g. "hw:0,0,0" (and here ',' can be used > > as a separator). > > > > The timer source string value can be changed at any time, but it is > > latched by PCM substream open callback "loopback_open()" (the first > > one for a particular cable). At this point it is actually used, > > that is the string is parsed, and the timer is looked up and opened. > > This seems to be a good trade-off between flexibility of updates and > > synchronizations or racing complexity. > > > > The timer source is set for a loopback card (the same as initial setting > > by module parameter), but every cable uses the value, current at the > moment > > of opening. Theoretically, it's possible to set the timer source for each > > cable independently (via separate files), but it would be inconsistent > > with the initial setting via module parameters on a per-card basis. > > > > v2: > > https://mailman.alsa-project.org/pipermail/alsa-devel/2019- > November/157961.html > > > > v3: > > https://mailman.alsa-project.org/pipermail/alsa-devel/2019- > November/158312.html > > - Change sound card lookup to use snd_card_ref() and avoid direct access > > to sound cards array > > - Squash commits on returning error codes for timer start and stop > > - Some locking related fixes > > - Some code cleanup > > > > v4: > > https://mailman.alsa-project.org/pipermail/alsa-devel/2019- > November/158896.html > > - Change to use updated API for snd_timer_open() (separate timer > instance) > > - Change to use snd_timer_close() returning void > > - Some code cleanup > > > > v5: > > - Change to initialize timer event tasklet before calling > snd_timer_open() > > > > > > Andrew Gabbasov (1): > > ALSA: aloop: Support runtime change of snd_timer via info interface > > > > Timo Wischer (6): > > ALSA: aloop: Describe units of variables > > ALSA: aloop: Support return of error code for timer start and stop > > ALSA: aloop: Use callback functions for timer specific implementations > > ALSA: aloop: Rename all jiffies timer specific functions > > ALSA: aloop: Move CABLE_VALID_BOTH to the top of file > > ALSA: aloop: Support selection of snd_timer instead of jiffies > > Now applied all patches. Thanks. Thank you very much! Unfortunately, I found some issue with locking in patch 6 (sorry for late finding): loopback_parse_timer_id() uses snd_card_ref(), that can lock on mutex, also snd_timer_instance_new() uses non-atomic allocation, that can sleep. So, both functions can not be called from loopback_snd_timer_open() with cable->lock spinlock locked. Also, most part of loopback_snd_timer_open() function body works when the opposite stream of the same cable does not yet exist, and the current stream is not yet completely open and can't be running, so existing locking of loopback->cable_lock mutex is enough to protect from conflicts with simultaneous opening or closing. So, it looks like locking of cable->lock spinlock is not needed in loopback_snd_timer_open() at all (similarly to loopback_snd_timer_close_cable()). I'm sending a separate patch to fix this: https://mailman.alsa-project.org/pipermail/alsa-devel/2019-November/159087.h tml Also, when you requested to move tasklet_init() call to before snd_timer_open() call, I should have guessed to look into the reverse closing side too ;-) Now, I have to add one more patch to move tasklet_kill() call to after snd_timer_close(). https://mailman.alsa-project.org/pipermail/alsa-devel/2019-November/159088.h tml Please, take a look at the patches. Thanks! Best regards, Andrew

1 0

[alsa-devel] [RESEND PATCH v11 1/6] ASoC: amd:Create multiple I2S platform device endpoints
by Ravulapati Vishnu vardhan rao 22 Nov '19

22 Nov '19

Creates Platform Device endpoints for multiple I2S instances: SP and BT endpoints device. Pass PCI resources like MMIO, irq to the platform devices. Signed-off-by: Ravulapati Vishnu vardhan rao <Vishnuvardhanrao.Ravulapati(a)amd.com> Reviewed-by: Dan Carpenter <dan.carpenter(a)oracle.com> --- sound/soc/amd/raven/acp3x.h | 5 +++ sound/soc/amd/raven/pci-acp3x.c | 95 +++++++++++++++++++++++++++-------------- 2 files changed, 68 insertions(+), 32 deletions(-) diff --git a/sound/soc/amd/raven/acp3x.h b/sound/soc/amd/raven/acp3x.h index 4f2cadd..2f15fe1 100644 --- a/sound/soc/amd/raven/acp3x.h +++ b/sound/soc/amd/raven/acp3x.h @@ -7,10 +7,15 @@ #include "chip_offset_byte.h" +#define ACP3x_DEVS 3 #define ACP3x_PHY_BASE_ADDRESS 0x1240000 #define ACP3x_I2S_MODE 0 #define ACP3x_REG_START 0x1240000 #define ACP3x_REG_END 0x1250200 +#define ACP3x_I2STDM_REG_START 0x1242400 +#define ACP3x_I2STDM_REG_END 0x1242410 +#define ACP3x_BT_TDM_REG_START 0x1242800 +#define ACP3x_BT_TDM_REG_END 0x1242810 #define I2S_MODE 0x04 #define BT_TX_THRESHOLD 26 #define BT_RX_THRESHOLD 25 diff --git a/sound/soc/amd/raven/pci-acp3x.c b/sound/soc/amd/raven/pci-acp3x.c index facec24..94f5f21 100644 --- a/sound/soc/amd/raven/pci-acp3x.c +++ b/sound/soc/amd/raven/pci-acp3x.c @@ -16,17 +16,17 @@ struct acp3x_dev_data { void __iomem *acp3x_base; bool acp3x_audio_mode; struct resource *res; - struct platform_device *pdev; + struct platform_device *pdev[ACP3x_DEVS]; }; static int snd_acp3x_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) { - int ret; - u32 addr, val; struct acp3x_dev_data *adata; - struct platform_device_info pdevinfo; + struct platform_device_info pdevinfo[ACP3x_DEVS]; unsigned int irqflags; + int ret, i; + u32 addr, val; if (pci_enable_device(pci)) { dev_err(&pci->dev, "pci_enable_device failed\n"); @@ -56,10 +56,11 @@ static int snd_acp3x_probe(struct pci_dev *pci, irqflags = 0; addr = pci_resource_start(pci, 0); - adata->acp3x_base = ioremap(addr, pci_resource_len(pci, 0)); + adata->acp3x_base = devm_ioremap(&pci->dev, addr, + pci_resource_len(pci, 0)); if (!adata->acp3x_base) { ret = -ENOMEM; - goto release_regions; + goto disable_msi; } pci_set_master(pci); pci_set_drvdata(pci, adata); @@ -68,11 +69,11 @@ static int snd_acp3x_probe(struct pci_dev *pci, switch (val) { case I2S_MODE: adata->res = devm_kzalloc(&pci->dev, - sizeof(struct resource) * 2, + sizeof(struct resource) * 4, GFP_KERNEL); if (!adata->res) { ret = -ENOMEM; - goto unmap_mmio; + goto disable_msi; } adata->res[0].name = "acp3x_i2s_iomem"; @@ -80,40 +81,67 @@ static int snd_acp3x_probe(struct pci_dev *pci, adata->res[0].start = addr; adata->res[0].end = addr + (ACP3x_REG_END - ACP3x_REG_START); - adata->res[1].name = "acp3x_i2s_irq"; - adata->res[1].flags = IORESOURCE_IRQ; - adata->res[1].start = pci->irq; - adata->res[1].end = pci->irq; + adata->res[1].name = "acp3x_i2s_sp"; + adata->res[1].flags = IORESOURCE_MEM; + adata->res[1].start = addr + ACP3x_I2STDM_REG_START; + adata->res[1].end = addr + ACP3x_I2STDM_REG_END; + + adata->res[2].name = "acp3x_i2s_bt"; + adata->res[2].flags = IORESOURCE_MEM; + adata->res[2].start = addr + ACP3x_BT_TDM_REG_START; + adata->res[2].end = addr + ACP3x_BT_TDM_REG_END; + + adata->res[3].name = "acp3x_i2s_irq"; + adata->res[3].flags = IORESOURCE_IRQ; + adata->res[3].start = pci->irq; + adata->res[3].end = adata->res[3].start; adata->acp3x_audio_mode = ACP3x_I2S_MODE; memset(&pdevinfo, 0, sizeof(pdevinfo)); - pdevinfo.name = "acp3x_rv_i2s"; - pdevinfo.id = 0; - pdevinfo.parent = &pci->dev; - pdevinfo.num_res = 2; - pdevinfo.res = adata->res; - pdevinfo.data = &irqflags; - pdevinfo.size_data = sizeof(irqflags); - - adata->pdev = platform_device_register_full(&pdevinfo); - if (IS_ERR(adata->pdev)) { - dev_err(&pci->dev, "cannot register %s device\n", - pdevinfo.name); - ret = PTR_ERR(adata->pdev); - goto unmap_mmio; + pdevinfo[0].name = "acp3x_rv_i2s_dma"; + pdevinfo[0].id = 0; + pdevinfo[0].parent = &pci->dev; + pdevinfo[0].num_res = 4; + pdevinfo[0].res = &adata->res[0]; + pdevinfo[0].data = &irqflags; + pdevinfo[0].size_data = sizeof(irqflags); + + pdevinfo[1].name = "acp3x_i2s_playcap"; + pdevinfo[1].id = 0; + pdevinfo[1].parent = &pci->dev; + pdevinfo[1].num_res = 1; + pdevinfo[1].res = &adata->res[1]; + + pdevinfo[2].name = "acp3x_i2s_playcap"; + pdevinfo[2].id = 1; + pdevinfo[2].parent = &pci->dev; + pdevinfo[2].num_res = 1; + pdevinfo[2].res = &adata->res[2]; + for (i = 0; i < ACP3x_DEVS ; i++) { + adata->pdev[i] = + platform_device_register_full(&pdevinfo[i]); + if (IS_ERR(adata->pdev[i])) { + dev_err(&pci->dev, "cannot register %s device\n", + pdevinfo[i].name); + ret = PTR_ERR(adata->pdev[i]); + goto unregister_devs; + } } break; default: dev_err(&pci->dev, "Invalid ACP audio mode : %d\n", val); ret = -ENODEV; - goto unmap_mmio; + goto disable_msi; } return 0; -unmap_mmio: +unregister_devs: + if (val == I2S_MODE) + for (i = 0 ; i < ACP3x_DEVS ; i++) + platform_device_unregister(adata->pdev[i]); +disable_msi: pci_disable_msi(pci); - iounmap(adata->acp3x_base); release_regions: pci_release_regions(pci); disable_pci: @@ -125,10 +153,12 @@ static int snd_acp3x_probe(struct pci_dev *pci, static void snd_acp3x_remove(struct pci_dev *pci) { struct acp3x_dev_data *adata = pci_get_drvdata(pci); + int i; - platform_device_unregister(adata->pdev); - iounmap(adata->acp3x_base); - + if (adata->acp3x_audio_mode == ACP3x_I2S_MODE) { + for (i = 0 ; i < ACP3x_DEVS ; i++) + platform_device_unregister(adata->pdev[i]); + } pci_disable_msi(pci); pci_release_regions(pci); pci_disable_device(pci); @@ -151,6 +181,7 @@ static struct pci_driver acp3x_driver = { module_pci_driver(acp3x_driver); +MODULE_AUTHOR("Vishnuvardhanrao.Ravulapati(a)amd.com"); MODULE_AUTHOR("Maruthi.Bayyavarapu(a)amd.com"); MODULE_DESCRIPTION("AMD ACP3x PCI driver"); MODULE_LICENSE("GPL v2"); -- 2.7.4

3 2

[alsa-devel] [PATCH][RFC] ASoC: stm32: sai: manage rebind issue
by Olivier Moysan 22 Nov '19

22 Nov '19

The commit e894efef9ac7 ("ASoC: core: add support to card rebind") allows to rebind the sound card after a rebind of one of its component. With this commit, the sound card is actually rebound, but is no more functional. With the sound card rebind the simplified call sequence is: stm32_sai_sub_probe snd_soc_register_component snd_soc_try_rebind_card snd_soc_instantiate_card devm_snd_dmaengine_pcm_register The problem occurs because the pcm must be registered, before snd_soc_instantiate_card() is called. Modify SAI driver, to change the call sequence as follows: stm32_sai_sub_probe devm_snd_dmaengine_pcm_register snd_soc_register_component snd_soc_try_rebind_card --- The current patch allows to fix the issue for STM SAI driver. However, most of the drivers register the component first. So, this solution is perhaps not the right way to manage the problem. This may probably be handled in ASoC framework instead. --- Signed-off-by: Olivier Moysan <olivier.moysan(a)st.com> --- sound/soc/stm/stm32_sai_sub.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sound/soc/stm/stm32_sai_sub.c b/sound/soc/stm/stm32_sai_sub.c index 48e629ac2d88..eb35306a1232 100644 --- a/sound/soc/stm/stm32_sai_sub.c +++ b/sound/soc/stm/stm32_sai_sub.c @@ -1484,6 +1484,13 @@ static int stm32_sai_sub_probe(struct platform_device *pdev) return ret; } + ret = devm_snd_dmaengine_pcm_register(&pdev->dev, conf, 0); + if (ret) { + dev_err(&pdev->dev, "Could not register pcm dma\n"); + return ret; + } + + ret = devm_snd_soc_register_component(&pdev->dev, &stm32_component, &sai->cpu_dai_drv, 1); if (ret) @@ -1492,11 +1499,6 @@ static int stm32_sai_sub_probe(struct platform_device *pdev) if (STM_SAI_PROTOCOL_IS_SPDIF(sai)) conf = &stm32_sai_pcm_config_spdif; - ret = devm_snd_dmaengine_pcm_register(&pdev->dev, conf, 0); - if (ret) { - dev_err(&pdev->dev, "Could not register pcm dma\n"); - return ret; - } return 0; } -- 2.17.1

1 0

[alsa-devel] [RESEND PATCH v12 1/6] ASoC: amd:Create multiple I2S platform device endpoint
by Ravulapati Vishnu vardhan rao 22 Nov '19

22 Nov '19

Creates Platform Device endpoints for multiple I2S instances: SP and BT endpoints device. Pass PCI resources like MMIO, irq to the platform devices. Signed-off-by: Ravulapati Vishnu vardhan rao <Vishnuvardhanrao.Ravulapati(a)amd.com> Reviewed-by: Dan Carpenter <dan.carpenter(a)oracle.com> --- sound/soc/amd/raven/acp3x.h | 5 +++ sound/soc/amd/raven/pci-acp3x.c | 95 +++++++++++++++++++++++++++-------------- 2 files changed, 68 insertions(+), 32 deletions(-) diff --git a/sound/soc/amd/raven/acp3x.h b/sound/soc/amd/raven/acp3x.h index 4f2cadd..2f15fe1 100644 --- a/sound/soc/amd/raven/acp3x.h +++ b/sound/soc/amd/raven/acp3x.h @@ -7,10 +7,15 @@ #include "chip_offset_byte.h" +#define ACP3x_DEVS 3 #define ACP3x_PHY_BASE_ADDRESS 0x1240000 #define ACP3x_I2S_MODE 0 #define ACP3x_REG_START 0x1240000 #define ACP3x_REG_END 0x1250200 +#define ACP3x_I2STDM_REG_START 0x1242400 +#define ACP3x_I2STDM_REG_END 0x1242410 +#define ACP3x_BT_TDM_REG_START 0x1242800 +#define ACP3x_BT_TDM_REG_END 0x1242810 #define I2S_MODE 0x04 #define BT_TX_THRESHOLD 26 #define BT_RX_THRESHOLD 25 diff --git a/sound/soc/amd/raven/pci-acp3x.c b/sound/soc/amd/raven/pci-acp3x.c index facec24..94f5f21 100644 --- a/sound/soc/amd/raven/pci-acp3x.c +++ b/sound/soc/amd/raven/pci-acp3x.c @@ -16,17 +16,17 @@ struct acp3x_dev_data { void __iomem *acp3x_base; bool acp3x_audio_mode; struct resource *res; - struct platform_device *pdev; + struct platform_device *pdev[ACP3x_DEVS]; }; static int snd_acp3x_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) { - int ret; - u32 addr, val; struct acp3x_dev_data *adata; - struct platform_device_info pdevinfo; + struct platform_device_info pdevinfo[ACP3x_DEVS]; unsigned int irqflags; + int ret, i; + u32 addr, val; if (pci_enable_device(pci)) { dev_err(&pci->dev, "pci_enable_device failed\n"); @@ -56,10 +56,11 @@ static int snd_acp3x_probe(struct pci_dev *pci, irqflags = 0; addr = pci_resource_start(pci, 0); - adata->acp3x_base = ioremap(addr, pci_resource_len(pci, 0)); + adata->acp3x_base = devm_ioremap(&pci->dev, addr, + pci_resource_len(pci, 0)); if (!adata->acp3x_base) { ret = -ENOMEM; - goto release_regions; + goto disable_msi; } pci_set_master(pci); pci_set_drvdata(pci, adata); @@ -68,11 +69,11 @@ static int snd_acp3x_probe(struct pci_dev *pci, switch (val) { case I2S_MODE: adata->res = devm_kzalloc(&pci->dev, - sizeof(struct resource) * 2, + sizeof(struct resource) * 4, GFP_KERNEL); if (!adata->res) { ret = -ENOMEM; - goto unmap_mmio; + goto disable_msi; } adata->res[0].name = "acp3x_i2s_iomem"; @@ -80,40 +81,67 @@ static int snd_acp3x_probe(struct pci_dev *pci, adata->res[0].start = addr; adata->res[0].end = addr + (ACP3x_REG_END - ACP3x_REG_START); - adata->res[1].name = "acp3x_i2s_irq"; - adata->res[1].flags = IORESOURCE_IRQ; - adata->res[1].start = pci->irq; - adata->res[1].end = pci->irq; + adata->res[1].name = "acp3x_i2s_sp"; + adata->res[1].flags = IORESOURCE_MEM; + adata->res[1].start = addr + ACP3x_I2STDM_REG_START; + adata->res[1].end = addr + ACP3x_I2STDM_REG_END; + + adata->res[2].name = "acp3x_i2s_bt"; + adata->res[2].flags = IORESOURCE_MEM; + adata->res[2].start = addr + ACP3x_BT_TDM_REG_START; + adata->res[2].end = addr + ACP3x_BT_TDM_REG_END; + + adata->res[3].name = "acp3x_i2s_irq"; + adata->res[3].flags = IORESOURCE_IRQ; + adata->res[3].start = pci->irq; + adata->res[3].end = adata->res[3].start; adata->acp3x_audio_mode = ACP3x_I2S_MODE; memset(&pdevinfo, 0, sizeof(pdevinfo)); - pdevinfo.name = "acp3x_rv_i2s"; - pdevinfo.id = 0; - pdevinfo.parent = &pci->dev; - pdevinfo.num_res = 2; - pdevinfo.res = adata->res; - pdevinfo.data = &irqflags; - pdevinfo.size_data = sizeof(irqflags); - - adata->pdev = platform_device_register_full(&pdevinfo); - if (IS_ERR(adata->pdev)) { - dev_err(&pci->dev, "cannot register %s device\n", - pdevinfo.name); - ret = PTR_ERR(adata->pdev); - goto unmap_mmio; + pdevinfo[0].name = "acp3x_rv_i2s_dma"; + pdevinfo[0].id = 0; + pdevinfo[0].parent = &pci->dev; + pdevinfo[0].num_res = 4; + pdevinfo[0].res = &adata->res[0]; + pdevinfo[0].data = &irqflags; + pdevinfo[0].size_data = sizeof(irqflags); + + pdevinfo[1].name = "acp3x_i2s_playcap"; + pdevinfo[1].id = 0; + pdevinfo[1].parent = &pci->dev; + pdevinfo[1].num_res = 1; + pdevinfo[1].res = &adata->res[1]; + + pdevinfo[2].name = "acp3x_i2s_playcap"; + pdevinfo[2].id = 1; + pdevinfo[2].parent = &pci->dev; + pdevinfo[2].num_res = 1; + pdevinfo[2].res = &adata->res[2]; + for (i = 0; i < ACP3x_DEVS ; i++) { + adata->pdev[i] = + platform_device_register_full(&pdevinfo[i]); + if (IS_ERR(adata->pdev[i])) { + dev_err(&pci->dev, "cannot register %s device\n", + pdevinfo[i].name); + ret = PTR_ERR(adata->pdev[i]); + goto unregister_devs; + } } break; default: dev_err(&pci->dev, "Invalid ACP audio mode : %d\n", val); ret = -ENODEV; - goto unmap_mmio; + goto disable_msi; } return 0; -unmap_mmio: +unregister_devs: + if (val == I2S_MODE) + for (i = 0 ; i < ACP3x_DEVS ; i++) + platform_device_unregister(adata->pdev[i]); +disable_msi: pci_disable_msi(pci); - iounmap(adata->acp3x_base); release_regions: pci_release_regions(pci); disable_pci: @@ -125,10 +153,12 @@ static int snd_acp3x_probe(struct pci_dev *pci, static void snd_acp3x_remove(struct pci_dev *pci) { struct acp3x_dev_data *adata = pci_get_drvdata(pci); + int i; - platform_device_unregister(adata->pdev); - iounmap(adata->acp3x_base); - + if (adata->acp3x_audio_mode == ACP3x_I2S_MODE) { + for (i = 0 ; i < ACP3x_DEVS ; i++) + platform_device_unregister(adata->pdev[i]); + } pci_disable_msi(pci); pci_release_regions(pci); pci_disable_device(pci); @@ -151,6 +181,7 @@ static struct pci_driver acp3x_driver = { module_pci_driver(acp3x_driver); +MODULE_AUTHOR("Vishnuvardhanrao.Ravulapati(a)amd.com"); MODULE_AUTHOR("Maruthi.Bayyavarapu(a)amd.com"); MODULE_DESCRIPTION("AMD ACP3x PCI driver"); MODULE_LICENSE("GPL v2"); -- 2.7.4

2 1

[alsa-devel] [PATCH v12 2/6] ASoC: amd: Refactoring of DAI from DMA driver
by Ravulapati Vishnu vardhan rao 22 Nov '19

22 Nov '19

ASoC: PCM DMA driver should only have dma ops. So Removed all DAI related functionality.Refactoring the PCM DMA diver code.Added new file containing only DAI ops Signed-off-by: Ravulapati Vishnu vardhan rao <Vishnuvardhanrao.Ravulapati(a)amd.com> --- sound/soc/amd/raven/Makefile | 2 + sound/soc/amd/raven/acp3x-i2s.c | 262 +++++++++++++++++++++++++++++++ sound/soc/amd/raven/acp3x-pcm-dma.c | 304 +++++++----------------------------- sound/soc/amd/raven/acp3x.h | 43 +++++ 4 files changed, 365 insertions(+), 246 deletions(-) create mode 100644 sound/soc/amd/raven/acp3x-i2s.c diff --git a/sound/soc/amd/raven/Makefile b/sound/soc/amd/raven/Makefile index 108d1ac..62c22b6 100644 --- a/sound/soc/amd/raven/Makefile +++ b/sound/soc/amd/raven/Makefile @@ -2,5 +2,7 @@ # Raven Ridge platform Support snd-pci-acp3x-objs := pci-acp3x.o snd-acp3x-pcm-dma-objs := acp3x-pcm-dma.o +snd-acp3x-i2s-objs := acp3x-i2s.o obj-$(CONFIG_SND_SOC_AMD_ACP3x) += snd-pci-acp3x.o obj-$(CONFIG_SND_SOC_AMD_ACP3x) += snd-acp3x-pcm-dma.o +obj-$(CONFIG_SND_SOC_AMD_ACP3x) += snd-acp3x-i2s.o diff --git a/sound/soc/amd/raven/acp3x-i2s.c b/sound/soc/amd/raven/acp3x-i2s.c new file mode 100644 index 0000000..cdc1c61 --- /dev/null +++ b/sound/soc/amd/raven/acp3x-i2s.c @@ -0,0 +1,262 @@ +// SPDX-License-Identifier: GPL-2.0+ +// +// AMD ALSA SoC PCM Driver +// +//Copyright 2016 Advanced Micro Devices, Inc. + +#include <linux/platform_device.h> +#include <linux/module.h> +#include <linux/err.h> +#include <linux/io.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include <sound/soc.h> +#include <sound/soc-dai.h> +#include <linux/dma-mapping.h> + +#include "acp3x.h" + +#define DRV_NAME "acp3x-i2s" + +static int acp3x_i2s_set_fmt(struct snd_soc_dai *cpu_dai, + unsigned int fmt) +{ + struct i2s_dev_data *adata; + int mode; + + adata = snd_soc_dai_get_drvdata(cpu_dai); + mode = fmt & SND_SOC_DAIFMT_FORMAT_MASK; + switch (mode) { + case SND_SOC_DAIFMT_I2S: + adata->tdm_mode = false; + break; + case SND_SOC_DAIFMT_DSP_A: + adata->tdm_mode = true; + break; + default: + return -EINVAL; + } + return 0; +} + +static int acp3x_i2s_set_tdm_slot(struct snd_soc_dai *cpu_dai, + u32 tx_mask, u32 rx_mask, int slots, int slot_width) +{ + struct i2s_dev_data *adata; + u32 val, reg_val, frmt_val, frm_len; + u16 slot_len; + + adata = snd_soc_dai_get_drvdata(cpu_dai); + + /* These values are as per Hardware Spec */ + switch (slot_width) { + case SLOT_WIDTH_8: + slot_len = 8; + break; + case SLOT_WIDTH_16: + slot_len = 16; + break; + case SLOT_WIDTH_24: + slot_len = 24; + break; + case SLOT_WIDTH_32: + slot_len = 0; + break; + default: + return -EINVAL; + } + + /* Enable I2S/BT channels TDM, respective TX/RX frame lengths.*/ + + frm_len = FRM_LEN | (slots << 15) | (slot_len << 18); + if (adata->substream_type == SNDRV_PCM_STREAM_PLAYBACK) { + reg_val = mmACP_BTTDM_ITER; + frmt_val = mmACP_BTTDM_TXFRMT; + } else { + reg_val = mmACP_BTTDM_IRER; + frmt_val = mmACP_BTTDM_RXFRMT; + } + val = rv_readl(adata->acp3x_base + reg_val); + rv_writel(val | 0x2, adata->acp3x_base + reg_val); + rv_writel(frm_len, adata->acp3x_base + frmt_val); + adata->tdm_fmt = frm_len; + return 0; +} + +static int acp3x_i2s_hwparams(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) +{ + struct i2s_stream_instance *rtd; + u32 val; + u32 reg_val; + + rtd = substream->runtime->private_data; + + /* These values are as per Hardware Spec */ + switch (params_format(params)) { + case SNDRV_PCM_FORMAT_U8: + case SNDRV_PCM_FORMAT_S8: + rtd->xfer_resolution = 0x0; + break; + case SNDRV_PCM_FORMAT_S16_LE: + rtd->xfer_resolution = 0x02; + break; + case SNDRV_PCM_FORMAT_S24_LE: + rtd->xfer_resolution = 0x04; + break; + case SNDRV_PCM_FORMAT_S32_LE: + rtd->xfer_resolution = 0x05; + break; + default: + return -EINVAL; + } + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + reg_val = mmACP_BTTDM_ITER; + else + reg_val = mmACP_BTTDM_IRER; + + val = rv_readl(rtd->acp3x_base + reg_val); + val = val | (rtd->xfer_resolution << 3); + rv_writel(val, rtd->acp3x_base + reg_val); + return 0; +} + +static int acp3x_i2s_trigger(struct snd_pcm_substream *substream, + int cmd, struct snd_soc_dai *dai) +{ + struct i2s_stream_instance *rtd; + u32 val, period_bytes; + int ret, reg_val; + + rtd = substream->runtime->private_data; + period_bytes = frames_to_bytes(substream->runtime, + substream->runtime->period_size); + switch (cmd) { + case SNDRV_PCM_TRIGGER_START: + case SNDRV_PCM_TRIGGER_RESUME: + case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: + rtd->bytescount = acp_get_byte_count(rtd, + substream->stream); + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { + reg_val = mmACP_BTTDM_ITER; + rv_writel(period_bytes, rtd->acp3x_base + + mmACP_BT_TX_INTR_WATERMARK_SIZE); + } else { + reg_val = mmACP_BTTDM_IRER; + rv_writel(period_bytes, rtd->acp3x_base + + mmACP_BT_RX_INTR_WATERMARK_SIZE); + } + val = rv_readl(rtd->acp3x_base + reg_val); + val = val | BIT(0); + rv_writel(val, rtd->acp3x_base + reg_val); + rv_writel(1, rtd->acp3x_base + mmACP_BTTDM_IER); + break; + case SNDRV_PCM_TRIGGER_STOP: + case SNDRV_PCM_TRIGGER_SUSPEND: + case SNDRV_PCM_TRIGGER_PAUSE_PUSH: + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + reg_val = mmACP_BTTDM_ITER; + else + reg_val = mmACP_BTTDM_IRER; + + val = rv_readl(rtd->acp3x_base + reg_val); + val = val & ~BIT(0); + rv_writel(val, rtd->acp3x_base + reg_val); + rv_writel(0, rtd->acp3x_base + mmACP_BTTDM_IER); + break; + default: + ret = -EINVAL; + break; + } + + return ret; +} + +static struct snd_soc_dai_ops acp3x_i2s_dai_ops = { + .hw_params = acp3x_i2s_hwparams, + .trigger = acp3x_i2s_trigger, + .set_fmt = acp3x_i2s_set_fmt, + .set_tdm_slot = acp3x_i2s_set_tdm_slot, +}; + +static const struct snd_soc_component_driver acp3x_dai_component = { + .name = "acp3x-i2s", +}; + +static struct snd_soc_dai_driver acp3x_i2s_dai = { + .playback = { + .rates = SNDRV_PCM_RATE_8000_96000, + .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S8 | + SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S24_LE | + SNDRV_PCM_FMTBIT_S32_LE, + .channels_min = 2, + .channels_max = 8, + .rate_min = 8000, + .rate_max = 96000, + }, + .capture = { + .rates = SNDRV_PCM_RATE_8000_48000, + .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S8 | + SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S24_LE | + SNDRV_PCM_FMTBIT_S32_LE, + .channels_min = 2, + .channels_max = 2, + .rate_min = 8000, + .rate_max = 48000, + }, + .ops = &acp3x_i2s_dai_ops, +}; + +static int acp3x_dai_probe(struct platform_device *pdev) +{ + struct resource *res; + struct i2s_dev_data *adata; + int ret; + + adata = devm_kzalloc(&pdev->dev, sizeof(struct i2s_dev_data), + GFP_KERNEL); + if (!adata) + return -ENOMEM; + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!res) { + dev_err(&pdev->dev, "IORESOURCE_MEM FAILED\n"); + return -ENOMEM; + } + adata->acp3x_base = devm_ioremap(&pdev->dev, res->start, + resource_size(res)); + if (IS_ERR(adata->acp3x_base)) + return PTR_ERR(adata->acp3x_base); + + adata->i2s_irq = res->start; + dev_set_drvdata(&pdev->dev, adata); + ret = devm_snd_soc_register_component(&pdev->dev, + &acp3x_dai_component, &acp3x_i2s_dai, 1); + if (ret) { + dev_err(&pdev->dev, "Fail to register acp i2s dai\n"); + return -ENODEV; + } + return 0; +} + +static int acp3x_dai_remove(struct platform_device *pdev) +{ + /* As we use devm_ memory alloc there is nothing TBD here */ + + return 0; +} + +static struct platform_driver acp3x_dai_driver = { + .probe = acp3x_dai_probe, + .remove = acp3x_dai_remove, + .driver = { + .name = "acp3x_i2s_playcap", + }, +}; + +module_platform_driver(acp3x_dai_driver); + +MODULE_AUTHOR("Vishnuvardhanrao.Ravulapati(a)amd.com"); +MODULE_DESCRIPTION("AMD ACP 3.x PCM Driver"); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:" DRV_NAME); diff --git a/sound/soc/amd/raven/acp3x-pcm-dma.c b/sound/soc/amd/raven/acp3x-pcm-dma.c index 60709e3..f8ad7ce 100644 --- a/sound/soc/amd/raven/acp3x-pcm-dma.c +++ b/sound/soc/amd/raven/acp3x-pcm-dma.c @@ -18,24 +18,6 @@ #define DRV_NAME "acp3x-i2s-audio" -struct i2s_dev_data { - bool tdm_mode; - unsigned int i2s_irq; - u32 tdm_fmt; - void __iomem *acp3x_base; - struct snd_pcm_substream *play_stream; - struct snd_pcm_substream *capture_stream; -}; - -struct i2s_stream_instance { - u16 num_pages; - u16 channels; - u32 xfer_resolution; - u64 bytescount; - dma_addr_t dma_addr; - void __iomem *acp3x_base; -}; - static const struct snd_pcm_hardware acp3x_pcm_hardware_playback = { .info = SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | @@ -178,10 +160,11 @@ static int acp3x_deinit(void __iomem *acp3x_base) static irqreturn_t i2s_irq_handler(int irq, void *dev_id) { + struct i2s_dev_data *rv_i2s_data; u16 play_flag, cap_flag; u32 val; - struct i2s_dev_data *rv_i2s_data = dev_id; + rv_i2s_data = dev_id; if (!rv_i2s_data) return IRQ_NONE; @@ -278,11 +261,17 @@ static void config_acp3x_dma(struct i2s_stream_instance *rtd, int direction) static int acp3x_dma_open(struct snd_soc_component *component, struct snd_pcm_substream *substream) { - int ret = 0; - struct snd_pcm_runtime *runtime = substream->runtime; - struct i2s_dev_data *adata = dev_get_drvdata(component->dev); - struct i2s_stream_instance *i2s_data = kzalloc(sizeof(struct i2s_stream_instance), - GFP_KERNEL); + struct snd_pcm_runtime *runtime; + struct snd_soc_pcm_runtime *prtd; + struct i2s_dev_data *adata; + struct i2s_stream_instance *i2s_data; + int ret; + + runtime = substream->runtime; + prtd = substream->private_data; + component = snd_soc_rtdcom_lookup(prtd, DRV_NAME); + adata = dev_get_drvdata(component->dev); + i2s_data = kzalloc(sizeof(*i2s_data), GFP_KERNEL); if (!i2s_data) return -EINVAL; @@ -312,33 +301,18 @@ static int acp3x_dma_open(struct snd_soc_component *component, return 0; } -static u64 acp_get_byte_count(struct i2s_stream_instance *rtd, int direction) -{ - u64 byte_count; - - if (direction == SNDRV_PCM_STREAM_PLAYBACK) { - byte_count = rv_readl(rtd->acp3x_base + - mmACP_BT_TX_LINEARPOSITIONCNTR_HIGH); - byte_count |= rv_readl(rtd->acp3x_base + - mmACP_BT_TX_LINEARPOSITIONCNTR_LOW); - } else { - byte_count = rv_readl(rtd->acp3x_base + - mmACP_BT_RX_LINEARPOSITIONCNTR_HIGH); - byte_count |= rv_readl(rtd->acp3x_base + - mmACP_BT_RX_LINEARPOSITIONCNTR_LOW); - } - return byte_count; -} static int acp3x_dma_hw_params(struct snd_soc_component *component, struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { + struct snd_pcm_runtime *runtime; + struct i2s_stream_instance *rtd; int status; u64 size; - struct snd_pcm_runtime *runtime = substream->runtime; - struct i2s_stream_instance *rtd = runtime->private_data; + runtime = substream->runtime; + rtd = substream->private_data; if (!rtd) return -EINVAL; @@ -362,12 +336,12 @@ static int acp3x_dma_hw_params(struct snd_soc_component *component, static snd_pcm_uframes_t acp3x_dma_pointer(struct snd_soc_component *component, struct snd_pcm_substream *substream) { - u32 pos = 0; - u32 buffersize = 0; - u64 bytescount = 0; - struct i2s_stream_instance *rtd = - substream->runtime->private_data; + struct i2s_stream_instance *rtd; + u32 pos; + u32 buffersize; + u64 bytescount; + rtd = substream->runtime->private_data; buffersize = frames_to_bytes(substream->runtime, substream->runtime->buffer_size); bytescount = acp_get_byte_count(rtd, substream->stream); @@ -380,7 +354,10 @@ static snd_pcm_uframes_t acp3x_dma_pointer(struct snd_soc_component *component, static int acp3x_dma_new(struct snd_soc_component *component, struct snd_soc_pcm_runtime *rtd) { - struct device *parent = component->dev->parent; + struct device *parent; + + component = snd_soc_rtdcom_lookup(rtd, DRV_NAME); + parent = component->dev->parent; snd_pcm_lib_preallocate_pages_for_all(rtd->pcm, SNDRV_DMA_TYPE_DEV, parent, MIN_BUFFER, MAX_BUFFER); return 0; @@ -402,8 +379,12 @@ static int acp3x_dma_mmap(struct snd_soc_component *component, static int acp3x_dma_close(struct snd_soc_component *component, struct snd_pcm_substream *substream) { - struct i2s_stream_instance *rtd = substream->runtime->private_data; - struct i2s_dev_data *adata = dev_get_drvdata(component->dev); + struct snd_soc_pcm_runtime *prtd; + struct i2s_dev_data *adata; + + prtd = substream->private_data; + component = snd_soc_rtdcom_lookup(prtd, DRV_NAME); + adata = dev_get_drvdata(component->dev); if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) adata->play_stream = NULL; @@ -415,186 +396,9 @@ static int acp3x_dma_close(struct snd_soc_component *component, */ if (!adata->play_stream && !adata->capture_stream) rv_writel(0, adata->acp3x_base + mmACP_EXTERNAL_INTR_ENB); - kfree(rtd); - return 0; -} - -static int acp3x_dai_i2s_set_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt) -{ - - struct i2s_dev_data *adata = snd_soc_dai_get_drvdata(cpu_dai); - - switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { - case SND_SOC_DAIFMT_I2S: - adata->tdm_mode = false; - break; - case SND_SOC_DAIFMT_DSP_A: - adata->tdm_mode = true; - break; - default: - return -EINVAL; - } - - return 0; -} - -static int acp3x_dai_set_tdm_slot(struct snd_soc_dai *cpu_dai, u32 tx_mask, - u32 rx_mask, int slots, int slot_width) -{ - u32 val = 0; - u16 slot_len; - - struct i2s_dev_data *adata = snd_soc_dai_get_drvdata(cpu_dai); - - switch (slot_width) { - case SLOT_WIDTH_8: - slot_len = 8; - break; - case SLOT_WIDTH_16: - slot_len = 16; - break; - case SLOT_WIDTH_24: - slot_len = 24; - break; - case SLOT_WIDTH_32: - slot_len = 0; - break; - default: - return -EINVAL; - } - - val = rv_readl(adata->acp3x_base + mmACP_BTTDM_ITER); - rv_writel((val | 0x2), adata->acp3x_base + mmACP_BTTDM_ITER); - val = rv_readl(adata->acp3x_base + mmACP_BTTDM_IRER); - rv_writel((val | 0x2), adata->acp3x_base + mmACP_BTTDM_IRER); - - val = (FRM_LEN | (slots << 15) | (slot_len << 18)); - rv_writel(val, adata->acp3x_base + mmACP_BTTDM_TXFRMT); - rv_writel(val, adata->acp3x_base + mmACP_BTTDM_RXFRMT); - - adata->tdm_fmt = val; return 0; } -static int acp3x_dai_i2s_hwparams(struct snd_pcm_substream *substream, - struct snd_pcm_hw_params *params, - struct snd_soc_dai *dai) -{ - u32 val = 0; - struct i2s_stream_instance *rtd = substream->runtime->private_data; - - switch (params_format(params)) { - case SNDRV_PCM_FORMAT_U8: - case SNDRV_PCM_FORMAT_S8: - rtd->xfer_resolution = 0x0; - break; - case SNDRV_PCM_FORMAT_S16_LE: - rtd->xfer_resolution = 0x02; - break; - case SNDRV_PCM_FORMAT_S24_LE: - rtd->xfer_resolution = 0x04; - break; - case SNDRV_PCM_FORMAT_S32_LE: - rtd->xfer_resolution = 0x05; - break; - default: - return -EINVAL; - } - val = rv_readl(rtd->acp3x_base + mmACP_BTTDM_ITER); - val = val | (rtd->xfer_resolution << 3); - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) - rv_writel(val, rtd->acp3x_base + mmACP_BTTDM_ITER); - else - rv_writel(val, rtd->acp3x_base + mmACP_BTTDM_IRER); - - return 0; -} - -static int acp3x_dai_i2s_trigger(struct snd_pcm_substream *substream, - int cmd, struct snd_soc_dai *dai) -{ - int ret = 0; - struct i2s_stream_instance *rtd = substream->runtime->private_data; - u32 val, period_bytes; - - period_bytes = frames_to_bytes(substream->runtime, - substream->runtime->period_size); - switch (cmd) { - case SNDRV_PCM_TRIGGER_START: - case SNDRV_PCM_TRIGGER_RESUME: - case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: - rtd->bytescount = acp_get_byte_count(rtd, substream->stream); - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { - rv_writel(period_bytes, rtd->acp3x_base + - mmACP_BT_TX_INTR_WATERMARK_SIZE); - val = rv_readl(rtd->acp3x_base + mmACP_BTTDM_ITER); - val = val | BIT(0); - rv_writel(val, rtd->acp3x_base + mmACP_BTTDM_ITER); - } else { - rv_writel(period_bytes, rtd->acp3x_base + - mmACP_BT_RX_INTR_WATERMARK_SIZE); - val = rv_readl(rtd->acp3x_base + mmACP_BTTDM_IRER); - val = val | BIT(0); - rv_writel(val, rtd->acp3x_base + mmACP_BTTDM_IRER); - } - rv_writel(1, rtd->acp3x_base + mmACP_BTTDM_IER); - break; - case SNDRV_PCM_TRIGGER_STOP: - case SNDRV_PCM_TRIGGER_SUSPEND: - case SNDRV_PCM_TRIGGER_PAUSE_PUSH: - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { - val = rv_readl(rtd->acp3x_base + mmACP_BTTDM_ITER); - val = val & ~BIT(0); - rv_writel(val, rtd->acp3x_base + mmACP_BTTDM_ITER); - } else { - val = rv_readl(rtd->acp3x_base + mmACP_BTTDM_IRER); - val = val & ~BIT(0); - rv_writel(val, rtd->acp3x_base + mmACP_BTTDM_IRER); - } - rv_writel(0, rtd->acp3x_base + mmACP_BTTDM_IER); - break; - default: - ret = -EINVAL; - break; - } - - return ret; -} - -static struct snd_soc_dai_ops acp3x_dai_i2s_ops = { - .hw_params = acp3x_dai_i2s_hwparams, - .trigger = acp3x_dai_i2s_trigger, - .set_fmt = acp3x_dai_i2s_set_fmt, - .set_tdm_slot = acp3x_dai_set_tdm_slot, -}; - -static struct snd_soc_dai_driver acp3x_i2s_dai_driver = { - .playback = { - .rates = SNDRV_PCM_RATE_8000_96000, - .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S8 | - SNDRV_PCM_FMTBIT_U8 | - SNDRV_PCM_FMTBIT_S24_LE | - SNDRV_PCM_FMTBIT_S32_LE, - .channels_min = 2, - .channels_max = 8, - - .rate_min = 8000, - .rate_max = 96000, - }, - .capture = { - .rates = SNDRV_PCM_RATE_8000_48000, - .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S8 | - SNDRV_PCM_FMTBIT_U8 | - SNDRV_PCM_FMTBIT_S24_LE | - SNDRV_PCM_FMTBIT_S32_LE, - .channels_min = 2, - .channels_max = 2, - .rate_min = 8000, - .rate_max = 48000, - }, - .ops = &acp3x_dai_i2s_ops, -}; - static const struct snd_soc_component_driver acp3x_i2s_component = { .name = DRV_NAME, .open = acp3x_dma_open, @@ -609,10 +413,10 @@ static const struct snd_soc_component_driver acp3x_i2s_component = { static int acp3x_audio_probe(struct platform_device *pdev) { - int status; struct resource *res; struct i2s_dev_data *adata; unsigned int irqflags; + int status, ret; if (!pdev->dev.platform_data) { dev_err(&pdev->dev, "platform_data not retrieved\n"); @@ -622,7 +426,7 @@ static int acp3x_audio_probe(struct platform_device *pdev) res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!res) { - dev_err(&pdev->dev, "IORESOURCE_IRQ FAILED\n"); + dev_err(&pdev->dev, "IORESOURCE_MEM FAILED\n"); return -ENODEV; } @@ -632,60 +436,64 @@ static int acp3x_audio_probe(struct platform_device *pdev) adata->acp3x_base = devm_ioremap(&pdev->dev, res->start, resource_size(res)); + if (!adata->acp3x_base) + return -ENOMEM; res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); if (!res) { dev_err(&pdev->dev, "IORESOURCE_IRQ FAILED\n"); - return -ENODEV; + return -ENOMEM; } adata->i2s_irq = res->start; - adata->play_stream = NULL; - adata->capture_stream = NULL; dev_set_drvdata(&pdev->dev, adata); /* Initialize ACP */ status = acp3x_init(adata->acp3x_base); if (status) return -ENODEV; + status = devm_snd_soc_register_component(&pdev->dev, &acp3x_i2s_component, - &acp3x_i2s_dai_driver, 1); + NULL, 0); if (status) { - dev_err(&pdev->dev, "Fail to register acp i2s dai\n"); + dev_err(&pdev->dev, "Fail to register acp i2s component\n"); + ret = -ENODEV; goto dev_err; } status = devm_request_irq(&pdev->dev, adata->i2s_irq, i2s_irq_handler, irqflags, "ACP3x_I2S_IRQ", adata); if (status) { dev_err(&pdev->dev, "ACP3x I2S IRQ request failed\n"); + ret = -ENODEV; goto dev_err; } - pm_runtime_set_autosuspend_delay(&pdev->dev, 10000); + pm_runtime_set_autosuspend_delay(&pdev->dev, 5000); pm_runtime_use_autosuspend(&pdev->dev); pm_runtime_enable(&pdev->dev); return 0; + dev_err: status = acp3x_deinit(adata->acp3x_base); if (status) dev_err(&pdev->dev, "ACP de-init failed\n"); else - dev_info(&pdev->dev, "ACP de-initialized\n"); - /*ignore device status and return driver probe error*/ - return -ENODEV; + dev_dbg(&pdev->dev, "ACP de-initialized\n"); + return ret; } static int acp3x_audio_remove(struct platform_device *pdev) { + struct i2s_dev_data *adata; int ret; - struct i2s_dev_data *adata = dev_get_drvdata(&pdev->dev); + adata = dev_get_drvdata(&pdev->dev); ret = acp3x_deinit(adata->acp3x_base); if (ret) dev_err(&pdev->dev, "ACP de-init failed\n"); else - dev_info(&pdev->dev, "ACP de-initialized\n"); + dev_dbg(&pdev->dev, "ACP de-initialized\n"); pm_runtime_disable(&pdev->dev); return 0; @@ -693,10 +501,11 @@ static int acp3x_audio_remove(struct platform_device *pdev) static int acp3x_resume(struct device *dev) { + struct i2s_dev_data *adata; int status; u32 val; - struct i2s_dev_data *adata = dev_get_drvdata(dev); + adata = dev_get_drvdata(dev); status = acp3x_init(adata->acp3x_base); if (status) return -ENODEV; @@ -738,14 +547,15 @@ static int acp3x_resume(struct device *dev) static int acp3x_pcm_runtime_suspend(struct device *dev) { + struct i2s_dev_data *adata; int status; - struct i2s_dev_data *adata = dev_get_drvdata(dev); + adata = dev_get_drvdata(dev); status = acp3x_deinit(adata->acp3x_base); if (status) dev_err(dev, "ACP de-init failed\n"); else - dev_info(dev, "ACP de-initialized\n"); + dev_dbg(dev, "ACP de-initialized\n"); rv_writel(0, adata->acp3x_base + mmACP_EXTERNAL_INTR_ENB); @@ -754,8 +564,9 @@ static int acp3x_pcm_runtime_suspend(struct device *dev) static int acp3x_pcm_runtime_resume(struct device *dev) { + struct i2s_dev_data *adata; int status; - struct i2s_dev_data *adata = dev_get_drvdata(dev); + adata = dev_get_drvdata(dev); status = acp3x_init(adata->acp3x_base); if (status) @@ -774,13 +585,14 @@ static struct platform_driver acp3x_dma_driver = { .probe = acp3x_audio_probe, .remove = acp3x_audio_remove, .driver = { - .name = "acp3x_rv_i2s", + .name = "acp3x_rv_i2s_dma", .pm = &acp3x_pm_ops, }, }; module_platform_driver(acp3x_dma_driver); +MODULE_AUTHOR("Vishnuvardhanrao.Ravulapati(a)amd.com"); MODULE_AUTHOR("Maruthi.Bayyavarapu(a)amd.com"); MODULE_AUTHOR("Vijendar.Mukunda(a)amd.com"); MODULE_DESCRIPTION("AMD ACP 3.x PCM Driver"); diff --git a/sound/soc/amd/raven/acp3x.h b/sound/soc/amd/raven/acp3x.h index 2f15fe1..a6c6d63 100644 --- a/sound/soc/amd/raven/acp3x.h +++ b/sound/soc/amd/raven/acp3x.h @@ -51,6 +51,30 @@ #define SLOT_WIDTH_24 0x18 #define SLOT_WIDTH_32 0x20 +struct acp3x_platform_info { + u16 play_i2s_instance; + u16 cap_i2s_instance; + u16 capture_channel; +}; + +struct i2s_dev_data { + bool tdm_mode; + unsigned int i2s_irq; + u32 tdm_fmt; + u32 substream_type; + void __iomem *acp3x_base; + struct snd_pcm_substream *play_stream; + struct snd_pcm_substream *capture_stream; +}; + +struct i2s_stream_instance { + u16 num_pages; + u16 channels; + u32 xfer_resolution; + u64 bytescount; + dma_addr_t dma_addr; + void __iomem *acp3x_base; +}; static inline u32 rv_readl(void __iomem *base_addr) { @@ -61,3 +85,22 @@ static inline void rv_writel(u32 val, void __iomem *base_addr) { writel(val, base_addr - ACP3x_PHY_BASE_ADDRESS); } + +static inline u64 acp_get_byte_count(struct i2s_stream_instance *rtd, + int direction) +{ + u64 byte_count; + + if (direction == SNDRV_PCM_STREAM_PLAYBACK) { + byte_count = rv_readl(rtd->acp3x_base + + mmACP_BT_TX_LINEARPOSITIONCNTR_HIGH); + byte_count |= rv_readl(rtd->acp3x_base + + mmACP_BT_TX_LINEARPOSITIONCNTR_LOW); + } else { + byte_count = rv_readl(rtd->acp3x_base + + mmACP_BT_RX_LINEARPOSITIONCNTR_HIGH); + byte_count |= rv_readl(rtd->acp3x_base + + mmACP_BT_RX_LINEARPOSITIONCNTR_LOW); + } + return byte_count; +} -- 2.7.4

2 1

[alsa-devel] [PATCH 0/2] ASoC: Follow the recent ALSA core API changes
by Takashi Iwai 22 Nov '19

22 Nov '19

Hi, this is a follow-up patch set for ASoC to adapt the recent ALSA PCM core changes. It's merely a preliminary and this itself doesn't change the current driver behavior. The purpose of this submission is to get the basic API changes done in 5.5-rc1, so that other trees can apply the actual changes later individually. The actual cleanups and changes in the driver side will be submitted after 5.5 merge window. Mark, if you are OK with this, please give ACK. Then I'll merge them into my tree for 5.5-rc1. thanks, Takashi === Takashi Iwai (2): ASoC: pcm: Make ioctl ops optional ASoC: component: Add sync_stop PCM ops include/sound/soc-component.h | 3 +++ sound/soc/soc-component.c | 19 +++++++++++++++++++ sound/soc/soc-pcm.c | 6 ++++-- 3 files changed, 26 insertions(+), 2 deletions(-) -- 2.16.4

2 4

[alsa-devel] [PATCH] ALSA: cs4236: fix error return comparison of an unsigned integer
by Colin King 22 Nov '19

22 Nov '19

From: Colin Ian King <colin.king(a)canonical.com> The return from pnp_irq is an unsigned integer type resource_size_t and hence the error check for a positive non-error code is always going to be true. A check for a non-failure return from pnp_irq should in fact be for (resource_size_t)-1 rather than >= 0. Addresses-Coverity: ("Unsigned compared against 0") Fixes: a9824c868a2c ("[ALSA] Add CS4232 PnP BIOS support") Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- sound/isa/cs423x/cs4236.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/isa/cs423x/cs4236.c b/sound/isa/cs423x/cs4236.c index 78dd213589b4..fa3c39cff5f8 100644 --- a/sound/isa/cs423x/cs4236.c +++ b/sound/isa/cs423x/cs4236.c @@ -278,7 +278,8 @@ static int snd_cs423x_pnp_init_mpu(int dev, struct pnp_dev *pdev) } else { mpu_port[dev] = pnp_port_start(pdev, 0); if (mpu_irq[dev] >= 0 && - pnp_irq_valid(pdev, 0) && pnp_irq(pdev, 0) >= 0) { + pnp_irq_valid(pdev, 0) && + pnp_irq(pdev, 0) != (resource_size_t)-1) { mpu_irq[dev] = pnp_irq(pdev, 0); } else { mpu_irq[dev] = -1; /* disable interrupt */ -- 2.24.0

2 1

[alsa-devel] [PATCH] ALSA: hda/hdmi - Clear codec->relaxed_resume flag at unbinding
by Takashi Iwai 22 Nov '19

22 Nov '19

The HDMI codec may leave codec->relaxed_resume flag set even after unbinding. Clear it unconditionally. It's very unlikely that this actually matters in the real use case, so just a fix for consistency. Fixes: ade49db337a9 ("ALSA: hda/hdmi - Allow audio component for AMD/ATI and Nvidia HDMI") Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/patch_hdmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 9063bf88689f..bffde594e204 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -2361,8 +2361,8 @@ static void generic_hdmi_free(struct hda_codec *codec) snd_hdac_acomp_exit(&codec->bus->core); } else if (codec_has_acomp(codec)) { snd_hdac_acomp_register_notifier(&codec->bus->core, NULL); - codec->relaxed_resume = 0; } + codec->relaxed_resume = 0; for (pin_idx = 0; pin_idx < spec->num_pins; pin_idx++) { struct hdmi_spec_per_pin *per_pin = get_pin(spec, pin_idx); -- 2.16.4

1 0

[alsa-devel] [PATCH] ALSA: hda - Disable audio component for legacy Nvidia HDMI codecs
by Takashi Iwai 22 Nov '19

22 Nov '19

The old Nvidia chips have multiple HD-audio codecs on the same HD-audio controller, and this doesn't work as expected with the current audio component binding that is implemented under the one-codec-per- controller assumption; at the probe time, the driver leads to several kernel WARNING messages. For the proper support, we may change the pin2port and port2pin to traverse the codec list per the given pin number, but this needs more development and testing. As a quick workaround, instead, this patch drops the binding in the audio side for these legacy chips since the audio component support in nouveau graphics driver is still not merged (hence it's basically unused). BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=205625 Fixes: ade49db337a9 ("ALSA: hda/hdmi - Allow audio component for AMD/ATI and Nvidia HDMI") Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/patch_hdmi.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 55d20e40a195..9063bf88689f 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -3574,8 +3574,6 @@ static int patch_nvhdmi_legacy(struct hda_codec *codec) codec->link_down_at_suspend = 1; - generic_acomp_init(codec, &nvhdmi_audio_ops, nvhdmi_port2pin); - return 0; } -- 2.16.4

1 0

[alsa-devel] [PATCH] ALSA: usb-audio: Fix NULL dereference at parsing BADD
by Takashi Iwai 22 Nov '19

22 Nov '19

snd_usb_mixer_controls_badd() that parses UAC3 BADD profiles misses a NULL check for the given interfaces. When a malformed USB descriptor is passed, this may lead to an Oops, as spotted by syzkaller. Skip the iteration if the interface doesn't exist for avoiding the crash. Fixes: 17156f23e93c ("ALSA: usb: add UAC3 BADD profiles support") Reported-by: syzbot+a36ab65c6653d7ccdd62(a)syzkaller.appspotmail.com Suggested-by: Dan Carpenter <dan.carpenter(a)oracle.com> Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/usb/mixer.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index 45eee5cc312e..6cd4ff09c5ee 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -2930,6 +2930,9 @@ static int snd_usb_mixer_controls_badd(struct usb_mixer_interface *mixer, continue; iface = usb_ifnum_to_if(dev, intf); + if (!iface) + continue; + num = iface->num_altsetting; if (num < 2) -- 2.16.4

1 0

[alsa-devel] general protection fault in snd_usb_create_mixer
by syzbot 22 Nov '19

22 Nov '19

Hello, syzbot found the following crash on: HEAD commit: 46178223 usb: gadget: add raw-gadget interface git tree: https://github.com/google/kasan.git usb-fuzzer console output: https://syzkaller.appspot.com/x/log.txt?x=176f9836e00000 kernel config: https://syzkaller.appspot.com/x/.config?x=99c88c44660624e7 dashboard link: https://syzkaller.appspot.com/bug?extid=a36ab65c6653d7ccdd62 compiler: gcc (GCC) 9.0.0 20181231 (experimental) syz repro: https://syzkaller.appspot.com/x/repro.syz?x=1447d3bae00000 C reproducer: https://syzkaller.appspot.com/x/repro.c?x=17ef3a86e00000 IMPORTANT: if you fix the bug, please add the following tag to the commit: Reported-by: syzbot+a36ab65c6653d7ccdd62(a)syzkaller.appspotmail.com usb 1-1: 208:241 : does not exist usb 1-1: 208:242 : does not exist usb 1-1: 208:243 : does not exist usb 1-1: 208:244 : does not exist usb 1-1: 208:245 : does not exist usb 1-1: 208:246 : does not exist usb 1-1: 208:247 : does not exist usb 1-1: 208:248 : does not exist usb 1-1: 208:249 : does not exist usb 1-1: 208:250 : does not exist kasan: CONFIG_KASAN_INLINE enabled kasan: GPF could be caused by NULL-ptr deref or user memory access general protection fault: 0000 [#1] SMP KASAN CPU: 1 PID: 22 Comm: kworker/1:1 Not tainted 5.4.0-rc6+ #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Workqueue: usb_hub_wq hub_event RIP: 0010:snd_usb_mixer_controls_badd sound/usb/mixer.c:2931 [inline] RIP: 0010:snd_usb_create_mixer+0xbb9/0x1890 sound/usb/mixer.c:3441 Code: ee e8 9b 23 a6 fc 41 39 ee 74 a4 e8 a1 22 a6 fc 48 8b 7c 24 28 89 ee e8 25 59 b4 fe 48 8d 78 10 48 89 c3 48 89 f8 48 c1 e8 03 <42> 0f b6 04 28 84 c0 74 08 3c 03 0f 8e 2f 09 00 00 8b 6b 10 bf 01 RSP: 0018:ffff8881d932f0a0 EFLAGS: 00010202 RAX: 0000000000000002 RBX: 0000000000000000 RCX: ffffffff834c5dac RDX: 0000000000000000 RSI: ffffffff834c5e1b RDI: 0000000000000010 RBP: 0000000000000021 R08: ffff8881da24e000 R09: fffffbfff11aadb5 R10: fffffbfff11aadb4 R11: ffffffff88d56da7 R12: 00000000000000da R13: dffffc0000000000 R14: 00000000000000d0 R15: 0000000000000000 FS: 0000000000000000(0000) GS:ffff8881db300000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 000000000043f100 CR3: 0000000006c21000 CR4: 00000000001406e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: usb_audio_probe+0xc76/0x2010 sound/usb/card.c:653 usb_probe_interface+0x305/0x7a0 drivers/usb/core/driver.c:361 really_probe+0x281/0x6d0 drivers/base/dd.c:548 driver_probe_device+0x104/0x210 drivers/base/dd.c:721 __device_attach_driver+0x1c2/0x220 drivers/base/dd.c:828 bus_for_each_drv+0x162/0x1e0 drivers/base/bus.c:430 __device_attach+0x217/0x360 drivers/base/dd.c:894 bus_probe_device+0x1e4/0x290 drivers/base/bus.c:490 device_add+0xae6/0x16f0 drivers/base/core.c:2202 usb_set_configuration+0xdf6/0x1670 drivers/usb/core/message.c:2023 generic_probe+0x9d/0xd5 drivers/usb/core/generic.c:210 usb_probe_device+0x99/0x100 drivers/usb/core/driver.c:266 really_probe+0x281/0x6d0 drivers/base/dd.c:548 driver_probe_device+0x104/0x210 drivers/base/dd.c:721 __device_attach_driver+0x1c2/0x220 drivers/base/dd.c:828 bus_for_each_drv+0x162/0x1e0 drivers/base/bus.c:430 __device_attach+0x217/0x360 drivers/base/dd.c:894 bus_probe_device+0x1e4/0x290 drivers/base/bus.c:490 device_add+0xae6/0x16f0 drivers/base/core.c:2202 usb_new_device.cold+0x6a4/0xe79 drivers/usb/core/hub.c:2537 hub_port_connect drivers/usb/core/hub.c:5184 [inline] hub_port_connect_change drivers/usb/core/hub.c:5324 [inline] port_event drivers/usb/core/hub.c:5470 [inline] hub_event+0x1df8/0x3800 drivers/usb/core/hub.c:5552 process_one_work+0x92b/0x1530 kernel/workqueue.c:2269 worker_thread+0x96/0xe20 kernel/workqueue.c:2415 kthread+0x318/0x420 kernel/kthread.c:255 ret_from_fork+0x24/0x30 arch/x86/entry/entry_64.S:352 Modules linked in: ---[ end trace 1d30a29898ec11e8 ]--- RIP: 0010:snd_usb_mixer_controls_badd sound/usb/mixer.c:2931 [inline] RIP: 0010:snd_usb_create_mixer+0xbb9/0x1890 sound/usb/mixer.c:3441 Code: ee e8 9b 23 a6 fc 41 39 ee 74 a4 e8 a1 22 a6 fc 48 8b 7c 24 28 89 ee e8 25 59 b4 fe 48 8d 78 10 48 89 c3 48 89 f8 48 c1 e8 03 <42> 0f b6 04 28 84 c0 74 08 3c 03 0f 8e 2f 09 00 00 8b 6b 10 bf 01 RSP: 0018:ffff8881d932f0a0 EFLAGS: 00010202 RAX: 0000000000000002 RBX: 0000000000000000 RCX: ffffffff834c5dac RDX: 0000000000000000 RSI: ffffffff834c5e1b RDI: 0000000000000010 RBP: 0000000000000021 R08: ffff8881da24e000 R09: fffffbfff11aadb5 R10: fffffbfff11aadb4 R11: ffffffff88d56da7 R12: 00000000000000da R13: dffffc0000000000 R14: 00000000000000d0 R15: 0000000000000000 FS: 0000000000000000(0000) GS:ffff8881db300000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 000000000043f100 CR3: 0000000006c21000 CR4: 00000000001406e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 --- This bug is generated by a bot. It may contain errors. See https://goo.gl/tpsmEJ for more information about syzbot. syzbot engineers can be reached at syzkaller(a)googlegroups.com. syzbot will keep track of this bug report. See: https://goo.gl/tpsmEJ#status for how to communicate with syzbot. syzbot can test patches for this bug, for details see: https://goo.gl/tpsmEJ#testing-patches

3 2

[alsa-devel] [RESEND PATCH v12 6/6] ASoC: amd: Added ACP3x system resume and runtime pm
by Ravulapati Vishnu vardhan rao 22 Nov '19

22 Nov '19

When system wide suspend happens, ACP will be powered off and when system resumes,for audio usecase to continue,all the runtime configuration data needs to be programmed again. Added resume pm call back to ACP pm ops and also added runtime PM operations for ACP3x PCM platform device. Device will enter into D3 state when there is no activity on audio I2S lines. Signed-off-by: Ravulapati Vishnu vardhan rao <Vishnuvardhanrao.Ravulapati(a)amd.com> --- sound/soc/amd/raven/acp3x-pcm-dma.c | 144 +----------------------------- sound/soc/amd/raven/acp3x.h | 7 ++ sound/soc/amd/raven/pci-acp3x.c | 173 ++++++++++++++++++++++++++++++++++-- 3 files changed, 177 insertions(+), 147 deletions(-) diff --git a/sound/soc/amd/raven/acp3x-pcm-dma.c b/sound/soc/amd/raven/acp3x-pcm-dma.c index a6bc9c1..d52d043 100644 --- a/sound/soc/amd/raven/acp3x-pcm-dma.c +++ b/sound/soc/amd/raven/acp3x-pcm-dma.c @@ -58,106 +58,6 @@ static const struct snd_pcm_hardware acp3x_pcm_hardware_capture = { .periods_max = CAPTURE_MAX_NUM_PERIODS, }; -static int acp3x_power_on(void __iomem *acp3x_base, bool on) -{ - u16 val, mask; - u32 timeout; - - if (on == true) { - val = 1; - mask = ACP3x_POWER_ON; - } else { - val = 0; - mask = ACP3x_POWER_OFF; - } - - rv_writel(val, acp3x_base + mmACP_PGFSM_CONTROL); - timeout = 0; - while (true) { - val = rv_readl(acp3x_base + mmACP_PGFSM_STATUS); - if ((val & ACP3x_POWER_OFF_IN_PROGRESS) == mask) - break; - if (timeout > 100) { - pr_err("ACP3x power state change failure\n"); - return -ENODEV; - } - timeout++; - cpu_relax(); - } - return 0; -} - -static int acp3x_reset(void __iomem *acp3x_base) -{ - u32 val, timeout; - - rv_writel(1, acp3x_base + mmACP_SOFT_RESET); - timeout = 0; - while (true) { - val = rv_readl(acp3x_base + mmACP_SOFT_RESET); - if ((val & ACP3x_SOFT_RESET__SoftResetAudDone_MASK) || - timeout > 100) { - if (val & ACP3x_SOFT_RESET__SoftResetAudDone_MASK) - break; - return -ENODEV; - } - timeout++; - cpu_relax(); - } - - rv_writel(0, acp3x_base + mmACP_SOFT_RESET); - timeout = 0; - while (true) { - val = rv_readl(acp3x_base + mmACP_SOFT_RESET); - if (!val || timeout > 100) { - if (!val) - break; - return -ENODEV; - } - timeout++; - cpu_relax(); - } - return 0; -} - -static int acp3x_init(void __iomem *acp3x_base) -{ - int ret; - - /* power on */ - ret = acp3x_power_on(acp3x_base, true); - if (ret) { - pr_err("ACP3x power on failed\n"); - return ret; - } - /* Reset */ - ret = acp3x_reset(acp3x_base); - if (ret) { - pr_err("ACP3x reset failed\n"); - return ret; - } - return 0; -} - -static int acp3x_deinit(void __iomem *acp3x_base) -{ - int ret; - - /* Reset */ - ret = acp3x_reset(acp3x_base); - if (ret) { - pr_err("ACP3x reset failed\n"); - return ret; - } - /* power off */ - ret = acp3x_power_on(acp3x_base, false); - if (ret) { - pr_err("ACP3x power off failed\n"); - return ret; - } - return 0; -} - static irqreturn_t i2s_irq_handler(int irq, void *dev_id) { struct i2s_dev_data *rv_i2s_data; @@ -534,53 +434,28 @@ static int acp3x_audio_probe(struct platform_device *pdev) adata->i2s_irq = res->start; dev_set_drvdata(&pdev->dev, adata); - /* Initialize ACP */ - status = acp3x_init(adata->acp3x_base); - if (status) - return -ENODEV; - status = devm_snd_soc_register_component(&pdev->dev, &acp3x_i2s_component, NULL, 0); if (status) { dev_err(&pdev->dev, "Fail to register acp i2s component\n"); - ret = -ENODEV; - goto dev_err; + return -ENODEV; } status = devm_request_irq(&pdev->dev, adata->i2s_irq, i2s_irq_handler, irqflags, "ACP3x_I2S_IRQ", adata); if (status) { dev_err(&pdev->dev, "ACP3x I2S IRQ request failed\n"); - ret = -ENODEV; - goto dev_err; + return -ENODEV; } pm_runtime_set_autosuspend_delay(&pdev->dev, 5000); pm_runtime_use_autosuspend(&pdev->dev); pm_runtime_enable(&pdev->dev); return 0; - -dev_err: - status = acp3x_deinit(adata->acp3x_base); - if (status) - dev_err(&pdev->dev, "ACP de-init failed\n"); - else - dev_dbg(&pdev->dev, "ACP de-initialized\n"); - return ret; } static int acp3x_audio_remove(struct platform_device *pdev) { - struct i2s_dev_data *adata; - int ret; - - adata = dev_get_drvdata(&pdev->dev); - ret = acp3x_deinit(adata->acp3x_base); - if (ret) - dev_err(&pdev->dev, "ACP de-init failed\n"); - else - dev_dbg(&pdev->dev, "ACP de-initialized\n"); - pm_runtime_disable(&pdev->dev); return 0; } @@ -588,13 +463,9 @@ static int acp3x_audio_remove(struct platform_device *pdev) static int acp3x_resume(struct device *dev) { struct i2s_dev_data *adata; - int status; u32 val, reg_val, frmt_val; adata = dev_get_drvdata(dev); - status = acp3x_init(adata->acp3x_base); - if (status) - return -ENODEV; if (adata->play_stream && adata->play_stream->runtime) { struct i2s_stream_instance *rtd = @@ -640,14 +511,8 @@ static int acp3x_resume(struct device *dev) static int acp3x_pcm_runtime_suspend(struct device *dev) { struct i2s_dev_data *adata; - int status; adata = dev_get_drvdata(dev); - status = acp3x_deinit(adata->acp3x_base); - if (status) - dev_err(dev, "ACP de-init failed\n"); - else - dev_dbg(dev, "ACP de-initialized\n"); rv_writel(0, adata->acp3x_base + mmACP_EXTERNAL_INTR_ENB); @@ -657,12 +522,9 @@ static int acp3x_pcm_runtime_suspend(struct device *dev) static int acp3x_pcm_runtime_resume(struct device *dev) { struct i2s_dev_data *adata; - int status; adata = dev_get_drvdata(dev); - status = acp3x_init(adata->acp3x_base); - if (status) - return -ENODEV; + rv_writel(1, adata->acp3x_base + mmACP_EXTERNAL_INTR_ENB); return 0; } diff --git a/sound/soc/amd/raven/acp3x.h b/sound/soc/amd/raven/acp3x.h index 3c28644..b64f8b0 100644 --- a/sound/soc/amd/raven/acp3x.h +++ b/sound/soc/amd/raven/acp3x.h @@ -68,6 +68,13 @@ #define SLOT_WIDTH_16 0x10 #define SLOT_WIDTH_24 0x18 #define SLOT_WIDTH_32 0x20 +#define ACP_PGFSM_CNTL_POWER_ON_MASK 0x01 +#define ACP_PGFSM_CNTL_POWER_OFF_MASK 0x00 +#define ACP_PGFSM_STATUS_MASK 0x03 +#define ACP_POWERED_ON 0x00 +#define ACP_POWER_ON_IN_PROGRESS 0x01 +#define ACP_POWERED_OFF 0x02 +#define ACP_POWER_OFF_IN_PROGRESS 0x03 struct acp3x_platform_info { u16 play_i2s_instance; diff --git a/sound/soc/amd/raven/pci-acp3x.c b/sound/soc/amd/raven/pci-acp3x.c index 94f5f21..d46a6d6 100644 --- a/sound/soc/amd/raven/pci-acp3x.c +++ b/sound/soc/amd/raven/pci-acp3x.c @@ -9,6 +9,9 @@ #include <linux/io.h> #include <linux/platform_device.h> #include <linux/interrupt.h> +#include <linux/pm_runtime.h> +#include <linux/delay.h> +#include <sound/pcm.h> #include "acp3x.h" @@ -19,6 +22,109 @@ struct acp3x_dev_data { struct platform_device *pdev[ACP3x_DEVS]; }; +static int acp3x_power_on(void __iomem *acp3x_base) +{ + u32 val; + int timeout; + + val = rv_readl(acp3x_base + mmACP_PGFSM_STATUS); + + if (val == 0) + return val; + + if (!((val & ACP_PGFSM_STATUS_MASK) == + ACP_POWER_ON_IN_PROGRESS)) + rv_writel(ACP_PGFSM_CNTL_POWER_ON_MASK, + acp3x_base + mmACP_PGFSM_CONTROL); + timeout = 0; + while (++timeout < 500) { + val = rv_readl(acp3x_base + mmACP_PGFSM_STATUS); + if (!val) + return 0; + udelay(1); + } + return -ETIMEDOUT; +} + +static int acp3x_power_off(void __iomem *acp3x_base) +{ + u32 val; + int timeout; + + rv_writel(ACP_PGFSM_CNTL_POWER_OFF_MASK, + acp3x_base + mmACP_PGFSM_CONTROL); + timeout = 0; + while (++timeout < 500) { + val = rv_readl(acp3x_base + mmACP_PGFSM_STATUS); + if ((val & ACP_PGFSM_STATUS_MASK) == ACP_POWERED_OFF) + return 0; + udelay(1); + } + return -ETIMEDOUT; +} + +static int acp3x_reset(void __iomem *acp3x_base) +{ + u32 val; + int timeout; + + rv_writel(1, acp3x_base + mmACP_SOFT_RESET); + timeout = 0; + while (++timeout < 500) { + val = rv_readl(acp3x_base + mmACP_SOFT_RESET); + if (val & ACP3x_SOFT_RESET__SoftResetAudDone_MASK) + return 0; + cpu_relax(); + } + rv_writel(0, acp3x_base + mmACP_SOFT_RESET); + timeout = 0; + while (++timeout < 500) { + val = rv_readl(acp3x_base + mmACP_SOFT_RESET); + if (!val) + return 0; + cpu_relax(); + } + return -ETIMEDOUT; +} + +static int acp3x_init(void __iomem *acp3x_base) +{ + int ret; + + /* power on */ + ret = acp3x_power_on(acp3x_base); + if (ret) { + pr_err("ACP3x power on failed\n"); + return ret; + } + /* Reset */ + ret = acp3x_reset(acp3x_base); + if (ret) { + pr_err("ACP3x reset failed\n"); + return ret; + } + return 0; +} + +static int acp3x_deinit(void __iomem *acp3x_base) +{ + int ret; + + /* Reset */ + ret = acp3x_reset(acp3x_base); + if (ret) { + pr_err("ACP3x reset failed\n"); + return ret; + } + /* power off */ + ret = acp3x_power_off(acp3x_base); + if (ret) { + pr_err("ACP3x power off failed\n"); + return ret; + } + return 0; +} + static int snd_acp3x_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) { @@ -64,6 +170,9 @@ static int snd_acp3x_probe(struct pci_dev *pci, } pci_set_master(pci); pci_set_drvdata(pci, adata); + ret = acp3x_init(adata->acp3x_base); + if (ret) + goto disable_msi; val = rv_readl(adata->acp3x_base + mmACP_I2S_PIN_CONFIG); switch (val) { @@ -73,7 +182,7 @@ static int snd_acp3x_probe(struct pci_dev *pci, GFP_KERNEL); if (!adata->res) { ret = -ENOMEM; - goto disable_msi; + goto de_init; } adata->res[0].name = "acp3x_i2s_iomem"; @@ -118,7 +227,7 @@ static int snd_acp3x_probe(struct pci_dev *pci, pdevinfo[2].parent = &pci->dev; pdevinfo[2].num_res = 1; pdevinfo[2].res = &adata->res[2]; - for (i = 0; i < ACP3x_DEVS ; i++) { + for (i = 0; i < ACP3x_DEVS; i++) { adata->pdev[i] = platform_device_register_full(&pdevinfo[i]); if (IS_ERR(adata->pdev[i])) { @@ -134,12 +243,20 @@ static int snd_acp3x_probe(struct pci_dev *pci, ret = -ENODEV; goto disable_msi; } + pm_runtime_set_autosuspend_delay(&pci->dev, 5000); + pm_runtime_use_autosuspend(&pci->dev); + pm_runtime_set_active(&pci->dev); + pm_runtime_put_noidle(&pci->dev); + pm_runtime_enable(&pci->dev); return 0; unregister_devs: if (val == I2S_MODE) - for (i = 0 ; i < ACP3x_DEVS ; i++) + for (i = 0; i < ACP3x_DEVS; i++) platform_device_unregister(adata->pdev[i]); +de_init: + if (acp3x_deinit(adata->acp3x_base)) + dev_err(&pci->dev, "ACP de-init failed\n"); disable_msi: pci_disable_msi(pci); release_regions: @@ -150,15 +267,56 @@ static int snd_acp3x_probe(struct pci_dev *pci, return ret; } +static int snd_acp3x_suspend(struct device *dev) +{ + int ret; + struct acp3x_dev_data *adata; + + adata = dev_get_drvdata(dev); + ret = acp3x_deinit(adata->acp3x_base); + if (ret) + dev_err(dev, "ACP de-init failed\n"); + else + dev_dbg(dev, "ACP de-initialized\n"); + + return 0; +} + +static int snd_acp3x_resume(struct device *dev) +{ + int ret; + struct acp3x_dev_data *adata; + + adata = dev_get_drvdata(dev); + ret = acp3x_init(adata->acp3x_base); + if (ret) { + dev_err(dev, "ACP init failed\n"); + return ret; + } + return 0; +} + +static const struct dev_pm_ops acp3x_pm = { + .runtime_suspend = snd_acp3x_suspend, + .runtime_resume = snd_acp3x_resume, + .resume = snd_acp3x_resume, +}; + static void snd_acp3x_remove(struct pci_dev *pci) { - struct acp3x_dev_data *adata = pci_get_drvdata(pci); - int i; + struct acp3x_dev_data *adata; + int i, ret; + adata = pci_get_drvdata(pci); if (adata->acp3x_audio_mode == ACP3x_I2S_MODE) { - for (i = 0 ; i < ACP3x_DEVS ; i++) + for (i = 0; i < ACP3x_DEVS; i++) platform_device_unregister(adata->pdev[i]); } + ret = acp3x_deinit(adata->acp3x_base); + if (ret) + dev_err(&pci->dev, "ACP de-init failed\n"); + pm_runtime_disable(&pci->dev); + pm_runtime_get_noresume(&pci->dev); pci_disable_msi(pci); pci_release_regions(pci); pci_disable_device(pci); @@ -177,6 +335,9 @@ static struct pci_driver acp3x_driver = { .id_table = snd_acp3x_ids, .probe = snd_acp3x_probe, .remove = snd_acp3x_remove, + .driver = { + .pm = &acp3x_pm, + } }; module_pci_driver(acp3x_driver); -- 2.7.4

1 0

[alsa-devel] [RESEND PATCH v12 5/6] ASoC: amd: Handle ACP3x I2S-SP Interrupts.
by Ravulapati Vishnu vardhan rao 22 Nov '19

22 Nov '19

Enabled support for I2S-SP interrupt handling. Previous to this implementation, driver supports only interrupts on BT instance. Signed-off-by: Ravulapati Vishnu vardhan rao <Vishnuvardhanrao.Ravulapati(a)amd.com> --- sound/soc/amd/raven/acp3x-pcm-dma.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sound/soc/amd/raven/acp3x-pcm-dma.c b/sound/soc/amd/raven/acp3x-pcm-dma.c index 77f2ed5..a6bc9c1 100644 --- a/sound/soc/amd/raven/acp3x-pcm-dma.c +++ b/sound/soc/amd/raven/acp3x-pcm-dma.c @@ -177,6 +177,13 @@ static irqreturn_t i2s_irq_handler(int irq, void *dev_id) snd_pcm_period_elapsed(rv_i2s_data->play_stream); play_flag = 1; } + if ((val & BIT(I2S_TX_THRESHOLD)) && + rv_i2s_data->i2ssp_play_stream) { + rv_writel(BIT(I2S_TX_THRESHOLD), + rv_i2s_data->acp3x_base + mmACP_EXTERNAL_INTR_STAT); + snd_pcm_period_elapsed(rv_i2s_data->i2ssp_play_stream); + play_flag = 1; + } if ((val & BIT(BT_RX_THRESHOLD)) && rv_i2s_data->capture_stream) { rv_writel(BIT(BT_RX_THRESHOLD), rv_i2s_data->acp3x_base + @@ -184,6 +191,13 @@ static irqreturn_t i2s_irq_handler(int irq, void *dev_id) snd_pcm_period_elapsed(rv_i2s_data->capture_stream); cap_flag = 1; } + if ((val & BIT(I2S_RX_THRESHOLD)) && + rv_i2s_data->i2ssp_capture_stream) { + rv_writel(BIT(I2S_RX_THRESHOLD), + rv_i2s_data->acp3x_base + mmACP_EXTERNAL_INTR_STAT); + snd_pcm_period_elapsed(rv_i2s_data->i2ssp_capture_stream); + cap_flag = 1; + } if (play_flag | cap_flag) return IRQ_HANDLED; -- 2.7.4

1 0

[alsa-devel] [PATCH 0/3] ASoC: max98090: fix PLL unlocked workaround-related
by Tzung-Bi Shih 22 Nov '19

22 Nov '19

This series is a follow up fix for the question: https://mailman.alsa-project.org/pipermail/alsa-devel/2019-October/157364.h… Tzung-Bi Shih (3): ASoC: max98090: remove msleep in PLL unlocked workaround ASoC: max98090: exit workaround earlier if PLL is locked ASoC: max98090: fix possible race conditions sound/soc/codecs/max98090.c | 23 ++++++++++++++--------- sound/soc/codecs/max98090.h | 1 - 2 files changed, 14 insertions(+), 10 deletions(-) -- 2.24.0.432.g9d3f5f5b63-goog

2 13

[alsa-devel] [PATCH AUTOSEL 4.19 215/219] ASoC: rt5645: Headphone Jack sense inverts on the LattePanda board
by Sasha Levin 22 Nov '19

22 Nov '19

From: Hui Wang <hui.wang(a)canonical.com> [ Upstream commit 406dcbc55a0a20fd155be889a4a0c4b812f7c18e ] The LattePanda board has a sound card chtrt5645, when there is nothing plugged in the headphone jack, the system thinks the headphone is plugged in, while we plug a headphone in the jack, the system thinks the headphone is unplugged. If adding quirk=0x21 in the module parameter, the headphone jack can work well. So let us fix it via platform_data. https://bugs.launchpad.net/bugs/182459 Signed-off-by: Hui Wang <hui.wang(a)canonical.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/codecs/rt5645.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index 1dc70f452c1b9..f842db498c741 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -3662,6 +3662,11 @@ static const struct rt5645_platform_data jd_mode3_platform_data = { .jd_mode = 3, }; +static const struct rt5645_platform_data lattepanda_board_platform_data = { + .jd_mode = 2, + .inv_jd1_1 = true +}; + static const struct dmi_system_id dmi_platform_data[] = { { .ident = "Chrome Buddy", @@ -3759,6 +3764,15 @@ static const struct dmi_system_id dmi_platform_data[] = { }, .driver_data = (void *)&intel_braswell_platform_data, }, + { + .ident = "LattePanda board", + .matches = { + DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "AMI Corporation"), + DMI_EXACT_MATCH(DMI_BOARD_NAME, "Cherry Trail CR"), + DMI_EXACT_MATCH(DMI_BOARD_VERSION, "Default string"), + }, + .driver_data = (void *)&lattepanda_board_platform_data, + }, { } }; -- 2.20.1

1 0

[alsa-devel] [PATCH AUTOSEL 4.19 188/219] ASoC: samsung: i2s: Fix prescaler setting for the secondary DAI
by Sasha Levin 22 Nov '19

22 Nov '19

From: Sylwester Nawrocki <s.nawrocki(a)samsung.com> [ Upstream commit 323fb7b947b265753de34703dbbf8acc8ea3a4de ] Make sure i2s->rclk_srcrate is properly initialized also during playback through the secondary DAI. Signed-off-by: Sylwester Nawrocki <s.nawrocki(a)samsung.com> Acked-by: Krzysztof Kozlowski <krzk(a)kernel.org> Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/samsung/i2s.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index ce00fe2f6aae3..d4bde4834ce5f 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c @@ -604,6 +604,7 @@ static int i2s_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) { struct i2s_dai *i2s = to_info(dai); + struct i2s_dai *other = get_other_dai(i2s); int lrp_shift, sdf_shift, sdf_mask, lrp_rlow, mod_slave; u32 mod, tmp = 0; unsigned long flags; @@ -661,7 +662,8 @@ static int i2s_set_fmt(struct snd_soc_dai *dai, * CLK_I2S_RCLK_SRC clock is not exposed so we ensure any * clock configuration assigned in DT is not overwritten. */ - if (i2s->rclk_srcrate == 0 && i2s->clk_data.clks == NULL) + if (i2s->rclk_srcrate == 0 && i2s->clk_data.clks == NULL && + other->clk_data.clks == NULL) i2s_set_sysclk(dai, SAMSUNG_I2S_RCLKSRC_0, 0, SND_SOC_CLOCK_IN); break; @@ -699,6 +701,7 @@ static int i2s_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) { struct i2s_dai *i2s = to_info(dai); + struct i2s_dai *other = get_other_dai(i2s); u32 mod, mask = 0, val = 0; struct clk *rclksrc; unsigned long flags; @@ -784,6 +787,9 @@ static int i2s_hw_params(struct snd_pcm_substream *substream, i2s->frmclk = params_rate(params); rclksrc = i2s->clk_table[CLK_I2S_RCLK_SRC]; + if (!rclksrc || IS_ERR(rclksrc)) + rclksrc = other->clk_table[CLK_I2S_RCLK_SRC]; + if (rclksrc && !IS_ERR(rclksrc)) i2s->rclk_srcrate = clk_get_rate(rclksrc); -- 2.20.1

1 0

[alsa-devel] [PATCH 0/8] ALSA: pcm: API cleanups and extensions
by Takashi Iwai 22 Nov '19

22 Nov '19

Hi, this is a patch series for a few ALSA PCM API changes. Basically the patch set introduces three changes: * Add the "managed buffer allocation" mode; this allows many drivers to drop hw_params and hw_free callbacks that simply call snd_pcm_lib_malloc_pages() and *_free_pages(). * Make PCM ioctl ops optional; almost all driver can drop the lines to define pcm_ops.ioctl. * The new sync_stop PCM ops and card->sync_irq; it's used to synchronize the pending task after stopping the stream, for fixing the use-after-free or such problem. I planned originally merging these changes to 5.6. But since the API changes would influence on many drivers outside sound git tree, it might be easier to merge only these core changes at first during 5.5 merge window while keeping the rest (the actual driver implementations) intact -- that's why I post now for reviews. The changes are additional, and they won't break things by themselves. The drivers can / need to change the call patterns for following these new APIs. thanks, Takashi === Takashi Iwai (8): ALSA: pcm: Introduce managed buffer allocation mode ALSA: docs: Update for managed buffer allocation mode ALSA: pcm: Allow NULL ioctl ops ALSA: docs: Update document about the default PCM ioctl ops ALSA: pcm: Move PCM_RUNTIME_CHECK() macro into local header ALSA: pcm: Add the support for sync-stop operation ALSA: pcm: Add card sync_irq field ALSA: docs: Update about the new PCM sync_stop ops .../sound/kernel-api/writing-an-alsa-driver.rst | 148 +++++++++++++++------ include/sound/core.h | 1 + include/sound/pcm.h | 12 +- sound/core/init.c | 1 + sound/core/pcm_local.h | 2 + sound/core/pcm_memory.c | 83 ++++++++++-- sound/core/pcm_native.c | 48 ++++++- 7 files changed, 237 insertions(+), 58 deletions(-) -- 2.16.4

6 37

[alsa-devel] alsa-lib Plugin: File deadlock when piping to shell command
by GitHub issues - edited 21 Nov '19

21 Nov '19

alsa-project/alsa-lib issue #14 was edited from bharris6: When using the [ALSA File plugin](https://www.alsa-project.org/alsa-doc/alsa-lib/pcm_plugins.html) you can tell it to pipe playback data to either a file or a program/shell command. >Output filename (or shell command the stream will be piped to if STR starts with the pipe char). Piping to a shell command (as shown below) causes a deadlock where alsa waits for the shell command to return at the same time that the shell command is waiting for alsa to write to its STDIN. >From the [source code](https://github.com/alsa-project/alsa-lib/blob/master/src/pcm/pcm_file…, it appears that [popen](https://pubs.opengroup.org/onlinepubs/009695399/functions/popen.html) is being used to initialize/open the output file specified in configuration: static int snd_pcm_file_open_output_file(snd_pcm_file_t *file) { int err, fd; /* fname can contain keys, generating final_fname */ err = snd_pcm_file_replace_fname(file, &(file->final_fname)); if (err < 0) return err; /*printf("DEBUG - original fname: %s, final fname: %s\n", file->fname, file->final_fname);*/ if (file->final_fname[0] == '|') { /* pipe mode */ FILE *pipe; /* clearing */ pipe = popen(file->final_fname + 1, "w"); if (!pipe) { SYSERR("running %s for writing failed", file->final_fname); return -errno; } fd = dup(fileno(pipe)); err = -errno; pclose(pipe); if (fd < 0) { SYSERR("unable to dup pipe file handle for command %s", file->final_fname); return err; Although I can confirm the file I pass in my ALSA configuration gets started fine, it never receives anything on its `stdin` like ALSA's (and popen's) documentation states it should: >If mode is w, *when the child process is started its file descriptor STDIN_FILENO shall be the readable end of the pipe*, and the file descriptor fileno(stream) in the calling process, where stream is the stream pointer returned by popen(), shall be the writable end of the pipe. My /etc/asound.conf: pcm.!default { type plug slave.pcm "duplicator } pcm.default { type plug slave.pcm "duplicator" } pcm.dmixer { type dmix ipc_key 1024 ipc_key_add_uid false ipc_perm 0666 slave { pcm "hw:0,0" period_time 0 period_size 1024 buffer_size 8192 rate 44100 } } pcm.duplicator { type plug slave.pcm { type multi slave { a { pcm "dmixer" channels 2 } b { pcm "fileout" channels 2 } } bindings [ { slave a channel 0 } { slave a channel 1 } { slave b channel 0 } { slave b channel 1 } ] } ttable [ [ 1 0 1 0 ] [ 0 1 0 1 ] ] } pcm.fileout { type file slave.pcm "null" file "|safe_fifo_alt" format raw perm 0666 } safe_fifo_alt: #!/usr/bin/python3 import os, sys BUFFER_SIZE = 16384 path = "/tmp/audio" if not os.path.exists(path): os.mkfifo(path) _fifo_in = os.open(path, os.O_RDONLY | os.O_NONBLOCK) _fifo_out = os.open(path, os.WR_ONLY | os.O_NONBLOCK) for chunk in iter(lambda: sys.stdin.buffer.read(BUFFER_SIZE), b''): os.write(_fifo_out, chunk) os.close(_fifo_in) os.close(_fifo_out) I based `safe_fifo_alt` on [safe_fifo](https://github.com/dpayne/cli-visualizer/blob/master/bin/safe_fi… from `cli-visualizer`. They both hang indefinitely on their STDIN read because alsa is hanging on its `pclose()`. I've tested an alternative method to simulate the popen and pipe into their STDIN to make sure it worked, specifically: head -c 500 /dev/urandom | sh -c safe_fifo_alt It appears this was changed in revision 22ade9b8c150240a960ca683ee6d8f53ce8bc6ea, where the `dup()` and `pclose()` calls were added and introduced the deadlock. Issue URL : https://github.com/alsa-project/alsa-lib/issues/14 Repository URL: https://github.com/alsa-project/alsa-lib

1 0

[alsa-devel] alsa-lib Plugin: File deadlock when piping to shell command
by GitHub issues - opened 21 Nov '19

21 Nov '19

alsa-project/alsa-lib issue #14 was opened from bharris6: When using the [ALSA File plugin](https://www.alsa-project.org/alsa-doc/alsa-lib/pcm_plugins.html) you can tell it to pipe playback data to either a file or a program/shell command. >Output filename (or shell command the stream will be piped to if STR starts with the pipe char). Piping to a shell command (as shown below) causes a deadlock where alsa waits for the shell command to return at the same time that the shell command is waiting for alsa to write to its STDIN. >From the [source code](https://github.com/alsa-project/alsa-lib/blob/master/src/pcm/pcm_file…, it appears that [popen](https://pubs.opengroup.org/onlinepubs/009695399/functions/popen.html) is being used to initialize/open the output file specified in configuration: static int snd_pcm_file_open_output_file(snd_pcm_file_t *file) { int err, fd; /* fname can contain keys, generating final_fname */ err = snd_pcm_file_replace_fname(file, &(file->final_fname)); if (err < 0) return err; /*printf("DEBUG - original fname: %s, final fname: %s\n", file->fname, file->final_fname);*/ if (file->final_fname[0] == '|') { /* pipe mode */ FILE *pipe; /* clearing */ pipe = popen(file->final_fname + 1, "w"); if (!pipe) { SYSERR("running %s for writing failed", file->final_fname); return -errno; } fd = dup(fileno(pipe)); err = -errno; pclose(pipe); if (fd < 0) { SYSERR("unable to dup pipe file handle for command %s", file->final_fname); return err; Although I can confirm the file I pass in my ALSA configuration gets started fine, it never receives anything on its `stdin` like ALSA's (and popen's) documentation states it should: >If mode is w, *when the child process is started its file descriptor STDIN_FILENO shall be the readable end of the pipe*, and the file descriptor fileno(stream) in the calling process, where stream is the stream pointer returned by popen(), shall be the writable end of the pipe. My /etc/asound.conf: pcm.!default { type plug slave.pcm "duplicator } pcm.default { type plug slave.pcm "duplicator" } pcm.dmixer { type dmix ipc_key 1024 ipc_key_add_uid false ipc_perm 0666 slave { pcm "hw:0,0" period_time 0 period_size 1024 buffer_size 8192 rate 44100 } } pcm.duplicator { type plug slave.pcm { type multi slave { a { pcm "dmixer" channels 2 } b { pcm "fileout" channels 2 } } bindings [ { slave a channel 0 } { slave a channel 1 } { slave b channel 0 } { slave b channel 1 } ] } ttable [ [ 1 0 1 0 ] [ 0 1 0 1 ] ] } pcm.fileout { type file slave.pcm "null" file "|safe_fifo_alt" format raw perm 0666 } safe_fifo_alt: #!/usr/bin/python3 import os, sys BUFFER_SIZE = 16384 path = "/tmp/audio" if not os.path.exists(path): os.mkfifo(path) _fifo_in = os.open(path, os.O_RDONLY | os.O_NONBLOCK) _fifo_out = os.open(path, os.WR_ONLY | os.O_NONBLOCK) for chunk in iter(lambda: sys.stdin.buffer.read(BUFFER_SIZE), b''): os.write(_fifo_out, chunk) os.close(_fifo_in) os.close(_fifo_out) I based `safe_fifo_alt` on [safe_fifo](https://github.com/dpayne/cli-visualizer/blob/master/bin/safe_fi… from `cli-visualizer`. They both hang indefinitely on their STDIN read because alsa is hanging on its `pclose()`. I've tested an alternative method to simulate the popen and pipe into their STDIN to make sure it worked, specifically: head -c 500 /dev/urandom | sh -c safe_fifo_alt It appears this was changed in revision 022c790aabc300eabad4da8947a3f2bdadce41e1, where the `dup()` and `pclose()` calls were added and introduced the deadlock. Issue URL : https://github.com/alsa-project/alsa-lib/issues/14 Repository URL: https://github.com/alsa-project/alsa-lib

1 0

[alsa-devel] [PATCH v11 2/6] ASoC: amd: Refactoring of DAI from DMA driver
by Ravulapati Vishnu vardhan rao 21 Nov '19

21 Nov '19

ASoC: PCM DMA driver should only have dma ops. So, removed all DAI related functionality. Refactoring the PCM DMA diver code.Added new file containing only DAI ops. Signed-off-by: Ravulapati Vishnu vardhan rao <Vishnuvardhanrao.Ravulapati(a)amd.com> --- sound/soc/amd/raven/Makefile | 2 + sound/soc/amd/raven/acp3x-i2s.c | 263 +++++++++++++++++++++++++++++++ sound/soc/amd/raven/acp3x-pcm-dma.c | 305 +++++++----------------------------- sound/soc/amd/raven/acp3x.h | 43 +++++ 4 files changed, 367 insertions(+), 246 deletions(-) create mode 100644 sound/soc/amd/raven/acp3x-i2s.c diff --git a/sound/soc/amd/raven/Makefile b/sound/soc/amd/raven/Makefile index 108d1ac..62c22b6 100644 --- a/sound/soc/amd/raven/Makefile +++ b/sound/soc/amd/raven/Makefile @@ -2,5 +2,7 @@ # Raven Ridge platform Support snd-pci-acp3x-objs := pci-acp3x.o snd-acp3x-pcm-dma-objs := acp3x-pcm-dma.o +snd-acp3x-i2s-objs := acp3x-i2s.o obj-$(CONFIG_SND_SOC_AMD_ACP3x) += snd-pci-acp3x.o obj-$(CONFIG_SND_SOC_AMD_ACP3x) += snd-acp3x-pcm-dma.o +obj-$(CONFIG_SND_SOC_AMD_ACP3x) += snd-acp3x-i2s.o diff --git a/sound/soc/amd/raven/acp3x-i2s.c b/sound/soc/amd/raven/acp3x-i2s.c new file mode 100644 index 0000000..1e2485e --- /dev/null +++ b/sound/soc/amd/raven/acp3x-i2s.c @@ -0,0 +1,263 @@ +// SPDX-License-Identifier: GPL-2.0+ +// +// AMD ALSA SoC PCM Driver +// +//Copyright 2016 Advanced Micro Devices, Inc. + +#include <linux/platform_device.h> +#include <linux/module.h> +#include <linux/err.h> +#include <linux/io.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include <sound/soc.h> +#include <sound/soc-dai.h> +#include <linux/dma-mapping.h> + +#include "acp3x.h" + +#define DRV_NAME "acp3x-i2s" + +static int acp3x_i2s_set_fmt(struct snd_soc_dai *cpu_dai, + unsigned int fmt) +{ + struct i2s_dev_data *adata; + int mode; + + adata = snd_soc_dai_get_drvdata(cpu_dai); + mode = fmt & SND_SOC_DAIFMT_FORMAT_MASK; + switch (mode) { + case SND_SOC_DAIFMT_I2S: + adata->tdm_mode = false; + break; + case SND_SOC_DAIFMT_DSP_A: + adata->tdm_mode = true; + break; + default: + return -EINVAL; + } + return 0; +} + +static int acp3x_i2s_set_tdm_slot(struct snd_soc_dai *cpu_dai, + u32 tx_mask, u32 rx_mask, int slots, int slot_width) +{ + struct i2s_dev_data *adata; + u32 val, reg_val, frmt_val, frm_len; + u16 slot_len; + + adata = snd_soc_dai_get_drvdata(cpu_dai); + + /* These values are as per Hardware Spec */ + switch (slot_width) { + case SLOT_WIDTH_8: + slot_len = 8; + break; + case SLOT_WIDTH_16: + slot_len = 16; + break; + case SLOT_WIDTH_24: + slot_len = 24; + break; + case SLOT_WIDTH_32: + slot_len = 0; + break; + default: + return -EINVAL; + } + + /* Enable I2S/BT channels TDM, respective TX/RX frame lengths.*/ + + frm_len = FRM_LEN | (slots << 15) | (slot_len << 18); + if (adata->substream_type == SNDRV_PCM_STREAM_PLAYBACK) { + reg_val = mmACP_BTTDM_ITER; + frmt_val = mmACP_BTTDM_TXFRMT; + } else { + reg_val = mmACP_BTTDM_IRER; + frmt_val = mmACP_BTTDM_RXFRMT; + } + val = rv_readl(adata->acp3x_base + reg_val); + rv_writel(val | 0x2, adata->acp3x_base + reg_val); + rv_writel(frm_len, adata->acp3x_base + frmt_val); + adata->tdm_fmt = frm_len; + return 0; +} + +static int acp3x_i2s_hwparams(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) +{ + struct i2s_stream_instance *rtd; + u32 val; + u32 reg_val; + + rtd = substream->runtime->private_data; + + /* These values are as per Hardware Spec */ + switch (params_format(params)) { + case SNDRV_PCM_FORMAT_U8: + case SNDRV_PCM_FORMAT_S8: + rtd->xfer_resolution = 0x0; + break; + case SNDRV_PCM_FORMAT_S16_LE: + rtd->xfer_resolution = 0x02; + break; + case SNDRV_PCM_FORMAT_S24_LE: + rtd->xfer_resolution = 0x04; + break; + case SNDRV_PCM_FORMAT_S32_LE: + rtd->xfer_resolution = 0x05; + break; + default: + return -EINVAL; + } + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + reg_val = mmACP_BTTDM_ITER; + else + reg_val = mmACP_BTTDM_IRER; + + val = rv_readl(rtd->acp3x_base + reg_val); + val = val | (rtd->xfer_resolution << 3); + rv_writel(val, rtd->acp3x_base + reg_val); + return 0; +} + +static int acp3x_i2s_trigger(struct snd_pcm_substream *substream, + int cmd, struct snd_soc_dai *dai) +{ + struct i2s_stream_instance *rtd; + u32 val, period_bytes; + int ret, reg_val; + + rtd = substream->runtime->private_data; + period_bytes = frames_to_bytes(substream->runtime, + substream->runtime->period_size); + switch (cmd) { + case SNDRV_PCM_TRIGGER_START: + case SNDRV_PCM_TRIGGER_RESUME: + case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: + rtd->bytescount = acp_get_byte_count(rtd, + substream->stream); + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { + reg_val = mmACP_BTTDM_ITER; + rv_writel(period_bytes, rtd->acp3x_base + + mmACP_BT_TX_INTR_WATERMARK_SIZE); + } else { + reg_val = mmACP_BTTDM_IRER; + rv_writel(period_bytes, rtd->acp3x_base + + mmACP_BT_RX_INTR_WATERMARK_SIZE); + } + val = rv_readl(rtd->acp3x_base + reg_val); + val = val | BIT(0); + rv_writel(val, rtd->acp3x_base + reg_val); + rv_writel(1, rtd->acp3x_base + mmACP_BTTDM_IER); + break; + case SNDRV_PCM_TRIGGER_STOP: + case SNDRV_PCM_TRIGGER_SUSPEND: + case SNDRV_PCM_TRIGGER_PAUSE_PUSH: + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + reg_val = mmACP_BTTDM_ITER; + else + reg_val = mmACP_BTTDM_IRER; + + val = rv_readl(rtd->acp3x_base + reg_val); + val = val & ~BIT(0); + rv_writel(val, rtd->acp3x_base + reg_val); + rv_writel(0, rtd->acp3x_base + mmACP_BTTDM_IER); + break; + default: + ret = -EINVAL; + break; + } + + return ret; +} + +static struct snd_soc_dai_ops acp3x_i2s_dai_ops = { + .hw_params = acp3x_i2s_hwparams, + .trigger = acp3x_i2s_trigger, + .set_fmt = acp3x_i2s_set_fmt, + .set_tdm_slot = acp3x_i2s_set_tdm_slot, +}; + +static const struct snd_soc_component_driver acp3x_dai_component = { + .name = "acp3x-i2s", +}; + +static struct snd_soc_dai_driver acp3x_i2s_dai = { + .playback = { + .rates = SNDRV_PCM_RATE_8000_96000, + .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S8 | + SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S24_LE | + SNDRV_PCM_FMTBIT_S32_LE, + .channels_min = 2, + .channels_max = 8, + .rate_min = 8000, + .rate_max = 96000, + }, + .capture = { + .rates = SNDRV_PCM_RATE_8000_48000, + .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S8 | + SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S24_LE | + SNDRV_PCM_FMTBIT_S32_LE, + .channels_min = 2, + .channels_max = 2, + .rate_min = 8000, + .rate_max = 48000, + }, + .ops = &acp3x_i2s_dai_ops, +}; + + +static int acp3x_dai_probe(struct platform_device *pdev) +{ + struct resource *res; + struct i2s_dev_data *adata; + int ret; + + adata = devm_kzalloc(&pdev->dev, sizeof(struct i2s_dev_data), + GFP_KERNEL); + if (!adata) + return -ENOMEM; + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!res) { + dev_err(&pdev->dev, "IORESOURCE_MEM FAILED\n"); + return -ENOMEM; + } + adata->acp3x_base = devm_ioremap(&pdev->dev, res->start, + resource_size(res)); + if (IS_ERR(adata->acp3x_base)) + return PTR_ERR(adata->acp3x_base); + + adata->i2s_irq = res->start; + dev_set_drvdata(&pdev->dev, adata); + ret = devm_snd_soc_register_component(&pdev->dev, + &acp3x_dai_component, &acp3x_i2s_dai, 1); + if (ret) { + dev_err(&pdev->dev, "Fail to register acp i2s dai\n"); + return -ENODEV; + } + return 0; +} + +static int acp3x_dai_remove(struct platform_device *pdev) +{ + /* As we use devm_ memory alloc there is nothing TBD here */ + + return 0; +} + +static struct platform_driver acp3x_dai_driver = { + .probe = acp3x_dai_probe, + .remove = acp3x_dai_remove, + .driver = { + .name = "acp3x_i2s_playcap", + }, +}; + +module_platform_driver(acp3x_dai_driver); + +MODULE_AUTHOR("Vishnuvardhanrao.Ravulapati(a)amd.com"); +MODULE_DESCRIPTION("AMD ACP 3.x PCM Driver"); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:" DRV_NAME); diff --git a/sound/soc/amd/raven/acp3x-pcm-dma.c b/sound/soc/amd/raven/acp3x-pcm-dma.c index 60709e3..0202737 100644 --- a/sound/soc/amd/raven/acp3x-pcm-dma.c +++ b/sound/soc/amd/raven/acp3x-pcm-dma.c @@ -18,24 +18,6 @@ #define DRV_NAME "acp3x-i2s-audio" -struct i2s_dev_data { - bool tdm_mode; - unsigned int i2s_irq; - u32 tdm_fmt; - void __iomem *acp3x_base; - struct snd_pcm_substream *play_stream; - struct snd_pcm_substream *capture_stream; -}; - -struct i2s_stream_instance { - u16 num_pages; - u16 channels; - u32 xfer_resolution; - u64 bytescount; - dma_addr_t dma_addr; - void __iomem *acp3x_base; -}; - static const struct snd_pcm_hardware acp3x_pcm_hardware_playback = { .info = SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | @@ -178,10 +160,11 @@ static int acp3x_deinit(void __iomem *acp3x_base) static irqreturn_t i2s_irq_handler(int irq, void *dev_id) { + struct i2s_dev_data *rv_i2s_data; u16 play_flag, cap_flag; u32 val; - struct i2s_dev_data *rv_i2s_data = dev_id; + rv_i2s_data = dev_id; if (!rv_i2s_data) return IRQ_NONE; @@ -278,11 +261,18 @@ static void config_acp3x_dma(struct i2s_stream_instance *rtd, int direction) static int acp3x_dma_open(struct snd_soc_component *component, struct snd_pcm_substream *substream) { - int ret = 0; - struct snd_pcm_runtime *runtime = substream->runtime; - struct i2s_dev_data *adata = dev_get_drvdata(component->dev); - struct i2s_stream_instance *i2s_data = kzalloc(sizeof(struct i2s_stream_instance), - GFP_KERNEL); + struct snd_pcm_runtime *runtime; + struct snd_soc_pcm_runtime *prtd; + struct i2s_dev_data *adata; + struct i2s_stream_instance *i2s_data; + int ret; + + runtime = substream->runtime; + prtd = substream->private_data; + component = snd_soc_rtdcom_lookup(prtd, DRV_NAME); + adata = dev_get_drvdata(component->dev); + i2s_data = kzalloc(sizeof(struct i2s_stream_instance), + GFP_KERNEL); if (!i2s_data) return -EINVAL; @@ -312,33 +302,18 @@ static int acp3x_dma_open(struct snd_soc_component *component, return 0; } -static u64 acp_get_byte_count(struct i2s_stream_instance *rtd, int direction) -{ - u64 byte_count; - - if (direction == SNDRV_PCM_STREAM_PLAYBACK) { - byte_count = rv_readl(rtd->acp3x_base + - mmACP_BT_TX_LINEARPOSITIONCNTR_HIGH); - byte_count |= rv_readl(rtd->acp3x_base + - mmACP_BT_TX_LINEARPOSITIONCNTR_LOW); - } else { - byte_count = rv_readl(rtd->acp3x_base + - mmACP_BT_RX_LINEARPOSITIONCNTR_HIGH); - byte_count |= rv_readl(rtd->acp3x_base + - mmACP_BT_RX_LINEARPOSITIONCNTR_LOW); - } - return byte_count; -} static int acp3x_dma_hw_params(struct snd_soc_component *component, struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { + struct snd_pcm_runtime *runtime; + struct i2s_stream_instance *rtd; int status; u64 size; - struct snd_pcm_runtime *runtime = substream->runtime; - struct i2s_stream_instance *rtd = runtime->private_data; + runtime = substream->runtime; + rtd = substream->private_data; if (!rtd) return -EINVAL; @@ -362,12 +337,12 @@ static int acp3x_dma_hw_params(struct snd_soc_component *component, static snd_pcm_uframes_t acp3x_dma_pointer(struct snd_soc_component *component, struct snd_pcm_substream *substream) { - u32 pos = 0; - u32 buffersize = 0; - u64 bytescount = 0; - struct i2s_stream_instance *rtd = - substream->runtime->private_data; + struct i2s_stream_instance *rtd; + u32 pos; + u32 buffersize; + u64 bytescount; + rtd = substream->runtime->private_data; buffersize = frames_to_bytes(substream->runtime, substream->runtime->buffer_size); bytescount = acp_get_byte_count(rtd, substream->stream); @@ -380,7 +355,10 @@ static snd_pcm_uframes_t acp3x_dma_pointer(struct snd_soc_component *component, static int acp3x_dma_new(struct snd_soc_component *component, struct snd_soc_pcm_runtime *rtd) { - struct device *parent = component->dev->parent; + struct device *parent; + + component = snd_soc_rtdcom_lookup(rtd, DRV_NAME); + parent = component->dev->parent; snd_pcm_lib_preallocate_pages_for_all(rtd->pcm, SNDRV_DMA_TYPE_DEV, parent, MIN_BUFFER, MAX_BUFFER); return 0; @@ -402,8 +380,12 @@ static int acp3x_dma_mmap(struct snd_soc_component *component, static int acp3x_dma_close(struct snd_soc_component *component, struct snd_pcm_substream *substream) { - struct i2s_stream_instance *rtd = substream->runtime->private_data; - struct i2s_dev_data *adata = dev_get_drvdata(component->dev); + struct snd_soc_pcm_runtime *prtd; + struct i2s_dev_data *adata; + + prtd = substream->private_data; + component = snd_soc_rtdcom_lookup(prtd, DRV_NAME); + adata = dev_get_drvdata(component->dev); if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) adata->play_stream = NULL; @@ -415,186 +397,9 @@ static int acp3x_dma_close(struct snd_soc_component *component, */ if (!adata->play_stream && !adata->capture_stream) rv_writel(0, adata->acp3x_base + mmACP_EXTERNAL_INTR_ENB); - kfree(rtd); - return 0; -} - -static int acp3x_dai_i2s_set_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt) -{ - - struct i2s_dev_data *adata = snd_soc_dai_get_drvdata(cpu_dai); - - switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { - case SND_SOC_DAIFMT_I2S: - adata->tdm_mode = false; - break; - case SND_SOC_DAIFMT_DSP_A: - adata->tdm_mode = true; - break; - default: - return -EINVAL; - } - - return 0; -} - -static int acp3x_dai_set_tdm_slot(struct snd_soc_dai *cpu_dai, u32 tx_mask, - u32 rx_mask, int slots, int slot_width) -{ - u32 val = 0; - u16 slot_len; - - struct i2s_dev_data *adata = snd_soc_dai_get_drvdata(cpu_dai); - - switch (slot_width) { - case SLOT_WIDTH_8: - slot_len = 8; - break; - case SLOT_WIDTH_16: - slot_len = 16; - break; - case SLOT_WIDTH_24: - slot_len = 24; - break; - case SLOT_WIDTH_32: - slot_len = 0; - break; - default: - return -EINVAL; - } - - val = rv_readl(adata->acp3x_base + mmACP_BTTDM_ITER); - rv_writel((val | 0x2), adata->acp3x_base + mmACP_BTTDM_ITER); - val = rv_readl(adata->acp3x_base + mmACP_BTTDM_IRER); - rv_writel((val | 0x2), adata->acp3x_base + mmACP_BTTDM_IRER); - - val = (FRM_LEN | (slots << 15) | (slot_len << 18)); - rv_writel(val, adata->acp3x_base + mmACP_BTTDM_TXFRMT); - rv_writel(val, adata->acp3x_base + mmACP_BTTDM_RXFRMT); - - adata->tdm_fmt = val; return 0; } -static int acp3x_dai_i2s_hwparams(struct snd_pcm_substream *substream, - struct snd_pcm_hw_params *params, - struct snd_soc_dai *dai) -{ - u32 val = 0; - struct i2s_stream_instance *rtd = substream->runtime->private_data; - - switch (params_format(params)) { - case SNDRV_PCM_FORMAT_U8: - case SNDRV_PCM_FORMAT_S8: - rtd->xfer_resolution = 0x0; - break; - case SNDRV_PCM_FORMAT_S16_LE: - rtd->xfer_resolution = 0x02; - break; - case SNDRV_PCM_FORMAT_S24_LE: - rtd->xfer_resolution = 0x04; - break; - case SNDRV_PCM_FORMAT_S32_LE: - rtd->xfer_resolution = 0x05; - break; - default: - return -EINVAL; - } - val = rv_readl(rtd->acp3x_base + mmACP_BTTDM_ITER); - val = val | (rtd->xfer_resolution << 3); - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) - rv_writel(val, rtd->acp3x_base + mmACP_BTTDM_ITER); - else - rv_writel(val, rtd->acp3x_base + mmACP_BTTDM_IRER); - - return 0; -} - -static int acp3x_dai_i2s_trigger(struct snd_pcm_substream *substream, - int cmd, struct snd_soc_dai *dai) -{ - int ret = 0; - struct i2s_stream_instance *rtd = substream->runtime->private_data; - u32 val, period_bytes; - - period_bytes = frames_to_bytes(substream->runtime, - substream->runtime->period_size); - switch (cmd) { - case SNDRV_PCM_TRIGGER_START: - case SNDRV_PCM_TRIGGER_RESUME: - case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: - rtd->bytescount = acp_get_byte_count(rtd, substream->stream); - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { - rv_writel(period_bytes, rtd->acp3x_base + - mmACP_BT_TX_INTR_WATERMARK_SIZE); - val = rv_readl(rtd->acp3x_base + mmACP_BTTDM_ITER); - val = val | BIT(0); - rv_writel(val, rtd->acp3x_base + mmACP_BTTDM_ITER); - } else { - rv_writel(period_bytes, rtd->acp3x_base + - mmACP_BT_RX_INTR_WATERMARK_SIZE); - val = rv_readl(rtd->acp3x_base + mmACP_BTTDM_IRER); - val = val | BIT(0); - rv_writel(val, rtd->acp3x_base + mmACP_BTTDM_IRER); - } - rv_writel(1, rtd->acp3x_base + mmACP_BTTDM_IER); - break; - case SNDRV_PCM_TRIGGER_STOP: - case SNDRV_PCM_TRIGGER_SUSPEND: - case SNDRV_PCM_TRIGGER_PAUSE_PUSH: - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { - val = rv_readl(rtd->acp3x_base + mmACP_BTTDM_ITER); - val = val & ~BIT(0); - rv_writel(val, rtd->acp3x_base + mmACP_BTTDM_ITER); - } else { - val = rv_readl(rtd->acp3x_base + mmACP_BTTDM_IRER); - val = val & ~BIT(0); - rv_writel(val, rtd->acp3x_base + mmACP_BTTDM_IRER); - } - rv_writel(0, rtd->acp3x_base + mmACP_BTTDM_IER); - break; - default: - ret = -EINVAL; - break; - } - - return ret; -} - -static struct snd_soc_dai_ops acp3x_dai_i2s_ops = { - .hw_params = acp3x_dai_i2s_hwparams, - .trigger = acp3x_dai_i2s_trigger, - .set_fmt = acp3x_dai_i2s_set_fmt, - .set_tdm_slot = acp3x_dai_set_tdm_slot, -}; - -static struct snd_soc_dai_driver acp3x_i2s_dai_driver = { - .playback = { - .rates = SNDRV_PCM_RATE_8000_96000, - .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S8 | - SNDRV_PCM_FMTBIT_U8 | - SNDRV_PCM_FMTBIT_S24_LE | - SNDRV_PCM_FMTBIT_S32_LE, - .channels_min = 2, - .channels_max = 8, - - .rate_min = 8000, - .rate_max = 96000, - }, - .capture = { - .rates = SNDRV_PCM_RATE_8000_48000, - .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S8 | - SNDRV_PCM_FMTBIT_U8 | - SNDRV_PCM_FMTBIT_S24_LE | - SNDRV_PCM_FMTBIT_S32_LE, - .channels_min = 2, - .channels_max = 2, - .rate_min = 8000, - .rate_max = 48000, - }, - .ops = &acp3x_dai_i2s_ops, -}; - static const struct snd_soc_component_driver acp3x_i2s_component = { .name = DRV_NAME, .open = acp3x_dma_open, @@ -609,10 +414,10 @@ static const struct snd_soc_component_driver acp3x_i2s_component = { static int acp3x_audio_probe(struct platform_device *pdev) { - int status; struct resource *res; struct i2s_dev_data *adata; unsigned int irqflags; + int status, ret; if (!pdev->dev.platform_data) { dev_err(&pdev->dev, "platform_data not retrieved\n"); @@ -622,7 +427,7 @@ static int acp3x_audio_probe(struct platform_device *pdev) res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!res) { - dev_err(&pdev->dev, "IORESOURCE_IRQ FAILED\n"); + dev_err(&pdev->dev, "IORESOURCE_MEM FAILED\n"); return -ENODEV; } @@ -632,60 +437,64 @@ static int acp3x_audio_probe(struct platform_device *pdev) adata->acp3x_base = devm_ioremap(&pdev->dev, res->start, resource_size(res)); + if (!adata->acp3x_base) + return -ENOMEM; res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); if (!res) { dev_err(&pdev->dev, "IORESOURCE_IRQ FAILED\n"); - return -ENODEV; + return -ENOMEM; } adata->i2s_irq = res->start; - adata->play_stream = NULL; - adata->capture_stream = NULL; dev_set_drvdata(&pdev->dev, adata); /* Initialize ACP */ status = acp3x_init(adata->acp3x_base); if (status) return -ENODEV; + status = devm_snd_soc_register_component(&pdev->dev, &acp3x_i2s_component, - &acp3x_i2s_dai_driver, 1); + NULL, 0); if (status) { - dev_err(&pdev->dev, "Fail to register acp i2s dai\n"); + dev_err(&pdev->dev, "Fail to register acp i2s component\n"); + ret = -ENODEV; goto dev_err; } status = devm_request_irq(&pdev->dev, adata->i2s_irq, i2s_irq_handler, irqflags, "ACP3x_I2S_IRQ", adata); if (status) { dev_err(&pdev->dev, "ACP3x I2S IRQ request failed\n"); + ret = -ENODEV; goto dev_err; } - pm_runtime_set_autosuspend_delay(&pdev->dev, 10000); + pm_runtime_set_autosuspend_delay(&pdev->dev, 5000); pm_runtime_use_autosuspend(&pdev->dev); pm_runtime_enable(&pdev->dev); return 0; + dev_err: status = acp3x_deinit(adata->acp3x_base); if (status) dev_err(&pdev->dev, "ACP de-init failed\n"); else - dev_info(&pdev->dev, "ACP de-initialized\n"); - /*ignore device status and return driver probe error*/ - return -ENODEV; + dev_dbg(&pdev->dev, "ACP de-initialized\n"); + return ret; } static int acp3x_audio_remove(struct platform_device *pdev) { + struct i2s_dev_data *adata; int ret; - struct i2s_dev_data *adata = dev_get_drvdata(&pdev->dev); + adata = dev_get_drvdata(&pdev->dev); ret = acp3x_deinit(adata->acp3x_base); if (ret) dev_err(&pdev->dev, "ACP de-init failed\n"); else - dev_info(&pdev->dev, "ACP de-initialized\n"); + dev_dbg(&pdev->dev, "ACP de-initialized\n"); pm_runtime_disable(&pdev->dev); return 0; @@ -693,10 +502,11 @@ static int acp3x_audio_remove(struct platform_device *pdev) static int acp3x_resume(struct device *dev) { + struct i2s_dev_data *adata; int status; u32 val; - struct i2s_dev_data *adata = dev_get_drvdata(dev); + adata = dev_get_drvdata(dev); status = acp3x_init(adata->acp3x_base); if (status) return -ENODEV; @@ -738,14 +548,15 @@ static int acp3x_resume(struct device *dev) static int acp3x_pcm_runtime_suspend(struct device *dev) { + struct i2s_dev_data *adata; int status; - struct i2s_dev_data *adata = dev_get_drvdata(dev); + adata = dev_get_drvdata(dev); status = acp3x_deinit(adata->acp3x_base); if (status) dev_err(dev, "ACP de-init failed\n"); else - dev_info(dev, "ACP de-initialized\n"); + dev_dbg(dev, "ACP de-initialized\n"); rv_writel(0, adata->acp3x_base + mmACP_EXTERNAL_INTR_ENB); @@ -754,8 +565,9 @@ static int acp3x_pcm_runtime_suspend(struct device *dev) static int acp3x_pcm_runtime_resume(struct device *dev) { + struct i2s_dev_data *adata; int status; - struct i2s_dev_data *adata = dev_get_drvdata(dev); + adata = dev_get_drvdata(dev); status = acp3x_init(adata->acp3x_base); if (status) @@ -774,13 +586,14 @@ static struct platform_driver acp3x_dma_driver = { .probe = acp3x_audio_probe, .remove = acp3x_audio_remove, .driver = { - .name = "acp3x_rv_i2s", + .name = "acp3x_rv_i2s_dma", .pm = &acp3x_pm_ops, }, }; module_platform_driver(acp3x_dma_driver); +MODULE_AUTHOR("Vishnuvardhanrao.Ravulapati(a)amd.com"); MODULE_AUTHOR("Maruthi.Bayyavarapu(a)amd.com"); MODULE_AUTHOR("Vijendar.Mukunda(a)amd.com"); MODULE_DESCRIPTION("AMD ACP 3.x PCM Driver"); diff --git a/sound/soc/amd/raven/acp3x.h b/sound/soc/amd/raven/acp3x.h index 2f15fe1..a6c6d63 100644 --- a/sound/soc/amd/raven/acp3x.h +++ b/sound/soc/amd/raven/acp3x.h @@ -51,6 +51,30 @@ #define SLOT_WIDTH_24 0x18 #define SLOT_WIDTH_32 0x20 +struct acp3x_platform_info { + u16 play_i2s_instance; + u16 cap_i2s_instance; + u16 capture_channel; +}; + +struct i2s_dev_data { + bool tdm_mode; + unsigned int i2s_irq; + u32 tdm_fmt; + u32 substream_type; + void __iomem *acp3x_base; + struct snd_pcm_substream *play_stream; + struct snd_pcm_substream *capture_stream; +}; + +struct i2s_stream_instance { + u16 num_pages; + u16 channels; + u32 xfer_resolution; + u64 bytescount; + dma_addr_t dma_addr; + void __iomem *acp3x_base; +}; static inline u32 rv_readl(void __iomem *base_addr) { @@ -61,3 +85,22 @@ static inline void rv_writel(u32 val, void __iomem *base_addr) { writel(val, base_addr - ACP3x_PHY_BASE_ADDRESS); } + +static inline u64 acp_get_byte_count(struct i2s_stream_instance *rtd, + int direction) +{ + u64 byte_count; + + if (direction == SNDRV_PCM_STREAM_PLAYBACK) { + byte_count = rv_readl(rtd->acp3x_base + + mmACP_BT_TX_LINEARPOSITIONCNTR_HIGH); + byte_count |= rv_readl(rtd->acp3x_base + + mmACP_BT_TX_LINEARPOSITIONCNTR_LOW); + } else { + byte_count = rv_readl(rtd->acp3x_base + + mmACP_BT_RX_LINEARPOSITIONCNTR_HIGH); + byte_count |= rv_readl(rtd->acp3x_base + + mmACP_BT_RX_LINEARPOSITIONCNTR_LOW); + } + return byte_count; +} -- 2.7.4

2 1

[alsa-devel] [RESEND PATCH v11 3/6] ASoC: amd: Enabling I2S instance in DMA and DAI
by Ravulapati Vishnu vardhan rao 21 Nov '19

21 Nov '19

This patch adds I2S SP support in ACP PCM DMA and DAI. Added I2S support in DMA and DAI probe,its hw_params handling its open and close functionalities. This enable to open and close on the SP instance for playback and capture. Signed-off-by: Ravulapati Vishnu vardhan rao <Vishnuvardhanrao.Ravulapati(a)amd.com> --- sound/soc/amd/raven/acp3x-i2s.c | 119 ++++++++++++++++---- sound/soc/amd/raven/acp3x-pcm-dma.c | 214 ++++++++++++++++++++++++------------ sound/soc/amd/raven/acp3x.h | 74 ++++++++++--- 3 files changed, 304 insertions(+), 103 deletions(-) diff --git a/sound/soc/amd/raven/acp3x-i2s.c b/sound/soc/amd/raven/acp3x-i2s.c index 1e2485e..246eac4 100644 --- a/sound/soc/amd/raven/acp3x-i2s.c +++ b/sound/soc/amd/raven/acp3x-i2s.c @@ -87,10 +87,22 @@ static int acp3x_i2s_hwparams(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) { struct i2s_stream_instance *rtd; + struct snd_soc_pcm_runtime *prtd; + struct snd_soc_card *card; + struct acp3x_platform_info *pinfo; u32 val; u32 reg_val; + prtd = substream->private_data; rtd = substream->runtime->private_data; + card = prtd->card; + pinfo = snd_soc_card_get_drvdata(card); + if (pinfo) { + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + rtd->i2s_instance = pinfo->play_i2s_instance; + else + rtd->i2s_instance = pinfo->cap_i2s_instance; + } /* These values are as per Hardware Spec */ switch (params_format(params)) { @@ -110,11 +122,25 @@ static int acp3x_i2s_hwparams(struct snd_pcm_substream *substream, default: return -EINVAL; } - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) - reg_val = mmACP_BTTDM_ITER; - else - reg_val = mmACP_BTTDM_IRER; - + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + reg_val = mmACP_BTTDM_ITER; + break; + case I2S_SP_INSTANCE: + default: + reg_val = mmACP_I2STDM_ITER; + } + } else { + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + reg_val = mmACP_BTTDM_IRER; + break; + case I2S_SP_INSTANCE: + default: + reg_val = mmACP_I2STDM_IRER; + } + } val = rv_readl(rtd->acp3x_base + reg_val); val = val | (rtd->xfer_resolution << 3); rv_writel(val, rtd->acp3x_base + reg_val); @@ -125,10 +151,21 @@ static int acp3x_i2s_trigger(struct snd_pcm_substream *substream, int cmd, struct snd_soc_dai *dai) { struct i2s_stream_instance *rtd; - u32 val, period_bytes; - int ret, reg_val; + struct snd_soc_pcm_runtime *prtd; + struct snd_soc_card *card; + struct acp3x_platform_info *pinfo; + u32 ret, val, period_bytes, reg_val, ier_val, water_val; + prtd = substream->private_data; rtd = substream->runtime->private_data; + card = prtd->card; + pinfo = snd_soc_card_get_drvdata(card); + if (pinfo) { + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + rtd->i2s_instance = pinfo->play_i2s_instance; + else + rtd->i2s_instance = pinfo->cap_i2s_instance; + } period_bytes = frames_to_bytes(substream->runtime, substream->runtime->period_size); switch (cmd) { @@ -138,31 +175,75 @@ static int acp3x_i2s_trigger(struct snd_pcm_substream *substream, rtd->bytescount = acp_get_byte_count(rtd, substream->stream); if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { - reg_val = mmACP_BTTDM_ITER; - rv_writel(period_bytes, rtd->acp3x_base + - mmACP_BT_TX_INTR_WATERMARK_SIZE); + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + water_val = + mmACP_BT_TX_INTR_WATERMARK_SIZE; + reg_val = mmACP_BTTDM_ITER; + ier_val = mmACP_BTTDM_IER; + break; + case I2S_SP_INSTANCE: + default: + water_val = + mmACP_I2S_TX_INTR_WATERMARK_SIZE; + reg_val = mmACP_I2STDM_ITER; + ier_val = mmACP_I2STDM_IER; + } } else { - reg_val = mmACP_BTTDM_IRER; - rv_writel(period_bytes, rtd->acp3x_base + - mmACP_BT_RX_INTR_WATERMARK_SIZE); + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + water_val = + mmACP_BT_RX_INTR_WATERMARK_SIZE; + reg_val = mmACP_BTTDM_IRER; + ier_val = mmACP_BTTDM_IER; + break; + case I2S_SP_INSTANCE: + default: + water_val = + mmACP_I2S_RX_INTR_WATERMARK_SIZE; + reg_val = mmACP_I2STDM_IRER; + ier_val = mmACP_I2STDM_IER; + } } + rv_writel(period_bytes, rtd->acp3x_base + water_val); val = rv_readl(rtd->acp3x_base + reg_val); val = val | BIT(0); rv_writel(val, rtd->acp3x_base + reg_val); - rv_writel(1, rtd->acp3x_base + mmACP_BTTDM_IER); + rv_writel(1, rtd->acp3x_base + ier_val); + ret = 0; break; case SNDRV_PCM_TRIGGER_STOP: case SNDRV_PCM_TRIGGER_SUSPEND: case SNDRV_PCM_TRIGGER_PAUSE_PUSH: - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) - reg_val = mmACP_BTTDM_ITER; - else - reg_val = mmACP_BTTDM_IRER; + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + reg_val = mmACP_BTTDM_ITER; + ier_val = mmACP_BTTDM_IER; + break; + case I2S_SP_INSTANCE: + default: + reg_val = mmACP_I2STDM_ITER; + ier_val = mmACP_I2STDM_IER; + } + } else { + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + reg_val = mmACP_BTTDM_IRER; + ier_val = mmACP_BTTDM_IER; + break; + case I2S_SP_INSTANCE: + default: + reg_val = mmACP_I2STDM_IRER; + ier_val = mmACP_I2STDM_IER; + } + } val = rv_readl(rtd->acp3x_base + reg_val); val = val & ~BIT(0); rv_writel(val, rtd->acp3x_base + reg_val); - rv_writel(0, rtd->acp3x_base + mmACP_BTTDM_IER); + rv_writel(0, rtd->acp3x_base + ier_val); + ret = 0; break; default: ret = -EINVAL; diff --git a/sound/soc/amd/raven/acp3x-pcm-dma.c b/sound/soc/amd/raven/acp3x-pcm-dma.c index 0202737..fc16432 100644 --- a/sound/soc/amd/raven/acp3x-pcm-dma.c +++ b/sound/soc/amd/raven/acp3x-pcm-dma.c @@ -194,15 +194,31 @@ static irqreturn_t i2s_irq_handler(int irq, void *dev_id) static void config_acp3x_dma(struct i2s_stream_instance *rtd, int direction) { u16 page_idx; - u32 low, high, val, acp_fifo_addr; - dma_addr_t addr = rtd->dma_addr; + u32 low, high, val, acp_fifo_addr, reg_fifo_addr; + u32 reg_ringbuf_size, reg_dma_size, reg_fifo_size; + dma_addr_t addr; - /* 8 scratch registers used to map one 64 bit address */ - if (direction == SNDRV_PCM_STREAM_PLAYBACK) - val = 0; - else - val = rtd->num_pages * 8; + addr = rtd->dma_addr; + if (direction == SNDRV_PCM_STREAM_PLAYBACK) { + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + val = ACP_SRAM_BT_PB_PTE_OFFSET; + break; + case I2S_SP_INSTANCE: + default: + val = ACP_SRAM_SP_PB_PTE_OFFSET; + } + } else { + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + val = ACP_SRAM_BT_CP_PTE_OFFSET; + break; + case I2S_SP_INSTANCE: + default: + val = ACP_SRAM_SP_CP_PTE_OFFSET; + } + } /* Group Enable */ rv_writel(ACP_SRAM_PTE_OFFSET | BIT(31), rtd->acp3x_base + mmACPAXI2AXI_ATU_BASE_ADDR_GRP_1); @@ -224,38 +240,61 @@ static void config_acp3x_dma(struct i2s_stream_instance *rtd, int direction) } if (direction == SNDRV_PCM_STREAM_PLAYBACK) { - /* Config ringbuffer */ - rv_writel(MEM_WINDOW_START, rtd->acp3x_base + - mmACP_BT_TX_RINGBUFADDR); - rv_writel(MAX_BUFFER, rtd->acp3x_base + - mmACP_BT_TX_RINGBUFSIZE); - rv_writel(DMA_SIZE, rtd->acp3x_base + mmACP_BT_TX_DMA_SIZE); - - /* Config audio fifo */ - acp_fifo_addr = ACP_SRAM_PTE_OFFSET + (rtd->num_pages * 8) - + PLAYBACK_FIFO_ADDR_OFFSET; - rv_writel(acp_fifo_addr, rtd->acp3x_base + - mmACP_BT_TX_FIFOADDR); - rv_writel(FIFO_SIZE, rtd->acp3x_base + mmACP_BT_TX_FIFOSIZE); + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + reg_ringbuf_size = mmACP_BT_TX_RINGBUFSIZE; + reg_dma_size = mmACP_BT_TX_DMA_SIZE; + acp_fifo_addr = ACP_SRAM_PTE_OFFSET + + BT_PB_FIFO_ADDR_OFFSET; + reg_fifo_addr = mmACP_BT_TX_FIFOADDR; + reg_fifo_size = mmACP_BT_TX_FIFOSIZE; + rv_writel(I2S_BT_TX_MEM_WINDOW_START, + rtd->acp3x_base + mmACP_BT_TX_RINGBUFADDR); + break; + + case I2S_SP_INSTANCE: + default: + reg_ringbuf_size = mmACP_I2S_TX_RINGBUFSIZE; + reg_dma_size = mmACP_I2S_TX_DMA_SIZE; + acp_fifo_addr = ACP_SRAM_PTE_OFFSET + + SP_PB_FIFO_ADDR_OFFSET; + reg_fifo_addr = mmACP_I2S_TX_FIFOADDR; + reg_fifo_size = mmACP_I2S_TX_FIFOSIZE; + rv_writel(I2S_SP_TX_MEM_WINDOW_START, + rtd->acp3x_base + mmACP_I2S_TX_RINGBUFADDR); + } } else { - /* Config ringbuffer */ - rv_writel(MEM_WINDOW_START + MAX_BUFFER, rtd->acp3x_base + - mmACP_BT_RX_RINGBUFADDR); - rv_writel(MAX_BUFFER, rtd->acp3x_base + - mmACP_BT_RX_RINGBUFSIZE); - rv_writel(DMA_SIZE, rtd->acp3x_base + mmACP_BT_RX_DMA_SIZE); - - /* Config audio fifo */ - acp_fifo_addr = ACP_SRAM_PTE_OFFSET + - (rtd->num_pages * 8) + CAPTURE_FIFO_ADDR_OFFSET; - rv_writel(acp_fifo_addr, rtd->acp3x_base + - mmACP_BT_RX_FIFOADDR); - rv_writel(FIFO_SIZE, rtd->acp3x_base + mmACP_BT_RX_FIFOSIZE); - } + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + reg_ringbuf_size = mmACP_BT_RX_RINGBUFSIZE; + reg_dma_size = mmACP_BT_RX_DMA_SIZE; + acp_fifo_addr = ACP_SRAM_PTE_OFFSET + + BT_CAPT_FIFO_ADDR_OFFSET; + reg_fifo_addr = mmACP_BT_RX_FIFOADDR; + reg_fifo_size = mmACP_BT_RX_FIFOSIZE; + rv_writel(I2S_BT_RX_MEM_WINDOW_START, + rtd->acp3x_base + mmACP_BT_RX_RINGBUFADDR); + break; - /* Enable watermark/period interrupt to host */ - rv_writel(BIT(BT_TX_THRESHOLD) | BIT(BT_RX_THRESHOLD), - rtd->acp3x_base + mmACP_EXTERNAL_INTR_CNTL); + case I2S_SP_INSTANCE: + default: + reg_ringbuf_size = mmACP_I2S_RX_RINGBUFSIZE; + reg_dma_size = mmACP_I2S_RX_DMA_SIZE; + acp_fifo_addr = ACP_SRAM_PTE_OFFSET + + SP_CAPT_FIFO_ADDR_OFFSET; + reg_fifo_addr = mmACP_I2S_RX_FIFOADDR; + reg_fifo_size = mmACP_I2S_RX_FIFOSIZE; + rv_writel(I2S_SP_RX_MEM_WINDOW_START, + rtd->acp3x_base + mmACP_I2S_RX_RINGBUFADDR); + } + } + rv_writel(MAX_BUFFER, rtd->acp3x_base + reg_ringbuf_size); + rv_writel(DMA_SIZE, rtd->acp3x_base + reg_dma_size); + rv_writel(acp_fifo_addr, rtd->acp3x_base + reg_fifo_addr); + rv_writel(FIFO_SIZE, rtd->acp3x_base + reg_fifo_size); + rv_writel(BIT(I2S_RX_THRESHOLD) | BIT(BT_RX_THRESHOLD) + | BIT(I2S_TX_THRESHOLD) | BIT(BT_TX_THRESHOLD), + rtd->acp3x_base + mmACP_EXTERNAL_INTR_CNTL); } static int acp3x_dma_open(struct snd_soc_component *component, @@ -289,17 +328,21 @@ static int acp3x_dma_open(struct snd_soc_component *component, return ret; } - if (!adata->play_stream && !adata->capture_stream) + if (!adata->play_stream && !adata->capture_stream && + adata->i2ssp_play_stream && !adata->i2ssp_capture_stream) rv_writel(1, adata->acp3x_base + mmACP_EXTERNAL_INTR_ENB); - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { adata->play_stream = substream; - else + adata->i2ssp_play_stream = substream; + } else { adata->capture_stream = substream; + adata->i2ssp_capture_stream = substream; + } i2s_data->acp3x_base = adata->acp3x_base; runtime->private_data = i2s_data; - return 0; + return ret; } @@ -307,16 +350,28 @@ static int acp3x_dma_hw_params(struct snd_soc_component *component, struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_pcm_runtime *runtime; struct i2s_stream_instance *rtd; + struct snd_soc_pcm_runtime *prtd; + struct snd_soc_card *card; + struct acp3x_platform_info *pinfo; int status; u64 size; - runtime = substream->runtime; - rtd = substream->private_data; + prtd = substream->private_data; + card = prtd->card; + pinfo = snd_soc_card_get_drvdata(card); + rtd = substream->runtime->private_data; if (!rtd) return -EINVAL; + if (pinfo) { + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + rtd->i2s_instance = pinfo->play_i2s_instance; + else + rtd->i2s_instance = pinfo->cap_i2s_instance; + } else + pr_err("pinfo failed\n"); + size = params_buffer_bytes(params); status = snd_pcm_lib_malloc_pages(substream, size); if (status < 0) @@ -337,12 +392,25 @@ static int acp3x_dma_hw_params(struct snd_soc_component *component, static snd_pcm_uframes_t acp3x_dma_pointer(struct snd_soc_component *component, struct snd_pcm_substream *substream) { + struct snd_soc_pcm_runtime *prtd; + struct snd_soc_card *card; + struct acp3x_platform_info *pinfo; struct i2s_stream_instance *rtd; u32 pos; u32 buffersize; u64 bytescount; + prtd = substream->private_data; + card = prtd->card; rtd = substream->runtime->private_data; + pinfo = snd_soc_card_get_drvdata(card); + if (pinfo) { + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + rtd->i2s_instance = pinfo->play_i2s_instance; + else + rtd->i2s_instance = pinfo->cap_i2s_instance; + } + buffersize = frames_to_bytes(substream->runtime, substream->runtime->buffer_size); bytescount = acp_get_byte_count(rtd, substream->stream); @@ -387,15 +455,19 @@ static int acp3x_dma_close(struct snd_soc_component *component, component = snd_soc_rtdcom_lookup(prtd, DRV_NAME); adata = dev_get_drvdata(component->dev); - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { adata->play_stream = NULL; - else + adata->i2ssp_play_stream = NULL; + } else { adata->capture_stream = NULL; + adata->i2ssp_capture_stream = NULL; + } /* Disable ACP irq, when the current stream is being closed and * another stream is also not active. */ - if (!adata->play_stream && !adata->capture_stream) + if (!adata->play_stream && !adata->capture_stream && + !adata->i2ssp_play_stream && !adata->i2ssp_capture_stream) rv_writel(0, adata->acp3x_base + mmACP_EXTERNAL_INTR_ENB); return 0; } @@ -504,7 +576,7 @@ static int acp3x_resume(struct device *dev) { struct i2s_dev_data *adata; int status; - u32 val; + u32 val, reg_val, frmt_val; adata = dev_get_drvdata(dev); status = acp3x_init(adata->acp3x_base); @@ -515,32 +587,38 @@ static int acp3x_resume(struct device *dev) struct i2s_stream_instance *rtd = adata->play_stream->runtime->private_data; config_acp3x_dma(rtd, SNDRV_PCM_STREAM_PLAYBACK); - rv_writel((rtd->xfer_resolution << 3), - rtd->acp3x_base + mmACP_BTTDM_ITER); - if (adata->tdm_mode == true) { - rv_writel(adata->tdm_fmt, adata->acp3x_base + - mmACP_BTTDM_TXFRMT); - val = rv_readl(adata->acp3x_base + mmACP_BTTDM_ITER); - rv_writel((val | 0x2), adata->acp3x_base + - mmACP_BTTDM_ITER); + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + reg_val = mmACP_BTTDM_ITER; + frmt_val = mmACP_BTTDM_TXFRMT; + break; + case I2S_SP_INSTANCE: + default: + reg_val = mmACP_I2STDM_ITER; + frmt_val = mmACP_I2STDM_TXFRMT; } } - if (adata->capture_stream && adata->capture_stream->runtime) { struct i2s_stream_instance *rtd = adata->capture_stream->runtime->private_data; config_acp3x_dma(rtd, SNDRV_PCM_STREAM_CAPTURE); - rv_writel((rtd->xfer_resolution << 3), - rtd->acp3x_base + mmACP_BTTDM_IRER); - if (adata->tdm_mode == true) { - rv_writel(adata->tdm_fmt, adata->acp3x_base + - mmACP_BTTDM_RXFRMT); - val = rv_readl(adata->acp3x_base + mmACP_BTTDM_IRER); - rv_writel((val | 0x2), adata->acp3x_base + - mmACP_BTTDM_IRER); + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + reg_val = mmACP_BTTDM_IRER; + frmt_val = mmACP_BTTDM_RXFRMT; + break; + case I2S_SP_INSTANCE: + default: + reg_val = mmACP_I2STDM_IRER; + frmt_val = mmACP_I2STDM_RXFRMT; } } - + rv_writel((rtd->xfer_resolution << 3), rtd->acp3x_base + reg_val); + if (adata->tdm_mode == true) { + rv_writel(adata->tdm_fmt, adata->acp3x_base + frmt_val); + val = rv_readl(adata->acp3x_base + reg_val); + rv_writel(val | 0x2, adata->acp3x_base + reg_val); + } rv_writel(1, adata->acp3x_base + mmACP_EXTERNAL_INTR_ENB); return 0; } @@ -550,8 +628,8 @@ static int acp3x_pcm_runtime_suspend(struct device *dev) { struct i2s_dev_data *adata; int status; - adata = dev_get_drvdata(dev); + adata = dev_get_drvdata(dev); status = acp3x_deinit(adata->acp3x_base); if (status) dev_err(dev, "ACP de-init failed\n"); @@ -567,8 +645,8 @@ static int acp3x_pcm_runtime_resume(struct device *dev) { struct i2s_dev_data *adata; int status; - adata = dev_get_drvdata(dev); + adata = dev_get_drvdata(dev); status = acp3x_init(adata->acp3x_base); if (status) return -ENODEV; diff --git a/sound/soc/amd/raven/acp3x.h b/sound/soc/amd/raven/acp3x.h index a6c6d63..a82d2c5 100644 --- a/sound/soc/amd/raven/acp3x.h +++ b/sound/soc/amd/raven/acp3x.h @@ -7,6 +7,9 @@ #include "chip_offset_byte.h" +#define I2S_SP_INSTANCE 0x01 +#define I2S_BT_INSTANCE 0x02 + #define ACP3x_DEVS 3 #define ACP3x_PHY_BASE_ADDRESS 0x1240000 #define ACP3x_I2S_MODE 0 @@ -17,8 +20,11 @@ #define ACP3x_BT_TDM_REG_START 0x1242800 #define ACP3x_BT_TDM_REG_END 0x1242810 #define I2S_MODE 0x04 +#define I2S_RX_THRESHOLD 27 +#define I2S_TX_THRESHOLD 28 #define BT_TX_THRESHOLD 26 #define BT_RX_THRESHOLD 25 +#define ACP_ERR_INTR_MASK 29 #define ACP3x_POWER_ON 0x00 #define ACP3x_POWER_ON_IN_PROGRESS 0x01 #define ACP3x_POWER_OFF 0x02 @@ -26,19 +32,28 @@ #define ACP3x_SOFT_RESET__SoftResetAudDone_MASK 0x00010001 #define ACP_SRAM_PTE_OFFSET 0x02050000 +#define ACP_SRAM_SP_PB_PTE_OFFSET 0x0 +#define ACP_SRAM_SP_CP_PTE_OFFSET 0x100 +#define ACP_SRAM_BT_PB_PTE_OFFSET 0x200 +#define ACP_SRAM_BT_CP_PTE_OFFSET 0x300 #define PAGE_SIZE_4K_ENABLE 0x2 -#define MEM_WINDOW_START 0x4000000 -#define PLAYBACK_FIFO_ADDR_OFFSET 0x400 -#define CAPTURE_FIFO_ADDR_OFFSET 0x500 +#define I2S_SP_TX_MEM_WINDOW_START 0x4000000 +#define I2S_SP_RX_MEM_WINDOW_START 0x4020000 +#define I2S_BT_TX_MEM_WINDOW_START 0x4040000 +#define I2S_BT_RX_MEM_WINDOW_START 0x4060000 +#define SP_PB_FIFO_ADDR_OFFSET 0x500 +#define SP_CAPT_FIFO_ADDR_OFFSET 0x700 +#define BT_PB_FIFO_ADDR_OFFSET 0x900 +#define BT_CAPT_FIFO_ADDR_OFFSET 0xB00 #define PLAYBACK_MIN_NUM_PERIODS 2 #define PLAYBACK_MAX_NUM_PERIODS 8 -#define PLAYBACK_MAX_PERIOD_SIZE 16384 -#define PLAYBACK_MIN_PERIOD_SIZE 4096 +#define PLAYBACK_MAX_PERIOD_SIZE 8192 +#define PLAYBACK_MIN_PERIOD_SIZE 1024 #define CAPTURE_MIN_NUM_PERIODS 2 #define CAPTURE_MAX_NUM_PERIODS 8 -#define CAPTURE_MAX_PERIOD_SIZE 16384 -#define CAPTURE_MIN_PERIOD_SIZE 4096 +#define CAPTURE_MAX_PERIOD_SIZE 8192 +#define CAPTURE_MIN_PERIOD_SIZE 1024 #define MAX_BUFFER (PLAYBACK_MAX_PERIOD_SIZE * PLAYBACK_MAX_NUM_PERIODS) #define MIN_BUFFER MAX_BUFFER @@ -65,14 +80,20 @@ struct i2s_dev_data { void __iomem *acp3x_base; struct snd_pcm_substream *play_stream; struct snd_pcm_substream *capture_stream; + struct snd_pcm_substream *i2ssp_play_stream; + struct snd_pcm_substream *i2ssp_capture_stream; }; struct i2s_stream_instance { u16 num_pages; + u16 i2s_instance; + u16 capture_channel; + u16 direction; u16 channels; u32 xfer_resolution; - u64 bytescount; + u32 val; dma_addr_t dma_addr; + u64 bytescount; void __iomem *acp3x_base; }; @@ -92,15 +113,36 @@ static inline u64 acp_get_byte_count(struct i2s_stream_instance *rtd, u64 byte_count; if (direction == SNDRV_PCM_STREAM_PLAYBACK) { - byte_count = rv_readl(rtd->acp3x_base + - mmACP_BT_TX_LINEARPOSITIONCNTR_HIGH); - byte_count |= rv_readl(rtd->acp3x_base + - mmACP_BT_TX_LINEARPOSITIONCNTR_LOW); + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + byte_count = rv_readl(rtd->acp3x_base + + mmACP_BT_TX_LINEARPOSITIONCNTR_HIGH); + byte_count |= rv_readl(rtd->acp3x_base + + mmACP_BT_TX_LINEARPOSITIONCNTR_LOW); + break; + case I2S_SP_INSTANCE: + default: + byte_count = rv_readl(rtd->acp3x_base + + mmACP_I2S_TX_LINEARPOSITIONCNTR_HIGH); + byte_count |= rv_readl(rtd->acp3x_base + + mmACP_I2S_TX_LINEARPOSITIONCNTR_LOW); + } + } else { - byte_count = rv_readl(rtd->acp3x_base + - mmACP_BT_RX_LINEARPOSITIONCNTR_HIGH); - byte_count |= rv_readl(rtd->acp3x_base + - mmACP_BT_RX_LINEARPOSITIONCNTR_LOW); + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + byte_count = rv_readl(rtd->acp3x_base + + mmACP_BT_RX_LINEARPOSITIONCNTR_HIGH); + byte_count |= rv_readl(rtd->acp3x_base + + mmACP_BT_RX_LINEARPOSITIONCNTR_LOW); + break; + case I2S_SP_INSTANCE: + default: + byte_count = rv_readl(rtd->acp3x_base + + mmACP_I2S_RX_LINEARPOSITIONCNTR_HIGH); + byte_count |= rv_readl(rtd->acp3x_base + + mmACP_I2S_RX_LINEARPOSITIONCNTR_LOW); + } } return byte_count; } -- 2.7.4

2 1

[alsa-devel] [RESEND PATCH v11 6/6] ASoC: amd: Added ACP3x system resume and runtime pm
by Ravulapati Vishnu vardhan rao 21 Nov '19

21 Nov '19

When system wide suspend happens, ACP will be powered off and when system resumes,for audio usecase to continue,all the runtime configuration data needs to be programmed again. Added resume pm call back to ACP pm ops and also added runtime PM operations for ACP3x PCM platform device. Device will enter into D3 state when there is no activity on audio I2S lines. Signed-off-by: Ravulapati Vishnu vardhan rao <Vishnuvardhanrao.Ravulapati(a)amd.com> --- sound/soc/amd/raven/acp3x-pcm-dma.c | 144 +----------------------------- sound/soc/amd/raven/acp3x.h | 7 ++ sound/soc/amd/raven/pci-acp3x.c | 173 ++++++++++++++++++++++++++++++++++-- 3 files changed, 177 insertions(+), 147 deletions(-) diff --git a/sound/soc/amd/raven/acp3x-pcm-dma.c b/sound/soc/amd/raven/acp3x-pcm-dma.c index e0bac1f..b4c277a 100644 --- a/sound/soc/amd/raven/acp3x-pcm-dma.c +++ b/sound/soc/amd/raven/acp3x-pcm-dma.c @@ -58,106 +58,6 @@ static const struct snd_pcm_hardware acp3x_pcm_hardware_capture = { .periods_max = CAPTURE_MAX_NUM_PERIODS, }; -static int acp3x_power_on(void __iomem *acp3x_base, bool on) -{ - u16 val, mask; - u32 timeout; - - if (on == true) { - val = 1; - mask = ACP3x_POWER_ON; - } else { - val = 0; - mask = ACP3x_POWER_OFF; - } - - rv_writel(val, acp3x_base + mmACP_PGFSM_CONTROL); - timeout = 0; - while (true) { - val = rv_readl(acp3x_base + mmACP_PGFSM_STATUS); - if ((val & ACP3x_POWER_OFF_IN_PROGRESS) == mask) - break; - if (timeout > 100) { - pr_err("ACP3x power state change failure\n"); - return -ENODEV; - } - timeout++; - cpu_relax(); - } - return 0; -} - -static int acp3x_reset(void __iomem *acp3x_base) -{ - u32 val, timeout; - - rv_writel(1, acp3x_base + mmACP_SOFT_RESET); - timeout = 0; - while (true) { - val = rv_readl(acp3x_base + mmACP_SOFT_RESET); - if ((val & ACP3x_SOFT_RESET__SoftResetAudDone_MASK) || - timeout > 100) { - if (val & ACP3x_SOFT_RESET__SoftResetAudDone_MASK) - break; - return -ENODEV; - } - timeout++; - cpu_relax(); - } - - rv_writel(0, acp3x_base + mmACP_SOFT_RESET); - timeout = 0; - while (true) { - val = rv_readl(acp3x_base + mmACP_SOFT_RESET); - if (!val || timeout > 100) { - if (!val) - break; - return -ENODEV; - } - timeout++; - cpu_relax(); - } - return 0; -} - -static int acp3x_init(void __iomem *acp3x_base) -{ - int ret; - - /* power on */ - ret = acp3x_power_on(acp3x_base, true); - if (ret) { - pr_err("ACP3x power on failed\n"); - return ret; - } - /* Reset */ - ret = acp3x_reset(acp3x_base); - if (ret) { - pr_err("ACP3x reset failed\n"); - return ret; - } - return 0; -} - -static int acp3x_deinit(void __iomem *acp3x_base) -{ - int ret; - - /* Reset */ - ret = acp3x_reset(acp3x_base); - if (ret) { - pr_err("ACP3x reset failed\n"); - return ret; - } - /* power off */ - ret = acp3x_power_on(acp3x_base, false); - if (ret) { - pr_err("ACP3x power off failed\n"); - return ret; - } - return 0; -} - static irqreturn_t i2s_irq_handler(int irq, void *dev_id) { struct i2s_dev_data *rv_i2s_data; @@ -535,53 +435,28 @@ static int acp3x_audio_probe(struct platform_device *pdev) adata->i2s_irq = res->start; dev_set_drvdata(&pdev->dev, adata); - /* Initialize ACP */ - status = acp3x_init(adata->acp3x_base); - if (status) - return -ENODEV; - status = devm_snd_soc_register_component(&pdev->dev, &acp3x_i2s_component, NULL, 0); if (status) { dev_err(&pdev->dev, "Fail to register acp i2s component\n"); - ret = -ENODEV; - goto dev_err; + return -ENODEV; } status = devm_request_irq(&pdev->dev, adata->i2s_irq, i2s_irq_handler, irqflags, "ACP3x_I2S_IRQ", adata); if (status) { dev_err(&pdev->dev, "ACP3x I2S IRQ request failed\n"); - ret = -ENODEV; - goto dev_err; + return -ENODEV; } pm_runtime_set_autosuspend_delay(&pdev->dev, 5000); pm_runtime_use_autosuspend(&pdev->dev); pm_runtime_enable(&pdev->dev); return 0; - -dev_err: - status = acp3x_deinit(adata->acp3x_base); - if (status) - dev_err(&pdev->dev, "ACP de-init failed\n"); - else - dev_dbg(&pdev->dev, "ACP de-initialized\n"); - return ret; } static int acp3x_audio_remove(struct platform_device *pdev) { - struct i2s_dev_data *adata; - int ret; - - adata = dev_get_drvdata(&pdev->dev); - ret = acp3x_deinit(adata->acp3x_base); - if (ret) - dev_err(&pdev->dev, "ACP de-init failed\n"); - else - dev_dbg(&pdev->dev, "ACP de-initialized\n"); - pm_runtime_disable(&pdev->dev); return 0; } @@ -589,13 +464,9 @@ static int acp3x_audio_remove(struct platform_device *pdev) static int acp3x_resume(struct device *dev) { struct i2s_dev_data *adata; - int status; u32 val, reg_val, frmt_val; adata = dev_get_drvdata(dev); - status = acp3x_init(adata->acp3x_base); - if (status) - return -ENODEV; if (adata->play_stream && adata->play_stream->runtime) { struct i2s_stream_instance *rtd = @@ -641,14 +512,8 @@ static int acp3x_resume(struct device *dev) static int acp3x_pcm_runtime_suspend(struct device *dev) { struct i2s_dev_data *adata; - int status; adata = dev_get_drvdata(dev); - status = acp3x_deinit(adata->acp3x_base); - if (status) - dev_err(dev, "ACP de-init failed\n"); - else - dev_dbg(dev, "ACP de-initialized\n"); rv_writel(0, adata->acp3x_base + mmACP_EXTERNAL_INTR_ENB); @@ -658,12 +523,9 @@ static int acp3x_pcm_runtime_suspend(struct device *dev) static int acp3x_pcm_runtime_resume(struct device *dev) { struct i2s_dev_data *adata; - int status; adata = dev_get_drvdata(dev); - status = acp3x_init(adata->acp3x_base); - if (status) - return -ENODEV; + rv_writel(1, adata->acp3x_base + mmACP_EXTERNAL_INTR_ENB); return 0; } diff --git a/sound/soc/amd/raven/acp3x.h b/sound/soc/amd/raven/acp3x.h index bf0a683..8ba484d 100644 --- a/sound/soc/amd/raven/acp3x.h +++ b/sound/soc/amd/raven/acp3x.h @@ -65,6 +65,13 @@ #define SLOT_WIDTH_16 0x10 #define SLOT_WIDTH_24 0x18 #define SLOT_WIDTH_32 0x20 +#define ACP_PGFSM_CNTL_POWER_ON_MASK 0x01 +#define ACP_PGFSM_CNTL_POWER_OFF_MASK 0x00 +#define ACP_PGFSM_STATUS_MASK 0x03 +#define ACP_POWERED_ON 0x00 +#define ACP_POWER_ON_IN_PROGRESS 0x01 +#define ACP_POWERED_OFF 0x02 +#define ACP_POWER_OFF_IN_PROGRESS 0x03 struct acp3x_platform_info { u16 play_i2s_instance; diff --git a/sound/soc/amd/raven/pci-acp3x.c b/sound/soc/amd/raven/pci-acp3x.c index 94f5f21..d46a6d6 100644 --- a/sound/soc/amd/raven/pci-acp3x.c +++ b/sound/soc/amd/raven/pci-acp3x.c @@ -9,6 +9,9 @@ #include <linux/io.h> #include <linux/platform_device.h> #include <linux/interrupt.h> +#include <linux/pm_runtime.h> +#include <linux/delay.h> +#include <sound/pcm.h> #include "acp3x.h" @@ -19,6 +22,109 @@ struct acp3x_dev_data { struct platform_device *pdev[ACP3x_DEVS]; }; +static int acp3x_power_on(void __iomem *acp3x_base) +{ + u32 val; + int timeout; + + val = rv_readl(acp3x_base + mmACP_PGFSM_STATUS); + + if (val == 0) + return val; + + if (!((val & ACP_PGFSM_STATUS_MASK) == + ACP_POWER_ON_IN_PROGRESS)) + rv_writel(ACP_PGFSM_CNTL_POWER_ON_MASK, + acp3x_base + mmACP_PGFSM_CONTROL); + timeout = 0; + while (++timeout < 500) { + val = rv_readl(acp3x_base + mmACP_PGFSM_STATUS); + if (!val) + return 0; + udelay(1); + } + return -ETIMEDOUT; +} + +static int acp3x_power_off(void __iomem *acp3x_base) +{ + u32 val; + int timeout; + + rv_writel(ACP_PGFSM_CNTL_POWER_OFF_MASK, + acp3x_base + mmACP_PGFSM_CONTROL); + timeout = 0; + while (++timeout < 500) { + val = rv_readl(acp3x_base + mmACP_PGFSM_STATUS); + if ((val & ACP_PGFSM_STATUS_MASK) == ACP_POWERED_OFF) + return 0; + udelay(1); + } + return -ETIMEDOUT; +} + +static int acp3x_reset(void __iomem *acp3x_base) +{ + u32 val; + int timeout; + + rv_writel(1, acp3x_base + mmACP_SOFT_RESET); + timeout = 0; + while (++timeout < 500) { + val = rv_readl(acp3x_base + mmACP_SOFT_RESET); + if (val & ACP3x_SOFT_RESET__SoftResetAudDone_MASK) + return 0; + cpu_relax(); + } + rv_writel(0, acp3x_base + mmACP_SOFT_RESET); + timeout = 0; + while (++timeout < 500) { + val = rv_readl(acp3x_base + mmACP_SOFT_RESET); + if (!val) + return 0; + cpu_relax(); + } + return -ETIMEDOUT; +} + +static int acp3x_init(void __iomem *acp3x_base) +{ + int ret; + + /* power on */ + ret = acp3x_power_on(acp3x_base); + if (ret) { + pr_err("ACP3x power on failed\n"); + return ret; + } + /* Reset */ + ret = acp3x_reset(acp3x_base); + if (ret) { + pr_err("ACP3x reset failed\n"); + return ret; + } + return 0; +} + +static int acp3x_deinit(void __iomem *acp3x_base) +{ + int ret; + + /* Reset */ + ret = acp3x_reset(acp3x_base); + if (ret) { + pr_err("ACP3x reset failed\n"); + return ret; + } + /* power off */ + ret = acp3x_power_off(acp3x_base); + if (ret) { + pr_err("ACP3x power off failed\n"); + return ret; + } + return 0; +} + static int snd_acp3x_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) { @@ -64,6 +170,9 @@ static int snd_acp3x_probe(struct pci_dev *pci, } pci_set_master(pci); pci_set_drvdata(pci, adata); + ret = acp3x_init(adata->acp3x_base); + if (ret) + goto disable_msi; val = rv_readl(adata->acp3x_base + mmACP_I2S_PIN_CONFIG); switch (val) { @@ -73,7 +182,7 @@ static int snd_acp3x_probe(struct pci_dev *pci, GFP_KERNEL); if (!adata->res) { ret = -ENOMEM; - goto disable_msi; + goto de_init; } adata->res[0].name = "acp3x_i2s_iomem"; @@ -118,7 +227,7 @@ static int snd_acp3x_probe(struct pci_dev *pci, pdevinfo[2].parent = &pci->dev; pdevinfo[2].num_res = 1; pdevinfo[2].res = &adata->res[2]; - for (i = 0; i < ACP3x_DEVS ; i++) { + for (i = 0; i < ACP3x_DEVS; i++) { adata->pdev[i] = platform_device_register_full(&pdevinfo[i]); if (IS_ERR(adata->pdev[i])) { @@ -134,12 +243,20 @@ static int snd_acp3x_probe(struct pci_dev *pci, ret = -ENODEV; goto disable_msi; } + pm_runtime_set_autosuspend_delay(&pci->dev, 5000); + pm_runtime_use_autosuspend(&pci->dev); + pm_runtime_set_active(&pci->dev); + pm_runtime_put_noidle(&pci->dev); + pm_runtime_enable(&pci->dev); return 0; unregister_devs: if (val == I2S_MODE) - for (i = 0 ; i < ACP3x_DEVS ; i++) + for (i = 0; i < ACP3x_DEVS; i++) platform_device_unregister(adata->pdev[i]); +de_init: + if (acp3x_deinit(adata->acp3x_base)) + dev_err(&pci->dev, "ACP de-init failed\n"); disable_msi: pci_disable_msi(pci); release_regions: @@ -150,15 +267,56 @@ static int snd_acp3x_probe(struct pci_dev *pci, return ret; } +static int snd_acp3x_suspend(struct device *dev) +{ + int ret; + struct acp3x_dev_data *adata; + + adata = dev_get_drvdata(dev); + ret = acp3x_deinit(adata->acp3x_base); + if (ret) + dev_err(dev, "ACP de-init failed\n"); + else + dev_dbg(dev, "ACP de-initialized\n"); + + return 0; +} + +static int snd_acp3x_resume(struct device *dev) +{ + int ret; + struct acp3x_dev_data *adata; + + adata = dev_get_drvdata(dev); + ret = acp3x_init(adata->acp3x_base); + if (ret) { + dev_err(dev, "ACP init failed\n"); + return ret; + } + return 0; +} + +static const struct dev_pm_ops acp3x_pm = { + .runtime_suspend = snd_acp3x_suspend, + .runtime_resume = snd_acp3x_resume, + .resume = snd_acp3x_resume, +}; + static void snd_acp3x_remove(struct pci_dev *pci) { - struct acp3x_dev_data *adata = pci_get_drvdata(pci); - int i; + struct acp3x_dev_data *adata; + int i, ret; + adata = pci_get_drvdata(pci); if (adata->acp3x_audio_mode == ACP3x_I2S_MODE) { - for (i = 0 ; i < ACP3x_DEVS ; i++) + for (i = 0; i < ACP3x_DEVS; i++) platform_device_unregister(adata->pdev[i]); } + ret = acp3x_deinit(adata->acp3x_base); + if (ret) + dev_err(&pci->dev, "ACP de-init failed\n"); + pm_runtime_disable(&pci->dev); + pm_runtime_get_noresume(&pci->dev); pci_disable_msi(pci); pci_release_regions(pci); pci_disable_device(pci); @@ -177,6 +335,9 @@ static struct pci_driver acp3x_driver = { .id_table = snd_acp3x_ids, .probe = snd_acp3x_probe, .remove = snd_acp3x_remove, + .driver = { + .pm = &acp3x_pm, + } }; module_pci_driver(acp3x_driver); -- 2.7.4

1 0