[src/trunk]: src/sys/modules/adiantum Create a loaable adiantum module, and m...

[pgoyette <pgoyette%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4ece65d6403d
branches:  trunk
changeset: 364632:4ece65d6403d
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Fri Apr 01 21:09:24 2022 +0000

description:
Create a loaable adiantum module, and make cgd require it.

This enablees use of a loadable cgd module, rather thtan requiring
it to be built-in.

Partially resolves kern/56772

diffstat:

 distrib/sets/lists/debug/module.mi |   4 +++-
 distrib/sets/lists/modules/mi      |   4 +++-
 sys/dev/cgd.c                      |   6 +++---
 sys/modules/Makefile               |   3 ++-
 sys/modules/adiantum/Makefile      |  10 ++++++++++
 5 files changed, 21 insertions(+), 6 deletions(-)

diffs (92 lines):

diff -r b89e68eaf100 -r 4ece65d6403d distrib/sets/lists/debug/module.mi
--- a/distrib/sets/lists/debug/module.mi        Fri Apr 01 20:38:37 2022 +0000
+++ b/distrib/sets/lists/debug/module.mi        Fri Apr 01 21:09:24 2022 +0000
@@ -1,9 +1,11 @@
-# $NetBSD: module.mi,v 1.17 2022/04/01 15:49:11 pgoyette Exp $
+# $NetBSD: module.mi,v 1.18 2022/04/01 21:09:24 pgoyette Exp $
 ./usr/libdata/debug/@MODULEDIR@                                        modules-base-kernel     kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/accf_dataready                 modules-base-kernel     kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/accf_dataready/accf_dataready.kmod.debug       modules-base-kernel     kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/accf_httpready                 modules-base-kernel     kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/accf_httpready/accf_httpready.kmod.debug       modules-base-kernel     kmod,debug
+./usr/libdata/debug/@MODULEDIR@/adiantum                       modules-base-kernel     kmod,debug
+./usr/libdata/debug/@MODULEDIR@/adiantum/adiantum.kmod.debug   modules-base-kernel     kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/adosfs                         modules-base-kernel     kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/adosfs/adosfs.kmod.debug               modules-base-kernel     kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/aio                            modules-base-kernel     kmod,debug
diff -r b89e68eaf100 -r 4ece65d6403d distrib/sets/lists/modules/mi
--- a/distrib/sets/lists/modules/mi     Fri Apr 01 20:38:37 2022 +0000
+++ b/distrib/sets/lists/modules/mi     Fri Apr 01 21:09:24 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.151 2022/04/01 15:49:11 pgoyette Exp $
+# $NetBSD: mi,v 1.152 2022/04/01 21:09:24 pgoyette Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -11,6 +11,8 @@
 ./@MODULEDIR@/accf_httpready/accf_httpready.kmod       modules-base-kernel     kmod
 ./@MODULEDIR@/adosfs                           modules-base-kernel     kmod
 ./@MODULEDIR@/adosfs/adosfs.kmod               modules-base-kernel     kmod
+./@MODULEDIR@/adiantum                         modules-base-kernel     kmod
+./@MODULEDIR@/adiantum/adiantum.kmod           modules-base-kernel     kmod
 ./@MODULEDIR@/aio                              modules-base-kernel     kmod
 ./@MODULEDIR@/aio/aio.kmod                     modules-base-kernel     kmod
 ./@MODULEDIR@/am2315temp                       modules-base-kernel     kmod
diff -r b89e68eaf100 -r 4ece65d6403d sys/dev/cgd.c
--- a/sys/dev/cgd.c     Fri Apr 01 20:38:37 2022 +0000
+++ b/sys/dev/cgd.c     Fri Apr 01 21:09:24 2022 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cgd.c,v 1.144 2022/04/01 00:21:19 riastradh Exp $ */
+/* $NetBSD: cgd.c,v 1.145 2022/04/01 21:09:24 pgoyette Exp $ */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.144 2022/04/01 00:21:19 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.145 2022/04/01 21:09:24 pgoyette Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -1723,7 +1723,7 @@
        aprint_debug("cgd: self-tests passed\n");
 }
 
-MODULE(MODULE_CLASS_DRIVER, cgd, "blowfish,des,dk_subr,bufq_fcfs");
+MODULE(MODULE_CLASS_DRIVER, cgd, "adiantum,blowfish,des,dk_subr,bufq_fcfs");
 
 #ifdef _MODULE
 CFDRIVER_DECL(cgd, DV_DISK, NULL);
diff -r b89e68eaf100 -r 4ece65d6403d sys/modules/Makefile
--- a/sys/modules/Makefile      Fri Apr 01 20:38:37 2022 +0000
+++ b/sys/modules/Makefile      Fri Apr 01 21:09:24 2022 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.263 2022/04/01 15:49:11 pgoyette Exp $
+#      $NetBSD: Makefile,v 1.264 2022/04/01 21:09:24 pgoyette Exp $
 
 .include <bsd.own.mk>
 
@@ -24,6 +24,7 @@
 SUBDIR+=       accf_dataready
 SUBDIR+=       accf_httpready
 SUBDIR+=       adosfs
+SUBDIR+=       adiantum
 SUBDIR+=       aio
 SUBDIR+=       audio
 SUBDIR+=       autofs
diff -r b89e68eaf100 -r 4ece65d6403d sys/modules/adiantum/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/modules/adiantum/Makefile     Fri Apr 01 21:09:24 2022 +0000
@@ -0,0 +1,10 @@
+#      $NetBSD: Makefile,v 1.1 2022/04/01 21:09:24 pgoyette Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${S}/crypto/adiantum
+
+KMOD=  adiantum
+SRCS=  adiantum.c adiantum_selftest.c
+
+.include <bsd.kmodule.mk>