On Mon, 22 May 2023 14:27:37 +0200,
Takashi Iwai wrote:
>
> On Mon, 22 May 2023 12:27:11 +0200,
> Takashi Iwai wrote:
> >
> > On Mon, 22 May 2023 10:08:24 +0200,
> > Jaroslav Kysela wrote:
> > >
> > > On 22. 05. 23 9:21, Takashi Iwai wrote:
> > > > On Mon, 22 May 2023 08:34:20 +0200,
> > > > Jaroslav Kysela wrote:
> > > >>
> > > >> On 19. 05. 23 11:30, Takashi Iwai wrote:
> > > >>> This patch adds the support helpers for UMP (Universal MIDI Packet) in
> > > >>> ALSA core.
> > > >>>
> > > >>> The basic design is that a rawmidi instance is assigned to each UMP
> > > >>> Endpoint. A UMP Endpoint provides a UMP stream, typically
> > > >>> bidirectional (but can be also uni-directional, too), which may hold
> > > >>> up to 16 UMP Groups, where each UMP (input/output) Group corresponds
> > > >>> to the traditional MIDI I/O Endpoint.
> > > >>>
> > > >>> Additionally, the ALSA UMP abstraction provides the multiple UMP
> > > >>> Blocks that can be assigned to each UMP Endpoint. A UMP Block is a
> > > >>> metadata to hold the UMP Group clusters, and can represent the
> > > >>> functions assigned to each UMP Group. A typical implementation of UMP
> > > >>> Block is the Group Terminal Blocks of USB MIDI 2.0 specification.
> > > >>>
> > > >>> For distinguishing from the legacy byte-stream MIDI device, a new
> > > >>> device "umpC*D*" will be created, instead of the standard (MIDI 1.0)
> > > >>> devices "midiC*D*". The UMP instance can be identified by the new
> > > >>> rawmidi info bit SNDRV_RAWMIDI_INFO_UMP, too.
> > > >>>
> > > >>> A UMP rawmidi device reads/writes only in 4-bytes words alignment,
> > > >>> stored in CPU native endianness.
> > > >>>
> > > >>> The transmit and receive functions take care of the input/out data
> > > >>> alignment, and may return zero or aligned size, and the params ioctl
> > > >>> may return -EINVAL when the given input/output buffer size isn't
> > > >>> aligned.
> > > >>>
> > > >>> A few new UMP-specific ioctls are added for obtaining the new UMP
> > > >>> endpoint and block information.
> > > >>>
> > > >>> As of this commit, no ALSA sequencer instance is attached to UMP
> > > >>> devices yet. They will be supported by later patches.
> > > >>>
> > > >>> Along with those changes, the protocol version for rawmidi is bumped
> > > >>> to 2.0.3.
> > > >>>
> > > >>> Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
> > > >>
> > > >> Reviewed-by: Jaroslav Kysela
> > > >>
> > > >> except:
> > > >>
> > > >>> +/* UMP Endpoint information */
> > > >>> +struct snd_ump_endpoint_info {
> > > >>> + int card; /* card number */
> > > >>> + int device; /* device number */
> > > >>
> > > >> I suspect that those two fields were added to enumerate devices in the
> > > >> control API. But this extension seems to be missing in your
> > > >> patches. There is only SNDRV_CTL_IOCTL_UMP_NEXT_DEVICE
> > > >> implemented. Otherwise those two fields are not useful.
> > > >
> > > > The SNDRV_CTL_IOCTL_UMP_NEXT_DEVICE is looping over rawmidi, and
> > > > snd_rawmidi_info is provided for (kernel) UMP implementation.
> > >
> > > Right. My point was that an application may be able to evaluate the
> > > other UMP specific information from those new structures before the
> > > rawmidi device is opened. So the CTL API extension may make sense.
> >
> > Point taken, and indeed it might make more sense to change the ioctl
> > for looking at snd_ump_endpoint_info. Will try to cook with it.
>
> FWIW, below is the patch to add two new ioctls for UMP EP/block
> inquiries. It's together with a slight change of ioctl callback.
> Will be included in v2 patch set I'll submit later.
>
> The latest patches are found in topic/midi20 branch of sound git
> tree.
There was a typo. The corrected version below.
Takashi
-- 8< --
From: Takashi Iwai <tiwai@xxxxxxx>
Subject: [PATCH] ALSA: ump: Add ioctls to inquiry UMP EP and Block info via
control API
It'd be convenient to have ioctls to inquiry the UMP Endpoint and UMP
Block information directly via the control API without opening the
rawmidi interface, just like SNDRV_CTL_IOCTL_RAWMIDI_INFO.
This patch extends the rawmidi ioctl handler to support those; new
ioctls, SNDRV_CTL_IOCTL_UMP_ENDPOINT_INFO and
SNDRV_CTL_IOCTL_UMP_BLOCK_INFO, return the snd_ump_endpoint and
snd_ump_block data that is specified by the device field,
respectively.
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
---
include/uapi/sound/asound.h | 2 ++
sound/core/rawmidi.c | 26 ++++++++++++++++++++++++++
2 files changed, 28 insertions(+)
diff --git a/include/uapi/sound/asound.h b/include/uapi/sound/asound.h
index 1e4a21036109..5c5f41dd4001 100644
--- a/include/uapi/sound/asound.h
+++ b/include/uapi/sound/asound.h
@@ -1178,6 +1178,8 @@ struct snd_ctl_tlv {
#define SNDRV_CTL_IOCTL_RAWMIDI_INFO _IOWR('U', 0x41, struct snd_rawmidi_info)
#define SNDRV_CTL_IOCTL_RAWMIDI_PREFER_SUBDEVICE _IOW('U', 0x42, int)
#define SNDRV_CTL_IOCTL_UMP_NEXT_DEVICE _IOWR('U', 0x43, int)
+#define SNDRV_CTL_IOCTL_UMP_ENDPOINT_INFO _IOWR('U', 0x44, struct snd_ump_endpoint_info)
+#define SNDRV_CTL_IOCTL_UMP_BLOCK_INFO _IOWR('U', 0x45, struct snd_ump_block_info)
#define SNDRV_CTL_IOCTL_POWER _IOWR('U', 0xd0, int)
#define SNDRV_CTL_IOCTL_POWER_STATE _IOR('U', 0xd1, int)
diff --git a/sound/core/rawmidi.c b/sound/core/rawmidi.c
index 9936ed282b85..ffb5b58105f4 100644
--- a/sound/core/rawmidi.c
+++ b/sound/core/rawmidi.c
@@ -1043,6 +1043,28 @@ static int snd_rawmidi_next_device(struct snd_card *card, int __user *argp,
return 0;
}
+#if IS_ENABLED(CONFIG_SND_UMP)
+/* inquiry of UMP endpoint and block info via control API */
+static int snd_rawmidi_call_ump_ioctl(struct snd_card *card, int cmd,
+ void __user *argp)
+{
+ struct snd_ump_endpoint_info __user *info = argp;
+ struct snd_rawmidi *rmidi;
+ int device, ret;
+
+ if (get_user(device, &info->device))
+ return -EFAULT;
+ mutex_lock(®ister_mutex);
+ rmidi = snd_rawmidi_search(card, device);
+ if (rmidi && rmidi->ops && rmidi->ops->ioctl)
+ ret = rmidi->ops->ioctl(rmidi, cmd, argp);
+ else
+ ret = -ENXIO;
+ mutex_unlock(®ister_mutex);
+ return ret;
+}
+#endif
+
static int snd_rawmidi_control_ioctl(struct snd_card *card,
struct snd_ctl_file *control,
unsigned int cmd,
@@ -1056,6 +1078,10 @@ static int snd_rawmidi_control_ioctl(struct snd_card *card,
#if IS_ENABLED(CONFIG_SND_UMP)
case SNDRV_CTL_IOCTL_UMP_NEXT_DEVICE:
return snd_rawmidi_next_device(card, argp, true);
+ case SNDRV_CTL_IOCTL_UMP_ENDPOINT_INFO:
+ return snd_rawmidi_call_ump_ioctl(card, SNDRV_UMP_IOCTL_ENDPOINT_INFO, argp);
+ case SNDRV_CTL_IOCTL_UMP_BLOCK_INFO:
+ return snd_rawmidi_call_ump_ioctl(card, SNDRV_UMP_IOCTL_BLOCK_INFO, argp);
#endif
case SNDRV_CTL_IOCTL_RAWMIDI_PREFER_SUBDEVICE:
{
--
2.35.3
