diff options
| author | Jason Wright <jason@cvs.openbsd.org> | 2006-05-28 06:28:09 +0000 |
|---|---|---|
| committer | Jason Wright <jason@cvs.openbsd.org> | 2006-05-28 06:28:09 +0000 |
| commit | 59ebc13934e5baa16d4d2f2325712e16e26f739d (patch) | |
| tree | 67778d984f6b0998da22a81fc87021e60d70c2a8 | |
| parent | 2895715e8201a96043b4ddc37504565867961a77 (diff) | |
don't hardcode the iova... it uses the same scheme as the sbus machines
(cd0 at scsibus0 at siop0 now attaches on the blade2k)
| -rw-r--r-- | sys/arch/sparc64/dev/iommureg.h | 3 | ||||
| -rw-r--r-- | sys/arch/sparc64/dev/schizo.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sys/arch/sparc64/dev/iommureg.h b/sys/arch/sparc64/dev/iommureg.h index d690fa56504..bdf6fa3c311 100644 --- a/sys/arch/sparc64/dev/iommureg.h +++ b/sys/arch/sparc64/dev/iommureg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: iommureg.h,v 1.11 2005/04/26 14:57:11 miod Exp $ */ +/* $OpenBSD: iommureg.h,v 1.12 2006/05/28 06:28:08 jason Exp $ */ /* $NetBSD: iommureg.h,v 1.6 2001/07/20 00:07:13 eeh Exp $ */ /* @@ -93,6 +93,7 @@ struct iommu_strbuf { #define IOTTE_8K 0x0000000000000000LL #define IOTTE_STREAM 0x1000000000000000LL /* Is page streamable? */ #define IOTTE_LOCAL 0x0800000000000000LL /* Accesses to same bus segment? */ +#define IOTTE_CONTEXT 0x07ff800000000000LL /* context number */ #define IOTTE_PAMASK 0x000007ffffffe000LL /* Let's assume this is correct (bits 42..13) */ #define IOTTE_C 0x0000000000000010LL /* Accesses to cacheable space */ #define IOTTE_W 0x0000000000000002LL /* Writeable */ diff --git a/sys/arch/sparc64/dev/schizo.c b/sys/arch/sparc64/dev/schizo.c index 2a3b0800300..582fd538b22 100644 --- a/sys/arch/sparc64/dev/schizo.c +++ b/sys/arch/sparc64/dev/schizo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: schizo.c,v 1.18 2006/03/19 02:43:38 brad Exp $ */ +/* $OpenBSD: schizo.c,v 1.19 2006/05/28 06:28:08 jason Exp $ */ /* * Copyright (c) 2002 Jason L. Wright (jason@thought.net) @@ -247,7 +247,7 @@ schizo_init_iommu(struct schizo_softc *sc, struct schizo_pbm *pbm) panic("couldn't malloc iommu name"); snprintf(name, 32, "%s dvma", sc->sc_dv.dv_xname); - iommu_init(name, is, 128 * 1024, 0xc0000000); + iommu_init(name, is, 128 * 1024, -1); iommu_reset(is); } |