ALSA: seq: Notify UMP EP and FB changes

So far we notify the sequencer client and port changes upon UMP FB
changes, but those aren't really corresponding to the UMP updates.
e.g. when a FB info gets updated, it's not notified but done only when
some of sequencer port attribute is changed.  This is no ideal
behavior.

This patch adds the two new sequencer event types for notifying the
UMP EP and FB changes via the announce port.  The new event takes
snd_seq_ev_ump_notify type data, which is compatible with
snd_seq_addr (where the port number is replaced with the block
number).

The events are sent when the EP and FB info gets updated explicitly
via ioctl, or the backend UMP receives the corresponding UMP
messages.

The sequencer protocol version is bumped to 1.0.5 along with it.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20250110155943.31578-9-tiwai@suse.de

diff --git a/Documentation/sound/designs/midi-2.0.rst b/Documentation/sound/designs/midi-2.0.rst
index d6c17a47c8320d1c45eba752384d75b97788fff9..71a343c93fe7d6aaa4d51fc3b9d2819ca6c25362 100644 (file)
--- a/Documentation/sound/designs/midi-2.0.rst
+++ b/Documentation/sound/designs/midi-2.0.rst
@@ -388,6 +388,13 @@ Sequencer API Extensions
   announcement to the ALSA sequencer system port, similarly like the
   normal port change notification.
 
+* There are two extended event types for notifying the UMP Endpoint and
+  Function Block changes via the system announcement port:
+  type 68 (`SNDRV_SEQ_EVENT_UMP_EP_CHANGE`) and type 69
+  (`SNDRV_SEQ_EVENT_UMP_BLOCK_CHANGE`). They take the new type,
+  `snd_seq_ev_ump_notify` in the payload, indicating the client number
+  and the FB number that are changed.
+
 
 MIDI2 USB Gadget Function Driver
 ================================

