Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Wed, 02 Feb 2022 11:35:33 +0100
Message-ID: <s5hleytzhca.wl-tiwai@suse.de>
From:   Takashi Iwai <tiwai@suse.de>
To:     Arnaldo Carvalho de Melo <acme@kernel.org>
Cc:     Takashi Iwai <tiwai@suse.de>, Mark Brown <broonie@kernel.org>,
        Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
        Takashi Sakamoto <o-takashi@sakamocchi.jp>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 1/1 fyi] tools include UAPI: Sync sound/asound.h copy with the kernel sources
In-Reply-To: <YflN0j09T+6ODHIh@kernel.org>
References: <YflN0j09T+6ODHIh@kernel.org>
User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka)
 FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/25.3
 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO)
MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka")
Content-Type: text/plain; charset=US-ASCII
Precedence: bulk

On Tue, 01 Feb 2022 16:12:18 +0100,
Arnaldo Carvalho de Melo wrote:
> 
> Picking the changes from:
> 
>   55b71f6c29f2a78a ("ALSA: uapi: use C90 comment style instead of C99 style")
>   fb6723daf89083a0 ("ALSA: pcm: comment about relation between msbits hw parameter and [S|U]32 formats")
>   b456abe63f60ad93 ("ALSA: pcm: introduce INFO_NO_REWINDS flag")
>   5aec579e08e4f2be ("ALSA: uapi: Fix a C++ style comment in asound.h")
> 
> Which entails no changes in the tooling side as it doesn't introduce new
> SNDRV_PCM_IOCTL_ ioctls.
> 
> To silence this perf tools build warning:
> 
>   Warning: Kernel ABI header at 'tools/include/uapi/sound/asound.h' differs from latest version at 'include/uapi/sound/asound.h'
>   diff -u tools/include/uapi/sound/asound.h include/uapi/sound/asound.h
> 
> Cc: Mark Brown <broonie@kernel.org>
> Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
> Cc: Takashi Iwai <tiwai@suse.de>
> Cc: Takashi Sakamoto <o-takashi@sakamocchi.jp>
> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

Thanks for the patch.
Shall I merge this through sound git tree or was already merged in
somewhere else?


Takashi

> ---
>  tools/include/uapi/sound/asound.h | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/tools/include/uapi/sound/asound.h b/tools/include/uapi/sound/asound.h
> index 5fbb79e30819af91..ef0cafe295b28253 100644
> --- a/tools/include/uapi/sound/asound.h
> +++ b/tools/include/uapi/sound/asound.h
> @@ -202,6 +202,11 @@ typedef int __bitwise snd_pcm_format_t;
>  #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 */
> +/*
> + * 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.
> + */
>  #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)
> @@ -300,7 +305,7 @@ typedef int __bitwise snd_pcm_subformat_t;
>  #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 */
>  #define SNDRV_PCM_INFO_EXPLICIT_SYNC	0x10000000	/* needs explicit sync of pointers and data */
> -
> +#define SNDRV_PCM_INFO_NO_REWINDS	0x20000000	/* hardware can only support monotonic changes of appl_ptr */
>  #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 */
>  
> -- 
> 2.34.1
>