superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ALSA: pcm: Replace [audio_]tstamp_[n]sec by struct __snd_timespec in struct snd_pcm_mmap_status32 

To match struct __snd_pcm_mmap_status and enable reuse of
snd_pcm_sync_ptr_get_user() and snd_pcm_sync_ptr_put_user() by
snd_pcm_sync_ptr() replace tstamp_sec and tstamp_nsec fields by
a struct __snd_timespec in struct snd_pcm_mmap_status32.
Do the same with audio_tstamp_sec and audio_tstamp_nsec.

This is possible because struct snd_pcm_mmap_status32 is packed
and __SND_STRUCT_TIME64 is always defined for kernel which means
struct __snd_timespec is always defined as:

	struct __snd_timespec {
		__s32 tv_sec;
		__s32 tv_nsec;
	};

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/df8ea1a9aff61c3e358759b1f495bdb9fb8a3e6a.1749883041.git.christophe.leroy@csgroup.eu
pull/1279/head
Christophe Leroy 2025-06-14 08:43:16 +02:00 committed by Takashi Iwai
parent a9b49bf8ad
commit c72fad73ba
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sound/core/pcm_compat.c
View File

@ -377,12 +377,10 @@ struct snd_pcm_mmap_status_x32 {
s32 pad1; s32 pad1;
u32 hw_ptr; u32 hw_ptr;
u32 pad2; /* alignment */ u32 pad2; /* alignment */
s64 tstamp_sec; struct __snd_timespec64 tstamp;
s64 tstamp_nsec;
snd_pcm_state_t suspended_state; snd_pcm_state_t suspended_state;
s32 pad3; s32 pad3;
s64 audio_tstamp_sec; struct __snd_timespec64 audio_tstamp;
s64 audio_tstamp_nsec;
} __packed; } __packed;
struct snd_pcm_mmap_control_x32 { struct snd_pcm_mmap_control_x32 {

14
sound/core/pcm_native.c
View File

@ -3078,11 +3078,11 @@ failed_begin: \
goto failed_begin; \ goto failed_begin; \
unsafe_put_user(__s.state, &__src->s.status.state, failed); \ unsafe_put_user(__s.state, &__src->s.status.state, failed); \
unsafe_put_user(__s.hw_ptr, &__src->s.status.hw_ptr, failed); \ unsafe_put_user(__s.hw_ptr, &__src->s.status.hw_ptr, failed); \
unsafe_put_user(__s.tstamp.tv_sec, &__src->s.status.tstamp_sec, failed);\ unsafe_put_user(__s.tstamp.tv_sec, &__src->s.status.tstamp.tv_sec, failed); \
unsafe_put_user(__s.tstamp.tv_nsec, &__src->s.status.tstamp_nsec, failed); \ unsafe_put_user(__s.tstamp.tv_nsec, &__src->s.status.tstamp.tv_nsec, failed); \
unsafe_put_user(__s.suspended_state, &__src->s.status.suspended_state, failed); \ unsafe_put_user(__s.suspended_state, &__src->s.status.suspended_state, failed); \
unsafe_put_user(__s.audio_tstamp.tv_sec, &__src->s.status.audio_tstamp_sec, failed); \ unsafe_put_user(__s.audio_tstamp.tv_sec, &__src->s.status.audio_tstamp.tv_sec, failed); \
unsafe_put_user(__s.audio_tstamp.tv_nsec, &__src->s.status.audio_tstamp_nsec, failed); \ unsafe_put_user(__s.audio_tstamp.tv_nsec, &__src->s.status.audio_tstamp.tv_nsec, failed);\
unsafe_put_user(__c.appl_ptr, &__src->c.control.appl_ptr, failed); \ unsafe_put_user(__c.appl_ptr, &__src->c.control.appl_ptr, failed); \
unsafe_put_user(__c.avail_min, &__src->c.control.avail_min, failed); \ unsafe_put_user(__c.avail_min, &__src->c.control.avail_min, failed); \
__err = 0; \ __err = 0; \
@ -3143,11 +3143,9 @@ struct snd_pcm_mmap_status32 {
snd_pcm_state_t state; snd_pcm_state_t state;
s32 pad1; s32 pad1;
u32 hw_ptr; u32 hw_ptr;
s32 tstamp_sec; struct __snd_timespec tstamp;
s32 tstamp_nsec;
snd_pcm_state_t suspended_state; snd_pcm_state_t suspended_state;
s32 audio_tstamp_sec; struct __snd_timespec audio_tstamp;
s32 audio_tstamp_nsec;
} __packed; } __packed;
struct snd_pcm_mmap_control32 { struct snd_pcm_mmap_control32 {