Module Name: src
Committed By: maxv
Date: Sun Jul 15 05:16:45 UTC 2018
Modified Files:
src/distrib/sets/lists/comp: mi
src/distrib/sets/lists/man: mi
src/share/examples/secmodel: secmodel_example.c
src/share/man/man4: Makefile
src/share/man/man7: hier.7 src.7
src/share/man/man9: Makefile boothowto.9 intro.9 kauth.9 panic.9
secmodel_securelevel.9
src/sys/arch/amigappc/amigappc: locore.S machdep.c
src/sys/arch/arm/arm32: fault.c
src/sys/arch/arm/at91: at91bus.c at91emac.c
src/sys/arch/arm/include/arm32: machdep.h
src/sys/arch/bebox/bebox: locore.S machdep.c
src/sys/arch/evbarm/armadaxp: armadaxp_machdep.c
src/sys/arch/evbarm/beagle: beagle_machdep.c
src/sys/arch/evbarm/gemini: gemini_machdep.c
src/sys/arch/evbarm/imx31: imx31lk_machdep.c
src/sys/arch/evbarm/mmnet: mmnet_machdep.c
src/sys/arch/evbarm/mpcsa: mpcsa_machdep.c
src/sys/arch/evbarm/tisdp24xx: sdp24xx_machdep.c
src/sys/arch/evbppc/ev64260: ev64260_locore.S machdep.c
src/sys/arch/evbppc/mpc85xx: mpc85xx_start.S
src/sys/arch/evbppc/obs405: obs200_locore.S obs200_machdep.c
obs266_machdep.c obs600_machdep.c
src/sys/arch/evbppc/pmppc: machdep.c pmppc_locore.S
src/sys/arch/evbppc/virtex: machdep.c virtex_start.S
src/sys/arch/evbppc/walnut: machdep.c walnut_start.S
src/sys/arch/ibmnws/ibmnws: locore.S
src/sys/arch/macppc/macppc: locore.S machdep.c
src/sys/arch/mvmeppc/mvmeppc: locore.S
src/sys/arch/ofppc/ofppc: locore.S
src/sys/arch/powerpc/conf: files.powerpc
src/sys/arch/powerpc/ibm4xx: genassym.cf ibm4xx_machdep.c trap_subr.S
src/sys/arch/powerpc/ibm4xx/openbios: locore.S
src/sys/arch/powerpc/include: cpu.h
src/sys/arch/powerpc/oea: genassym.cf oea_machdep.c ofwoea_machdep.c
src/sys/arch/powerpc/powerpc: trap_subr.S
src/sys/arch/prep/prep: locore.S
src/sys/arch/rs6000/rs6000: locore.S
src/sys/arch/sandpoint/sandpoint: locore.S machdep.c
src/sys/dev/cadence: if_cemac.c
src/sys/dev/ic: dp8390.c dp8390var.h ne2000.c ne2000var.h
src/sys/dev/ofw: ofnet.c
src/sys/dev/pci: files.pci if_ne_pci.c
src/sys/netinet: udp_usrreq.c
src/sys/secmodel/keylock: secmodel_keylock.c
src/sys/secmodel/securelevel: secmodel_securelevel.c
src/sys/secmodel/suser: secmodel_suser.c
src/sys/sys: kauth.h
Removed Files:
src/share/man/man4: ipkdb.4
src/share/man/man9: ipkdb.9
src/sys/arch/amigappc/include: ipkdb.h
src/sys/arch/bebox/include: ipkdb.h
src/sys/arch/evbppc/include: ipkdb.h
src/sys/arch/ibmnws/include: ipkdb.h
src/sys/arch/macppc/include: ipkdb.h
src/sys/arch/mvmeppc/include: ipkdb.h
src/sys/arch/ofppc/include: ipkdb.h
src/sys/arch/powerpc/include: ipkdb.h
src/sys/arch/powerpc/powerpc: ipkdb_glue.c
src/sys/arch/prep/include: ipkdb.h
src/sys/arch/rs6000/include: ipkdb.h
src/sys/arch/sandpoint/include: ipkdb.h
src/sys/ipkdb: README.port TODO files.ipkdb ipkdb.h ipkdb_if.c
ipkdb_ipkdb.c
Log Message:
Retire ipkdb entirely. The option was removed from the config files
yesterday.
ok kamil christos
To generate a diff of this commit:
cvs rdiff -u -r1.2210 -r1.2211 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.1598 -r1.1599 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.26 -r1.27 src/share/examples/secmodel/secmodel_example.c
cvs rdiff -u -r1.657 -r1.658 src/share/man/man4/Makefile
cvs rdiff -u -r1.7 -r0 src/share/man/man4/ipkdb.4
cvs rdiff -u -r1.129 -r1.130 src/share/man/man7/hier.7
cvs rdiff -u -r1.11 -r1.12 src/share/man/man7/src.7
cvs rdiff -u -r1.428 -r1.429 src/share/man/man9/Makefile
cvs rdiff -u -r1.6 -r1.7 src/share/man/man9/boothowto.9
cvs rdiff -u -r1.22 -r1.23 src/share/man/man9/intro.9
cvs rdiff -u -r1.9 -r0 src/share/man/man9/ipkdb.9
cvs rdiff -u -r1.111 -r1.112 src/share/man/man9/kauth.9
cvs rdiff -u -r1.21 -r1.22 src/share/man/man9/panic.9
cvs rdiff -u -r1.17 -r1.18 src/share/man/man9/secmodel_securelevel.9
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/amigappc/amigappc/locore.S
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/amigappc/amigappc/machdep.c
cvs rdiff -u -r1.1 -r0 src/sys/arch/amigappc/include/ipkdb.h
cvs rdiff -u -r1.105 -r1.106 src/sys/arch/arm/arm32/fault.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/at91/at91bus.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/at91/at91emac.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/include/arm32/machdep.h
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/bebox/bebox/locore.S
cvs rdiff -u -r1.107 -r1.108 src/sys/arch/bebox/bebox/machdep.c
cvs rdiff -u -r1.2 -r0 src/sys/arch/bebox/include/ipkdb.h
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/armadaxp/armadaxp_machdep.c
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/evbarm/beagle/beagle_machdep.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/evbarm/gemini/gemini_machdep.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbarm/imx31/imx31lk_machdep.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/mmnet/mmnet_machdep.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/mpcsa/mpcsa_machdep.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/evbppc/ev64260/ev64260_locore.S
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/evbppc/ev64260/machdep.c
cvs rdiff -u -r1.1 -r0 src/sys/arch/evbppc/include/ipkdb.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbppc/mpc85xx/mpc85xx_start.S
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbppc/obs405/obs200_locore.S
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/evbppc/obs405/obs200_machdep.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbppc/obs405/obs266_machdep.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbppc/obs405/obs600_machdep.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbppc/pmppc/machdep.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbppc/pmppc/pmppc_locore.S
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/evbppc/virtex/machdep.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbppc/virtex/virtex_start.S
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/evbppc/walnut/machdep.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/evbppc/walnut/walnut_start.S
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/ibmnws/ibmnws/locore.S
cvs rdiff -u -r1.2 -r0 src/sys/arch/ibmnws/include/ipkdb.h
cvs rdiff -u -r1.2 -r0 src/sys/arch/macppc/include/ipkdb.h
cvs rdiff -u -r1.72 -r1.73 src/sys/arch/macppc/macppc/locore.S
cvs rdiff -u -r1.167 -r1.168 src/sys/arch/macppc/macppc/machdep.c
cvs rdiff -u -r1.1 -r0 src/sys/arch/mvmeppc/include/ipkdb.h
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/mvmeppc/mvmeppc/locore.S
cvs rdiff -u -r1.1 -r0 src/sys/arch/ofppc/include/ipkdb.h
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/ofppc/ofppc/locore.S
cvs rdiff -u -r1.90 -r1.91 src/sys/arch/powerpc/conf/files.powerpc
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/powerpc/ibm4xx/genassym.cf
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/powerpc/ibm4xx/trap_subr.S
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/powerpc/ibm4xx/openbios/locore.S
cvs rdiff -u -r1.106 -r1.107 src/sys/arch/powerpc/include/cpu.h
cvs rdiff -u -r1.4 -r0 src/sys/arch/powerpc/include/ipkdb.h
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/powerpc/oea/genassym.cf
cvs rdiff -u -r1.74 -r1.75 src/sys/arch/powerpc/oea/oea_machdep.c
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/powerpc/oea/ofwoea_machdep.c
cvs rdiff -u -r1.11 -r0 src/sys/arch/powerpc/powerpc/ipkdb_glue.c
cvs rdiff -u -r1.79 -r1.80 src/sys/arch/powerpc/powerpc/trap_subr.S
cvs rdiff -u -r1.1 -r0 src/sys/arch/prep/include/ipkdb.h
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/prep/prep/locore.S
cvs rdiff -u -r1.1 -r0 src/sys/arch/rs6000/include/ipkdb.h
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/rs6000/rs6000/locore.S
cvs rdiff -u -r1.1 -r0 src/sys/arch/sandpoint/include/ipkdb.h
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/sandpoint/sandpoint/locore.S
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/sandpoint/sandpoint/machdep.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/cadence/if_cemac.c
cvs rdiff -u -r1.89 -r1.90 src/sys/dev/ic/dp8390.c
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/ic/dp8390var.h
cvs rdiff -u -r1.74 -r1.75 src/sys/dev/ic/ne2000.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/ic/ne2000var.h
cvs rdiff -u -r1.59 -r1.60 src/sys/dev/ofw/ofnet.c
cvs rdiff -u -r1.397 -r1.398 src/sys/dev/pci/files.pci
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/pci/if_ne_pci.c
cvs rdiff -u -r1.4 -r0 src/sys/ipkdb/README.port
cvs rdiff -u -r1.3 -r0 src/sys/ipkdb/TODO src/sys/ipkdb/files.ipkdb
cvs rdiff -u -r1.6 -r0 src/sys/ipkdb/ipkdb.h
cvs rdiff -u -r1.12 -r0 src/sys/ipkdb/ipkdb_if.c
cvs rdiff -u -r1.27 -r0 src/sys/ipkdb/ipkdb_ipkdb.c
cvs rdiff -u -r1.254 -r1.255 src/sys/netinet/udp_usrreq.c
cvs rdiff -u -r1.8 -r1.9 src/sys/secmodel/keylock/secmodel_keylock.c
cvs rdiff -u -r1.31 -r1.32 \
src/sys/secmodel/securelevel/secmodel_securelevel.c
cvs rdiff -u -r1.45 -r1.46 src/sys/secmodel/suser/secmodel_suser.c
cvs rdiff -u -r1.77 -r1.78 src/sys/sys/kauth.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2210 src/distrib/sets/lists/comp/mi:1.2211
--- src/distrib/sets/lists/comp/mi:1.2210 Thu Jul 12 10:46:40 2018
+++ src/distrib/sets/lists/comp/mi Sun Jul 15 05:16:40 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.2210 2018/07/12 10:46:40 maxv Exp $
+# $NetBSD: mi,v 1.2211 2018/07/15 05:16:40 maxv Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
./etc/mtree/set.comp comp-sys-root
@@ -10942,16 +10942,16 @@
./usr/share/man/cat9/ioctl_copyin.0 comp-sys-catman .cat
./usr/share/man/cat9/ioctl_copyout.0 comp-sys-catman .cat
./usr/share/man/cat9/ipi.0 comp-sys-catman .cat
-./usr/share/man/cat9/ipkdb.0 comp-sys-catman .cat
-./usr/share/man/cat9/ipkdb_connect.0 comp-sys-catman .cat
-./usr/share/man/cat9/ipkdb_init.0 comp-sys-catman .cat
-./usr/share/man/cat9/ipkdb_poll.0 comp-sys-catman .cat
-./usr/share/man/cat9/ipkdb_trap.0 comp-sys-catman .cat
-./usr/share/man/cat9/ipkdbcmds.0 comp-sys-catman .cat
-./usr/share/man/cat9/ipkdbfbyte.0 comp-sys-catman .cat
-./usr/share/man/cat9/ipkdbif_init.0 comp-sys-catman .cat
-./usr/share/man/cat9/ipkdbinit.0 comp-sys-catman .cat
-./usr/share/man/cat9/ipkdbsbyte.0 comp-sys-catman .cat
+./usr/share/man/cat9/ipkdb.0 comp-obsolete obsolete
+./usr/share/man/cat9/ipkdb_connect.0 comp-obsolete obsolete
+./usr/share/man/cat9/ipkdb_init.0 comp-obsolete obsolete
+./usr/share/man/cat9/ipkdb_poll.0 comp-obsolete obsolete
+./usr/share/man/cat9/ipkdb_trap.0 comp-obsolete obsolete
+./usr/share/man/cat9/ipkdbcmds.0 comp-obsolete obsolete
+./usr/share/man/cat9/ipkdbfbyte.0 comp-obsolete obsolete
+./usr/share/man/cat9/ipkdbif_init.0 comp-obsolete obsolete
+./usr/share/man/cat9/ipkdbinit.0 comp-obsolete obsolete
+./usr/share/man/cat9/ipkdbsbyte.0 comp-obsolete obsolete
./usr/share/man/cat9/is_leap_year.0 comp-sys-catman .cat
./usr/share/man/cat9/isa.0 comp-sys-catman .cat
./usr/share/man/cat9/isa_dmaabort.0 comp-sys-catman .cat
@@ -18649,16 +18649,16 @@
./usr/share/man/html9/ioctl_copyin.html comp-sys-htmlman html
./usr/share/man/html9/ioctl_copyout.html comp-sys-htmlman html
./usr/share/man/html9/ipi.html comp-sys-htmlman html
-./usr/share/man/html9/ipkdb.html comp-sys-htmlman html
-./usr/share/man/html9/ipkdb_connect.html comp-sys-htmlman html
-./usr/share/man/html9/ipkdb_init.html comp-sys-htmlman html
-./usr/share/man/html9/ipkdb_poll.html comp-sys-htmlman html
-./usr/share/man/html9/ipkdb_trap.html comp-sys-htmlman html
-./usr/share/man/html9/ipkdbcmds.html comp-sys-htmlman html
-./usr/share/man/html9/ipkdbfbyte.html comp-sys-htmlman html
-./usr/share/man/html9/ipkdbif_init.html comp-sys-htmlman html
-./usr/share/man/html9/ipkdbinit.html comp-sys-htmlman html
-./usr/share/man/html9/ipkdbsbyte.html comp-sys-htmlman html
+./usr/share/man/html9/ipkdb.html comp-obsolete obsolete
+./usr/share/man/html9/ipkdb_connect.html comp-obsolete obsolete
+./usr/share/man/html9/ipkdb_init.html comp-obsolete obsolete
+./usr/share/man/html9/ipkdb_poll.html comp-obsolete obsolete
+./usr/share/man/html9/ipkdb_trap.html comp-obsolete obsolete
+./usr/share/man/html9/ipkdbcmds.html comp-obsolete obsolete
+./usr/share/man/html9/ipkdbfbyte.html comp-obsolete obsolete
+./usr/share/man/html9/ipkdbif_init.html comp-obsolete obsolete
+./usr/share/man/html9/ipkdbinit.html comp-obsolete obsolete
+./usr/share/man/html9/ipkdbsbyte.html comp-obsolete obsolete
./usr/share/man/html9/is_leap_year.html comp-sys-htmlman html
./usr/share/man/html9/isa.html comp-sys-htmlman html
./usr/share/man/html9/isa_dmaabort.html comp-sys-htmlman html
@@ -26504,16 +26504,16 @@
./usr/share/man/man9/ioctl_copyin.9 comp-sys-man .man
./usr/share/man/man9/ioctl_copyout.9 comp-sys-man .man
./usr/share/man/man9/ipi.9 comp-sys-man .man
-./usr/share/man/man9/ipkdb.9 comp-sys-man .man
-./usr/share/man/man9/ipkdb_connect.9 comp-sys-man .man
-./usr/share/man/man9/ipkdb_init.9 comp-sys-man .man
-./usr/share/man/man9/ipkdb_poll.9 comp-sys-man .man
-./usr/share/man/man9/ipkdb_trap.9 comp-sys-man .man
-./usr/share/man/man9/ipkdbcmds.9 comp-sys-man .man
-./usr/share/man/man9/ipkdbfbyte.9 comp-sys-man .man
-./usr/share/man/man9/ipkdbif_init.9 comp-sys-man .man
-./usr/share/man/man9/ipkdbinit.9 comp-sys-man .man
-./usr/share/man/man9/ipkdbsbyte.9 comp-sys-man .man
+./usr/share/man/man9/ipkdb.9 comp-obsolete obsolete
+./usr/share/man/man9/ipkdb_connect.9 comp-obsolete obsolete
+./usr/share/man/man9/ipkdb_init.9 comp-obsolete obsolete
+./usr/share/man/man9/ipkdb_poll.9 comp-obsolete obsolete
+./usr/share/man/man9/ipkdb_trap.9 comp-obsolete obsolete
+./usr/share/man/man9/ipkdbcmds.9 comp-obsolete obsolete
+./usr/share/man/man9/ipkdbfbyte.9 comp-obsolete obsolete
+./usr/share/man/man9/ipkdbif_init.9 comp-obsolete obsolete
+./usr/share/man/man9/ipkdbinit.9 comp-obsolete obsolete
+./usr/share/man/man9/ipkdbsbyte.9 comp-obsolete obsolete
./usr/share/man/man9/is_leap_year.9 comp-sys-man .man
./usr/share/man/man9/isa.9 comp-sys-man .man
./usr/share/man/man9/isa_dmaabort.9 comp-sys-man .man
Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1598 src/distrib/sets/lists/man/mi:1.1599
--- src/distrib/sets/lists/man/mi:1.1598 Fri Jul 13 11:14:14 2018
+++ src/distrib/sets/lists/man/mi Sun Jul 15 05:16:40 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1598 2018/07/13 11:14:14 maxv Exp $
+# $NetBSD: mi,v 1.1599 2018/07/15 05:16:40 maxv Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1327,7 +1327,7 @@
./usr/share/man/cat4/ipf.0 man-ipf-catman ipfilter,.cat
./usr/share/man/cat4/ipfilter.0 man-ipf-catman ipfilter,.cat
./usr/share/man/cat4/ipip.0 man-obsolete obsolete
-./usr/share/man/cat4/ipkdb.0 man-sys-catman .cat
+./usr/share/man/cat4/ipkdb.0 man-obsolete obsolete
./usr/share/man/cat4/ipl.0 man-ipf-catman ipfilter,.cat
./usr/share/man/cat4/ipmi.0 man-sys-catman .cat
./usr/share/man/cat4/ipnat.0 man-ipf-catman ipfilter,.cat
@@ -4439,7 +4439,7 @@
./usr/share/man/html4/ip6.html man-sys-htmlman html
./usr/share/man/html4/ipf.html man-ipf-htmlman ipfilter,html
./usr/share/man/html4/ipfilter.html man-ipf-htmlman ipfilter,html
-./usr/share/man/html4/ipkdb.html man-sys-htmlman html
+./usr/share/man/html4/ipkdb.html man-obsolete obsolete
./usr/share/man/html4/ipl.html man-ipf-htmlman ipfilter,html
./usr/share/man/html4/ipmi.html man-sys-htmlman html
./usr/share/man/html4/ipnat.html man-ipf-htmlman ipfilter,html
@@ -7389,7 +7389,7 @@
./usr/share/man/man4/ipf.4 man-sys-man ipfilter,.man
./usr/share/man/man4/ipfilter.4 man-sys-man ipfilter,.man
./usr/share/man/man4/ipip.4 man-obsolete obsolete
-./usr/share/man/man4/ipkdb.4 man-sys-man .man
+./usr/share/man/man4/ipkdb.4 man-obsolete obsolete
./usr/share/man/man4/ipl.4 man-sys-man ipfilter,.man
./usr/share/man/man4/ipmi.4 man-sys-man .man
./usr/share/man/man4/ipnat.4 man-sys-man ipfilter,.man
Index: src/share/examples/secmodel/secmodel_example.c
diff -u src/share/examples/secmodel/secmodel_example.c:1.26 src/share/examples/secmodel/secmodel_example.c:1.27
--- src/share/examples/secmodel/secmodel_example.c:1.26 Sun Dec 4 23:55:36 2011
+++ src/share/examples/secmodel/secmodel_example.c Sun Jul 15 05:16:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: secmodel_example.c,v 1.26 2011/12/04 23:55:36 jym Exp $ */
+/* $NetBSD: secmodel_example.c,v 1.27 2018/07/15 05:16:40 maxv Exp $ */
/*
* This file is placed in the public domain.
@@ -13,7 +13,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: secmodel_example.c,v 1.26 2011/12/04 23:55:36 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: secmodel_example.c,v 1.27 2018/07/15 05:16:40 maxv Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -298,12 +298,6 @@ secmodel_example_system_cb(kauth_cred_t
break;
case KAUTH_SYSTEM_DEBUG:
- switch (req) {
- case KAUTH_REQ_SYSTEM_DEBUG_IPKDB:
- default:
- result = KAUTH_RESULT_DEFER;
- break;
- }
break;
case KAUTH_SYSTEM_PSET:
Index: src/share/man/man4/Makefile
diff -u src/share/man/man4/Makefile:1.657 src/share/man/man4/Makefile:1.658
--- src/share/man/man4/Makefile:1.657 Tue Jul 10 17:01:43 2018
+++ src/share/man/man4/Makefile Sun Jul 15 05:16:40 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.657 2018/07/10 17:01:43 maya Exp $
+# $NetBSD: Makefile,v 1.658 2018/07/15 05:16:40 maxv Exp $
# @(#)Makefile 8.1 (Berkeley) 6/18/93
MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \
@@ -32,7 +32,7 @@ MAN= aac.4 ac97.4 acardide.4 aceride.4 a
ibmcd.4 ibmhawk.4 ichsmb.4 icmp.4 icp.4 icsphy.4 iee.4 ieee80211.4 \
ifmedia.4 igmafb.4 igphy.4 igsfb.4 iha.4 ihidev.4 ihphy.4 iic.4 ims.4 \
inet.4 ikphy.4 inphy.4 intersil7170.4 intro.4 \
- ioasic.4 ioat.4 iop.4 iophy.4 iopsp.4 ip.4 ipkdb.4 ipmi.4 ipw.4 \
+ ioasic.4 ioat.4 iop.4 iophy.4 iopsp.4 ip.4 ipmi.4 ipw.4 \
irmce.4 isp.4 ismt.4 isv.4 itesio.4 iteide.4 iwi.4 iwm.4 iwn.4 ixg.4 \
ixpide.4 ixv.4 \
jme.4 jmide.4 joy.4 \
Index: src/share/man/man7/hier.7
diff -u src/share/man/man7/hier.7:1.129 src/share/man/man7/hier.7:1.130
--- src/share/man/man7/hier.7:1.129 Thu Mar 1 06:37:40 2018
+++ src/share/man/man7/hier.7 Sun Jul 15 05:16:41 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: hier.7,v 1.129 2018/03/01 06:37:40 snj Exp $
+.\" $NetBSD: hier.7,v 1.130 2018/07/15 05:16:41 maxv Exp $
.\"
.\" Copyright (c) 1990, 1993, 1994
.\" The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\" @(#)hier.7 8.5 (Berkeley) 6/1/94
.\"
-.Dd January 8, 2018
+.Dd July 14, 2018
.Dt HIER 7
.Os
.Sh NAME
@@ -958,8 +958,6 @@ Union file system; see
.It Pa gdbscripts/
Support for accessing kernel structures from within the debugger
.Xr gdb 1 .
-.It Pa ipkdb/
-Support for kernel debugging over the network.
.Pp
.It Pa kern/
Primary kernel source code.
Index: src/share/man/man7/src.7
diff -u src/share/man/man7/src.7:1.11 src/share/man/man7/src.7:1.12
--- src/share/man/man7/src.7:1.11 Wed Feb 15 17:44:52 2017
+++ src/share/man/man7/src.7 Sun Jul 15 05:16:41 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: src.7,v 1.11 2017/02/15 17:44:52 abhinav Exp $
+.\" $NetBSD: src.7,v 1.12 2018/07/15 05:16:41 maxv Exp $
.\"
.\" Copyright (c) 2012, 2013 Mingzhe Wang and Elvira Khabirova.
.\" All rights reserved.
@@ -24,7 +24,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd May 21, 2015
+.Dd July 14, 2018
.Dt SRC 7
.Os
.Sh NAME
@@ -275,8 +275,6 @@ File systems storing data on physical dr
.It Pa gdbscripts/
.Xr gdb 1
macros.
-.It Pa ipkdb/
-Client code for remote kernel debugger.
.It Pa kern/
.Nx Ap s
Kernel code, such as resource management, signal delivering, etc.
Index: src/share/man/man9/Makefile
diff -u src/share/man/man9/Makefile:1.428 src/share/man/man9/Makefile:1.429
--- src/share/man/man9/Makefile:1.428 Thu Jul 12 10:46:41 2018
+++ src/share/man/man9/Makefile Sun Jul 15 05:16:41 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.428 2018/07/12 10:46:41 maxv Exp $
+# $NetBSD: Makefile,v 1.429 2018/07/15 05:16:41 maxv Exp $
# Makefile for section 9 (kernel function and variable) manual pages.
@@ -28,7 +28,7 @@ MAN= accept_filter.9 accf_data.9 accf_ht
ieee80211_radiotap.9 iic.9 imax.9 \
in_getifa.9 \
in4_cksum.9 inittodr.9 interrupt_distribute.9 intro.9 ioasic.9 \
- ioctl.9 ipkdb.9 ipi.9 isa.9 isapnp.9 itimerfix.9 kauth.9 kcopy.9 \
+ ioctl.9 ipi.9 isa.9 isapnp.9 itimerfix.9 kauth.9 kcopy.9 \
kcpuset.9 kernhist.9 klua_lock.9 klua_mod_register.9 kmem.9 kpause.9 \
kfilter_register.9 knote.9 \
kprintf.9 kthread.9 linedisc.9 lock.9 locking.9 log.9 ltsleep.9 \
@@ -395,9 +395,6 @@ MLINKS+=ioasic.9 ioasic_intr_establish.9
ioasic.9 ioasic_intr_evcnt.9 \
ioasic.9 ioasic_attach_devs.9 \
ioasic.9 ioasic_submatch.9
-MLINKS+=ipkdb.9 ipkdb_init.9 ipkdb.9 ipkdb_connect.9 ipkdb.9 ipkdbinit.9 \
- ipkdb.9 ipkdbcmds.9 ipkdb.9 ipkdb_trap.9 ipkdb.9 ipkdb_poll.9 \
- ipkdb.9 ipkdbif_init.9 ipkdb.9 ipkdbfbyte.9 ipkdb.9 ipkdbsbyte.9
MLINKS+=isa.9 isa_intr_alloc.9 \
isa.9 isa_intr_establish.9 \
isa.9 isa_intr_disestablish.9 \
Index: src/share/man/man9/boothowto.9
diff -u src/share/man/man9/boothowto.9:1.6 src/share/man/man9/boothowto.9:1.7
--- src/share/man/man9/boothowto.9:1.6 Thu Feb 25 17:15:55 2010
+++ src/share/man/man9/boothowto.9 Sun Jul 15 05:16:41 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: boothowto.9,v 1.6 2010/02/25 17:15:55 wiz Exp $
+.\" $NetBSD: boothowto.9,v 1.7 2018/07/15 05:16:41 maxv Exp $
.\"
.\" Copyright (c) 2009 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -24,7 +24,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd September 11, 2009
+.Dd July 14, 2018
.Dt BOOTHOWTO 9
.Os
.Sh NAME
@@ -151,13 +151,11 @@ flag.
.It Dv RB_KDB Ta Li 0x00000040 Ta Fl d Ta
Gives control to a kernel debugger early in the boot sequence.
See
-.Xr ddb 4 ,
+.Xr ddb 4
+and
.Dq "options KGDB"
in
-.Xr options 4 ,
-.\" the kgdb_* functions are undocumented
-and
-.Xr ipkdb 9 .
+.Xr options 4 .
.It Dv RB_RDONLY Ta Li 0x00000080 Ta Ta
This flag is deprecated.
It previously caused the kernel to mount the root file system
Index: src/share/man/man9/intro.9
diff -u src/share/man/man9/intro.9:1.22 src/share/man/man9/intro.9:1.23
--- src/share/man/man9/intro.9:1.22 Fri Jul 13 09:37:32 2018
+++ src/share/man/man9/intro.9 Sun Jul 15 05:16:41 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: intro.9,v 1.22 2018/07/13 09:37:32 maxv Exp $
+.\" $NetBSD: intro.9,v 1.23 2018/07/15 05:16:41 maxv Exp $
.\"
.\" Copyright (c) 1997, 2007 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd July 13, 2018
+.Dd July 14, 2018
.Dt INTRO 9
.Os
.Sh NAME
@@ -616,10 +616,6 @@ Format a number into a human readable fo
See
.Xr humanize_number 9 .
.Pp
-Machine-dependent interface to ipkdb.
-See
-.Xr ipkdb 9 .
-.Pp
Options string management.
See
.Xr optstr 9 .
Index: src/share/man/man9/kauth.9
diff -u src/share/man/man9/kauth.9:1.111 src/share/man/man9/kauth.9:1.112
--- src/share/man/man9/kauth.9:1.111 Mon Aug 28 06:04:00 2017
+++ src/share/man/man9/kauth.9 Sun Jul 15 05:16:41 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: kauth.9,v 1.111 2017/08/28 06:04:00 wiz Exp $
+.\" $NetBSD: kauth.9,v 1.112 2018/07/15 05:16:41 maxv Exp $
.\"
.\" Copyright (c) 2005, 2006 Elad Efrat <[email protected]>
.\" All rights reserved.
@@ -25,7 +25,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd August 28, 2017
+.Dd July 14, 2018
.Dt KAUTH 9
.Os
.Sh NAME
@@ -195,14 +195,6 @@ Set CPU state, including setting it onli
.El
.It Dv KAUTH_SYSTEM_DEBUG
This request concentrates several debugging-related operations.
-.Ar req
-can be any of the following:
-.Bl -tag -width compact
-.It Dv KAUTH_REQ_SYSTEM_DEBUG_IPKDB
-Check if using
-.Xr ipkdb 4
-is allowed.
-.El
.It Dv KAUTH_SYSTEM_DEVMAPPER
Check if operations on the device mapper
.Xr dm 4
Index: src/share/man/man9/panic.9
diff -u src/share/man/man9/panic.9:1.21 src/share/man/man9/panic.9:1.22
--- src/share/man/man9/panic.9:1.21 Tue Jun 12 21:06:43 2012
+++ src/share/man/man9/panic.9 Sun Jul 15 05:16:41 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: panic.9,v 1.21 2012/06/12 21:06:43 jdf Exp $
+.\" $NetBSD: panic.9,v 1.22 2018/07/15 05:16:41 maxv Exp $
.\"
.\" Copyright (c) 1996 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd September 29, 2011
+.Dd July 14, 2018
.Dt PANIC 9
.Os
.Sh NAME
@@ -106,7 +106,6 @@ function never returns.
.Sh SEE ALSO
.Xr sysctl 3 ,
.Xr ddb 4 ,
-.Xr ipkdb 4 ,
.Xr options 4 ,
.Xr savecore 8 ,
.Xr swapctl 8 ,
Index: src/share/man/man9/secmodel_securelevel.9
diff -u src/share/man/man9/secmodel_securelevel.9:1.17 src/share/man/man9/secmodel_securelevel.9:1.18
--- src/share/man/man9/secmodel_securelevel.9:1.17 Fri Apr 27 09:33:43 2018
+++ src/share/man/man9/secmodel_securelevel.9 Sun Jul 15 05:16:41 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: secmodel_securelevel.9,v 1.17 2018/04/27 09:33:43 wiz Exp $
+.\" $NetBSD: secmodel_securelevel.9,v 1.18 2018/07/15 05:16:41 maxv Exp $
.\"
.\" Copyright (c) 2006 Elad Efrat <[email protected]>
.\" Copyright (c) 2000 Hugh Graham
@@ -26,7 +26,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd April 26, 2018
+.Dd July 14, 2018
.Dt SECMODEL_SECURELEVEL 9
.Os
.Sh NAME
@@ -117,10 +117,6 @@ The RTC offset may not be changed.
.It
Set-id coredump settings may not be altered.
.It
-Attaching the IP-based kernel debugger,
-.Xr ipkdb 4 ,
-is not allowed.
-.It
Device
.Dq pass-thru
requests that may be used to perform raw disk and/or memory access are denied.
Index: src/sys/arch/amigappc/amigappc/locore.S
diff -u src/sys/arch/amigappc/amigappc/locore.S:1.25 src/sys/arch/amigappc/amigappc/locore.S:1.26
--- src/sys/arch/amigappc/amigappc/locore.S:1.25 Wed Aug 6 15:11:17 2014
+++ src/sys/arch/amigappc/amigappc/locore.S Sun Jul 15 05:16:41 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.25 2014/08/06 15:11:17 joerg Exp $ */
+/* $NetBSD: locore.S,v 1.26 2018/07/15 05:16:41 maxv Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -36,7 +36,6 @@
* Rewritten for 4.0 and bootargs support by Frank Wille.
*/
#include "opt_ddb.h"
-#include "opt_ipkdb.h"
#include "opt_lockdebug.h"
#include "opt_multiprocessor.h"
#include "opt_ppcparam.h"
Index: src/sys/arch/amigappc/amigappc/machdep.c
diff -u src/sys/arch/amigappc/amigappc/machdep.c:1.52 src/sys/arch/amigappc/amigappc/machdep.c:1.53
--- src/sys/arch/amigappc/amigappc/machdep.c:1.52 Thu Dec 22 14:47:54 2016
+++ src/sys/arch/amigappc/amigappc/machdep.c Sun Jul 15 05:16:41 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.52 2016/12/22 14:47:54 cherry Exp $ */
+/* $NetBSD: machdep.c,v 1.53 2018/07/15 05:16:41 maxv Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.52 2016/12/22 14:47:54 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.53 2018/07/15 05:16:41 maxv Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -61,7 +61,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include <amigappc/amigappc/p5reg.h>
#include "opt_ddb.h"
-#include "opt_ipkdb.h"
#include "fd.h"
#include "ser.h"
Index: src/sys/arch/arm/arm32/fault.c
diff -u src/sys/arch/arm/arm32/fault.c:1.105 src/sys/arch/arm/arm32/fault.c:1.106
--- src/sys/arch/arm/arm32/fault.c:1.105 Sat Oct 28 00:37:12 2017
+++ src/sys/arch/arm/arm32/fault.c Sun Jul 15 05:16:41 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: fault.c,v 1.105 2017/10/28 00:37:12 pgoyette Exp $ */
+/* $NetBSD: fault.c,v 1.106 2018/07/15 05:16:41 maxv Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -81,7 +81,7 @@
#include "opt_kgdb.h"
#include <sys/types.h>
-__KERNEL_RCSID(0, "$NetBSD: fault.c,v 1.105 2017/10/28 00:37:12 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fault.c,v 1.106 2018/07/15 05:16:41 maxv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -383,7 +383,7 @@ data_abort_handler(trapframe_t *tf)
(read_insn(tf->tf_pc, false) & 0x05200000) != 0x04200000))) {
map = kernel_map;
- /* Was the fault due to the FPE/IPKDB ? */
+ /* Was the fault due to the FPE ? */
if (__predict_false((tf->tf_spsr & PSR_MODE)==PSR_UND32_MODE)) {
KSI_INIT_TRAP(&ksi);
ksi.ksi_signo = SIGSEGV;
Index: src/sys/arch/arm/at91/at91bus.c
diff -u src/sys/arch/arm/at91/at91bus.c:1.19 src/sys/arch/arm/at91/at91bus.c:1.20
--- src/sys/arch/arm/at91/at91bus.c:1.19 Thu Dec 22 14:47:54 2016
+++ src/sys/arch/arm/at91/at91bus.c Sun Jul 15 05:16:41 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: at91bus.c,v 1.19 2016/12/22 14:47:54 cherry Exp $ */
+/* $NetBSD: at91bus.c,v 1.20 2018/07/15 05:16:41 maxv Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91bus.c,v 1.19 2016/12/22 14:47:54 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91bus.c,v 1.20 2018/07/15 05:16:41 maxv Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -37,11 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: at91bus.c,v
/* Define various stack sizes in pages */
#define IRQ_STACK_SIZE 8
#define ABT_STACK_SIZE 8
-#ifdef IPKDB
-#define UND_STACK_SIZE 16
-#else
#define UND_STACK_SIZE 8
-#endif
#include <sys/param.h>
#include <sys/device.h>
@@ -540,13 +536,6 @@ at91bus_setup(BootConfig *mem)
#endif
boothowto = AB_VERBOSE | AB_DEBUG; // @@@@
-#ifdef IPKDB
- /* Initialise ipkdb */
- ipkdb_init();
- if (boothowto & RB_KDB)
- ipkdb_connect(0);
-#endif
-
#ifdef DDB
db_machine_init();
if (boothowto & RB_KDB)
Index: src/sys/arch/arm/at91/at91emac.c
diff -u src/sys/arch/arm/at91/at91emac.c:1.21 src/sys/arch/arm/at91/at91emac.c:1.22
--- src/sys/arch/arm/at91/at91emac.c:1.21 Tue Jun 26 06:47:57 2018
+++ src/sys/arch/arm/at91/at91emac.c Sun Jul 15 05:16:41 2018
@@ -1,5 +1,5 @@
-/* $Id: at91emac.c,v 1.21 2018/06/26 06:47:57 msaitoh Exp $ */
-/* $NetBSD: at91emac.c,v 1.21 2018/06/26 06:47:57 msaitoh Exp $ */
+/* $Id: at91emac.c,v 1.22 2018/07/15 05:16:41 maxv Exp $ */
+/* $NetBSD: at91emac.c,v 1.22 2018/07/15 05:16:41 maxv Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91emac.c,v 1.21 2018/06/26 06:47:57 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91emac.c,v 1.22 2018/07/15 05:16:41 maxv Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -69,10 +69,6 @@ __KERNEL_RCSID(0, "$NetBSD: at91emac.c,v
#include <netinet/if_inarp.h>
#endif
-#ifdef IPKDB_AT91 // @@@
-#include <ipkdb/ipkdb.h>
-#endif
-
#include <arm/at91/at91var.h>
#include <arm/at91/at91emacreg.h>
#include <arm/at91/at91emacvar.h>
Index: src/sys/arch/arm/include/arm32/machdep.h
diff -u src/sys/arch/arm/include/arm32/machdep.h:1.21 src/sys/arch/arm/include/arm32/machdep.h:1.22
--- src/sys/arch/arm/include/arm32/machdep.h:1.21 Mon Feb 20 17:23:54 2017
+++ src/sys/arch/arm/include/arm32/machdep.h Sun Jul 15 05:16:41 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.h,v 1.21 2017/02/20 17:23:54 skrll Exp $ */
+/* $NetBSD: machdep.h,v 1.22 2018/07/15 05:16:41 maxv Exp $ */
#ifndef _ARM32_BOOT_MACHDEP_H_
#define _ARM32_BOOT_MACHDEP_H_
@@ -11,12 +11,8 @@
#define ABT_STACK_SIZE 1
#endif
#ifndef UND_STACK_SIZE
-#ifdef IPKDB
-#define UND_STACK_SIZE 2
-#else
#define UND_STACK_SIZE 1
#endif
-#endif
#ifndef FIQ_STACK_SIZE
#define FIQ_STACK_SIZE 1
#endif
Index: src/sys/arch/bebox/bebox/locore.S
diff -u src/sys/arch/bebox/bebox/locore.S:1.28 src/sys/arch/bebox/bebox/locore.S:1.29
--- src/sys/arch/bebox/bebox/locore.S:1.28 Sat Oct 20 14:53:37 2012
+++ src/sys/arch/bebox/bebox/locore.S Sun Jul 15 05:16:41 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.28 2012/10/20 14:53:37 kiyohara Exp $ */
+/* $NetBSD: locore.S,v 1.29 2018/07/15 05:16:41 maxv Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -33,7 +33,6 @@
*/
#include "opt_ddb.h"
-#include "opt_ipkdb.h"
#include "opt_lockdebug.h"
#include "opt_modular.h"
#include "opt_multiprocessor.h"
Index: src/sys/arch/bebox/bebox/machdep.c
diff -u src/sys/arch/bebox/bebox/machdep.c:1.107 src/sys/arch/bebox/bebox/machdep.c:1.108
--- src/sys/arch/bebox/bebox/machdep.c:1.107 Sun Apr 21 15:42:11 2013
+++ src/sys/arch/bebox/bebox/machdep.c Sun Jul 15 05:16:41 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.107 2013/04/21 15:42:11 kiyohara Exp $ */
+/* $NetBSD: machdep.c,v 1.108 2018/07/15 05:16:41 maxv Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,11 +32,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.107 2013/04/21 15:42:11 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.108 2018/07/15 05:16:41 maxv Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
-#include "opt_ipkdb.h"
#define _POWERPC_BUS_DMA_PRIVATE
Index: src/sys/arch/evbarm/armadaxp/armadaxp_machdep.c
diff -u src/sys/arch/evbarm/armadaxp/armadaxp_machdep.c:1.13 src/sys/arch/evbarm/armadaxp/armadaxp_machdep.c:1.14
--- src/sys/arch/evbarm/armadaxp/armadaxp_machdep.c:1.13 Fri Mar 10 15:44:24 2017
+++ src/sys/arch/evbarm/armadaxp/armadaxp_machdep.c Sun Jul 15 05:16:41 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: armadaxp_machdep.c,v 1.13 2017/03/10 15:44:24 skrll Exp $ */
+/* $NetBSD: armadaxp_machdep.c,v 1.14 2018/07/15 05:16:41 maxv Exp $ */
/*******************************************************************************
Copyright (C) Marvell International Ltd. and its affiliates
@@ -37,7 +37,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
*******************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: armadaxp_machdep.c,v 1.13 2017/03/10 15:44:24 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: armadaxp_machdep.c,v 1.14 2018/07/15 05:16:41 maxv Exp $");
#include "opt_machdep.h"
#include "opt_mvsoc.h"
@@ -46,7 +46,6 @@ __KERNEL_RCSID(0, "$NetBSD: armadaxp_mac
#include "opt_ddb.h"
#include "opt_kgdb.h"
#include "opt_pci.h"
-#include "opt_ipkdb.h"
#include <sys/bus.h>
#include <sys/param.h>
Index: src/sys/arch/evbarm/beagle/beagle_machdep.c
diff -u src/sys/arch/evbarm/beagle/beagle_machdep.c:1.69 src/sys/arch/evbarm/beagle/beagle_machdep.c:1.70
--- src/sys/arch/evbarm/beagle/beagle_machdep.c:1.69 Tue Jun 5 08:03:28 2018
+++ src/sys/arch/evbarm/beagle/beagle_machdep.c Sun Jul 15 05:16:41 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: beagle_machdep.c,v 1.69 2018/06/05 08:03:28 hkenken Exp $ */
+/* $NetBSD: beagle_machdep.c,v 1.70 2018/07/15 05:16:41 maxv Exp $ */
/*
* Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,12 +125,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: beagle_machdep.c,v 1.69 2018/06/05 08:03:28 hkenken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: beagle_machdep.c,v 1.70 2018/07/15 05:16:41 maxv Exp $");
#include "opt_machdep.h"
#include "opt_ddb.h"
#include "opt_kgdb.h"
-#include "opt_ipkdb.h"
#include "opt_md.h"
#include "opt_com.h"
#include "opt_omap.h"
Index: src/sys/arch/evbarm/gemini/gemini_machdep.c
diff -u src/sys/arch/evbarm/gemini/gemini_machdep.c:1.24 src/sys/arch/evbarm/gemini/gemini_machdep.c:1.25
--- src/sys/arch/evbarm/gemini/gemini_machdep.c:1.24 Fri Dec 30 07:35:14 2016
+++ src/sys/arch/evbarm/gemini/gemini_machdep.c Sun Jul 15 05:16:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: gemini_machdep.c,v 1.24 2016/12/30 07:35:14 rin Exp $ */
+/* $NetBSD: gemini_machdep.c,v 1.25 2018/07/15 05:16:42 maxv Exp $ */
/* adapted from:
* NetBSD: sdp24xx_machdep.c,v 1.4 2008/08/27 11:03:10 matt Exp
@@ -129,12 +129,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gemini_machdep.c,v 1.24 2016/12/30 07:35:14 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_machdep.c,v 1.25 2018/07/15 05:16:42 maxv Exp $");
#include "opt_machdep.h"
#include "opt_ddb.h"
#include "opt_kgdb.h"
-#include "opt_ipkdb.h"
#include "opt_md.h"
#include "opt_com.h"
#include "opt_gemini.h"
@@ -735,13 +734,6 @@ initarm(void *arg)
printf("done.\n");
#endif
-#ifdef IPKDB
- /* Initialise ipkdb */
- ipkdb_init();
- if (boothowto & RB_KDB)
- ipkdb_connect(0);
-#endif
-
#if defined(MEMORY_DISK_DYNAMIC)
md_root_setconf((char *)GEMINI_RAMDISK_VBASE, GEMINI_RAMDISK_SIZE);
#endif
Index: src/sys/arch/evbarm/imx31/imx31lk_machdep.c
diff -u src/sys/arch/evbarm/imx31/imx31lk_machdep.c:1.20 src/sys/arch/evbarm/imx31/imx31lk_machdep.c:1.21
--- src/sys/arch/evbarm/imx31/imx31lk_machdep.c:1.20 Tue Mar 13 06:18:17 2018
+++ src/sys/arch/evbarm/imx31/imx31lk_machdep.c Sun Jul 15 05:16:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: imx31lk_machdep.c,v 1.20 2018/03/13 06:18:17 ryo Exp $ */
+/* $NetBSD: imx31lk_machdep.c,v 1.21 2018/07/15 05:16:42 maxv Exp $ */
/*
* Startup routines for the ZOOM iMX31 LITEKIT.
@@ -110,11 +110,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx31lk_machdep.c,v 1.20 2018/03/13 06:18:17 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx31lk_machdep.c,v 1.21 2018/07/15 05:16:42 maxv Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
-#include "opt_ipkdb.h"
#include "opt_pmap_debug.h"
#include "opt_md.h"
#include "opt_com.h"
@@ -705,13 +704,6 @@ printf("%s: textsize %#lx, totalsize %#l
md_root_setconf(memory_disk, sizeof memory_disk);
#endif
-#ifdef IPKDB
- /* Initialise ipkdb */
- ipkdb_init();
- if (boothowto & RB_KDB)
- ipkdb_connect(0);
-#endif
-
#ifdef KGDB
if (boothowto & RB_KDB) {
kgdb_debug_init = 1;
Index: src/sys/arch/evbarm/mmnet/mmnet_machdep.c
diff -u src/sys/arch/evbarm/mmnet/mmnet_machdep.c:1.2 src/sys/arch/evbarm/mmnet/mmnet_machdep.c:1.3
--- src/sys/arch/evbarm/mmnet/mmnet_machdep.c:1.2 Thu Aug 16 18:22:45 2012
+++ src/sys/arch/evbarm/mmnet/mmnet_machdep.c Sun Jul 15 05:16:42 2018
@@ -1,5 +1,5 @@
-/* $Id: mmnet_machdep.c,v 1.2 2012/08/16 18:22:45 matt Exp $ */
-/* $NetBSD: mmnet_machdep.c,v 1.2 2012/08/16 18:22:45 matt Exp $ */
+/* $Id: mmnet_machdep.c,v 1.3 2018/07/15 05:16:42 maxv Exp $ */
+/* $NetBSD: mmnet_machdep.c,v 1.3 2018/07/15 05:16:42 maxv Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy
@@ -78,7 +78,7 @@
/* Adaptation for Propox MMnet by Aymeric Vincent is in the public domain */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mmnet_machdep.c,v 1.2 2012/08/16 18:22:45 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mmnet_machdep.c,v 1.3 2018/07/15 05:16:42 maxv Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -125,7 +125,6 @@ __KERNEL_RCSID(0, "$NetBSD: mmnet_machde
#include <arm/at91/at91sam9260reg.h>
#include <arm/at91/at91sam9260busvar.h>
-#include "opt_ipkdb.h"
#include "ksyms.h"
#include <arm/at91/at91busvar.h>
Index: src/sys/arch/evbarm/mpcsa/mpcsa_machdep.c
diff -u src/sys/arch/evbarm/mpcsa/mpcsa_machdep.c:1.9 src/sys/arch/evbarm/mpcsa/mpcsa_machdep.c:1.10
--- src/sys/arch/evbarm/mpcsa/mpcsa_machdep.c:1.9 Sun Aug 18 15:58:20 2013
+++ src/sys/arch/evbarm/mpcsa/mpcsa_machdep.c Sun Jul 15 05:16:42 2018
@@ -1,5 +1,5 @@
-/* $Id: mpcsa_machdep.c,v 1.9 2013/08/18 15:58:20 matt Exp $ */
-/* $NetBSD: mpcsa_machdep.c,v 1.9 2013/08/18 15:58:20 matt Exp $ */
+/* $Id: mpcsa_machdep.c,v 1.10 2018/07/15 05:16:42 maxv Exp $ */
+/* $NetBSD: mpcsa_machdep.c,v 1.10 2018/07/15 05:16:42 maxv Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpcsa_machdep.c,v 1.9 2013/08/18 15:58:20 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpcsa_machdep.c,v 1.10 2018/07/15 05:16:42 maxv Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -148,7 +148,6 @@ __KERNEL_RCSID(0, "$NetBSD: mpcsa_machde
#include <arm/at91/at91rm9200reg.h>
#include <arm/at91/at91rm9200busvar.h>
-#include "opt_ipkdb.h"
#include "ksyms.h"
#include <arm/at91/at91busvar.h>
Index: src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c
diff -u src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c:1.18 src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c:1.19
--- src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c:1.18 Sat Dec 24 17:36:59 2016
+++ src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c Sun Jul 15 05:16:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sdp24xx_machdep.c,v 1.18 2016/12/24 17:36:59 mlelstv Exp $ */
+/* $NetBSD: sdp24xx_machdep.c,v 1.19 2018/07/15 05:16:42 maxv Exp $ */
/*
* Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,12 +125,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdp24xx_machdep.c,v 1.18 2016/12/24 17:36:59 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdp24xx_machdep.c,v 1.19 2018/07/15 05:16:42 maxv Exp $");
#include "opt_machdep.h"
#include "opt_ddb.h"
#include "opt_kgdb.h"
-#include "opt_ipkdb.h"
#include "opt_md.h"
#include "opt_com.h"
#include "opt_omap.h"
@@ -556,13 +555,6 @@ initarm(void *arg)
printf("done.\n");
#endif
-#ifdef IPKDB
- /* Initialise ipkdb */
- ipkdb_init();
- if (boothowto & RB_KDB)
- ipkdb_connect(0);
-#endif
-
#ifdef KGDB
if (boothowto & RB_KDB) {
kgdb_debug_init = 1;
Index: src/sys/arch/evbppc/ev64260/ev64260_locore.S
diff -u src/sys/arch/evbppc/ev64260/ev64260_locore.S:1.19 src/sys/arch/evbppc/ev64260/ev64260_locore.S:1.20
--- src/sys/arch/evbppc/ev64260/ev64260_locore.S:1.19 Mon Jun 20 19:56:11 2011
+++ src/sys/arch/evbppc/ev64260/ev64260_locore.S Sun Jul 15 05:16:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ev64260_locore.S,v 1.19 2011/06/20 19:56:11 matt Exp $ */
+/* $NetBSD: ev64260_locore.S,v 1.20 2018/07/15 05:16:42 maxv Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -34,7 +34,6 @@
#include "opt_ddb.h"
#include "opt_ppcparam.h"
-#include "opt_ipkdb.h"
#include "opt_modular.h"
#include "opt_multiprocessor.h"
#include "opt_openpic.h"
Index: src/sys/arch/evbppc/ev64260/machdep.c
diff -u src/sys/arch/evbppc/ev64260/machdep.c:1.32 src/sys/arch/evbppc/ev64260/machdep.c:1.33
--- src/sys/arch/evbppc/ev64260/machdep.c:1.32 Thu Dec 22 14:47:57 2016
+++ src/sys/arch/evbppc/ev64260/machdep.c Sun Jul 15 05:16:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.32 2016/12/22 14:47:57 cherry Exp $ */
+/* $NetBSD: machdep.c,v 1.33 2018/07/15 05:16:42 maxv Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.32 2016/12/22 14:47:57 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.33 2018/07/15 05:16:42 maxv Exp $");
#include "opt_marvell.h"
#include "opt_modular.h"
@@ -42,7 +42,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include "opt_inet.h"
#include "opt_ccitt.h"
#include "opt_ns.h"
-#include "opt_ipkdb.h"
#define _POWERPC_BUS_DMA_PRIVATE
@@ -238,14 +237,6 @@ initppc(u_int startkernel, u_int endkern
startsym, endsym);
}
#endif
-#ifdef IPKDB
- /*
- * Now trap to IPKDB
- */
- ipkdb_init();
- if (boothowto & RB_KDB)
- ipkdb_connect(0);
-#endif
}
/*
Index: src/sys/arch/evbppc/mpc85xx/mpc85xx_start.S
diff -u src/sys/arch/evbppc/mpc85xx/mpc85xx_start.S:1.9 src/sys/arch/evbppc/mpc85xx/mpc85xx_start.S:1.10
--- src/sys/arch/evbppc/mpc85xx/mpc85xx_start.S:1.9 Sun Aug 10 18:01:29 2014
+++ src/sys/arch/evbppc/mpc85xx/mpc85xx_start.S Sun Jul 15 05:16:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: mpc85xx_start.S,v 1.9 2014/08/10 18:01:29 joerg Exp $ */
+/* $NetBSD: mpc85xx_start.S,v 1.10 2018/07/15 05:16:42 maxv Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -37,11 +37,10 @@
#include <sys/cdefs.h>
#include <powerpc/asm.h>
-RCSID("$NetBSD: mpc85xx_start.S,v 1.9 2014/08/10 18:01:29 joerg Exp $")
+RCSID("$NetBSD: mpc85xx_start.S,v 1.10 2018/07/15 05:16:42 maxv Exp $")
#include "opt_altivec.h"
#include "opt_ddb.h"
-#include "opt_ipkdb.h"
#include "opt_lockdebug.h"
#include "opt_modular.h"
#include "opt_multiprocessor.h"
Index: src/sys/arch/evbppc/obs405/obs200_locore.S
diff -u src/sys/arch/evbppc/obs405/obs200_locore.S:1.12 src/sys/arch/evbppc/obs405/obs200_locore.S:1.13
--- src/sys/arch/evbppc/obs405/obs200_locore.S:1.12 Tue Aug 5 16:28:39 2014
+++ src/sys/arch/evbppc/obs405/obs200_locore.S Sun Jul 15 05:16:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: obs200_locore.S,v 1.12 2014/08/05 16:28:39 joerg Exp $ */
+/* $NetBSD: obs200_locore.S,v 1.13 2018/07/15 05:16:42 maxv Exp $ */
/* Original Tag: locore.S,v 1.1 2003/09/23 15:21:58 shige Exp */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
@@ -71,7 +71,6 @@
#undef PPC_4XX_NOCACHE
#include "opt_ddb.h"
-#include "opt_ipkdb.h"
#include "opt_lockdebug.h"
#include "opt_modular.h"
#include "opt_multiprocessor.h"
Index: src/sys/arch/evbppc/obs405/obs200_machdep.c
diff -u src/sys/arch/evbppc/obs405/obs200_machdep.c:1.19 src/sys/arch/evbppc/obs405/obs200_machdep.c:1.20
--- src/sys/arch/evbppc/obs405/obs200_machdep.c:1.19 Wed Jun 22 18:06:32 2011
+++ src/sys/arch/evbppc/obs405/obs200_machdep.c Sun Jul 15 05:16:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: obs200_machdep.c,v 1.19 2011/06/22 18:06:32 matt Exp $ */
+/* $NetBSD: obs200_machdep.c,v 1.20 2018/07/15 05:16:42 maxv Exp $ */
/* Original: machdep.c,v 1.3 2005/01/17 17:24:09 shige Exp */
/*
@@ -68,11 +68,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obs200_machdep.c,v 1.19 2011/06/22 18:06:32 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obs200_machdep.c,v 1.20 2018/07/15 05:16:42 maxv Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
-#include "opt_ipkdb.h"
#include <sys/param.h>
#include <sys/kernel.h>
@@ -171,14 +170,6 @@ initppc(vaddr_t startkernel, vaddr_t end
if (boothowto & RB_KDB)
Debugger();
#endif
-#ifdef IPKDB
- /*
- * Now trap to IPKDB
- */
- ipkdb_init();
- if (boothowto & RB_KDB)
- ipkdb_connect(0);
-#endif
/*
* Look for the ibm4xx modules in the right place.
Index: src/sys/arch/evbppc/obs405/obs266_machdep.c
diff -u src/sys/arch/evbppc/obs405/obs266_machdep.c:1.20 src/sys/arch/evbppc/obs405/obs266_machdep.c:1.21
--- src/sys/arch/evbppc/obs405/obs266_machdep.c:1.20 Wed Jun 22 18:06:32 2011
+++ src/sys/arch/evbppc/obs405/obs266_machdep.c Sun Jul 15 05:16:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: obs266_machdep.c,v 1.20 2011/06/22 18:06:32 matt Exp $ */
+/* $NetBSD: obs266_machdep.c,v 1.21 2018/07/15 05:16:42 maxv Exp $ */
/* Original: md_machdep.c,v 1.3 2005/01/24 18:47:37 shige Exp $ */
/*
@@ -68,11 +68,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obs266_machdep.c,v 1.20 2011/06/22 18:06:32 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obs266_machdep.c,v 1.21 2018/07/15 05:16:42 maxv Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
-#include "opt_ipkdb.h"
#include <sys/param.h>
#include <sys/kernel.h>
@@ -162,14 +161,6 @@ initppc(vaddr_t startkernel, vaddr_t end
if (boothowto & RB_KDB)
Debugger();
#endif
-#ifdef IPKDB
- /*
- * Now trap to IPKDB
- */
- ipkdb_init();
- if (boothowto & RB_KDB)
- ipkdb_connect(0);
-#endif
/*
* Look for the ibm4xx modules in the right place.
Index: src/sys/arch/evbppc/obs405/obs600_machdep.c
diff -u src/sys/arch/evbppc/obs405/obs600_machdep.c:1.9 src/sys/arch/evbppc/obs405/obs600_machdep.c:1.10
--- src/sys/arch/evbppc/obs405/obs600_machdep.c:1.9 Thu Jul 5 02:56:40 2012
+++ src/sys/arch/evbppc/obs405/obs600_machdep.c Sun Jul 15 05:16:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: obs600_machdep.c,v 1.9 2012/07/05 02:56:40 kiyohara Exp $ */
+/* $NetBSD: obs600_machdep.c,v 1.10 2018/07/15 05:16:42 maxv Exp $ */
/* Original: md_machdep.c,v 1.3 2005/01/24 18:47:37 shige Exp $ */
/*
@@ -68,11 +68,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obs600_machdep.c,v 1.9 2012/07/05 02:56:40 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obs600_machdep.c,v 1.10 2018/07/15 05:16:42 maxv Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
-#include "opt_ipkdb.h"
#include "opt_modular.h"
#include <sys/param.h>
@@ -170,14 +169,6 @@ initppc(vaddr_t startkernel, vaddr_t end
if (boothowto & RB_KDB)
Debugger();
#endif
-#ifdef IPKDB
- /*
- * Now trap to IPKDB
- */
- ipkdb_init();
- if (boothowto & RB_KDB)
- ipkdb_connect(0);
-#endif
/*
* Look for the ibm4xx modules in the right place.
Index: src/sys/arch/evbppc/pmppc/machdep.c
diff -u src/sys/arch/evbppc/pmppc/machdep.c:1.13 src/sys/arch/evbppc/pmppc/machdep.c:1.14
--- src/sys/arch/evbppc/pmppc/machdep.c:1.13 Thu Dec 22 14:47:57 2016
+++ src/sys/arch/evbppc/pmppc/machdep.c Sun Jul 15 05:16:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.13 2016/12/22 14:47:57 cherry Exp $ */
+/* $NetBSD: machdep.c,v 1.14 2018/07/15 05:16:42 maxv Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.13 2016/12/22 14:47:57 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.14 2018/07/15 05:16:42 maxv Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@@ -69,7 +69,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include "opt_inet.h"
#include "opt_ccitt.h"
#include "opt_ns.h"
-#include "opt_ipkdb.h"
#include <sys/param.h>
#include <sys/buf.h>
@@ -225,14 +224,6 @@ initppc(u_int startkernel, u_int endkern
*/
pmap_bootstrap(startkernel, endkernel);
-#ifdef IPKDB
- /*
- * Now trap to IPKDB
- */
- ipkdb_init();
- if (boothowto & RB_KDB)
- ipkdb_connect(0);
-#endif
#ifdef KGDB
kgdb_port_init();
if (boothowto & RB_KDB) {
Index: src/sys/arch/evbppc/pmppc/pmppc_locore.S
diff -u src/sys/arch/evbppc/pmppc/pmppc_locore.S:1.11 src/sys/arch/evbppc/pmppc/pmppc_locore.S:1.12
--- src/sys/arch/evbppc/pmppc/pmppc_locore.S:1.11 Mon Jun 20 19:56:11 2011
+++ src/sys/arch/evbppc/pmppc/pmppc_locore.S Sun Jul 15 05:16:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pmppc_locore.S,v 1.11 2011/06/20 19:56:11 matt Exp $ */
+/* $NetBSD: pmppc_locore.S,v 1.12 2018/07/15 05:16:42 maxv Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -34,7 +34,6 @@
#include "opt_ddb.h"
#include "opt_kgdb.h"
-#include "opt_ipkdb.h"
#include "opt_multiprocessor.h"
#include "opt_openpic.h"
#include "opt_ppcparam.h"
Index: src/sys/arch/evbppc/virtex/machdep.c
diff -u src/sys/arch/evbppc/virtex/machdep.c:1.21 src/sys/arch/evbppc/virtex/machdep.c:1.22
--- src/sys/arch/evbppc/virtex/machdep.c:1.21 Fri Jul 27 22:13:58 2012
+++ src/sys/arch/evbppc/virtex/machdep.c Sun Jul 15 05:16:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.21 2012/07/27 22:13:58 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.22 2018/07/15 05:16:42 maxv Exp $ */
/*
* Copyright (c) 2006 Jachym Holecek
@@ -34,11 +34,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.21 2012/07/27 22:13:58 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.22 2018/07/15 05:16:42 maxv Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
-#include "opt_ipkdb.h"
#include "opt_virtex.h"
#include "opt_kgdb.h"
@@ -151,14 +150,7 @@ initppc(vaddr_t startkernel, vaddr_t end
if (boothowto & RB_KDB)
Debugger();
#endif
-#ifdef IPKDB
- /*
- * Now trap to IPKDB
- */
- ipkdb_init();
- if (boothowto & RB_KDB)
- ipkdb_connect(0);
-#endif
+
#ifdef KGDB
/*
* Now trap to KGDB
Index: src/sys/arch/evbppc/virtex/virtex_start.S
diff -u src/sys/arch/evbppc/virtex/virtex_start.S:1.8 src/sys/arch/evbppc/virtex/virtex_start.S:1.9
--- src/sys/arch/evbppc/virtex/virtex_start.S:1.8 Mon Jun 20 19:56:11 2011
+++ src/sys/arch/evbppc/virtex/virtex_start.S Sun Jul 15 05:16:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: virtex_start.S,v 1.8 2011/06/20 19:56:11 matt Exp $ */
+/* $NetBSD: virtex_start.S,v 1.9 2018/07/15 05:16:42 maxv Exp $ */
/*
* Copyright (c) 2006 Jachym Holecek
@@ -34,7 +34,6 @@
*/
#include "opt_ddb.h"
-#include "opt_ipkdb.h"
#include "opt_lockdebug.h"
#include "opt_modular.h"
#include "opt_multiprocessor.h"
Index: src/sys/arch/evbppc/walnut/machdep.c
diff -u src/sys/arch/evbppc/walnut/machdep.c:1.55 src/sys/arch/evbppc/walnut/machdep.c:1.56
--- src/sys/arch/evbppc/walnut/machdep.c:1.55 Fri Jul 27 22:13:58 2012
+++ src/sys/arch/evbppc/walnut/machdep.c Sun Jul 15 05:16:43 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.55 2012/07/27 22:13:58 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.56 2018/07/15 05:16:43 maxv Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -67,11 +67,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.55 2012/07/27 22:13:58 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.56 2018/07/15 05:16:43 maxv Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
-#include "opt_ipkdb.h"
#include <sys/param.h>
#include <sys/boot_flag.h>
@@ -204,14 +203,6 @@ initppc(vaddr_t startkernel, vaddr_t end
if (boothowto & RB_KDB)
Debugger();
#endif
-#ifdef IPKDB
- /*
- * Now trap to IPKDB
- */
- ipkdb_init();
- if (boothowto & RB_KDB)
- ipkdb_connect(0);
-#endif
/*
* Look for the ibm4xx modules in the right place.
Index: src/sys/arch/evbppc/walnut/walnut_start.S
diff -u src/sys/arch/evbppc/walnut/walnut_start.S:1.23 src/sys/arch/evbppc/walnut/walnut_start.S:1.24
--- src/sys/arch/evbppc/walnut/walnut_start.S:1.23 Tue Aug 5 16:28:39 2014
+++ src/sys/arch/evbppc/walnut/walnut_start.S Sun Jul 15 05:16:43 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: walnut_start.S,v 1.23 2014/08/05 16:28:39 joerg Exp $ */
+/* $NetBSD: walnut_start.S,v 1.24 2018/07/15 05:16:43 maxv Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -70,7 +70,6 @@
#undef PPC_4XX_NOCACHE
#include "opt_ddb.h"
-#include "opt_ipkdb.h"
#include "opt_lockdebug.h"
#include "opt_modular.h"
#include "opt_multiprocessor.h"
Index: src/sys/arch/ibmnws/ibmnws/locore.S
diff -u src/sys/arch/ibmnws/ibmnws/locore.S:1.11 src/sys/arch/ibmnws/ibmnws/locore.S:1.12
--- src/sys/arch/ibmnws/ibmnws/locore.S:1.11 Mon Jun 20 19:56:11 2011
+++ src/sys/arch/ibmnws/ibmnws/locore.S Sun Jul 15 05:16:43 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.11 2011/06/20 19:56:11 matt Exp $ */
+/* $NetBSD: locore.S,v 1.12 2018/07/15 05:16:43 maxv Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,6 @@
*/
#include "opt_ddb.h"
-#include "opt_ipkdb.h"
#include "opt_lockdebug.h"
#include "opt_ppcparam.h"
#include "assym.h"
Index: src/sys/arch/macppc/macppc/locore.S
diff -u src/sys/arch/macppc/macppc/locore.S:1.72 src/sys/arch/macppc/macppc/locore.S:1.73
--- src/sys/arch/macppc/macppc/locore.S:1.72 Sun Nov 9 00:05:06 2014
+++ src/sys/arch/macppc/macppc/locore.S Sun Jul 15 05:16:43 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.72 2014/11/09 00:05:06 chs Exp $ */
+/* $NetBSD: locore.S,v 1.73 2018/07/15 05:16:43 maxv Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -33,7 +33,6 @@
#include "opt_ddb.h"
#include "opt_kgdb.h"
-#include "opt_ipkdb.h"
#include "opt_lockdebug.h"
#include "opt_modular.h"
#include "opt_multiprocessor.h"
Index: src/sys/arch/macppc/macppc/machdep.c
diff -u src/sys/arch/macppc/macppc/machdep.c:1.167 src/sys/arch/macppc/macppc/machdep.c:1.168
--- src/sys/arch/macppc/macppc/machdep.c:1.167 Wed Sep 6 03:10:09 2017
+++ src/sys/arch/macppc/macppc/machdep.c Sun Jul 15 05:16:43 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.167 2017/09/06 03:10:09 macallan Exp $ */
+/* $NetBSD: machdep.c,v 1.168 2018/07/15 05:16:43 maxv Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,12 +32,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.167 2017/09/06 03:10:09 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.168 2018/07/15 05:16:43 maxv Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
#include "opt_kgdb.h"
-#include "opt_ipkdb.h"
#include "opt_altivec.h"
#include "opt_multiprocessor.h"
#include "adb.h"
@@ -69,10 +68,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#ifdef KGDB
#include <sys/kgdb.h>
#endif
-
-#ifdef IPKDB
-#include <ipkdb/ipkdb.h>
-#endif
#include <dev/ofw/openfirm.h>
#include <dev/wsfb/genfbvar.h>
Index: src/sys/arch/mvmeppc/mvmeppc/locore.S
diff -u src/sys/arch/mvmeppc/mvmeppc/locore.S:1.16 src/sys/arch/mvmeppc/mvmeppc/locore.S:1.17
--- src/sys/arch/mvmeppc/mvmeppc/locore.S:1.16 Thu Aug 7 09:08:41 2014
+++ src/sys/arch/mvmeppc/mvmeppc/locore.S Sun Jul 15 05:16:43 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.16 2014/08/07 09:08:41 joerg Exp $ */
+/* $NetBSD: locore.S,v 1.17 2018/07/15 05:16:43 maxv Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -33,7 +33,6 @@
*/
#include "opt_ddb.h"
-#include "opt_ipkdb.h"
#include "opt_lockdebug.h"
#include "opt_modular.h"
#include "opt_multiprocessor.h"
Index: src/sys/arch/ofppc/ofppc/locore.S
diff -u src/sys/arch/ofppc/ofppc/locore.S:1.49 src/sys/arch/ofppc/ofppc/locore.S:1.50
--- src/sys/arch/ofppc/ofppc/locore.S:1.49 Sun Nov 9 00:05:06 2014
+++ src/sys/arch/ofppc/ofppc/locore.S Sun Jul 15 05:16:43 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.49 2014/11/09 00:05:06 chs Exp $ */
+/* $NetBSD: locore.S,v 1.50 2018/07/15 05:16:43 maxv Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,6 @@
*/
#include "opt_ddb.h"
-#include "opt_ipkdb.h"
#include "opt_lockdebug.h"
#include "opt_modular.h"
#include "opt_multiprocessor.h"
Index: src/sys/arch/powerpc/conf/files.powerpc
diff -u src/sys/arch/powerpc/conf/files.powerpc:1.90 src/sys/arch/powerpc/conf/files.powerpc:1.91
--- src/sys/arch/powerpc/conf/files.powerpc:1.90 Fri Jun 1 18:06:58 2018
+++ src/sys/arch/powerpc/conf/files.powerpc Sun Jul 15 05:16:43 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.powerpc,v 1.90 2018/06/01 18:06:58 macallan Exp $
+# $NetBSD: files.powerpc,v 1.91 2018/07/15 05:16:43 maxv Exp $
defflag opt_altivec.h ALTIVEC K_ALTIVEC PPC_HAVE_SPE
defflag opt_openpic.h OPENPIC_DISTRIBUTE
@@ -13,7 +13,6 @@ file arch/powerpc/powerpc/core_machdep.c
file arch/powerpc/powerpc/fixup.c
file arch/powerpc/powerpc/fubyte.c
file arch/powerpc/powerpc/fuswintr.c
-file arch/powerpc/powerpc/ipkdb_glue.c ipkdb
file arch/powerpc/powerpc/kgdb_machdep.c kgdb
file arch/powerpc/powerpc/kobj_machdep.c modular
file arch/powerpc/powerpc/lock_stubs.S
Index: src/sys/arch/powerpc/ibm4xx/genassym.cf
diff -u src/sys/arch/powerpc/ibm4xx/genassym.cf:1.23 src/sys/arch/powerpc/ibm4xx/genassym.cf:1.24
--- src/sys/arch/powerpc/ibm4xx/genassym.cf:1.23 Mon Jun 20 19:56:12 2011
+++ src/sys/arch/powerpc/ibm4xx/genassym.cf Sun Jul 15 05:16:43 2018
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.23 2011/06/20 19:56:12 matt Exp $
+# $NetBSD: genassym.cf,v 1.24 2018/07/15 05:16:43 maxv Exp $
#
# Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -46,7 +46,6 @@ define KERNEL_PID KERNEL_PID
define CI_INTSTK offsetof(struct cpu_info, ci_intstk)
define CI_TEMPSAVE offsetof(struct cpu_info, ci_savearea[CI_SAVETEMP])
define CI_DDBSAVE offsetof(struct cpu_info, ci_savearea[CI_SAVEDDB])
-define CI_IPKDBSAVE offsetof(struct cpu_info, ci_savearea[CI_SAVEIPKDB])
define CI_TLBMISSSAVE offsetof(struct cpu_info, ci_savearea[CI_SAVEMMU])
define CPUSAVE_R28 CPUSAVE_R28*sizeof(register_t)
Index: src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c
diff -u src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c:1.25 src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c:1.26
--- src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c:1.25 Mon Dec 26 21:25:08 2016
+++ src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c Sun Jul 15 05:16:43 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ibm4xx_machdep.c,v 1.25 2016/12/26 21:25:08 rin Exp $ */
+/* $NetBSD: ibm4xx_machdep.c,v 1.26 2018/07/15 05:16:43 maxv Exp $ */
/* Original: ibm40x_machdep.c,v 1.3 2005/01/17 17:19:36 shige Exp $ */
/*
@@ -68,12 +68,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ibm4xx_machdep.c,v 1.25 2016/12/26 21:25:08 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ibm4xx_machdep.c,v 1.26 2018/07/15 05:16:43 maxv Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
#include "opt_kgdb.h"
-#include "opt_ipkdb.h"
#include "opt_modular.h"
#include "ksyms.h" /* for NKSYMS */
@@ -94,10 +93,6 @@ __KERNEL_RCSID(0, "$NetBSD: ibm4xx_machd
#include <sys/kgdb.h>
#endif
-#if defined(IPKDB)
-#include <ipkdb/ipkdb.h>
-#endif
-
#include <machine/powerpc.h>
#include <powerpc/pcb.h>
#include <machine/trap.h>
@@ -131,8 +126,6 @@ extern const uint32_t pitfitwdog[], pitf
extern const uint32_t errata51handler[], errata51size;
#if defined(DDB)
extern const uint32_t ddblow[], ddbsize;
-#elif defined(IPKDB)
-extern const uint32_t ipkdblow[], ipkdbsize;
#endif
static const struct exc_info trap_table[] = {
{ EXC_SC, sctrap, (uintptr_t)&scsize },
@@ -147,8 +140,6 @@ static const struct exc_info trap_table[
errata51handler, (uintptr_t)&errata51size },
#if defined(DDB)
{ EXC_PGM, ddblow, (uintptr_t)&ddbsize },
-#elif defined(IPKDB)
- { EXC_PGM, ipkdblow, (uintptr_t)&ipkdbsize },
#endif
};
Index: src/sys/arch/powerpc/ibm4xx/trap_subr.S
diff -u src/sys/arch/powerpc/ibm4xx/trap_subr.S:1.26 src/sys/arch/powerpc/ibm4xx/trap_subr.S:1.27
--- src/sys/arch/powerpc/ibm4xx/trap_subr.S:1.26 Wed Dec 28 09:36:02 2016
+++ src/sys/arch/powerpc/ibm4xx/trap_subr.S Sun Jul 15 05:16:43 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: trap_subr.S,v 1.26 2016/12/28 09:36:02 rin Exp $ */
+/* $NetBSD: trap_subr.S,v 1.27 2018/07/15 05:16:43 maxv Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -198,17 +198,6 @@ _C_LABEL(ddblow):
_C_LABEL(ddbsize) = .-_C_LABEL(ddblow)
#endif /* DDB || KGDB */
-#ifdef IPKDB
-/*
- * In case of IPKDB we want a separate trap catcher for it
- */
- .globl _C_LABEL(ipkdblow),_C_LABEL(ipkdbsize)
-_C_LABEL(ipkdblow):
- ACCESS_PROLOG(CI_IPKDBSAVE)
- bla ipkdbtrap
-_C_LABEL(ipkdbsize) = .-_C_LABEL(ipkdblow)
-#endif /* IPKDB */
-
#ifdef DEBUG
#define TRAP_IF_ZERO(r) tweqi r,0
#else
@@ -525,107 +514,3 @@ ddbtrap:
beq trapagain
b trapexit
#endif /* DDB || KGDB */
-
-#ifdef IPKDB
-/*
- * Deliberate entry to ipkdbtrap
- */
- .globl _C_LABEL(ipkdb_trap)
-_C_LABEL(ipkdb_trap):
- mtsprg1 %r1
- GET_CPUINFO(%r4)
- mfmsr %r3
- stw %r3,(CI_IPKDBSAVE+CPUSAVE_SRR1)(%r4)
- wrteei 0 /* disable interrupts */
- isync
- stmw %r28,CI_IPKDBSAVE(%r4)
- mflr %r28
- stw %r28,(CI_IPKDBSAVE+CPUSAVE_SRR0)(%r4)
- li %r29,EXC_BPT
- mtlr %r29
- mfcr %r29
-
-/*
- * Now the ipkdb trap catching code.
- */
-ipkdbtrap:
- FRAME_SETUP(CI_IPKDBSAVE)
-/* Call C trap code: */
- addi %r3,%r1,FRAME_TF
- bl _C_LABEL(ipkdb_trap_glue)
- or. %r3,%r3,%r3
- beq trapagain
- b trapexit
-
-ipkdbfault:
- ba _ipkdbfault
-_ipkdbfault:
- mfsrr0 %r3
- addi %r3,%r3,4
- mtsrr0 %r3
- li %r3,-1
- rfi
- ba . /* Protect against prefetch */
-
-/*
- * int ipkdbfbyte(unsigned char *p)
- */
- .globl _C_LABEL(ipkdbfbyte)
-_C_LABEL(ipkdbfbyte):
- li %r9,EXC_DSI /* establish new fault routine */
- lwz %r5,0(%r9)
- lis %r6,ipkdbfault@ha
- lwz %r6,ipkdbfault@l(%r6)
- stw %r6,0(%r9)
-#ifdef IPKDBUSERHACK
-#ifndef PPC_IBM4XX
- lis %r8,_C_LABEL(ipkdbsr)@ha
- lwz %r8,_C_LABEL(ipkdbsr)@l(%r8)
- mtsr USER_SR,%r8
- isync
-#endif
-#endif
- dcbst %r0,%r9 /* flush data... */
- sync
- icbi %r0,%r9 /* and instruction caches */
- lbz %r3,0(%r3) /* fetch data */
- stw %r5,0(%r9) /* restore previous fault handler */
- dcbst %r0,%r9 /* and flush data... */
- sync
- icbi %r0,%r9 /* and instruction caches */
- blr
-
-/*
- * int ipkdbsbyte(unsigned char *p, int c)
- */
- .globl _C_LABEL(ipkdbsbyte)
-_C_LABEL(ipkdbsbyte):
- li %r9,EXC_DSI /* establish new fault routine */
- lwz %r5,0(%r9)
- lis %r6,ipkdbfault@ha
- lwz %r6,ipkdbfault@l(%r6)
- stw %r6,0(%r9)
-#ifdef IPKDBUSERHACK
-#ifndef PPC_IBM4XX
- lis %r8,_C_LABEL(ipkdbsr)@ha
- lwz %r8,_C_LABEL(ipkdbsr)@l(%r8)
- mtsr USER_SR,%r8
- isync
-#endif
-#endif
- dcbst %r0,%r9 /* flush data... */
- sync
- icbi %r0,%r9 /* and instruction caches */
- mr %r6,%r3
- xor %r3,%r3,%r3
- stb %r4,0(%r6)
- dcbst %r0,%r6 /* Now do appropriate flushes
- to data... */
- sync
- icbi %r0,%r6 /* and instruction caches */
- stw %r5,0(%r9) /* restore previous fault handler */
- dcbst %r0,%r9 /* and flush data... */
- sync
- icbi %r0,%r9 /* and instruction caches */
- blr
-#endif /* IPKDB */
Index: src/sys/arch/powerpc/ibm4xx/openbios/locore.S
diff -u src/sys/arch/powerpc/ibm4xx/openbios/locore.S:1.11 src/sys/arch/powerpc/ibm4xx/openbios/locore.S:1.12
--- src/sys/arch/powerpc/ibm4xx/openbios/locore.S:1.11 Tue Aug 5 16:28:39 2014
+++ src/sys/arch/powerpc/ibm4xx/openbios/locore.S Sun Jul 15 05:16:44 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.11 2014/08/05 16:28:39 joerg Exp $ */
+/* $NetBSD: locore.S,v 1.12 2018/07/15 05:16:44 maxv Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -70,7 +70,6 @@
#undef PPC_4XX_NOCACHE
#include "opt_ddb.h"
-#include "opt_ipkdb.h"
#include "opt_lockdebug.h"
#include "opt_modular.h"
#include "opt_multiprocessor.h"
Index: src/sys/arch/powerpc/include/cpu.h
diff -u src/sys/arch/powerpc/include/cpu.h:1.106 src/sys/arch/powerpc/include/cpu.h:1.107
--- src/sys/arch/powerpc/include/cpu.h:1.106 Fri May 25 23:00:34 2018
+++ src/sys/arch/powerpc/include/cpu.h Sun Jul 15 05:16:44 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.106 2018/05/25 23:00:34 macallan Exp $ */
+/* $NetBSD: cpu.h,v 1.107 2018/07/15 05:16:44 maxv Exp $ */
/*
* Copyright (C) 1999 Wolfgang Solfrank.
@@ -95,7 +95,7 @@ struct cpu_info {
#endif
#define CI_SAVETEMP (0*CPUSAVE_LEN)
#define CI_SAVEDDB (1*CPUSAVE_LEN)
-#define CI_SAVEIPKDB (2*CPUSAVE_LEN)
+#define CI_SAVEIPKDB (2*CPUSAVE_LEN) /* obsolete */
#define CI_SAVEMMU (3*CPUSAVE_LEN)
#define CI_SAVEMAX (4*CPUSAVE_LEN)
#define CPUSAVE_LEN 8
Index: src/sys/arch/powerpc/oea/genassym.cf
diff -u src/sys/arch/powerpc/oea/genassym.cf:1.26 src/sys/arch/powerpc/oea/genassym.cf:1.27
--- src/sys/arch/powerpc/oea/genassym.cf:1.26 Wed Feb 1 05:25:57 2012
+++ src/sys/arch/powerpc/oea/genassym.cf Sun Jul 15 05:16:44 2018
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.26 2012/02/01 05:25:57 matt Exp $
+# $NetBSD: genassym.cf,v 1.27 2018/07/15 05:16:44 maxv Exp $
#
# Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -66,7 +66,6 @@ endif
define CI_TEMPSAVE offsetof(struct cpu_info, ci_savearea[CI_SAVETEMP])
define CI_DDBSAVE offsetof(struct cpu_info, ci_savearea[CI_SAVEDDB])
-define CI_IPKDBSAVE offsetof(struct cpu_info, ci_savearea[CI_SAVEIPKDB])
define CI_DISISAVE offsetof(struct cpu_info, ci_savearea[CI_SAVEMMU])
define CPUSAVE_R28 CPUSAVE_R28*sizeof(register_t)
Index: src/sys/arch/powerpc/oea/oea_machdep.c
diff -u src/sys/arch/powerpc/oea/oea_machdep.c:1.74 src/sys/arch/powerpc/oea/oea_machdep.c:1.75
--- src/sys/arch/powerpc/oea/oea_machdep.c:1.74 Sun Feb 11 00:01:12 2018
+++ src/sys/arch/powerpc/oea/oea_machdep.c Sun Jul 15 05:16:44 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: oea_machdep.c,v 1.74 2018/02/11 00:01:12 mrg Exp $ */
+/* $NetBSD: oea_machdep.c,v 1.75 2018/07/15 05:16:44 maxv Exp $ */
/*
* Copyright (C) 2002 Matt Thomas
@@ -33,13 +33,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: oea_machdep.c,v 1.74 2018/02/11 00:01:12 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: oea_machdep.c,v 1.75 2018/07/15 05:16:44 maxv Exp $");
#include "opt_ppcarch.h"
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
#include "opt_kgdb.h"
-#include "opt_ipkdb.h"
#include "opt_multiprocessor.h"
#include "opt_altivec.h"
@@ -68,10 +67,6 @@ __KERNEL_RCSID(0, "$NetBSD: oea_machdep.
#ifdef KGDB
#include <sys/kgdb.h>
#endif
-
-#ifdef IPKDB
-#include <ipkdb/ipkdb.h>
-#endif
#include <machine/powerpc.h>
@@ -140,9 +135,6 @@ oea_init(void (*handler)(void))
#if defined(DDB) || defined(KGDB)
extern int ddblow[], ddbsize[];
#endif
-#ifdef IPKDB
- extern int ipkdblow[], ipkdbsize[];
-#endif
#ifdef ALTIVEC
register_t msr;
#endif
@@ -265,7 +257,7 @@ oea_init(void (*handler)(void))
memcpy((void *)exc, trapcode, size);
memcpy((void *)(exc_base + EXC_VEC), trapcode, size);
break;
-#if defined(DDB) || defined(IPKDB) || defined(KGDB)
+#if defined(DDB) || defined(KGDB)
case EXC_RUNMODETRC:
#ifdef PPC_OEA601
if (cpuvers != MPC601) {
@@ -280,18 +272,10 @@ oea_init(void (*handler)(void))
case EXC_PGM:
case EXC_TRC:
case EXC_BPT:
-#if defined(DDB) || defined(KGDB)
size = (size_t)ddbsize;
memcpy((void *)exc, ddblow, size);
-#if defined(IPKDB)
-#error "cannot enable IPKDB with DDB or KGDB"
-#endif
-#else
- size = (size_t)ipkdbsize;
- memcpy((void *)exc, ipkdblow, size);
-#endif
break;
-#endif /* DDB || IPKDB || KGDB */
+#endif /* DDB || KGDB */
}
#if 0
exc += roundup(size, 32);
Index: src/sys/arch/powerpc/oea/ofwoea_machdep.c
diff -u src/sys/arch/powerpc/oea/ofwoea_machdep.c:1.44 src/sys/arch/powerpc/oea/ofwoea_machdep.c:1.45
--- src/sys/arch/powerpc/oea/ofwoea_machdep.c:1.44 Sat Mar 3 22:50:17 2018
+++ src/sys/arch/powerpc/oea/ofwoea_machdep.c Sun Jul 15 05:16:44 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ofwoea_machdep.c,v 1.44 2018/03/03 22:50:17 macallan Exp $ */
+/* $NetBSD: ofwoea_machdep.c,v 1.45 2018/07/15 05:16:44 maxv Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,13 +30,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofwoea_machdep.c,v 1.44 2018/03/03 22:50:17 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofwoea_machdep.c,v 1.45 2018/07/15 05:16:44 maxv Exp $");
#include "opt_ppcarch.h"
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
#include "opt_kgdb.h"
-#include "opt_ipkdb.h"
#include "opt_modular.h"
#include "wsdisplay.h"
@@ -81,10 +80,6 @@ __KERNEL_RCSID(0, "$NetBSD: ofwoea_machd
#include <sys/kgdb.h>
#endif
-#ifdef IPKDB
-#include <ipkdb/ipkdb.h>
-#endif
-
#include "opt_ofwoea.h"
#ifdef ofppc
Index: src/sys/arch/powerpc/powerpc/trap_subr.S
diff -u src/sys/arch/powerpc/powerpc/trap_subr.S:1.79 src/sys/arch/powerpc/powerpc/trap_subr.S:1.80
--- src/sys/arch/powerpc/powerpc/trap_subr.S:1.79 Wed May 2 08:24:40 2018
+++ src/sys/arch/powerpc/powerpc/trap_subr.S Sun Jul 15 05:16:44 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: trap_subr.S,v 1.79 2018/05/02 08:24:40 phx Exp $ */
+/* $NetBSD: trap_subr.S,v 1.80 2018/07/15 05:16:44 maxv Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -170,8 +170,7 @@
/*
* This code gets copied to all the trap vectors
- * (except ISI/DSI, ALI, the interrupts, and possibly the debugging
- * traps when using IPKDB).
+ * (except ISI/DSI, ALI, the interrupts).
*/
/* LINTSTUB: Var: int trapcode[1], trapsize[1]; */
@@ -729,42 +728,6 @@ _C_LABEL(ddblow):
_C_LABEL(ddbsize) = .-_C_LABEL(ddblow)
#endif /* DDB || KGDB */
-#if defined(IPKDB) && !defined(DISTANT_KERNEL)
-/* IPKDB doesn't work together with DISTANT_KERNEL at the moment! */
-
-#define ipkdbsave 0xde0 /* primary save area for IPKDB */
-/*
- * In case of IPKDB we want a separate trap catcher for it
- */
-
- .local ipkdbstk
- .comm ipkdbstk,INTSTK,8 /* ipkdb stack */
-
-/* LINTSTUB: Var: int ipkdblow[1], ipkdbsize[1]; */
- .globl _C_LABEL(ipkdblow),_C_LABEL(ipkdbsize)
-_C_LABEL(ipkdblow):
- mtsprg1 %r1 /* save SP */
- ENABLE_64BIT_BRIDGE(%r1)
- GET_CPUINFO(%r1)
- streg %r28,(CI_IPKDBSAVE+CPUSAVE_R28)(%r1) /* save r28 */
- streg %r29,(CI_IPKDBSAVE+CPUSAVE_R29)(%r1) /* save r29 */
- streg %r30,(CI_IPKDBSAVE+CPUSAVE_R30)(%r1) /* save r30 */
- streg %r31,(CI_IPKDBSAVE+CPUSAVE_R31)(%r1) /* save r31 */
- mflr %r28 /* save LR */
- mfcr %r29 /* save CR */
- lis %r1,ipkdbstk+INTSTK@ha /* get new SP */
- addi %r1,%r1,ipkdbstk+INTSTK@l
-#if defined(DISTANT_KERNEL)
- lis %r31,ipkdbtrap@ha
- addi %r31,%r31,ipkdbtrap@l
- mtlr %r31
- blrl
-#else
- bla ipkdbtrap
-#endif
-_C_LABEL(ipkdbsize) = .-_C_LABEL(ipkdblow)
-#endif /* IPKDB */
-
/*
* FRAME_SETUP assumes:
* SPRG1 SP (%r1)
@@ -1254,111 +1217,6 @@ ddbtrap:
RFI
#endif /* DDB || KGDB */
-#if defined(IPKDB) && !defined(DISTANT_KERNEL)
-/*
- * Deliberate entry to ipkdbtrap
- */
- .globl _C_LABEL(ipkdb_trap)
-_C_LABEL(ipkdb_trap):
- mtsprg1 %r1
- mfmsr %r3
- mtsrr1 %r3
- andi. %r3,%r3,~(PSL_EE|PSL_ME)@l
- mtmsr %r3 /* disable interrupts */
- isync
- ENABLE_64BIT_BRIDGE(%r3)
- GET_CPUINFO(%r3)
- streg %r28,(CI_IPKDBSAVE+CPUSAVE_R28)(%r3)
- streg %r29,(CI_IPKDBSAVE+CPUSAVE_R29)(%r3)
- streg %r30,(CI_IPKDBSAVE+CPUSAVE_R30)(%r3)
- streg %r31,(CI_IPKDBSAVE+CPUSAVE_R31)(%r3)
- mflr %r28
- li %r29,EXC_BPT
- mtlr %r29
- mfcr %r29
- mtsrr0 %r28
-
-/*
- * Now the ipkdb trap catching code.
- */
-ipkdbtrap:
- FRAME_SETUP(CI_IPKDBSAVE)
-/* Call C trap code: */
- addi %r3,%r1,FRAME_TF
- bl _C_LABEL(ipkdb_trap_glue)
- or. %r3,%r3,%r3
- beq trapagain
- FRAME_RESTORE_CALLEE
- FRAME_LEAVE(CI_IPKDBSAVE)
- RFI
-
-ipkdbfault:
- ba _ipkdbfault
-_ipkdbfault:
- mfsrr0 %r3
- addi %r3,%r3,4
- mtsrr0 %r3
- li %r3,-1
- RFI
-
-/*
- * int ipkdbfbyte(unsigned char *p)
- */
- .globl _C_LABEL(ipkdbfbyte)
-_C_LABEL(ipkdbfbyte):
- li %r9,EXC_DSI /* establish new fault routine */
- ldint %r5,0(%r9)
- lis %r6,ipkdbfault@ha
- ldint %r6,ipkdbfault@l(%r6)
- stint %r6,0(%r9)
-#ifdef IPKDBUSERHACK
- lis %r8,_C_LABEL(ipkdbsr)@ha
- ldreg %r8,_C_LABEL(ipkdbsr)@l(%r8)
- mtsr USER_SR,8
- isync
-#endif
- dcbst %r0,%r9 /* flush data... */
- sync
- icbi %r0,%r9 /* and instruction caches */
- lbz %r3,0(%r3) /* fetch data */
- stint %r5,0(%r9) /* restore previous fault handler */
- dcbst %r0,%r9 /* and flush data... */
- sync
- icbi %r0,%r9 /* and instruction caches */
- blr
-
-/*
- * int ipkdbsbyte(unsigned char *p, int c)
- */
- .globl _C_LABEL(ipkdbsbyte)
-_C_LABEL(ipkdbsbyte):
- li %r9,EXC_DSI /* establish new fault routine */
- ldint %r5,0(%r9)
- lis %r6,ipkdbfault@ha
- ldint %r6,ipkdbfault@l(%r6)
- stint %r6,0(%r9)
-#ifdef IPKDBUSERHACK
- lis %r8,_C_LABEL(ipkdbsr)@ha
- ldreg %r8,_C_LABEL(ipkdbsr)@l(%r8)
- mtsr USER_SR,%r8
- isync
-#endif
- dcbst %r0,%r9 /* flush data... */
- sync
- icbi %r0,%r9 /* and instruction caches */
- mr %r6,%r3
- li %r3,0
- stb %r4,0(%r6)
- dcbst %r0,%r6 /* Now do appropriate flushes
- to data... */
- sync
- icbi %r0,%r6 /* and instruction caches */
- stint %r5,0(%r9) /* restore previous fault handler */
- dcbst %r0,%r9 /* and flush data... */
- sync
- icbi %r0,%r9 /* and instruction caches */
- blr
-#endif /* IPKDB */
.globl _C_LABEL(trapend)
_C_LABEL(trapend):
Index: src/sys/arch/prep/prep/locore.S
diff -u src/sys/arch/prep/prep/locore.S:1.19 src/sys/arch/prep/prep/locore.S:1.20
--- src/sys/arch/prep/prep/locore.S:1.19 Thu Aug 7 09:06:53 2014
+++ src/sys/arch/prep/prep/locore.S Sun Jul 15 05:16:44 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.19 2014/08/07 09:06:53 joerg Exp $ */
+/* $NetBSD: locore.S,v 1.20 2018/07/15 05:16:44 maxv Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -33,7 +33,6 @@
*/
#include "opt_ddb.h"
-#include "opt_ipkdb.h"
#include "opt_lockdebug.h"
#include "opt_modular.h"
#include "opt_multiprocessor.h"
Index: src/sys/arch/rs6000/rs6000/locore.S
diff -u src/sys/arch/rs6000/rs6000/locore.S:1.11 src/sys/arch/rs6000/rs6000/locore.S:1.12
--- src/sys/arch/rs6000/rs6000/locore.S:1.11 Wed Aug 6 15:38:07 2014
+++ src/sys/arch/rs6000/rs6000/locore.S Sun Jul 15 05:16:44 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.11 2014/08/06 15:38:07 joerg Exp $ */
+/* $NetBSD: locore.S,v 1.12 2018/07/15 05:16:44 maxv Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -33,7 +33,6 @@
*/
#include "opt_ddb.h"
-#include "opt_ipkdb.h"
#include "opt_lockdebug.h"
#include "opt_modular.h"
#include "opt_multiprocessor.h"
Index: src/sys/arch/sandpoint/sandpoint/locore.S
diff -u src/sys/arch/sandpoint/sandpoint/locore.S:1.24 src/sys/arch/sandpoint/sandpoint/locore.S:1.25
--- src/sys/arch/sandpoint/sandpoint/locore.S:1.24 Fri Feb 7 08:51:34 2014
+++ src/sys/arch/sandpoint/sandpoint/locore.S Sun Jul 15 05:16:44 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.24 2014/02/07 08:51:34 phx Exp $ */
+/* $NetBSD: locore.S,v 1.25 2018/07/15 05:16:44 maxv Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -33,7 +33,6 @@
*/
#include "opt_ddb.h"
-#include "opt_ipkdb.h"
#include "opt_modular.h"
#include "opt_multiprocessor.h"
#include "opt_openpic.h"
Index: src/sys/arch/sandpoint/sandpoint/machdep.c
diff -u src/sys/arch/sandpoint/sandpoint/machdep.c:1.66 src/sys/arch/sandpoint/sandpoint/machdep.c:1.67
--- src/sys/arch/sandpoint/sandpoint/machdep.c:1.66 Thu Dec 22 14:47:59 2016
+++ src/sys/arch/sandpoint/sandpoint/machdep.c Sun Jul 15 05:16:44 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.66 2016/12/22 14:47:59 cherry Exp $ */
+/* $NetBSD: machdep.c,v 1.67 2018/07/15 05:16:44 maxv Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,11 +32,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.66 2016/12/22 14:47:59 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.67 2018/07/15 05:16:44 maxv Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
-#include "opt_ipkdb.h"
#include "opt_interrupt.h"
#include "opt_modular.h"
@@ -206,14 +205,6 @@ initppc(u_int startkernel, u_int endkern
#if 0 /* NKSYMS || defined(DDB) || defined(MODULAR) */
ksyms_addsyms_elf((int)((u_int)endsym - (u_int)startsym), startsym, endsym);
#endif
-#ifdef IPKDB
- /*
- * Now trap to IPKDB
- */
- ipkdb_init();
- if (boothowto & RB_KDB)
- ipkdb_connect(0);
-#endif
}
void
Index: src/sys/dev/cadence/if_cemac.c
diff -u src/sys/dev/cadence/if_cemac.c:1.13 src/sys/dev/cadence/if_cemac.c:1.14
--- src/sys/dev/cadence/if_cemac.c:1.13 Tue Jun 26 06:48:00 2018
+++ src/sys/dev/cadence/if_cemac.c Sun Jul 15 05:16:44 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cemac.c,v 1.13 2018/06/26 06:48:00 msaitoh Exp $ */
+/* $NetBSD: if_cemac.c,v 1.14 2018/07/15 05:16:44 maxv Exp $ */
/*
* Copyright (c) 2015 Genetec Corporation. All rights reserved.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cemac.c,v 1.13 2018/06/26 06:48:00 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cemac.c,v 1.14 2018/07/15 05:16:44 maxv Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -76,10 +76,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_cemac.c,v
#include <netinet/if_inarp.h>
#endif
-#ifdef IPKDB_AT91 // @@@
-#include <ipkdb/ipkdb.h>
-#endif
-
#include <dev/cadence/cemacreg.h>
#include <dev/cadence/if_cemacvar.h>
Index: src/sys/dev/ic/dp8390.c
diff -u src/sys/dev/ic/dp8390.c:1.89 src/sys/dev/ic/dp8390.c:1.90
--- src/sys/dev/ic/dp8390.c:1.89 Tue Jun 26 06:48:00 2018
+++ src/sys/dev/ic/dp8390.c Sun Jul 15 05:16:45 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: dp8390.c,v 1.89 2018/06/26 06:48:00 msaitoh Exp $ */
+/* $NetBSD: dp8390.c,v 1.90 2018/07/15 05:16:45 maxv Exp $ */
/*
* Device driver for National Semiconductor DS8390/WD83C690 based ethernet
@@ -14,9 +14,8 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dp8390.c,v 1.89 2018/06/26 06:48:00 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dp8390.c,v 1.90 2018/07/15 05:16:45 maxv Exp $");
-#include "opt_ipkdb.h"
#include "opt_inet.h"
#include <sys/param.h>
@@ -48,10 +47,6 @@ __KERNEL_RCSID(0, "$NetBSD: dp8390.c,v 1
#include <sys/bus.h>
-#ifdef IPKDB_DP8390
-#include <ipkdb/ipkdb.h>
-#endif
-
#include <dev/ic/dp8390reg.h>
#include <dev/ic/dp8390var.h>
@@ -1244,264 +1239,3 @@ dp8390_detach(struct dp8390_softc *sc, i
return 0;
}
-
-#ifdef IPKDB_DP8390
-static void dp8390_ipkdb_hwinit(struct ipkdb_if *);
-static void dp8390_ipkdb_init(struct ipkdb_if *);
-static void dp8390_ipkdb_leave(struct ipkdb_if *);
-static int dp8390_ipkdb_rcv(struct ipkdb_if *, uint8_t *, int);
-static void dp8390_ipkdb_send(struct ipkdb_if *, uint8_t *, int);
-
-/*
- * This is essentially similar to dp8390_config above.
- */
-int
-dp8390_ipkdb_attach(struct ipkdb_if *kip)
-{
- struct dp8390_softc *sc = kip->port;
-
- if (sc->mem_size < 8192 * 2)
- sc->txb_cnt = 1;
- else if (sc->mem_size < 8192 * 3)
- sc->txb_cnt = 2;
- else
- sc->txb_cnt = 3;
-
- sc->tx_page_start = sc->mem_start >> ED_PAGE_SHIFT;
- sc->rec_page_start = sc->tx_page_start + sc->txb_cnt * ED_TXBUF_SIZE;
- sc->rec_page_stop = sc->tx_page_start + (sc->mem_size >> ED_PAGE_SHIFT);
- sc->mem_ring = sc->mem_start +
- ((sc->txb_cnt * ED_TXBUF_SIZE) << ED_PAGE_SHIFT);
- sc->mem_end = sc->mem_start + sc->mem_size;
-
- dp8390_stop(sc);
-
- kip->start = dp8390_ipkdb_init;
- kip->leave = dp8390_ipkdb_leave;
- kip->receive = dp8390_ipkdb_rcv;
- kip->send = dp8390_ipkdb_send;
-
- return 0;
-}
-
-/*
- * Similar to dp8390_init above.
- */
-static void
-dp8390_ipkdb_hwinit(struct ipkdb_if *kip)
-{
- struct dp8390_softc *sc = kip->port;
- struct ifnet *ifp = &sc->sc_ec.ec_if;
- bus_space_tag_t regt = sc->sc_regt;
- bus_space_handle_t regh = sc->sc_regh;
- int i;
-
- sc->txb_inuse = 0;
- sc->txb_new = 0;
- sc->txb_next_tx = 0;
- dp8390_stop(sc);
-
- if (sc->dcr_reg & ED_DCR_LS)
- NIC_PUT(regt, regh, ED_P0_DCR, sc->dcr_reg);
- else
- NIC_PUT(regt, regh, ED_P0_DCR, ED_DCR_FT1 | ED_DCR_LS);
- NIC_PUT(regt, regh, ED_P0_RBCR0, 0);
- NIC_PUT(regt, regh, ED_P0_RBCR1, 0);
- NIC_PUT(regt, regh, ED_P0_RCR, ED_RCR_MON | sc->rcr_proto);
- NIC_PUT(regt, regh, ED_P0_TCR, ED_TCR_LB0);
- if (sc->is790)
- NIC_PUT(regt, regh, 0x09, 0);
- NIC_PUT(regt, regh, ED_P0_BNRY, sc->rec_page_start);
- NIC_PUT(regt, regh, ED_P0_PSTART, sc->rec_page_start);
- NIC_PUT(regt, regh, ED_P0_PSTOP, sc->rec_page_stop);
- NIC_PUT(regt, regh, ED_P0_IMR, 0);
- NIC_BARRIER(regt, regh);
- NIC_PUT(regt, regh, ED_P0_ISR, 0xff);
-
- NIC_BARRIER(regt, regh);
- NIC_PUT(regt, regh, ED_P0_CR,
- sc->cr_proto | ED_CR_PAGE_1 | ED_CR_STP);
- NIC_BARRIER(regt, regh);
-
- for (i = 0; i < sizeof kip->myenetaddr; i++)
- NIC_PUT(regt, regh, ED_P1_PAR0 + i, kip->myenetaddr[i]);
- /* multicast filter? */
-
- sc->next_packet = sc->rec_page_start + 1;
- NIC_PUT(regt, regh, ED_P1_CURR, sc->next_packet);
-
- NIC_BARRIER(regt, regh);
- NIC_PUT(regt, regh, ED_P1_CR,
- sc->cr_proto | ED_CR_PAGE_0 | ED_CR_STP);
- NIC_BARRIER(regt, regh);
-
- /* promiscuous mode? */
- NIC_PUT(regt, regh, ED_P0_RCR, ED_RCR_AB | ED_RCR_AM | sc->rcr_proto);
- NIC_PUT(regt, regh, ED_P0_TCR, 0);
-
- /* card-specific initialization? */
-
- NIC_BARRIER(regt, regh);
- NIC_PUT(regt, regh, ED_P0_CR,
- sc->cr_proto | ED_CR_PAGE_0 | ED_CR_STA);
-
- ifp->if_flags &= ~IFF_OACTIVE;
-}
-
-static void
-dp8390_ipkdb_init(struct ipkdb_if *kip)
-{
- struct dp8390_softc *sc = kip->port;
- bus_space_tag_t regt = sc->sc_regt;
- bus_space_handle_t regh = sc->sc_regh;
- uint8_t cmd;
-
- cmd = NIC_GET(regt, regh, ED_P0_CR) & ~(ED_CR_PAGE_3 | ED_CR_STA);
-
- /* Select page 0 */
- NIC_BARRIER(regt, regh);
- NIC_PUT(regt, regh, ED_P0_CR, cmd | ED_CR_PAGE_0 | ED_CR_STP);
- NIC_BARRIER(regt, regh);
-
- /* If not started, init chip */
- if ((cmd & ED_CR_STP) != 0)
- dp8390_ipkdb_hwinit(kip);
-
- /* If output active, wait for packets to drain */
- while (sc->txb_inuse) {
- while ((cmd = (NIC_GET(regt, regh, ED_P0_ISR) &
- (ED_ISR_PTX | ED_ISR_TXE))) == 0)
- DELAY(1);
- NIC_PUT(regt, regh, ED_P0_ISR, cmd);
- if (--sc->txb_inuse)
- dp8390_xmit(sc);
- }
-}
-
-static void
-dp8390_ipkdb_leave(struct ipkdb_if *kip)
-{
- struct dp8390_softc *sc = kip->port;
- struct ifnet *ifp = &sc->sc_ec.ec_if;
-
- ifp->if_timer = 0;
-}
-
-/*
- * Similar to dp8390_intr above.
- */
-static int
-dp8390_ipkdb_rcv(struct ipkdb_if *kip, uint8_t *buf, int poll)
-{
- struct dp8390_softc *sc = kip->port;
- bus_space_tag_t regt = sc->sc_regt;
- bus_space_handle_t regh = sc->sc_regh;
- uint8_t bnry, current, isr;
- int len, nlen, packet_ptr;
- struct dp8390_ring packet_hdr;
-
- /* Switch to page 0. */
- NIC_BARRIER(regt, regh);
- NIC_PUT(regt, regh, ED_P0_CR,
- sc->cr_proto | ED_CR_PAGE_0 | ED_CR_STA);
- NIC_BARRIER(regt, regh);
-
- for (;;) {
- isr = NIC_GET(regt, regh, ED_P0_ISR);
- NIC_PUT(regt, regh, ED_P0_ISR, isr);
-
- if (isr & (ED_ISR_PRX | ED_ISR_TXE)) {
- NIC_GET(regt, regh, ED_P0_NCR);
- NIC_GET(regt, regh, ED_P0_TSR);
- }
-
- if (isr & ED_ISR_OVW) {
- dp8390_ipkdb_hwinit(kip);
- continue;
- }
-
- if (isr & ED_ISR_CNT) {
- NIC_GET(regt, regh, ED_P0_CNTR0);
- NIC_GET(regt, regh, ED_P0_CNTR1);
- NIC_GET(regt, regh, ED_P0_CNTR2);
- }
-
- /* Similar to dp8390_rint above. */
- NIC_BARRIER(regt, regh);
- NIC_PUT(regt, regh, ED_P0_CR,
- sc->cr_proto | ED_CR_PAGE_1 | ED_CR_STA);
- NIC_BARRIER(regt, regh);
-
- current = NIC_GET(regt, regh, ED_P1_CURR);
-
- NIC_BARRIER(regt, regh);
- NIC_PUT(regt, regh, ED_P1_CR,
- sc->cr_proto | ED_CR_PAGE_0 | ED_CR_STA);
- NIC_BARRIER(regt, regh);
-
- if (sc->next_packet == current) {
- if (poll)
- return 0;
- continue;
- }
-
- packet_ptr = sc->mem_ring +
- ((sc->next_packet - sc->rec_page_start) << ED_PAGE_SHIFT);
- sc->read_hdr(sc, packet_ptr, &packet_hdr);
- len = packet_hdr.count;
- nlen = packet_hdr.next_packet - sc->next_packet;
- if (nlen < 0)
- nlen += sc->rec_page_stop - sc->rec_page_start;
- nlen--;
- if ((len & ED_PAGE_MASK) + sizeof(packet_hdr) > ED_PAGE_SIZE)
- nlen--;
- len = (len & ED_PAGE_MASK) | (nlen << ED_PAGE_SHIFT);
- len -= sizeof(packet_hdr);
-
- if (len <= ETHERMTU &&
- packet_hdr.next_packet >= sc->rec_page_start &&
- packet_hdr.next_packet < sc->rec_page_stop) {
- sc->ring_copy(sc, packet_ptr + sizeof(packet_hdr),
- buf, len);
- sc->next_packet = packet_hdr.next_packet;
- bnry = sc->next_packet - 1;
- if (bnry < sc->rec_page_start)
- bnry = sc->rec_page_stop - 1;
- NIC_PUT(regt, regh, ED_P0_BNRY, bnry);
- return len;
- }
-
- dp8390_ipkdb_hwinit(kip);
- }
-}
-
-static void
-dp8390_ipkdb_send(struct ipkdb_if *kip, uint8_t *buf, int l)
-{
- struct dp8390_softc *sc = kip->port;
- bus_space_tag_t regt = sc->sc_regt;
- bus_space_handle_t regh = sc->sc_regh;
- struct mbuf mb;
-
- mbuf_hdr_init(&mb, MT_DATA, NULL, buf, l);
- mbuf_pkthdr_init(&mb);
- mb.m_pkthdr.len = l;
- mb.m_flags |= M_EXT;
-
- l = sc->write_mbuf(sc, &mb,
- sc->mem_start + ((sc->txb_new * ED_TXBUF_SIZE) << ED_PAGE_SHIFT));
- sc->txb_len[sc->txb_new] = max(l, ETHER_MIN_LEN - ETHER_CRC_LEN);
-
- if (++sc->txb_new == sc->txb_cnt)
- sc->txb_new = 0;
-
- sc->txb_inuse++;
- dp8390_xmit(sc);
-
- while ((NIC_GET(regt, regh, ED_P0_ISR) &
- (ED_ISR_PTX | ED_ISR_TXE)) == 0)
- DELAY(1);
-
- sc->txb_inuse--;
-}
-#endif
Index: src/sys/dev/ic/dp8390var.h
diff -u src/sys/dev/ic/dp8390var.h:1.33 src/sys/dev/ic/dp8390var.h:1.34
--- src/sys/dev/ic/dp8390var.h:1.33 Mon Apr 13 16:33:24 2015
+++ src/sys/dev/ic/dp8390var.h Sun Jul 15 05:16:45 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: dp8390var.h,v 1.33 2015/04/13 16:33:24 riastradh Exp $ */
+/* $NetBSD: dp8390var.h,v 1.34 2018/07/15 05:16:45 maxv Exp $ */
/*
* Device driver for National Semiconductor DS8390/WD83C690 based ethernet
@@ -179,7 +179,3 @@ int dp8390_mediachange(struct ifnet *);
void dp8390_mediastatus(struct ifnet *, struct ifmediareq *);
void dp8390_media_init(struct dp8390_softc *);
-
-#ifdef IPKDB_DP8390
-int dp8390_ipkdb_attach(struct ipkdb_if *);
-#endif
Index: src/sys/dev/ic/ne2000.c
diff -u src/sys/dev/ic/ne2000.c:1.74 src/sys/dev/ic/ne2000.c:1.75
--- src/sys/dev/ic/ne2000.c:1.74 Sun Aug 11 12:34:16 2013
+++ src/sys/dev/ic/ne2000.c Sun Jul 15 05:16:45 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ne2000.c,v 1.74 2013/08/11 12:34:16 rkujawa Exp $ */
+/* $NetBSD: ne2000.c,v 1.75 2018/07/15 05:16:45 maxv Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -48,9 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ne2000.c,v 1.74 2013/08/11 12:34:16 rkujawa Exp $");
-
-#include "opt_ipkdb.h"
+__KERNEL_RCSID(0, "$NetBSD: ne2000.c,v 1.75 2018/07/15 05:16:45 maxv Exp $");
#include "rtl80x9.h"
@@ -77,10 +75,6 @@ __KERNEL_RCSID(0, "$NetBSD: ne2000.c,v 1
#define bus_space_read_multi_stream_2 bus_space_read_multi_2
#endif /* __BUS_SPACE_HAS_STREAM_METHODS */
-#ifdef IPKDB_NE
-#include <ipkdb/ipkdb.h>
-#endif
-
#include <dev/ic/dp8390reg.h>
#include <dev/ic/dp8390var.h>
@@ -885,141 +879,6 @@ ne2000_detach(struct ne2000_softc *sc, i
return dp8390_detach(&sc->sc_dp8390, flags);
}
-#ifdef IPKDB_NE
-/*
- * This code is essentially the same as ne2000_attach above.
- */
-int
-ne2000_ipkdb_attach(struct ipkdb_if *kip)
-{
- struct ne2000_softc *np = kip->port;
- struct dp8390_softc *dp = &np->sc_dp8390;
- bus_space_tag_t nict = dp->sc_regt;
- bus_space_handle_t nich = dp->sc_regh;
- bus_space_tag_t asict = np->sc_asict;
- bus_space_handle_t asich = np->sc_asich;
- int i, useword;
-
-#ifdef GWETHER
- /* Not supported (yet?) */
- return -1;
-#endif
-
- if (np->sc_type == NE2000_TYPE_UNKNOWN)
- np->sc_type = ne2000_detect(nict, nich, asict, asich);
- if (np->sc_type == NE2000_TYPE_UNKNOWN)
- return -1;
-
- switch (np->sc_type) {
- case NE2000_TYPE_NE1000:
- dp->mem_start = 8192;
- dp->mem_size = 8192;
- useword = 0;
- kip->name = "ne1000";
- break;
- case NE2000_TYPE_NE2000:
- case NE2000_TYPE_AX88190:
- case NE2000_TYPE_AX88790:
- case NE2000_TYPE_AX88796:
-#if NRTL80X9 > 0
- case NE2000_TYPE_RTL8019:
-#endif
- dp->mem_start = 16384;
- dp->mem_size = 16384;
- useword = 1;
- if (
-#ifdef NE2000_DETECT_8BIT
- ne2000_detect_8bit(nict, nich, asict, asich) ||
-#endif
- (np->sc_quirk & NE2000_QUIRK_8BIT) != 0) {
- /* in 8 bit mode, only 8KB memory can be used */
- dp->mem_size = 8192;
- useword = 0;
- }
- kip->name =
- (np->sc_type == NE2000_TYPE_AX88190 ||
- np->sc_type == NE2000_TYPE_AX88790) ?
- "ax88190" : "ne2000";
- break;
- case NE2000_TYPE_DL10019:
- case NE2000_TYPE_DL10022:
- dp->mem_start = 8192 * 3;
- dp->mem_size = 8192 * 3;
- useword = 1;
- kip->name = (np->sc_type == NE2000_TYPE_DL10019) ?
- "dl10022" : "dl10019";
- break;
- default:
- return -1;
- break;
- }
-
- np->sc_useword = useword;
-#if NRTL80X9 > 0
- if (np->sc_type == NE2000_TYPE_RTL8019) {
- dp->init_card = rtl80x9_init_card;
- dp->sc_media_init = rtl80x9_media_init;
- dp->sc_mediachange = rtl80x9_mediachange;
- dp->sc_mediastatus = rtl80x9_mediastatus;
- }
-#endif
-
- dp->cr_proto = ED_CR_RD2;
- if (np->sc_type == NE2000_TYPE_AX88190 ||
- np->sc_type == NE2000_TYPE_AX88790) {
- dp->rcr_proto = ED_RCR_INTT;
- dp->sc_flags |= DP8390_DO_AX88190_WORKAROUND;
- } else
- dp->rcr_proto = 0;
- dp->dcr_reg = ED_DCR_FT1 | ED_DCR_LS | (useword ? ED_DCR_WTS : 0);
-
- dp->test_mem = ne2000_test_mem;
- dp->ring_copy = ne2000_ring_copy;
- dp->write_mbuf = ne2000_write_mbuf;
- dp->read_hdr = ne2000_read_hdr;
-
- for (i = 0; i < 16; i++)
- dp->sc_reg_map[i] = i;
-
- if (dp8390_ipkdb_attach(kip))
- return -1;
-
- if (!(kip->flags & IPKDB_MYHW)) {
- char romdata[16];
-
- /* Read the station address. */
- if (np->sc_type == NE2000_TYPE_AX88190 ||
- np->sc_type == NE2000_TYPE_AX88790 ||
- np->sc_type == NE2000_TYPE_AX88796) {
- /* Select page 0 registers. */
- NIC_BARRIER(nict, nich);
- bus_space_write_1(nict, nich, ED_P0_CR,
- ED_CR_RD2 | ED_CR_PAGE_0 | ED_CR_STA);
- NIC_BARRIER(nict, nich);
- /* Select word transfer */
- bus_space_write_1(nict, nich, ED_P0_DCR,
- useword ? ED_DCR_WTS : 0);
- ne2000_readmem(nict, nich, asict, asich,
- AX88190_NODEID_OFFSET, kip->myenetaddr,
- ETHER_ADDR_LEN, useword);
- } else {
- bool ne1000 = (np->sc_type == NE2000_TYPE_NE1000);
-
- ne2000_readmem(nict, nich, asict, asich,
- 0, romdata, sizeof romdata, useword);
- for (i = 0; i < ETHER_ADDR_LEN; i++)
- kip->myenetaddr[i] =
- romdata[i * (ne1000 ? 1 : 2)];
- }
- kip->flags |= IPKDB_MYHW;
-
- }
- dp8390_stop(dp);
-
- return 0;
-}
-#endif
-
bool
ne2000_suspend(device_t self, const pmf_qual_t *qual)
{
Index: src/sys/dev/ic/ne2000var.h
diff -u src/sys/dev/ic/ne2000var.h:1.27 src/sys/dev/ic/ne2000var.h:1.28
--- src/sys/dev/ic/ne2000var.h:1.27 Sun Aug 11 12:34:16 2013
+++ src/sys/dev/ic/ne2000var.h Sun Jul 15 05:16:45 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ne2000var.h,v 1.27 2013/08/11 12:34:16 rkujawa Exp $ */
+/* $NetBSD: ne2000var.h,v 1.28 2018/07/15 05:16:45 maxv Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -60,10 +60,6 @@ int ne2000_detect(bus_space_tag_t, bus_s
bus_space_tag_t, bus_space_handle_t);
int ne2000_detach(struct ne2000_softc *, int);
-#ifdef IPKDB_NE
-int ne2000_ipkdb_attach(struct ipkdb_if *);
-#endif
-
/* pmf(9) */
bool ne2000_suspend(device_t, const pmf_qual_t *);
bool ne2000_resume(device_t, const pmf_qual_t *);
Index: src/sys/dev/ofw/ofnet.c
diff -u src/sys/dev/ofw/ofnet.c:1.59 src/sys/dev/ofw/ofnet.c:1.60
--- src/sys/dev/ofw/ofnet.c:1.59 Tue Jun 26 06:48:01 2018
+++ src/sys/dev/ofw/ofnet.c Sun Jul 15 05:16:45 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ofnet.c,v 1.59 2018/06/26 06:48:01 msaitoh Exp $ */
+/* $NetBSD: ofnet.c,v 1.60 2018/07/15 05:16:45 maxv Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofnet.c,v 1.59 2018/06/26 06:48:01 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofnet.c,v 1.60 2018/07/15 05:16:45 maxv Exp $");
#include "ofnet.h"
#include "opt_inet.h"
@@ -58,19 +58,6 @@ __KERNEL_RCSID(0, "$NetBSD: ofnet.c,v 1.
#include <dev/ofw/openfirm.h>
-#if NIPKDB_OFN > 0
-#include <ipkdb/ipkdb.h>
-#include <machine/ipkdb.h>
-
-CFATTACH_DECL_NEW(ipkdb_ofn, 0,
- ipkdb_probe, ipkdb_attach, NULL, NULL);
-
-static struct ipkdb_if *kifp;
-static struct ofnet_softc *ipkdb_of;
-
-static int ipkdbprobe (cfdata_t, void *);
-#endif
-
struct ofnet_softc {
device_t sc_dev;
int sc_phandle;
@@ -101,10 +88,6 @@ ofnet_match(device_t parent, cfdata_t ma
char type[32];
int l;
-#if NIPKDB_OFN > 0
- if (!parent)
- return ipkdbprobe(match, aux);
-#endif
if (strcmp(oba->oba_busname, "ofw"))
return (0);
if ((l = OF_getprop(oba->oba_phandle, "device_type", type,
@@ -131,14 +114,7 @@ ofnet_attach(device_t parent, device_t s
of->sc_dev = self;
of->sc_phandle = oba->oba_phandle;
-#if NIPKDB_OFN > 0
- if (kifp &&
- kifp->unit - 1 == device_unit(of->sc_dev) &&
- OF_instance_to_package(kifp->port) == oba->oba_phandle) {
- ipkdb_of = of;
- of->sc_ihandle = kifp->port;
- } else
-#endif
+
if ((l = OF_package_to_path(oba->oba_phandle, path,
sizeof path - 1)) < 0 ||
l >= sizeof path ||
@@ -174,9 +150,7 @@ ofnet_read(struct ofnet_softc *of)
char *bufp;
s = splnet();
-#if NIPKDB_OFN > 0
- ipkdbrint(kifp, ifp);
-#endif
+
for (;;) {
len = OF_read(of->sc_ihandle, buf, sizeof buf);
if (len == -2 || len == 0)
@@ -411,70 +385,3 @@ ofnet_watchdog(struct ifnet *ifp)
ofnet_stop(of);
ofnet_init(of);
}
-
-#if NIPKDB_OFN > 0
-static void
-ipkdbofstart(struct ipkdb_if *kip)
-{
- if (ipkdb_of)
- ipkdbattach(kip, &ipkdb_of->sc_ethercom);
-}
-
-static void
-ipkdbofleave(struct ipkdb_if *kip)
-{
-}
-
-static int
-ipkdbofrcv(struct ipkdb_if *kip, u_char *buf, int poll)
-{
- int l;
-
- do {
- l = OF_read(kip->port, buf, ETHERMTU);
- if (l < 0)
- l = 0;
- } while (!poll && !l);
- return l;
-}
-
-static void
-ipkdbofsend(struct ipkdb_if *kip, u_char *buf, int l)
-{
- OF_write(kip->port, buf, l);
-}
-
-static int
-ipkdbprobe(cfdata_t match, void *aux)
-{
- struct ipkdb_if *kip = aux;
- static char name[256];
- int len;
- int phandle;
-
- kip->unit = match->cf_unit + 1;
-
- if (!(kip->port = OF_open("net")))
- return -1;
- if ((len = OF_instance_to_path(kip->port, name, sizeof name - 1)) < 0 ||
- len >= sizeof name)
- return -1;
- name[len] = 0;
- if ((phandle = OF_instance_to_package(kip->port)) == -1)
- return -1;
- if (OF_getprop(phandle, "mac-address", kip->myenetaddr,
- sizeof kip->myenetaddr) < 0)
- return -1;
-
- kip->flags |= IPKDB_MYHW;
- kip->name = name;
- kip->start = ipkdbofstart;
- kip->leave = ipkdbofleave;
- kip->receive = ipkdbofrcv;
- kip->send = ipkdbofsend;
-
- kifp = kip;
-
- return 0;
-}
-#endif
Index: src/sys/dev/pci/files.pci
diff -u src/sys/dev/pci/files.pci:1.397 src/sys/dev/pci/files.pci:1.398
--- src/sys/dev/pci/files.pci:1.397 Wed Jun 6 18:10:35 2018
+++ src/sys/dev/pci/files.pci Sun Jul 15 05:16:45 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.pci,v 1.397 2018/06/06 18:10:35 jakllsch Exp $
+# $NetBSD: files.pci,v 1.398 2018/07/15 05:16:45 maxv Exp $
#
# Config file and device description for machine-independent PCI code.
# Included by ports that need it. Requires that the SCSI files be
@@ -409,10 +409,8 @@ attach jme at pci
file dev/pci/if_jme.c jme
# NE2000-compatible PCI Ethernet cards
-defparam opt_ipkdb.h IPKDB_NE_PCISLOT
-defflag opt_ipkdb.h IPKDB_NE_PCI : IPKDB_NE
attach ne at pci with ne_pci: rtl80x9
-file dev/pci/if_ne_pci.c ne_pci | ipkdb_ne_pci
+file dev/pci/if_ne_pci.c ne_pci
# Texas Instruments ThunderLAN Chip.
device tl: ether, ifnet, arp, i2cexec, at24cxx_eeprom, i2c_bitbang,
Index: src/sys/dev/pci/if_ne_pci.c
diff -u src/sys/dev/pci/if_ne_pci.c:1.37 src/sys/dev/pci/if_ne_pci.c:1.38
--- src/sys/dev/pci/if_ne_pci.c:1.37 Sat Mar 29 19:28:25 2014
+++ src/sys/dev/pci/if_ne_pci.c Sun Jul 15 05:16:45 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ne_pci.c,v 1.37 2014/03/29 19:28:25 christos Exp $ */
+/* $NetBSD: if_ne_pci.c,v 1.38 2018/07/15 05:16:45 maxv Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,9 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ne_pci.c,v 1.37 2014/03/29 19:28:25 christos Exp $");
-
-#include "opt_ipkdb.h"
+__KERNEL_RCSID(0, "$NetBSD: if_ne_pci.c,v 1.38 2018/07/15 05:16:45 maxv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -49,10 +47,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_ne_pci.c,
#include <sys/bus.h>
#include <sys/intr.h>
-#ifdef IPKDB_NE_PCI
-#include <ipkdb/ipkdb.h>
-#endif
-
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcidevs.h>
@@ -79,18 +73,6 @@ static void ne_pci_attach(device_t, devi
CFATTACH_DECL_NEW(ne_pci, sizeof(struct ne_pci_softc),
ne_pci_match, ne_pci_attach, NULL, NULL);
-#ifdef IPKDB_NE_PCI
-static struct ne_pci_softc ipkdb_softc;
-static pci_chipset_tag_t ipkdb_pc;
-static pcitag_t ipkdb_tag;
-static struct ipkdb_if *ne_kip;
-
-int ne_pci_ipkdb_attach(struct ipkdb_if *, bus_space_tag_t, /* XXX */
- pci_chipset_tag_t, int, int);
-
-static int ne_pci_isipkdb(pci_chipset_tag_t, pcitag_t);
-#endif
-
static const struct ne_pci_product {
pci_vendor_id_t npp_vendor;
pci_product_id_t npp_product;
@@ -210,13 +192,6 @@ ne_pci_attach(device_t parent, device_t
printf(": %s Ethernet\n", npp->npp_name);
-#ifdef IPKDB_NE_PCI
- if (ne_pci_isipkdb(pc, pa->pa_tag)) {
- nict = ipkdb_softc.sc_ne2000.sc_dp8390.sc_regt;
- nich = ipkdb_softc.sc_ne2000.sc_dp8390.sc_regh;
- ne_kip->port = nsc;
- } else
-#endif
if (pci_mapreg_map(pa, PCI_CBIO, PCI_MAPREG_TYPE_IO, 0,
&nict, &nich, NULL, NULL)) {
aprint_error_dev(dsc->sc_dev, "can't map i/o space\n");
@@ -272,66 +247,3 @@ ne_pci_attach(device_t parent, device_t
}
aprint_normal_dev(dsc->sc_dev, "interrupting at %s\n", intrstr);
}
-
-#ifdef IPKDB_NE_PCI
-static int
-ne_pci_isipkdb(pci_chipset_tag_t pc, pcitag_t tag)
-{
- return !memcmp(&pc, &ipkdb_pc, sizeof pc)
- && !memcmp(&tag, &ipkdb_tag, sizeof tag);
-}
-
-int
-ne_pci_ipkdb_attach(struct ipkdb_if *kip, bus_space_tag_t iot,
- pci_chipset_tag_t pc, int bus, int dev)
-{
- struct pci_attach_args pa;
- bus_space_tag_t nict, asict;
- bus_space_handle_t nich, asich;
- u_int32_t csr;
-
- pa.pa_iot = iot;
- pa.pa_pc = pc;
- pa.pa_device = dev;
- pa.pa_function = 0;
- pa.pa_flags = PCI_FLAGS_IO_OKAY;
- pa.pa_tag = pci_make_tag(pc, bus, dev, /*func*/0);
- pa.pa_id = pci_conf_read(pc, pa.pa_tag, PCI_ID_REG);
- pa.pa_class = pci_conf_read(pc, pa.pa_tag, PCI_CLASS_REG);
- if (ne_pci_lookup(&pa) == NULL)
- return -1;
-
- if (pci_mapreg_map(&pa, PCI_CBIO, PCI_MAPREG_TYPE_IO, 0,
- &nict, &nich, NULL, NULL))
- return -1;
-
- asict = nict;
- if (bus_space_subregion(nict, nich, NE2000_ASIC_OFFSET,
- NE2000_ASIC_NPORTS, &asich)) {
- bus_space_unmap(nict, nich, NE2000_NPORTS);
- return -1;
- }
-
- /* Enable card */
- csr = pci_conf_read(pc, pa.pa_tag, PCI_COMMAND_STATUS_REG);
- pci_conf_write(pc, pa.pa_tag, PCI_COMMAND_STATUS_REG,
- csr | PCI_COMMAND_MASTER_ENABLE);
-
- ipkdb_softc.sc_ne2000.sc_dp8390.sc_regt = nict;
- ipkdb_softc.sc_ne2000.sc_dp8390.sc_regh = nich;
- ipkdb_softc.sc_ne2000.sc_asict = asict;
- ipkdb_softc.sc_ne2000.sc_asich = asich;
-
- kip->port = &ipkdb_softc;
- ipkdb_pc = pc;
- ipkdb_tag = pa.pa_tag;
- ne_kip = kip;
-
- if (ne2000_ipkdb_attach(kip) < 0) {
- bus_space_unmap(nict, nich, NE2000_NPORTS);
- return -1;
- }
-
- return 0;
-}
-#endif /* IPKDB_NE_PCI */
Index: src/sys/netinet/udp_usrreq.c
diff -u src/sys/netinet/udp_usrreq.c:1.254 src/sys/netinet/udp_usrreq.c:1.255
--- src/sys/netinet/udp_usrreq.c:1.254 Thu May 31 13:51:56 2018
+++ src/sys/netinet/udp_usrreq.c Sun Jul 15 05:16:45 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: udp_usrreq.c,v 1.254 2018/05/31 13:51:56 maxv Exp $ */
+/* $NetBSD: udp_usrreq.c,v 1.255 2018/07/15 05:16:45 maxv Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -66,13 +66,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.254 2018/05/31 13:51:56 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.255 2018/07/15 05:16:45 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
#include "opt_ipsec.h"
#include "opt_inet_csum.h"
-#include "opt_ipkdb.h"
#include "opt_mbuftrace.h"
#include "opt_net_mpsafe.h"
#endif
@@ -119,10 +118,6 @@ __KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c
#include <netipsec/esp.h>
#endif
-#ifdef IPKDB
-#include <ipkdb/ipkdb.h>
-#endif
-
int udpcksum = 1;
int udp_do_loopback_cksum = 0;
@@ -434,17 +429,6 @@ udp_input(struct mbuf *m, ...)
goto bad;
}
UDP_STATINC(UDP_STAT_NOPORT);
-#ifdef IPKDB
- if (checkipkdb(&ip->ip_src, uh->uh_sport, uh->uh_dport,
- m, iphlen + sizeof(struct udphdr),
- m->m_pkthdr.len - iphlen - sizeof(struct udphdr))) {
- /*
- * It was a debugger connect packet,
- * just drop it now
- */
- goto bad;
- }
-#endif
icmp_error(m, ICMP_UNREACH, ICMP_UNREACH_PORT, 0, 0);
m = NULL;
}
Index: src/sys/secmodel/keylock/secmodel_keylock.c
diff -u src/sys/secmodel/keylock/secmodel_keylock.c:1.8 src/sys/secmodel/keylock/secmodel_keylock.c:1.9
--- src/sys/secmodel/keylock/secmodel_keylock.c:1.8 Tue Feb 25 18:30:13 2014
+++ src/sys/secmodel/keylock/secmodel_keylock.c Sun Jul 15 05:16:45 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: secmodel_keylock.c,v 1.8 2014/02/25 18:30:13 pooka Exp $ */
+/* $NetBSD: secmodel_keylock.c,v 1.9 2018/07/15 05:16:45 maxv Exp $ */
/*-
* Copyright (c) 2009 Marc Balmer <[email protected]>
* Copyright (c) 2006 Elad Efrat <[email protected]>
@@ -54,7 +54,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: secmodel_keylock.c,v 1.8 2014/02/25 18:30:13 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: secmodel_keylock.c,v 1.9 2018/07/15 05:16:45 maxv Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -248,14 +248,6 @@ secmodel_keylock_system_cb(kauth_cred_t
break;
case KAUTH_SYSTEM_DEBUG:
- switch (req) {
- case KAUTH_REQ_SYSTEM_DEBUG_IPKDB:
- if (kstate == KEYLOCK_CLOSE)
- result = KAUTH_RESULT_DENY;
- break;
- default:
- break;
- }
break;
}
Index: src/sys/secmodel/securelevel/secmodel_securelevel.c
diff -u src/sys/secmodel/securelevel/secmodel_securelevel.c:1.31 src/sys/secmodel/securelevel/secmodel_securelevel.c:1.32
--- src/sys/secmodel/securelevel/secmodel_securelevel.c:1.31 Thu Apr 26 18:54:09 2018
+++ src/sys/secmodel/securelevel/secmodel_securelevel.c Sun Jul 15 05:16:45 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: secmodel_securelevel.c,v 1.31 2018/04/26 18:54:09 alnsn Exp $ */
+/* $NetBSD: secmodel_securelevel.c,v 1.32 2018/07/15 05:16:45 maxv Exp $ */
/*-
* Copyright (c) 2006 Elad Efrat <[email protected]>
* All rights reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: secmodel_securelevel.c,v 1.31 2018/04/26 18:54:09 alnsn Exp $");
+__KERNEL_RCSID(0, "$NetBSD: secmodel_securelevel.c,v 1.32 2018/07/15 05:16:45 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_insecure.h"
@@ -348,17 +348,6 @@ secmodel_securelevel_system_cb(kauth_cre
break;
case KAUTH_SYSTEM_DEBUG:
- switch (req) {
- case KAUTH_REQ_SYSTEM_DEBUG_IPKDB:
- if (securelevel > 0)
- result = KAUTH_RESULT_DENY;
- break;
-
- default:
- break;
- }
- break;
-
default:
break;
}
Index: src/sys/secmodel/suser/secmodel_suser.c
diff -u src/sys/secmodel/suser/secmodel_suser.c:1.45 src/sys/secmodel/suser/secmodel_suser.c:1.46
--- src/sys/secmodel/suser/secmodel_suser.c:1.45 Fri Jul 13 09:58:49 2018
+++ src/sys/secmodel/suser/secmodel_suser.c Sun Jul 15 05:16:45 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: secmodel_suser.c,v 1.45 2018/07/13 09:58:49 maxv Exp $ */
+/* $NetBSD: secmodel_suser.c,v 1.46 2018/07/15 05:16:45 maxv Exp $ */
/*-
* Copyright (c) 2006 Elad Efrat <[email protected]>
* All rights reserved.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: secmodel_suser.c,v 1.45 2018/07/13 09:58:49 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: secmodel_suser.c,v 1.46 2018/07/15 05:16:45 maxv Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -392,17 +392,6 @@ secmodel_suser_system_cb(kauth_cred_t cr
break;
case KAUTH_SYSTEM_DEBUG:
- switch (req) {
- case KAUTH_REQ_SYSTEM_DEBUG_IPKDB:
- if (isroot)
- result = KAUTH_RESULT_ALLOW;
-
- break;
-
- default:
- break;
- }
-
break;
case KAUTH_SYSTEM_CHSYSFLAGS:
Index: src/sys/sys/kauth.h
diff -u src/sys/sys/kauth.h:1.77 src/sys/sys/kauth.h:1.78
--- src/sys/sys/kauth.h:1.77 Fri Jul 13 09:58:49 2018
+++ src/sys/sys/kauth.h Sun Jul 15 05:16:45 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: kauth.h,v 1.77 2018/07/13 09:58:49 maxv Exp $ */
+/* $NetBSD: kauth.h,v 1.78 2018/07/15 05:16:45 maxv Exp $ */
/*-
* Copyright (c) 2005, 2006 Elad Efrat <[email protected]>
@@ -153,7 +153,6 @@ enum kauth_system_req {
KAUTH_REQ_SYSTEM_CHROOT_CHROOT=1,
KAUTH_REQ_SYSTEM_CHROOT_FCHROOT,
KAUTH_REQ_SYSTEM_CPU_SETSTATE,
- KAUTH_REQ_SYSTEM_DEBUG_IPKDB,
KAUTH_REQ_SYSTEM_MOUNT_GET,
KAUTH_REQ_SYSTEM_MOUNT_NEW,
KAUTH_REQ_SYSTEM_MOUNT_UNMOUNT,
