d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Stop listing "on motherboard" as the parent of nexus devices on x86.

Browse Source 
Reviewed by:	imp
Differential Revision:	https://reviews.freebsd.org/D21256
This commit is contained in:
John Baldwin 2019-08-14 22:13:11 +00:00
parent 041f5b3611
commit ea32110781
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/x86/x86/io_apic.c
View File

@ -924,7 +924,7 @@ ioapic_register(void *cookie)
flags = ioapic_read(apic, IOAPIC_VER) & IOART_VER_VERSION; flags = ioapic_read(apic, IOAPIC_VER) & IOART_VER_VERSION;
STAILQ_INSERT_TAIL(&ioapic_list, io, io_next); STAILQ_INSERT_TAIL(&ioapic_list, io, io_next);
mtx_unlock_spin(&icu_lock); 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_id, flags >> 4, flags & 0xf, io->io_intbase,
io->io_intbase + io->io_numintr - 1); io->io_intbase + io->io_numintr - 1);

5
sys/x86/x86/legacy.c
View File

@ -169,8 +169,7 @@ legacy_attach(device_t dev)
bus_generic_attach(dev); bus_generic_attach(dev);
/* /*
* If we didn't see ISA on a pci bridge, create some * If we didn't see ISA on a PCI bridge, add a top-level bus.
* connection points now so they show up "on motherboard".
*/ */
if (!devclass_get_device(devclass_find("isa"), 0)) { if (!devclass_get_device(devclass_find("isa"), 0)) {
child = BUS_ADD_CHILD(dev, 0, "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); retval += bus_print_child_header(bus, child);
if (atdev->lg_pcibus != -1) if (atdev->lg_pcibus != -1)
retval += printf(" pcibus %d", atdev->lg_pcibus); retval += printf(" pcibus %d", atdev->lg_pcibus);
retval += printf(" on motherboard\n"); /* XXX "motherboard", ick */ retval += printf("\n");
return (retval); return (retval);
} }

2
sys/x86/x86/nexus.c
View File

@ -322,7 +322,7 @@ nexus_print_child(device_t bus, device_t child)
retval += nexus_print_all_resources(child); retval += nexus_print_all_resources(child);
if (device_get_flags(child)) if (device_get_flags(child))
retval += printf(" flags %#x", 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); return (retval);
} }