Commit 10a29de1 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: seq: Allow system notification in atomic 



Currently the system notification helper assumes only the non-atomic
delivery.  For allowing an event delivery in non-atomic context, add
the atomic flag to the helper function.

This is a preliminary change for the support of UMP EP/FB
notification.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20250110155943.31578-8-tiwai@suse.de
parent aca56535

sound/core/seq/seq_clientmgr.c

+1 −1
Original line number Diff line number Diff line
@@ -1476,7 +1476,7 @@ int snd_seq_client_notify_subscription(int client, int port, 
	event.data.connect.dest = info->dest;

	event.data.connect.sender = info->sender;



	return snd_seq_system_notify(client, port, &event);  /* non-atomic */

	return snd_seq_system_notify(client, port, &event, false);  /* non-atomic */

}

sound/core/seq/seq_system.c

+5 −4
Original line number Diff line number Diff line
@@ -78,26 +78,27 @@ static int setheader(struct snd_seq_event * ev, int client, int port) 




/* entry points for broadcasting system events */

void snd_seq_system_broadcast(int client, int port, int type)

void snd_seq_system_broadcast(int client, int port, int type, bool atomic)

{

	struct snd_seq_event ev;

	

	if (setheader(&ev, client, port) < 0)

		return;

	ev.type = type;

	snd_seq_kernel_client_dispatch(sysclient, &ev, 0, 0);

	snd_seq_kernel_client_dispatch(sysclient, &ev, atomic, 0);

}

EXPORT_SYMBOL_GPL(snd_seq_system_broadcast);



/* entry points for broadcasting system events */

int snd_seq_system_notify(int client, int port, struct snd_seq_event *ev)

int snd_seq_system_notify(int client, int port, struct snd_seq_event *ev,

			  bool atomic)

{

	ev->flags = SNDRV_SEQ_EVENT_LENGTH_FIXED;

	ev->source.client = sysclient;

	ev->source.port = announce_port;

	ev->dest.client = client;

	ev->dest.port = port;

	return snd_seq_kernel_client_dispatch(sysclient, ev, 0, 0);

	return snd_seq_kernel_client_dispatch(sysclient, ev, atomic, 0);

}



/* call-back handler for timer events */

sound/core/seq/seq_system.h

+13 −8
Original line number Diff line number Diff line
@@ -10,16 +10,21 @@ 




/* entry points for broadcasting system events */

void snd_seq_system_broadcast(int client, int port, int type);

void snd_seq_system_broadcast(int client, int port, int type, bool atomic);



#define snd_seq_system_client_ev_client_start(client) snd_seq_system_broadcast(client, 0, SNDRV_SEQ_EVENT_CLIENT_START)

#define snd_seq_system_client_ev_client_exit(client) snd_seq_system_broadcast(client, 0, SNDRV_SEQ_EVENT_CLIENT_EXIT)

#define snd_seq_system_client_ev_client_change(client) snd_seq_system_broadcast(client, 0, SNDRV_SEQ_EVENT_CLIENT_CHANGE)

#define snd_seq_system_client_ev_port_start(client, port) snd_seq_system_broadcast(client, port, SNDRV_SEQ_EVENT_PORT_START)

#define snd_seq_system_client_ev_port_exit(client, port) snd_seq_system_broadcast(client, port, SNDRV_SEQ_EVENT_PORT_EXIT)

#define snd_seq_system_client_ev_port_change(client, port) snd_seq_system_broadcast(client, port, SNDRV_SEQ_EVENT_PORT_CHANGE)

/* normal system notification event broadcast */

#define notify_event(client, port, type) \

	snd_seq_system_broadcast(client, port, type, false)



int snd_seq_system_notify(int client, int port, struct snd_seq_event *ev);

#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)

#define snd_seq_system_client_ev_port_start(client, port) notify_event(client, port, SNDRV_SEQ_EVENT_PORT_START)

#define snd_seq_system_client_ev_port_exit(client, port) notify_event(client, port, SNDRV_SEQ_EVENT_PORT_EXIT)

#define snd_seq_system_client_ev_port_change(client, port) notify_event(client, port, SNDRV_SEQ_EVENT_PORT_CHANGE)



int snd_seq_system_notify(int client, int port, struct snd_seq_event *ev,

			  bool atomic);



/* register our internal client */

int snd_seq_system_client_init(void);