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

Re: stable-rc/linux-5.4.y bisection: baseline.dmesg.alert on meson-g12a-x96-max
by Guillaume Tucker 04 May '20

04 May '20

Please see the bisection report below about a kernel Oops. Reports aren't automatically sent to the public while we're trialing new bisection features on kernelci.org but this one looks valid. The log shows a kernel NULL pointer dereference: https://storage.kernelci.org/stable-rc/linux-5.4.y/v5.4.36-52-g35bbc55d9e29… The call stack is not the same as in the commit message found by the bisection, so maybe it only fixed part of the problem: <1>[ 16.007376] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000010 <1>[ 16.016300] Mem abort info: <1>[ 16.019269] ESR = 0x96000006 <1>[ 16.022571] EC = 0x25: DABT (current EL), IL = 32 bits <1>[ 16.028075] SET = 0, FnV = 0 <1>[ 16.031356] EA = 0, S1PTW = 0 <1>[ 16.034705] Data abort info: <1>[ 16.037837] ISV = 0, ISS = 0x00000006 <1>[ 16.041876] CM = 0, WnR = 0 <1>[ 16.045128] user pgtable: 4k pages, 48-bit VAs, pgdp=00000000be0f0000 <1>[ 16.051702] [0000000000000010] pgd=00000000be117003, pud=00000000be118003, pmd=0000000000000000 <0>[ 16.051709] Internal error: Oops: 96000006 [#1] PREEMPT SMP <4>[ 16.133466] CPU: 2 PID: 33 Comm: kworker/2:1 Tainted: G W 5.4.37-rc1 #1 <4>[ 16.141566] Hardware name: Shenzhen Amediatech Technology Co., Ltd X96 Max (DT) <4>[ 16.149087] Workqueue: events deferred_probe_work_func <4>[ 16.154419] pstate: 20000005 (nzCv daif -PAN -UAO) <4>[ 16.159428] pc : snd_soc_dapm_new_dai+0x3c/0x1b0 <4>[ 16.164252] lr : snd_soc_dapm_connect_dai_link_widgets+0x114/0x268 <4>[ 16.256970] Call trace: <4>[ 16.259647] snd_soc_dapm_new_dai+0x3c/0x1b0 <4>[ 16.264129] snd_soc_dapm_connect_dai_link_widgets+0x114/0x268 <4>[ 16.270167] snd_soc_instantiate_card+0x858/0xb88 <4>[ 16.275083] snd_soc_register_card+0xf8/0x120 <4>[ 16.279656] devm_snd_soc_register_card+0x40/0x90 <4>[ 16.284575] axg_card_probe+0x9dc/0xaf0 [snd_soc_meson_axg_sound_card] <4>[ 16.291299] platform_drv_probe+0x50/0xa0 <4>[ 16.295524] really_probe+0xd4/0x328 <4>[ 16.299319] driver_probe_device+0x54/0xe8 ... Guillaume On 01/05/2020 10:32, kernelci.org bot wrote: > * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * > * 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! * > * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * > > stable-rc/linux-5.4.y bisection: baseline.dmesg.alert on meson-g12a-x96-max > > Summary: > Start: 35bbc55d9e296 Linux 5.4.37-rc1 > Plain log: https://storage.kernelci.org/stable-rc/linux-5.4.y/v5.4.36-52-g35bbc55d9e29… > HTML log: https://storage.kernelci.org/stable-rc/linux-5.4.y/v5.4.36-52-g35bbc55d9e29… > Result: 09f4294793bd3 ASoC: meson: axg-card: fix codec-to-codec link setup > > Checks: > revert: PASS > verify: PASS > > Parameters: > Tree: stable-rc > URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git > Branch: linux-5.4.y > Target: meson-g12a-x96-max > CPU arch: arm64 > Lab: lab-baylibre > Compiler: gcc-8 > Config: defconfig > Test case: baseline.dmesg.alert > > Breaking commit found: > > ------------------------------------------------------------------------------- > commit 09f4294793bd3e70d68fdab5b392dff18bff62ca > Author: Jerome Brunet <jbrunet(a)baylibre.com> > Date: Mon Apr 20 13:45:10 2020 +0200 > > ASoC: meson: axg-card: fix codec-to-codec link setup > > commit 1164284270779e1865cc2046a2a01b58a1e858a9 upstream. > > Since the addition of commit 9b5db059366a ("ASoC: soc-pcm: dpcm: Only allow > playback/capture if supported"), meson-axg cards which have codec-to-codec > links fail to init and Oops: > > Unable to handle kernel NULL pointer dereference at virtual address 0000000000000128 > Internal error: Oops: 96000044 [#1] PREEMPT SMP > CPU: 3 PID: 1582 Comm: arecord Not tainted 5.7.0-rc1 > pc : invalidate_paths_ep+0x30/0xe0 > lr : snd_soc_dapm_dai_get_connected_widgets+0x170/0x1a8 > Call trace: > invalidate_paths_ep+0x30/0xe0 > snd_soc_dapm_dai_get_connected_widgets+0x170/0x1a8 > dpcm_path_get+0x38/0xd0 > dpcm_fe_dai_open+0x70/0x920 > snd_pcm_open_substream+0x564/0x840 > snd_pcm_open+0xfc/0x228 > snd_pcm_capture_open+0x4c/0x78 > snd_open+0xac/0x1a8 > ... > > While initiliazing the links, ASoC treats the codec-to-codec links of this > card type as a DPCM backend. This error eventually leads to the Oops. > > Most of the card driver code is shared between DPCM backends and > codec-to-codec links. The property "no_pcm" marking DCPM BE was left set on > codec-to-codec links, leading to this problem. This commit fixes that. > > Fixes: 0a8f1117a680 ("ASoC: meson: axg-card: add basic codec-to-codec link support") > Signed-off-by: Jerome Brunet <jbrunet(a)baylibre.com> > Link: https://lore.kernel.org/r/20200420114511.450560-2-jbrunet@baylibre.com > Signed-off-by: Mark Brown <broonie(a)kernel.org> > Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> > > diff --git a/sound/soc/meson/axg-card.c b/sound/soc/meson/axg-card.c > index 1f698adde506c..2b04ac3d8fd3b 100644 > --- a/sound/soc/meson/axg-card.c > +++ b/sound/soc/meson/axg-card.c > @@ -586,8 +586,10 @@ static int axg_card_add_link(struct snd_soc_card *card, struct device_node *np, > > if (axg_card_cpu_is_tdm_iface(dai_link->cpus->of_node)) > ret = axg_card_parse_tdm(card, np, index); > - else if (axg_card_cpu_is_codec(dai_link->cpus->of_node)) > + else if (axg_card_cpu_is_codec(dai_link->cpus->of_node)) { > dai_link->params = &codec_params; > + dai_link->no_pcm = 0; /* link is not a DPCM BE */ > + } > > return ret; > } > ------------------------------------------------------------------------------- > > > Git bisection log: > > ------------------------------------------------------------------------------- > git bisect start > # good: [aa73bcc376865c23e61dcebd467697b527901be8] Linux 5.4.36 > git bisect good aa73bcc376865c23e61dcebd467697b527901be8 > # bad: [35bbc55d9e296d37cf01555d415338b84a70d4c5] Linux 5.4.37-rc1 > git bisect bad 35bbc55d9e296d37cf01555d415338b84a70d4c5 > # bad: [924f1d37852ff357658c205dd114c70862865fc9] svcrdma: Fix trace point use-after-free race > git bisect bad 924f1d37852ff357658c205dd114c70862865fc9 > # good: [b848f65436665b5fe675fd3f645c1a458e49f60a] counter: 104-quad-8: Add lock guards - generic interface > git bisect good b848f65436665b5fe675fd3f645c1a458e49f60a > # bad: [04b53ed855129c1703d00d8494e4c61309714a99] drivers: soc: xilinx: fix firmware driver Kconfig dependency > git bisect bad 04b53ed855129c1703d00d8494e4c61309714a99 > # good: [ae886eae0318c71a6125347d6810a1578a83d262] ASoC: tas571x: disable regulators on failed probe > git bisect good ae886eae0318c71a6125347d6810a1578a83d262 > # bad: [2c0990070379284dda0b51304ce19c2b96e083a2] ASoC: wm8960: Fix wrong clock after suspend & resume > git bisect bad 2c0990070379284dda0b51304ce19c2b96e083a2 > # bad: [09f4294793bd3e70d68fdab5b392dff18bff62ca] ASoC: meson: axg-card: fix codec-to-codec link setup > git bisect bad 09f4294793bd3e70d68fdab5b392dff18bff62ca > # first bad commit: [09f4294793bd3e70d68fdab5b392dff18bff62ca] ASoC: meson: axg-card: fix codec-to-codec link setup > ------------------------------------------------------------------------------- >