diff --git a/include/sound/ump.h b/include/sound/ump.h
index 532c2c3ea28e3c13b485636c7bb932c684891369..73f97f88e2ed7a1a5555b8aadb388617d95a1e28 100644 (file)
--- a/include/sound/ump.h
+++ b/include/sound/ump.h
@@ -83,6 +83,7 @@ struct snd_ump_ops {
 struct snd_seq_ump_ops {
        void (*input_receive)(struct snd_ump_endpoint *ump,
                              const u32 *data, int words);
+       int (*notify_ep_change)(struct snd_ump_endpoint *ump);
        int (*notify_fb_change)(struct snd_ump_endpoint *ump,
                                struct snd_ump_block *fb);
        int (*switch_protocol)(struct snd_ump_endpoint *ump);

diff --git a/include/uapi/sound/asequencer.h b/include/uapi/sound/asequencer.h
index bc30c1f2a10945964edbb1783f68dd7772b532ce..a5c41f771e059b0fa456e8508378bb3ed4f2ed78 100644 (file)
--- a/include/uapi/sound/asequencer.h
+++ b/include/uapi/sound/asequencer.h
@@ -10,7 +10,7 @@
 #include <sound/asound.h>
 
 /** version of the sequencer */
-#define SNDRV_SEQ_VERSION SNDRV_PROTOCOL_VERSION(1, 0, 4)
+#define SNDRV_SEQ_VERSION SNDRV_PROTOCOL_VERSION(1, 0, 5)
 
 /**
  * definition of sequencer event types
@@ -92,6 +92,9 @@
 #define SNDRV_SEQ_EVENT_PORT_SUBSCRIBED        66      /* ports connected */
 #define SNDRV_SEQ_EVENT_PORT_UNSUBSCRIBED 67   /* ports disconnected */
 
+#define SNDRV_SEQ_EVENT_UMP_EP_CHANGE  68      /* UMP EP info has changed */
+#define SNDRV_SEQ_EVENT_UMP_BLOCK_CHANGE 69    /* UMP block info has changed */
+
 /* 70-89:  synthesizer events - obsoleted */
 
 /** user-defined events with fixed length
@@ -253,6 +256,12 @@ struct snd_seq_ev_quote {
        struct snd_seq_event *event;            /* quoted event */
 } __packed;
 
+       /* UMP info change notify */
+struct snd_seq_ev_ump_notify {
+       unsigned char client;   /**< Client number */
+       unsigned char block;    /**< Block number (optional) */
+};
+
 union snd_seq_event_data { /* event data... */
        struct snd_seq_ev_note note;
        struct snd_seq_ev_ctrl control;
@@ -265,6 +274,7 @@ union snd_seq_event_data { /* event data... */
        struct snd_seq_connect connect;
        struct snd_seq_result result;
        struct snd_seq_ev_quote quote;
+       struct snd_seq_ev_ump_notify ump_notify;
 };
 
        /* sequencer event */

diff --git a/sound/core/seq/seq_clientmgr.c b/sound/core/seq/seq_clientmgr.c
index 3d27f777f29ebfada2cb21dd76f685115b1608ba..75783d69e7083412e596efbeb9944e9b7a93aea7 100644 (file)
--- a/sound/core/seq/seq_clientmgr.c
+++ b/sound/core/seq/seq_clientmgr.c
@@ -2230,6 +2230,16 @@ static int snd_seq_ioctl_client_ump_info(struct snd_seq_client *caller,
  error:
        mutex_unlock(&cptr->ioctl_mutex);
        snd_seq_client_unlock(cptr);
+       if (!err && cmd == SNDRV_SEQ_IOCTL_SET_CLIENT_UMP_INFO) {
+               if (type == SNDRV_SEQ_CLIENT_UMP_INFO_ENDPOINT)
+                       snd_seq_system_ump_notify(client, 0,
+                                                 SNDRV_SEQ_EVENT_UMP_EP_CHANGE,
+                                                 false);
+               else
+                       snd_seq_system_ump_notify(client, type - 1,
+                                                 SNDRV_SEQ_EVENT_UMP_BLOCK_CHANGE,
+                                                 false);
+       }
        return err;
 }
 #endif

diff --git a/sound/core/seq/seq_system.h b/sound/core/seq/seq_system.h
index a118f7252b62a03e5bb571462d5748880b9fe50c..62e513f74871512465ba2ccbdcdb11efd53cef09 100644 (file)
--- a/sound/core/seq/seq_system.h
+++ b/sound/core/seq/seq_system.h
@@ -16,6 +16,16 @@ void snd_seq_system_broadcast(int client, int port, int type, bool atomic);
 #define notify_event(client, port, type) \
        snd_seq_system_broadcast(client, port, type, false)
 
+/* notify UMP EP/FB change event */
+static inline void snd_seq_system_ump_notify(int client, int block, int type,
+                                            bool atomic)
+{
+       /* reuse the existing snd_seq_system_broadcast():
+        * struct snd_seq_ev_ump_notify is compatible with struct snd_seq_addr
+        */
+       snd_seq_system_broadcast(client, block, type, atomic);
+}
+
 #define snd_seq_system_client_ev_client_start(client) notify_event(client, 0, SNDRV_SEQ_EVENT_CLIENT_START)
 #define snd_seq_system_client_ev_client_exit(client) notify_event(client, 0, SNDRV_SEQ_EVENT_CLIENT_EXIT)
 #define snd_seq_system_client_ev_client_change(client) notify_event(client, 0, SNDRV_SEQ_EVENT_CLIENT_CHANGE)

diff --git a/sound/core/seq/seq_ump_client.c b/sound/core/seq/seq_ump_client.c
index 27c4dd9940ffbca525f81b8b7860a2abba8dfcc0..1255351b59ce1ac5639d3ebb77735c040b16346b 100644 (file)
--- a/sound/core/seq/seq_ump_client.c
+++ b/sound/core/seq/seq_ump_client.c
@@ -388,6 +388,33 @@ static void handle_group_notify(struct work_struct *work)
        setup_client_group_filter(client);
 }
 
+/* UMP EP change notification */
+static int seq_ump_notify_ep_change(struct snd_ump_endpoint *ump)
+{
+       struct seq_ump_client *client = ump->seq_client;
+       struct snd_seq_client *cptr;
+       int client_id;
+
+       if (!client)
+               return -ENODEV;
+       client_id = client->seq_client;
+       cptr = snd_seq_kernel_client_get(client_id);
+       if (!cptr)
+               return -ENODEV;
+
+       snd_seq_system_ump_notify(client_id, 0, SNDRV_SEQ_EVENT_UMP_EP_CHANGE,
+                                 true);
+
+       /* update sequencer client name if needed */
+       if (*ump->core.name && strcmp(ump->core.name, cptr->name)) {
+               strscpy(cptr->name, ump->core.name, sizeof(cptr->name));
+               snd_seq_system_client_ev_client_change(client_id);
+       }
+
+       snd_seq_kernel_client_put(cptr);
+       return 0;
+}
+
 /* UMP FB change notification */
 static int seq_ump_notify_fb_change(struct snd_ump_endpoint *ump,
                                    struct snd_ump_block *fb)
@@ -397,20 +424,29 @@ static int seq_ump_notify_fb_change(struct snd_ump_endpoint *ump,
        if (!client)
                return -ENODEV;
        schedule_work(&client->group_notify_work);
+       snd_seq_system_ump_notify(client->seq_client, fb->info.block_id,
+                                 SNDRV_SEQ_EVENT_UMP_BLOCK_CHANGE,
+                                 true);
        return 0;
 }
 
 /* UMP protocol change notification; just update the midi_version field */
 static int seq_ump_switch_protocol(struct snd_ump_endpoint *ump)
 {
-       if (!ump->seq_client)
+       struct seq_ump_client *client = ump->seq_client;
+
+       if (!client)
                return -ENODEV;
-       setup_client_midi_version(ump->seq_client);
+       setup_client_midi_version(client);
+       snd_seq_system_ump_notify(client->seq_client, 0,
+                                 SNDRV_SEQ_EVENT_UMP_EP_CHANGE,
+                                 true);
        return 0;
 }
 
 static const struct snd_seq_ump_ops seq_ump_ops = {
        .input_receive = seq_ump_input_receive,
+       .notify_ep_change = seq_ump_notify_ep_change,
        .notify_fb_change = seq_ump_notify_fb_change,
        .switch_protocol = seq_ump_switch_protocol,
 };

diff --git a/sound/core/ump.c b/sound/core/ump.c
index c80a0a8b7ad0cc64cb5e79eb7b27834d3e7743f8..ff3cc2386ece98ae9f372d4e0f1db665afce3d3d 100644 (file)
--- a/sound/core/ump.c
+++ b/sound/core/ump.c
@@ -695,6 +695,15 @@ static void choose_default_protocol(struct snd_ump_endpoint *ump)
                ump->info.protocol |= SNDRV_UMP_EP_INFO_PROTO_MIDI1;
 }
 
