Author: marius
Date: Wed Mar 31 22:32:56 2010
New Revision: 206020
URL: http://svn.freebsd.org/changeset/base/206020
Log:
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:
head/sys/sparc64/pci/psycho.c
head/sys/sparc64/pci/schizo.c
Modified: head/sys/sparc64/pci/psycho.c
==============================================================================
--- head/sys/sparc64/pci/psycho.c Wed Mar 31 22:27:33 2010
(r206019)
+++ head/sys/sparc64/pci/psycho.c Wed Mar 31 22:32:56 2010
(r206020)
@@ -808,7 +808,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);
}
@@ -838,7 +838,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: head/sys/sparc64/pci/schizo.c
==============================================================================
--- head/sys/sparc64/pci/schizo.c Wed Mar 31 22:27:33 2010
(r206019)
+++ head/sys/sparc64/pci/schizo.c Wed Mar 31 22:32:56 2010
(r206020)
@@ -826,7 +826,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);
@@ -861,7 +861,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);
}
@@ -895,7 +895,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);
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