5 5

[PATCH] Mark the ADAU7118 reset register as volatile.
by chris.d.garren＠gmail.com 04 May '20

04 May '20

From: Chris Garren <cdgarren(a)indesign-llc.com> Without this the previously written value was written to this reg, which caused the different configuration registers to be reset. --- sound/soc/codecs/adau7118-i2c.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sound/soc/codecs/adau7118-i2c.c b/sound/soc/codecs/adau7118-i2c.c index a821136..aa7afb3 100644 --- a/sound/soc/codecs/adau7118-i2c.c +++ b/sound/soc/codecs/adau7118-i2c.c @@ -32,6 +32,12 @@ static const struct reg_default adau7118_reg_defaults[] = { { ADAU7118_REG_RESET, 0x00 }, }; +static bool adau7118_volatile(struct device *dev, unsigned int reg) +{ + return (reg == ADAU7118_REG_RESET); +} + + static const struct regmap_config adau7118_regmap_config = { .reg_bits = 8, .val_bits = 8, @@ -39,6 +45,7 @@ static const struct regmap_config adau7118_regmap_config = { .num_reg_defaults = ARRAY_SIZE(adau7118_reg_defaults), .cache_type = REGCACHE_RBTREE, .max_register = ADAU7118_REG_RESET, + .volatile_reg = adau7118_volatile, }; static int adau7118_probe_i2c(struct i2c_client *i2c, -- 2.7.4

2 1

[PATCH 0/3] Tegra194 HW Fixes
by Sameer Pujar 04 May '20

04 May '20

This series proposes SW workarounds for Tegra194 HDA HW bugs. Following are the two issues seen: 1. GCAP register does not reflect true capability. The actual number of SDO lines is "4", where as it reflects "2". 2. With 4 SDO line configuration playback fails for, 44.1K/48K, 2-channel, 16-bps audio stream. After fixing [1], issue [2] is uncovered. As per recommendation by Tegra HW team the workarounds are pushed. Testing done ============ * Verify GCAP register after registering HDA sound card * Verify audio playback for 44.1K/48K, 2-channel, 16-bps. Sameer Pujar (3): ALSA: hda/tegra: correct number of SDO lines for Tegra194 ALSA: hda: add member to store ratio for stripe control ALSA: hda/tegra: workaround playback failure on Tegra194 include/sound/hdaudio.h | 3 +++ sound/hda/hdac_controller.c | 11 ++++++++++ sound/hda/hdac_stream.c | 2 +- sound/pci/hda/hda_tegra.c | 50 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 65 insertions(+), 1 deletion(-) -- 2.7.4

2 7

[RFC PATCH] drm: dw-hdmi-i2s: Workaround for interchannel sample offset
by Matthias Blankertz 04 May '20

04 May '20

Add a second reset of the I2S block after the audio parameters are set. Without this, it was observed on the R-Car Gen3 platform that in ~50% of audio stream starts, the samples on each odd-numbered channel were delayed by one sample relative to the even-numbered channels: A stereo test stream was sent with a walking ones pattern, that is the data pattern was: Sample Left Right 1 0x0001 0x0001 2 0x0002 0x0002 3 0x0004 0x0004 4 0x0008 0x0008 5 0x0010 0x0010 etc. When the error occurred, the receiving device got the following data: Left Right ... 0x0004 0x0002 0x0008 0x0004 0x0010 0x0008 ... With the additional reset, the samples were always properly aligned on the receiver. Maybe this relates to the comment of commit 46cecde310bb ("drm/bridge: dw-hdmi-i2s: reset audio fifo before applying new params"), but without the datasheet it is only speculation. Signed-off-by: Matthias Blankertz <matthias.blankertz(a)cetitec.com> --- Can someone with knowledge of the hardware, or access to the datasheet give some insight if this is a "proper" fix, an ugly workaround, or the problem is actually elsewhere and this only changes behaviour due to e.g. timing changes? Thanks, Matthias drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c index d7e65c869415..0cb526f6b8d9 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c @@ -110,6 +110,14 @@ static int dw_hdmi_i2s_hw_params(struct device *dev, void *data, hdmi_write(audio, conf0, HDMI_AUD_CONF0); hdmi_write(audio, conf1, HDMI_AUD_CONF1); + /* Re-reset I2S in an attempt to fix inter-channel sample offset + * Without this second reset of the I2S interface, it was observed on + * the R-Car Gen3 platform that in ~50% of audio stream starts, the + * samples on each odd-numbered channel were delayed by one sample + * relative to the even-numbered channels. + */ + audio->write(audio->hdmi, (u8)~HDMI_MC_SWRSTZ_I2SSWRST_REQ, + HDMI_MC_SWRSTZ); return 0; } base-commit: 7111951b8d4973bda27ff663f2cf18b663d15b48 -- 2.26.2

1 0

[PATCH] ALSA: usb-audio: add mapping for ASRock TRX40 Creator
by Andrew Oakley 04 May '20

04 May '20

This is another TRX40 based motherboard with ALC1220-VB USB-audio that requires a static mapping table. This motherboard also has a PCI device which advertises no codecs. The PCI ID is 1022:1487 and PCI SSID is 1022:d102. As this is using the AMD vendor ID, don't blacklist for now in case other boards have a working audio device with the same ssid. alsa-info.sh report for this board: http://alsa-project.org/db/?f=0a742f89066527497b77ce16bca486daccf8a70c Signed-off-by: Andrew Oakley <andrew(a)adoakley.name> --- sound/usb/mixer_maps.c | 5 +++++ sound/usb/quirks-table.h | 1 + 2 files changed, 6 insertions(+) diff --git a/sound/usb/mixer_maps.c b/sound/usb/mixer_maps.c index 0260c750e156..bfdc6ad52785 100644 --- a/sound/usb/mixer_maps.c +++ b/sound/usb/mixer_maps.c @@ -549,6 +549,11 @@ static const struct usbmix_ctl_map usbmix_ctl_maps[] = { .map = trx40_mobo_map, .connector_map = trx40_mobo_connector_map, }, + { /* Asrock TRX40 Creator */ + .id = USB_ID(0x26ce, 0x0a01), + .map = trx40_mobo_map, + .connector_map = trx40_mobo_connector_map, + }, { 0 } /* terminator */ }; diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index a1df4c5b4f8c..6313c30f5c85 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h @@ -3563,6 +3563,7 @@ AU0828_DEVICE(0x2040, 0x7270, "Hauppauge", "HVR-950Q"), ALC1220_VB_DESKTOP(0x0414, 0xa002), /* Gigabyte TRX40 Aorus Pro WiFi */ ALC1220_VB_DESKTOP(0x0db0, 0x0d64), /* MSI TRX40 Creator */ ALC1220_VB_DESKTOP(0x0db0, 0x543d), /* MSI TRX40 */ +ALC1220_VB_DESKTOP(0x26ce, 0x0a01), /* Asrock TRX40 Creator */ #undef ALC1220_VB_DESKTOP #undef USB_DEVICE_VENDOR_SPEC -- 2.24.1

2 2

Add initial support for Realtek ALC1220 TRX40 motherboards
by GitHub pull_request - opened 03 May '20

03 May '20

alsa-project/alsa-ucm-conf pull request #25 was opened from maximlevitsky: Tested with TRX40 Designare but should work on most TRX40 motherboards Tested with pulseaudio 13.99.1 (from fedora 31 package) Tested with kernel 5.7.0-rc3 The following are the notes of the testing and implementation * Back speaker works in 5.1 mode, however pulseaudio doesn't know how to handle mixer controls with 8 channels, thus 'PlaybackMixerElem' is for now commented out This profile at least makes pulseaudio to set volume on this mixer element to 100% when it boots 7.1 mode doesn't work due to lack of jack retasking in the kernel Also pulseaudio refuses to set any postive volume on subwoofer on unknown grounds, even though on the kernel level it works. * SPDIF is not tested physically yet. The SPDIF mute mixer control is recognised by pulseaudio correctly * PlaybackPrioriry/CapturePriority seems to have no effect to pulseaudio, it doesn't autoswitch inputs when jacks are insterted. You need to switch manually * When all capture inputs are disconnected, pulseaudio thinks that the UCM2 profile is invalid and doesn't use it by default. It can be forced to use it by selecting it in the pavucontrol. Or you can for now comment out one of 'JackControl' statements, to make it think that one of the jacks is always plugged in. * Front mic is alway working in mic mode due to lack of jack retasting as well. * PulseAudio doesn't take advantage of EnableSequence/DisableSequence fully. It just enables all the devices regardless of the jack status, and it will disable them only when you swith the device profile to Off * The default volume on capture devices is set to 59% which roughtly repesents 0 dB amplification according to alsamixer Signed-off-by: Maxim Levitsky <maximlevitsky(a)gmail.com> Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/25 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/25.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH 1/2] Revert "ALSA: hda/realtek: Fix pop noise on ALC225"
by Kai-Heng Feng 03 May '20

03 May '20

This reverts commit 3b36b13d5e69d6f51ff1c55d1b404a74646c9757. Enable power save node breaks some systems with ACL225. Revert the patch and use a platform specific quirk for the original issue isntead. Fixes: 3b36b13d5e69 ("ALSA: hda/realtek: Fix pop noise on ALC225") BugLink: https://bugs.launchpad.net/bugs/1875916 Signed-off-by: Kai-Heng Feng <kai.heng.feng(a)canonical.com> --- sound/pci/hda/patch_realtek.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index b26f0acfd86e..dedf0c17f198 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -8246,8 +8246,6 @@ static int patch_alc269(struct hda_codec *codec) spec->gen.mixer_nid = 0; break; case 0x10ec0225: - codec->power_save_node = 1; - /* fall through */ case 0x10ec0295: case 0x10ec0299: spec->codec_variant = ALC269_TYPE_ALC225; -- 2.17.1

2 3

helem (MIXER, 'Master Playback Volume', 0, 1, 0) appears twice or more cannot load mixer controls: Invalid argument
by GitHub issues - edited 03 May '20

03 May '20

alsa-project/alsa-lib issue #47 was edited from igrekster: I have a PCIE Asus Sound Card (Asus Xonar AE) that uses USB interface: ``` Bus 003 Device 002: ID 0b05:180f ASUSTek Computer, Inc. ``` It's been working fine on earlier versions of kernel/alsa-lib but at some point the volume control stopped working (the playback still works fine): ``` $ alsamixer -c 1 ALSA lib /var/tmp/portage/media-libs/alsa-lib-1.2.2-r1/work/alsa-lib-1.2.2/src/mixer/simple_none.c:1544:(simple_add1) helem (MIXER,'Master Playback Volume',0,1,0) appears twice or more cannot load mixer controls: Invalid argument ``` This is on kernel 5.4.37/alsa 1.2.2. Unfortunately I cannot downgrade to the point when it was working to pinpoint the issue. I tried kernels 5.3.11 and alsa 1.1.8. I've tried building the latest alsa-lib, and it is still showing the error. I'm happy to try patches to alsa or kernel modules to help debug this. ``` $ amixer -c 1 controls numid=7,iface=CARD,name='Clock Source 18 Validity' numid=10,iface=CARD,name='Clock Source 19 Validity' numid=17,iface=CARD,name='Clock Source 22 Validity' numid=11,iface=CARD,name='IEC958 In - Output Jack' numid=18,iface=CARD,name='Keep Interface' numid=14,iface=CARD,name='Line - Input Jack' numid=12,iface=CARD,name='Mic - Input Jack' numid=8,iface=CARD,name='Speaker - Output Jack' numid=20,iface=MIXER,name='Master Playback Volume' numid=19,iface=MIXER,name='Master Playback Volume',device=1 numid=5,iface=MIXER,name='PCM Playback Switch' numid=9,iface=MIXER,name='PCM Playback Switch',index=1 numid=16,iface=MIXER,name='PCM Capture Source' numid=15,iface=MIXER,name='Line Capture Switch' numid=13,iface=MIXER,name='Mic Capture Switch' numid=6,iface=MIXER,name='Input Gain Pad Control' numid=4,iface=PCM,name='Capture Channel Map' numid=1,iface=PCM,name='Playback Channel Map' numid=2,iface=PCM,name='Playback Channel Map',device=1 numid=3,iface=PCM,name='Playback Channel Map',device=2 ``` `amixer -c scontrols` fails withe the same error as `alsamixer`. A few more details: [alsa-info.txt](https://github.com/alsa-project/alsa-lib/files/4569764/alsa-… [proc-asound.txt](https://github.com/alsa-project/alsa-lib/files/4569766/pro… Issue URL : https://github.com/alsa-project/alsa-lib/issues/47 Repository URL: https://github.com/alsa-project/alsa-lib

1 0

helem (MIXER, 'Master Playback Volume', 0, 1, 0) appears twice or more cannot load mixer controls: Invalid argument
by GitHub issues - opened 03 May '20

03 May '20

alsa-project/alsa-lib issue #47 was opened from igrekster: I have a PCIE Asus Sound Card (Asus Xonar AE) that uses USB interface: ``` Bus 003 Device 002: ID 0b05:180f ASUSTek Computer, Inc. ``` It's been working fine on earlier versions of kernel/alsa-lib but at some point the volume control stopped working (the playback still works fine): ``` $ alsamixer -c 1 ALSA lib /var/tmp/portage/media-libs/alsa-lib-1.2.2-r1/work/alsa-lib-1.2.2/src/mixer/simple_none.c:1544:(simple_add1) helem (MIXER,'Master Playback Volume',0,1,0) appears twice or more cannot load mixer controls: Invalid argument ``` This is on kernel 5.4.37/alsa 1.2.2. Unfortunately I cannot downgrade to the point when it was working to pinpoint the issue. I tried kernels 5.3.11 and alsa 1.1.8. I've tried building the latest alsa-lib, and it is still showing the error. I'm happy to try patches to alsa or kernel modules to help debug this. A few more details: [alsa-info.txt](https://github.com/alsa-project/alsa-lib/files/4569764/alsa-… [proc-asound.txt](https://github.com/alsa-project/alsa-lib/files/4569766/pro… Issue URL : https://github.com/alsa-project/alsa-lib/issues/47 Repository URL: https://github.com/alsa-project/alsa-lib

1 0

[PATCH] ALSA: firewire-lib: fix 'function sizeof not defined' error of tracepoints format
by Takashi Sakamoto 03 May '20

03 May '20

The snd-firewire-lib.ko has 'amdtp-packet' event of tracepoints. Current printk format for the event includes 'sizeof(u8)' macro expected to be extended in compilation time. However, this is not done. As a result, perf tools cannot parse the event for printing: $ mount -l -t debugfs debugfs on /sys/kernel/debug type debugfs (rw,nosuid,nodev,noexec,relatime) $ cat /sys/kernel/debug/tracing/events/snd_firewire_lib/amdtp_packet/format ... print fmt: "%02u %04u %04x %04x %02d %03u %02u %03u %02u %01u %02u %s", REC->second, REC->cycle, REC->src, REC->dest, REC->channel, REC->payload_quadlets, REC->data_blocks, REC->data_block_counter, REC->packet_index, REC->irq, REC->index, __print_array(__get_dynamic_array(cip_header), __get_dynamic_array_len(cip_header), sizeof(u8)) $ sudo perf record -e snd_firewire_lib:amdtp_packet [snd_firewire_lib:amdtp_packet] function sizeof not defined Error: expected type 5 but read 0 This commit fixes it by obsoleting the macro with actual size. Cc: <stable(a)vger.kernel.org> Fixes: bde2bbdb307a: ("ALSA: firewire-lib: use dynamic array for CIP header of tracing events") Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- sound/firewire/amdtp-stream-trace.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/firewire/amdtp-stream-trace.h b/sound/firewire/amdtp-stream-trace.h index 16c7f6605511..26e7cb555d3c 100644 --- a/sound/firewire/amdtp-stream-trace.h +++ b/sound/firewire/amdtp-stream-trace.h @@ -66,8 +66,7 @@ TRACE_EVENT(amdtp_packet, __entry->irq, __entry->index, __print_array(__get_dynamic_array(cip_header), - __get_dynamic_array_len(cip_header), - sizeof(u8))) + __get_dynamic_array_len(cip_header), 1)) ); #endif -- 2.25.1

2 1