diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2006-07-01 16:41:27 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2006-07-01 16:41:27 +0000 |
| commit | 7937c561d78b712d86ccecc567ac3775851bb59d (patch) | |
| tree | 6bcc1038b6a61987c64b61d2402d910e7d545f61 | |
| parent | fbfcc4cf531a40dae5234e59b1bccef3ef4523d1 (diff) | |
clean dmesg output for iommu more; tested miod dlg
| -rw-r--r-- | sys/arch/sparc64/dev/iommu.c | 6 | ||||
| -rw-r--r-- | sys/arch/sparc64/dev/psycho.c | 11 | ||||
| -rw-r--r-- | sys/arch/sparc64/dev/schizo.c | 3 |
3 files changed, 9 insertions, 11 deletions
diff --git a/sys/arch/sparc64/dev/iommu.c b/sys/arch/sparc64/dev/iommu.c index 3ffa4930f2f..28cd1618d7e 100644 --- a/sys/arch/sparc64/dev/iommu.c +++ b/sys/arch/sparc64/dev/iommu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: iommu.c,v 1.39 2006/06/28 20:09:15 deraadt Exp $ */ +/* $OpenBSD: iommu.c,v 1.40 2006/07/01 16:41:26 deraadt Exp $ */ /* $NetBSD: iommu.c,v 1.47 2002/02/08 20:03:45 eeh Exp $ */ /* @@ -223,6 +223,7 @@ iommu_init(char *name, struct iommu_state *is, int tsbsize, u_int32_t iovabase) * now actually start up the IOMMU */ iommu_reset(is); + printf("\n"); } /* @@ -249,11 +250,10 @@ iommu_reset(struct iommu_state *is) sb->sb_iommu = is; strbuf_reset(sb); - if (sb->sb_flush) { char buf[64]; bus_space_render_tag(sb->sb_bustag, buf, sizeof buf); - printf("STC%d on %s enabled\n", i, buf); + printf(", STC%d enabled", i); } } } diff --git a/sys/arch/sparc64/dev/psycho.c b/sys/arch/sparc64/dev/psycho.c index 8a1b2d3580d..f1a03025b8c 100644 --- a/sys/arch/sparc64/dev/psycho.c +++ b/sys/arch/sparc64/dev/psycho.c @@ -1,4 +1,4 @@ -/* $OpenBSD: psycho.c,v 1.46 2006/07/01 13:57:50 kettenis Exp $ */ +/* $OpenBSD: psycho.c,v 1.47 2006/07/01 16:41:26 deraadt Exp $ */ /* $NetBSD: psycho.c,v 1.39 2001/10/07 20:30:41 eeh Exp $ */ /* @@ -358,7 +358,7 @@ psycho_attach(struct device *parent, struct device *self, void *aux) pba.pba_bus = psycho_br[0]; pba.pba_bridgetag = NULL; - printf("%s: bus range %u-%u, PCI bus %d", sc->sc_dev.dv_xname, + printf("%s: bus range %u-%u, PCI bus %d\n", sc->sc_dev.dv_xname, psycho_br[0], psycho_br[1], psycho_br[0]); pp->pp_pcictl = sc->sc_pcictl; @@ -476,9 +476,8 @@ psycho_attach(struct device *parent, struct device *self, void *aux) /* Point out iommu at the strbuf_ctl. */ sc->sc_is->is_sb[0] = &pp->pp_sb; - printf(", "); + printf("%s: ", sc->sc_dev.dv_xname); psycho_iommu_init(sc, 2); - printf("\n"); sc->sc_configtag = psycho_alloc_config_tag(sc->sc_psycho_this); if (bus_space_map(sc->sc_configtag, @@ -518,15 +517,15 @@ psycho_attach(struct device *parent, struct device *self, void *aux) /* Point out iommu at the strbuf_ctl. */ sc->sc_is->is_sb[1] = &pp->pp_sb; - printf(", "); + printf("%s: ", sc->sc_dev.dv_xname); printf("dvma map %x-%x, ", sc->sc_is->is_dvmabase, sc->sc_is->is_dvmaend); printf("iotdb %llx-%llx", (unsigned long long)sc->sc_is->is_ptsb, (unsigned long long)(sc->sc_is->is_ptsb + (PAGE_SIZE << sc->sc_is->is_tsbsize))); - printf("\n"); iommu_reset(sc->sc_is); + printf("\n"); } /* diff --git a/sys/arch/sparc64/dev/schizo.c b/sys/arch/sparc64/dev/schizo.c index cfe655e72e3..ed68361301f 100644 --- a/sys/arch/sparc64/dev/schizo.c +++ b/sys/arch/sparc64/dev/schizo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: schizo.c,v 1.32 2006/06/30 05:02:11 deraadt Exp $ */ +/* $OpenBSD: schizo.c,v 1.33 2006/07/01 16:41:26 deraadt Exp $ */ /* * Copyright (c) 2002 Jason L. Wright (jason@thought.net) @@ -378,7 +378,6 @@ schizo_init_iommu(struct schizo_softc *sc, struct schizo_pbm *pbm) } iommu_init(name, is, tsbsize, iobase); - iommu_reset(is); } int |