From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2622FC83F1A for ; Fri, 11 Jul 2025 09:24:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:Cc:To:From: Subject:Message-ID:References:Mime-Version:In-Reply-To:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=OI8EJdj4iWn/1u1hrxV7gJL9a9iP26e/+tYZeBGEhqQ=; b=V1qBDLJV4b79LeVvAPQ02wISda lht497UzfI+nL8OD0ZdCxetOmdTxX4eip6jze8FIxc+1DiEccOjrmcWenpQJizl+FJax+5CfghVL7 GcAnD4a6HFk1LqScJVyNRs+HWXuRK4M26NY+FvrTDq2wubhpayCv5yuHriZ9s8XVnGzPg1ipqquq6 WMLt9FxQ9iafF1ciIAxRrw8V58RtxUbOkiTN9moz1Fx+Wf2fXosTkfA2rSj9LqqEjgALktJe+B7n4 xy3WdZjX4TeFB79q+PUmYhg7jCiM4UKJU8HN7p6et5DlN94bR8FnmhOLDFd4DKn7BMSKJK7XPirSp cqya8KxQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1ua9zF-0000000EIOS-3nNK; Fri, 11 Jul 2025 09:24:09 +0000 Received: from mail-ed1-x54a.google.com ([2a00:1450:4864:20::54a]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1ua955-0000000E7yY-23f3 for linux-arm-kernel@lists.infradead.org; Fri, 11 Jul 2025 08:26:08 +0000 Received: by mail-ed1-x54a.google.com with SMTP id 4fb4d7f45d1cf-606f507ede7so1888237a12.0 for ; Fri, 11 Jul 2025 01:26:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1752222365; x=1752827165; darn=lists.infradead.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=OI8EJdj4iWn/1u1hrxV7gJL9a9iP26e/+tYZeBGEhqQ=; b=ZzpmA42zQ5BxNoEU2QkM/w4/bm5DH0YsUqTTVhAMhx/I3AIiJA0oRpRr/Sv5ZrTDX3 cDjWR9QyPsxCXT8Em+8xcW7cVkoSaTLH+Upy7xqJjSwutOVUrC9hsmNM41UP410WWe0X xd2A40DbvB3SypQnjV0IxqZj2cN40+Yt/aKZw2D+p2V53r5idv8PMZUVNWrhwHX88/rj XrxDJVc5smP5QJikvdKpeBXG6fnXdtQ89a94iMHck9N8Ct3V5u1rbY39KVCX+nitue0K C7VF1VKioKWv0V/7a6NRJjIOrU2zyP9EGEFsxykoolAZt/4MuTxZ688iLsAxG0DcNtbg CRTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752222365; x=1752827165; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=OI8EJdj4iWn/1u1hrxV7gJL9a9iP26e/+tYZeBGEhqQ=; b=iQNqTAtCGL+KP5K/Uqi/2d/DkWnC60m27q5XWZmck6QMPUVzXuG1IhqK++dW0ZMPW4 qR4h+FWoYUjZGGyNgd0SS0DN5jQMk7twPCADq5Q/5/t5Y4L/7RFE0dFX4INOUtP5gjiU YapngJkei5FZsQkw//qGgftQzsvoispiMyzoRp2udTBudD5lRabKxsiGVz8E0VZnRyKY EtQocnX1gKs7Qxh9HylqELzVtoLhPllPFco6Fxb4Ic2PUNwCnr/6xWB47099n+aByk1h NKofNUEpIWfimV1DpWBSaFYgDa5Yb6nUjl9Eu3KAbFEcw2UwMkfdX9+v+d+6xZglmIum DxbQ== X-Forwarded-Encrypted: i=1; AJvYcCUtnvhFtd6LMBZXZX1kxmktqMV41u1DgsdBSeYfwhxrRCOea8pVdWh0Yw4sUs5t7Sx+GKTL8+/a7FSOBmzE/36F@lists.infradead.org X-Gm-Message-State: AOJu0Yy+TDnFp7ccIChAkOcaIjRKx4MwYC3Ki2fLhkSORuIefGqdnhtO WoZ7OdxBn/uiyvWfQI/iD3fuWG9/5AAXfP/d7jlaCyt2p59slwNRJpDVdydO86f+f/0DAYVOp1Z iIHnqDfiLc+uMNHYRAg== X-Google-Smtp-Source: AGHT+IHI8PTrj97CrFmguJmIDyCYPUtRTqpUv31CiuHbIgrvImgMyuw2xI5mKz+ZrzTXQ83FPflouczIPb1Ff4c= X-Received: from edbdc17.prod.google.com ([2002:a05:6402:3111:b0:60e:395c:9cd1]) (user=verhaegen job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6402:13c1:b0:60b:9cf8:b218 with SMTP id 4fb4d7f45d1cf-611e7614a78mr1823302a12.7.1752222364829; Fri, 11 Jul 2025 01:26:04 -0700 (PDT) Date: Fri, 11 Jul 2025 09:24:35 +0100 In-Reply-To: <20250711082441.4193295-1-verhaegen@google.com> Mime-Version: 1.0 References: <20250711082441.4193295-1-verhaegen@google.com> X-Mailer: git-send-email 2.50.0.727.gbf7dc18ff4-goog Message-ID: <20250711082441.4193295-4-verhaegen@google.com> Subject: [PATCH v1 3/4] ALSA: compress_offload: Add SNDRV_COMPRESS_AVAIL64 ioctl From: George Verhaegen To: Vinod Koul , Jaroslav Kysela , Takashi Iwai , Liam Girdwood , Mark Brown , Charles Keepax , Richard Fitzgerald , David Rhodes , Cezary Rojewski , Peter Ujfalusi , Bard Liao , Ranjani Sridharan , Kai Vehmanen , Pierre-Louis Bossart , Srinivas Kandagatla , Daniel Baluta , Orson Zhai , Baolin Wang , Chunyan Zhang , Kunihiko Hayashi , Masami Hiramatsu Cc: Joris Verhaegen , kernel-team@android.com, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, patches@opensource.cirrus.com, linux-arm-msm@vger.kernel.org, sound-open-firmware@alsa-project.org, linux-arm-kernel@lists.infradead.org, David Li , Miller Liang Content-Type: text/plain; charset="UTF-8" X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250711_012607_537239_362E63E0 X-CRM114-Status: GOOD ( 18.66 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Joris Verhaegen Previous patches introduced ioctl for fetching a 64-bit timestamp via SNDRV_COMPRESS_TSTAMP64. To provide a consistent API, a 64-bit version of SNDRV_COMPRESS_AVAIL ioctl is required. Define a new struct snd_compr_avail64, which embeds the 64-bit timestamp struct, and define the corresponding SNDRV_COMPRESS_AVAIL64 ioctl command in the UAPI header. Signed-off-by: Joris Verhaegen Tested-by: Joris Verhaegen Reviewed-by: David Li Reviewed-by: Miller Liang --- include/uapi/sound/compress_offload.h | 11 ++++ sound/core/compress_offload.c | 88 +++++++++++++++++++++------ 2 files changed, 79 insertions(+), 20 deletions(-) diff --git a/include/uapi/sound/compress_offload.h b/include/uapi/sound/compress_offload.h index 2758d9ee3d91..48525a87d98f 100644 --- a/include/uapi/sound/compress_offload.h +++ b/include/uapi/sound/compress_offload.h @@ -85,6 +85,16 @@ struct snd_compr_avail { struct snd_compr_tstamp tstamp; } __attribute__((packed, aligned(4))); +/** + * struct snd_compr_avail64 - avail descriptor with tstamp in 64 bit format + * @avail: Number of bytes available in ring buffer for writing/reading + * @tstamp: timestamp information + */ +struct snd_compr_avail64 { + __u64 avail; + struct snd_compr_tstamp64 tstamp; +} __attribute__((packed, aligned(4))); + enum snd_compr_direction { SND_COMPRESS_PLAYBACK = 0, SND_COMPRESS_CAPTURE, @@ -232,6 +242,7 @@ struct snd_compr_task_status { #define SNDRV_COMPRESS_TSTAMP _IOR('C', 0x20, struct snd_compr_tstamp) #define SNDRV_COMPRESS_AVAIL _IOR('C', 0x21, struct snd_compr_avail) #define SNDRV_COMPRESS_TSTAMP64 _IOR('C', 0x22, struct snd_compr_tstamp64) +#define SNDRV_COMPRESS_AVAIL64 _IOR('C', 0x23, struct snd_compr_avail64) #define SNDRV_COMPRESS_PAUSE _IO('C', 0x30) #define SNDRV_COMPRESS_RESUME _IO('C', 0x31) #define SNDRV_COMPRESS_START _IO('C', 0x32) diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c index 40c1e69961b7..78ba86e0d74f 100644 --- a/sound/core/compress_offload.c +++ b/sound/core/compress_offload.c @@ -257,12 +257,11 @@ static int snd_compr_update_tstamp64(struct snd_compr_stream *stream, return 0; } -static size_t snd_compr_calc_avail(struct snd_compr_stream *stream, - struct snd_compr_avail *avail) +static size_t snd_compr_calc_avail_internal(struct snd_compr_stream *stream, + struct snd_compr_avail *avail32, + struct snd_compr_avail64 *avail64) { - memset(avail, 0, sizeof(*avail)); - snd_compr_update_tstamp32(stream, &avail->tstamp); - /* Still need to return avail even if tstamp can't be filled in */ + u64 avail; if (stream->runtime->total_bytes_available == 0 && stream->runtime->state == SNDRV_PCM_STATE_SETUP && @@ -284,33 +283,68 @@ static size_t snd_compr_calc_avail(struct snd_compr_stream *stream, } } - avail->avail = stream->runtime->total_bytes_available - - stream->runtime->total_bytes_transferred; + avail = stream->runtime->total_bytes_available - + stream->runtime->total_bytes_transferred; if (stream->direction == SND_COMPRESS_PLAYBACK) - avail->avail = stream->runtime->buffer_size - avail->avail; + avail = stream->runtime->buffer_size - avail; + + if (avail32) + avail32->avail = avail; + if (avail64) + avail64->avail = avail; + + pr_debug("ret avail %llu as %zu\n", avail, (size_t)avail); + return avail; +} + +static size_t snd_compr_calc_avail32(struct snd_compr_stream *stream, + struct snd_compr_avail *avail) +{ + memset(avail, 0, sizeof(*avail)); + snd_compr_update_tstamp32(stream, &avail->tstamp); + /* Still need to return avail even if tstamp can't be filled in */ - pr_debug("ret avail as %llu\n", avail->avail); - return avail->avail; + return snd_compr_calc_avail_internal(stream, avail, NULL); +} + +static size_t snd_compr_calc_avail64(struct snd_compr_stream *stream, + struct snd_compr_avail64 *avail) +{ + memset(avail, 0, sizeof(*avail)); + snd_compr_update_tstamp64(stream, &avail->tstamp); + /* Still need to return avail even if tstamp can't be filled in */ + + return snd_compr_calc_avail_internal(stream, NULL, avail); } static inline size_t snd_compr_get_avail(struct snd_compr_stream *stream) { struct snd_compr_avail avail; - return snd_compr_calc_avail(stream, &avail); + return snd_compr_calc_avail32(stream, &avail); } -static int -snd_compr_ioctl_avail(struct snd_compr_stream *stream, unsigned long arg) +static int snd_compr_ioctl_avail(struct snd_compr_stream *stream, + unsigned long arg, bool is_64bit) { - struct snd_compr_avail ioctl_avail; - size_t avail; + union { + struct snd_compr_avail avail32; + struct snd_compr_avail64 avail64; + } ioctrl_avail_u; + size_t avail, ioctrl_avail_size; if (stream->direction == SND_COMPRESS_ACCEL) return -EBADFD; - avail = snd_compr_calc_avail(stream, &ioctl_avail); - ioctl_avail.avail = avail; + if (is_64bit) { + avail = snd_compr_calc_avail64(stream, &ioctrl_avail_u.avail64); + ioctrl_avail_u.avail64.avail = avail; + ioctrl_avail_size = sizeof(ioctrl_avail_u.avail64); + } else { + avail = snd_compr_calc_avail32(stream, &ioctrl_avail_u.avail32); + ioctrl_avail_u.avail32.avail = avail; + ioctrl_avail_size = sizeof(ioctrl_avail_u.avail32); + } switch (stream->runtime->state) { case SNDRV_PCM_STATE_OPEN: @@ -321,12 +355,24 @@ snd_compr_ioctl_avail(struct snd_compr_stream *stream, unsigned long arg) break; } - if (copy_to_user((__u64 __user *)arg, - &ioctl_avail, sizeof(ioctl_avail))) + if (copy_to_user((__u64 __user *)arg, &ioctrl_avail_u, + ioctrl_avail_size)) return -EFAULT; return 0; } +static int snd_compr_ioctl_avail32(struct snd_compr_stream *stream, + unsigned long arg) +{ + return snd_compr_ioctl_avail(stream, arg, false); +} + +static int snd_compr_ioctl_avail64(struct snd_compr_stream *stream, + unsigned long arg) +{ + return snd_compr_ioctl_avail(stream, arg, true); +} + static int snd_compr_write_data(struct snd_compr_stream *stream, const char __user *buf, size_t count) { @@ -1393,7 +1439,9 @@ static long snd_compr_ioctl(struct file *f, unsigned int cmd, unsigned long arg) case _IOC_NR(SNDRV_COMPRESS_TSTAMP64): return snd_compr_tstamp64(stream, arg); case _IOC_NR(SNDRV_COMPRESS_AVAIL): - return snd_compr_ioctl_avail(stream, arg); + return snd_compr_ioctl_avail32(stream, arg); + case _IOC_NR(SNDRV_COMPRESS_AVAIL64): + return snd_compr_ioctl_avail64(stream, arg); case _IOC_NR(SNDRV_COMPRESS_PAUSE): return snd_compr_pause(stream); case _IOC_NR(SNDRV_COMPRESS_RESUME): -- 2.50.0.727.gbf7dc18ff4-goog