• Arnaldo Carvalho de Melo's avatar
    tools include UAPI: Sync the sound/asound.h copy with the kernel sources · 28e898ff
    Arnaldo Carvalho de Melo authored
    Picking the changes from:
    
      01dfa8e9 ("ALSA: ump: Add info flag bit for static blocks")
      e375b8a0 ("ALSA: ump: Add more attributes to UMP EP and FB info")
      30fc1392 ("ALSA: ump: Add ioctls to inquiry UMP EP and Block info via control API")
      127ae6f6 ("ALSA: rawmidi: Skip UMP devices at SNDRV_CTL_IOCTL_RAWMIDI_NEXT_DEVICE")
      e3a8a5b7 ("ALSA: rawmidi: UMP support")
      a4bb75c4 ("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.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
    28e898ff
asound.h 53.9 KB