diff options
| author | Sebastian Reichel <sre@kernel.org> | 2015-04-16 19:05:18 +0200 |
|---|---|---|
| committer | Sebastian Reichel <sre@kernel.org> | 2015-06-23 02:40:03 +0200 |
| commit | 5023a5ca8e144846ec0646554336000abb11e04f (patch) | |
| tree | ee7d239e6b231977c9f03bd011de1fefcdc61194 /drivers/hsi | |
| parent | b953c0d234bc72e8489d3bf51a276c5c4ec85345 (diff) | |
| download | linux-5023a5ca8e144846ec0646554336000abb11e04f.tar.gz linux-5023a5ca8e144846ec0646554336000abb11e04f.tar.bz2 linux-5023a5ca8e144846ec0646554336000abb11e04f.zip | |
HSI: cmt_speech: fix timestamp interface
The user interface for timestamps in the new cmt_speech
driver is broken in multiple ways:
- The layout is incompatible between 32-bit and 64-bit user
space, because of the size differences in 'struct timespec'.
This means that the driver can not work when used with 32-bit
user space on a 64-bit kernel.
- As there are plans to change 32-bit user space to use
a 64-bit time_t type in the future, it will also be
incompatible with new 32-bit user space.
- It is using ktime_get_ts under it's deprecated alias
(do_posix_clock_monotonic_gettime).
To keep support for the user space tools written for this driver (which
have lived many years out-of-tree), the interface has been hardened to
unsigned 32-bit values.
Reported-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
Diffstat (limited to 'drivers/hsi')
| -rw-r--r-- | drivers/hsi/clients/cmt_speech.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/hsi/clients/cmt_speech.c b/drivers/hsi/clients/cmt_speech.c index 4983529a9c6c..d04643f9548b 100644 --- a/drivers/hsi/clients/cmt_speech.c +++ b/drivers/hsi/clients/cmt_speech.c @@ -451,9 +451,14 @@ static void cs_hsi_read_on_control_complete(struct hsi_msg *msg) dev_dbg(&hi->cl->device, "Read on control: %08X\n", cmd); cs_release_cmd(msg); if (hi->flags & CS_FEAT_TSTAMP_RX_CTRL) { - struct timespec *tstamp = + struct timespec tspec; + struct cs_timestamp *tstamp = &hi->mmap_cfg->tstamp_rx_ctrl; - do_posix_clock_monotonic_gettime(tstamp); + + ktime_get_ts(&tspec); + + tstamp->tv_sec = (__u32) tspec.tv_sec; + tstamp->tv_nsec = (__u32) tspec.tv_nsec; } spin_unlock(&hi->lock); |