14628 ancient devicedb should be removed

Reviewed by: Robert Mustacchi <rm@fingolfin.org> Reviewed by: Toomas Soome <tsoome@me.com> Approved by: Dan McDonald <danmcd@mnx.io>
illumos · May 17, 2022 · d403934 · d403934
1 parent 68c72dd
commit d403934
Show file tree

Hide file tree

Showing 13 changed files with 232 additions and 1,031 deletions.
diff --git a/usr/src/cmd/boot/filelist/i386/filelist.ramdisk b/usr/src/cmd/boot/filelist/i386/filelist.ramdisk
@@ -1,6 +1,5 @@
 boot/acpi/tables
 boot/solaris/bootenv.rc
-boot/solaris/devicedb/master
 etc/cluster/nodeid
 etc/dacf.conf
 etc/devices/devid_cache

diff --git a/usr/src/pkg/manifests/system-boot-real-mode.p5m b/usr/src/pkg/manifests/system-boot-real-mode.p5m
@@ -38,14 +38,7 @@ $(i386_ONLY)dir path=boot/solaris group=sys
 $(i386_ONLY)hardlink path=boot/solaris.xpm target=splashimage.xpm
 $(i386_ONLY)file path=boot/solaris/bootenv.rc group=sys \
     original_name=SUNWrmodr:boot/solaris/bootenv.rc preserve=renamenew
-$(i386_ONLY)dir path=boot/solaris/devicedb group=sys
-$(i386_ONLY)file path=boot/solaris/devicedb/master group=sys \
-    original_name=SUNWrmod:boot/solaris/devicedb/master preserve=true
 $(i386_ONLY)file path=boot/splashimage.xpm group=sys
-$(i386_ONLY)dir path=usr group=sys
-$(i386_ONLY)dir path=usr/lib
-$(i386_ONLY)dir path=usr/lib/fs group=sys
-$(i386_ONLY)dir path=usr/lib/fs/ufs group=sys
 $(i386_ONLY)legacy pkg=SUNWrmodr desc="Realmode Modules, (Root)" \
     name="Realmode Modules, (Root)"
 $(i386_ONLY)legacy pkg=SUNWrmodu desc="Realmode Modules, (Usr)" \

diff --git a/usr/src/pkg/manifests/system-kernel.p5m b/usr/src/pkg/manifests/system-kernel.p5m
@@ -659,8 +659,7 @@ driver name=ufm perms="ufm 0666 root sys"
 $(i386_ONLY)driver name=vgatext \
     alias=pciclass,000100 \
     alias=pciclass,030000 \
-    alias=pciclass,030001 \
-    alias=pnpPNP,900
+    alias=pciclass,030001
 driver name=vnic perms="* 0666 root sys" clone_perms="vnic 0666 root sys"
 driver name=wc perms="* 0600 root sys"
 legacy pkg=SUNWckr \

diff --git a/usr/src/uts/common/io/i8042.c b/usr/src/uts/common/io/i8042.c
@@ -1535,7 +1535,10 @@ alloc_kb_mouse(dev_info_t *i8042_dip, int nodes_needed)
 	int acpi_off = 0;
 	char *acpi_prop;
 
