 @@ -1,14 +1,14 @@
-/*	$NetBSD: ubsec.c,v 1.41 2014/08/10 16:44:36 tls Exp $	*/
+/*	$NetBSD: ubsec.c,v 1.42 2015/04/13 15:43:43 riastradh Exp $	*/
 /* $FreeBSD: src/sys/dev/ubsec/ubsec.c,v 1.6.2.6 2003/01/23 21:06:43 sam Exp $ */
 /*	$OpenBSD: ubsec.c,v 1.143 2009/03/27 13:31:30 reyk Exp$	*/
 /*
  * Copyright (c) 2000 Jason L. Wright (jason@thought.net)
  * Copyright (c) 2000 Theo de Raadt (deraadt@openbsd.org)
  * Copyright (c) 2001 Patrik Lindergren (patrik@ipunplugged.com)
+ *
  * 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.
 @@ -25,27 +25,27 @@
  * SERVICES; LOSS OF 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.
+ *
  * Effort sponsored in part by the Defense Advanced Research Projects
  * Agency (DARPA) and Air Force Research Laboratory, Air Force
  * Materiel Command, USAF, under agreement number F30602-01-2-0537.
+ *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ubsec.c,v 1.41 2014/08/10 16:44:36 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ubsec.c,v 1.42 2015/04/13 15:43:43 riastradh Exp $");
 #undef UBSEC_DEBUG
 /*
  * uBsec 5[56]01, 58xx hardware crypto accelerator
  */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/endian.h>
 #ifdef __NetBSD__
   #define UBSEC_NO_RNG	/* hangs on attach */
 @@ -59,26 +59,28 @@ __KERNEL_RCSID(0, "$NetBSD: ubsec.c,v 1.
 #include <sys/device.h>
 #include <sys/module.h>
 #include <sys/queue.h>
 #include <sys/sysctl.h>
 #include <opencrypto/cryptodev.h>
 #include <opencrypto/xform.h>
 #ifdef __OpenBSD__
  #include <dev/rndvar.h>
  #include <sys/md5k.h>
 #else
  #include <sys/cprng.h>
  #include <sys/md5.h>
  #include <sys/rndpool.h>
  #include <sys/rndsource.h>
 #endif
 #include <sys/sha1.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/ubsecreg.h>
 #include <dev/pci/ubsecvar.h>
 /*
  * Prototypes and count for the pci_device structure
  */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ubsecreg.h,v 1.4 2014/04/19 12:29:24 bad Exp $	*/
+/*	$NetBSD: ubsecreg.h,v 1.5 2015/04/13 15:43:43 riastradh Exp $	*/
 /*	$OpenBSD: ubsecreg.h,v 1.29 2009/03/25 12:17:30 reyk Exp $	*/
 /*
  * Copyright (c) 2000 Theo de Raadt
  * Copyright (c) 2001 Patrik Lindergren (patrik@ipunplugged.com)
+ *
  * 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
 @@ -22,26 +22,29 @@
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF 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.
+ *
  * Effort sponsored in part by the Defense Advanced Research Projects
  * Agency (DARPA) and Air Force Research Laboratory, Air Force
  * Materiel Command, USAF, under agreement number F30602-01-2-0537.
+ *
  */
 #ifndef	_DEV_PCI_UBSECREG_H
 #define	_DEV_PCI_UBSECREG_H
 /*
  * Register definitions for 5601 BlueSteel Networks Ubiquitous Broadband
  * Security "uBSec" chip.  Definitions from revision 2.8 of the product
  * datasheet.
  */
 #define BS_BAR			0x10	/* DMA base address register */
 #define	BS_TRDY_TIMEOUT		0x40	/* TRDY timeout */
 #define	BS_RETRY_TIMEOUT	0x41	/* DMA retry timeout */
 #define	UBS_PCI_RTY_SHIFT			8
 #define	UBS_PCI_RTY_MASK			0xff
 #define	UBS_PCI_RTY(misc) \
 @@ -241,13 +244,15 @@ struct ubsec_ctx_modexp {
 	volatile u_int16_t	me_E_len;	/* E (bits) */
 	volatile u_int16_t	me_N_len;	/* N (bits) */
 	u_int8_t		me_N[2048/8];	/* N */
 };
 struct ubsec_ctx_rsapriv {
 	volatile u_int16_t	rpr_len;	/* command length */
 	volatile u_int16_t	rpr_op;		/* rsaprivate, 0x04 */
 	volatile u_int16_t	rpr_q_len;	/* q (bits) */
 	volatile u_int16_t	rpr_p_len;	/* p (bits) */
 	u_int8_t		rpr_buf[5 * 1024 / 8];	/* parameters: */
 						/* p, q, dp, dq, pinv */
 };
 #endif	/* _DEV_PCI_UBSECREG_H */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ubsecvar.h,v 1.9 2014/04/19 12:29:24 bad Exp $	*/
+/*	$NetBSD: ubsecvar.h,v 1.10 2015/04/13 15:43:43 riastradh Exp $	*/
 /*	$OpenBSD: ubsecvar.h,v 1.38 2009/03/27 13:31:30 reyk Exp $	*/
 /*
  * Copyright (c) 2000 Theo de Raadt
  * Copyright (c) 2001 Patrik Lindergren (patrik@ipunplugged.com)
+ *
  * 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
 @@ -22,26 +22,32 @@
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF 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.
+ *
  * Effort sponsored in part by the Defense Advanced Research Projects
  * Agency (DARPA) and Air Force Research Laboratory, Air Force
  * Materiel Command, USAF, under agreement number F30602-01-2-0537.
+ *
  */
 #ifndef	_DEV_PCI_UBSECVAR_H
 #define	_DEV_PCI_UBSECVAR_H
 #include <sys/types.h>
 #include <sys/rndsource.h>
 /* Maximum queue length */
 #ifndef UBS_MAX_NQUEUE
 #define UBS_MAX_NQUEUE		60
 #endif
 #define	UBS_MAX_SCATTER		64	/* Maximum scatter/gather depth */
 #ifndef UBS_MAX_AGGR
 #define	UBS_MAX_AGGR		17	/* Maximum aggregation count */
 #endif
 #ifndef UBS_MIN_AGGR
 #define	UBS_MIN_AGGR		5	/* < 5827, Maximum aggregation count */
 @@ -230,13 +236,15 @@ struct ubsec_stats {
 	u_int32_t hst_nomap;		/* bus_dmamap_create failed */
 	u_int32_t hst_noload;		/* bus_dmamap_load_* failed */
 	u_int32_t hst_nombuf;		/* MGET* failed */
 	u_int32_t hst_nomcl;		/* MCLGET* failed */
 	u_int32_t hst_totbatch;		/* ops submitted w/o interrupt */
 	u_int32_t hst_maxbatch;		/* max ops submitted together */
 	u_int32_t hst_maxqueue;		/* max ops queued for submission */
 	u_int32_t hst_maxqchip;		/* max mcr1 ops out for processing */
 	u_int32_t hst_mcr1full;		/* MCR1 too busy to take ops */
 	u_int32_t hst_rng;		/* RNG requests */
 	u_int32_t hst_modexp;		/* MOD EXP requests */
 	u_int32_t hst_modexpcrt;	/* MOD EXP CRT requests */
 };
 #endif	/* _DEV_PCI_UBSECVAR_H */