Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b075dd40 authored by Lucas De Marchi's avatar Lucas De Marchi Committed by Marcel Holtmann
Browse files

Bluetooth: allocate static minor for vhci 



Commit bfacbb9a (Bluetooth: Use devname:vhci module alias for virtual HCI
driver) added the module alias to hci_vhci module so it's possible to
create the /dev/vhci node. However creating an alias without
specifying the minor doesn't allow us to create the node ahead,
triggerring module auto-load when it's first accessed.

Starting with depmod from kmod 16 we started to warn if there's a
devname alias without specifying the major and minor.

Let's do the same done for uhid, kvm, fuse and others, specifying a
fixed minor. In systems with systemd as the init the following will
happen: on early boot systemd will call "kmod static-nodes" to read
/lib/modules/$(uname -r)/modules.devname and then create the nodes. When
first accessed these "dead" nodes will trigger the module loading.

Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 2426f3a5

Documentation/devices.txt

+1 −0
Original line number Diff line number Diff line
@@ -353,6 +353,7 @@ Your cooperation is appreciated. 
		133 = /dev/exttrp	External device trap

		134 = /dev/apm_bios	Advanced Power Management BIOS

		135 = /dev/rtc		Real Time Clock

		137 = /dev/vhci		Bluetooth virtual HCI driver

		139 = /dev/openprom	SPARC OpenBoot PROM

		140 = /dev/relay8	Berkshire Products Octal relay card

		141 = /dev/relay16	Berkshire Products ISO-16 relay card

drivers/bluetooth/hci_vhci.c

+2 −1
Original line number Diff line number Diff line
@@ -359,7 +359,7 @@ static const struct file_operations vhci_fops = { 
static struct miscdevice vhci_miscdev= {

	.name	= "vhci",

	.fops	= &vhci_fops,

	.minor	= MISC_DYNAMIC_MINOR,

	.minor	= VHCI_MINOR,

};



static int __init vhci_init(void)
@@ -385,3 +385,4 @@ MODULE_DESCRIPTION("Bluetooth virtual HCI driver ver " VERSION); 
MODULE_VERSION(VERSION);

MODULE_LICENSE("GPL");

MODULE_ALIAS("devname:vhci");

MODULE_ALIAS_MISCDEV(VHCI_MINOR);

include/linux/miscdevice.h

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#define TEMP_MINOR		131	/* Temperature Sensor */

#define RTC_MINOR		135

#define EFI_RTC_MINOR		136	/* EFI Time services */

#define VHCI_MINOR		137

#define SUN_OPENPROM_MINOR	139

#define DMAPI_MINOR		140	/* DMAPI */

#define NVRAM_MINOR		144