From owner-svn-src-all@FreeBSD.ORG Wed Sep 17 18:55:40 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B784BB0B; Wed, 17 Sep 2014 18:55:40 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 88F9093D; Wed, 17 Sep 2014 18:55:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8HIteAu011432; Wed, 17 Sep 2014 18:55:40 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8HItehx011430; Wed, 17 Sep 2014 18:55:40 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201409171855.s8HItehx011430@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Wed, 17 Sep 2014 18:55:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r271717 - in head/sys: dev/acpica sparc64/pci X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Sep 2014 18:55:40 -0000 Author: jhb Date: Wed Sep 17 18:55:39 2014 New Revision: 271717 URL: http://svnweb.freebsd.org/changeset/base/271717 Log: Revert unrelated changes accidentally committed in r271192. Modified: head/sys/dev/acpica/acpi.c head/sys/sparc64/pci/psycho.c Modified: head/sys/dev/acpica/acpi.c ============================================================================== --- head/sys/dev/acpica/acpi.c Wed Sep 17 18:49:57 2014 (r271716) +++ head/sys/dev/acpica/acpi.c Wed Sep 17 18:55:39 2014 (r271717) @@ -1211,11 +1211,6 @@ acpi_set_resource(device_t dev, device_t if (!(type == SYS_RES_IOPORT && start == CONF1_ADDR_PORT)) #endif { - if (bootverbose) - device_printf(dev, - "Ignoring %s range %#lx-%#lx for %s\n", - type == SYS_RES_MEMORY ? "memory" : "I/O", - start, start + count - 1, acpi_name(ad->ad_handle)); AcpiOsFree(devinfo); return (0); } Modified: head/sys/sparc64/pci/psycho.c ============================================================================== --- head/sys/sparc64/pci/psycho.c Wed Sep 17 18:49:57 2014 (r271716) +++ head/sys/sparc64/pci/psycho.c Wed Sep 17 18:55:39 2014 (r271717) @@ -448,30 +448,24 @@ psycho_attach(device_t dev) i = OF_getprop_alloc(node, "ranges", sizeof(*range), (void **)&range); /* + * Make sure that the expected ranges are present. The + * OFW_PCI_CS_MEM64 one is not currently used though. + */ + if (i != PSYCHO_NRANGE) + panic("%s: unsupported number of ranges", __func__); + /* * Find the addresses of the various bus spaces. * There should not be multiple ones of one kind. * The physical start addresses of the ranges are the configuration, * memory and I/O handles. */ - for (; i >= 0; i--) { + for (i = 0; i < PSYCHO_NRANGE; i++) { j = OFW_PCI_RANGE_CS(&range[i]); if (sc->sc_pci_bh[j] != 0) panic("%s: duplicate range for space %d", __func__, j); sc->sc_pci_bh[j] = OFW_PCI_RANGE_PHYS(&range[i]); } - - /* - * Make sure that the expected ranges are present. The - * OFW_PCI_CS_MEM64 one is not currently used. - */ - if (sc->sc_pci_bh[OFW_PCI_CS_CONFIG] == 0) - panic("%s: missing CONFIG range", __func__); - if (sc->sc_pci_bh[OFW_PCI_CS_IO] == 0) - panic("%s: missing IO range", __func__); - if (sc->sc_pci_bh[OFW_PCI_CS_MEM32] == 0) - panic("%s: missing MEM32 range", __func__); - free(range, M_OFWPROP); /* Register the softc, this is needed for paired Psychos. */