diff options
author | marius <marius@FreeBSD.org> | 2008-05-07 21:22:15 +0000 |
---|---|---|
committer | marius <marius@FreeBSD.org> | 2008-05-07 21:22:15 +0000 |
commit | 57e87ccecba1cf8105d49f6403df79e7ec9960ed (patch) | |
tree | 8c981a4b54e567c6ee9de5615f4b1f1df4b2d718 /sys/sparc64/pci | |
parent | 1960aee8832e4bb01564e1c0a25fba64d5a74d68 (diff) | |
download | FreeBSD-src-57e87ccecba1cf8105d49f6403df79e7ec9960ed.zip FreeBSD-src-57e87ccecba1cf8105d49f6403df79e7ec9960ed.tar.gz |
- Use the name returned by device_get_nameunit(9) for the name of the
counter-timer timecounter so the associated SYSCTL nodes don't clash on
machines having multiple U2P and U2S bridges as well as establishing a
clear mapping between these bridges and their timecounter device.
- Don't bother setting up a "nice" name for the IOMMU, just use the name
returned by device_get_nameunit(9), too.
- Fix some minor style(9) bugs.
- Use __FBSDID in counter.c
MFC after: 1 week
Diffstat (limited to 'sys/sparc64/pci')
-rw-r--r-- | sys/sparc64/pci/psycho.c | 44 |
1 files changed, 19 insertions, 25 deletions
diff --git a/sys/sparc64/pci/psycho.c b/sys/sparc64/pci/psycho.c index 4ea8d73..034e794 100644 --- a/sys/sparc64/pci/psycho.c +++ b/sys/sparc64/pci/psycho.c @@ -345,7 +345,7 @@ psycho_attach(device_t dev) /* * Match other Psycho's that are already configured against - * the base physical address. This will be the same for a + * the base physical address. This will be the same for a * pair of devices that share register space. */ osc = NULL; @@ -464,8 +464,8 @@ psycho_attach(device_t dev) nrange = 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. + * Make sure that the expected ranges are present. The + * OFW_PCI_CS_MEM64 one is not currently used though. */ if (nrange != PSYCHO_NRANGE) panic("%s: unsupported number of ranges", __func__); @@ -510,7 +510,7 @@ psycho_attach(device_t dev) #ifdef PSYCHO_DEBUG /* * Enable all interrupts and clear all interrupt - * states. This aids the debugging of interrupt + * states. This aids the debugging of interrupt * routing problems. */ device_printf(dev, @@ -571,7 +571,8 @@ psycho_attach(device_t dev) #endif /* PSYCHO_MAP_WAKEUP */ /* Initialize the counter-timer. */ - sparc64_counter_init(rman_get_bustag(sc->sc_mem_res), + sparc64_counter_init(device_get_nameunit(dev), + rman_get_bustag(sc->sc_mem_res), rman_get_bushandle(sc->sc_mem_res), PSR_TC0); } @@ -610,7 +611,7 @@ psycho_attach(device_t dev) /* * Register a PCI bus error interrupt handler according to which - * half this is. Hummingbird/Sabre don't have a PCI bus B error + * half this is. Hummingbird/Sabre don't have a PCI bus B error * interrupt but they are also only used for PCI bus A. */ psycho_set_intr(sc, 0, sc->sc_half == 0 ? PSR_PCIAERR_INT_MAP : @@ -666,8 +667,8 @@ psycho_attach(device_t dev) /* * On E250 the interrupt map entry for the EBus bridge is wrong, * causing incorrect interrupts to be assigned to some devices on - * the EBus. Work around it by changing our copy of the interrupt - * map mask to perform a full comparison of the INO. That way + * the EBus. Work around it by changing our copy of the interrupt + * map mask to perform a full comparison of the INO. That way * the interrupt map entry for the EBus bridge won't match at all * and the INOs specified in the "interrupts" properties of the * EBus devices will be used directly instead. @@ -782,7 +783,7 @@ psycho_ue(void *arg) /* * On the UltraSPARC-IIi/IIe, IOMMU misses/protection faults cause * the AFAR to be set to the physical address of the TTE entry that - * was invalid/write protected. Call into the iommu code to have + * was invalid/write protected. Call into the IOMMU code to have * them decoded to virtual I/O addresses. */ if ((afsr & UEAFSR_P_DTE) != 0) @@ -871,7 +872,6 @@ psycho_wakeup(void *arg) static void psycho_iommu_init(struct psycho_softc *sc, int tsbsize, uint32_t dvmabase) { - char *name; struct iommu_state *is = sc->sc_is; /* Punch in our copies. */ @@ -884,13 +884,7 @@ psycho_iommu_init(struct psycho_softc *sc, int tsbsize, uint32_t dvmabase) is->is_dva = PSR_IOMMU_SVADIAG; is->is_dtcmp = PSR_IOMMU_TLB_CMP_DIAG; - /* Give us a nice name... */ - name = malloc(32, M_DEVBUF, M_NOWAIT); - if (name == NULL) - panic("%s: could not malloc iommu name", __func__); - snprintf(name, 32, "%s dvma", device_get_nameunit(sc->sc_dev)); - - iommu_init(name, is, tsbsize, dvmabase, 0); + iommu_init(device_get_nameunit(sc->sc_dev), is, tsbsize, dvmabase, 0); } static int @@ -921,10 +915,10 @@ psycho_read_config(device_t dev, u_int bus, u_int slot, u_int func, u_int reg, * only allow their config space to be accessed using the * "native" width of the respective register being accessed * and return semi-random other content of their config space - * otherwise. Given that the PCI specs don't say anything + * otherwise. Given that the PCI specs don't say anything * about such a (unusual) limitation and lots of stuff expects * to be able to access the contents of the config space at - * any width we allow just that. We do this by using a copy + * any width we allow just that. We do this by using a copy * of the header of the bridge (the rest is all zero anyway) * read during attach (expect for PCIR_STATUS) in order to * simplify things. @@ -1027,7 +1021,7 @@ psycho_route_interrupt(device_t bridge, device_t dev, int pin) /* * If this is outside of the range for an intpin, it's likely a full * INO, and no mapping is required at all; this happens on the U30, - * where there's no interrupt map at the Psycho node. Fortunately, + * where there's no interrupt map at the Psycho node. Fortunately, * there seem to be no INOs in the intpin range on this boxen, so * this easy heuristics will do. */ @@ -1035,7 +1029,7 @@ psycho_route_interrupt(device_t bridge, device_t dev, int pin) return (pin); /* * Guess the INO; we always assume that this is a non-OBIO - * device, and that pin is a "real" intpin number. Determine + * device, and that pin is a "real" intpin number. Determine * the mapping register to be used by the slot number. * We only need to do this on E450s, it seems; here, the slot numbers * for bus A are one-based, while those for bus B seemingly have an @@ -1146,7 +1140,7 @@ psycho_setup_intr(device_t dev, device_t child, struct resource *ires, /* * The Sabre-APB-combination has a bug where it does not drain * DMA write data for devices behind additional PCI-PCI bridges - * underneath the APB PCI-PCI bridge. The workaround is to do + * underneath the APB PCI-PCI bridge. The workaround is to do * a read on the farest PCI-PCI bridge followed by a read of the * PCI DMA write sync register of the Sabre. * XXX installing the wrapper for an affected device and the @@ -1260,10 +1254,10 @@ psycho_alloc_resource(device_t bus, device_t child, int type, int *rid, if (type == SYS_RES_IRQ) { /* * XXX: Don't accept blank ranges for now, only single - * interrupts. The other case should not happen with the - * MI PCI code... + * interrupts. The other case should not happen with + * the MI PCI code... * XXX: This may return a resource that is out of the - * range that was specified. Is this correct...? + * range that was specified. Is this correct...? */ if (start != end) panic("%s: XXX: interrupt range", __func__); |