+/* notify the EP info/name change to sequencer */
+static void seq_notify_ep_change(struct snd_ump_endpoint *ump)
+{
+#if IS_ENABLED(CONFIG_SND_SEQUENCER)
+       if (ump->parsed && ump->seq_ops && ump->seq_ops->notify_ep_change)
+               ump->seq_ops->notify_ep_change(ump);
+#endif
+}
+
 /* handle EP info stream message; update the UMP attributes */
 static int ump_handle_ep_info_msg(struct snd_ump_endpoint *ump,
                                  const union snd_ump_stream_msg *buf)
@@ -719,6 +728,7 @@ static int ump_handle_ep_info_msg(struct snd_ump_endpoint *ump,
 
        ump->info.protocol &= ump->info.protocol_caps;
        choose_default_protocol(ump);
+       seq_notify_ep_change(ump);
 
        return 1; /* finished */
 }
@@ -741,6 +751,7 @@ static int ump_handle_device_info_msg(struct snd_ump_endpoint *ump,
                ump->info.family_id,
                ump->info.model_id,
                ump->info.sw_revision);
+       seq_notify_ep_change(ump);
        return 1; /* finished */
 }
 
@@ -762,6 +773,7 @@ static int ump_handle_ep_name_msg(struct snd_ump_endpoint *ump,
        if (ret && ump->parsed) {
                ump_set_rawmidi_name(ump);
                ump_legacy_set_rawmidi_name(ump);
+               seq_notify_ep_change(ump);
        }
 
        return ret;
@@ -771,9 +783,14 @@ static int ump_handle_ep_name_msg(struct snd_ump_endpoint *ump,
 static int ump_handle_product_id_msg(struct snd_ump_endpoint *ump,
                                     const union snd_ump_stream_msg *buf)
 {
-       return ump_append_string(ump, ump->info.product_id,
-                                sizeof(ump->info.product_id),
-                                buf->raw, 2);
+       int ret;
+
+       ret = ump_append_string(ump, ump->info.product_id,
+                               sizeof(ump->info.product_id),
+                               buf->raw, 2);
+       if (ret)
+               seq_notify_ep_change(ump);
+       return ret;
 }
 
 /* notify the protocol change to sequencer */