From owner-svn-src-head@freebsd.org Wed Aug 14 22:13:12 2019 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7F353BD543; Wed, 14 Aug 2019 22:13:12 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4683kJ2VCWz44F2; Wed, 14 Aug 2019 22:13:12 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1DC3C6BBE; Wed, 14 Aug 2019 22:13:12 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7EMDCMx040503; Wed, 14 Aug 2019 22:13:12 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7EMDB8m040500; Wed, 14 Aug 2019 22:13:11 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201908142213.x7EMDB8m040500@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Wed, 14 Aug 2019 22:13:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r351054 - head/sys/x86/x86 X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: head/sys/x86/x86 X-SVN-Commit-Revision: 351054 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Aug 2019 22:13:12 -0000 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 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); 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); }