-	/* don't alloc unless acpi is off */
+	/*
+	 * If ACPI enumeration is not disabled and has taken place, return
+	 * early and do nothing.
+	 */
 	if (ddi_prop_lookup_string(DDI_DEV_T_ANY, ddi_root_node(),
 	    DDI_PROP_DONTPASS, "acpi-enum", &acpi_prop) == DDI_PROP_SUCCESS) {
 		if (strcmp("off", acpi_prop) == 0) {

diff --git a/usr/src/uts/i86pc/io/isa.c b/usr/src/uts/i86pc/io/isa.c
@@ -1206,13 +1206,20 @@ isa_enumerate(int reprogram)
 
 	ndi_devi_enter(isa_dip, &circ);
 
+	/*
+	 * Check whether ACPI enumeration is disabled.
+	 *
+	 * Note this property may also be set if ACPI ISA enumeration has
+	 * failed, to communicate that to the i8042 nexus.
+	 */
 	if (ddi_prop_lookup_string(DDI_DEV_T_ANY, ddi_root_node(),
 	    DDI_PROP_DONTPASS, "acpi-enum", &acpi_prop) == DDI_PROP_SUCCESS) {
+		/* 0 == match == false */
 		acpi_enum = strcmp("off", acpi_prop);
 		ddi_prop_free(acpi_prop);
 	}
 
-	if (acpi_enum) {
+	if (acpi_enum != 0) {
 		if (acpi_isa_device_enum(isa_dip)) {
 			ndi_devi_exit(isa_dip, circ);
 			if (isa_resource_setup() != NDI_SUCCESS) {
@@ -1246,7 +1253,6 @@ isa_enumerate(int reprogram)
 		    (pnode_t)DEVI_SID_NODEID, &xdip);
 		(void) ndi_prop_update_string(DDI_DEV_T_NONE, xdip,
 		    "compatible", "pnpPNP,500");
-		/* This should be gotten from master file: */
 		(void) ndi_prop_update_string(DDI_DEV_T_NONE, xdip,
 		    "model", "Standard PC COM port");
 		(void) ndi_prop_update_int_array(DDI_DEV_T_NONE, xdip,
@@ -1346,7 +1352,6 @@ enumerate_BIOS_serial(dev_info_t *isa_dip)
 			    (pnode_t)DEVI_SID_NODEID, &xdip);
 			(void) ndi_prop_update_string(DDI_DEV_T_NONE, xdip,
 			    "compatible", "pnpPNP,500");
-			/* This should be gotten from master file: */
 			(void) ndi_prop_update_string(DDI_DEV_T_NONE, xdip,
 			    "model", "Standard PC COM port");
 			(void) ndi_prop_update_int_array(DDI_DEV_T_NONE, xdip,

diff --git a/usr/src/uts/intel/Makefile.files b/usr/src/uts/intel/Makefile.files
@@ -227,7 +227,7 @@ ACPICA_OBJS	+= \
 		   utxferror.o utxfinit.o utxfmutex.o utresdecode.o \
 		   utstrsuppt.o utstrtoul64.o \
 		   \
-		   acpi_enum.o acpica_ec.o acpica.o ahids.o master_ops.o \
+		   acpi_enum.o acpica_ec.o acpica.o ahids.o isapnp_devs.o \
 		   osl_ml.o osl.o
 
 

diff --git a/usr/src/uts/intel/config/Makefile b/usr/src/uts/intel/config/Makefile
@@ -51,13 +51,11 @@ SECCONFIG	= device_policy priv_names
 BOOTIMAGE	= splashimage.xpm
 ALTBOOTIMAGE	= solaris.xpm	# Temporary, for compatibility
 BOOTENVRC	= bootenv.rc
-DEVMASTER	= master
 FILEMODE	= 644
 ROOTETC		= $(ROOT)/etc
 ROOTETCSEC	= $(ROOTETC)/security
 ROOTBOOT	= $(ROOT)/boot
 BOOTSOLARIS	= $(ROOTBOOT)/solaris
-BOOTDEVICEDB	= $(BOOTSOLARIS)/devicedb
 
 SRCFILES	= $(CONFIGFILES:%=$(SRCDIR)/%) $(SECCONFIG:%=$(SRCDIR)/%)
 SRCFILES	+= $(BOOTIMAGE:%=$(SRCDIR)/%)
@@ -66,7 +64,6 @@ SRCFILES	+= $(DEVMASTER:%=$(SRCDIR)/%)
 ROOTCONFIGFILES	= $(CONFIGFILES:%=$(ROOTETC)/%) $(SECCONFIG:%=$(ROOTETCSEC)/%)
 ROOTCONFIGFILES	+= $(BOOTIMAGE:%=$(ROOTBOOT)/%)
 ROOTCONFIGFILES	+= $(BOOTENVRC:%=$(BOOTSOLARIS)/%)
-ROOTCONFIGFILES	+= $(DEVMASTER:%=$(BOOTDEVICEDB)/%)
 ROOTALTBOOTIMAGE = $(ALTBOOTIMAGE:%=$(ROOTBOOT)/%)
 
 #
@@ -101,19 +98,12 @@ $(ROOTBOOT)/%: $(ROOTBOOT) $(SRCDIR)/%
 $(ROOTBOOT)/solaris.xpm: $(ROOTBOOT)/splashimage.xpm
 	$(RM) $@; $(LN) $(ROOTBOOT)/splashimage.xpm $@
 
-
 $(BOOTSOLARIS):
 	$(INS) -s -d -m $(DIRMODE) $@
 
 $(BOOTSOLARIS)/%: $(BOOTSOLARIS) $(SRCDIR)/%
 	$(INS.file)
 
-$(BOOTDEVICEDB):
-	$(INS) -s -d -m $(DIRMODE) $@
-
-$(BOOTDEVICEDB)/%: $(BOOTDEVICEDB) $(SRCDIR)/%
-	$(INS.file)
-
 $(SRCDIR)/priv_names: $(PRIVS_DEF) $(PRIVS_AWK)
 	$(AWK) -f $(PRIVS_AWK) < $(PRIVS_DEF) -v pnamesfile=$@