Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 5 Apr 2010 18:04:08 +0000 (UTC)
From:      Marius Strobl <marius@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
Subject:   svn commit: r206194 - stable/7/sys/sparc64/pci
Message-ID:  <201004051804.o35I48f3003110@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: marius
Date: Mon Apr  5 18:04:08 2010
New Revision: 206194
URL: http://svn.freebsd.org/changeset/base/206194

Log:
  MFC: r206020
  
  Use device_get_nameunit(9) rather than device_get_name(9) so one can
  identify the reporting bridge in machines with multiple PCI domains.

Modified:
  stable/7/sys/sparc64/pci/psycho.c
  stable/7/sys/sparc64/pci/schizo.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/sparc64/pci/psycho.c
==============================================================================
--- stable/7/sys/sparc64/pci/psycho.c	Mon Apr  5 18:04:01 2010	(r206193)
+++ stable/7/sys/sparc64/pci/psycho.c	Mon Apr  5 18:04:08 2010	(r206194)
@@ -809,7 +809,7 @@ psycho_ue(void *arg)
 	if ((afsr & UEAFSR_P_DTE) != 0)
 		iommu_decode_fault(sc->sc_is, afar);
 	panic("%s: uncorrectable DMA error AFAR %#lx AFSR %#lx",
-	    device_get_name(sc->sc_dev), (u_long)afar, (u_long)afsr);
+	    device_get_nameunit(sc->sc_dev), (u_long)afar, (u_long)afsr);
 	return (FILTER_HANDLED);
 }
 
@@ -839,7 +839,7 @@ psycho_pci_bus(void *arg)
 	afar = PCICTL_READ8(sc, PCR_AFA);
 	afsr = PCICTL_READ8(sc, PCR_AFS);
 	panic("%s: PCI bus %c error AFAR %#lx AFSR %#lx",
-	    device_get_name(sc->sc_dev), 'A' + sc->sc_half, (u_long)afar,
+	    device_get_nameunit(sc->sc_dev), 'A' + sc->sc_half, (u_long)afar,
 	    (u_long)afsr);
 	return (FILTER_HANDLED);
 }

Modified: stable/7/sys/sparc64/pci/schizo.c
==============================================================================
--- stable/7/sys/sparc64/pci/schizo.c	Mon Apr  5 18:04:01 2010	(r206193)
+++ stable/7/sys/sparc64/pci/schizo.c	Mon Apr  5 18:04:08 2010	(r206194)
@@ -804,7 +804,7 @@ schizo_pci_bus(void *arg)
 	}
 
 	panic("%s: PCI bus %c error AFAR %#llx AFSR %#llx PCI CSR %#llx "
-	    "IOMMU %#llx STATUS %#llx", device_get_name(sc->sc_dev),
+	    "IOMMU %#llx STATUS %#llx", device_get_nameunit(sc->sc_dev),
 	    'A' + sc->sc_half, (unsigned long long)afar,
 	    (unsigned long long)afsr, (unsigned long long)csr,
 	    (unsigned long long)iommu, (unsigned long long)status);
@@ -839,7 +839,7 @@ schizo_ue(void *arg)
 			break;
 	mtx_unlock_spin(sc->sc_mtx);
 	panic("%s: uncorrectable DMA error AFAR %#llx AFSR %#llx",
-	    device_get_name(sc->sc_dev), (unsigned long long)afar,
+	    device_get_nameunit(sc->sc_dev), (unsigned long long)afar,
 	    (unsigned long long)afsr);
 	return (FILTER_HANDLED);
 }
@@ -873,7 +873,7 @@ schizo_host_bus(void *arg)
 	uint64_t errlog;
 
 	errlog = SCHIZO_CTRL_READ_8(sc, STX_CTRL_BUS_ERRLOG);
-	panic("%s: %s error %#llx", device_get_name(sc->sc_dev),
+	panic("%s: %s error %#llx", device_get_nameunit(sc->sc_dev),
 	    sc->sc_mode == SCHIZO_MODE_TOM ? "JBus" : "Safari",
 	    (unsigned long long)errlog);
 	return (FILTER_HANDLED);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201004051804.o35I48f3003110>