1 files changed, 38 insertions, 3 deletions

diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index 279e24f61305..abe1e811e660 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -707,6 +707,23 @@ int snd_pcm_status(struct snd_pcm_substream *substream,
         struct snd_pcm_runtime *runtime = substream->runtime;
 
         snd_pcm_stream_lock_irq(substream);
+
+        snd_pcm_unpack_audio_tstamp_config(status->audio_tstamp_data,
+                                        &runtime->audio_tstamp_config);
+
+        /* backwards compatible behavior */
+        if (runtime->audio_tstamp_config.type_requested ==
+                SNDRV_PCM_AUDIO_TSTAMP_TYPE_COMPAT) {
+                if (runtime->hw.info & SNDRV_PCM_INFO_HAS_WALL_CLOCK)
+                        runtime->audio_tstamp_config.type_requested =
+                                SNDRV_PCM_AUDIO_TSTAMP_TYPE_LINK;
+                else
+                        runtime->audio_tstamp_config.type_requested =
+                                SNDRV_PCM_AUDIO_TSTAMP_TYPE_DEFAULT;
+                runtime->audio_tstamp_report.valid = 0;
+        } else
+                runtime->audio_tstamp_report.valid = 1;
+
         status->state = runtime->status->state;
         status->suspended_state = runtime->status->suspended_state;
         if (status->state == SNDRV_PCM_STATE_OPEN)
@@ -716,8 +733,15 @@ int snd_pcm_status(struct snd_pcm_substream *substream,
                 snd_pcm_update_hw_ptr(substream);
                 if (runtime->tstamp_mode == SNDRV_PCM_TSTAMP_ENABLE) {
                         status->tstamp = runtime->status->tstamp;
+                        status->driver_tstamp = runtime->driver_tstamp;
                         status->audio_tstamp =
                                 runtime->status->audio_tstamp;
+                        if (runtime->audio_tstamp_report.valid == 1)
+                                /* backwards compatibility, no report provided in COMPAT mode */
+                                snd_pcm_pack_audio_tstamp_report(&status->audio_tstamp_data,
+                                                                &status->audio_tstamp_accuracy,
+                                                                &runtime->audio_tstamp_report);
+
                         goto _tstamp_end;
                 }
         } else {
@@ -753,12 +777,21 @@ int snd_pcm_status(struct snd_pcm_substream *substream,
 }
 
 static int snd_pcm_status_user(struct snd_pcm_substream *substream,
-                               struct snd_pcm_status __user * _status)
+                               struct snd_pcm_status __user * _status,
+                               bool ext)
 {
         struct snd_pcm_status status;
         int res;
-        
+
         memset(&status, 0, sizeof(status));
+        /*
+         * with extension, parameters are read/write,
+         * get audio_tstamp_data from user,
+         * ignore rest of status structure
+         */
+        if (ext && get_user(status.audio_tstamp_data,
+                                (u32 __user *)(&_status->audio_tstamp_data)))
+                return -EFAULT;
         res = snd_pcm_status(substream, &status);
         if (res < 0)
                 return res;
@@ -2725,7 +2758,9 @@ static int snd_pcm_common_ioctl1(struct file *file,
         case SNDRV_PCM_IOCTL_SW_PARAMS:
                 return snd_pcm_sw_params_user(substream, arg);
         case SNDRV_PCM_IOCTL_STATUS:
-                return snd_pcm_status_user(substream, arg);
+                return snd_pcm_status_user(substream, arg, false);
+        case SNDRV_PCM_IOCTL_STATUS_EXT:
+                return snd_pcm_status_user(substream, arg, true);
         case SNDRV_PCM_IOCTL_CHANNEL_INFO:
                 return snd_pcm_channel_info_user(substream, arg);
         case SNDRV_PCM_IOCTL_PREPARE: