Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 14 Aug 2019 22:13:11 +0000 (UTC)
From:      John Baldwin <jhb@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r351054 - head/sys/x86/x86
Message-ID:  <201908142213.x7EMDB8m040500@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jhb
Date: Wed Aug 14 22:13:11 2019
New Revision: 351054
URL: https://svnweb.freebsd.org/changeset/base/351054

Log:
  Stop listing "on motherboard" as the parent of nexus devices on x86.
  
  Reviewed by:	imp
  Differential Revision:	https://reviews.freebsd.org/D21256

Modified:
  head/sys/x86/x86/io_apic.c
  head/sys/x86/x86/legacy.c
  head/sys/x86/x86/nexus.c

Modified: head/sys/x86/x86/io_apic.c
==============================================================================
--- head/sys/x86/x86/io_apic.c	Wed Aug 14 20:58:50 2019	(r351053)
+++ head/sys/x86/x86/io_apic.c	Wed Aug 14 22:13:11 2019	(r351054)
@@ -924,7 +924,7 @@ ioapic_register(void *cookie)
 	flags = ioapic_read(apic, IOAPIC_VER) & IOART_VER_VERSION;
 	STAILQ_INSERT_TAIL(&ioapic_list, io, io_next);
 	mtx_unlock_spin(&icu_lock);
-	printf("ioapic%u <Version %u.%u> irqs %u-%u on motherboard\n",
+	printf("ioapic%u <Version %u.%u> irqs %u-%u\n",
 	    io->io_id, flags >> 4, flags & 0xf, io->io_intbase,
 	    io->io_intbase + io->io_numintr - 1);
 

Modified: head/sys/x86/x86/legacy.c
==============================================================================
--- head/sys/x86/x86/legacy.c	Wed Aug 14 20:58:50 2019	(r351053)
+++ head/sys/x86/x86/legacy.c	Wed Aug 14 22:13:11 2019	(r351054)
@@ -169,8 +169,7 @@ legacy_attach(device_t dev)
 	bus_generic_attach(dev);
 
 	/*
-	 * If we didn't see ISA on a pci bridge, create some
-	 * connection points now so they show up "on motherboard".
+	 * If we didn't see ISA on a PCI bridge, add a top-level bus.
 	 */
 	if (!devclass_get_device(devclass_find("isa"), 0)) {
 		child = BUS_ADD_CHILD(dev, 0, "isa", 0);
@@ -191,7 +190,7 @@ legacy_print_child(device_t bus, device_t child)
 	retval += bus_print_child_header(bus, child);
 	if (atdev->lg_pcibus != -1)
 		retval += printf(" pcibus %d", atdev->lg_pcibus);
-	retval += printf(" on motherboard\n");	/* XXX "motherboard", ick */
+	retval += printf("\n");
 
 	return (retval);
 }

Modified: head/sys/x86/x86/nexus.c
==============================================================================
--- head/sys/x86/x86/nexus.c	Wed Aug 14 20:58:50 2019	(r351053)
+++ head/sys/x86/x86/nexus.c	Wed Aug 14 22:13:11 2019	(r351054)
@@ -322,7 +322,7 @@ nexus_print_child(device_t bus, device_t child)
 	retval += nexus_print_all_resources(child);
 	if (device_get_flags(child))
 		retval += printf(" flags %#x", device_get_flags(child));
-	retval += printf(" on motherboard\n");	/* XXX "motherboard", ick */
+	retval += printf("\n");
 
 	return (retval);
 }



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201908142213.x7EMDB8m040500>