svn commit: r271717 - in head/sys: dev/acpica sparc64/pci

John Baldwin jhb at FreeBSD.org
Wed Sep 17 18:55:40 UTC 2014


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. */


More information about the svn-src-head mailing list