Skip to contentSkip to conversation

fall back to reserved minor numbers

RFC PATCH In review Wu Fengguang 2 participants 4 messages May 14, 2010 Sound

lore
Share & tools
lore
#0 lore raw

RFC PATCH 1/1 fall back to reserved minor numbers

When the static minor numbers collide because of too many devices, fall back to the reserved minor numbers 2 and 3.

This for example will allow Intel HDMI audio driver to create three PCM devices (index 3, 7, 8; the minor number of the last index will otherwise collide with the first record device).

The other option is to force enable CONFIG_SND_DYNAMIC_MINORS.

---
 include/sound/minors.h |    4 +++-
 sound/core/sound.c     |   10 ++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)
include/sound/minors.h +3 -1
@@ -35,7 +35,9 @@
 #define SNDRV_MINOR_TIMER		(SNDRV_MINOR_GLOBAL + 1 * 32)
 
 #ifndef CONFIG_SND_DYNAMIC_MINORS
-						/* 2 - 3 (reserved) */
+
+#define SNDRV_MINOR_BACKUP1		2
+#define SNDRV_MINOR_BACKUP2		3
 #define SNDRV_MINOR_HWDEP		4	/* 4 - 7 */
 #define SNDRV_MINOR_RAWMIDI		8	/* 8 - 15 */
 #define SNDRV_MINOR_PCM_PLAYBACK	16	/* 16 - 23 */
sound/core/sound.c +8 -2
@@ -269,8 +269,14 @@ int snd_register_device_for_dev(int type
 	minor = snd_find_free_minor();
 #else
 	minor = snd_kernel_minor(type, card, dev);
-	if (minor >= 0 && snd_minors[minor])
-		minor = -EBUSY;
+	if (minor >= 0) {
+		if (snd_minors[minor])
+			minor = SNDRV_MINOR_BACKUP1;
+		if (snd_minors[minor])
+			minor = SNDRV_MINOR_BACKUP2;
+		if (snd_minors[minor])
+			minor = -EBUSY;
+	}
 #endif
 	if (minor < 0) {
 		mutex_unlock(&sound_mutex);
#1 lore raw

At Fri, 14 May 2010 11:28:28 +0800,

Quoted 11 lines · Wu Fengguang

When the static minor numbers collide because of too many devices, fall back to the reserved minor numbers 2 and 3.

This for example will allow Intel HDMI audio driver to create three PCM devices (index 3, 7, 8; the minor number of the last index will otherwise collide with the first record device).

The other option is to force enable CONFIG_SND_DYNAMIC_MINORS.

Well, frankly, I don't see a big merit of doing this.

Most (all?) 2.6-based distros are using udev, thus CONFIG_SND_DYNAMIC_MINORS should be used there. The rest is for old distros or for some limited systems like embedded devices, and they won't need so much PCM devices.

Even if we do this, it doesn't make sense unless the user-space side creates the corresponding device node.

thanks,

Takashi

Quoted 38 lines
---
 include/sound/minors.h |    4 +++-
 sound/core/sound.c     |   10 ++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)
include/sound/minors.h +3 -1
@@ -35,7 +35,9 @@
 #define SNDRV_MINOR_TIMER		(SNDRV_MINOR_GLOBAL + 1 * 32)
 
 #ifndef CONFIG_SND_DYNAMIC_MINORS
-						/* 2 - 3 (reserved) */
+
+#define SNDRV_MINOR_BACKUP1		2
+#define SNDRV_MINOR_BACKUP2		3
 #define SNDRV_MINOR_HWDEP		4	/* 4 - 7 */
 #define SNDRV_MINOR_RAWMIDI		8	/* 8 - 15 */
 #define SNDRV_MINOR_PCM_PLAYBACK	16	/* 16 - 23 */
sound/core/sound.c +8 -2
@@ -269,8 +269,14 @@ int snd_register_device_for_dev(int type
 	minor = snd_find_free_minor();
 #else
 	minor = snd_kernel_minor(type, card, dev);
-	if (minor >= 0 && snd_minors[minor])
-		minor = -EBUSY;
+	if (minor >= 0) {
+		if (snd_minors[minor])
+			minor = SNDRV_MINOR_BACKUP1;
+		if (snd_minors[minor])
+			minor = SNDRV_MINOR_BACKUP2;
+		if (snd_minors[minor])
+			minor = -EBUSY;
+	}
 #endif
 	if (minor < 0) {
 		mutex_unlock(&sound_mutex);
#2 lore raw
Quoted 16 lines · Takashi Iwai

At Fri, 14 May 2010 11:28:28 +0800,

Quoted 11 lines · Wu Fengguang

When the static minor numbers collide because of too many devices, fall back to the reserved minor numbers 2 and 3.

This for example will allow Intel HDMI audio driver to create three PCM devices (index 3, 7, 8; the minor number of the last index will otherwise collide with the first record device).

The other option is to force enable CONFIG_SND_DYNAMIC_MINORS.

Well, frankly, I don't see a big merit of doing this.

Quoted 7 lines

Most (all?) 2.6-based distros are using udev, thus CONFIG_SND_DYNAMIC_MINORS should be used there. The rest is for old distros or for some limited systems like embedded devices, and they won't need so much PCM devices.

Even if we do this, it doesn't make sense unless the user-space side creates the corresponding device node.

I was afraid of this case: an embedded system with G45 HDMI codec. This codec only has 1 PCM playback device, however the driver still requires enabling CONFIG_SND_DYNAMIC_MINORS in order to support more capable HDMI codecs.

Thanks,
Fengguang

#3 lore raw

At Fri, 14 May 2010 16:55:26 +0800,

Quoted 23 lines · Wu Fengguang
Quoted 21 lines · Takashi Iwai

At Fri, 14 May 2010 11:28:28 +0800,

Quoted 11 lines · Wu Fengguang

When the static minor numbers collide because of too many devices, fall back to the reserved minor numbers 2 and 3.

This for example will allow Intel HDMI audio driver to create three PCM devices (index 3, 7, 8; the minor number of the last index will otherwise collide with the first record device).

The other option is to force enable CONFIG_SND_DYNAMIC_MINORS.

Well, frankly, I don't see a big merit of doing this.

Most (all?) 2.6-based distros are using udev, thus CONFIG_SND_DYNAMIC_MINORS should be used there. The rest is for old distros or for some limited systems like embedded devices, and they won't need so much PCM devices.

Quoted 7 lines
Quoted 2 lines

Even if we do this, it doesn't make sense unless the user-space side creates the corresponding device node.

I was afraid of this case: an embedded system with G45 HDMI codec. This codec only has 1 PCM playback device, however the driver still requires enabling CONFIG_SND_DYNAMIC_MINORS in order to support more capable HDMI codecs.

It's 2.6 kernel and no udev? It must be a rare case. In such a case, they can patch it out by themselves.

Takashi