tools/headers: Synchronize kernel ABI headers
After the SPDX license tags were added a number of tooling headers got out of
sync with their kernel variants, generating lots of build warnings.
Sync them:
- tools/arch/x86/include/asm/disabled-features.h,
tools/arch/x86/include/asm/required-features.h,
tools/include/linux/hash.h:
Remove the SPDX tag where the kernel version does not have it.
- tools/include/asm-generic/bitops/__fls.h,
tools/include/asm-generic/bitops/arch_hweight.h,
tools/include/asm-generic/bitops/const_hweight.h,
tools/include/asm-generic/bitops/fls.h,
tools/include/asm-generic/bitops/fls64.h,
tools/include/uapi/asm-generic/ioctls.h,
tools/include/uapi/asm-generic/mman-common.h,
tools/include/uapi/sound/asound.h,
tools/include/uapi/linux/kvm.h,
tools/include/uapi/linux/perf_event.h,
tools/include/uapi/linux/sched.h,
tools/include/uapi/linux/vhost.h,
tools/include/uapi/sound/asound.h:
Add the SPDX tag of the respective kernel header.
- tools/include/uapi/linux/bpf_common.h,
tools/include/uapi/linux/fcntl.h,
tools/include/uapi/linux/hw_breakpoint.h,
tools/include/uapi/linux/mman.h,
tools/include/uapi/linux/stat.h,
Change the tag to the kernel header version:
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
Also sync other header details:
- include/uapi/sound/asound.h:
Fix pointless end of line whitespace noise the header grew in this cycle.
- tools/arch/x86/lib/memcpy_64.S:
Sync the code and add tools/include/asm/export.h with dummy wrappers
to support building the kernel side code in a tooling header environment.
- tools/include/uapi/asm-generic/mman.h,
tools/include/uapi/linux/bpf.h:
Sync other details that don't impact tooling's use of the ABIs.
Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2017-11-03 12:18:37 +01:00
/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
2017-07-31 16:45:32 -03:00
/*
* Advanced Linux Sound Architecture - ALSA - Driver
* Copyright ( c ) 1994 - 2003 by Jaroslav Kysela < perex @ perex . cz > ,
* Abramo Bagnara < abramo @ alsa - project . org >
*/
# ifndef _UAPI__SOUND_ASOUND_H
# define _UAPI__SOUND_ASOUND_H
# if defined(__KERNEL__) || defined(__linux__)
# include <linux/types.h>
2020-02-12 11:04:23 -03:00
# include <asm/byteorder.h>
2017-07-31 16:45:32 -03:00
# else
2020-02-12 11:04:23 -03:00
# include <endian.h>
2017-07-31 16:45:32 -03:00
# include <sys/ioctl.h>
# endif
# ifndef __KERNEL__
# include <stdlib.h>
2019-04-16 11:30:15 -03:00
# include <time.h>
2017-07-31 16:45:32 -03:00
# endif
/*
* protocol version
*/
# define SNDRV_PROTOCOL_VERSION(major, minor, subminor) (((major)<<16)|((minor)<<8)|(subminor))
# define SNDRV_PROTOCOL_MAJOR(version) (((version)>>16)&0xffff)
# define SNDRV_PROTOCOL_MINOR(version) (((version)>>8)&0xff)
# define SNDRV_PROTOCOL_MICRO(version) ((version)&0xff)
# define SNDRV_PROTOCOL_INCOMPATIBLE(kversion, uversion) \
( SNDRV_PROTOCOL_MAJOR ( kversion ) ! = SNDRV_PROTOCOL_MAJOR ( uversion ) | | \
( SNDRV_PROTOCOL_MAJOR ( kversion ) = = SNDRV_PROTOCOL_MAJOR ( uversion ) & & \
SNDRV_PROTOCOL_MINOR ( kversion ) ! = SNDRV_PROTOCOL_MINOR ( uversion ) ) )
/****************************************************************************
* *
* Digital audio interface *
* *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
2020-02-12 11:04:23 -03:00
# define AES_IEC958_STATUS_SIZE 24
2017-07-31 16:45:32 -03:00
struct snd_aes_iec958 {
2020-02-12 11:04:23 -03:00
unsigned char status [ AES_IEC958_STATUS_SIZE ] ; /* AES/IEC958 channel status bits */
2017-07-31 16:45:32 -03:00
unsigned char subcode [ 147 ] ; /* AES/IEC958 subcode bits */
unsigned char pad ; /* nothing */
unsigned char dig_subframe [ 4 ] ; /* AES/IEC958 subframe bits */
} ;
/****************************************************************************
* *
* CEA - 861 Audio InfoFrame . Used in HDMI and DisplayPort *
* *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
struct snd_cea_861_aud_if {
unsigned char db1_ct_cc ; /* coding type and channel count */
unsigned char db2_sf_ss ; /* sample frequency and size */
unsigned char db3 ; /* not used, all zeros */
unsigned char db4_ca ; /* channel allocation code */
unsigned char db5_dminh_lsv ; /* downmix inhibit & level-shit values */
} ;
/****************************************************************************
* *
* Section for driver hardware dependent interface - / dev / snd / hw ? *
* *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
# define SNDRV_HWDEP_VERSION SNDRV_PROTOCOL_VERSION(1, 0, 1)
enum {
SNDRV_HWDEP_IFACE_OPL2 = 0 ,
SNDRV_HWDEP_IFACE_OPL3 ,
SNDRV_HWDEP_IFACE_OPL4 ,
SNDRV_HWDEP_IFACE_SB16CSP , /* Creative Signal Processor */
SNDRV_HWDEP_IFACE_EMU10K1 , /* FX8010 processor in EMU10K1 chip */
SNDRV_HWDEP_IFACE_YSS225 , /* Yamaha FX processor */
SNDRV_HWDEP_IFACE_ICS2115 , /* Wavetable synth */
SNDRV_HWDEP_IFACE_SSCAPE , /* Ensoniq SoundScape ISA card (MC68EC000) */
SNDRV_HWDEP_IFACE_VX , /* Digigram VX cards */
SNDRV_HWDEP_IFACE_MIXART , /* Digigram miXart cards */
SNDRV_HWDEP_IFACE_USX2Y , /* Tascam US122, US224 & US428 usb */
SNDRV_HWDEP_IFACE_EMUX_WAVETABLE , /* EmuX wavetable */
SNDRV_HWDEP_IFACE_BLUETOOTH , /* Bluetooth audio */
SNDRV_HWDEP_IFACE_USX2Y_PCM , /* Tascam US122, US224 & US428 rawusb pcm */
SNDRV_HWDEP_IFACE_PCXHR , /* Digigram PCXHR */
SNDRV_HWDEP_IFACE_SB_RC , /* SB Extigy/Audigy2NX remote control */
SNDRV_HWDEP_IFACE_HDA , /* HD-audio */
SNDRV_HWDEP_IFACE_USB_STREAM , /* direct access to usb stream */
SNDRV_HWDEP_IFACE_FW_DICE , /* TC DICE FireWire device */
SNDRV_HWDEP_IFACE_FW_FIREWORKS , /* Echo Audio Fireworks based device */
SNDRV_HWDEP_IFACE_FW_BEBOB , /* BridgeCo BeBoB based device */
SNDRV_HWDEP_IFACE_FW_OXFW , /* Oxford OXFW970/971 based device */
SNDRV_HWDEP_IFACE_FW_DIGI00X , /* Digidesign Digi 002/003 family */
SNDRV_HWDEP_IFACE_FW_TASCAM , /* TASCAM FireWire series */
SNDRV_HWDEP_IFACE_LINE6 , /* Line6 USB processors */
SNDRV_HWDEP_IFACE_FW_MOTU , /* MOTU FireWire series */
SNDRV_HWDEP_IFACE_FW_FIREFACE , /* RME Fireface series */
/* Don't forget to change the following: */
SNDRV_HWDEP_IFACE_LAST = SNDRV_HWDEP_IFACE_FW_FIREFACE
} ;
struct snd_hwdep_info {
unsigned int device ; /* WR: device number */
int card ; /* R: card number */
unsigned char id [ 64 ] ; /* ID (user selectable) */
unsigned char name [ 80 ] ; /* hwdep name */
int iface ; /* hwdep interface */
unsigned char reserved [ 64 ] ; /* reserved for future */
} ;
/* generic DSP loader */
struct snd_hwdep_dsp_status {
unsigned int version ; /* R: driver-specific version */
unsigned char id [ 32 ] ; /* R: driver-specific ID string */
unsigned int num_dsps ; /* R: number of DSP images to transfer */
unsigned int dsp_loaded ; /* R: bit flags indicating the loaded DSPs */
unsigned int chip_ready ; /* R: 1 = initialization finished */
unsigned char reserved [ 16 ] ; /* reserved for future use */
} ;
struct snd_hwdep_dsp_image {
unsigned int index ; /* W: DSP index */
unsigned char name [ 64 ] ; /* W: ID (e.g. file name) */
unsigned char __user * image ; /* W: binary image */
size_t length ; /* W: size of image in bytes */
unsigned long driver_data ; /* W: driver-specific data */
} ;
# define SNDRV_HWDEP_IOCTL_PVERSION _IOR ('H', 0x00, int)
# define SNDRV_HWDEP_IOCTL_INFO _IOR ('H', 0x01, struct snd_hwdep_info)
# define SNDRV_HWDEP_IOCTL_DSP_STATUS _IOR('H', 0x02, struct snd_hwdep_dsp_status)
# define SNDRV_HWDEP_IOCTL_DSP_LOAD _IOW('H', 0x03, struct snd_hwdep_dsp_image)
/*****************************************************************************
* *
* Digital Audio ( PCM ) interface - / dev / snd / pcm ? ? *
* *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
2020-02-12 11:04:23 -03:00
# define SNDRV_PCM_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 15)
2017-07-31 16:45:32 -03:00
typedef unsigned long snd_pcm_uframes_t ;
typedef signed long snd_pcm_sframes_t ;
enum {
SNDRV_PCM_CLASS_GENERIC = 0 , /* standard mono or stereo device */
SNDRV_PCM_CLASS_MULTI , /* multichannel device */
SNDRV_PCM_CLASS_MODEM , /* software modem class */
SNDRV_PCM_CLASS_DIGITIZER , /* digitizer class */
/* Don't forget to change the following: */
SNDRV_PCM_CLASS_LAST = SNDRV_PCM_CLASS_DIGITIZER ,
} ;
enum {
SNDRV_PCM_SUBCLASS_GENERIC_MIX = 0 , /* mono or stereo subdevices are mixed together */
SNDRV_PCM_SUBCLASS_MULTI_MIX , /* multichannel subdevices are mixed together */
/* Don't forget to change the following: */
SNDRV_PCM_SUBCLASS_LAST = SNDRV_PCM_SUBCLASS_MULTI_MIX ,
} ;
enum {
SNDRV_PCM_STREAM_PLAYBACK = 0 ,
SNDRV_PCM_STREAM_CAPTURE ,
SNDRV_PCM_STREAM_LAST = SNDRV_PCM_STREAM_CAPTURE ,
} ;
typedef int __bitwise snd_pcm_access_t ;
# define SNDRV_PCM_ACCESS_MMAP_INTERLEAVED ((__force snd_pcm_access_t) 0) /* interleaved mmap */
# define SNDRV_PCM_ACCESS_MMAP_NONINTERLEAVED ((__force snd_pcm_access_t) 1) /* noninterleaved mmap */
# define SNDRV_PCM_ACCESS_MMAP_COMPLEX ((__force snd_pcm_access_t) 2) /* complex mmap */
# define SNDRV_PCM_ACCESS_RW_INTERLEAVED ((__force snd_pcm_access_t) 3) /* readi/writei */
# define SNDRV_PCM_ACCESS_RW_NONINTERLEAVED ((__force snd_pcm_access_t) 4) /* readn/writen */
# define SNDRV_PCM_ACCESS_LAST SNDRV_PCM_ACCESS_RW_NONINTERLEAVED
typedef int __bitwise snd_pcm_format_t ;
# define SNDRV_PCM_FORMAT_S8 ((__force snd_pcm_format_t) 0)
# define SNDRV_PCM_FORMAT_U8 ((__force snd_pcm_format_t) 1)
# define SNDRV_PCM_FORMAT_S16_LE ((__force snd_pcm_format_t) 2)
# define SNDRV_PCM_FORMAT_S16_BE ((__force snd_pcm_format_t) 3)
# define SNDRV_PCM_FORMAT_U16_LE ((__force snd_pcm_format_t) 4)
# define SNDRV_PCM_FORMAT_U16_BE ((__force snd_pcm_format_t) 5)
# define SNDRV_PCM_FORMAT_S24_LE ((__force snd_pcm_format_t) 6) /* low three bytes */
# define SNDRV_PCM_FORMAT_S24_BE ((__force snd_pcm_format_t) 7) /* low three bytes */
# define SNDRV_PCM_FORMAT_U24_LE ((__force snd_pcm_format_t) 8) /* low three bytes */
# define SNDRV_PCM_FORMAT_U24_BE ((__force snd_pcm_format_t) 9) /* low three bytes */
2020-02-12 11:04:23 -03:00
/*
* For S32 / U32 formats , ' msbits ' hardware parameter is often used to deliver information about the
* available bit count in most significant bit . It ' s for the case of so - called ' left - justified ' or
* ` right - padding ` sample which has less width than 32 bit .
*/
2017-07-31 16:45:32 -03:00
# define SNDRV_PCM_FORMAT_S32_LE ((__force snd_pcm_format_t) 10)
# define SNDRV_PCM_FORMAT_S32_BE ((__force snd_pcm_format_t) 11)
# define SNDRV_PCM_FORMAT_U32_LE ((__force snd_pcm_format_t) 12)
# define SNDRV_PCM_FORMAT_U32_BE ((__force snd_pcm_format_t) 13)
# define SNDRV_PCM_FORMAT_FLOAT_LE ((__force snd_pcm_format_t) 14) /* 4-byte float, IEEE-754 32-bit, range -1.0 to 1.0 */
# define SNDRV_PCM_FORMAT_FLOAT_BE ((__force snd_pcm_format_t) 15) /* 4-byte float, IEEE-754 32-bit, range -1.0 to 1.0 */
# define SNDRV_PCM_FORMAT_FLOAT64_LE ((__force snd_pcm_format_t) 16) /* 8-byte float, IEEE-754 64-bit, range -1.0 to 1.0 */
# define SNDRV_PCM_FORMAT_FLOAT64_BE ((__force snd_pcm_format_t) 17) /* 8-byte float, IEEE-754 64-bit, range -1.0 to 1.0 */
# define SNDRV_PCM_FORMAT_IEC958_SUBFRAME_LE ((__force snd_pcm_format_t) 18) /* IEC-958 subframe, Little Endian */
# define SNDRV_PCM_FORMAT_IEC958_SUBFRAME_BE ((__force snd_pcm_format_t) 19) /* IEC-958 subframe, Big Endian */
# define SNDRV_PCM_FORMAT_MU_LAW ((__force snd_pcm_format_t) 20)
# define SNDRV_PCM_FORMAT_A_LAW ((__force snd_pcm_format_t) 21)
# define SNDRV_PCM_FORMAT_IMA_ADPCM ((__force snd_pcm_format_t) 22)
# define SNDRV_PCM_FORMAT_MPEG ((__force snd_pcm_format_t) 23)
# define SNDRV_PCM_FORMAT_GSM ((__force snd_pcm_format_t) 24)
tools headers: Synchronize sound/asound.h
To pick up the changes from this cset:
823dbb6eb08a ("ALSA: pcm: add SNDRV_PCM_FORMAT_{S,U}20")
It doesn't affect how the tools are built, this os done just to silence
this perf build warning:
Warning: Kernel ABI header at 'tools/include/uapi/sound/asound.h' differs from latest version at 'include/uapi/sound/asound.h'
Right now tools/perf uses this header to generate string tables to
translate ioctl commands in 'perf trace', see
tools/perf/trace/beauty/sndrv_pcm_ioctl.sh, here is an example
of a strace like system wide session, for one second:
# perf trace -a -e ioctl sleep 1
0.000 ( 0.019 ms): alsa-sink-HDMI/4219 ioctl(fd: 47</dev/snd/pcmC0D8p>, cmd: SNDRV_PCM_HWSYNC, arg: 0x107b) = 0
0.081 ( 0.006 ms): alsa-sink-HDMI/4219 ioctl(fd: 47</dev/snd/pcmC0D8p>, cmd: SNDRV_PCM_HWSYNC, arg: 0x107b) = 0
0.092 ( 0.006 ms): alsa-sink-HDMI/4219 ioctl(fd: 47</dev/snd/pcmC0D8p>, cmd: SNDRV_PCM_STATUS_EXT, arg: 0x7f6745ec4ae0) = 0
10.178 ( 0.013 ms): alsa-sink-HDMI/4219 ioctl(fd: 47</dev/snd/pcmC0D8p>, cmd: SNDRV_PCM_HWSYNC, arg: 0x107b) = 0
10.229 ( 0.005 ms): alsa-sink-HDMI/4219 ioctl(fd: 47</dev/snd/pcmC0D8p>, cmd: SNDRV_PCM_HWSYNC, arg: 0x107b) = 0
10.238 ( 0.013 ms): alsa-sink-HDMI/4219 ioctl(fd: 47</dev/snd/pcmC0D8p>, cmd: SNDRV_PCM_STATUS_EXT, arg: 0x7f6745ec4ae0) = 0
10.368 ( 0.009 ms): threaded-ml/26440 ioctl(fd: 141<socket:[111353]>, cmd: TIOCLINUX, arg: 0x7f8f70d2e1a4) = 0
10.495 ( 0.018 ms): alsa-sink-HDMI/4219 ioctl(fd: 47</dev/snd/pcmC0D8p>, cmd: SNDRV_PCM_HWSYNC, arg: 0x107b) = 0
10.526 ( 0.005 ms): alsa-sink-HDMI/4219 ioctl(fd: 47</dev/snd/pcmC0D8p>, cmd: SNDRV_PCM_HWSYNC, arg: 0x107b) = 0
19.695 ( 0.018 ms): alsa-sink-HDMI/4219 ioctl(fd: 47</dev/snd/pcmC0D8p>, cmd: SNDRV_PCM_HWSYNC, arg: 0x107b) = 0
19.757 ( 0.006 ms): alsa-sink-HDMI/4219 ioctl(fd: 47</dev/snd/pcmC0D8p>, cmd: SNDRV_PCM_HWSYNC, arg: 0x107b) = 0
19.767 ( 0.005 ms): alsa-sink-HDMI/4219 ioctl(fd: 47</dev/snd/pcmC0D8p>, cmd: SNDRV_PCM_STATUS_EXT, arg: 0x7f6745ec4ae0) = 0
<BIG SNIP>
#
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Maciej S. Szmigiero <mail@maciej.szmigiero.name>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Takashi Iwai <tiwai@suse.de>
Cc: Wang Nan <wangnan0@huawei.com>
Link: https://lkml.kernel.org/n/tip-sfpeesn8w0pyn3fe7vf2xmfl@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2018-02-02 13:06:04 -03:00
# define SNDRV_PCM_FORMAT_S20_LE ((__force snd_pcm_format_t) 25) /* in four bytes, LSB justified */
# define SNDRV_PCM_FORMAT_S20_BE ((__force snd_pcm_format_t) 26) /* in four bytes, LSB justified */
# define SNDRV_PCM_FORMAT_U20_LE ((__force snd_pcm_format_t) 27) /* in four bytes, LSB justified */
# define SNDRV_PCM_FORMAT_U20_BE ((__force snd_pcm_format_t) 28) /* in four bytes, LSB justified */
/* gap in the numbering for a future standard linear format */
2017-07-31 16:45:32 -03:00
# define SNDRV_PCM_FORMAT_SPECIAL ((__force snd_pcm_format_t) 31)
# define SNDRV_PCM_FORMAT_S24_3LE ((__force snd_pcm_format_t) 32) /* in three bytes */
# define SNDRV_PCM_FORMAT_S24_3BE ((__force snd_pcm_format_t) 33) /* in three bytes */
# define SNDRV_PCM_FORMAT_U24_3LE ((__force snd_pcm_format_t) 34) /* in three bytes */
# define SNDRV_PCM_FORMAT_U24_3BE ((__force snd_pcm_format_t) 35) /* in three bytes */
# define SNDRV_PCM_FORMAT_S20_3LE ((__force snd_pcm_format_t) 36) /* in three bytes */
# define SNDRV_PCM_FORMAT_S20_3BE ((__force snd_pcm_format_t) 37) /* in three bytes */
# define SNDRV_PCM_FORMAT_U20_3LE ((__force snd_pcm_format_t) 38) /* in three bytes */
# define SNDRV_PCM_FORMAT_U20_3BE ((__force snd_pcm_format_t) 39) /* in three bytes */
# define SNDRV_PCM_FORMAT_S18_3LE ((__force snd_pcm_format_t) 40) /* in three bytes */
# define SNDRV_PCM_FORMAT_S18_3BE ((__force snd_pcm_format_t) 41) /* in three bytes */
# define SNDRV_PCM_FORMAT_U18_3LE ((__force snd_pcm_format_t) 42) /* in three bytes */
# define SNDRV_PCM_FORMAT_U18_3BE ((__force snd_pcm_format_t) 43) /* in three bytes */
# define SNDRV_PCM_FORMAT_G723_24 ((__force snd_pcm_format_t) 44) /* 8 samples in 3 bytes */
# define SNDRV_PCM_FORMAT_G723_24_1B ((__force snd_pcm_format_t) 45) /* 1 sample in 1 byte */
# define SNDRV_PCM_FORMAT_G723_40 ((__force snd_pcm_format_t) 46) /* 8 Samples in 5 bytes */
# define SNDRV_PCM_FORMAT_G723_40_1B ((__force snd_pcm_format_t) 47) /* 1 sample in 1 byte */
# define SNDRV_PCM_FORMAT_DSD_U8 ((__force snd_pcm_format_t) 48) /* DSD, 1-byte samples DSD (x8) */
# define SNDRV_PCM_FORMAT_DSD_U16_LE ((__force snd_pcm_format_t) 49) /* DSD, 2-byte samples DSD (x16), little endian */
# define SNDRV_PCM_FORMAT_DSD_U32_LE ((__force snd_pcm_format_t) 50) /* DSD, 4-byte samples DSD (x32), little endian */
# define SNDRV_PCM_FORMAT_DSD_U16_BE ((__force snd_pcm_format_t) 51) /* DSD, 2-byte samples DSD (x16), big endian */
# define SNDRV_PCM_FORMAT_DSD_U32_BE ((__force snd_pcm_format_t) 52) /* DSD, 4-byte samples DSD (x32), big endian */
# define SNDRV_PCM_FORMAT_LAST SNDRV_PCM_FORMAT_DSD_U32_BE
2018-04-16 08:18:22 +02:00
# define SNDRV_PCM_FORMAT_FIRST SNDRV_PCM_FORMAT_S8
2017-07-31 16:45:32 -03:00
# ifdef SNDRV_LITTLE_ENDIAN
# define SNDRV_PCM_FORMAT_S16 SNDRV_PCM_FORMAT_S16_LE
# define SNDRV_PCM_FORMAT_U16 SNDRV_PCM_FORMAT_U16_LE
# define SNDRV_PCM_FORMAT_S24 SNDRV_PCM_FORMAT_S24_LE
# define SNDRV_PCM_FORMAT_U24 SNDRV_PCM_FORMAT_U24_LE
# define SNDRV_PCM_FORMAT_S32 SNDRV_PCM_FORMAT_S32_LE
# define SNDRV_PCM_FORMAT_U32 SNDRV_PCM_FORMAT_U32_LE
# define SNDRV_PCM_FORMAT_FLOAT SNDRV_PCM_FORMAT_FLOAT_LE
# define SNDRV_PCM_FORMAT_FLOAT64 SNDRV_PCM_FORMAT_FLOAT64_LE
# define SNDRV_PCM_FORMAT_IEC958_SUBFRAME SNDRV_PCM_FORMAT_IEC958_SUBFRAME_LE
tools headers: Synchronize sound/asound.h
To pick up the changes from this cset:
823dbb6eb08a ("ALSA: pcm: add SNDRV_PCM_FORMAT_{S,U}20")
It doesn't affect how the tools are built, this os done just to silence
this perf build warning:
Warning: Kernel ABI header at 'tools/include/uapi/sound/asound.h' differs from latest version at 'include/uapi/sound/asound.h'
Right now tools/perf uses this header to generate string tables to
translate ioctl commands in 'perf trace', see
tools/perf/trace/beauty/sndrv_pcm_ioctl.sh, here is an example
of a strace like system wide session, for one second:
# perf trace -a -e ioctl sleep 1
0.000 ( 0.019 ms): alsa-sink-HDMI/4219 ioctl(fd: 47</dev/snd/pcmC0D8p>, cmd: SNDRV_PCM_HWSYNC, arg: 0x107b) = 0
0.081 ( 0.006 ms): alsa-sink-HDMI/4219 ioctl(fd: 47</dev/snd/pcmC0D8p>, cmd: SNDRV_PCM_HWSYNC, arg: 0x107b) = 0
0.092 ( 0.006 ms): alsa-sink-HDMI/4219 ioctl(fd: 47</dev/snd/pcmC0D8p>, cmd: SNDRV_PCM_STATUS_EXT, arg: 0x7f6745ec4ae0) = 0
10.178 ( 0.013 ms): alsa-sink-HDMI/4219 ioctl(fd: 47</dev/snd/pcmC0D8p>, cmd: SNDRV_PCM_HWSYNC, arg: 0x107b) = 0
10.229 ( 0.005 ms): alsa-sink-HDMI/4219 ioctl(fd: 47</dev/snd/pcmC0D8p>, cmd: SNDRV_PCM_HWSYNC, arg: 0x107b) = 0
10.238 ( 0.013 ms): alsa-sink-HDMI/4219 ioctl(fd: 47</dev/snd/pcmC0D8p>, cmd: SNDRV_PCM_STATUS_EXT, arg: 0x7f6745ec4ae0) = 0
10.368 ( 0.009 ms): threaded-ml/26440 ioctl(fd: 141<socket:[111353]>, cmd: TIOCLINUX, arg: 0x7f8f70d2e1a4) = 0
10.495 ( 0.018 ms): alsa-sink-HDMI/4219 ioctl(fd: 47</dev/snd/pcmC0D8p>, cmd: SNDRV_PCM_HWSYNC, arg: 0x107b) = 0
10.526 ( 0.005 ms): alsa-sink-HDMI/4219 ioctl(fd: 47</dev/snd/pcmC0D8p>, cmd: SNDRV_PCM_HWSYNC, arg: 0x107b) = 0
19.695 ( 0.018 ms): alsa-sink-HDMI/4219 ioctl(fd: 47</dev/snd/pcmC0D8p>, cmd: SNDRV_PCM_HWSYNC, arg: 0x107b) = 0
19.757 ( 0.006 ms): alsa-sink-HDMI/4219 ioctl(fd: 47</dev/snd/pcmC0D8p>, cmd: SNDRV_PCM_HWSYNC, arg: 0x107b) = 0
19.767 ( 0.005 ms): alsa-sink-HDMI/4219 ioctl(fd: 47</dev/snd/pcmC0D8p>, cmd: SNDRV_PCM_STATUS_EXT, arg: 0x7f6745ec4ae0) = 0
<BIG SNIP>
#
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Maciej S. Szmigiero <mail@maciej.szmigiero.name>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Takashi Iwai <tiwai@suse.de>
Cc: Wang Nan <wangnan0@huawei.com>
Link: https://lkml.kernel.org/n/tip-sfpeesn8w0pyn3fe7vf2xmfl@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2018-02-02 13:06:04 -03:00
# define SNDRV_PCM_FORMAT_S20 SNDRV_PCM_FORMAT_S20_LE
# define SNDRV_PCM_FORMAT_U20 SNDRV_PCM_FORMAT_U20_LE
2017-07-31 16:45:32 -03:00
# endif
# ifdef SNDRV_BIG_ENDIAN
# define SNDRV_PCM_FORMAT_S16 SNDRV_PCM_FORMAT_S16_BE
# define SNDRV_PCM_FORMAT_U16 SNDRV_PCM_FORMAT_U16_BE
# define SNDRV_PCM_FORMAT_S24 SNDRV_PCM_FORMAT_S24_BE
# define SNDRV_PCM_FORMAT_U24 SNDRV_PCM_FORMAT_U24_BE
# define SNDRV_PCM_FORMAT_S32 SNDRV_PCM_FORMAT_S32_BE
# define SNDRV_PCM_FORMAT_U32 SNDRV_PCM_FORMAT_U32_BE
# define SNDRV_PCM_FORMAT_FLOAT SNDRV_PCM_FORMAT_FLOAT_BE
# define SNDRV_PCM_FORMAT_FLOAT64 SNDRV_PCM_FORMAT_FLOAT64_BE
# define SNDRV_PCM_FORMAT_IEC958_SUBFRAME SNDRV_PCM_FORMAT_IEC958_SUBFRAME_BE
tools headers: Synchronize sound/asound.h
To pick up the changes from this cset:
823dbb6eb08a ("ALSA: pcm: add SNDRV_PCM_FORMAT_{S,U}20")
It doesn't affect how the tools are built, this os done just to silence
this perf build warning:
Warning: Kernel ABI header at 'tools/include/uapi/sound/asound.h' differs from latest version at 'include/uapi/sound/asound.h'
Right now tools/perf uses this header to generate string tables to
translate ioctl commands in 'perf trace', see
tools/perf/trace/beauty/sndrv_pcm_ioctl.sh, here is an example
of a strace like system wide session, for one second:
# perf trace -a -e ioctl sleep 1
0.000 ( 0.019 ms): alsa-sink-HDMI/4219 ioctl(fd: 47</dev/snd/pcmC0D8p>, cmd: SNDRV_PCM_HWSYNC, arg: 0x107b) = 0
0.081 ( 0.006 ms): alsa-sink-HDMI/4219 ioctl(fd: 47</dev/snd/pcmC0D8p>, cmd: SNDRV_PCM_HWSYNC, arg: 0x107b) = 0
0.092 ( 0.006 ms): alsa-sink-HDMI/4219 ioctl(fd: 47</dev/snd/pcmC0D8p>, cmd: SNDRV_PCM_STATUS_EXT, arg: 0x7f6745ec4ae0) = 0
10.178 ( 0.013 ms): alsa-sink-HDMI/4219 ioctl(fd: 47</dev/snd/pcmC0D8p>, cmd: SNDRV_PCM_HWSYNC, arg: 0x107b) = 0
10.229 ( 0.005 ms): alsa-sink-HDMI/4219 ioctl(fd: 47</dev/snd/pcmC0D8p>, cmd: SNDRV_PCM_HWSYNC, arg: 0x107b) = 0
10.238 ( 0.013 ms): alsa-sink-HDMI/4219 ioctl(fd: 47</dev/snd/pcmC0D8p>, cmd: SNDRV_PCM_STATUS_EXT, arg: 0x7f6745ec4ae0) = 0
10.368 ( 0.009 ms): threaded-ml/26440 ioctl(fd: 141<socket:[111353]>, cmd: TIOCLINUX, arg: 0x7f8f70d2e1a4) = 0
10.495 ( 0.018 ms): alsa-sink-HDMI/4219 ioctl(fd: 47</dev/snd/pcmC0D8p>, cmd: SNDRV_PCM_HWSYNC, arg: 0x107b) = 0
10.526 ( 0.005 ms): alsa-sink-HDMI/4219 ioctl(fd: 47</dev/snd/pcmC0D8p>, cmd: SNDRV_PCM_HWSYNC, arg: 0x107b) = 0
19.695 ( 0.018 ms): alsa-sink-HDMI/4219 ioctl(fd: 47</dev/snd/pcmC0D8p>, cmd: SNDRV_PCM_HWSYNC, arg: 0x107b) = 0
19.757 ( 0.006 ms): alsa-sink-HDMI/4219 ioctl(fd: 47</dev/snd/pcmC0D8p>, cmd: SNDRV_PCM_HWSYNC, arg: 0x107b) = 0
19.767 ( 0.005 ms): alsa-sink-HDMI/4219 ioctl(fd: 47</dev/snd/pcmC0D8p>, cmd: SNDRV_PCM_STATUS_EXT, arg: 0x7f6745ec4ae0) = 0
<BIG SNIP>
#
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Maciej S. Szmigiero <mail@maciej.szmigiero.name>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Takashi Iwai <tiwai@suse.de>
Cc: Wang Nan <wangnan0@huawei.com>
Link: https://lkml.kernel.org/n/tip-sfpeesn8w0pyn3fe7vf2xmfl@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2018-02-02 13:06:04 -03:00
# define SNDRV_PCM_FORMAT_S20 SNDRV_PCM_FORMAT_S20_BE
# define SNDRV_PCM_FORMAT_U20 SNDRV_PCM_FORMAT_U20_BE
2017-07-31 16:45:32 -03:00
# endif
typedef int __bitwise snd_pcm_subformat_t ;
# define SNDRV_PCM_SUBFORMAT_STD ((__force snd_pcm_subformat_t) 0)
# define SNDRV_PCM_SUBFORMAT_LAST SNDRV_PCM_SUBFORMAT_STD
# define SNDRV_PCM_INFO_MMAP 0x00000001 /* hardware supports mmap */
# define SNDRV_PCM_INFO_MMAP_VALID 0x00000002 /* period data are valid during transfer */
# define SNDRV_PCM_INFO_DOUBLE 0x00000004 /* Double buffering needed for PCM start/stop */
# define SNDRV_PCM_INFO_BATCH 0x00000010 /* double buffering */
# define SNDRV_PCM_INFO_SYNC_APPLPTR 0x00000020 /* need the explicit sync of appl_ptr update */
tools include UAPI: Sync the sound/asound.h copy with the kernel sources
Picking the changes from:
01dfa8e969dbbc72 ("ALSA: ump: Add info flag bit for static blocks")
e375b8a045873cf5 ("ALSA: ump: Add more attributes to UMP EP and FB info")
30fc139260d46e9b ("ALSA: ump: Add ioctls to inquiry UMP EP and Block info via control API")
127ae6f6dad2edb2 ("ALSA: rawmidi: Skip UMP devices at SNDRV_CTL_IOCTL_RAWMIDI_NEXT_DEVICE")
e3a8a5b726bdd903 ("ALSA: rawmidi: UMP support")
a4bb75c4f19db711 ("ALSA: uapi: pcm: control the filling of the silence samples for drain")
That harvests some new ioctls:
$ tools/perf/trace/beauty/sndrv_ctl_ioctl.sh > before.ctl
$ tools/perf/trace/beauty/sndrv_pcm_ioctl.sh > before.pcm
$ cp include/uapi/sound/asound.h tools/include/uapi/sound/asound.h
$ tools/perf/trace/beauty/sndrv_ctl_ioctl.sh > after.ctl
$ tools/perf/trace/beauty/sndrv_pcm_ioctl.sh > after.pcm
$ diff -u before.ctl after.ctl
--- before.ctl 2023-07-14 10:17:00.319591889 -0300
+++ after.ctl 2023-07-14 10:17:24.668248373 -0300
@@ -22,6 +22,9 @@
[0x40] = "RAWMIDI_NEXT_DEVICE",
[0x41] = "RAWMIDI_INFO",
[0x42] = "RAWMIDI_PREFER_SUBDEVICE",
+ [0x43] = "UMP_NEXT_DEVICE",
+ [0x44] = "UMP_ENDPOINT_INFO",
+ [0x45] = "UMP_BLOCK_INFO",
[0xd0] = "POWER",
[0xd1] = "POWER_STATE",
};
$ diff -u before.pcm after.pcm
$
Now those will be decoded when they appear, see a system wide 'perf
trace' session example here:
# perf trace -e ioctl --max-events=10
0.000 ( 0.010 ms): gnome-shell/2240 ioctl(fd: 9, cmd: DRM_MODE_RMFB, arg: 0x7ffc0041d54c) = 0
2.444 ( 0.005 ms): wireplumber/2304 ioctl(fd: 47, cmd: TIOCOUTQ, arg: 0x7f16e9afea24) = 0
2.452 ( 0.002 ms): wireplumber/2304 ioctl(fd: 47, cmd: TIOCOUTQ, arg: 0x7f16e9afea24) = 0
11.348 ( 0.010 ms): gnome-shell/2240 ioctl(fd: 14, cmd: DRM_I915_IRQ_WAIT, arg: 0x7ffc0041ccf0) = 0
11.406 ( 0.037 ms): gnome-shel:cs0/2259 ioctl(fd: 14, cmd: DRM_I915_IRQ_EMIT, arg: 0x7f3cf69fdc60) = 0
11.476 ( 0.009 ms): gnome-shell/2240 ioctl(fd: 9, cmd: DRM_MODE_ADDFB2, arg: 0x7ffc0041ce50) = 0
11.497 ( 0.019 ms): gnome-shell/2240 ioctl(fd: 9, cmd: DRM_MODE_ATOMIC, arg: 0x7ffc0041cdf0) = 0
12.481 ( 0.020 ms): firefox:cs0/3651 ioctl(fd: 40, cmd: DRM_I915_IRQ_EMIT, arg: 0x7f1c365fea60) = 0
12.529 ( 0.009 ms): firefox:cs0/3651 ioctl(fd: 40, cmd: DRM_I915_IRQ_EMIT, arg: 0x7f1c365feab0) = 0
12.624 ( 0.018 ms): firefox:cs0/3651 ioctl(fd: 40, cmd: DRM_I915_IRQ_EMIT, arg: 0x7f1c365fea30) = 0
#
Silencing these perf build warnings:
Warning: Kernel ABI header differences:
diff -u tools/include/uapi/sound/asound.h include/uapi/sound/asound.h
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Takashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/lkml/ZLFOrTE2+xZBgHGe@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2023-07-14 10:18:42 -03:00
# define SNDRV_PCM_INFO_PERFECT_DRAIN 0x00000040 /* silencing at the end of stream is not required */
2017-07-31 16:45:32 -03:00
# define SNDRV_PCM_INFO_INTERLEAVED 0x00000100 /* channels are interleaved */
# define SNDRV_PCM_INFO_NONINTERLEAVED 0x00000200 /* channels are not interleaved */
# define SNDRV_PCM_INFO_COMPLEX 0x00000400 /* complex frame organization (mmap only) */
# define SNDRV_PCM_INFO_BLOCK_TRANSFER 0x00010000 /* hardware transfer block of samples */
# define SNDRV_PCM_INFO_OVERRANGE 0x00020000 /* hardware supports ADC (capture) overrange detection */
# define SNDRV_PCM_INFO_RESUME 0x00040000 /* hardware supports stream resume after suspend */
# define SNDRV_PCM_INFO_PAUSE 0x00080000 /* pause ioctl is supported */
# define SNDRV_PCM_INFO_HALF_DUPLEX 0x00100000 /* only half duplex */
# define SNDRV_PCM_INFO_JOINT_DUPLEX 0x00200000 /* playback and capture stream are somewhat correlated */
# define SNDRV_PCM_INFO_SYNC_START 0x00400000 /* pcm support some kind of sync go */
# define SNDRV_PCM_INFO_NO_PERIOD_WAKEUP 0x00800000 /* period wakeup can be disabled */
# define SNDRV_PCM_INFO_HAS_WALL_CLOCK 0x01000000 /* (Deprecated)has audio wall clock for audio/system time sync */
# define SNDRV_PCM_INFO_HAS_LINK_ATIME 0x01000000 /* report hardware link audio time, reset on startup */
# define SNDRV_PCM_INFO_HAS_LINK_ABSOLUTE_ATIME 0x02000000 /* report absolute hardware link audio time, not reset on startup */
# define SNDRV_PCM_INFO_HAS_LINK_ESTIMATED_ATIME 0x04000000 /* report estimated link audio time */
# define SNDRV_PCM_INFO_HAS_LINK_SYNCHRONIZED_ATIME 0x08000000 /* report synchronized audio/system time */
2020-02-12 11:04:23 -03:00
# define SNDRV_PCM_INFO_EXPLICIT_SYNC 0x10000000 /* needs explicit sync of pointers and data */
2020-02-12 11:04:23 -03:00
# define SNDRV_PCM_INFO_NO_REWINDS 0x20000000 /* hardware can only support monotonic changes of appl_ptr */
2017-07-31 16:45:32 -03:00
# define SNDRV_PCM_INFO_DRAIN_TRIGGER 0x40000000 /* internal kernel flag - trigger in drain */
# define SNDRV_PCM_INFO_FIFO_IN_FRAMES 0x80000000 /* internal kernel flag - FIFO size is in frames */
2020-02-12 11:04:23 -03:00
# if (__BITS_PER_LONG == 32 && defined(__USE_TIME_BITS64)) || defined __KERNEL__
# define __SND_STRUCT_TIME64
# endif
2017-07-31 16:45:32 -03:00
typedef int __bitwise snd_pcm_state_t ;
# define SNDRV_PCM_STATE_OPEN ((__force snd_pcm_state_t) 0) /* stream is open */
# define SNDRV_PCM_STATE_SETUP ((__force snd_pcm_state_t) 1) /* stream has a setup */
# define SNDRV_PCM_STATE_PREPARED ((__force snd_pcm_state_t) 2) /* stream is ready to start */
# define SNDRV_PCM_STATE_RUNNING ((__force snd_pcm_state_t) 3) /* stream is running */
# define SNDRV_PCM_STATE_XRUN ((__force snd_pcm_state_t) 4) /* stream reached an xrun */
# define SNDRV_PCM_STATE_DRAINING ((__force snd_pcm_state_t) 5) /* stream is draining */
# define SNDRV_PCM_STATE_PAUSED ((__force snd_pcm_state_t) 6) /* stream is paused */
# define SNDRV_PCM_STATE_SUSPENDED ((__force snd_pcm_state_t) 7) /* hardware is suspended */
# define SNDRV_PCM_STATE_DISCONNECTED ((__force snd_pcm_state_t) 8) /* hardware is disconnected */
# define SNDRV_PCM_STATE_LAST SNDRV_PCM_STATE_DISCONNECTED
enum {
SNDRV_PCM_MMAP_OFFSET_DATA = 0x00000000 ,
2020-02-12 11:04:23 -03:00
SNDRV_PCM_MMAP_OFFSET_STATUS_OLD = 0x80000000 ,
SNDRV_PCM_MMAP_OFFSET_CONTROL_OLD = 0x81000000 ,
SNDRV_PCM_MMAP_OFFSET_STATUS_NEW = 0x82000000 ,
SNDRV_PCM_MMAP_OFFSET_CONTROL_NEW = 0x83000000 ,
# ifdef __SND_STRUCT_TIME64
SNDRV_PCM_MMAP_OFFSET_STATUS = SNDRV_PCM_MMAP_OFFSET_STATUS_NEW ,
SNDRV_PCM_MMAP_OFFSET_CONTROL = SNDRV_PCM_MMAP_OFFSET_CONTROL_NEW ,
# else
SNDRV_PCM_MMAP_OFFSET_STATUS = SNDRV_PCM_MMAP_OFFSET_STATUS_OLD ,
SNDRV_PCM_MMAP_OFFSET_CONTROL = SNDRV_PCM_MMAP_OFFSET_CONTROL_OLD ,
# endif
2017-07-31 16:45:32 -03:00
} ;
union snd_pcm_sync_id {
unsigned char id [ 16 ] ;
unsigned short id16 [ 8 ] ;
unsigned int id32 [ 4 ] ;
} ;
struct snd_pcm_info {
unsigned int device ; /* RO/WR (control): device number */
unsigned int subdevice ; /* RO/WR (control): subdevice number */
int stream ; /* RO/WR (control): stream direction */
int card ; /* R: card number */
unsigned char id [ 64 ] ; /* ID (user selectable) */
unsigned char name [ 80 ] ; /* name of this device */
unsigned char subname [ 32 ] ; /* subdevice name */
int dev_class ; /* SNDRV_PCM_CLASS_* */
int dev_subclass ; /* SNDRV_PCM_SUBCLASS_* */
unsigned int subdevices_count ;
unsigned int subdevices_avail ;
union snd_pcm_sync_id sync ; /* hardware synchronization ID */
unsigned char reserved [ 64 ] ; /* reserved for future... */
} ;
typedef int snd_pcm_hw_param_t ;
# define SNDRV_PCM_HW_PARAM_ACCESS 0 /* Access type */
# define SNDRV_PCM_HW_PARAM_FORMAT 1 /* Format */
# define SNDRV_PCM_HW_PARAM_SUBFORMAT 2 /* Subformat */
# define SNDRV_PCM_HW_PARAM_FIRST_MASK SNDRV_PCM_HW_PARAM_ACCESS
# define SNDRV_PCM_HW_PARAM_LAST_MASK SNDRV_PCM_HW_PARAM_SUBFORMAT
# define SNDRV_PCM_HW_PARAM_SAMPLE_BITS 8 /* Bits per sample */
# define SNDRV_PCM_HW_PARAM_FRAME_BITS 9 /* Bits per frame */
# define SNDRV_PCM_HW_PARAM_CHANNELS 10 /* Channels */
# define SNDRV_PCM_HW_PARAM_RATE 11 /* Approx rate */
# define SNDRV_PCM_HW_PARAM_PERIOD_TIME 12 / * Approx distance between
* interrupts in us
*/
# define SNDRV_PCM_HW_PARAM_PERIOD_SIZE 13 / * Approx frames between
* interrupts
*/
# define SNDRV_PCM_HW_PARAM_PERIOD_BYTES 14 / * Approx bytes between
* interrupts
*/
# define SNDRV_PCM_HW_PARAM_PERIODS 15 / * Approx interrupts per
* buffer
*/
# define SNDRV_PCM_HW_PARAM_BUFFER_TIME 16 / * Approx duration of buffer
* in us
*/
# define SNDRV_PCM_HW_PARAM_BUFFER_SIZE 17 /* Size of buffer in frames */
# define SNDRV_PCM_HW_PARAM_BUFFER_BYTES 18 /* Size of buffer in bytes */
# define SNDRV_PCM_HW_PARAM_TICK_TIME 19 /* Approx tick duration in us */
# define SNDRV_PCM_HW_PARAM_FIRST_INTERVAL SNDRV_PCM_HW_PARAM_SAMPLE_BITS
# define SNDRV_PCM_HW_PARAM_LAST_INTERVAL SNDRV_PCM_HW_PARAM_TICK_TIME
# define SNDRV_PCM_HW_PARAMS_NORESAMPLE (1<<0) /* avoid rate resampling */
# define SNDRV_PCM_HW_PARAMS_EXPORT_BUFFER (1<<1) /* export buffer */
# define SNDRV_PCM_HW_PARAMS_NO_PERIOD_WAKEUP (1<<2) /* disable period wakeups */
tools include UAPI: Sync the sound/asound.h copy with the kernel sources
Picking the changes from:
01dfa8e969dbbc72 ("ALSA: ump: Add info flag bit for static blocks")
e375b8a045873cf5 ("ALSA: ump: Add more attributes to UMP EP and FB info")
30fc139260d46e9b ("ALSA: ump: Add ioctls to inquiry UMP EP and Block info via control API")
127ae6f6dad2edb2 ("ALSA: rawmidi: Skip UMP devices at SNDRV_CTL_IOCTL_RAWMIDI_NEXT_DEVICE")
e3a8a5b726bdd903 ("ALSA: rawmidi: UMP support")
a4bb75c4f19db711 ("ALSA: uapi: pcm: control the filling of the silence samples for drain")
That harvests some new ioctls:
$ tools/perf/trace/beauty/sndrv_ctl_ioctl.sh > before.ctl
$ tools/perf/trace/beauty/sndrv_pcm_ioctl.sh > before.pcm
$ cp include/uapi/sound/asound.h tools/include/uapi/sound/asound.h
$ tools/perf/trace/beauty/sndrv_ctl_ioctl.sh > after.ctl
$ tools/perf/trace/beauty/sndrv_pcm_ioctl.sh > after.pcm
$ diff -u before.ctl after.ctl
--- before.ctl 2023-07-14 10:17:00.319591889 -0300
+++ after.ctl 2023-07-14 10:17:24.668248373 -0300
@@ -22,6 +22,9 @@
[0x40] = "RAWMIDI_NEXT_DEVICE",
[0x41] = "RAWMIDI_INFO",
[0x42] = "RAWMIDI_PREFER_SUBDEVICE",
+ [0x43] = "UMP_NEXT_DEVICE",
+ [0x44] = "UMP_ENDPOINT_INFO",
+ [0x45] = "UMP_BLOCK_INFO",
[0xd0] = "POWER",
[0xd1] = "POWER_STATE",
};
$ diff -u before.pcm after.pcm
$
Now those will be decoded when they appear, see a system wide 'perf
trace' session example here:
# perf trace -e ioctl --max-events=10
0.000 ( 0.010 ms): gnome-shell/2240 ioctl(fd: 9, cmd: DRM_MODE_RMFB, arg: 0x7ffc0041d54c) = 0
2.444 ( 0.005 ms): wireplumber/2304 ioctl(fd: 47, cmd: TIOCOUTQ, arg: 0x7f16e9afea24) = 0
2.452 ( 0.002 ms): wireplumber/2304 ioctl(fd: 47, cmd: TIOCOUTQ, arg: 0x7f16e9afea24) = 0
11.348 ( 0.010 ms): gnome-shell/2240 ioctl(fd: 14, cmd: DRM_I915_IRQ_WAIT, arg: 0x7ffc0041ccf0) = 0
11.406 ( 0.037 ms): gnome-shel:cs0/2259 ioctl(fd: 14, cmd: DRM_I915_IRQ_EMIT, arg: 0x7f3cf69fdc60) = 0
11.476 ( 0.009 ms): gnome-shell/2240 ioctl(fd: 9, cmd: DRM_MODE_ADDFB2, arg: 0x7ffc0041ce50) = 0
11.497 ( 0.019 ms): gnome-shell/2240 ioctl(fd: 9, cmd: DRM_MODE_ATOMIC, arg: 0x7ffc0041cdf0) = 0
12.481 ( 0.020 ms): firefox:cs0/3651 ioctl(fd: 40, cmd: DRM_I915_IRQ_EMIT, arg: 0x7f1c365fea60) = 0
12.529 ( 0.009 ms): firefox:cs0/3651 ioctl(fd: 40, cmd: DRM_I915_IRQ_EMIT, arg: 0x7f1c365feab0) = 0
12.624 ( 0.018 ms): firefox:cs0/3651 ioctl(fd: 40, cmd: DRM_I915_IRQ_EMIT, arg: 0x7f1c365fea30) = 0
#
Silencing these perf build warnings:
Warning: Kernel ABI header differences:
diff -u tools/include/uapi/sound/asound.h include/uapi/sound/asound.h
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Takashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/lkml/ZLFOrTE2+xZBgHGe@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2023-07-14 10:18:42 -03:00
# define SNDRV_PCM_HW_PARAMS_NO_DRAIN_SILENCE (1<<3) / * suppress drain with the filling
* of the silence samples
*/
2017-07-31 16:45:32 -03:00
struct snd_interval {
unsigned int min , max ;
unsigned int openmin : 1 ,
openmax : 1 ,
integer : 1 ,
empty : 1 ;
} ;
# define SNDRV_MASK_MAX 256
struct snd_mask {
__u32 bits [ ( SNDRV_MASK_MAX + 31 ) / 32 ] ;
} ;
struct snd_pcm_hw_params {
unsigned int flags ;
struct snd_mask masks [ SNDRV_PCM_HW_PARAM_LAST_MASK -
SNDRV_PCM_HW_PARAM_FIRST_MASK + 1 ] ;
struct snd_mask mres [ 5 ] ; /* reserved masks */
struct snd_interval intervals [ SNDRV_PCM_HW_PARAM_LAST_INTERVAL -
SNDRV_PCM_HW_PARAM_FIRST_INTERVAL + 1 ] ;
struct snd_interval ires [ 9 ] ; /* reserved intervals */
unsigned int rmask ; /* W: requested masks */
unsigned int cmask ; /* R: changed masks */
unsigned int info ; /* R: Info flags for returned setup */
unsigned int msbits ; /* R: used most significant bits */
unsigned int rate_num ; /* R: rate numerator */
unsigned int rate_den ; /* R: rate denominator */
snd_pcm_uframes_t fifo_size ; /* R: chip FIFO size in frames */
unsigned char reserved [ 64 ] ; /* reserved for future */
} ;
enum {
SNDRV_PCM_TSTAMP_NONE = 0 ,
SNDRV_PCM_TSTAMP_ENABLE ,
SNDRV_PCM_TSTAMP_LAST = SNDRV_PCM_TSTAMP_ENABLE ,
} ;
struct snd_pcm_sw_params {
int tstamp_mode ; /* timestamp mode */
unsigned int period_step ;
unsigned int sleep_min ; /* min ticks to sleep */
snd_pcm_uframes_t avail_min ; /* min avail frames for wakeup */
snd_pcm_uframes_t xfer_align ; /* obsolete: xfer size need to be a multiple */
snd_pcm_uframes_t start_threshold ; /* min hw_avail frames for automatic start */
2023-05-10 18:24:08 +08:00
/*
* The following two thresholds alleviate playback buffer underruns ; when
* hw_avail drops below the threshold , the respective action is triggered :
*/
snd_pcm_uframes_t stop_threshold ; /* - stop playback */
snd_pcm_uframes_t silence_threshold ; /* - pre-fill buffer with silence */
snd_pcm_uframes_t silence_size ; /* max size of silence pre-fill; when >= boundary,
* fill played area with silence immediately */
2017-07-31 16:45:32 -03:00
snd_pcm_uframes_t boundary ; /* pointers wrap point */
unsigned int proto ; /* protocol version */
unsigned int tstamp_type ; /* timestamp type (req. proto >= 2.0.12) */
unsigned char reserved [ 56 ] ; /* reserved for future */
} ;
struct snd_pcm_channel_info {
unsigned int channel ;
__kernel_off_t offset ; /* mmap offset */
unsigned int first ; /* offset to first sample in bits */
unsigned int step ; /* samples distance in bits */
} ;
enum {
/*
* first definition for backwards compatibility only ,
* maps to wallclock / link time for HDAudio playback and DEFAULT / DMA time for everything else
*/
SNDRV_PCM_AUDIO_TSTAMP_TYPE_COMPAT = 0 ,
/* timestamp definitions */
SNDRV_PCM_AUDIO_TSTAMP_TYPE_DEFAULT = 1 , /* DMA time, reported as per hw_ptr */
SNDRV_PCM_AUDIO_TSTAMP_TYPE_LINK = 2 , /* link time reported by sample or wallclock counter, reset on startup */
SNDRV_PCM_AUDIO_TSTAMP_TYPE_LINK_ABSOLUTE = 3 , /* link time reported by sample or wallclock counter, not reset on startup */
SNDRV_PCM_AUDIO_TSTAMP_TYPE_LINK_ESTIMATED = 4 , /* link time estimated indirectly */
SNDRV_PCM_AUDIO_TSTAMP_TYPE_LINK_SYNCHRONIZED = 5 , /* link time synchronized with system time */
SNDRV_PCM_AUDIO_TSTAMP_TYPE_LAST = SNDRV_PCM_AUDIO_TSTAMP_TYPE_LINK_SYNCHRONIZED
} ;
2020-02-12 11:04:23 -03:00
# ifndef __KERNEL__
/* explicit padding avoids incompatibility between i386 and x86-64 */
typedef struct { unsigned char pad [ sizeof ( time_t ) - sizeof ( int ) ] ; } __time_pad ;
2017-07-31 16:45:32 -03:00
struct snd_pcm_status {
snd_pcm_state_t state ; /* stream state */
2020-02-12 11:04:23 -03:00
__time_pad pad1 ; /* align to timespec */
2017-07-31 16:45:32 -03:00
struct timespec trigger_tstamp ; /* time when stream was started/stopped/paused */
struct timespec tstamp ; /* reference timestamp */
snd_pcm_uframes_t appl_ptr ; /* appl ptr */
snd_pcm_uframes_t hw_ptr ; /* hw ptr */
snd_pcm_sframes_t delay ; /* current delay in frames */
snd_pcm_uframes_t avail ; /* number of frames available */
snd_pcm_uframes_t avail_max ; /* max frames available on hw since last status */
snd_pcm_uframes_t overrange ; /* count of ADC (capture) overrange detections from last status */
snd_pcm_state_t suspended_state ; /* suspended stream state */
__u32 audio_tstamp_data ; /* needed for 64-bit alignment, used for configs/report to/from userspace */
struct timespec audio_tstamp ; /* sample counter, wall clock, PHC or on-demand sync'ed */
struct timespec driver_tstamp ; /* useful in case reference system tstamp is reported with delay */
__u32 audio_tstamp_accuracy ; /* in ns units, only valid if indicated in audio_tstamp_data */
unsigned char reserved [ 52 - 2 * sizeof ( struct timespec ) ] ; /* must be filled with zero */
} ;
2020-02-12 11:04:23 -03:00
# endif
/*
* For mmap operations , we need the 64 - bit layout , both for compat mode ,
* and for y2038 compatibility . For 64 - bit applications , the two definitions
* are identical , so we keep the traditional version .
*/
# ifdef __SND_STRUCT_TIME64
# define __snd_pcm_mmap_status64 snd_pcm_mmap_status
# define __snd_pcm_mmap_control64 snd_pcm_mmap_control
# define __snd_pcm_sync_ptr64 snd_pcm_sync_ptr
# ifdef __KERNEL__
# define __snd_timespec64 __kernel_timespec
# else
# define __snd_timespec64 timespec
# endif
struct __snd_timespec {
__s32 tv_sec ;
__s32 tv_nsec ;
} ;
# else
# define __snd_pcm_mmap_status snd_pcm_mmap_status
# define __snd_pcm_mmap_control snd_pcm_mmap_control
# define __snd_pcm_sync_ptr snd_pcm_sync_ptr
# define __snd_timespec timespec
struct __snd_timespec64 {
__s64 tv_sec ;
__s64 tv_nsec ;
} ;
2017-07-31 16:45:32 -03:00
2020-02-12 11:04:23 -03:00
# endif
struct __snd_pcm_mmap_status {
2017-07-31 16:45:32 -03:00
snd_pcm_state_t state ; /* RO: state - SNDRV_PCM_STATE_XXXX */
int pad1 ; /* Needed for 64 bit alignment */
snd_pcm_uframes_t hw_ptr ; /* RO: hw ptr (0...boundary-1) */
2020-02-12 11:04:23 -03:00
struct __snd_timespec tstamp ; /* Timestamp */
2017-07-31 16:45:32 -03:00
snd_pcm_state_t suspended_state ; /* RO: suspended stream state */
2020-02-12 11:04:23 -03:00
struct __snd_timespec audio_tstamp ; /* from sample counter or wall clock */
2017-07-31 16:45:32 -03:00
} ;
2020-02-12 11:04:23 -03:00
struct __snd_pcm_mmap_control {
2017-07-31 16:45:32 -03:00
snd_pcm_uframes_t appl_ptr ; /* RW: appl ptr (0...boundary-1) */
snd_pcm_uframes_t avail_min ; /* RW: min available frames for wakeup */
} ;
# define SNDRV_PCM_SYNC_PTR_HWSYNC (1<<0) /* execute hwsync */
# define SNDRV_PCM_SYNC_PTR_APPL (1<<1) /* get appl_ptr from driver (r/w op) */
# define SNDRV_PCM_SYNC_PTR_AVAIL_MIN (1<<2) /* get avail_min from driver */
2020-02-12 11:04:23 -03:00
struct __snd_pcm_sync_ptr {
2017-07-31 16:45:32 -03:00
unsigned int flags ;
union {
2020-02-12 11:04:23 -03:00
struct __snd_pcm_mmap_status status ;
unsigned char reserved [ 64 ] ;
} s ;
union {
struct __snd_pcm_mmap_control control ;
unsigned char reserved [ 64 ] ;
} c ;
} ;
# if defined(__BYTE_ORDER) ? __BYTE_ORDER == __BIG_ENDIAN : defined(__BIG_ENDIAN)
typedef char __pad_before_uframe [ sizeof ( __u64 ) - sizeof ( snd_pcm_uframes_t ) ] ;
typedef char __pad_after_uframe [ 0 ] ;
# endif
# if defined(__BYTE_ORDER) ? __BYTE_ORDER == __LITTLE_ENDIAN : defined(__LITTLE_ENDIAN)
typedef char __pad_before_uframe [ 0 ] ;
typedef char __pad_after_uframe [ sizeof ( __u64 ) - sizeof ( snd_pcm_uframes_t ) ] ;
# endif
struct __snd_pcm_mmap_status64 {
snd_pcm_state_t state ; /* RO: state - SNDRV_PCM_STATE_XXXX */
__u32 pad1 ; /* Needed for 64 bit alignment */
__pad_before_uframe __pad1 ;
snd_pcm_uframes_t hw_ptr ; /* RO: hw ptr (0...boundary-1) */
__pad_after_uframe __pad2 ;
struct __snd_timespec64 tstamp ; /* Timestamp */
snd_pcm_state_t suspended_state ; /* RO: suspended stream state */
__u32 pad3 ; /* Needed for 64 bit alignment */
struct __snd_timespec64 audio_tstamp ; /* sample counter or wall clock */
} ;
struct __snd_pcm_mmap_control64 {
__pad_before_uframe __pad1 ;
snd_pcm_uframes_t appl_ptr ; /* RW: appl ptr (0...boundary-1) */
2023-05-10 18:24:08 +08:00
__pad_before_uframe __pad2 ; // This should be __pad_after_uframe, but binary
// backwards compatibility constraints prevent a fix.
2020-02-12 11:04:23 -03:00
__pad_before_uframe __pad3 ;
snd_pcm_uframes_t avail_min ; /* RW: min available frames for wakeup */
__pad_after_uframe __pad4 ;
} ;
struct __snd_pcm_sync_ptr64 {
__u32 flags ;
__u32 pad1 ;
union {
struct __snd_pcm_mmap_status64 status ;
2017-07-31 16:45:32 -03:00
unsigned char reserved [ 64 ] ;
} s ;
union {
2020-02-12 11:04:23 -03:00
struct __snd_pcm_mmap_control64 control ;
2017-07-31 16:45:32 -03:00
unsigned char reserved [ 64 ] ;
} c ;
} ;
struct snd_xferi {
snd_pcm_sframes_t result ;
void __user * buf ;
snd_pcm_uframes_t frames ;
} ;
struct snd_xfern {
snd_pcm_sframes_t result ;
void __user * __user * bufs ;
snd_pcm_uframes_t frames ;
} ;
enum {
SNDRV_PCM_TSTAMP_TYPE_GETTIMEOFDAY = 0 , /* gettimeofday equivalent */
SNDRV_PCM_TSTAMP_TYPE_MONOTONIC , /* posix_clock_monotonic equivalent */
SNDRV_PCM_TSTAMP_TYPE_MONOTONIC_RAW , /* monotonic_raw (no NTP) */
SNDRV_PCM_TSTAMP_TYPE_LAST = SNDRV_PCM_TSTAMP_TYPE_MONOTONIC_RAW ,
} ;
/* channel positions */
enum {
SNDRV_CHMAP_UNKNOWN = 0 ,
SNDRV_CHMAP_NA , /* N/A, silent */
SNDRV_CHMAP_MONO , /* mono stream */
/* this follows the alsa-lib mixer channel value + 3 */
SNDRV_CHMAP_FL , /* front left */
SNDRV_CHMAP_FR , /* front right */
SNDRV_CHMAP_RL , /* rear left */
SNDRV_CHMAP_RR , /* rear right */
SNDRV_CHMAP_FC , /* front center */
SNDRV_CHMAP_LFE , /* LFE */
SNDRV_CHMAP_SL , /* side left */
SNDRV_CHMAP_SR , /* side right */
SNDRV_CHMAP_RC , /* rear center */
/* new definitions */
SNDRV_CHMAP_FLC , /* front left center */
SNDRV_CHMAP_FRC , /* front right center */
SNDRV_CHMAP_RLC , /* rear left center */
SNDRV_CHMAP_RRC , /* rear right center */
SNDRV_CHMAP_FLW , /* front left wide */
SNDRV_CHMAP_FRW , /* front right wide */
SNDRV_CHMAP_FLH , /* front left high */
SNDRV_CHMAP_FCH , /* front center high */
SNDRV_CHMAP_FRH , /* front right high */
SNDRV_CHMAP_TC , /* top center */
SNDRV_CHMAP_TFL , /* top front left */
SNDRV_CHMAP_TFR , /* top front right */
SNDRV_CHMAP_TFC , /* top front center */
SNDRV_CHMAP_TRL , /* top rear left */
SNDRV_CHMAP_TRR , /* top rear right */
SNDRV_CHMAP_TRC , /* top rear center */
/* new definitions for UAC2 */
SNDRV_CHMAP_TFLC , /* top front left center */
SNDRV_CHMAP_TFRC , /* top front right center */
SNDRV_CHMAP_TSL , /* top side left */
SNDRV_CHMAP_TSR , /* top side right */
SNDRV_CHMAP_LLFE , /* left LFE */
SNDRV_CHMAP_RLFE , /* right LFE */
SNDRV_CHMAP_BC , /* bottom center */
SNDRV_CHMAP_BLC , /* bottom left center */
SNDRV_CHMAP_BRC , /* bottom right center */
SNDRV_CHMAP_LAST = SNDRV_CHMAP_BRC ,
} ;
# define SNDRV_CHMAP_POSITION_MASK 0xffff
# define SNDRV_CHMAP_PHASE_INVERSE (0x01 << 16)
# define SNDRV_CHMAP_DRIVER_SPEC (0x02 << 16)
# define SNDRV_PCM_IOCTL_PVERSION _IOR('A', 0x00, int)
# define SNDRV_PCM_IOCTL_INFO _IOR('A', 0x01, struct snd_pcm_info)
# define SNDRV_PCM_IOCTL_TSTAMP _IOW('A', 0x02, int)
# define SNDRV_PCM_IOCTL_TTSTAMP _IOW('A', 0x03, int)
# define SNDRV_PCM_IOCTL_USER_PVERSION _IOW('A', 0x04, int)
# define SNDRV_PCM_IOCTL_HW_REFINE _IOWR('A', 0x10, struct snd_pcm_hw_params)
# define SNDRV_PCM_IOCTL_HW_PARAMS _IOWR('A', 0x11, struct snd_pcm_hw_params)
# define SNDRV_PCM_IOCTL_HW_FREE _IO('A', 0x12)
# define SNDRV_PCM_IOCTL_SW_PARAMS _IOWR('A', 0x13, struct snd_pcm_sw_params)
# define SNDRV_PCM_IOCTL_STATUS _IOR('A', 0x20, struct snd_pcm_status)
# define SNDRV_PCM_IOCTL_DELAY _IOR('A', 0x21, snd_pcm_sframes_t)
# define SNDRV_PCM_IOCTL_HWSYNC _IO('A', 0x22)
2020-02-12 11:04:23 -03:00
# define __SNDRV_PCM_IOCTL_SYNC_PTR _IOWR('A', 0x23, struct __snd_pcm_sync_ptr)
# define __SNDRV_PCM_IOCTL_SYNC_PTR64 _IOWR('A', 0x23, struct __snd_pcm_sync_ptr64)
2017-07-31 16:45:32 -03:00
# define SNDRV_PCM_IOCTL_SYNC_PTR _IOWR('A', 0x23, struct snd_pcm_sync_ptr)
# define SNDRV_PCM_IOCTL_STATUS_EXT _IOWR('A', 0x24, struct snd_pcm_status)
# define SNDRV_PCM_IOCTL_CHANNEL_INFO _IOR('A', 0x32, struct snd_pcm_channel_info)
# define SNDRV_PCM_IOCTL_PREPARE _IO('A', 0x40)
# define SNDRV_PCM_IOCTL_RESET _IO('A', 0x41)
# define SNDRV_PCM_IOCTL_START _IO('A', 0x42)
# define SNDRV_PCM_IOCTL_DROP _IO('A', 0x43)
# define SNDRV_PCM_IOCTL_DRAIN _IO('A', 0x44)
# define SNDRV_PCM_IOCTL_PAUSE _IOW('A', 0x45, int)
# define SNDRV_PCM_IOCTL_REWIND _IOW('A', 0x46, snd_pcm_uframes_t)
# define SNDRV_PCM_IOCTL_RESUME _IO('A', 0x47)
# define SNDRV_PCM_IOCTL_XRUN _IO('A', 0x48)
# define SNDRV_PCM_IOCTL_FORWARD _IOW('A', 0x49, snd_pcm_uframes_t)
# define SNDRV_PCM_IOCTL_WRITEI_FRAMES _IOW('A', 0x50, struct snd_xferi)
# define SNDRV_PCM_IOCTL_READI_FRAMES _IOR('A', 0x51, struct snd_xferi)
# define SNDRV_PCM_IOCTL_WRITEN_FRAMES _IOW('A', 0x52, struct snd_xfern)
# define SNDRV_PCM_IOCTL_READN_FRAMES _IOR('A', 0x53, struct snd_xfern)
# define SNDRV_PCM_IOCTL_LINK _IOW('A', 0x60, int)
# define SNDRV_PCM_IOCTL_UNLINK _IO('A', 0x61)
/*****************************************************************************
* *
* MIDI v1 .0 interface *
* *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/*
* Raw MIDI section - / dev / snd / midi ? ?
*/
tools include UAPI: Sync the sound/asound.h copy with the kernel sources
Picking the changes from:
01dfa8e969dbbc72 ("ALSA: ump: Add info flag bit for static blocks")
e375b8a045873cf5 ("ALSA: ump: Add more attributes to UMP EP and FB info")
30fc139260d46e9b ("ALSA: ump: Add ioctls to inquiry UMP EP and Block info via control API")
127ae6f6dad2edb2 ("ALSA: rawmidi: Skip UMP devices at SNDRV_CTL_IOCTL_RAWMIDI_NEXT_DEVICE")
e3a8a5b726bdd903 ("ALSA: rawmidi: UMP support")
a4bb75c4f19db711 ("ALSA: uapi: pcm: control the filling of the silence samples for drain")
That harvests some new ioctls:
$ tools/perf/trace/beauty/sndrv_ctl_ioctl.sh > before.ctl
$ tools/perf/trace/beauty/sndrv_pcm_ioctl.sh > before.pcm
$ cp include/uapi/sound/asound.h tools/include/uapi/sound/asound.h
$ tools/perf/trace/beauty/sndrv_ctl_ioctl.sh > after.ctl
$ tools/perf/trace/beauty/sndrv_pcm_ioctl.sh > after.pcm
$ diff -u before.ctl after.ctl
--- before.ctl 2023-07-14 10:17:00.319591889 -0300
+++ after.ctl 2023-07-14 10:17:24.668248373 -0300
@@ -22,6 +22,9 @@
[0x40] = "RAWMIDI_NEXT_DEVICE",
[0x41] = "RAWMIDI_INFO",
[0x42] = "RAWMIDI_PREFER_SUBDEVICE",
+ [0x43] = "UMP_NEXT_DEVICE",
+ [0x44] = "UMP_ENDPOINT_INFO",
+ [0x45] = "UMP_BLOCK_INFO",
[0xd0] = "POWER",
[0xd1] = "POWER_STATE",
};
$ diff -u before.pcm after.pcm
$
Now those will be decoded when they appear, see a system wide 'perf
trace' session example here:
# perf trace -e ioctl --max-events=10
0.000 ( 0.010 ms): gnome-shell/2240 ioctl(fd: 9, cmd: DRM_MODE_RMFB, arg: 0x7ffc0041d54c) = 0
2.444 ( 0.005 ms): wireplumber/2304 ioctl(fd: 47, cmd: TIOCOUTQ, arg: 0x7f16e9afea24) = 0
2.452 ( 0.002 ms): wireplumber/2304 ioctl(fd: 47, cmd: TIOCOUTQ, arg: 0x7f16e9afea24) = 0
11.348 ( 0.010 ms): gnome-shell/2240 ioctl(fd: 14, cmd: DRM_I915_IRQ_WAIT, arg: 0x7ffc0041ccf0) = 0
11.406 ( 0.037 ms): gnome-shel:cs0/2259 ioctl(fd: 14, cmd: DRM_I915_IRQ_EMIT, arg: 0x7f3cf69fdc60) = 0
11.476 ( 0.009 ms): gnome-shell/2240 ioctl(fd: 9, cmd: DRM_MODE_ADDFB2, arg: 0x7ffc0041ce50) = 0
11.497 ( 0.019 ms): gnome-shell/2240 ioctl(fd: 9, cmd: DRM_MODE_ATOMIC, arg: 0x7ffc0041cdf0) = 0
12.481 ( 0.020 ms): firefox:cs0/3651 ioctl(fd: 40, cmd: DRM_I915_IRQ_EMIT, arg: 0x7f1c365fea60) = 0
12.529 ( 0.009 ms): firefox:cs0/3651 ioctl(fd: 40, cmd: DRM_I915_IRQ_EMIT, arg: 0x7f1c365feab0) = 0
12.624 ( 0.018 ms): firefox:cs0/3651 ioctl(fd: 40, cmd: DRM_I915_IRQ_EMIT, arg: 0x7f1c365fea30) = 0
#
Silencing these perf build warnings:
Warning: Kernel ABI header differences:
diff -u tools/include/uapi/sound/asound.h include/uapi/sound/asound.h
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Takashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/lkml/ZLFOrTE2+xZBgHGe@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2023-07-14 10:18:42 -03:00
# define SNDRV_RAWMIDI_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 4)
2017-07-31 16:45:32 -03:00
enum {
SNDRV_RAWMIDI_STREAM_OUTPUT = 0 ,
SNDRV_RAWMIDI_STREAM_INPUT ,
SNDRV_RAWMIDI_STREAM_LAST = SNDRV_RAWMIDI_STREAM_INPUT ,
} ;
# define SNDRV_RAWMIDI_INFO_OUTPUT 0x00000001
# define SNDRV_RAWMIDI_INFO_INPUT 0x00000002
# define SNDRV_RAWMIDI_INFO_DUPLEX 0x00000004
tools include UAPI: Sync the sound/asound.h copy with the kernel sources
Picking the changes from:
01dfa8e969dbbc72 ("ALSA: ump: Add info flag bit for static blocks")
e375b8a045873cf5 ("ALSA: ump: Add more attributes to UMP EP and FB info")
30fc139260d46e9b ("ALSA: ump: Add ioctls to inquiry UMP EP and Block info via control API")
127ae6f6dad2edb2 ("ALSA: rawmidi: Skip UMP devices at SNDRV_CTL_IOCTL_RAWMIDI_NEXT_DEVICE")
e3a8a5b726bdd903 ("ALSA: rawmidi: UMP support")
a4bb75c4f19db711 ("ALSA: uapi: pcm: control the filling of the silence samples for drain")
That harvests some new ioctls:
$ tools/perf/trace/beauty/sndrv_ctl_ioctl.sh > before.ctl
$ tools/perf/trace/beauty/sndrv_pcm_ioctl.sh > before.pcm
$ cp include/uapi/sound/asound.h tools/include/uapi/sound/asound.h
$ tools/perf/trace/beauty/sndrv_ctl_ioctl.sh > after.ctl
$ tools/perf/trace/beauty/sndrv_pcm_ioctl.sh > after.pcm
$ diff -u before.ctl after.ctl
--- before.ctl 2023-07-14 10:17:00.319591889 -0300
+++ after.ctl 2023-07-14 10:17:24.668248373 -0300
@@ -22,6 +22,9 @@
[0x40] = "RAWMIDI_NEXT_DEVICE",
[0x41] = "RAWMIDI_INFO",
[0x42] = "RAWMIDI_PREFER_SUBDEVICE",
+ [0x43] = "UMP_NEXT_DEVICE",
+ [0x44] = "UMP_ENDPOINT_INFO",
+ [0x45] = "UMP_BLOCK_INFO",
[0xd0] = "POWER",
[0xd1] = "POWER_STATE",
};
$ diff -u before.pcm after.pcm
$
Now those will be decoded when they appear, see a system wide 'perf
trace' session example here:
# perf trace -e ioctl --max-events=10
0.000 ( 0.010 ms): gnome-shell/2240 ioctl(fd: 9, cmd: DRM_MODE_RMFB, arg: 0x7ffc0041d54c) = 0
2.444 ( 0.005 ms): wireplumber/2304 ioctl(fd: 47, cmd: TIOCOUTQ, arg: 0x7f16e9afea24) = 0
2.452 ( 0.002 ms): wireplumber/2304 ioctl(fd: 47, cmd: TIOCOUTQ, arg: 0x7f16e9afea24) = 0
11.348 ( 0.010 ms): gnome-shell/2240 ioctl(fd: 14, cmd: DRM_I915_IRQ_WAIT, arg: 0x7ffc0041ccf0) = 0
11.406 ( 0.037 ms): gnome-shel:cs0/2259 ioctl(fd: 14, cmd: DRM_I915_IRQ_EMIT, arg: 0x7f3cf69fdc60) = 0
11.476 ( 0.009 ms): gnome-shell/2240 ioctl(fd: 9, cmd: DRM_MODE_ADDFB2, arg: 0x7ffc0041ce50) = 0
11.497 ( 0.019 ms): gnome-shell/2240 ioctl(fd: 9, cmd: DRM_MODE_ATOMIC, arg: 0x7ffc0041cdf0) = 0
12.481 ( 0.020 ms): firefox:cs0/3651 ioctl(fd: 40, cmd: DRM_I915_IRQ_EMIT, arg: 0x7f1c365fea60) = 0
12.529 ( 0.009 ms): firefox:cs0/3651 ioctl(fd: 40, cmd: DRM_I915_IRQ_EMIT, arg: 0x7f1c365feab0) = 0
12.624 ( 0.018 ms): firefox:cs0/3651 ioctl(fd: 40, cmd: DRM_I915_IRQ_EMIT, arg: 0x7f1c365fea30) = 0
#
Silencing these perf build warnings:
Warning: Kernel ABI header differences:
diff -u tools/include/uapi/sound/asound.h include/uapi/sound/asound.h
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Takashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/lkml/ZLFOrTE2+xZBgHGe@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2023-07-14 10:18:42 -03:00
# define SNDRV_RAWMIDI_INFO_UMP 0x00000008
2017-07-31 16:45:32 -03:00
struct snd_rawmidi_info {
unsigned int device ; /* RO/WR (control): device number */
unsigned int subdevice ; /* RO/WR (control): subdevice number */
int stream ; /* WR: stream */
int card ; /* R: card number */
unsigned int flags ; /* SNDRV_RAWMIDI_INFO_XXXX */
unsigned char id [ 64 ] ; /* ID (user selectable) */
unsigned char name [ 80 ] ; /* name of device */
unsigned char subname [ 32 ] ; /* name of active or selected subdevice */
unsigned int subdevices_count ;
unsigned int subdevices_avail ;
unsigned char reserved [ 64 ] ; /* reserved for future use */
} ;
2020-02-12 11:04:23 -03:00
# define SNDRV_RAWMIDI_MODE_FRAMING_MASK (7<<0)
# define SNDRV_RAWMIDI_MODE_FRAMING_SHIFT 0
# define SNDRV_RAWMIDI_MODE_FRAMING_NONE (0<<0)
# define SNDRV_RAWMIDI_MODE_FRAMING_TSTAMP (1<<0)
# define SNDRV_RAWMIDI_MODE_CLOCK_MASK (7<<3)
# define SNDRV_RAWMIDI_MODE_CLOCK_SHIFT 3
# define SNDRV_RAWMIDI_MODE_CLOCK_NONE (0<<3)
# define SNDRV_RAWMIDI_MODE_CLOCK_REALTIME (1<<3)
# define SNDRV_RAWMIDI_MODE_CLOCK_MONOTONIC (2<<3)
# define SNDRV_RAWMIDI_MODE_CLOCK_MONOTONIC_RAW (3<<3)
# define SNDRV_RAWMIDI_FRAMING_DATA_LENGTH 16
struct snd_rawmidi_framing_tstamp {
/* For now, frame_type is always 0. Midi 2.0 is expected to add new
* types here . Applications are expected to skip unknown frame types .
*/
__u8 frame_type ;
__u8 length ; /* number of valid bytes in data field */
__u8 reserved [ 2 ] ;
__u32 tv_nsec ; /* nanoseconds */
__u64 tv_sec ; /* seconds */
__u8 data [ SNDRV_RAWMIDI_FRAMING_DATA_LENGTH ] ;
} __packed ;
2017-07-31 16:45:32 -03:00
struct snd_rawmidi_params {
int stream ;
size_t buffer_size ; /* queue size in bytes */
size_t avail_min ; /* minimum avail bytes for wakeup */
unsigned int no_active_sensing : 1 ; /* do not send active sensing byte in close() */
2020-02-12 11:04:23 -03:00
unsigned int mode ; /* For input data only, frame incoming data */
unsigned char reserved [ 12 ] ; /* reserved for future use */
2017-07-31 16:45:32 -03:00
} ;
2020-02-12 11:04:23 -03:00
# ifndef __KERNEL__
2017-07-31 16:45:32 -03:00
struct snd_rawmidi_status {
int stream ;
2020-02-12 11:04:23 -03:00
__time_pad pad1 ;
2017-07-31 16:45:32 -03:00
struct timespec tstamp ; /* Timestamp */
size_t avail ; /* available bytes */
size_t xruns ; /* count of overruns since last status (in bytes) */
unsigned char reserved [ 16 ] ; /* reserved for future use */
} ;
2020-02-12 11:04:23 -03:00
# endif
2017-07-31 16:45:32 -03:00
tools include UAPI: Sync the sound/asound.h copy with the kernel sources
Picking the changes from:
01dfa8e969dbbc72 ("ALSA: ump: Add info flag bit for static blocks")
e375b8a045873cf5 ("ALSA: ump: Add more attributes to UMP EP and FB info")
30fc139260d46e9b ("ALSA: ump: Add ioctls to inquiry UMP EP and Block info via control API")
127ae6f6dad2edb2 ("ALSA: rawmidi: Skip UMP devices at SNDRV_CTL_IOCTL_RAWMIDI_NEXT_DEVICE")
e3a8a5b726bdd903 ("ALSA: rawmidi: UMP support")
a4bb75c4f19db711 ("ALSA: uapi: pcm: control the filling of the silence samples for drain")
That harvests some new ioctls:
$ tools/perf/trace/beauty/sndrv_ctl_ioctl.sh > before.ctl
$ tools/perf/trace/beauty/sndrv_pcm_ioctl.sh > before.pcm
$ cp include/uapi/sound/asound.h tools/include/uapi/sound/asound.h
$ tools/perf/trace/beauty/sndrv_ctl_ioctl.sh > after.ctl
$ tools/perf/trace/beauty/sndrv_pcm_ioctl.sh > after.pcm
$ diff -u before.ctl after.ctl
--- before.ctl 2023-07-14 10:17:00.319591889 -0300
+++ after.ctl 2023-07-14 10:17:24.668248373 -0300
@@ -22,6 +22,9 @@
[0x40] = "RAWMIDI_NEXT_DEVICE",
[0x41] = "RAWMIDI_INFO",
[0x42] = "RAWMIDI_PREFER_SUBDEVICE",
+ [0x43] = "UMP_NEXT_DEVICE",
+ [0x44] = "UMP_ENDPOINT_INFO",
+ [0x45] = "UMP_BLOCK_INFO",
[0xd0] = "POWER",
[0xd1] = "POWER_STATE",
};
$ diff -u before.pcm after.pcm
$
Now those will be decoded when they appear, see a system wide 'perf
trace' session example here:
# perf trace -e ioctl --max-events=10
0.000 ( 0.010 ms): gnome-shell/2240 ioctl(fd: 9, cmd: DRM_MODE_RMFB, arg: 0x7ffc0041d54c) = 0
2.444 ( 0.005 ms): wireplumber/2304 ioctl(fd: 47, cmd: TIOCOUTQ, arg: 0x7f16e9afea24) = 0
2.452 ( 0.002 ms): wireplumber/2304 ioctl(fd: 47, cmd: TIOCOUTQ, arg: 0x7f16e9afea24) = 0
11.348 ( 0.010 ms): gnome-shell/2240 ioctl(fd: 14, cmd: DRM_I915_IRQ_WAIT, arg: 0x7ffc0041ccf0) = 0
11.406 ( 0.037 ms): gnome-shel:cs0/2259 ioctl(fd: 14, cmd: DRM_I915_IRQ_EMIT, arg: 0x7f3cf69fdc60) = 0
11.476 ( 0.009 ms): gnome-shell/2240 ioctl(fd: 9, cmd: DRM_MODE_ADDFB2, arg: 0x7ffc0041ce50) = 0
11.497 ( 0.019 ms): gnome-shell/2240 ioctl(fd: 9, cmd: DRM_MODE_ATOMIC, arg: 0x7ffc0041cdf0) = 0
12.481 ( 0.020 ms): firefox:cs0/3651 ioctl(fd: 40, cmd: DRM_I915_IRQ_EMIT, arg: 0x7f1c365fea60) = 0
12.529 ( 0.009 ms): firefox:cs0/3651 ioctl(fd: 40, cmd: DRM_I915_IRQ_EMIT, arg: 0x7f1c365feab0) = 0
12.624 ( 0.018 ms): firefox:cs0/3651 ioctl(fd: 40, cmd: DRM_I915_IRQ_EMIT, arg: 0x7f1c365fea30) = 0
#
Silencing these perf build warnings:
Warning: Kernel ABI header differences:
diff -u tools/include/uapi/sound/asound.h include/uapi/sound/asound.h
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Takashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/lkml/ZLFOrTE2+xZBgHGe@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2023-07-14 10:18:42 -03:00
/* UMP EP info flags */
# define SNDRV_UMP_EP_INFO_STATIC_BLOCKS 0x01
/* UMP EP Protocol / JRTS capability bits */
# define SNDRV_UMP_EP_INFO_PROTO_MIDI_MASK 0x0300
# define SNDRV_UMP_EP_INFO_PROTO_MIDI1 0x0100 /* MIDI 1.0 */
# define SNDRV_UMP_EP_INFO_PROTO_MIDI2 0x0200 /* MIDI 2.0 */
# define SNDRV_UMP_EP_INFO_PROTO_JRTS_MASK 0x0003
# define SNDRV_UMP_EP_INFO_PROTO_JRTS_TX 0x0001 /* JRTS Transmit */
# define SNDRV_UMP_EP_INFO_PROTO_JRTS_RX 0x0002 /* JRTS Receive */
/* UMP Endpoint information */
struct snd_ump_endpoint_info {
int card ; /* card number */
int device ; /* device number */
unsigned int flags ; /* additional info */
unsigned int protocol_caps ; /* protocol capabilities */
unsigned int protocol ; /* current protocol */
unsigned int num_blocks ; /* # of function blocks */
unsigned short version ; /* UMP major/minor version */
unsigned short family_id ; /* MIDI device family ID */
unsigned short model_id ; /* MIDI family model ID */
unsigned int manufacturer_id ; /* MIDI manufacturer ID */
unsigned char sw_revision [ 4 ] ; /* software revision */
unsigned short padding ;
unsigned char name [ 128 ] ; /* endpoint name string */
unsigned char product_id [ 128 ] ; /* unique product id string */
unsigned char reserved [ 32 ] ;
} __packed ;
/* UMP direction */
# define SNDRV_UMP_DIR_INPUT 0x01
# define SNDRV_UMP_DIR_OUTPUT 0x02
# define SNDRV_UMP_DIR_BIDIRECTION 0x03
/* UMP block info flags */
# define SNDRV_UMP_BLOCK_IS_MIDI1 (1U << 0) /* MIDI 1.0 port w/o restrict */
# define SNDRV_UMP_BLOCK_IS_LOWSPEED (1U << 1) /* 31.25Kbps B/W MIDI1 port */
/* UMP block user-interface hint */
# define SNDRV_UMP_BLOCK_UI_HINT_UNKNOWN 0x00
# define SNDRV_UMP_BLOCK_UI_HINT_RECEIVER 0x01
# define SNDRV_UMP_BLOCK_UI_HINT_SENDER 0x02
# define SNDRV_UMP_BLOCK_UI_HINT_BOTH 0x03
/* UMP groups and blocks */
# define SNDRV_UMP_MAX_GROUPS 16
# define SNDRV_UMP_MAX_BLOCKS 32
/* UMP Block information */
struct snd_ump_block_info {
int card ; /* card number */
int device ; /* device number */
unsigned char block_id ; /* block ID (R/W) */
unsigned char direction ; /* UMP direction */
unsigned char active ; /* Activeness */
unsigned char first_group ; /* first group ID */
unsigned char num_groups ; /* number of groups */
unsigned char midi_ci_version ; /* MIDI-CI support version */
unsigned char sysex8_streams ; /* max number of sysex8 streams */
unsigned char ui_hint ; /* user interface hint */
unsigned int flags ; /* various info flags */
unsigned char name [ 128 ] ; /* block name string */
unsigned char reserved [ 32 ] ;
} __packed ;
2017-07-31 16:45:32 -03:00
# define SNDRV_RAWMIDI_IOCTL_PVERSION _IOR('W', 0x00, int)
# define SNDRV_RAWMIDI_IOCTL_INFO _IOR('W', 0x01, struct snd_rawmidi_info)
2020-02-12 11:04:23 -03:00
# define SNDRV_RAWMIDI_IOCTL_USER_PVERSION _IOW('W', 0x02, int)
2017-07-31 16:45:32 -03:00
# define SNDRV_RAWMIDI_IOCTL_PARAMS _IOWR('W', 0x10, struct snd_rawmidi_params)
# define SNDRV_RAWMIDI_IOCTL_STATUS _IOWR('W', 0x20, struct snd_rawmidi_status)
# define SNDRV_RAWMIDI_IOCTL_DROP _IOW('W', 0x30, int)
# define SNDRV_RAWMIDI_IOCTL_DRAIN _IOW('W', 0x31, int)
tools include UAPI: Sync the sound/asound.h copy with the kernel sources
Picking the changes from:
01dfa8e969dbbc72 ("ALSA: ump: Add info flag bit for static blocks")
e375b8a045873cf5 ("ALSA: ump: Add more attributes to UMP EP and FB info")
30fc139260d46e9b ("ALSA: ump: Add ioctls to inquiry UMP EP and Block info via control API")
127ae6f6dad2edb2 ("ALSA: rawmidi: Skip UMP devices at SNDRV_CTL_IOCTL_RAWMIDI_NEXT_DEVICE")
e3a8a5b726bdd903 ("ALSA: rawmidi: UMP support")
a4bb75c4f19db711 ("ALSA: uapi: pcm: control the filling of the silence samples for drain")
That harvests some new ioctls:
$ tools/perf/trace/beauty/sndrv_ctl_ioctl.sh > before.ctl
$ tools/perf/trace/beauty/sndrv_pcm_ioctl.sh > before.pcm
$ cp include/uapi/sound/asound.h tools/include/uapi/sound/asound.h
$ tools/perf/trace/beauty/sndrv_ctl_ioctl.sh > after.ctl
$ tools/perf/trace/beauty/sndrv_pcm_ioctl.sh > after.pcm
$ diff -u before.ctl after.ctl
--- before.ctl 2023-07-14 10:17:00.319591889 -0300
+++ after.ctl 2023-07-14 10:17:24.668248373 -0300
@@ -22,6 +22,9 @@
[0x40] = "RAWMIDI_NEXT_DEVICE",
[0x41] = "RAWMIDI_INFO",
[0x42] = "RAWMIDI_PREFER_SUBDEVICE",
+ [0x43] = "UMP_NEXT_DEVICE",
+ [0x44] = "UMP_ENDPOINT_INFO",
+ [0x45] = "UMP_BLOCK_INFO",
[0xd0] = "POWER",
[0xd1] = "POWER_STATE",
};
$ diff -u before.pcm after.pcm
$
Now those will be decoded when they appear, see a system wide 'perf
trace' session example here:
# perf trace -e ioctl --max-events=10
0.000 ( 0.010 ms): gnome-shell/2240 ioctl(fd: 9, cmd: DRM_MODE_RMFB, arg: 0x7ffc0041d54c) = 0
2.444 ( 0.005 ms): wireplumber/2304 ioctl(fd: 47, cmd: TIOCOUTQ, arg: 0x7f16e9afea24) = 0
2.452 ( 0.002 ms): wireplumber/2304 ioctl(fd: 47, cmd: TIOCOUTQ, arg: 0x7f16e9afea24) = 0
11.348 ( 0.010 ms): gnome-shell/2240 ioctl(fd: 14, cmd: DRM_I915_IRQ_WAIT, arg: 0x7ffc0041ccf0) = 0
11.406 ( 0.037 ms): gnome-shel:cs0/2259 ioctl(fd: 14, cmd: DRM_I915_IRQ_EMIT, arg: 0x7f3cf69fdc60) = 0
11.476 ( 0.009 ms): gnome-shell/2240 ioctl(fd: 9, cmd: DRM_MODE_ADDFB2, arg: 0x7ffc0041ce50) = 0
11.497 ( 0.019 ms): gnome-shell/2240 ioctl(fd: 9, cmd: DRM_MODE_ATOMIC, arg: 0x7ffc0041cdf0) = 0
12.481 ( 0.020 ms): firefox:cs0/3651 ioctl(fd: 40, cmd: DRM_I915_IRQ_EMIT, arg: 0x7f1c365fea60) = 0
12.529 ( 0.009 ms): firefox:cs0/3651 ioctl(fd: 40, cmd: DRM_I915_IRQ_EMIT, arg: 0x7f1c365feab0) = 0
12.624 ( 0.018 ms): firefox:cs0/3651 ioctl(fd: 40, cmd: DRM_I915_IRQ_EMIT, arg: 0x7f1c365fea30) = 0
#
Silencing these perf build warnings:
Warning: Kernel ABI header differences:
diff -u tools/include/uapi/sound/asound.h include/uapi/sound/asound.h
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Takashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/lkml/ZLFOrTE2+xZBgHGe@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2023-07-14 10:18:42 -03:00
/* Additional ioctls for UMP rawmidi devices */
# define SNDRV_UMP_IOCTL_ENDPOINT_INFO _IOR('W', 0x40, struct snd_ump_endpoint_info)
# define SNDRV_UMP_IOCTL_BLOCK_INFO _IOR('W', 0x41, struct snd_ump_block_info)
2017-07-31 16:45:32 -03:00
/*
* Timer section - / dev / snd / timer
*/
2020-02-12 11:04:23 -03:00
# define SNDRV_TIMER_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 7)
2017-07-31 16:45:32 -03:00
enum {
SNDRV_TIMER_CLASS_NONE = - 1 ,
SNDRV_TIMER_CLASS_SLAVE = 0 ,
SNDRV_TIMER_CLASS_GLOBAL ,
SNDRV_TIMER_CLASS_CARD ,
SNDRV_TIMER_CLASS_PCM ,
SNDRV_TIMER_CLASS_LAST = SNDRV_TIMER_CLASS_PCM ,
} ;
/* slave timer classes */
enum {
SNDRV_TIMER_SCLASS_NONE = 0 ,
SNDRV_TIMER_SCLASS_APPLICATION ,
SNDRV_TIMER_SCLASS_SEQUENCER , /* alias */
SNDRV_TIMER_SCLASS_OSS_SEQUENCER , /* alias */
SNDRV_TIMER_SCLASS_LAST = SNDRV_TIMER_SCLASS_OSS_SEQUENCER ,
} ;
/* global timers (device member) */
# define SNDRV_TIMER_GLOBAL_SYSTEM 0
# define SNDRV_TIMER_GLOBAL_RTC 1 /* unused */
# define SNDRV_TIMER_GLOBAL_HPET 2
# define SNDRV_TIMER_GLOBAL_HRTIMER 3
/* info flags */
# define SNDRV_TIMER_FLG_SLAVE (1<<0) /* cannot be controlled */
struct snd_timer_id {
int dev_class ;
int dev_sclass ;
int card ;
int device ;
int subdevice ;
} ;
struct snd_timer_ginfo {
struct snd_timer_id tid ; /* requested timer ID */
unsigned int flags ; /* timer flags - SNDRV_TIMER_FLG_* */
int card ; /* card number */
unsigned char id [ 64 ] ; /* timer identification */
unsigned char name [ 80 ] ; /* timer name */
unsigned long reserved0 ; /* reserved for future use */
unsigned long resolution ; /* average period resolution in ns */
unsigned long resolution_min ; /* minimal period resolution in ns */
unsigned long resolution_max ; /* maximal period resolution in ns */
unsigned int clients ; /* active timer clients */
unsigned char reserved [ 32 ] ;
} ;
struct snd_timer_gparams {
struct snd_timer_id tid ; /* requested timer ID */
unsigned long period_num ; /* requested precise period duration (in seconds) - numerator */
unsigned long period_den ; /* requested precise period duration (in seconds) - denominator */
unsigned char reserved [ 32 ] ;
} ;
struct snd_timer_gstatus {
struct snd_timer_id tid ; /* requested timer ID */
unsigned long resolution ; /* current period resolution in ns */
unsigned long resolution_num ; /* precise current period resolution (in seconds) - numerator */
unsigned long resolution_den ; /* precise current period resolution (in seconds) - denominator */
unsigned char reserved [ 32 ] ;
} ;
struct snd_timer_select {
struct snd_timer_id id ; /* bind to timer ID */
unsigned char reserved [ 32 ] ; /* reserved */
} ;
struct snd_timer_info {
unsigned int flags ; /* timer flags - SNDRV_TIMER_FLG_* */
int card ; /* card number */
unsigned char id [ 64 ] ; /* timer identificator */
unsigned char name [ 80 ] ; /* timer name */
unsigned long reserved0 ; /* reserved for future use */
unsigned long resolution ; /* average period resolution in ns */
unsigned char reserved [ 64 ] ; /* reserved */
} ;
# define SNDRV_TIMER_PSFLG_AUTO (1<<0) /* auto start, otherwise one-shot */
# define SNDRV_TIMER_PSFLG_EXCLUSIVE (1<<1) /* exclusive use, precise start/stop/pause/continue */
# define SNDRV_TIMER_PSFLG_EARLY_EVENT (1<<2) /* write early event to the poll queue */
struct snd_timer_params {
2018-10-30 14:20:07 -03:00
unsigned int flags ; /* flags - SNDRV_TIMER_PSFLG_* */
2017-07-31 16:45:32 -03:00
unsigned int ticks ; /* requested resolution in ticks */
unsigned int queue_size ; /* total size of queue (32-1024) */
unsigned int reserved0 ; /* reserved, was: failure locations */
unsigned int filter ; /* event filter (bitmask of SNDRV_TIMER_EVENT_*) */
unsigned char reserved [ 60 ] ; /* reserved */
} ;
2020-02-12 11:04:23 -03:00
# ifndef __KERNEL__
2017-07-31 16:45:32 -03:00
struct snd_timer_status {
struct timespec tstamp ; /* Timestamp - last update */
unsigned int resolution ; /* current period resolution in ns */
unsigned int lost ; /* counter of master tick lost */
unsigned int overrun ; /* count of read queue overruns */
unsigned int queue ; /* used queue size */
unsigned char reserved [ 64 ] ; /* reserved */
} ;
2020-02-12 11:04:23 -03:00
# endif
2017-07-31 16:45:32 -03:00
# define SNDRV_TIMER_IOCTL_PVERSION _IOR('T', 0x00, int)
# define SNDRV_TIMER_IOCTL_NEXT_DEVICE _IOWR('T', 0x01, struct snd_timer_id)
2020-02-12 11:04:23 -03:00
# define SNDRV_TIMER_IOCTL_TREAD_OLD _IOW('T', 0x02, int)
2017-07-31 16:45:32 -03:00
# define SNDRV_TIMER_IOCTL_GINFO _IOWR('T', 0x03, struct snd_timer_ginfo)
# define SNDRV_TIMER_IOCTL_GPARAMS _IOW('T', 0x04, struct snd_timer_gparams)
# define SNDRV_TIMER_IOCTL_GSTATUS _IOWR('T', 0x05, struct snd_timer_gstatus)
# define SNDRV_TIMER_IOCTL_SELECT _IOW('T', 0x10, struct snd_timer_select)
# define SNDRV_TIMER_IOCTL_INFO _IOR('T', 0x11, struct snd_timer_info)
# define SNDRV_TIMER_IOCTL_PARAMS _IOW('T', 0x12, struct snd_timer_params)
# define SNDRV_TIMER_IOCTL_STATUS _IOR('T', 0x14, struct snd_timer_status)
/* The following four ioctls are changed since 1.0.9 due to confliction */
# define SNDRV_TIMER_IOCTL_START _IO('T', 0xa0)
# define SNDRV_TIMER_IOCTL_STOP _IO('T', 0xa1)
# define SNDRV_TIMER_IOCTL_CONTINUE _IO('T', 0xa2)
# define SNDRV_TIMER_IOCTL_PAUSE _IO('T', 0xa3)
2020-02-12 11:04:23 -03:00
# define SNDRV_TIMER_IOCTL_TREAD64 _IOW('T', 0xa4, int)
# if __BITS_PER_LONG == 64
# define SNDRV_TIMER_IOCTL_TREAD SNDRV_TIMER_IOCTL_TREAD_OLD
# else
# define SNDRV_TIMER_IOCTL_TREAD ((sizeof(__kernel_long_t) >= sizeof(time_t)) ? \
SNDRV_TIMER_IOCTL_TREAD_OLD : \
SNDRV_TIMER_IOCTL_TREAD64 )
# endif
2017-07-31 16:45:32 -03:00
struct snd_timer_read {
unsigned int resolution ;
unsigned int ticks ;
} ;
enum {
SNDRV_TIMER_EVENT_RESOLUTION = 0 , /* val = resolution in ns */
SNDRV_TIMER_EVENT_TICK , /* val = ticks */
SNDRV_TIMER_EVENT_START , /* val = resolution in ns */
SNDRV_TIMER_EVENT_STOP , /* val = 0 */
SNDRV_TIMER_EVENT_CONTINUE , /* val = resolution in ns */
SNDRV_TIMER_EVENT_PAUSE , /* val = 0 */
SNDRV_TIMER_EVENT_EARLY , /* val = 0, early event */
SNDRV_TIMER_EVENT_SUSPEND , /* val = 0 */
SNDRV_TIMER_EVENT_RESUME , /* val = resolution in ns */
/* master timer events for slave timer instances */
SNDRV_TIMER_EVENT_MSTART = SNDRV_TIMER_EVENT_START + 10 ,
SNDRV_TIMER_EVENT_MSTOP = SNDRV_TIMER_EVENT_STOP + 10 ,
SNDRV_TIMER_EVENT_MCONTINUE = SNDRV_TIMER_EVENT_CONTINUE + 10 ,
SNDRV_TIMER_EVENT_MPAUSE = SNDRV_TIMER_EVENT_PAUSE + 10 ,
SNDRV_TIMER_EVENT_MSUSPEND = SNDRV_TIMER_EVENT_SUSPEND + 10 ,
SNDRV_TIMER_EVENT_MRESUME = SNDRV_TIMER_EVENT_RESUME + 10 ,
} ;
2020-02-12 11:04:23 -03:00
# ifndef __KERNEL__
2017-07-31 16:45:32 -03:00
struct snd_timer_tread {
int event ;
2020-02-12 11:04:23 -03:00
__time_pad pad1 ;
2017-07-31 16:45:32 -03:00
struct timespec tstamp ;
unsigned int val ;
2020-02-12 11:04:23 -03:00
__time_pad pad2 ;
2017-07-31 16:45:32 -03:00
} ;
2020-02-12 11:04:23 -03:00
# endif
2017-07-31 16:45:32 -03:00
/****************************************************************************
* *
* Section for driver control interface - / dev / snd / control ? *
* *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
tools include UAPI: Sync the sound/asound.h copy with the kernel sources
Picking the changes from:
01dfa8e969dbbc72 ("ALSA: ump: Add info flag bit for static blocks")
e375b8a045873cf5 ("ALSA: ump: Add more attributes to UMP EP and FB info")
30fc139260d46e9b ("ALSA: ump: Add ioctls to inquiry UMP EP and Block info via control API")
127ae6f6dad2edb2 ("ALSA: rawmidi: Skip UMP devices at SNDRV_CTL_IOCTL_RAWMIDI_NEXT_DEVICE")
e3a8a5b726bdd903 ("ALSA: rawmidi: UMP support")
a4bb75c4f19db711 ("ALSA: uapi: pcm: control the filling of the silence samples for drain")
That harvests some new ioctls:
$ tools/perf/trace/beauty/sndrv_ctl_ioctl.sh > before.ctl
$ tools/perf/trace/beauty/sndrv_pcm_ioctl.sh > before.pcm
$ cp include/uapi/sound/asound.h tools/include/uapi/sound/asound.h
$ tools/perf/trace/beauty/sndrv_ctl_ioctl.sh > after.ctl
$ tools/perf/trace/beauty/sndrv_pcm_ioctl.sh > after.pcm
$ diff -u before.ctl after.ctl
--- before.ctl 2023-07-14 10:17:00.319591889 -0300
+++ after.ctl 2023-07-14 10:17:24.668248373 -0300
@@ -22,6 +22,9 @@
[0x40] = "RAWMIDI_NEXT_DEVICE",
[0x41] = "RAWMIDI_INFO",
[0x42] = "RAWMIDI_PREFER_SUBDEVICE",
+ [0x43] = "UMP_NEXT_DEVICE",
+ [0x44] = "UMP_ENDPOINT_INFO",
+ [0x45] = "UMP_BLOCK_INFO",
[0xd0] = "POWER",
[0xd1] = "POWER_STATE",
};
$ diff -u before.pcm after.pcm
$
Now those will be decoded when they appear, see a system wide 'perf
trace' session example here:
# perf trace -e ioctl --max-events=10
0.000 ( 0.010 ms): gnome-shell/2240 ioctl(fd: 9, cmd: DRM_MODE_RMFB, arg: 0x7ffc0041d54c) = 0
2.444 ( 0.005 ms): wireplumber/2304 ioctl(fd: 47, cmd: TIOCOUTQ, arg: 0x7f16e9afea24) = 0
2.452 ( 0.002 ms): wireplumber/2304 ioctl(fd: 47, cmd: TIOCOUTQ, arg: 0x7f16e9afea24) = 0
11.348 ( 0.010 ms): gnome-shell/2240 ioctl(fd: 14, cmd: DRM_I915_IRQ_WAIT, arg: 0x7ffc0041ccf0) = 0
11.406 ( 0.037 ms): gnome-shel:cs0/2259 ioctl(fd: 14, cmd: DRM_I915_IRQ_EMIT, arg: 0x7f3cf69fdc60) = 0
11.476 ( 0.009 ms): gnome-shell/2240 ioctl(fd: 9, cmd: DRM_MODE_ADDFB2, arg: 0x7ffc0041ce50) = 0
11.497 ( 0.019 ms): gnome-shell/2240 ioctl(fd: 9, cmd: DRM_MODE_ATOMIC, arg: 0x7ffc0041cdf0) = 0
12.481 ( 0.020 ms): firefox:cs0/3651 ioctl(fd: 40, cmd: DRM_I915_IRQ_EMIT, arg: 0x7f1c365fea60) = 0
12.529 ( 0.009 ms): firefox:cs0/3651 ioctl(fd: 40, cmd: DRM_I915_IRQ_EMIT, arg: 0x7f1c365feab0) = 0
12.624 ( 0.018 ms): firefox:cs0/3651 ioctl(fd: 40, cmd: DRM_I915_IRQ_EMIT, arg: 0x7f1c365fea30) = 0
#
Silencing these perf build warnings:
Warning: Kernel ABI header differences:
diff -u tools/include/uapi/sound/asound.h include/uapi/sound/asound.h
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Takashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/lkml/ZLFOrTE2+xZBgHGe@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2023-07-14 10:18:42 -03:00
# define SNDRV_CTL_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 9)
2017-07-31 16:45:32 -03:00
struct snd_ctl_card_info {
int card ; /* card number */
int pad ; /* reserved for future (was type) */
unsigned char id [ 16 ] ; /* ID of card (user selectable) */
unsigned char driver [ 16 ] ; /* Driver name */
unsigned char name [ 32 ] ; /* Short name of soundcard */
unsigned char longname [ 80 ] ; /* name + info text about soundcard */
unsigned char reserved_ [ 16 ] ; /* reserved for future (was ID of mixer) */
unsigned char mixername [ 80 ] ; /* visual mixer identification */
unsigned char components [ 128 ] ; /* card components / fine identification, delimited with one space (AC97 etc..) */
} ;
typedef int __bitwise snd_ctl_elem_type_t ;
# define SNDRV_CTL_ELEM_TYPE_NONE ((__force snd_ctl_elem_type_t) 0) /* invalid */
# define SNDRV_CTL_ELEM_TYPE_BOOLEAN ((__force snd_ctl_elem_type_t) 1) /* boolean type */
# define SNDRV_CTL_ELEM_TYPE_INTEGER ((__force snd_ctl_elem_type_t) 2) /* integer type */
# define SNDRV_CTL_ELEM_TYPE_ENUMERATED ((__force snd_ctl_elem_type_t) 3) /* enumerated type */
# define SNDRV_CTL_ELEM_TYPE_BYTES ((__force snd_ctl_elem_type_t) 4) /* byte array */
# define SNDRV_CTL_ELEM_TYPE_IEC958 ((__force snd_ctl_elem_type_t) 5) /* IEC958 (S/PDIF) setup */
# define SNDRV_CTL_ELEM_TYPE_INTEGER64 ((__force snd_ctl_elem_type_t) 6) /* 64-bit integer type */
# define SNDRV_CTL_ELEM_TYPE_LAST SNDRV_CTL_ELEM_TYPE_INTEGER64
typedef int __bitwise snd_ctl_elem_iface_t ;
# define SNDRV_CTL_ELEM_IFACE_CARD ((__force snd_ctl_elem_iface_t) 0) /* global control */
# define SNDRV_CTL_ELEM_IFACE_HWDEP ((__force snd_ctl_elem_iface_t) 1) /* hardware dependent device */
# define SNDRV_CTL_ELEM_IFACE_MIXER ((__force snd_ctl_elem_iface_t) 2) /* virtual mixer device */
# define SNDRV_CTL_ELEM_IFACE_PCM ((__force snd_ctl_elem_iface_t) 3) /* PCM device */
# define SNDRV_CTL_ELEM_IFACE_RAWMIDI ((__force snd_ctl_elem_iface_t) 4) /* RawMidi device */
# define SNDRV_CTL_ELEM_IFACE_TIMER ((__force snd_ctl_elem_iface_t) 5) /* timer device */
# define SNDRV_CTL_ELEM_IFACE_SEQUENCER ((__force snd_ctl_elem_iface_t) 6) /* sequencer client */
# define SNDRV_CTL_ELEM_IFACE_LAST SNDRV_CTL_ELEM_IFACE_SEQUENCER
# define SNDRV_CTL_ELEM_ACCESS_READ (1<<0)
# define SNDRV_CTL_ELEM_ACCESS_WRITE (1<<1)
# define SNDRV_CTL_ELEM_ACCESS_READWRITE (SNDRV_CTL_ELEM_ACCESS_READ|SNDRV_CTL_ELEM_ACCESS_WRITE)
# define SNDRV_CTL_ELEM_ACCESS_VOLATILE (1<<2) /* control value may be changed without a notification */
2021-11-13 11:04:55 -03:00
/* (1 << 3) is unused. */
2017-07-31 16:45:32 -03:00
# define SNDRV_CTL_ELEM_ACCESS_TLV_READ (1<<4) /* TLV read is possible */
# define SNDRV_CTL_ELEM_ACCESS_TLV_WRITE (1<<5) /* TLV write is possible */
# define SNDRV_CTL_ELEM_ACCESS_TLV_READWRITE (SNDRV_CTL_ELEM_ACCESS_TLV_READ|SNDRV_CTL_ELEM_ACCESS_TLV_WRITE)
# define SNDRV_CTL_ELEM_ACCESS_TLV_COMMAND (1<<6) /* TLV command is possible */
# define SNDRV_CTL_ELEM_ACCESS_INACTIVE (1<<8) /* control does actually nothing, but may be updated */
# define SNDRV_CTL_ELEM_ACCESS_LOCK (1<<9) /* write lock */
# define SNDRV_CTL_ELEM_ACCESS_OWNER (1<<10) /* write lock owner */
# define SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK (1<<28) /* kernel use a TLV callback */
# define SNDRV_CTL_ELEM_ACCESS_USER (1<<29) /* user space element */
/* bits 30 and 31 are obsoleted (for indirect access) */
/* for further details see the ACPI and PCI power management specification */
# define SNDRV_CTL_POWER_D0 0x0000 /* full On */
# define SNDRV_CTL_POWER_D1 0x0100 /* partial On */
# define SNDRV_CTL_POWER_D2 0x0200 /* partial On */
# define SNDRV_CTL_POWER_D3 0x0300 /* Off */
# define SNDRV_CTL_POWER_D3hot (SNDRV_CTL_POWER_D3|0x0000) /* Off, with power */
# define SNDRV_CTL_POWER_D3cold (SNDRV_CTL_POWER_D3|0x0001) /* Off, without power */
# define SNDRV_CTL_ELEM_ID_NAME_MAXLEN 44
struct snd_ctl_elem_id {
unsigned int numid ; /* numeric identifier, zero = invalid */
snd_ctl_elem_iface_t iface ; /* interface identifier */
unsigned int device ; /* device/client number */
unsigned int subdevice ; /* subdevice (substream) number */
unsigned char name [ SNDRV_CTL_ELEM_ID_NAME_MAXLEN ] ; /* ASCII name of item */
unsigned int index ; /* index of item */
} ;
struct snd_ctl_elem_list {
unsigned int offset ; /* W: first element ID to get */
unsigned int space ; /* W: count of element IDs to get */
unsigned int used ; /* R: count of element IDs set */
unsigned int count ; /* R: count of all elements */
struct snd_ctl_elem_id __user * pids ; /* R: IDs */
unsigned char reserved [ 50 ] ;
} ;
struct snd_ctl_elem_info {
struct snd_ctl_elem_id id ; /* W: element ID */
snd_ctl_elem_type_t type ; /* R: value type - SNDRV_CTL_ELEM_TYPE_* */
unsigned int access ; /* R: value access (bitmask) - SNDRV_CTL_ELEM_ACCESS_* */
unsigned int count ; /* count of values */
__kernel_pid_t owner ; /* owner's PID of this control */
union {
struct {
long min ; /* R: minimum value */
long max ; /* R: maximum value */
long step ; /* R: step (0 variable) */
} integer ;
struct {
long long min ; /* R: minimum value */
long long max ; /* R: maximum value */
long long step ; /* R: step (0 variable) */
} integer64 ;
struct {
unsigned int items ; /* R: number of items */
unsigned int item ; /* W: item number */
char name [ 64 ] ; /* R: value name */
__u64 names_ptr ; /* W: names list (ELEM_ADD only) */
unsigned int names_length ;
} enumerated ;
unsigned char reserved [ 128 ] ;
} value ;
2020-02-12 11:04:23 -03:00
unsigned char reserved [ 64 ] ;
2017-07-31 16:45:32 -03:00
} ;
struct snd_ctl_elem_value {
struct snd_ctl_elem_id id ; /* W: element ID */
unsigned int indirect : 1 ; /* W: indirect access - obsoleted */
union {
union {
long value [ 128 ] ;
long * value_ptr ; /* obsoleted */
} integer ;
union {
long long value [ 64 ] ;
long long * value_ptr ; /* obsoleted */
} integer64 ;
union {
unsigned int item [ 128 ] ;
unsigned int * item_ptr ; /* obsoleted */
} enumerated ;
union {
unsigned char data [ 512 ] ;
unsigned char * data_ptr ; /* obsoleted */
} bytes ;
struct snd_aes_iec958 iec958 ;
} value ; /* RO */
2020-02-12 11:04:23 -03:00
unsigned char reserved [ 128 ] ;
2017-07-31 16:45:32 -03:00
} ;
struct snd_ctl_tlv {
unsigned int numid ; /* control element numeric identification */
unsigned int length ; /* in bytes aligned to 4 */
2022-04-06 19:36:51 -05:00
unsigned int tlv [ ] ; /* first TLV */
2017-07-31 16:45:32 -03:00
} ;
# define SNDRV_CTL_IOCTL_PVERSION _IOR('U', 0x00, int)
# define SNDRV_CTL_IOCTL_CARD_INFO _IOR('U', 0x01, struct snd_ctl_card_info)
# define SNDRV_CTL_IOCTL_ELEM_LIST _IOWR('U', 0x10, struct snd_ctl_elem_list)
# define SNDRV_CTL_IOCTL_ELEM_INFO _IOWR('U', 0x11, struct snd_ctl_elem_info)
# define SNDRV_CTL_IOCTL_ELEM_READ _IOWR('U', 0x12, struct snd_ctl_elem_value)
# define SNDRV_CTL_IOCTL_ELEM_WRITE _IOWR('U', 0x13, struct snd_ctl_elem_value)
# define SNDRV_CTL_IOCTL_ELEM_LOCK _IOW('U', 0x14, struct snd_ctl_elem_id)
# define SNDRV_CTL_IOCTL_ELEM_UNLOCK _IOW('U', 0x15, struct snd_ctl_elem_id)
# define SNDRV_CTL_IOCTL_SUBSCRIBE_EVENTS _IOWR('U', 0x16, int)
# define SNDRV_CTL_IOCTL_ELEM_ADD _IOWR('U', 0x17, struct snd_ctl_elem_info)
# define SNDRV_CTL_IOCTL_ELEM_REPLACE _IOWR('U', 0x18, struct snd_ctl_elem_info)
# define SNDRV_CTL_IOCTL_ELEM_REMOVE _IOWR('U', 0x19, struct snd_ctl_elem_id)
# define SNDRV_CTL_IOCTL_TLV_READ _IOWR('U', 0x1a, struct snd_ctl_tlv)
# define SNDRV_CTL_IOCTL_TLV_WRITE _IOWR('U', 0x1b, struct snd_ctl_tlv)
# define SNDRV_CTL_IOCTL_TLV_COMMAND _IOWR('U', 0x1c, struct snd_ctl_tlv)
# define SNDRV_CTL_IOCTL_HWDEP_NEXT_DEVICE _IOWR('U', 0x20, int)
# define SNDRV_CTL_IOCTL_HWDEP_INFO _IOR('U', 0x21, struct snd_hwdep_info)
# define SNDRV_CTL_IOCTL_PCM_NEXT_DEVICE _IOR('U', 0x30, int)
# define SNDRV_CTL_IOCTL_PCM_INFO _IOWR('U', 0x31, struct snd_pcm_info)
# define SNDRV_CTL_IOCTL_PCM_PREFER_SUBDEVICE _IOW('U', 0x32, int)
# define SNDRV_CTL_IOCTL_RAWMIDI_NEXT_DEVICE _IOWR('U', 0x40, int)
# define SNDRV_CTL_IOCTL_RAWMIDI_INFO _IOWR('U', 0x41, struct snd_rawmidi_info)
# define SNDRV_CTL_IOCTL_RAWMIDI_PREFER_SUBDEVICE _IOW('U', 0x42, int)
tools include UAPI: Sync the sound/asound.h copy with the kernel sources
Picking the changes from:
01dfa8e969dbbc72 ("ALSA: ump: Add info flag bit for static blocks")
e375b8a045873cf5 ("ALSA: ump: Add more attributes to UMP EP and FB info")
30fc139260d46e9b ("ALSA: ump: Add ioctls to inquiry UMP EP and Block info via control API")
127ae6f6dad2edb2 ("ALSA: rawmidi: Skip UMP devices at SNDRV_CTL_IOCTL_RAWMIDI_NEXT_DEVICE")
e3a8a5b726bdd903 ("ALSA: rawmidi: UMP support")
a4bb75c4f19db711 ("ALSA: uapi: pcm: control the filling of the silence samples for drain")
That harvests some new ioctls:
$ tools/perf/trace/beauty/sndrv_ctl_ioctl.sh > before.ctl
$ tools/perf/trace/beauty/sndrv_pcm_ioctl.sh > before.pcm
$ cp include/uapi/sound/asound.h tools/include/uapi/sound/asound.h
$ tools/perf/trace/beauty/sndrv_ctl_ioctl.sh > after.ctl
$ tools/perf/trace/beauty/sndrv_pcm_ioctl.sh > after.pcm
$ diff -u before.ctl after.ctl
--- before.ctl 2023-07-14 10:17:00.319591889 -0300
+++ after.ctl 2023-07-14 10:17:24.668248373 -0300
@@ -22,6 +22,9 @@
[0x40] = "RAWMIDI_NEXT_DEVICE",
[0x41] = "RAWMIDI_INFO",
[0x42] = "RAWMIDI_PREFER_SUBDEVICE",
+ [0x43] = "UMP_NEXT_DEVICE",
+ [0x44] = "UMP_ENDPOINT_INFO",
+ [0x45] = "UMP_BLOCK_INFO",
[0xd0] = "POWER",
[0xd1] = "POWER_STATE",
};
$ diff -u before.pcm after.pcm
$
Now those will be decoded when they appear, see a system wide 'perf
trace' session example here:
# perf trace -e ioctl --max-events=10
0.000 ( 0.010 ms): gnome-shell/2240 ioctl(fd: 9, cmd: DRM_MODE_RMFB, arg: 0x7ffc0041d54c) = 0
2.444 ( 0.005 ms): wireplumber/2304 ioctl(fd: 47, cmd: TIOCOUTQ, arg: 0x7f16e9afea24) = 0
2.452 ( 0.002 ms): wireplumber/2304 ioctl(fd: 47, cmd: TIOCOUTQ, arg: 0x7f16e9afea24) = 0
11.348 ( 0.010 ms): gnome-shell/2240 ioctl(fd: 14, cmd: DRM_I915_IRQ_WAIT, arg: 0x7ffc0041ccf0) = 0
11.406 ( 0.037 ms): gnome-shel:cs0/2259 ioctl(fd: 14, cmd: DRM_I915_IRQ_EMIT, arg: 0x7f3cf69fdc60) = 0
11.476 ( 0.009 ms): gnome-shell/2240 ioctl(fd: 9, cmd: DRM_MODE_ADDFB2, arg: 0x7ffc0041ce50) = 0
11.497 ( 0.019 ms): gnome-shell/2240 ioctl(fd: 9, cmd: DRM_MODE_ATOMIC, arg: 0x7ffc0041cdf0) = 0
12.481 ( 0.020 ms): firefox:cs0/3651 ioctl(fd: 40, cmd: DRM_I915_IRQ_EMIT, arg: 0x7f1c365fea60) = 0
12.529 ( 0.009 ms): firefox:cs0/3651 ioctl(fd: 40, cmd: DRM_I915_IRQ_EMIT, arg: 0x7f1c365feab0) = 0
12.624 ( 0.018 ms): firefox:cs0/3651 ioctl(fd: 40, cmd: DRM_I915_IRQ_EMIT, arg: 0x7f1c365fea30) = 0
#
Silencing these perf build warnings:
Warning: Kernel ABI header differences:
diff -u tools/include/uapi/sound/asound.h include/uapi/sound/asound.h
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Takashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/lkml/ZLFOrTE2+xZBgHGe@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2023-07-14 10:18:42 -03:00
# define SNDRV_CTL_IOCTL_UMP_NEXT_DEVICE _IOWR('U', 0x43, int)
# define SNDRV_CTL_IOCTL_UMP_ENDPOINT_INFO _IOWR('U', 0x44, struct snd_ump_endpoint_info)
# define SNDRV_CTL_IOCTL_UMP_BLOCK_INFO _IOWR('U', 0x45, struct snd_ump_block_info)
2017-07-31 16:45:32 -03:00
# define SNDRV_CTL_IOCTL_POWER _IOWR('U', 0xd0, int)
# define SNDRV_CTL_IOCTL_POWER_STATE _IOR('U', 0xd1, int)
/*
* Read interface .
*/
enum sndrv_ctl_event_type {
SNDRV_CTL_EVENT_ELEM = 0 ,
SNDRV_CTL_EVENT_LAST = SNDRV_CTL_EVENT_ELEM ,
} ;
# define SNDRV_CTL_EVENT_MASK_VALUE (1<<0) /* element value was changed */
# define SNDRV_CTL_EVENT_MASK_INFO (1<<1) /* element info was changed */
# define SNDRV_CTL_EVENT_MASK_ADD (1<<2) /* element was added */
# define SNDRV_CTL_EVENT_MASK_TLV (1<<3) /* element TLV tree was changed */
# define SNDRV_CTL_EVENT_MASK_REMOVE (~0U) /* element was removed */
struct snd_ctl_event {
int type ; /* event type - SNDRV_CTL_EVENT_* */
union {
struct {
unsigned int mask ;
struct snd_ctl_elem_id id ;
} elem ;
unsigned char data8 [ 60 ] ;
} data ;
} ;
/*
* Control names
*/
# define SNDRV_CTL_NAME_NONE ""
# define SNDRV_CTL_NAME_PLAYBACK "Playback "
# define SNDRV_CTL_NAME_CAPTURE "Capture "
# define SNDRV_CTL_NAME_IEC958_NONE ""
# define SNDRV_CTL_NAME_IEC958_SWITCH "Switch"
# define SNDRV_CTL_NAME_IEC958_VOLUME "Volume"
# define SNDRV_CTL_NAME_IEC958_DEFAULT "Default"
# define SNDRV_CTL_NAME_IEC958_MASK "Mask"
# define SNDRV_CTL_NAME_IEC958_CON_MASK "Con Mask"
# define SNDRV_CTL_NAME_IEC958_PRO_MASK "Pro Mask"
# define SNDRV_CTL_NAME_IEC958_PCM_STREAM "PCM Stream"
# define SNDRV_CTL_NAME_IEC958(expl,direction,what) "IEC958 " expl SNDRV_CTL_NAME_##direction SNDRV_CTL_NAME_IEC958_##what
# endif /* _UAPI__SOUND_ASOUND_H */