 @@ -1,14 +1,14 @@
-/*	$NetBSD: crypto.c,v 1.92 2017/07/18 06:01:36 knakahara Exp $ */
+/*	$NetBSD: crypto.c,v 1.93 2017/07/20 09:31:36 knakahara Exp $ */
 /*	$FreeBSD: src/sys/opencrypto/crypto.c,v 1.4.2.5 2003/02/26 00:14:05 sam Exp $	*/
 /*	$OpenBSD: crypto.c,v 1.41 2002/07/17 23:52:38 art Exp $	*/
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Coyote Point Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -43,41 +43,42 @@
  * Permission to use, copy, and modify this software with or without fee
  * is hereby granted, provided that this entire notice is included in
  * all source code copies of any software which is or includes a copy or
  * modification of this software.
+ *
  * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR
  * IMPLIED WARRANTY. IN PARTICULAR, NONE OF THE AUTHORS MAKES ANY
  * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE
  * MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
  * PURPOSE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: crypto.c,v 1.92 2017/07/18 06:01:36 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: crypto.c,v 1.93 2017/07/20 09:31:36 knakahara Exp $");
 #include <sys/param.h>
 #include <sys/reboot.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/pool.h>
 #include <sys/kthread.h>
 #include <sys/once.h>
 #include <sys/sysctl.h>
 #include <sys/intr.h>
 #include <sys/errno.h>
 #include <sys/module.h>
 #include <sys/xcall.h>
 #include <sys/device.h>
 #if defined(_KERNEL_OPT)
 #include "opt_ocf.h"
 #endif
 #include <opencrypto/cryptodev.h>
 #include <opencrypto/xform.h>			/* XXX for M_XDATA */
 static kmutex_t crypto_q_mtx;
 static kmutex_t crypto_ret_q_mtx;
 /* below are kludges for residual code wrtitten to FreeBSD interfaces */
   #define SWI_CRYPTO 17
 @@ -372,26 +373,28 @@ MALLOC_DEFINE(M_CRYPTO_DATA, "crypto", "
 static	void cryptointr(void);		/* swi thread to dispatch ops */
 static	void cryptoret_softint(void *);	/* kernel thread for callbacks*/
 static	int crypto_destroy(bool);
 static	int crypto_invoke(struct cryptop *crp, int hint);
 static	int crypto_kinvoke(struct cryptkop *krp, int hint);
 static struct cryptocap *crypto_checkdriver_lock(u_int32_t);
 static struct cryptocap *crypto_checkdriver_uninit(u_int32_t);
 static struct cryptocap *crypto_checkdriver(u_int32_t);
 static void crypto_driver_lock(struct cryptocap *);
 static void crypto_driver_unlock(struct cryptocap *);
 static void crypto_driver_clear(struct cryptocap *);
 static int crypto_init_finalize(device_t);
 static struct cryptostats cryptostats;
 #ifdef CRYPTO_TIMING
 static	int crypto_timing = 0;
 #endif
 static struct sysctllog *sysctl_opencrypto_clog;
 static int
 crypto_init0(void)
+{
 	mutex_init(&crypto_drv_mtx, MUTEX_DEFAULT, IPL_NONE);
 	mutex_init(&crypto_q_mtx, MUTEX_DEFAULT, IPL_NONE);
 @@ -407,38 +410,52 @@ crypto_init0(void)
 	    sizeof(struct cryptocap), M_CRYPTO_DATA, M_NOWAIT | M_ZERO);
 	if (crypto_drivers == NULL) {
 		printf("crypto_init: cannot malloc driver table\n");
 		return ENOMEM;
+	}
 	crypto_drivers_num = CRYPTO_DRIVERS_INITIAL;
 	softintr_cookie = register_swi(SWI_CRYPTO, cryptointr);
 	if (softintr_cookie == NULL) {
 		printf("crypto_init: cannot establish request queue handler\n");
 		return crypto_destroy(false);
+	}
-	crypto_ret_si = softint_establish(SOFTINT_NET|SOFTINT_MPSAFE|SOFTINT_RCPU,
+	/*
-	    &cryptoret_softint, NULL);
+	 * Some encryption devices(such as mvcesa) is attached before
-	if (crypto_ret_si == NULL) {
+	 * ipi_sysinit(). That causes assertion in ipi_register() as
-		printf("crypto_init: cannot establish ret queue handler\n");
+	 * crypto_ret_si softint uses SOFTINT_RCPU.
 	 */
 	if (config_finalize_register(NULL, crypto_init_finalize) != 0) {
 		printf("crypto_init: cannot register crypto_init_finalize\n");
 		return crypto_destroy(false);
+	}
 	sysctl_opencrypto_setup(&sysctl_opencrypto_clog);
 	return 0;
+}
 static int
 crypto_init_finalize(device_t self __unused)
+{
 	crypto_ret_si = softint_establish(SOFTINT_NET|SOFTINT_MPSAFE|SOFTINT_RCPU,
 	    &cryptoret_softint, NULL);
 	KASSERT(crypto_ret_si != NULL);
 	return 0;
+}
 int
 crypto_init(void)
+{
 	static ONCE_DECL(crypto_init_once);
 	return RUN_ONCE(&crypto_init_once, crypto_init0);
+}
 static int
 crypto_destroy(bool exit_kthread)
+{
 	int i;