diff options
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/i386/pci/pchb.c | 120 |
1 files changed, 117 insertions, 3 deletions
diff --git a/sys/arch/i386/pci/pchb.c b/sys/arch/i386/pci/pchb.c index 3703fa2a1b8..6aedd48b169 100644 --- a/sys/arch/i386/pci/pchb.c +++ b/sys/arch/i386/pci/pchb.c @@ -1,5 +1,36 @@ +/* $OpenBSD: pchb.c,v 1.7 2000/04/10 20:07:47 mickey Exp $ */ /* $NetBSD: pchb.c,v 1.6 1997/06/06 23:29:16 thorpej Exp $ */ +/* + * Copyright (c) 2000 Michael Shalayeff + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by Michael Shalayeff. + * 4. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR OR HIS RELATIVES BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF MIND, USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGE. + */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. * All rights reserved. @@ -36,18 +67,22 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/types.h> #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> +#include <sys/proc.h> +#include <sys/timeout.h> #include <machine/bus.h> #include <dev/pci/pcivar.h> #include <dev/pci/pcireg.h> - #include <dev/pci/pcidevs.h> +#include <dev/rndvar.h> + +#include <dev/ic/i82802reg.h> + #define PCISET_BRIDGETYPE_MASK 0x3 #define PCISET_TYPE_COMPAT 0x1 #define PCISET_TYPE_AUX 0x2 @@ -65,19 +100,32 @@ #define I82424_BCTL_PCIMEM_BURSTEN 0x01 #define I82424_BCTL_PCI_BURSTEN 0x02 +struct pchb_softc { + struct device sc_dev; + + bus_space_tag_t bt; + bus_space_handle_t bh; + + /* rng stuff */ + int ax; + int i; + struct timeout sc_tmo; +}; + int pchbmatch __P((struct device *, void *, void *)); void pchbattach __P((struct device *, struct device *, void *)); int pchb_print __P((void *, const char *)); struct cfattach pchb_ca = { - sizeof(struct device), pchbmatch, pchbattach + sizeof(struct pchb_softc), pchbmatch, pchbattach }; struct cfdriver pchb_cd = { NULL, "pchb", DV_DULL }; +void pchb_rnd __P((void *v)); int pchbmatch(parent, match, aux) @@ -98,10 +146,12 @@ pchbattach(parent, self, aux) struct device *parent, *self; void *aux; { + struct pchb_softc *sc = (struct pchb_softc *)self; struct pci_attach_args *pa = aux; struct pcibus_attach_args pba; pcireg_t bcreg; u_char bdnum, pbnum; + int i; /* * Print out a description, and configure certain chipsets which @@ -149,6 +199,45 @@ pchbattach(parent, self, aux) printf(": disabled CPU-PCI write posting"); } break; + case PCI_PRODUCT_INTEL_82810E_MCH: + sc->bt = pa->pa_memt; + if (bus_space_map(sc->bt, I82802_IOBASE, I82802_IOSIZE, + 0, &sc->bh) < 0) + break; + + /* probe and init rng */ + if (bus_space_read_1(sc->bt, sc->bh, + I82802_RNG_HWST) & I82802_RNG_HWST_PRESENT) { + int r; + + /* enable RNG */ + bus_space_write_1(sc->bt, sc->bh, + I82802_RNG_HWST, + bus_space_read_1(sc->bt, sc->bh, + I82802_RNG_HWST) | + I82802_RNG_HWST_ENABLE); + + /* + * see if we can read anything, + * and it passed the test + */ + for (i = 1000; i-- && + !(bus_space_read_1(sc->bt, sc->bh, I82802_RNG_RNGST) & + I82802_RNG_RNGST_DATAV); DELAY(10)); + + if (bus_space_read_1(sc->bt, sc->bh, + I82802_RNG_RNGST) & I82802_RNG_RNGST_DATAV + && (r = bus_space_read_1(sc->bt, sc->bh, + I82802_RNG_DATA)) != 0 + /*&& runfipstest()>=0*/) { + printf (": RNG(%x)", r); + + sc->i = 4; + timeout_set(&sc->sc_tmo, pchb_rnd, sc); + timeout_add(&sc->sc_tmo, 1); + } + } + break; default: break; } @@ -168,3 +257,28 @@ pchb_print(aux, pnp) printf(" bus %d", pba->pba_bus); return (UNCONF); } + + +void +pchb_rnd(v) + void *v; +{ + struct pchb_softc *sc = v; + int s, ret = -1; + + s = splhigh(); + if (bus_space_read_1(sc->bt, sc->bh, I82802_RNG_RNGST) & + I82802_RNG_RNGST_DATAV) + ret = bus_space_read_1(sc->bt, sc->bh, I82802_RNG_DATA); + splx(s); + + if (ret >= 0) { + if (sc->i--) + sc->ax = (sc->ax << 8) + ret; + else { + sc->i = 4; + add_true_randomness(ret); + } + } + timeout_add(&sc->sc_tmo, 1); +} |