From ea32110781e8107e17ac1d5a852bdb4bf611da64 Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Wed, 14 Aug 2019 22:13:11 +0000 Subject: [PATCH] Stop listing "on motherboard" as the parent of nexus devices on x86. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D21256 --- sys/x86/x86/io_apic.c | 2 +- sys/x86/x86/legacy.c | 5 ++--- sys/x86/x86/nexus.c | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/sys/x86/x86/io_apic.c b/sys/x86/x86/io_apic.c index cf43a18aa073..e66d00211546 100644 --- a/sys/x86/x86/io_apic.c +++ b/sys/x86/x86/io_apic.c @@ -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 irqs %u-%u on motherboard\n", + printf("ioapic%u irqs %u-%u\n", io->io_id, flags >> 4, flags & 0xf, io->io_intbase, io->io_intbase + io->io_numintr - 1); diff --git a/sys/x86/x86/legacy.c b/sys/x86/x86/legacy.c index 7985eebd2ecc..217fa2e23e91 100644 --- a/sys/x86/x86/legacy.c +++ b/sys/x86/x86/legacy.c @@ -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); } diff --git a/sys/x86/x86/nexus.c b/sys/x86/x86/nexus.c index 91877499ca6c..dd609532e23c 100644 --- a/sys/x86/x86/nexus.c +++ b/sys/x86/x86/nexus.c @@ -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); }