Deleted Added
full compact
ubsec.c (243857) ubsec.c (254263)
1/* $OpenBSD: ubsec.c,v 1.115 2002/09/24 18:33:26 jason Exp $ */
2
3/*-
4 * Copyright (c) 2000 Jason L. Wright (jason@thought.net)
5 * Copyright (c) 2000 Theo de Raadt (deraadt@openbsd.org)
6 * Copyright (c) 2001 Patrik Lindergren (patrik@ipunplugged.com)
7 *
8 * All rights reserved.

--- 25 unchanged lines hidden (view full) ---

34 * POSSIBILITY OF SUCH DAMAGE.
35 *
36 * Effort sponsored in part by the Defense Advanced Research Projects
37 * Agency (DARPA) and Air Force Research Laboratory, Air Force
38 * Materiel Command, USAF, under agreement number F30602-01-2-0537.
39 */
40
41#include <sys/cdefs.h>
1/* $OpenBSD: ubsec.c,v 1.115 2002/09/24 18:33:26 jason Exp $ */
2
3/*-
4 * Copyright (c) 2000 Jason L. Wright (jason@thought.net)
5 * Copyright (c) 2000 Theo de Raadt (deraadt@openbsd.org)
6 * Copyright (c) 2001 Patrik Lindergren (patrik@ipunplugged.com)
7 *
8 * All rights reserved.

--- 25 unchanged lines hidden (view full) ---

34 * POSSIBILITY OF SUCH DAMAGE.
35 *
36 * Effort sponsored in part by the Defense Advanced Research Projects
37 * Agency (DARPA) and Air Force Research Laboratory, Air Force
38 * Materiel Command, USAF, under agreement number F30602-01-2-0537.
39 */
40
41#include <sys/cdefs.h>
42__FBSDID("$FreeBSD: head/sys/dev/ubsec/ubsec.c 243857 2012-12-04 09:32:43Z glebius $");
42__FBSDID("$FreeBSD: head/sys/dev/ubsec/ubsec.c 254263 2013-08-12 23:30:01Z scottl $");
43
44/*
45 * uBsec 5[56]01, 58xx hardware crypto accelerator
46 */
47
48#include "opt_ubsec.h"
49
50#include <sys/param.h>

--- 211 unchanged lines hidden (view full) ---

262 random_harvest(buf, count, count*NBBY, 0, RANDOM_PURE);
263}
264
265static int
266ubsec_attach(device_t dev)
267{
268 struct ubsec_softc *sc = device_get_softc(dev);
269 struct ubsec_dma *dmap;
43
44/*
45 * uBsec 5[56]01, 58xx hardware crypto accelerator
46 */
47
48#include "opt_ubsec.h"
49
50#include <sys/param.h>

--- 211 unchanged lines hidden (view full) ---

262 random_harvest(buf, count, count*NBBY, 0, RANDOM_PURE);
263}
264
265static int
266ubsec_attach(device_t dev)
267{
268 struct ubsec_softc *sc = device_get_softc(dev);
269 struct ubsec_dma *dmap;
270 u_int32_t cmd, i;
270 u_int32_t i;
271 int rid;
272
273 bzero(sc, sizeof (*sc));
274 sc->sc_dev = dev;
275
276 SIMPLEQ_INIT(&sc->sc_queue);
277 SIMPLEQ_INIT(&sc->sc_qchip);
278 SIMPLEQ_INIT(&sc->sc_queue2);

--- 28 unchanged lines hidden (view full) ---

307 pci_get_device(dev) == PCI_PRODUCT_SUN_5821))) {
308 /* NB: the 5821/5822 defines some additional status bits */
309 sc->sc_statmask |= BS_STAT_MCR1_ALLEMPTY |
310 BS_STAT_MCR2_ALLEMPTY;
311 sc->sc_flags |= UBS_FLAGS_KEY | UBS_FLAGS_RNG |
312 UBS_FLAGS_LONGCTX | UBS_FLAGS_HWNORM | UBS_FLAGS_BIGKEY;
313 }
314
271 int rid;
272
273 bzero(sc, sizeof (*sc));
274 sc->sc_dev = dev;
275
276 SIMPLEQ_INIT(&sc->sc_queue);
277 SIMPLEQ_INIT(&sc->sc_qchip);
278 SIMPLEQ_INIT(&sc->sc_queue2);

--- 28 unchanged lines hidden (view full) ---

307 pci_get_device(dev) == PCI_PRODUCT_SUN_5821))) {
308 /* NB: the 5821/5822 defines some additional status bits */
309 sc->sc_statmask |= BS_STAT_MCR1_ALLEMPTY |
310 BS_STAT_MCR2_ALLEMPTY;
311 sc->sc_flags |= UBS_FLAGS_KEY | UBS_FLAGS_RNG |
312 UBS_FLAGS_LONGCTX | UBS_FLAGS_HWNORM | UBS_FLAGS_BIGKEY;
313 }
314
315 cmd = pci_read_config(dev, PCIR_COMMAND, 4);
316 cmd |= PCIM_CMD_MEMEN | PCIM_CMD_BUSMASTEREN;
317 pci_write_config(dev, PCIR_COMMAND, cmd, 4);
318 cmd = pci_read_config(dev, PCIR_COMMAND, 4);
315 pci_enable_busmaster(dev);
319
316
320 if (!(cmd & PCIM_CMD_MEMEN)) {
321 device_printf(dev, "failed to enable memory mapping\n");
322 goto bad;
323 }
324
325 if (!(cmd & PCIM_CMD_BUSMASTEREN)) {
326 device_printf(dev, "failed to enable bus mastering\n");
327 goto bad;
328 }
329
330 /*
331 * Setup memory-mapping of PCI registers.
332 */
333 rid = BS_BAR;
334 sc->sc_sr = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid,
335 RF_ACTIVE);
336 if (sc->sc_sr == NULL) {
337 device_printf(dev, "cannot map register space\n");

--- 2545 unchanged lines hidden ---
317 /*
318 * Setup memory-mapping of PCI registers.
319 */
320 rid = BS_BAR;
321 sc->sc_sr = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid,
322 RF_ACTIVE);
323 if (sc->sc_sr == NULL) {
324 device_printf(dev, "cannot map register space\n");

--- 2545 unchanged lines hidden ---