CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: rillig
Date: Thu Aug 6 05:52:46 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: recursive.mk
Log Message:
make(1): add rationale and expected behavior to "recursive" test
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/make/unit-tests/recursive.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/unit-tests/recursive.mk
diff -u src/usr.bin/make/unit-tests/recursive.mk:1.1 src/usr.bin/make/unit-tests/recursive.mk:1.2
--- src/usr.bin/make/unit-tests/recursive.mk:1.1 Thu Aug 6 05:36:33 2020
+++ src/usr.bin/make/unit-tests/recursive.mk Thu Aug 6 05:52:45 2020
@@ -1,4 +1,4 @@
-# $NetBSD: recursive.mk,v 1.1 2020/08/06 05:36:33 rillig Exp $
+# $NetBSD: recursive.mk,v 1.2 2020/08/06 05:52:45 rillig Exp $
#
# In -dL mode, a variable may get expanded before it makes sense.
# This would stop make from doing anything since the "recursive" error
@@ -15,8 +15,23 @@ AM_V_lt = $(am__v_lt_$(V))
am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
am__v_lt_0 = --silent
am__v_lt_1 =
+
+# On 2020-08-06, make reported: "Variable am__v_lt_ is recursive."
libXfixes_la_LINK = ... $(AM_V_lt) ...
-.info not reached
# somewhere later ...
AM_DEFAULT_VERBOSITY = 1
+
+
+# The purpose of the -dL flag is to detect unclosed variables. This
+# can be achieved by just parsing the variable and not evaluating it.
+#
+# When the variable is only parsed but not evaluated, bugs in nested
+# variables are not discovered. But these are hard to produce anyway,
+# therefore that's acceptable. In most practical cases, the missing
+# brace would be detected directly in the line where it is produced.
+MISSING_BRACE_INDIRECT:= ${:U\${MISSING_BRACE}
+UNCLOSED = $(MISSING_PAREN
+UNCLOSED = ${MISSING_BRACE
+UNCLOSED = ${MISSING_BRACE_INDIRECT}
+
CVS commit: src/usr.bin/make/unit-tests
Module Name:src Committed By: rillig Date: Thu Aug 6 05:52:46 UTC 2020 Modified Files: src/usr.bin/make/unit-tests: recursive.mk Log Message: make(1): add rationale and expected behavior to "recursive" test To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/usr.bin/make/unit-tests/recursive.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: rillig
Date: Thu Aug 6 05:36:33 UTC 2020
Modified Files:
src/distrib/sets/lists/tests: mi
src/usr.bin/make/unit-tests: Makefile
Added Files:
src/usr.bin/make/unit-tests: recursive.exp recursive.mk
Log Message:
make(1): add test for unintended "recursive variable" in -dL mode
To generate a diff of this commit:
cvs rdiff -u -r1.884 -r1.885 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.83 -r1.84 src/usr.bin/make/unit-tests/Makefile
cvs rdiff -u -r0 -r1.1 src/usr.bin/make/unit-tests/recursive.exp \
src/usr.bin/make/unit-tests/recursive.mk
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/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.884 src/distrib/sets/lists/tests/mi:1.885
--- src/distrib/sets/lists/tests/mi:1.884 Mon Aug 3 15:43:31 2020
+++ src/distrib/sets/lists/tests/mi Thu Aug 6 05:36:32 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.884 2020/08/03 15:43:31 rillig Exp $
+# $NetBSD: mi,v 1.885 2020/08/06 05:36:32 rillig Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -4598,6 +4598,8 @@
./usr/tests/usr.bin/make/unit-tests/posix1.mk tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/make/unit-tests/qequals.exp tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/make/unit-tests/qequals.mk tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/make/unit-tests/recursive.exp tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/make/unit-tests/recursive.mk tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/make/unit-tests/suffixes.exp tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/make/unit-tests/suffixes.mk tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/make/unit-tests/sunshcmd.exp tests-usr.bin-tests compattestfile,atf
Index: src/usr.bin/make/unit-tests/Makefile
diff -u src/usr.bin/make/unit-tests/Makefile:1.83 src/usr.bin/make/unit-tests/Makefile:1.84
--- src/usr.bin/make/unit-tests/Makefile:1.83 Mon Aug 3 15:43:32 2020
+++ src/usr.bin/make/unit-tests/Makefile Thu Aug 6 05:36:33 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.83 2020/08/03 15:43:32 rillig Exp $
+# $NetBSD: Makefile,v 1.84 2020/08/06 05:36:33 rillig Exp $
#
# Unit tests for make(1)
#
@@ -70,6 +70,7 @@ TESTS+= # phony-end # broken by reverti
TESTS+= posix
TESTS+= # posix1 # broken by reverting POSIX changes
TESTS+= qequals
+TESTS+= recursive
TESTS+= # suffixes # broken by reverting POSIX changes
TESTS+= sunshcmd
TESTS+= sysv
@@ -90,6 +91,7 @@ ENV.counter= -i
ENV.envfirst= FROM_ENV=value-from-env
ENV.export= -i PATH=${PATH:Q}
ENV.lint= -i
+ENV.recursive= -i
ENV.varmisc= FROM_ENV=env
ENV.varmisc+= FROM_ENV_BEFORE=env
ENV.varmisc+= FROM_ENV_AFTER=env
@@ -101,6 +103,7 @@ FLAGS.envfirst= -e
FLAGS.export= -r
FLAGS.lint= -dL -k
FLAGS.order= -j1
+FLAGS.recursive= -dL
FLAGS.vardebug= -k -dv FROM_CMDLINE=
# Some tests need extra post-processing.
Added files:
Index: src/usr.bin/make/unit-tests/recursive.exp
diff -u /dev/null src/usr.bin/make/unit-tests/recursive.exp:1.1
--- /dev/null Thu Aug 6 05:36:33 2020
+++ src/usr.bin/make/unit-tests/recursive.exp Thu Aug 6 05:36:33 2020
@@ -0,0 +1,4 @@
+Variable am__v_lt_ is recursive.
+
+make: stopped in unit-tests
+exit status 2
Index: src/usr.bin/make/unit-tests/recursive.mk
diff -u /dev/null src/usr.bin/make/unit-tests/recursive.mk:1.1
--- /dev/null Thu Aug 6 05:36:33 2020
+++ src/usr.bin/make/unit-tests/recursive.mk Thu Aug 6 05:36:33 2020
@@ -0,0 +1,22 @@
+# $NetBSD: recursive.mk,v 1.1 2020/08/06 05:36:33 rillig Exp $
+#
+# In -dL mode, a variable may get expanded before it makes sense.
+# This would stop make from doing anything since the "recursive" error
+# is fatal and exits immediately.
+#
+# The purpose of evaluating that variable early was just to detect
+# whether there are unclosed variables. It might be enough to parse the
+# variable value without VARE_WANTRES for that purpose.
+#
+# Seen in pkgsrc/x11/libXfixes, and probably many more package that use
+# GNU Automake.
+
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+am__v_lt_1 =
+libXfixes_la_LINK = ... $(AM_V_lt) ...
+.info not reached
+
+# somewhere later ...
+AM_DEFAULT_VERBOSITY = 1
CVS commit: src
Module Name:src Committed By: rillig Date: Thu Aug 6 05:36:33 UTC 2020 Modified Files: src/distrib/sets/lists/tests: mi src/usr.bin/make/unit-tests: Makefile Added Files: src/usr.bin/make/unit-tests: recursive.exp recursive.mk Log Message: make(1): add test for unintended "recursive variable" in -dL mode To generate a diff of this commit: cvs rdiff -u -r1.884 -r1.885 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.83 -r1.84 src/usr.bin/make/unit-tests/Makefile cvs rdiff -u -r0 -r1.1 src/usr.bin/make/unit-tests/recursive.exp \ src/usr.bin/make/unit-tests/recursive.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Thu Aug 6 05:32:26 UTC 2020
Modified Files:
src/usr.bin/make: Makefile
Log Message:
make(1): revert previous commit; "make retest" was already possible
What I really meant to allow was to run "make sync-mi" directly from the
main directory. But adding that to TARGETS didn't do anything.
To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 src/usr.bin/make/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/Makefile
diff -u src/usr.bin/make/Makefile:1.80 src/usr.bin/make/Makefile:1.81
--- src/usr.bin/make/Makefile:1.80 Thu Aug 6 05:27:31 2020
+++ src/usr.bin/make/Makefile Thu Aug 6 05:32:26 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.80 2020/08/06 05:27:31 rillig Exp $
+# $NetBSD: Makefile,v 1.81 2020/08/06 05:32:26 rillig Exp $
# @(#)Makefile 5.2 (Berkeley) 12/28/90
PROG= make
@@ -53,8 +53,6 @@ SUBDIR+= unit-tests
${SRCS:M*.c:.c=.o}: buf.h config.h dir.h hash.h job.h lst.h make.h make_malloc.h
${SRCS:M*.c:.c=.o}: meta.h metachar.h nonints.h pathnames.h sprite.h strlist.h trace.h
-TARGETS+= retest
-
.include
.include
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Thu Aug 6 05:32:26 UTC 2020 Modified Files: src/usr.bin/make: Makefile Log Message: make(1): revert previous commit; "make retest" was already possible What I really meant to allow was to run "make sync-mi" directly from the main directory. But adding that to TARGETS didn't do anything. To generate a diff of this commit: cvs rdiff -u -r1.80 -r1.81 src/usr.bin/make/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Thu Aug 6 05:27:31 UTC 2020 Modified Files: src/usr.bin/make: Makefile Log Message: make(1): allow "make retest" directly from the main directory To generate a diff of this commit: cvs rdiff -u -r1.79 -r1.80 src/usr.bin/make/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Thu Aug 6 05:27:31 UTC 2020
Modified Files:
src/usr.bin/make: Makefile
Log Message:
make(1): allow "make retest" directly from the main directory
To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/usr.bin/make/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/Makefile
diff -u src/usr.bin/make/Makefile:1.79 src/usr.bin/make/Makefile:1.80
--- src/usr.bin/make/Makefile:1.79 Mon Aug 3 20:26:09 2020
+++ src/usr.bin/make/Makefile Thu Aug 6 05:27:31 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2020/08/03 20:26:09 rillig Exp $
+# $NetBSD: Makefile,v 1.80 2020/08/06 05:27:31 rillig Exp $
# @(#)Makefile 5.2 (Berkeley) 12/28/90
PROG= make
@@ -6,6 +6,7 @@ SRCS= arch.c buf.c compat.c cond.c dir.c
SRCS+= make.c make_malloc.c metachar.c parse.c
SRCS+= str.c strlist.c suff.c targ.c trace.c var.c util.c
+# Whether to generate a coverage report after running the tests.
USE_COVERAGE?= no # works only with gcc; clang9 fails to link
.if ${USE_COVERAGE} == "yes"
COPTS+= --coverage -O0 -ggdb
@@ -13,6 +14,7 @@ LDADD+= --coverage
CLEANFILES+= ${SRCS:.c=.gcda} ${SRCS:.c=.gcno} ${SRCS:=.gcov}
.endif
+# Whether to compile using the Undefined Behavior Sanitizer (GCC, Clang).
USE_UBSAN?= no
.if ${USE_UBSAN} == "yes"
COPTS+= -fsanitize=undefined
@@ -51,6 +53,8 @@ SUBDIR+= unit-tests
${SRCS:M*.c:.c=.o}: buf.h config.h dir.h hash.h job.h lst.h make.h make_malloc.h
${SRCS:M*.c:.c=.o}: meta.h metachar.h nonints.h pathnames.h sprite.h strlist.h trace.h
+TARGETS+= retest
+
.include
.include
CVS commit: [netbsd-8] src/sys/arch/x86/include
Module Name:src Committed By: martin Date: Wed Aug 5 18:26:17 UTC 2020 Modified Files: src/sys/arch/x86/include [netbsd-8]: specialreg.h Log Message: Accidently not commited for ticket #1595: sys/arch/x86/include/specialreg.h 1.129 via patch Add six errata for AMD Family 17h (Ryzen etc). To generate a diff of this commit: cvs rdiff -u -r1.98.2.20 -r1.98.2.21 src/sys/arch/x86/include/specialreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/x86/include/specialreg.h diff -u src/sys/arch/x86/include/specialreg.h:1.98.2.20 src/sys/arch/x86/include/specialreg.h:1.98.2.21 --- src/sys/arch/x86/include/specialreg.h:1.98.2.20 Wed Aug 5 16:02:53 2020 +++ src/sys/arch/x86/include/specialreg.h Wed Aug 5 18:26:17 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: specialreg.h,v 1.98.2.20 2020/08/05 16:02:53 martin Exp $ */ +/* $NetBSD: specialreg.h,v 1.98.2.21 2020/08/05 18:26:17 martin Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -1055,6 +1055,9 @@ #define NB_CFG_INITAPICCPUIDLO (1ULL << 54) #define MSR_LS_CFG 0xc0011020 +#define LS_CFG_ERRATA_1033 __BIT(4) +#define LS_CFG_ERRATA_793 __BIT(15) +#define LS_CFG_ERRATA_1095 __BIT(57) #define LS_CFG_DIS_LS2_SQUISH 0x0200 #define LS_CFG_DIS_SSB_F15H 0x0040ULL #define LS_CFG_DIS_SSB_F16H 0x0002ULL @@ -1063,6 +1066,7 @@ #define MSR_IC_CFG 0xc0011021 #define IC_CFG_DIS_SEQ_PREFETCH 0x0800 #define IC_CFG_DIS_IND 0x4000 +#define IC_CFG_ERRATA_776 __BIT(26) #define MSR_DC_CFG 0xc0011022 #define DC_CFG_DIS_CNV_WC_SSO 0x0008 @@ -1077,9 +1081,16 @@ #define BU_CFG_WBPFSMCCHKDIS 0x2000ULL #define BU_CFG_WBENHWSBDIS 0x0001ULL +#define MSR_FP_CFG 0xc0011028 +#define FP_CFG_ERRATA_1049 __BIT(4) + #define MSR_DE_CFG 0xc0011029 #define DE_CFG_ERRATA_721 0x0001 #define DE_CFG_LFENCE_SERIALIZE __BIT(1) +#define DE_CFG_ERRATA_1021 __BIT(13) + +#define MSR_LS_CFG2 0xc001102d +#define LS_CFG2_ERRATA_1091 __BIT(34) /* AMD Family10h MSRs */ #define MSR_OSVW_ID_LENGTH 0xc0010140
CVS commit: [netbsd-8] src/sys/arch/x86/include
Module Name:src Committed By: martin Date: Wed Aug 5 18:26:17 UTC 2020 Modified Files: src/sys/arch/x86/include [netbsd-8]: specialreg.h Log Message: Accidently not commited for ticket #1595: sys/arch/x86/include/specialreg.h 1.129 via patch Add six errata for AMD Family 17h (Ryzen etc). To generate a diff of this commit: cvs rdiff -u -r1.98.2.20 -r1.98.2.21 src/sys/arch/x86/include/specialreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/doc
Module Name:src
Committed By: martin
Date: Wed Aug 5 17:31:45 UTC 2020
Modified Files:
src/doc [netbsd-8]: CHANGES-8.3
Log Message:
Tickets #1584 - #1595
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.25 -r1.1.2.26 src/doc/CHANGES-8.3
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/CHANGES-8.3
diff -u src/doc/CHANGES-8.3:1.1.2.25 src/doc/CHANGES-8.3:1.1.2.26
--- src/doc/CHANGES-8.3:1.1.2.25 Wed Aug 5 14:18:54 2020
+++ src/doc/CHANGES-8.3 Wed Aug 5 17:31:45 2020
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-8.3,v 1.1.2.25 2020/08/05 14:18:54 martin Exp $
+# $NetBSD: CHANGES-8.3,v 1.1.2.26 2020/08/05 17:31:45 martin Exp $
A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3
release:
@@ -821,3 +821,175 @@ usr.bin/w/w.c 1.88-1.90
Handle hostname from DISPLAY="[2001:db8::dead:beef]:0" or similar.
[kim, ticket #1583]
+sys/dev/dev_verbose.h1.3
+
+ PR 55535: make built-in verbose modules available before the
+ start of the autoconfiguration.
+ [uwe, ticket #1584]
+
+usr.sbin/cpuctl/Makefile 1.9
+usr.sbin/cpuctl/arch/cpuctl_i386.h 1.5
+usr.sbin/cpuctl/arch/i386.c 1.111-1.113 via patch
+usr.sbin/cpuctl/cpuctl.c 1.31
+usr.sbin/cpuctl/cpuctl.h 1.7
+sys/arch/x86/x86/identcpu_subr.c 1.1-1.7
+
+ - Get TSC frequency from CPUID 0x15 and/or x16 for newer Intel
+ processors.
+ - Add 0xa5 and 0xa6 for Comet Lake.
+ - Rename ci_cpuid_level to ci_max_cpuid and ci_cpuid_extlevel to
+ ci_max_ext_cpuid to match x86/include/cpu.h. No functional change.
+ - Sort some entries.
+ - Add comment.
+ [msaitoh, ticket #1585]
+
+sys/dev/pci/ichsmb.c1.66-1.68 via patch
+
+ - Add Comet Lake, Whiskey Lake U and Amber Lake Y support.
+ - Whitespace fix.
+ [msaitoh, ticket #1586]
+
+sys/dev/pci/ixgbe/ix_txrx.c 1.62-1.63 via patch
+sys/dev/pci/ixgbe/ixgbe.c 1.225, 1.228-1.229, 1.232 via
+ patch
+sys/dev/pci/ixgbe/ixgbe.h 1.64, 1.66
+sys/dev/pci/ixgbe/ixv.c1.146, 1.148-1.150 via patch
+sys/dev/pci/ixgbe/ixgbe_common.c 1.27
+sys/dev/pci/ixgbe/ixgbe_vf.c 1.23
+sys/dev/pci/ixgbe/ixgbe_82598.c 1.15
+sys/dev/pci/ixgbe/ixgbe_x550.c 1.18
+sys/dev/pci/ixgbe/ixgbe_netbsd.c 1.14
+sys/dev/pci/ixgbe/ixgbe_phy.c 1.21
+sys/dev/pci/ixgbe/ixgbe_osdep.h 1.26
+
+ - Fix IXGBE_LE32_TO_CPUS() macro for big endian machine. This problem
+ was only on X550.
+ - Add debug printf()s.
+ - Use unsigned to avoid undefined behavior in
+ ixgbe_fc_enable_generic().
+ - Modify a little to reduce diff between ixgbe.c and ixv.c.
+ No functional change.
+ - Modify comment.
+ - Remove unused macros.
+ - Whitespace fix.
+ - Fix typos.
+ [msaitoh, ticket #1587]
+
+sys/arch/x86/include/specialreg.h 1.162-1.168 via patch
+
+ - AMD CPUID Fn8000_000a %edx bit 20 is "SPEC_CTRL".
+ - Add some bit definitions of AMD's CPUID Fn8000_001f Encrypted Memory
+ features.
+ - Add AMD INVLPGB/TLBSYNC hypervisor enable in VMCB and TLBSYNC
+ intercept bit.
+ - Add AMD MSR_DE_CFG's bit 1 as DE_CFG_LFENCE_SERIALIZE.
+ - Add some definitions for Intel:
+ - Add CPUID leaf 6 %eax bit 19 for HW_FEEDBACK* and
+ IA32_PACKAGE_TERM* MSRs.
+ - Add CPUID leaf 7 %ecx bit 31 for Protection Keys.
+ - Add definition of Load only TLB and Store only TLB.
+ - Add IF_PSCHANGE_MC_NO bit of IA32_ARCH_CAPABILITIES
+ - Fix HWP_IGNIDL.
+ - Add CPUID 7 %edx bit 9 "SRBDS_CTRL"
+ - Modify comment. Style and fix typo.
+ [msaitoh, ticket #1588]
+
+sys/arch/x86/x86/coretemp.c 1.37
+
+ Add special handling for model 0x0f stepping >=2 or mode 0x0e to
+ get Tjmax.
+ [msaitoh, ticket #1589]
+
+sys/dev/pci/if_ti.c1.103, 1.106, 1.108,
+ 1.116-1.120 via patch
+sys/dev/pci/if_tireg.h1.26
+
+ - Use pci_intr_establish_xname()
+ - Don't clear CFI and priority bit to pass them to the upper layer.
+ - Add support for Farallon PN9000SX from FreeBSD.
+ - u_int_{8,16,32}_t -> uint_{8,16,32}_t
+ - Fix typo in comment.
+ - Style fix.
+ [msaitoh, ticket #1590]
+
+sys/dev/pci/piixpm.c1.57-1.59, 1.61-1.63 via patch
+sys/dev/pci/piixpmreg.h1.9-1.12
+
+ - Fix number of port for Hudson rev. 0x1f and newer.
+ - Read SB800_SMB_HOSTC correctly. This register is not in the PCI
+ config space but in the I/O space.
+ - The bit 0 of SB800_SMB_HOSTC is 0 on SMI or 1 on IRQ, so invert the
+ check.
+ - Don't force using SMBUS0SEL register.
+ - Acquire/release host semaphore to share SMBus between the host and
+ the embedded controller (IMC). Without this change, "shutdown -r"
+ does power off and not boot on some machines.
+ - Save/restore port number before selecting port.
+ - Modify comment.
+ - Whitespace fix.
+ [msaitoh, ticket #1591]
+
+sys/dev/sdmmc/sdhc.c1.107
+sys/dev/sdmmc/sdhcreg.h1.21
+
+ Identify SDHC 4.1 and 4.2.
+ [msaitoh, ticket #1592]
+
+sys/arch/x86/conf/files.x86 1.108
+sys/arch/x86/include/apicvar.h 1.7 via patch
+sys/arch/x86/include/cpu.h 1.121
+sys/arch/x86/x86/cpu.c
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Wed Aug 5 17:31:45 UTC 2020 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Tickets #1584 - #1595 To generate a diff of this commit: cvs rdiff -u -r1.1.2.25 -r1.1.2.26 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/arch/x86/x86
Module Name:src
Committed By: martin
Date: Wed Aug 5 17:27:48 UTC 2020
Modified Files:
src/sys/arch/x86/x86 [netbsd-8]: errata.c
Log Message:
Pull up the following, requested by msaitoh in ticket #1595:
sys/arch/x86/include/specialreg.h 1.129 via patch
sys/arch/x86/x86/errata.c 1.24-1.26
- Add six errata for AMD Family 17h (Ryzen etc), tested by
Patrick Welche and mrg@.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.23.10.1 src/sys/arch/x86/x86/errata.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/errata.c
diff -u src/sys/arch/x86/x86/errata.c:1.23 src/sys/arch/x86/x86/errata.c:1.23.10.1
--- src/sys/arch/x86/x86/errata.c:1.23 Tue Jan 5 10:20:22 2016
+++ src/sys/arch/x86/x86/errata.c Wed Aug 5 17:27:48 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: errata.c,v 1.23 2016/01/05 10:20:22 hannken Exp $ */
+/* $NetBSD: errata.c,v 1.23.10.1 2020/08/05 17:27:48 martin Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: errata.c,v 1.23 2016/01/05 10:20:22 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: errata.c,v 1.23.10.1 2020/08/05 17:27:48 martin Exp $");
#include
#include
@@ -70,8 +70,8 @@ typedef enum cpurev {
BH_E4, CH_CG, CH_D0, DH_CG, DH_D0, DH_E3, DH_E6, JH_E1,
JH_E6, SH_B0, SH_B3, SH_C0, SH_CG, SH_D0, SH_E4, SH_E5,
DR_BA, DR_B2, DR_B3, RB_C2, RB_C3, BL_C2, BL_C3, DA_C2,
- DA_C3, HY_D0, HY_D1, HY_D1_G34R1, PH_E0, LN_B0,
- OINK
+ DA_C3, HY_D0, HY_D1, HY_D1_G34R1, PH_E0, LN_B0, KB_A1,
+ ML_A1, ZP_B1, ZP_B2, PiR_B2, OINK
} cpurev_t;
static const u_int cpurevs[] = {
@@ -89,7 +89,9 @@ static const u_int cpurevs[] = {
RB_C2, 0x0100f42, RB_C3, 0x0100f43, BL_C2, 0x0100f52,
BL_C3, 0x0100f53, DA_C2, 0x0100f62, DA_C3, 0x0100f63,
HY_D0, 0x0100f80, HY_D1, 0x0100f81, HY_D1_G34R1, 0x0100f91,
- PH_E0, 0x0100fa0, LN_B0, 0x0300f10,
+ PH_E0, 0x0100fa0, LN_B0, 0x0300f10, KB_A1, 0x0700F01,
+ ML_A1, 0x0730F01, ZP_B1, 0x0800F11, ZP_B2, 0x0800F12,
+ PiR_B2, 0x0800F82,
OINK
};
@@ -142,6 +144,22 @@ static const uint8_t x86_errata_set11[]
DA_C3, HY_D0, HY_D1, HY_D1_G34R1, PH_E0, LN_B0, OINK
};
+static const uint8_t x86_errata_set12[] = {
+ KB_A1, OINK
+};
+
+static const uint8_t x86_errata_set13[] = {
+ ZP_B1, ZP_B2, PiR_B2, OINK
+};
+
+static const uint8_t x86_errata_set14[] = {
+ ZP_B1, OINK
+};
+
+static const uint8_t x86_errata_set15[] = {
+ KB_A1, ML_A1, OINK
+};
+
static bool x86_errata_setmsr(struct cpu_info *, errata_t *);
static bool x86_errata_testmsr(struct cpu_info *, errata_t *);
@@ -285,6 +303,62 @@ static errata_t errata[] = {
721, FALSE, MSR_DE_CFG, x86_errata_set11,
x86_errata_setmsr, DE_CFG_ERRATA_721
},
+ /*
+ * 776: Incorrect Processor Branch Prediction for Two Consecutive
+ * Linear Pages
+ */
+ {
+ 776, FALSE, MSR_IC_CFG, x86_errata_set12,
+ x86_errata_setmsr, IC_CFG_ERRATA_776
+ },
+ /*
+ * 793: Specific Combination of Writes to Write Combined Memory
+ * Types and Locked Instructions May Cause Core Hang
+ */
+ {
+ 793, FALSE, MSR_LS_CFG, x86_errata_set15,
+ x86_errata_setmsr, LS_CFG_ERRATA_793
+ },
+ /*
+ * 1021: Load Operation May Receive Stale Data From Older Store
+ * Operation
+ */
+ {
+ 1021, FALSE, MSR_DE_CFG, x86_errata_set13,
+ x86_errata_setmsr, DE_CFG_ERRATA_1021
+ },
+ /*
+ * 1033: A Lock Operation May Cause the System to Hang
+ */
+ {
+ 1033, FALSE, MSR_LS_CFG, x86_errata_set14,
+ x86_errata_setmsr, LS_CFG_ERRATA_1033
+ },
+ /*
+ * 1049: FCMOV Instruction May Not Execute Correctly
+ */
+ {
+ 1049, FALSE, MSR_FP_CFG, x86_errata_set13,
+ x86_errata_setmsr, FP_CFG_ERRATA_1049
+ },
+#if 0 /* Should we apply this errata? The other OSes don't. */
+ /*
+ * 1091: Address Boundary Crossing Load Operation May Receive
+ * Stale Data
+ */
+ {
+ 1091, FALSE, MSR_LS_CFG2, x86_errata_set13,
+ x86_errata_setmsr, LS_CFG2_ERRATA_1091
+ },
+#endif
+ /*
+ * 1095: Potential Violation of Read Ordering In Lock Operation
+ * In SMT (Simultaneous Multithreading) Mode
+ */
+ {
+ 1095, FALSE, MSR_LS_CFG, x86_errata_set13,
+ x86_errata_setmsr, LS_CFG_ERRATA_1095
+ },
};
static bool
CVS commit: [netbsd-8] src/sys/arch/x86/x86
Module Name:src Committed By: martin Date: Wed Aug 5 17:27:48 UTC 2020 Modified Files: src/sys/arch/x86/x86 [netbsd-8]: errata.c Log Message: Pull up the following, requested by msaitoh in ticket #1595: sys/arch/x86/include/specialreg.h 1.129 via patch sys/arch/x86/x86/errata.c 1.24-1.26 - Add six errata for AMD Family 17h (Ryzen etc), tested by Patrick Welche and mrg@. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.23.10.1 src/sys/arch/x86/x86/errata.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/dev
Module Name:src
Committed By: martin
Date: Wed Aug 5 17:22:46 UTC 2020
Modified Files:
src/sys/dev/mii [netbsd-8]: igphy.c igphyreg.h makphy.c makphyreg.h
src/sys/dev/pci [netbsd-8]: if_wm.c if_wmreg.h if_wmvar.h
Log Message:
Pull up the following revisions, requested by msaitoh in ticket #1594:
sys/dev/pci/if_wm.c 1.655-1.658, 1.660,
1.662, 1.664-1.668,
1.671-1.674, 1.678,
1.680-1.685 via patch
sys/dev/pci/if_wmreg.c 1.118-1.119 via patch
sys/dev/pci/if_wmvar.c 1.45 via patch
sys/dev/mii/igphy.c 1.35-1.36 via patch
sys/dev/mii/igphyreg.h 1.12-1.13
sys/dev/mii/makphy.c1.66 via patch
sys/dev/mii/makphyreg.h 1.11
- Add SFP support. Module insertion/removal is not supported yet.
Currently, SFP detection is only done in the driver's attach phase.
- Detect the Media Auto Sense feature. Not supported yet.
- Fix SFF_SFP_ETH_FLAGS_100FX. It's not 0x10 but 0x20.
- Add extra delay in wm_serdes_power_up_link_82575().
- Add Intel I219 LM10-LM15 and V10-V14.
- wm(4) can use workqueue as deferred Rx/Tx handler).
Set hw.wm*.txrx_workqueue=1 to use workqueue instead of softint.
The default value of hw.wm*.txrx_workqueue is 0 which use softint
as before.
- Unset RSS UDP flags like ixg(4) and other OSes. To handle IP
fragmented UDP, first packet and second packet should be processed
in the same Rx queue.
- It's useless to not to set PCI_PMCSR_PME_STS bit when writing because
the bit is W1C. Instead, always write PCI_PMCSR_PME_STS bit to clear
in case it's already set.
- Actually writing always the checksum offload context descriptor
makes the HW do extra processing, avoid doing that if possible.
- Fix a bug that the WMREG_EEARBC_I210 register is incorrectly set if
the system uses iNVM.
- "wmX: 0" on 82542 is difficult to understand, so don't print it.
- Explicitly cast from uint16_t to uint32_t before shifting 16bit left
when printing Image Unique ID to avoid undefined behavior.
- Set if_baudrate for non-MII device.
- Rename some macros and function.
- KNF. Add comment.
To generate a diff of this commit:
cvs rdiff -u -r1.26.10.1 -r1.26.10.2 src/sys/dev/mii/igphy.c
cvs rdiff -u -r1.10 -r1.10.8.1 src/sys/dev/mii/igphyreg.h
cvs rdiff -u -r1.42.8.4 -r1.42.8.5 src/sys/dev/mii/makphy.c
cvs rdiff -u -r1.6.20.2 -r1.6.20.3 src/sys/dev/mii/makphyreg.h
cvs rdiff -u -r1.508.4.38 -r1.508.4.39 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.98.6.11 -r1.98.6.12 src/sys/dev/pci/if_wmreg.h
cvs rdiff -u -r1.33.6.5 -r1.33.6.6 src/sys/dev/pci/if_wmvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/mii/igphy.c
diff -u src/sys/dev/mii/igphy.c:1.26.10.1 src/sys/dev/mii/igphy.c:1.26.10.2
--- src/sys/dev/mii/igphy.c:1.26.10.1 Tue Aug 1 23:33:18 2017
+++ src/sys/dev/mii/igphy.c Wed Aug 5 17:22:46 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: igphy.c,v 1.26.10.1 2017/08/01 23:33:18 snj Exp $ */
+/* $NetBSD: igphy.c,v 1.26.10.2 2020/08/05 17:22:46 martin Exp $ */
/*
* The Intel copyright applies to the analog register setup, and the
@@ -70,7 +70,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: igphy.c,v 1.26.10.1 2017/08/01 23:33:18 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: igphy.c,v 1.26.10.2 2020/08/05 17:22:46 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_mii.h"
@@ -274,7 +274,7 @@ igphy_load_dspcode(struct mii_softc *sc)
delay(2);
- PHY_WRITE(sc, MII_IGPHY_PAGE_SELECT, 0x);
+ PHY_WRITE(sc, IGPHY_PAGE_SELECT, 0x);
PHY_WRITE(sc, 0x, 0x0140);
delay(5000);
@@ -282,7 +282,7 @@ igphy_load_dspcode(struct mii_softc *sc)
for (i = 0; !((code[i].reg == 0) && (code[i].val == 0)); i++)
IGPHY_WRITE(sc, code[i].reg, code[i].val);
- PHY_WRITE(sc, MII_IGPHY_PAGE_SELECT, 0x);
+ PHY_WRITE(sc, IGPHY_PAGE_SELECT, 0x);
PHY_WRITE(sc, 0x, 0x3300);
delay(2);
@@ -327,9 +327,9 @@ igphy_reset(struct mii_softc *sc)
}
if (igsc->sc_mactype == WM_T_82547) {
- fused = IGPHY_READ(sc, MII_IGPHY_ANALOG_SPARE_FUSE_STATUS);
+ fused = IGPHY_READ(sc, IGPHY_ANALOG_SPARE_FUSE_STATUS);
if ((fused & ANALOG_SPARE_FUSE_ENABLED) == 0) {
- fused = IGPHY_READ(sc, MII_IGPHY_ANALOG_FUSE_STATUS);
+ fused = IGPHY_READ(sc, IGPHY_ANALOG_FUSE_STATUS);
fine = fused & ANALOG_FUSE_FINE_MASK;
coarse = fused & ANALOG_FUSE_COARSE_MASK;
@@ -344,12 +344,12 @@ igphy_reset(struct mii_softc *sc)
(fine & ANALOG_FUSE_FINE_MASK) |
(coarse & ANALOG_FUSE_COARSE_MASK);
- IGPHY_WRITE(sc, MII_IGPHY_ANALOG_FUSE_CONTROL, fused);
- IGPHY_WRITE(sc, MII_IGPHY_ANALOG_FUSE_BYPASS,
+ IGPHY_WRITE(sc, IGPHY_ANALOG_FUSE_CONTROL, fused);
+
CVS commit: [netbsd-8] src/sys/dev
Module Name:src Committed By: martin Date: Wed Aug 5 17:22:46 UTC 2020 Modified Files: src/sys/dev/mii [netbsd-8]: igphy.c igphyreg.h makphy.c makphyreg.h src/sys/dev/pci [netbsd-8]: if_wm.c if_wmreg.h if_wmvar.h Log Message: Pull up the following revisions, requested by msaitoh in ticket #1594: sys/dev/pci/if_wm.c 1.655-1.658, 1.660, 1.662, 1.664-1.668, 1.671-1.674, 1.678, 1.680-1.685 via patch sys/dev/pci/if_wmreg.c 1.118-1.119 via patch sys/dev/pci/if_wmvar.c 1.45 via patch sys/dev/mii/igphy.c 1.35-1.36 via patch sys/dev/mii/igphyreg.h 1.12-1.13 sys/dev/mii/makphy.c1.66 via patch sys/dev/mii/makphyreg.h 1.11 - Add SFP support. Module insertion/removal is not supported yet. Currently, SFP detection is only done in the driver's attach phase. - Detect the Media Auto Sense feature. Not supported yet. - Fix SFF_SFP_ETH_FLAGS_100FX. It's not 0x10 but 0x20. - Add extra delay in wm_serdes_power_up_link_82575(). - Add Intel I219 LM10-LM15 and V10-V14. - wm(4) can use workqueue as deferred Rx/Tx handler). Set hw.wm*.txrx_workqueue=1 to use workqueue instead of softint. The default value of hw.wm*.txrx_workqueue is 0 which use softint as before. - Unset RSS UDP flags like ixg(4) and other OSes. To handle IP fragmented UDP, first packet and second packet should be processed in the same Rx queue. - It's useless to not to set PCI_PMCSR_PME_STS bit when writing because the bit is W1C. Instead, always write PCI_PMCSR_PME_STS bit to clear in case it's already set. - Actually writing always the checksum offload context descriptor makes the HW do extra processing, avoid doing that if possible. - Fix a bug that the WMREG_EEARBC_I210 register is incorrectly set if the system uses iNVM. - "wmX: 0" on 82542 is difficult to understand, so don't print it. - Explicitly cast from uint16_t to uint32_t before shifting 16bit left when printing Image Unique ID to avoid undefined behavior. - Set if_baudrate for non-MII device. - Rename some macros and function. - KNF. Add comment. To generate a diff of this commit: cvs rdiff -u -r1.26.10.1 -r1.26.10.2 src/sys/dev/mii/igphy.c cvs rdiff -u -r1.10 -r1.10.8.1 src/sys/dev/mii/igphyreg.h cvs rdiff -u -r1.42.8.4 -r1.42.8.5 src/sys/dev/mii/makphy.c cvs rdiff -u -r1.6.20.2 -r1.6.20.3 src/sys/dev/mii/makphyreg.h cvs rdiff -u -r1.508.4.38 -r1.508.4.39 src/sys/dev/pci/if_wm.c cvs rdiff -u -r1.98.6.11 -r1.98.6.12 src/sys/dev/pci/if_wmreg.h cvs rdiff -u -r1.33.6.5 -r1.33.6.6 src/sys/dev/pci/if_wmvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/nvmm
Module Name:src Committed By: maxv Date: Wed Aug 5 16:36:34 UTC 2020 Modified Files: src/sys/dev/nvmm: nvmm.h Log Message: Add CTASSERT. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/dev/nvmm/nvmm.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/nvmm
Module Name:src
Committed By: maxv
Date: Wed Aug 5 16:36:34 UTC 2020
Modified Files:
src/sys/dev/nvmm: nvmm.h
Log Message:
Add CTASSERT.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/nvmm/nvmm.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/nvmm/nvmm.h
diff -u src/sys/dev/nvmm/nvmm.h:1.13 src/sys/dev/nvmm/nvmm.h:1.14
--- src/sys/dev/nvmm/nvmm.h:1.13 Sat Aug 1 08:18:36 2020
+++ src/sys/dev/nvmm/nvmm.h Wed Aug 5 16:36:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nvmm.h,v 1.13 2020/08/01 08:18:36 maxv Exp $ */
+/* $NetBSD: nvmm.h,v 1.14 2020/08/05 16:36:33 maxv Exp $ */
/*
* Copyright (c) 2018-2020 The NetBSD Foundation, Inc.
@@ -96,4 +96,9 @@ struct nvmm_comm_page {
#define NVMM_COMM_CPUID(off) \
((off >> 12) & 0xFF)
+#ifdef _KERNEL
+/* At most one page, for the NVMM_COMM_* macros. */
+CTASSERT(sizeof(struct nvmm_comm_page) <= PAGE_SIZE);
+#endif
+
#endif
CVS commit: [netbsd-8] src/sys/arch
Module Name:src Committed By: martin Date: Wed Aug 5 16:20:09 UTC 2020 Modified Files: src/sys/arch/x86/conf [netbsd-8]: files.x86 src/sys/arch/x86/include [netbsd-8]: apicvar.h cpu.h src/sys/arch/x86/x86 [netbsd-8]: cpu.c hyperv.c tsc.c src/sys/arch/xen/conf [netbsd-8]: files.xen Log Message: Pull up the following revisions, requested by msaitoh in ticket #1593: sys/arch/x86/conf/files.x86 1.108 sys/arch/x86/include/apicvar.h 1.7 via patch sys/arch/x86/include/cpu.h 1.121 sys/arch/x86/x86/cpu.c 1.185 via patch sys/arch/x86/x86/hyperv.c 1.7 sys/arch/x86/x86/tsc.c 1.41 sys/arch/xen/conf/files.xen 1.181 Get TSC frequency from CPUID 0x15 and/or x16 if it's available. This change fixes a problem that newer Intel processors' timer counts very slowly. To generate a diff of this commit: cvs rdiff -u -r1.88.6.2 -r1.88.6.3 src/sys/arch/x86/conf/files.x86 cvs rdiff -u -r1.5 -r1.5.80.1 src/sys/arch/x86/include/apicvar.h cvs rdiff -u -r1.71.2.8 -r1.71.2.9 src/sys/arch/x86/include/cpu.h cvs rdiff -u -r1.130.2.9 -r1.130.2.10 src/sys/arch/x86/x86/cpu.c cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/arch/x86/x86/hyperv.c cvs rdiff -u -r1.36.22.1 -r1.36.22.2 src/sys/arch/x86/x86/tsc.c cvs rdiff -u -r1.147.2.3 -r1.147.2.4 src/sys/arch/xen/conf/files.xen Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/arch
Module Name:src
Committed By: martin
Date: Wed Aug 5 16:20:09 UTC 2020
Modified Files:
src/sys/arch/x86/conf [netbsd-8]: files.x86
src/sys/arch/x86/include [netbsd-8]: apicvar.h cpu.h
src/sys/arch/x86/x86 [netbsd-8]: cpu.c hyperv.c tsc.c
src/sys/arch/xen/conf [netbsd-8]: files.xen
Log Message:
Pull up the following revisions, requested by msaitoh in ticket #1593:
sys/arch/x86/conf/files.x86 1.108
sys/arch/x86/include/apicvar.h 1.7 via patch
sys/arch/x86/include/cpu.h 1.121
sys/arch/x86/x86/cpu.c 1.185 via patch
sys/arch/x86/x86/hyperv.c 1.7
sys/arch/x86/x86/tsc.c 1.41
sys/arch/xen/conf/files.xen 1.181
Get TSC frequency from CPUID 0x15 and/or x16 if it's available.
This change fixes a problem that newer Intel processors' timer
counts very slowly.
To generate a diff of this commit:
cvs rdiff -u -r1.88.6.2 -r1.88.6.3 src/sys/arch/x86/conf/files.x86
cvs rdiff -u -r1.5 -r1.5.80.1 src/sys/arch/x86/include/apicvar.h
cvs rdiff -u -r1.71.2.8 -r1.71.2.9 src/sys/arch/x86/include/cpu.h
cvs rdiff -u -r1.130.2.9 -r1.130.2.10 src/sys/arch/x86/x86/cpu.c
cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/arch/x86/x86/hyperv.c
cvs rdiff -u -r1.36.22.1 -r1.36.22.2 src/sys/arch/x86/x86/tsc.c
cvs rdiff -u -r1.147.2.3 -r1.147.2.4 src/sys/arch/xen/conf/files.xen
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/conf/files.x86
diff -u src/sys/arch/x86/conf/files.x86:1.88.6.2 src/sys/arch/x86/conf/files.x86:1.88.6.3
--- src/sys/arch/x86/conf/files.x86:1.88.6.2 Sat Mar 9 17:10:20 2019
+++ src/sys/arch/x86/conf/files.x86 Wed Aug 5 16:20:08 2020
@@ -1,4 +1,4 @@
-# $NetBSD: files.x86,v 1.88.6.2 2019/03/09 17:10:20 martin Exp $
+# $NetBSD: files.x86,v 1.88.6.3 2020/08/05 16:20:08 martin Exp $
# options for MP configuration through the MP spec
defflag opt_mpbios.h MPBIOS MPVERBOSE MPDEBUG MPBIOS_SCANPCI
@@ -84,6 +84,7 @@ file arch/x86/x86/efi.c machdep
file arch/x86/x86/errata.c machdep
file arch/x86/x86/genfb_machdep.c machdep
file arch/x86/x86/identcpu.c machdep
+file arch/x86/x86/identcpu_subr.c machdep
file arch/x86/x86/i8259.c machdep
file arch/x86/x86/intr.c machdep
file arch/x86/x86/nmi.c machdep
Index: src/sys/arch/x86/include/apicvar.h
diff -u src/sys/arch/x86/include/apicvar.h:1.5 src/sys/arch/x86/include/apicvar.h:1.5.80.1
--- src/sys/arch/x86/include/apicvar.h:1.5 Mon Apr 28 20:23:40 2008
+++ src/sys/arch/x86/include/apicvar.h Wed Aug 5 16:20:08 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: apicvar.h,v 1.5 2008/04/28 20:23:40 martin Exp $ */
+/* $NetBSD: apicvar.h,v 1.5.80.1 2020/08/05 16:20:08 martin Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -46,4 +46,7 @@ struct apic_attach_args {
void apic_format_redir(const char *, const char *, int, u_int32_t, u_int32_t);
+/* For lapic.c */
+extern uint32_t lapic_per_second;
+
#endif /* !_X86_APICVAR_H_ */
Index: src/sys/arch/x86/include/cpu.h
diff -u src/sys/arch/x86/include/cpu.h:1.71.2.8 src/sys/arch/x86/include/cpu.h:1.71.2.9
--- src/sys/arch/x86/include/cpu.h:1.71.2.8 Sat Mar 9 17:10:20 2019
+++ src/sys/arch/x86/include/cpu.h Wed Aug 5 16:20:08 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.71.2.8 2019/03/09 17:10:20 martin Exp $ */
+/* $NetBSD: cpu.h,v 1.71.2.9 2020/08/05 16:20:08 martin Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -451,6 +451,9 @@ void cpu_probe(struct cpu_info *);
void cpu_identify(struct cpu_info *);
void identify_hypervisor(void);
+/* identcpu_subr.c */
+uint64_t cpu_tsc_freq_cpuid(struct cpu_info *);
+
typedef enum vm_guest {
VM_GUEST_NO = 0,
VM_GUEST_VM,
Index: src/sys/arch/x86/x86/cpu.c
diff -u src/sys/arch/x86/x86/cpu.c:1.130.2.9 src/sys/arch/x86/x86/cpu.c:1.130.2.10
--- src/sys/arch/x86/x86/cpu.c:1.130.2.9 Tue Jan 21 16:47:24 2020
+++ src/sys/arch/x86/x86/cpu.c Wed Aug 5 16:20:08 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.130.2.9 2020/01/21 16:47:24 martin Exp $ */
+/* $NetBSD: cpu.c,v 1.130.2.10 2020/08/05 16:20:08 martin Exp $ */
/*-
* Copyright (c) 2000-2012 NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.130.2.9 2020/01/21 16:47:24 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.130.2.10 2020/08/05 16:20:08 martin Exp $");
#include "opt_ddb.h"
#include "opt_mpbios.h" /* for MPDEBUG */
@@ -1226,16 +1226,25 @@ cpu_shutdown(device_t dv, int how)
return cpu_stop(dv);
}
+/* Get the TSC frequency and set it to ci->ci_data.cpu_cc_freq. */
void
cpu_get_tsc_freq(struct cpu_info *ci)
{
- uint64_t last_tsc;
+ uint64_t freq = 0, last_tsc;
if (cpu_hascounter()) {
- last_tsc = cpu_counter_serializing();
- x86_delay(10);
-
CVS commit: [netbsd-8] src/sys/dev/sdmmc
Module Name:src
Committed By: martin
Date: Wed Aug 5 16:14:25 UTC 2020
Modified Files:
src/sys/dev/sdmmc [netbsd-8]: sdhc.c sdhcreg.h
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1592):
sys/dev/sdmmc/sdhc.c: revision 1.107
sys/dev/sdmmc/sdhcreg.h: revision 1.21
Identify SDHC 4.1 and 4.2. From {DragonFly,Free}BSD.
To generate a diff of this commit:
cvs rdiff -u -r1.100.4.1 -r1.100.4.2 src/sys/dev/sdmmc/sdhc.c
cvs rdiff -u -r1.18.10.1 -r1.18.10.2 src/sys/dev/sdmmc/sdhcreg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/sdmmc/sdhc.c
diff -u src/sys/dev/sdmmc/sdhc.c:1.100.4.1 src/sys/dev/sdmmc/sdhc.c:1.100.4.2
--- src/sys/dev/sdmmc/sdhc.c:1.100.4.1 Sun Jan 7 09:24:59 2018
+++ src/sys/dev/sdmmc/sdhc.c Wed Aug 5 16:14:25 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhc.c,v 1.100.4.1 2018/01/07 09:24:59 snj Exp $ */
+/* $NetBSD: sdhc.c,v 1.100.4.2 2020/08/05 16:14:25 martin Exp $ */
/* $OpenBSD: sdhc.c,v 1.25 2009/01/13 19:44:20 grange Exp $ */
/*
@@ -23,7 +23,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.100.4.1 2018/01/07 09:24:59 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.100.4.2 2020/08/05 16:14:25 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_sdmmc.h"
@@ -316,6 +316,12 @@ sdhc_host_found(struct sdhc_softc *sc, b
case SDHC_SPEC_VERS_400:
aprint_normal("4.0");
break;
+ case SDHC_SPEC_VERS_410:
+ aprint_normal("4.1");
+ break;
+ case SDHC_SPEC_VERS_420:
+ aprint_normal("4.2");
+ break;
case SDHC_SPEC_NOVERS:
hp->specver = -1;
aprint_normal("NO-VERS");
Index: src/sys/dev/sdmmc/sdhcreg.h
diff -u src/sys/dev/sdmmc/sdhcreg.h:1.18.10.1 src/sys/dev/sdmmc/sdhcreg.h:1.18.10.2
--- src/sys/dev/sdmmc/sdhcreg.h:1.18.10.1 Sun Jan 7 09:24:59 2018
+++ src/sys/dev/sdmmc/sdhcreg.h Wed Aug 5 16:14:25 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhcreg.h,v 1.18.10.1 2018/01/07 09:24:59 snj Exp $ */
+/* $NetBSD: sdhcreg.h,v 1.18.10.2 2020/08/05 16:14:25 martin Exp $ */
/* $OpenBSD: sdhcreg.h,v 1.4 2006/07/30 17:20:40 fgsch Exp $ */
/*
@@ -246,6 +246,8 @@
#define SDHC_SPEC_VERS_200 0x01
#define SDHC_SPEC_VERS_300 0x02
#define SDHC_SPEC_VERS_400 0x03
+#define SDHC_SPEC_VERS_410 0x04
+#define SDHC_SPEC_VERS_420 0x05
#define SDHC_SPEC_NOVERS 0xff /* dummy */
/* SDHC_CAPABILITIES decoding */
CVS commit: [netbsd-8] src/sys/dev/sdmmc
Module Name:src
Committed By: martin
Date: Wed Aug 5 16:14:25 UTC 2020
Modified Files:
src/sys/dev/sdmmc [netbsd-8]: sdhc.c sdhcreg.h
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1592):
sys/dev/sdmmc/sdhc.c: revision 1.107
sys/dev/sdmmc/sdhcreg.h: revision 1.21
Identify SDHC 4.1 and 4.2. From {DragonFly,Free}BSD.
To generate a diff of this commit:
cvs rdiff -u -r1.100.4.1 -r1.100.4.2 src/sys/dev/sdmmc/sdhc.c
cvs rdiff -u -r1.18.10.1 -r1.18.10.2 src/sys/dev/sdmmc/sdhcreg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src Committed By: martin Date: Wed Aug 5 16:11:56 UTC 2020 Modified Files: src/sys/dev/pci [netbsd-8]: piixpm.c piixpmreg.h Log Message: Pull up the following revisions, requested by msaitoh in ticket #1591: sys/dev/pci/piixpm.c1.57-1.59, 1.61-1.63 via patch sys/dev/pci/piixpmreg.h 1.9-1.12 - Fix number of port for Hudson rev. 0x1f and newer. - Read SB800_SMB_HOSTC correctly. This register is not in the PCI config space but in the I/O space. - The bit 0 of SB800_SMB_HOSTC is 0 on SMI or 1 on IRQ, so invert the check. - Don't force using SMBUS0SEL register. - Acquire/release host semaphore to share SMBus between the host and the embedded controller (IMC). Without this change, "shutdown -r" does power off and not boot on some machines. - Save/restore port number before selecting port. - Modify comment. - Whitespace fix. To generate a diff of this commit: cvs rdiff -u -r1.52.6.1 -r1.52.6.2 src/sys/dev/pci/piixpm.c cvs rdiff -u -r1.7.22.1 -r1.7.22.2 src/sys/dev/pci/piixpmreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Wed Aug 5 16:11:56 UTC 2020
Modified Files:
src/sys/dev/pci [netbsd-8]: piixpm.c piixpmreg.h
Log Message:
Pull up the following revisions, requested by msaitoh in ticket #1591:
sys/dev/pci/piixpm.c1.57-1.59,
1.61-1.63 via patch
sys/dev/pci/piixpmreg.h 1.9-1.12
- Fix number of port for Hudson rev. 0x1f and newer.
- Read SB800_SMB_HOSTC correctly. This register is not in the PCI
config space but in the I/O space.
- The bit 0 of SB800_SMB_HOSTC is 0 on SMI or 1 on IRQ, so invert the
check.
- Don't force using SMBUS0SEL register.
- Acquire/release host semaphore to share SMBus between the host and
the embedded controller (IMC). Without this change, "shutdown -r"
does power off and not boot on some machines.
- Save/restore port number before selecting port.
- Modify comment.
- Whitespace fix.
To generate a diff of this commit:
cvs rdiff -u -r1.52.6.1 -r1.52.6.2 src/sys/dev/pci/piixpm.c
cvs rdiff -u -r1.7.22.1 -r1.7.22.2 src/sys/dev/pci/piixpmreg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/piixpm.c
diff -u src/sys/dev/pci/piixpm.c:1.52.6.1 src/sys/dev/pci/piixpm.c:1.52.6.2
--- src/sys/dev/pci/piixpm.c:1.52.6.1 Tue Aug 6 16:02:54 2019
+++ src/sys/dev/pci/piixpm.c Wed Aug 5 16:11:56 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: piixpm.c,v 1.52.6.1 2019/08/06 16:02:54 martin Exp $ */
+/* $NetBSD: piixpm.c,v 1.52.6.2 2020/08/05 16:11:56 martin Exp $ */
/* $OpenBSD: piixpm.c,v 1.39 2013/10/01 20:06:02 sf Exp $ */
/*
@@ -22,7 +22,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: piixpm.c,v 1.52.6.1 2019/08/06 16:02:54 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: piixpm.c,v 1.52.6.2 2020/08/05 16:11:56 martin Exp $");
#include
#include
@@ -70,8 +70,11 @@ __KERNEL_RCSID(0, "$NetBSD: piixpm.c,v 1
#define PIIXPM_IS_FCHGRP(sc) (PIIXPM_IS_HUDSON(sc) || PIIXPM_IS_KERNCZ(sc))
+#define PIIX_SB800_TIMEOUT 500
+
struct piixpm_smbus {
int sda;
+ int sda_save;
struct piixpm_softc *softc;
};
@@ -86,6 +89,7 @@ struct piixpm_softc {
bus_space_handle_t sc_smb_ioh;
void * sc_smb_ih;
int sc_poll;
+ bool sc_sb800_selen; /* Use SMBUS0SEL */
pci_chipset_tag_t sc_pc;
pcitag_t sc_pcitag;
@@ -119,8 +123,8 @@ static bool piixpm_resume(device_t, cons
static int piixpm_sb800_init(struct piixpm_softc *);
static void piixpm_csb5_reset(void *);
-static int piixpm_i2c_acquire_bus(void *, int);
-static void piixpm_i2c_release_bus(void *, int);
+static int piixpm_i2c_sb800_acquire_bus(void *, int);
+static void piixpm_i2c_sb800_release_bus(void *, int);
static int piixpm_i2c_exec(void *, i2c_op_t, i2c_addr_t, const void *,
size_t, void *, size_t, int);
@@ -231,15 +235,10 @@ nopowermanagement:
/* SB800 rev 0x40+, AMD HUDSON and newer need special initialization */
if (PIIXPM_IS_FCHGRP(sc) || PIIXPM_IS_SB800GRP(sc)) {
if (piixpm_sb800_init(sc) == 0) {
- sc->sc_numbusses = 4;
-
/* Read configuration */
- conf = pci_conf_read(pa->pa_pc, pa->pa_tag,
- SB800_SMB_HOSTC);
- DPRINTF(("%s: conf 0x%08x\n", device_xname(self),
-conf));
-
- usesmi = conf & SB800_SMB_HOSTC_SMI;
+ conf = bus_space_read_1(sc->sc_iot,
+ sc->sc_smb_ioh, SB800_SMB_HOSTC);
+ usesmi = ((conf & SB800_SMB_HOSTC_IRQ) == 0);
goto setintr;
}
aprint_normal_dev(self, "SMBus initialization failed\n");
@@ -328,17 +327,24 @@ piixpm_rescan(device_t self, const char
/* Attach I2C bus */
for (i = 0; i < sc->sc_numbusses; i++) {
+ struct i2c_controller *tag = >sc_i2c_tags[i];
+
if (sc->sc_i2c_device[i])
continue;
sc->sc_busses[i].sda = i;
sc->sc_busses[i].softc = sc;
- sc->sc_i2c_tags[i].ic_cookie = >sc_busses[i];
- sc->sc_i2c_tags[i].ic_acquire_bus = piixpm_i2c_acquire_bus;
- sc->sc_i2c_tags[i].ic_release_bus = piixpm_i2c_release_bus;
- sc->sc_i2c_tags[i].ic_exec = piixpm_i2c_exec;
+ tag->ic_cookie = >sc_busses[i];
+ if (PIIXPM_IS_SB800GRP(sc) || PIIXPM_IS_FCHGRP(sc)) {
+ tag->ic_acquire_bus = piixpm_i2c_sb800_acquire_bus;
+ tag->ic_release_bus = piixpm_i2c_sb800_release_bus;
+ } else {
+ tag->ic_acquire_bus = NULL;
+ tag->ic_release_bus = NULL;
+ }
+ tag->ic_exec = piixpm_i2c_exec;
memset(, 0, sizeof(iba));
iba.iba_type = I2C_TYPE_SMBUS;
- iba.iba_tag = >sc_i2c_tags[i];
+ iba.iba_tag = tag;
sc->sc_i2c_device[i] = config_found_ia(self, ifattr, ,
piixpm_iicbus_print);
}
@@ -401,6 +407,12 @@ piixpm_sb800_init(struct piixpm_softc *s
uint16_t val, base_addr;
bool enabled;
+ if (PIIXPM_IS_KERNCZ(sc) ||
+ (PIIXPM_IS_HUDSON(sc) && (sc->sc_rev >= 0x1f)))
+ sc->sc_numbusses = 2;
+ else
+ sc->sc_numbusses = 4;
+
/* Fetch SMB base address */
if (bus_space_map(iot,
SB800_INDIRECTIO_BASE, SB800_INDIRECTIO_SIZE, 0, )) {
@@
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Wed Aug 5 16:08:10 UTC 2020
Modified Files:
src/sys/dev/pci [netbsd-8]: if_ti.c if_tireg.h
Log Message:
Pull up the following revisions, requested by msaitoh in ticket #1590:
sys/dev/pci/if_ti.c 1.103, 1.106, 1.108,
1.116-1.120 via patch
sys/dev/pci/if_tireg.h 1.26
- Use pci_intr_establish_xname()
- Don't clear CFI and priority bit to pass them to the upper layer.
- Add support for Farallon PN9000SX from FreeBSD.
- u_int_{8,16,32}_t -> uint_{8,16,32}_t
- Fix typo in comment.
- Style fix.
To generate a diff of this commit:
cvs rdiff -u -r1.101.8.2 -r1.101.8.3 src/sys/dev/pci/if_ti.c
cvs rdiff -u -r1.20 -r1.20.30.1 src/sys/dev/pci/if_tireg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Wed Aug 5 16:08:10 UTC 2020
Modified Files:
src/sys/dev/pci [netbsd-8]: if_ti.c if_tireg.h
Log Message:
Pull up the following revisions, requested by msaitoh in ticket #1590:
sys/dev/pci/if_ti.c 1.103, 1.106, 1.108,
1.116-1.120 via patch
sys/dev/pci/if_tireg.h 1.26
- Use pci_intr_establish_xname()
- Don't clear CFI and priority bit to pass them to the upper layer.
- Add support for Farallon PN9000SX from FreeBSD.
- u_int_{8,16,32}_t -> uint_{8,16,32}_t
- Fix typo in comment.
- Style fix.
To generate a diff of this commit:
cvs rdiff -u -r1.101.8.2 -r1.101.8.3 src/sys/dev/pci/if_ti.c
cvs rdiff -u -r1.20 -r1.20.30.1 src/sys/dev/pci/if_tireg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_ti.c
diff -u src/sys/dev/pci/if_ti.c:1.101.8.2 src/sys/dev/pci/if_ti.c:1.101.8.3
--- src/sys/dev/pci/if_ti.c:1.101.8.2 Mon May 13 12:40:13 2019
+++ src/sys/dev/pci/if_ti.c Wed Aug 5 16:08:09 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ti.c,v 1.101.8.2 2019/05/13 12:40:13 martin Exp $ */
+/* $NetBSD: if_ti.c,v 1.101.8.3 2020/08/05 16:08:09 martin Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -81,7 +81,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_ti.c,v 1.101.8.2 2019/05/13 12:40:13 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ti.c,v 1.101.8.3 2020/08/05 16:08:09 martin Exp $");
#include "opt_inet.h"
@@ -140,6 +140,8 @@ static const struct ti_type ti_devs[] =
"Netgear GA620 1000BASE-T Ethernet" },
{ PCI_VENDOR_SGI, PCI_PRODUCT_SGI_TIGON,
"Silicon Graphics Gigabit Ethernet" },
+ { PCI_VENDOR_DEC, PCI_PRODUCT_DEC_PN9000SX,
+ "Farallon PN9000SX Gigabit Ethernet" },
{ 0, 0, NULL }
};
@@ -152,8 +154,8 @@ static void ti_txeof_tigon2(struct ti_so
static void ti_rxeof(struct ti_softc *);
static void ti_stats_update(struct ti_softc *);
-static int ti_encap_tigon1(struct ti_softc *, struct mbuf *, u_int32_t *);
-static int ti_encap_tigon2(struct ti_softc *, struct mbuf *, u_int32_t *);
+static int ti_encap_tigon1(struct ti_softc *, struct mbuf *, uint32_t *);
+static int ti_encap_tigon2(struct ti_softc *, struct mbuf *, uint32_t *);
static int ti_intr(void *);
static void ti_start(struct ifnet *);
@@ -165,15 +167,15 @@ static void ti_watchdog(struct ifnet *);
static int ti_ifmedia_upd(struct ifnet *);
static void ti_ifmedia_sts(struct ifnet *, struct ifmediareq *);
-static u_int32_t ti_eeprom_putbyte(struct ti_softc *, int);
-static u_int8_t ti_eeprom_getbyte(struct ti_softc *, int, u_int8_t *);
+static uint32_t ti_eeprom_putbyte(struct ti_softc *, int);
+static uint8_t ti_eeprom_getbyte(struct ti_softc *, int, uint8_t *);
static int ti_read_eeprom(struct ti_softc *, void *, int, int);
static void ti_add_mcast(struct ti_softc *, struct ether_addr *);
static void ti_del_mcast(struct ti_softc *, struct ether_addr *);
static void ti_setmulti(struct ti_softc *);
-static void ti_mem(struct ti_softc *, u_int32_t, u_int32_t, const void *);
+static void ti_mem(struct ti_softc *, uint32_t, uint32_t, const void *);
static void ti_loadfw(struct ti_softc *);
static void ti_cmd(struct ti_softc *, struct ti_cmd_desc *);
static void ti_cmd_ext(struct ti_softc *, struct ti_cmd_desc *, void *, int);
@@ -205,7 +207,7 @@ CFATTACH_DECL_NEW(ti, sizeof(struct ti_s
/*
* Send an instruction or address to the EEPROM, check for ACK.
*/
-static u_int32_t
+static uint32_t
ti_eeprom_putbyte(struct ti_softc *sc, int byte)
{
int i, ack = 0;
@@ -216,7 +218,7 @@ ti_eeprom_putbyte(struct ti_softc *sc, i
TI_SETBIT(sc, TI_MISC_LOCAL_CTL, TI_MLC_EE_TXEN);
/*
- * Feed in each bit and stobe the clock.
+ * Feed in each bit and strobe the clock.
*/
for (i = 0x80; i; i >>= 1) {
if (byte & i) {
@@ -250,11 +252,11 @@ ti_eeprom_putbyte(struct ti_softc *sc, i
* We have to send two address bytes since the EEPROM can hold
* more than 256 bytes of data.
*/
-static u_int8_t
-ti_eeprom_getbyte(struct ti_softc *sc, int addr, u_int8_t *dest)
+static uint8_t
+ti_eeprom_getbyte(struct ti_softc *sc, int addr, uint8_t *dest)
{
int i;
- u_int8_t byte = 0;
+ uint8_t byte = 0;
EEPROM_START();
@@ -327,7 +329,7 @@ ti_read_eeprom(struct ti_softc *sc, void
{
char *dest = destv;
int err = 0, i;
- u_int8_t byte = 0;
+ uint8_t byte = 0;
for (i = 0; i < cnt; i++) {
err = ti_eeprom_getbyte(sc, off + i, );
@@ -344,7 +346,7 @@ ti_read_eeprom(struct ti_softc *sc, void
* of NIC local memory or (if tbuf is non-NULL) copy data into it.
*/
static void
-ti_mem(struct ti_softc *sc, u_int32_t addr, u_int32_t len, const void *xbuf)
+ti_mem(struct ti_softc *sc, uint32_t addr, uint32_t len, const void *xbuf)
{
int segptr, segsize, cnt;
const void *ptr;
@@ -368,11 +370,11 @@ ti_mem(struct
CVS commit: [netbsd-8] src/sys/arch/x86/x86
Module Name:src
Committed By: martin
Date: Wed Aug 5 16:05:49 UTC 2020
Modified Files:
src/sys/arch/x86/x86 [netbsd-8]: coretemp.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1589):
sys/arch/x86/x86/coretemp.c: revision 1.37
Add special handling for model 0x0f stepping >=2 or mode 0x0e to get Tjmax.
To generate a diff of this commit:
cvs rdiff -u -r1.35.10.1 -r1.35.10.2 src/sys/arch/x86/x86/coretemp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/coretemp.c
diff -u src/sys/arch/x86/x86/coretemp.c:1.35.10.1 src/sys/arch/x86/x86/coretemp.c:1.35.10.2
--- src/sys/arch/x86/x86/coretemp.c:1.35.10.1 Thu Jul 26 23:23:50 2018
+++ src/sys/arch/x86/x86/coretemp.c Wed Aug 5 16:05:49 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: coretemp.c,v 1.35.10.1 2018/07/26 23:23:50 snj Exp $ */
+/* $NetBSD: coretemp.c,v 1.35.10.2 2020/08/05 16:05:49 martin Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: coretemp.c,v 1.35.10.1 2018/07/26 23:23:50 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: coretemp.c,v 1.35.10.2 2020/08/05 16:05:49 martin Exp $");
#include
#include
@@ -271,6 +271,19 @@ coretemp_tjmax(device_t self)
sc->sc_tjmax = 100;
if ((model == 0x0f && stepping >= 2) || (model == 0x0e)) {
+ /*
+ * Check MSR_IA32_PLATFORM_ID(0x17) bit 28. It's not documented
+ * in the datasheet, but the following page describes the
+ * detail:
+ * http://software.intel.com/en-us/articles/
+ * mobile-intel-core2-processor-detection-table/
+ * Was: http://softwarecommunity.intel.com/Wiki/Mobility/
+ * 720.htm
+ */
+ if (rdmsr_safe(MSR_IA32_PLATFORM_ID, ) != 0)
+ goto notee;
+ if ((model < 0x17) && ((msr & __BIT(28)) == 0))
+ goto notee;
if (rdmsr_safe(MSR_IA32_EXT_CONFIG, ) == EFAULT)
return;
@@ -290,6 +303,7 @@ coretemp_tjmax(device_t self)
} else
sc->sc_tjmax = 90;
} else {
+notee:
/*
* Attempt to get Tj(max) from IA32_TEMPERATURE_TARGET,
* but only consider the interval [70, 110] C as valid.
CVS commit: [netbsd-8] src/sys/arch/x86/x86
Module Name:src Committed By: martin Date: Wed Aug 5 16:05:49 UTC 2020 Modified Files: src/sys/arch/x86/x86 [netbsd-8]: coretemp.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1589): sys/arch/x86/x86/coretemp.c: revision 1.37 Add special handling for model 0x0f stepping >=2 or mode 0x0e to get Tjmax. To generate a diff of this commit: cvs rdiff -u -r1.35.10.1 -r1.35.10.2 src/sys/arch/x86/x86/coretemp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/arch/x86/include
Module Name:src Committed By: martin Date: Wed Aug 5 16:02:53 UTC 2020 Modified Files: src/sys/arch/x86/include [netbsd-8]: specialreg.h Log Message: Pull up the following revisions, requested by msaitoh in ticket #1588: sys/arch/x86/include/specialreg.h 1.162-1.168 via patch - AMD CPUID Fn8000_000a %edx bit 20 is "SPEC_CTRL". - Add some bit definitions of AMD's CPUID Fn8000_001f Encrypted Memory features. - Add AMD INVLPGB/TLBSYNC hypervisor enable in VMCB and TLBSYNC intercept bit. - Add AMD MSR_DE_CFG's bit 1 as DE_CFG_LFENCE_SERIALIZE. - Add some definitions for Intel: - Add CPUID leaf 6 %eax bit 19 for HW_FEEDBACK* and IA32_PACKAGE_TERM* MSRs. - Add CPUID leaf 7 %ecx bit 31 for Protection Keys. - Add definition of Load only TLB and Store only TLB. - Add IF_PSCHANGE_MC_NO bit of IA32_ARCH_CAPABILITIES - Fix HWP_IGNIDL. - Add CPUID 7 %edx bit 9 "SRBDS_CTRL" - Modify comment. Style and fix typo. To generate a diff of this commit: cvs rdiff -u -r1.98.2.19 -r1.98.2.20 src/sys/arch/x86/include/specialreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/arch/x86/include
Module Name:src Committed By: martin Date: Wed Aug 5 16:02:53 UTC 2020 Modified Files: src/sys/arch/x86/include [netbsd-8]: specialreg.h Log Message: Pull up the following revisions, requested by msaitoh in ticket #1588: sys/arch/x86/include/specialreg.h 1.162-1.168 via patch - AMD CPUID Fn8000_000a %edx bit 20 is "SPEC_CTRL". - Add some bit definitions of AMD's CPUID Fn8000_001f Encrypted Memory features. - Add AMD INVLPGB/TLBSYNC hypervisor enable in VMCB and TLBSYNC intercept bit. - Add AMD MSR_DE_CFG's bit 1 as DE_CFG_LFENCE_SERIALIZE. - Add some definitions for Intel: - Add CPUID leaf 6 %eax bit 19 for HW_FEEDBACK* and IA32_PACKAGE_TERM* MSRs. - Add CPUID leaf 7 %ecx bit 31 for Protection Keys. - Add definition of Load only TLB and Store only TLB. - Add IF_PSCHANGE_MC_NO bit of IA32_ARCH_CAPABILITIES - Fix HWP_IGNIDL. - Add CPUID 7 %edx bit 9 "SRBDS_CTRL" - Modify comment. Style and fix typo. To generate a diff of this commit: cvs rdiff -u -r1.98.2.19 -r1.98.2.20 src/sys/arch/x86/include/specialreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/x86/include/specialreg.h diff -u src/sys/arch/x86/include/specialreg.h:1.98.2.19 src/sys/arch/x86/include/specialreg.h:1.98.2.20 --- src/sys/arch/x86/include/specialreg.h:1.98.2.19 Wed Apr 15 14:25:09 2020 +++ src/sys/arch/x86/include/specialreg.h Wed Aug 5 16:02:53 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: specialreg.h,v 1.98.2.19 2020/04/15 14:25:09 martin Exp $ */ +/* $NetBSD: specialreg.h,v 1.98.2.20 2020/08/05 16:02:53 martin Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -247,10 +247,10 @@ ? 0 : (CPUID_TO_EXTMODEL(cpuid) << 4))) /* CPUID Fn0001 %ebx */ -#define CPUID_BRAND_INDEX __BITS(7,0) -#define CPUID_CLFLUSH_SIZE __BITS(15,8) -#define CPUID_HTT_CORES __BITS(23,16) -#define CPUID_LOCAL_APIC_ID __BITS(31,24) +#define CPUID_BRAND_INDEX __BITS(7,0) +#define CPUID_CLFLUSH_SIZE __BITS(15,8) +#define CPUID_HTT_CORES __BITS(23,16) +#define CPUID_LOCAL_APIC_ID __BITS(31,24) /* * Intel Deterministic Cache Parameter Leaf @@ -320,6 +320,7 @@ #define CPUID_DSPM_HWP_PECI __BIT(16) /* HWP PECI override */ #define CPUID_DSPM_HWP_FLEX __BIT(17) /* Flexible HWP */ #define CPUID_DSPM_HWP_FAST __BIT(18) /* Fast access for IA32_HWP_REQUEST */ +#define CPUID_DSPM_HW_FEEDBACK __BIT(19) /* HW_FEEDBACK*, IA32_PACKAGE_TERM* */ #define CPUID_DSPM_HWP_IGNIDL __BIT(20) /* Ignore Idle Logical Processor HWP */ #define CPUID_DSPM_FLAGS "\20" \ @@ -327,8 +328,8 @@ "\5" "PLN" "\6" "ECMD" "\7" "PTM" "\10" "HWP" \ "\11" "HWP_NOTIFY" "\12" "HWP_ACTWIN" "\13" "HWP_EPP" "\14" "HWP_PLR" \ "\16" "HDC" "\17" "TBM3" "\20" "HWP_CAP" \ - "\21" "HWP_PECI" "\22" "HWP_FLEX" "\23" "HWP_FAST" \ - "25" "HWP_IGNIDL" + "\21" "HWP_PECI" "\22" "HWP_FLEX" "\23" "HWP_FAST" "\24HW_FEEDBACK" \ + "\25" "HWP_IGNIDL" /* * Intel/AMD Digital Thermal Sensor and @@ -341,7 +342,7 @@ /* * Intel/AMD Structured Extended Feature leaf Fn_0007 - * %eax == 0: Subleaf 0 + * %ecx == 0: Subleaf 0 * %eax: The Maximum input value for supported subleaf. * %ebx: Feature bits. * %ecx: Feature bits. @@ -413,6 +414,7 @@ #define CPUID_SEF_MOVDIRI __BIT(27) /* MOVDIRI instruction */ #define CPUID_SEF_MOVDIR64B __BIT(28) /* MOVDIR64B instruction */ #define CPUID_SEF_SGXLC __BIT(30) /* SGX Launch Configuration */ +#define CPUID_SEF_PKS __BIT(31) /* Protection Keys */ #define CPUID_SEF_FLAGS1 "\177\20" \ "b\0PREFETCHWT1\0" "b\1AVX512_VBMI\0" "b\2UMIP\0" "b\3PKU\0" \ @@ -422,13 +424,14 @@ "f\21\5MAWAU\0" \ "b\26RDPID\0" \ "b\31CLDEMOTE\0" "b\33MOVDIRI\0" \ - "b\34MOVDIR64B\0" "b\36SGXLC\0" + "b\34MOVDIR64B\0" "b\36SGXLC\0" "b\37PKS\0" /* %edx */ #define CPUID_SEF_AVX512_4VNNIW __BIT(2) #define CPUID_SEF_AVX512_4FMAPS __BIT(3) #define CPUID_SEF_FSREP_MOV __BIT(4) /* Fast Short REP MOV */ #define CPUID_SEF_AVX512_VP2INTERSECT __BIT(8) +#define CPUID_SEF_SRBDS_CTRL __BIT(9) /* IA32_MCU_OPT_CTRL */ #define CPUID_SEF_MD_CLEAR __BIT(10) #define CPUID_SEF_TSX_FORCE_ABORT __BIT(13) /* MSR_TSX_FORCE_ABORT bit 0 */ #define CPUID_SEF_SERIALIZE __BIT(14) @@ -445,7 +448,7 @@ #define CPUID_SEF_FLAGS2 "\20" \ "\3" "AVX512_4VNNIW" "\4" "AVX512_4FMAPS" \ "\5" "FSREP_MOV" \ - "\11" "VP2INTERSECT" "\13" "MD_CLEAR" \ + "\11VP2INTERSECT" "\12SRBDS_CTRL" "\13MD_CLEAR" \ "\16TSX_FORCE_ABORT" "\17SERIALIZE" "\20HYBRID" \ "\21" "TSXLDTRK" \ "\25" "CET_IBT" \ @@ -561,6 +564,8 @@ #define CPUID_DATP_TCTYPE_D 1 /* Data TLB */ #define CPUID_DATP_TCTYPE_I 2 /* Instruction TLB */ #define CPUID_DATP_TCTYPE_U 3 /* Unified TLB */ +#define CPUID_DATP_TCTYPE_L 4 /* Load only TLB */ +#define CPUID_DATP_TCTYPE_S 5 /* Store only TLB */ #define CPUID_DATP_TCLEVEL __BITS(7, 5) /* TLB level (start at 1) */ #define
CVS commit: [netbsd-8] src/sys/dev/pci/ixgbe
Module Name:src
Committed By: martin
Date: Wed Aug 5 15:58:03 UTC 2020
Modified Files:
src/sys/dev/pci/ixgbe [netbsd-8]: ix_txrx.c ixgbe.c ixgbe.h
ixgbe_82598.c ixgbe_common.c ixgbe_netbsd.c ixgbe_osdep.h
ixgbe_phy.c ixgbe_vf.c ixgbe_x550.c ixv.c
Log Message:
Pull up the following revisions, requested by msaitoh in ticket #1587:
sys/dev/pci/ixgbe/ix_txrx.c 1.62-1.63 via patch
sys/dev/pci/ixgbe/ixgbe.c 1.225, 1.228-1.229,
1.232 via patch
sys/dev/pci/ixgbe/ixgbe.h 1.64, 1.66
sys/dev/pci/ixgbe/ixv.c 1.146, 1.148-1.150
via patch
sys/dev/pci/ixgbe/ixgbe_common.c1.27
sys/dev/pci/ixgbe/ixgbe_vf.c1.23
sys/dev/pci/ixgbe/ixgbe_82598.c 1.15
sys/dev/pci/ixgbe/ixgbe_x550.c 1.18
sys/dev/pci/ixgbe/ixgbe_netbsd.c1.14
sys/dev/pci/ixgbe/ixgbe_phy.c 1.21
sys/dev/pci/ixgbe/ixgbe_osdep.h 1.26
- Fix IXGBE_LE32_TO_CPUS() macro for big endian machine. This problem
was only on X550.
- Add debug printf()s.
- Use unsigned to avoid undefined behavior in
ixgbe_fc_enable_generic().
- Modify a little to reduce diff between ixgbe.c and ixv.c.
No functional change.
- Modify comment.
- Remove unused macros.
- Whitespace fix.
- Fix typos.
To generate a diff of this commit:
cvs rdiff -u -r1.24.2.19 -r1.24.2.20 src/sys/dev/pci/ixgbe/ix_txrx.c
cvs rdiff -u -r1.88.2.39 -r1.88.2.40 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.24.6.19 -r1.24.6.20 src/sys/dev/pci/ixgbe/ixgbe.h
cvs rdiff -u -r1.8.8.3 -r1.8.8.4 src/sys/dev/pci/ixgbe/ixgbe_82598.c
cvs rdiff -u -r1.13.2.8 -r1.13.2.9 src/sys/dev/pci/ixgbe/ixgbe_common.c
cvs rdiff -u -r1.6.2.5 -r1.6.2.6 src/sys/dev/pci/ixgbe/ixgbe_netbsd.c
cvs rdiff -u -r1.17.6.6 -r1.17.6.7 src/sys/dev/pci/ixgbe/ixgbe_osdep.h
cvs rdiff -u -r1.11.6.5 -r1.11.6.6 src/sys/dev/pci/ixgbe/ixgbe_phy.c
cvs rdiff -u -r1.12.8.4 -r1.12.8.5 src/sys/dev/pci/ixgbe/ixgbe_vf.c
cvs rdiff -u -r1.5.6.7 -r1.5.6.8 src/sys/dev/pci/ixgbe/ixgbe_x550.c
cvs rdiff -u -r1.56.2.29 -r1.56.2.30 src/sys/dev/pci/ixgbe/ixv.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/ixgbe/ix_txrx.c
diff -u src/sys/dev/pci/ixgbe/ix_txrx.c:1.24.2.19 src/sys/dev/pci/ixgbe/ix_txrx.c:1.24.2.20
--- src/sys/dev/pci/ixgbe/ix_txrx.c:1.24.2.19 Fri Jan 24 18:37:31 2020
+++ src/sys/dev/pci/ixgbe/ix_txrx.c Wed Aug 5 15:58:02 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ix_txrx.c,v 1.24.2.19 2020/01/24 18:37:31 martin Exp $ */
+/* $NetBSD: ix_txrx.c,v 1.24.2.20 2020/08/05 15:58:02 martin Exp $ */
/**
@@ -926,7 +926,7 @@ ixgbe_tx_ctx_setup(struct tx_ring *txr,
vlan_macip_lens |= ip_hlen;
/* No support for offloads for non-L4 next headers */
- switch (ipproto) {
+ switch (ipproto) {
case IPPROTO_TCP:
if (mp->m_pkthdr.csum_flags &
(M_CSUM_TCPv4 | M_CSUM_TCPv6))
@@ -1569,7 +1569,6 @@ ixgbe_setup_receive_ring(struct rx_ring
rxbuf->addr = htole64(rxbuf->pmap->dm_segs[0].ds_addr);
}
-
/* Setup our descriptor indices */
rxr->next_to_check = 0;
rxr->next_to_refresh = 0;
@@ -1625,6 +1624,7 @@ ixgbe_setup_receive_structures(struct ad
struct rx_ring *rxr = adapter->rx_rings;
intj;
+ INIT_DEBUGOUT("ixgbe_setup_receive_structures");
for (j = 0; j < adapter->num_queues; j++, rxr++)
if (ixgbe_setup_receive_ring(rxr))
goto fail;
@@ -2233,7 +2233,7 @@ ixgbe_allocate_queues(struct adapter *ad
/* First, allocate the top level queue structs */
adapter->queues = (struct ix_queue *)malloc(sizeof(struct ix_queue) *
-adapter->num_queues, M_DEVBUF, M_NOWAIT | M_ZERO);
+ adapter->num_queues, M_DEVBUF, M_NOWAIT | M_ZERO);
if (adapter->queues == NULL) {
aprint_error_dev(dev, "Unable to allocate queue memory\n");
error = ENOMEM;
@@ -2300,7 +2300,7 @@ ixgbe_allocate_queues(struct adapter *ad
"Critical Failure setting up transmit buffers\n");
error = ENOMEM;
goto err_tx_desc;
- }
+ }
if (!(adapter->feat_en & IXGBE_FEATURE_LEGACY_TX)) {
/* Allocate a buf ring */
txr->txr_interq = pcq_create(IXGBE_BR_SIZE, KM_SLEEP);
Index: src/sys/dev/pci/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.88.2.39 src/sys/dev/pci/ixgbe/ixgbe.c:1.88.2.40
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.88.2.39 Fri Jan 24 18:37:31 2020
+++ src/sys/dev/pci/ixgbe/ixgbe.c Wed Aug 5 15:58:02 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.88.2.39 2020/01/24 18:37:31 martin Exp $ */
+/* $NetBSD: ixgbe.c,v 1.88.2.40 2020/08/05 15:58:02 martin Exp $ */
CVS commit: [netbsd-8] src/sys/dev/pci/ixgbe
Module Name:src Committed By: martin Date: Wed Aug 5 15:58:03 UTC 2020 Modified Files: src/sys/dev/pci/ixgbe [netbsd-8]: ix_txrx.c ixgbe.c ixgbe.h ixgbe_82598.c ixgbe_common.c ixgbe_netbsd.c ixgbe_osdep.h ixgbe_phy.c ixgbe_vf.c ixgbe_x550.c ixv.c Log Message: Pull up the following revisions, requested by msaitoh in ticket #1587: sys/dev/pci/ixgbe/ix_txrx.c 1.62-1.63 via patch sys/dev/pci/ixgbe/ixgbe.c 1.225, 1.228-1.229, 1.232 via patch sys/dev/pci/ixgbe/ixgbe.h 1.64, 1.66 sys/dev/pci/ixgbe/ixv.c 1.146, 1.148-1.150 via patch sys/dev/pci/ixgbe/ixgbe_common.c1.27 sys/dev/pci/ixgbe/ixgbe_vf.c1.23 sys/dev/pci/ixgbe/ixgbe_82598.c 1.15 sys/dev/pci/ixgbe/ixgbe_x550.c 1.18 sys/dev/pci/ixgbe/ixgbe_netbsd.c1.14 sys/dev/pci/ixgbe/ixgbe_phy.c 1.21 sys/dev/pci/ixgbe/ixgbe_osdep.h 1.26 - Fix IXGBE_LE32_TO_CPUS() macro for big endian machine. This problem was only on X550. - Add debug printf()s. - Use unsigned to avoid undefined behavior in ixgbe_fc_enable_generic(). - Modify a little to reduce diff between ixgbe.c and ixv.c. No functional change. - Modify comment. - Remove unused macros. - Whitespace fix. - Fix typos. To generate a diff of this commit: cvs rdiff -u -r1.24.2.19 -r1.24.2.20 src/sys/dev/pci/ixgbe/ix_txrx.c cvs rdiff -u -r1.88.2.39 -r1.88.2.40 src/sys/dev/pci/ixgbe/ixgbe.c cvs rdiff -u -r1.24.6.19 -r1.24.6.20 src/sys/dev/pci/ixgbe/ixgbe.h cvs rdiff -u -r1.8.8.3 -r1.8.8.4 src/sys/dev/pci/ixgbe/ixgbe_82598.c cvs rdiff -u -r1.13.2.8 -r1.13.2.9 src/sys/dev/pci/ixgbe/ixgbe_common.c cvs rdiff -u -r1.6.2.5 -r1.6.2.6 src/sys/dev/pci/ixgbe/ixgbe_netbsd.c cvs rdiff -u -r1.17.6.6 -r1.17.6.7 src/sys/dev/pci/ixgbe/ixgbe_osdep.h cvs rdiff -u -r1.11.6.5 -r1.11.6.6 src/sys/dev/pci/ixgbe/ixgbe_phy.c cvs rdiff -u -r1.12.8.4 -r1.12.8.5 src/sys/dev/pci/ixgbe/ixgbe_vf.c cvs rdiff -u -r1.5.6.7 -r1.5.6.8 src/sys/dev/pci/ixgbe/ixgbe_x550.c cvs rdiff -u -r1.56.2.29 -r1.56.2.30 src/sys/dev/pci/ixgbe/ixv.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Wed Aug 5 15:54:30 UTC 2020
Modified Files:
src/sys/dev/pci [netbsd-8]: ichsmb.c
Log Message:
Pull up the following revisions, requested by msaitoh in ticket #1586:
sys/dev/pci/ichsmb.c1.66-1.68 via patch
- Add Comet Lake, Whiskey Lake U and Amber Lake Y support.
- Whitespace fix.
To generate a diff of this commit:
cvs rdiff -u -r1.50.6.3 -r1.50.6.4 src/sys/dev/pci/ichsmb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/ichsmb.c
diff -u src/sys/dev/pci/ichsmb.c:1.50.6.3 src/sys/dev/pci/ichsmb.c:1.50.6.4
--- src/sys/dev/pci/ichsmb.c:1.50.6.3 Thu Jul 26 20:32:38 2018
+++ src/sys/dev/pci/ichsmb.c Wed Aug 5 15:54:30 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ichsmb.c,v 1.50.6.3 2018/07/26 20:32:38 snj Exp $ */
+/* $NetBSD: ichsmb.c,v 1.50.6.4 2020/08/05 15:54:30 martin Exp $ */
/* $OpenBSD: ichiic.c,v 1.18 2007/05/03 09:36:26 dlg Exp $ */
/*
@@ -22,7 +22,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.50.6.3 2018/07/26 20:32:38 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.50.6.4 2020/08/05 15:54:30 martin Exp $");
#include
#include
@@ -118,8 +118,10 @@ ichsmb_match(device_t parent, cfdata_t m
case PCI_PRODUCT_INTEL_100SERIES_LP_SMB:
case PCI_PRODUCT_INTEL_2HS_SMB:
case PCI_PRODUCT_INTEL_3HS_SMB:
+ case PCI_PRODUCT_INTEL_3HS_U_SMB:
case PCI_PRODUCT_INTEL_CORE4G_M_SMB:
case PCI_PRODUCT_INTEL_CORE5G_M_SMB:
+ case PCI_PRODUCT_INTEL_CMTLK_SMB:
case PCI_PRODUCT_INTEL_BAYTRAIL_PCU_SMB:
case PCI_PRODUCT_INTEL_BSW_PCU_SMB:
case PCI_PRODUCT_INTEL_APL_SMB:
@@ -237,7 +239,6 @@ ichsmb_chdet(device_t self, device_t chi
if (sc->sc_i2c_device == child)
sc->sc_i2c_device = NULL;
-
}
static int
@@ -282,7 +283,7 @@ ichsmb_i2c_exec(void *cookie, i2c_op_t o
LPCIB_SMB_HS_INTR | LPCIB_SMB_HS_DEVERR |
LPCIB_SMB_HS_BUSERR | LPCIB_SMB_HS_FAILED);
bus_space_barrier(sc->sc_iot, sc->sc_ioh, LPCIB_SMB_HS, 1,
- BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE);
+ BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE);
/* Wait for bus to be idle */
for (retries = 100; retries > 0; retries--) {
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src Committed By: martin Date: Wed Aug 5 15:54:30 UTC 2020 Modified Files: src/sys/dev/pci [netbsd-8]: ichsmb.c Log Message: Pull up the following revisions, requested by msaitoh in ticket #1586: sys/dev/pci/ichsmb.c1.66-1.68 via patch - Add Comet Lake, Whiskey Lake U and Amber Lake Y support. - Whitespace fix. To generate a diff of this commit: cvs rdiff -u -r1.50.6.3 -r1.50.6.4 src/sys/dev/pci/ichsmb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src
Module Name:src
Committed By: martin
Date: Wed Aug 5 15:48:54 UTC 2020
Modified Files:
src/usr.sbin/cpuctl [netbsd-8]: Makefile cpuctl.c cpuctl.h
src/usr.sbin/cpuctl/arch [netbsd-8]: cpuctl_i386.h i386.c
Added Files:
src/sys/arch/x86/x86 [netbsd-8]: identcpu_subr.c
Log Message:
Pull up the following revisions, requested by msaitoh in ticket #1585:
usr.sbin/cpuctl/Makefile1.9
usr.sbin/cpuctl/arch/cpuctl_i386.h 1.5
usr.sbin/cpuctl/arch/i386.c 1.111-1.113 via patch
usr.sbin/cpuctl/cpuctl.c1.31
usr.sbin/cpuctl/cpuctl.h1.7
sys/arch/x86/x86/identcpu_subr.c1.1-1.7
- Get TSC frequency from CPUID 0x15 and/or x16 for newer Intel
processors.
- Add 0xa5 and 0xa6 for Comet Lake.
- Rename ci_cpuid_level to ci_max_cpuid and ci_cpuid_extlevel to
ci_max_ext_cpuid to match x86/include/cpu.h. No functional change.
- Sort some entries.
- Add comment.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.7.4.2 src/sys/arch/x86/x86/identcpu_subr.c
cvs rdiff -u -r1.8 -r1.8.8.1 src/usr.sbin/cpuctl/Makefile
cvs rdiff -u -r1.28.8.1 -r1.28.8.2 src/usr.sbin/cpuctl/cpuctl.c
cvs rdiff -u -r1.5 -r1.5.18.1 src/usr.sbin/cpuctl/cpuctl.h
cvs rdiff -u -r1.2 -r1.2.28.1 src/usr.sbin/cpuctl/arch/cpuctl_i386.h
cvs rdiff -u -r1.74.6.10 -r1.74.6.11 src/usr.sbin/cpuctl/arch/i386.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/cpuctl/Makefile
diff -u src/usr.sbin/cpuctl/Makefile:1.8 src/usr.sbin/cpuctl/Makefile:1.8.8.1
--- src/usr.sbin/cpuctl/Makefile:1.8 Sat Jan 23 21:22:50 2016
+++ src/usr.sbin/cpuctl/Makefile Wed Aug 5 15:48:53 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2016/01/23 21:22:50 christos Exp $
+# $NetBSD: Makefile,v 1.8.8.1 2020/08/05 15:48:53 martin Exp $
.include
@@ -19,6 +19,12 @@ SRCS+= noarch.c
SRCS+= ${MACHINE_ARCH}-asm.S
.endif
+.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386"
+CPPFLAGS+= -I${.CURDIR} -I${.CURDIR}/arch
+.PATH.c: ${NETBSDSRCDIR}/sys/arch/x86/x86
+SRCS+= identcpu_subr.c
+.endif
+
CPPFLAGS+= -D_KERNTYPES
LDADD+=-lutil
DPADD+=${LIBUTIL}
Index: src/usr.sbin/cpuctl/cpuctl.c
diff -u src/usr.sbin/cpuctl/cpuctl.c:1.28.8.1 src/usr.sbin/cpuctl/cpuctl.c:1.28.8.2
--- src/usr.sbin/cpuctl/cpuctl.c:1.28.8.1 Sun May 12 09:21:12 2019
+++ src/usr.sbin/cpuctl/cpuctl.c Wed Aug 5 15:48:53 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cpuctl.c,v 1.28.8.1 2019/05/12 09:21:12 martin Exp $ */
+/* $NetBSD: cpuctl.c,v 1.28.8.2 2020/08/05 15:48:53 martin Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009, 2012, 2015 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#ifndef lint
#include
-__RCSID("$NetBSD: cpuctl.c,v 1.28.8.1 2019/05/12 09:21:12 martin Exp $");
+__RCSID("$NetBSD: cpuctl.c,v 1.28.8.2 2020/08/05 15:48:53 martin Exp $");
#endif /* not lint */
#include
@@ -383,3 +383,4 @@ aprint_normal_dev(const char *dev, const
}
__strong_alias(aprint_verbose_dev,aprint_normal_dev)
__strong_alias(aprint_error_dev,aprint_normal_dev)
+__strong_alias(aprint_debug_dev,aprint_normal_dev)
Index: src/usr.sbin/cpuctl/cpuctl.h
diff -u src/usr.sbin/cpuctl/cpuctl.h:1.5 src/usr.sbin/cpuctl/cpuctl.h:1.5.18.1
--- src/usr.sbin/cpuctl/cpuctl.h:1.5 Mon Dec 23 12:35:33 2013
+++ src/usr.sbin/cpuctl/cpuctl.h Wed Aug 5 15:48:53 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cpuctl.h,v 1.5 2013/12/23 12:35:33 msaitoh Exp $ */
+/* $NetBSD: cpuctl.h,v 1.5.18.1 2020/08/05 15:48:53 martin Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -26,12 +26,15 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#include
+
int aprint_normal(const char *, ...) __printflike(1, 2);
int aprint_verbose(const char *, ...) __printflike(1, 2);
int aprint_error(const char *, ...) __printflike(1, 2);
int aprint_normal_dev(const char *, const char *, ...) __printflike(2, 3);
int aprint_verbose_dev(const char *, const char *, ...) __printflike(2, 3);
int aprint_error_dev(const char *, const char *, ...) __printflike(2, 3);
+int aprint_debug_dev(const char *, const char *, ...) __printflike(2, 3);
void identifycpu(int, const char *);
int ucodeupdate_check(int, struct cpu_ucode *);
Index: src/usr.sbin/cpuctl/arch/cpuctl_i386.h
diff -u src/usr.sbin/cpuctl/arch/cpuctl_i386.h:1.2 src/usr.sbin/cpuctl/arch/cpuctl_i386.h:1.2.28.1
--- src/usr.sbin/cpuctl/arch/cpuctl_i386.h:1.2 Mon Jan 7 23:20:42 2013
+++ src/usr.sbin/cpuctl/arch/cpuctl_i386.h Wed Aug 5 15:48:53 2020
@@ -1,4 +1,50 @@
-/* $NetBSD: cpuctl_i386.h,v 1.2 2013/01/07 23:20:42 dsl Exp $ */
+/* $NetBSD: cpuctl_i386.h,v 1.2.28.1 2020/08/05 15:48:53 martin Exp $ */
+
+#include
+#include
+#include
+
+struct cpu_info {
+ const char *ci_dev;
+ int32_t ci_cpu_type; /* for cpu's without cpuid */
+ uint32_t ci_signature; /* X86 cpuid type */
+ uint32_t
CVS commit: [netbsd-8] src
Module Name:src Committed By: martin Date: Wed Aug 5 15:48:54 UTC 2020 Modified Files: src/usr.sbin/cpuctl [netbsd-8]: Makefile cpuctl.c cpuctl.h src/usr.sbin/cpuctl/arch [netbsd-8]: cpuctl_i386.h i386.c Added Files: src/sys/arch/x86/x86 [netbsd-8]: identcpu_subr.c Log Message: Pull up the following revisions, requested by msaitoh in ticket #1585: usr.sbin/cpuctl/Makefile1.9 usr.sbin/cpuctl/arch/cpuctl_i386.h 1.5 usr.sbin/cpuctl/arch/i386.c 1.111-1.113 via patch usr.sbin/cpuctl/cpuctl.c1.31 usr.sbin/cpuctl/cpuctl.h1.7 sys/arch/x86/x86/identcpu_subr.c1.1-1.7 - Get TSC frequency from CPUID 0x15 and/or x16 for newer Intel processors. - Add 0xa5 and 0xa6 for Comet Lake. - Rename ci_cpuid_level to ci_max_cpuid and ci_cpuid_extlevel to ci_max_ext_cpuid to match x86/include/cpu.h. No functional change. - Sort some entries. - Add comment. To generate a diff of this commit: cvs rdiff -u -r0 -r1.7.4.2 src/sys/arch/x86/x86/identcpu_subr.c cvs rdiff -u -r1.8 -r1.8.8.1 src/usr.sbin/cpuctl/Makefile cvs rdiff -u -r1.28.8.1 -r1.28.8.2 src/usr.sbin/cpuctl/cpuctl.c cvs rdiff -u -r1.5 -r1.5.18.1 src/usr.sbin/cpuctl/cpuctl.h cvs rdiff -u -r1.2 -r1.2.28.1 src/usr.sbin/cpuctl/arch/cpuctl_i386.h cvs rdiff -u -r1.74.6.10 -r1.74.6.11 src/usr.sbin/cpuctl/arch/i386.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/server/xorg-server/hw
Module Name:src
Committed By: tsutsui
Date: Wed Aug 5 15:48:09 UTC 2020
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k: Makefile
src/external/mit/xorg/server/xorg-server/hw/sun: Makefile.Xsun
src/external/mit/xorg/server/xorg-server/hw/vfb: Makefile
src/external/mit/xorg/server/xorg-server/hw/xnest: Makefile
Log Message:
No need to build fbcmap_mi.c in each DDX server.
Per upstream commit:
https://cgit.freedesktop.org/xorg/xserver/commit/?id=432fc37e2ca833f1ec3cb614cbdc3a7ae13f22b7
> Build fbcmap_mi.c once, rather than once for each DDX, and make it part of
> libfb
> or libwfb convenience library.
Tested on sun3 and x68k.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun
cvs rdiff -u -r1.18 -r1.19 \
src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile
cvs rdiff -u -r1.22 -r1.23 \
src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.8 src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.9
--- src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.8 Wed Jul 22 21:25:03 2020
+++ src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile Wed Aug 5 15:48:09 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2020/07/22 21:25:03 tsutsui Exp $
+# $NetBSD: Makefile,v 1.9 2020/08/05 15:48:09 tsutsui Exp $
.include
@@ -25,9 +25,6 @@ SRCS+= stubs.c
.PATH: ${X11SRCDIR.xorg-server}/mi
SRCS+= miinitext.c
-.PATH: ${X11SRCDIR.xorg-server}/fb
-SRCS+= fbcmap_mi.c
-
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/netbsd/x68k \
${X11INCS.DIX}
Index: src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun
diff -u src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.4 src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.5
--- src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.4 Tue Aug 4 14:31:58 2020
+++ src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun Wed Aug 5 15:48:09 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.Xsun,v 1.4 2020/08/04 14:31:58 tsutsui Exp $
+# $NetBSD: Makefile.Xsun,v 1.5 2020/08/05 15:48:09 tsutsui Exp $
.include
@@ -70,9 +70,6 @@ SRCS+= sunFbs.c sunIo.c sunKbd.c sunKeyM
.PATH: ${X11SRCDIR.xorg-server}/Xi
SRCS+= stubs.c
-.PATH: ${X11SRCDIR.xorg-server}/fb
-SRCS+= fbcmap_mi.c
-
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/sun \
${X11INCS.DIX}
Index: src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.18 src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.19
--- src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.18 Mon Dec 31 11:14:04 2018
+++ src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile Wed Aug 5 15:48:09 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2018/12/31 11:14:04 mrg Exp $
+# $NetBSD: Makefile,v 1.19 2020/08/05 15:48:09 tsutsui Exp $
.include
@@ -13,10 +13,6 @@ PROG= Xvfb
.PATH: ${X11SRCDIR.xorg-server}/mi
SRCS= InitInput.c InitOutput.c miinitext.c stubs.c
-# XXX should not be needed now
-#.PATH: ${X11SRCDIR.xorg-server}/fb
-#SRCS+= fbcmap_mi.c
-
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 \
-I${X11SRCDIR.xorg-server}/fb \
-I${X11SRCDIR.xorg-server}/mfb \
Index: src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.22 src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.23
--- src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.22 Mon Jul 20 13:59:57 2020
+++ src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile Wed Aug 5 15:48:09 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2020/07/20 13:59:57 tsutsui Exp $
+# $NetBSD: Makefile,v 1.23 2020/08/05 15:48:09 tsutsui Exp $
.include
@@ -16,8 +16,7 @@ PROG= Xnest
SRCS= Args.c Color.c Cursor.c Display.c Events.c Font.c \
GC.c GCOps.c Handlers.c Init.c Keyboard.c \
Pixmap.c Pointer.c Screen.c Visual.c Window.c \
- stubs.c miinitext.c \
- fbcmap_mi.c
+ stubs.c miinitext.c
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xnest \
-I${DESTDIR}${X11INCDIR}/X11 \
CVS commit: src/external/mit/xorg/server/xorg-server/hw
Module Name:src Committed By: tsutsui Date: Wed Aug 5 15:48:09 UTC 2020 Modified Files: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k: Makefile src/external/mit/xorg/server/xorg-server/hw/sun: Makefile.Xsun src/external/mit/xorg/server/xorg-server/hw/vfb: Makefile src/external/mit/xorg/server/xorg-server/hw/xnest: Makefile Log Message: No need to build fbcmap_mi.c in each DDX server. Per upstream commit: https://cgit.freedesktop.org/xorg/xserver/commit/?id=432fc37e2ca833f1ec3cb614cbdc3a7ae13f22b7 > Build fbcmap_mi.c once, rather than once for each DDX, and make it part of > libfb > or libwfb convenience library. Tested on sun3 and x68k. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 \ src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile cvs rdiff -u -r1.4 -r1.5 \ src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun cvs rdiff -u -r1.18 -r1.19 \ src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile cvs rdiff -u -r1.22 -r1.23 \ src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/x86/include
Module Name:src Committed By: maxv Date: Wed Aug 5 15:40:46 UTC 2020 Modified Files: src/sys/arch/x86/include: specialreg.h Log Message: Add new fields here and there. To generate a diff of this commit: cvs rdiff -u -r1.170 -r1.171 src/sys/arch/x86/include/specialreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/x86/include/specialreg.h diff -u src/sys/arch/x86/include/specialreg.h:1.170 src/sys/arch/x86/include/specialreg.h:1.171 --- src/sys/arch/x86/include/specialreg.h:1.170 Mon Jul 20 05:50:55 2020 +++ src/sys/arch/x86/include/specialreg.h Wed Aug 5 15:40:46 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: specialreg.h,v 1.170 2020/07/20 05:50:55 maxv Exp $ */ +/* $NetBSD: specialreg.h,v 1.171 2020/08/05 15:40:46 maxv Exp $ */ /* * Copyright (c) 2014-2020 The NetBSD Foundation, Inc. @@ -109,6 +109,7 @@ #define CR4_OSFXSR 0x0200 /* enable fxsave/fxrestor and SSE */ #define CR4_OSXMMEXCPT 0x0400 /* enable unmasked SSE exceptions */ #define CR4_UMIP 0x0800 /* user-mode instruction prevention */ +#define CR4_LA57 0x1000 /* 57-bit linear addresses */ #define CR4_VMXE 0x2000 /* enable VMX operations */ #define CR4_SMXE 0x4000 /* enable SMX operations */ #define CR4_FSGSBASE 0x0001 /* enable *FSBASE and *GSBASE instructions */ @@ -116,7 +117,9 @@ #define CR4_OSXSAVE 0x0004 /* enable xsave and xrestore */ #define CR4_SMEP 0x0010 /* enable SMEP support */ #define CR4_SMAP 0x0020 /* enable SMAP support */ -#define CR4_PKE 0x0040 /* protection key enable */ +#define CR4_PKE 0x0040 /* enable Protection Keys for user pages */ +#define CR4_CET 0x0080 /* enable CET */ +#define CR4_PKS 0x0100 /* enable Protection Keys for kern pages */ /* * Extended Control Register XCR0 @@ -131,13 +134,17 @@ #define XCR0_Hi16_ZMM 0x0080 /* AVX-512 512 bits upper registers */ #define XCR0_PT 0x0100 /* Processor Trace state */ #define XCR0_PKRU 0x0200 /* Protection Key state */ +#define XCR0_CET_U 0x0800 /* User CET state */ +#define XCR0_CET_S 0x1000 /* Kern CET state */ #define XCR0_HDC 0x2000 /* Hardware Duty Cycle state */ +#define XCR0_HWP 0x0001 /* Hardware P-states */ #define XCR0_FLAGS1 "\20" \ "\1" "x87" "\2" "SSE" "\3" "AVX" \ "\4" "BNDREGS" "\5" "BNDCSR" "\6" "Opmask" \ "\7" "ZMM_Hi256" "\10" "Hi16_ZMM" "\11" "PT" \ - "\12" "PKRU" "\16" "HDC" + "\12" "PKRU" "\14" "CET_U" "\15" "CET_S" \ + "\16" "HDC" "\21" "HWP" /* * Known FPU bits, only these get enabled. The save area is sized for all the @@ -147,7 +154,7 @@ XCR0_Opmask | XCR0_ZMM_Hi256 | XCR0_Hi16_ZMM) /* - * XSAVE component indices. + * XSAVE component indices, internal to NetBSD. */ #define XSAVE_X87 0 #define XSAVE_SSE 1 @@ -157,9 +164,6 @@ #define XSAVE_Opmask 5 #define XSAVE_ZMM_Hi256 6 #define XSAVE_Hi16_ZMM 7 -#define XSAVE_PT 8 -#define XSAVE_PKRU 9 -#define XSAVE_HDC 10 /* * Highest XSAVE component enabled by XCR0_FPU. @@ -448,7 +452,7 @@ #define CPUID_SEF_OSPKE __BIT(4) /* OS has set CR4.PKE to ena. protec. keys */ #define CPUID_SEF_WAITPKG __BIT(5) /* TPAUSE,UMONITOR,UMWAIT */ #define CPUID_SEF_AVX512_VBMI2 __BIT(6) /* AVX-512 Vector Byte Manipulation 2 */ -#define CPUID_SEF_CET_SS __BIT(7) /* CET shadow stack */ +#define CPUID_SEF_CET_SS __BIT(7) /* CET Shadow Stack */ #define CPUID_SEF_GFNI __BIT(8) #define CPUID_SEF_VAES __BIT(9) #define CPUID_SEF_VPCLMULQDQ __BIT(10) @@ -461,7 +465,7 @@ #define CPUID_SEF_MOVDIRI __BIT(27) /* MOVDIRI instruction */ #define CPUID_SEF_MOVDIR64B __BIT(28) /* MOVDIR64B instruction */ #define CPUID_SEF_SGXLC __BIT(30) /* SGX Launch Configuration */ -#define CPUID_SEF_PKS __BIT(31) /* Protection Keys */ +#define CPUID_SEF_PKS __BIT(31) /* Protection Keys for Kern-mode pages */ #define CPUID_SEF_FLAGS1 "\177\20" \ "b\0PREFETCHWT1\0" "b\1AVX512_VBMI\0" "b\2UMIP\0" "b\3PKU\0" \ @@ -481,7 +485,7 @@ #define CPUID_SEF_SRBDS_CTRL __BIT(9) /* IA32_MCU_OPT_CTRL */ #define CPUID_SEF_MD_CLEAR __BIT(10) #define CPUID_SEF_TSX_FORCE_ABORT __BIT(13) /* MSR_TSX_FORCE_ABORT bit 0 */ -#define CPUID_SEF_SERIALIZE __BIT(14) +#define CPUID_SEF_SERIALIZE __BIT(14) /* SERIALIZE instruction */ #define CPUID_SEF_HYBRID __BIT(15) /* Hybrid part */ #define CPUID_SEF_TSXLDTRK __BIT(16) /* TSX suspend load addr tracking */ #define CPUID_SEF_CET_IBT __BIT(20) /* CET Indirect Branch Tracking */
CVS commit: src/sys/arch/x86/include
Module Name:src Committed By: maxv Date: Wed Aug 5 15:40:46 UTC 2020 Modified Files: src/sys/arch/x86/include: specialreg.h Log Message: Add new fields here and there. To generate a diff of this commit: cvs rdiff -u -r1.170 -r1.171 src/sys/arch/x86/include/specialreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/nvmm/x86
Module Name:src Committed By: maxv Date: Wed Aug 5 15:38:28 UTC 2020 Modified Files: src/sys/dev/nvmm/x86: nvmm_x86.c Log Message: Improve the CPUID emulation: - Hide SGX*, PKU, WAITPKG, and SKINIT, because they are not supported. - Hide HLE and RTM, part of TSX. Because TSX is just too buggy and we cannot guarantee that it remains enabled in the guest (if for example the host disables TSX while the guest is running). Nobody wants this crap anyway, so bye-bye. - Advertise FSREP_MOV, because no reason to hide it. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/dev/nvmm/x86/nvmm_x86.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/nvmm/x86
Module Name:src Committed By: maxv Date: Wed Aug 5 15:38:28 UTC 2020 Modified Files: src/sys/dev/nvmm/x86: nvmm_x86.c Log Message: Improve the CPUID emulation: - Hide SGX*, PKU, WAITPKG, and SKINIT, because they are not supported. - Hide HLE and RTM, part of TSX. Because TSX is just too buggy and we cannot guarantee that it remains enabled in the guest (if for example the host disables TSX while the guest is running). Nobody wants this crap anyway, so bye-bye. - Advertise FSREP_MOV, because no reason to hide it. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/dev/nvmm/x86/nvmm_x86.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/nvmm/x86/nvmm_x86.c diff -u src/sys/dev/nvmm/x86/nvmm_x86.c:1.10 src/sys/dev/nvmm/x86/nvmm_x86.c:1.11 --- src/sys/dev/nvmm/x86/nvmm_x86.c:1.10 Wed Aug 5 15:16:50 2020 +++ src/sys/dev/nvmm/x86/nvmm_x86.c Wed Aug 5 15:38:28 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: nvmm_x86.c,v 1.10 2020/08/05 15:16:50 maxv Exp $ */ +/* $NetBSD: nvmm_x86.c,v 1.11 2020/08/05 15:38:28 maxv Exp $ */ /* * Copyright (c) 2018-2020 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: nvmm_x86.c,v 1.10 2020/08/05 15:16:50 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nvmm_x86.c,v 1.11 2020/08/05 15:38:28 maxv Exp $"); #include #include @@ -304,16 +304,16 @@ const struct nvmm_x86_cpuid_mask nvmm_cp .ebx = CPUID_SEF_FSGSBASE | /* CPUID_SEF_TSC_ADJUST excluded */ - CPUID_SEF_SGX | + /* CPUID_SEF_SGX excluded */ CPUID_SEF_BMI1 | - CPUID_SEF_HLE | + /* CPUID_SEF_HLE excluded */ /* CPUID_SEF_AVX2 excluded */ CPUID_SEF_FDPEXONLY | CPUID_SEF_SMEP | CPUID_SEF_BMI2 | CPUID_SEF_ERMS | /* CPUID_SEF_INVPCID excluded, but re-included in VMX */ - CPUID_SEF_RTM | + /* CPUID_SEF_RTM excluded */ /* CPUID_SEF_QM excluded */ CPUID_SEF_FPUCSDS | /* CPUID_SEF_MPX excluded */ @@ -337,9 +337,9 @@ const struct nvmm_x86_cpuid_mask nvmm_cp CPUID_SEF_PREFETCHWT1 | /* CPUID_SEF_AVX512_VBMI excluded */ CPUID_SEF_UMIP | - CPUID_SEF_PKU | + /* CPUID_SEF_PKU excluded */ CPUID_SEF_OSPKE | - CPUID_SEF_WAITPKG | + /* CPUID_SEF_WAITPKG excluded */ /* CPUID_SEF_AVX512_VBMI2 excluded */ /* CPUID_SEF_CET_SS excluded */ CPUID_SEF_GFNI | @@ -352,13 +352,13 @@ const struct nvmm_x86_cpuid_mask nvmm_cp /* CPUID_SEF_RDPID excluded */ CPUID_SEF_CLDEMOTE | CPUID_SEF_MOVDIRI | - CPUID_SEF_MOVDIR64B | - CPUID_SEF_SGXLC, + CPUID_SEF_MOVDIR64B, + /* CPUID_SEF_SGXLC excluded */ /* CPUID_SEF_PKS excluded */ .edx = /* CPUID_SEF_AVX512_4VNNIW excluded */ /* CPUID_SEF_AVX512_4FMAPS excluded */ - /* CPUID_SEF_FSREP_MOV excluded */ + CPUID_SEF_FSREP_MOV | /* CPUID_SEF_AVX512_VP2INTERSECT excluded */ /* CPUID_SEF_SRBDS_CTRL excluded */ CPUID_SEF_MD_CLEAR | @@ -391,7 +391,7 @@ const struct nvmm_x86_cpuid_mask nvmm_cp /* CPUID_OSVW excluded */ CPUID_IBS | CPUID_XOP | - CPUID_SKINIT | + /* CPUID_SKINIT excluded */ CPUID_WDT | CPUID_LWP | CPUID_FMA4 |
CVS commit: src/sys/dev/nvmm/x86
Module Name:src
Committed By: maxv
Date: Wed Aug 5 15:22:25 UTC 2020
Modified Files:
src/sys/dev/nvmm/x86: nvmm_x86_svm.c
Log Message:
Add new field definitions, and intercept everything, for future-proofness.
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/sys/dev/nvmm/x86/nvmm_x86_svm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/nvmm/x86/nvmm_x86_svm.c
diff -u src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.66 src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.67
--- src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.66 Wed Aug 5 10:31:37 2020
+++ src/sys/dev/nvmm/x86/nvmm_x86_svm.c Wed Aug 5 15:22:25 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nvmm_x86_svm.c,v 1.66 2020/08/05 10:31:37 maxv Exp $ */
+/* $NetBSD: nvmm_x86_svm.c,v 1.67 2020/08/05 15:22:25 maxv Exp $ */
/*
* Copyright (c) 2018-2020 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.66 2020/08/05 10:31:37 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.67 2020/08/05 15:22:25 maxv Exp $");
#include
#include
@@ -232,11 +232,16 @@ svm_stgi(void)
#define VMCB_EXITCODE_CR13_WRITE_TRAP 0x009D
#define VMCB_EXITCODE_CR14_WRITE_TRAP 0x009E
#define VMCB_EXITCODE_CR15_WRITE_TRAP 0x009F
+#define VMCB_EXITCODE_INVLPGB 0x00A0
+#define VMCB_EXITCODE_INVLPGB_ILLEGAL 0x00A1
+#define VMCB_EXITCODE_INVPCID 0x00A2
#define VMCB_EXITCODE_MCOMMIT 0x00A3
+#define VMCB_EXITCODE_TLBSYNC 0x00A4
#define VMCB_EXITCODE_NPF 0x0400
#define VMCB_EXITCODE_AVIC_INCOMP_IPI 0x0401
#define VMCB_EXITCODE_AVIC_NOACCEL 0x0402
#define VMCB_EXITCODE_VMGEXIT 0x0403
+#define VMCB_EXITCODE_BUSY -2ULL
#define VMCB_EXITCODE_INVALID -1ULL
/* -- */
@@ -307,7 +312,11 @@ struct vmcb_ctrl {
#define VMCB_CTRL_INTERCEPT_WCR_SPEC(x) __BIT(16 + x)
uint32_t intercept_misc3;
+#define VMCB_CTRL_INTERCEPT_INVLPGB_ALL __BIT(0)
+#define VMCB_CTRL_INTERCEPT_INVLPGB_ILL __BIT(1)
+#define VMCB_CTRL_INTERCEPT_PCID __BIT(2)
#define VMCB_CTRL_INTERCEPT_MCOMMIT __BIT(3)
+#define VMCB_CTRL_INTERCEPT_TLBSYNC __BIT(4)
uint8_t rsvd1[36];
uint16_t pause_filt_thresh;
@@ -335,6 +344,7 @@ struct vmcb_ctrl {
uint64_t intr;
#define VMCB_CTRL_INTR_SHADOW __BIT(0)
+#define VMCB_CTRL_INTR_MASK __BIT(1)
uint64_t exitcode;
uint64_t exitinfo1;
@@ -399,7 +409,7 @@ struct vmcb_ctrl {
#define VMCB_CTRL_AVIC_PHYS_MAX_INDEX __BITS(7,0)
uint64_t rsvd4;
- uint64_t vmcb_ptr;
+ uint64_t vmsa_ptr;
uint8_t pad[752];
} __packed;
@@ -1449,6 +1459,11 @@ svm_vcpu_run(struct nvmm_machine *mach,
case VMCB_EXITCODE_CLGI:
case VMCB_EXITCODE_SKINIT:
case VMCB_EXITCODE_RDTSCP:
+ case VMCB_EXITCODE_RDPRU:
+ case VMCB_EXITCODE_INVLPGB:
+ case VMCB_EXITCODE_INVPCID:
+ case VMCB_EXITCODE_MCOMMIT:
+ case VMCB_EXITCODE_TLBSYNC:
svm_inject_ud(vcpu);
exit->reason = NVMM_VCPU_EXIT_NONE;
break;
@@ -2042,7 +2057,17 @@ svm_vcpu_init(struct nvmm_machine *mach,
VMCB_CTRL_INTERCEPT_RDTSCP |
VMCB_CTRL_INTERCEPT_MONITOR |
VMCB_CTRL_INTERCEPT_MWAIT |
- VMCB_CTRL_INTERCEPT_XSETBV;
+ VMCB_CTRL_INTERCEPT_XSETBV |
+ VMCB_CTRL_INTERCEPT_RDPRU;
+
+ /*
+ * Intercept everything.
+ */
+ vmcb->ctrl.intercept_misc3 =
+ VMCB_CTRL_INTERCEPT_INVLPGB_ALL |
+ VMCB_CTRL_INTERCEPT_PCID |
+ VMCB_CTRL_INTERCEPT_MCOMMIT |
+ VMCB_CTRL_INTERCEPT_TLBSYNC;
/* Intercept all I/O accesses. */
memset(cpudata->iobm, 0xFF, IOBM_SIZE);
CVS commit: src/sys/dev/nvmm/x86
Module Name:src Committed By: maxv Date: Wed Aug 5 15:22:25 UTC 2020 Modified Files: src/sys/dev/nvmm/x86: nvmm_x86_svm.c Log Message: Add new field definitions, and intercept everything, for future-proofness. To generate a diff of this commit: cvs rdiff -u -r1.66 -r1.67 src/sys/dev/nvmm/x86/nvmm_x86_svm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Wed Aug 5 15:20:21 UTC 2020 Modified Files: src/doc [netbsd-9]: CHANGES-9.1 Log Message: Tickets #1036 - #1041 To generate a diff of this commit: cvs rdiff -u -r1.1.2.89 -r1.1.2.90 src/doc/CHANGES-9.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.1 diff -u src/doc/CHANGES-9.1:1.1.2.89 src/doc/CHANGES-9.1:1.1.2.90 --- src/doc/CHANGES-9.1:1.1.2.89 Wed Aug 5 13:48:13 2020 +++ src/doc/CHANGES-9.1 Wed Aug 5 15:20:21 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.1,v 1.1.2.89 2020/08/05 13:48:13 martin Exp $ +# $NetBSD: CHANGES-9.1,v 1.1.2.90 2020/08/05 15:20:21 martin Exp $ A complete list of changes from the NetBSD 9.0 release to the NetBSD 9.1 release: @@ -3972,3 +3972,49 @@ sys/arch/hppa/dev/wax.c1.2 request register in attach. [skrll, ticket #1035] +distrib/notes/common/main 1.563 +distrib/notes/evbarm/hardware 1.17,1.22 +distrib/notes/evbarm/xfer 1.5 + + Note support for TI AM335x SoC. + List all supported Amlogic SoCs. + Remove Arm OABI -> EABI change notice. + [nia, ticket #1036] + +sys/dev/dev_verbose.h1.3 + + PR 55535: make built-in verbose modules available before the + start of the autoconfiguration. + [uwe, ticket #1037] + +sys/dev/pci/if_ena.c1.25 + + PR 55532: do not mark callout and workqueues as mpsafe unless + the NET_MPSAFE option is present. + [jmcneill, ticket #1038] + +sys/arch/hppa/dev/cpu.c1.2 +sys/arch/hppa/hppa/fpu.c 1.27 + + hppa: allow booting on QEMU without a FPU. + [skrll, ticket #1039] + +sys/dev/mii/igphy.c1.35,1.36 +sys/dev/mii/igphyreg.h1.12 +sys/dev/mii/igphyreg.h1.13 +sys/dev/mii/makphy.c1.66 +sys/dev/mii/makphyreg.h1.11 +sys/dev/pci/if_wm.c1.682-1.685 + + - Setup PCS and SGMII for SFP correctly. + - Explicitly cast from uint16_t to uint32_t before shifting 16bit left + when printing Image Unique ID to avoid undefined behavior. + - Set if_baudrate for non-MII device. + [msaitoh, ticket #1040] + +sys/dev/nvmm/x86/nvmm_x86_svm.c 1.55,1.56,1.66 +sys/dev/nvmm/x86/nvmm_x86_vmx.c 1.46,1.49,1.50,1.66 + + No real functional changes, reduce diff to -current. + [maxv, ticket #1041] +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Wed Aug 5 15:20:21 UTC 2020 Modified Files: src/doc [netbsd-9]: CHANGES-9.1 Log Message: Tickets #1036 - #1041 To generate a diff of this commit: cvs rdiff -u -r1.1.2.89 -r1.1.2.90 src/doc/CHANGES-9.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/nvmm/x86
Module Name:src Committed By: maxv Date: Wed Aug 5 15:20:09 UTC 2020 Modified Files: src/sys/dev/nvmm/x86: nvmm_x86_vmx.c Log Message: Add new field definitions. To generate a diff of this commit: cvs rdiff -u -r1.66 -r1.67 src/sys/dev/nvmm/x86/nvmm_x86_vmx.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/nvmm/x86
Module Name:src Committed By: maxv Date: Wed Aug 5 15:20:09 UTC 2020 Modified Files: src/sys/dev/nvmm/x86: nvmm_x86_vmx.c Log Message: Add new field definitions. To generate a diff of this commit: cvs rdiff -u -r1.66 -r1.67 src/sys/dev/nvmm/x86/nvmm_x86_vmx.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/nvmm/x86/nvmm_x86_vmx.c diff -u src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.66 src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.67 --- src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.66 Wed Aug 5 10:20:50 2020 +++ src/sys/dev/nvmm/x86/nvmm_x86_vmx.c Wed Aug 5 15:20:09 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: nvmm_x86_vmx.c,v 1.66 2020/08/05 10:20:50 maxv Exp $ */ +/* $NetBSD: nvmm_x86_vmx.c,v 1.67 2020/08/05 15:20:09 maxv Exp $ */ /* * Copyright (c) 2018-2020 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_vmx.c,v 1.66 2020/08/05 10:20:50 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_vmx.c,v 1.67 2020/08/05 15:20:09 maxv Exp $"); #include #include @@ -223,11 +223,16 @@ vmx_sti(void) #define MSR_IA32_VMX_CR4_FIXED1 0x0489 #define MSR_IA32_VMX_EPT_VPID_CAP 0x048C +#define IA32_VMX_EPT_VPID_XO __BIT(0) #define IA32_VMX_EPT_VPID_WALKLENGTH_4 __BIT(6) #define IA32_VMX_EPT_VPID_UC __BIT(8) #define IA32_VMX_EPT_VPID_WB __BIT(14) +#define IA32_VMX_EPT_VPID_2MB __BIT(16) +#define IA32_VMX_EPT_VPID_1GB __BIT(17) #define IA32_VMX_EPT_VPID_INVEPT __BIT(20) #define IA32_VMX_EPT_VPID_FLAGS_AD __BIT(21) +#define IA32_VMX_EPT_VPID_ADVANCED_VMEXIT_INFO __BIT(22) +#define IA32_VMX_EPT_VPID_SHSTK __BIT(23) #define IA32_VMX_EPT_VPID_INVEPT_CONTEXT __BIT(25) #define IA32_VMX_EPT_VPID_INVEPT_ALL __BIT(26) #define IA32_VMX_EPT_VPID_INVVPID __BIT(32) @@ -281,6 +286,7 @@ vmx_sti(void) #define EPTP_TYPE_WB 6 #define EPTP_WALKLEN __BITS(5,3) #define EPTP_FLAGS_AD __BIT(6) +#define EPTP_SSS __BIT(7) #define EPTP_PHYSADDR __BITS(63,12) #define VMCS_EOI_EXIT00x201C #define VMCS_EOI_EXIT10x201E @@ -294,6 +300,7 @@ vmx_sti(void) #define VMCS_ENCLS_EXIT_BITMAP 0x202E #define VMCS_SUBPAGE_PERM_TABLE_PTR 0x2030 #define VMCS_TSC_MULTIPLIER 0x2032 +#define VMCS_ENCLV_EXIT_BITMAP 0x2036 /* 64-bit read-only fields */ #define VMCS_GUEST_PHYSICAL_ADDRESS 0x2400 /* 64-bit guest-state fields */ @@ -307,10 +314,13 @@ vmx_sti(void) #define VMCS_GUEST_PDPTE2 0x280E #define VMCS_GUEST_PDPTE3 0x2810 #define VMCS_GUEST_BNDCFGS 0x2812 +#define VMCS_GUEST_RTIT_CTL 0x2814 +#define VMCS_GUEST_PKRS0x2818 /* 64-bit host-state fields */ #define VMCS_HOST_IA32_PAT 0x2C00 #define VMCS_HOST_IA32_EFER 0x2C02 #define VMCS_HOST_IA32_PERF_GLOBAL_CTRL 0x2C04 +#define VMCS_HOST_IA32_PKRS 0x2C06 /* 32-bit control fields */ #define VMCS_PINBASED_CTLS 0x4000 #define PIN_CTLS_INT_EXITING __BIT(0) @@ -356,6 +366,9 @@ vmx_sti(void) #define EXIT_CTLS_SAVE_PREEMPT_TIMER __BIT(22) #define EXIT_CTLS_CLEAR_BNDCFGS __BIT(23) #define EXIT_CTLS_CONCEAL_PT __BIT(24) +#define EXIT_CTLS_CLEAR_RTIT_CTL __BIT(25) +#define EXIT_CTLS_LOAD_CET __BIT(28) +#define EXIT_CTLS_LOAD_PKRS __BIT(29) #define VMCS_EXIT_MSR_STORE_COUNT 0x400E #define VMCS_EXIT_MSR_LOAD_COUNT 0x4010 #define VMCS_ENTRY_CTLS0x4012 @@ -368,6 +381,9 @@ vmx_sti(void) #define ENTRY_CTLS_LOAD_EFER __BIT(15) #define ENTRY_CTLS_LOAD_BNDCFGS __BIT(16) #define ENTRY_CTLS_CONCEAL_PT __BIT(17) +#define ENTRY_CTLS_LOAD_RTIT_CTL __BIT(18) +#define ENTRY_CTLS_LOAD_CET __BIT(20) +#define ENTRY_CTLS_LOAD_PKRS __BIT(22) #define VMCS_ENTRY_MSR_LOAD_COUNT 0x4014 #define VMCS_ENTRY_INTR_INFO 0x4016 #define INTR_INFO_VECTOR __BITS(7,0) @@ -408,7 +424,9 @@ vmx_sti(void) #define PROC_CTLS2_XSAVES_ENABLE __BIT(20) #define PROC_CTLS2_MODE_BASED_EXEC_EPT __BIT(22) #define PROC_CTLS2_SUBPAGE_PERMISSIONS __BIT(23) +#define PROC_CTLS2_PT_USES_GPA __BIT(24) #define PROC_CTLS2_USE_TSC_SCALING __BIT(25) +#define PROC_CTLS2_WAIT_PAUSE_ENABLE __BIT(26) #define PROC_CTLS2_ENCLV_EXITING __BIT(28) #define VMCS_PLE_GAP0x4020 #define VMCS_PLE_WINDOW0x4022 @@ -489,6 +507,9 @@ vmx_sti(void) #define VMCS_GUEST_PENDING_DBG_EXCEPTIONS 0x6822 #define VMCS_GUEST_IA32_SYSENTER_ESP 0x6824 #define VMCS_GUEST_IA32_SYSENTER_EIP 0x6826 +#define VMCS_GUEST_IA32_S_CET 0x6828 +#define VMCS_GUEST_SSP0x682A +#define VMCS_GUEST_IA32_INTR_SSP_TABLE 0x682C /* Natural-Width host-state fields */ #define VMCS_HOST_CR00x6C00 #define VMCS_HOST_CR30x6C02 @@ -502,6 +523,9 @@ vmx_sti(void) #define VMCS_HOST_IA32_SYSENTER_EIP 0x6C12 #define VMCS_HOST_RSP0x6C14 #define VMCS_HOST_RIP0x6C16 +#define VMCS_HOST_IA32_S_CET 0x6C18 +#define VMCS_HOST_SSP0x6C1A
CVS commit: [netbsd-9] src/sys/dev/nvmm/x86
Module Name:src
Committed By: martin
Date: Wed Aug 5 15:18:24 UTC 2020
Modified Files:
src/sys/dev/nvmm/x86 [netbsd-9]: nvmm_x86_svm.c nvmm_x86_vmx.c
Log Message:
Pull up following revision(s) (requested by maxv in ticket #1041):
sys/dev/nvmm/x86/nvmm_x86_vmx.c: revision 1.66
sys/dev/nvmm/x86/nvmm_x86_vmx.c: revision 1.50
sys/dev/nvmm/x86/nvmm_x86_svm.c: revision 1.66
sys/dev/nvmm/x86/nvmm_x86_vmx.c: revision 1.46
sys/dev/nvmm/x86/nvmm_x86_vmx.c: revision 1.49
sys/dev/nvmm/x86/nvmm_x86_svm.c: revision 1.55
sys/dev/nvmm/x86/nvmm_x86_svm.c: revision 1.56
pg->phys_addr > VM_PAGE_TO_PHYS(pg)
Explicitly cast pointers to uintptr_t before casting to enums. They are
not necessarily the same size. Don't cast pointers to bool, check for
NULL instead.
vmx_vmptrst(): only used when DIAGNOSTIC
Simplify, remove unnecessary #ifdef DIAGNOSTIC around KASSERTs.
Use ULL, to make it clear we are unsigned.
To generate a diff of this commit:
cvs rdiff -u -r1.46.4.6 -r1.46.4.7 src/sys/dev/nvmm/x86/nvmm_x86_svm.c
cvs rdiff -u -r1.36.2.8 -r1.36.2.9 src/sys/dev/nvmm/x86/nvmm_x86_vmx.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/nvmm/x86/nvmm_x86_svm.c
diff -u src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.46.4.6 src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.46.4.7
--- src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.46.4.6 Sun Aug 2 08:49:08 2020
+++ src/sys/dev/nvmm/x86/nvmm_x86_svm.c Wed Aug 5 15:18:24 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nvmm_x86_svm.c,v 1.46.4.6 2020/08/02 08:49:08 martin Exp $ */
+/* $NetBSD: nvmm_x86_svm.c,v 1.46.4.7 2020/08/05 15:18:24 martin Exp $ */
/*
* Copyright (c) 2018-2019 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.46.4.6 2020/08/02 08:49:08 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.46.4.7 2020/08/05 15:18:24 martin Exp $");
#include
#include
@@ -225,7 +225,7 @@ int svm_vmrun(paddr_t, uint64_t *);
#define VMCB_EXITCODE_AVIC_INCOMP_IPI 0x0401
#define VMCB_EXITCODE_AVIC_NOACCEL 0x0402
#define VMCB_EXITCODE_VMGEXIT 0x0403
-#define VMCB_EXITCODE_INVALID -1
+#define VMCB_EXITCODE_INVALID -1ULL
/* -- */
@@ -1507,7 +1507,7 @@ svm_memalloc(paddr_t *pa, vaddr_t *va, s
, 1, 0);
if (ret != 0)
return ENOMEM;
- _pa = TAILQ_FIRST()->phys_addr;
+ _pa = VM_PAGE_TO_PHYS(TAILQ_FIRST());
_va = uvm_km_alloc(kernel_map, npages * PAGE_SIZE, 0,
UVM_KMF_VAONLY | UVM_KMF_NOWAIT);
if (_va == 0)
@@ -2337,7 +2337,7 @@ svm_init_asid(uint32_t maxasid)
static void
svm_change_cpu(void *arg1, void *arg2)
{
- bool enable = (bool)arg1;
+ bool enable = arg1 != NULL;
uint64_t msr;
msr = rdmsr(MSR_VMCR);
Index: src/sys/dev/nvmm/x86/nvmm_x86_vmx.c
diff -u src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.36.2.8 src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.36.2.9
--- src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.36.2.8 Sun Aug 2 08:49:08 2020
+++ src/sys/dev/nvmm/x86/nvmm_x86_vmx.c Wed Aug 5 15:18:24 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nvmm_x86_vmx.c,v 1.36.2.8 2020/08/02 08:49:08 martin Exp $ */
+/* $NetBSD: nvmm_x86_vmx.c,v 1.36.2.9 2020/08/05 15:18:24 martin Exp $ */
/*
* Copyright (c) 2018-2019 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_vmx.c,v 1.36.2.8 2020/08/02 08:49:08 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_vmx.c,v 1.36.2.9 2020/08/05 15:18:24 martin Exp $");
#include
#include
@@ -135,6 +135,7 @@ vmx_vmwrite(uint64_t field, uint64_t val
);
}
+#ifdef DIAGNOSTIC
static inline paddr_t
vmx_vmptrst(void)
{
@@ -149,6 +150,7 @@ vmx_vmptrst(void)
return pa;
}
+#endif
static inline void
vmx_vmptrld(paddr_t *pa)
@@ -871,15 +873,11 @@ vmx_vmcs_enter(struct nvmm_cpu *vcpu)
{
struct vmx_cpudata *cpudata = vcpu->cpudata;
struct cpu_info *vmcs_ci;
- paddr_t oldpa __diagused;
cpudata->vmcs_refcnt++;
if (cpudata->vmcs_refcnt > 1) {
-#ifdef DIAGNOSTIC
KASSERT(kpreempt_disabled());
- oldpa = vmx_vmptrst();
- KASSERT(oldpa == cpudata->vmcs_pa);
-#endif
+ KASSERT(vmx_vmptrst() == cpudata->vmcs_pa);
return;
}
@@ -909,9 +907,7 @@ vmx_vmcs_leave(struct nvmm_cpu *vcpu)
struct vmx_cpudata *cpudata = vcpu->cpudata;
KASSERT(kpreempt_disabled());
-#ifdef DIAGNOSTIC
KASSERT(vmx_vmptrst() == cpudata->vmcs_pa);
-#endif
KASSERT(cpudata->vmcs_refcnt > 0);
cpudata->vmcs_refcnt--;
@@ -929,9 +925,7 @@ vmx_vmcs_destroy(struct nvmm_cpu *vcpu)
struct vmx_cpudata *cpudata = vcpu->cpudata;
KASSERT(kpreempt_disabled());
-#ifdef DIAGNOSTIC
KASSERT(vmx_vmptrst() == cpudata->vmcs_pa);
-#endif
KASSERT(cpudata->vmcs_refcnt == 1);
cpudata->vmcs_refcnt--;
@@ -2230,7 +2224,7 @@ vmx_memalloc(paddr_t *pa, vaddr_t *va, s
, 1, 0);
if (ret != 0)
return ENOMEM;
- _pa =
CVS commit: [netbsd-9] src/sys/dev/nvmm/x86
Module Name:src Committed By: martin Date: Wed Aug 5 15:18:24 UTC 2020 Modified Files: src/sys/dev/nvmm/x86 [netbsd-9]: nvmm_x86_svm.c nvmm_x86_vmx.c Log Message: Pull up following revision(s) (requested by maxv in ticket #1041): sys/dev/nvmm/x86/nvmm_x86_vmx.c: revision 1.66 sys/dev/nvmm/x86/nvmm_x86_vmx.c: revision 1.50 sys/dev/nvmm/x86/nvmm_x86_svm.c: revision 1.66 sys/dev/nvmm/x86/nvmm_x86_vmx.c: revision 1.46 sys/dev/nvmm/x86/nvmm_x86_vmx.c: revision 1.49 sys/dev/nvmm/x86/nvmm_x86_svm.c: revision 1.55 sys/dev/nvmm/x86/nvmm_x86_svm.c: revision 1.56 pg->phys_addr > VM_PAGE_TO_PHYS(pg) Explicitly cast pointers to uintptr_t before casting to enums. They are not necessarily the same size. Don't cast pointers to bool, check for NULL instead. vmx_vmptrst(): only used when DIAGNOSTIC Simplify, remove unnecessary #ifdef DIAGNOSTIC around KASSERTs. Use ULL, to make it clear we are unsigned. To generate a diff of this commit: cvs rdiff -u -r1.46.4.6 -r1.46.4.7 src/sys/dev/nvmm/x86/nvmm_x86_svm.c cvs rdiff -u -r1.36.2.8 -r1.36.2.9 src/sys/dev/nvmm/x86/nvmm_x86_vmx.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/nvmm/x86
Module Name:src
Committed By: maxv
Date: Wed Aug 5 15:16:51 UTC 2020
Modified Files:
src/sys/dev/nvmm/x86: nvmm_x86.c
Log Message:
Make it easier to understand what's going on, no functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/nvmm/x86/nvmm_x86.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/nvmm/x86/nvmm_x86.c
diff -u src/sys/dev/nvmm/x86/nvmm_x86.c:1.9 src/sys/dev/nvmm/x86/nvmm_x86.c:1.10
--- src/sys/dev/nvmm/x86/nvmm_x86.c:1.9 Sat May 9 16:18:57 2020
+++ src/sys/dev/nvmm/x86/nvmm_x86.c Wed Aug 5 15:16:50 2020
@@ -1,7 +1,7 @@
-/* $NetBSD: nvmm_x86.c,v 1.9 2020/05/09 16:18:57 maxv Exp $ */
+/* $NetBSD: nvmm_x86.c,v 1.10 2020/08/05 15:16:50 maxv Exp $ */
/*
- * Copyright (c) 2018-2019 The NetBSD Foundation, Inc.
+ * Copyright (c) 2018-2020 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: nvmm_x86.c,v 1.9 2020/05/09 16:18:57 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm_x86.c,v 1.10 2020/08/05 15:16:50 maxv Exp $");
#include
#include
@@ -233,85 +233,191 @@ const struct nvmm_x86_cpuid_mask nvmm_cp
.eax = ~0,
.ebx = ~0,
.ecx =
- /* Excluded: MONITOR, VMX, SMX, EST, TM2, PDCM, PCID, DCA, X2APIC,
- * DEADLINE, RAZ. */
- CPUID2_SSE3 | CPUID2_PCLMUL |
- CPUID2_DTES64 | CPUID2_DS_CPL |
- CPUID2_SSSE3 | CPUID2_CID |
- CPUID2_SDBG | CPUID2_FMA |
- CPUID2_CX16 | CPUID2_xTPR |
- CPUID2_SSE41 | CPUID2_SSE42 |
- CPUID2_MOVBE | CPUID2_POPCNT |
- CPUID2_AES | CPUID2_XSAVE |
- CPUID2_OSXSAVE | CPUID2_F16C |
+ CPUID2_SSE3 |
+ CPUID2_PCLMUL |
+ CPUID2_DTES64 |
+ /* CPUID2_MONITOR excluded */
+ CPUID2_DS_CPL |
+ /* CPUID2_VMX excluded */
+ /* CPUID2_SMX excluded */
+ /* CPUID2_EST excluded */
+ /* CPUID2_TM2 excluded */
+ CPUID2_SSSE3 |
+ CPUID2_CID |
+ CPUID2_SDBG |
+ CPUID2_FMA |
+ CPUID2_CX16 |
+ CPUID2_xTPR |
+ /* CPUID2_PDCM excluded */
+ /* CPUID2_PCID excluded, but re-included in VMX */
+ /* CPUID2_DCA excluded */
+ CPUID2_SSE41 |
+ CPUID2_SSE42 |
+ /* CPUID2_X2APIC excluded */
+ CPUID2_MOVBE |
+ CPUID2_POPCNT |
+ /* CPUID2_DEADLINE excluded */
+ CPUID2_AES |
+ CPUID2_XSAVE |
+ CPUID2_OSXSAVE |
+ /* CPUID2_AVX excluded */
+ CPUID2_F16C |
CPUID2_RDRAND,
+ /* CPUID2_RAZ excluded */
.edx =
- /* Excluded: MCE, MTRR, MCA, DS, ACPI, TM. */
- CPUID_FPU | CPUID_VME |
- CPUID_DE | CPUID_PSE |
- CPUID_TSC | CPUID_MSR |
- CPUID_PAE | CPUID_CX8 |
- CPUID_APIC | CPUID_B10 |
- CPUID_SEP | CPUID_PGE |
- CPUID_CMOV | CPUID_PAT |
- CPUID_PSE36 | CPUID_PN |
- CPUID_CFLUSH | CPUID_B20 |
- CPUID_MMX | CPUID_FXSR |
- CPUID_SSE | CPUID_SSE2 |
- CPUID_SS | CPUID_HTT |
- CPUID_IA64 | CPUID_SBF
+ CPUID_FPU |
+ CPUID_VME |
+ CPUID_DE |
+ CPUID_PSE |
+ CPUID_TSC |
+ CPUID_MSR |
+ CPUID_PAE |
+ /* CPUID_MCE excluded */
+ CPUID_CX8 |
+ CPUID_APIC |
+ CPUID_B10 |
+ CPUID_SEP |
+ /* CPUID_MTRR excluded */
+ CPUID_PGE |
+ /* CPUID_MCA excluded */
+ CPUID_CMOV |
+ CPUID_PAT |
+ CPUID_PSE36 |
+ CPUID_PN |
+ CPUID_CFLUSH |
+ CPUID_B20 |
+ /* CPUID_DS excluded */
+ /* CPUID_ACPI excluded */
+ CPUID_MMX |
+ CPUID_FXSR |
+ CPUID_SSE |
+ CPUID_SSE2 |
+ CPUID_SS |
+ CPUID_HTT |
+ /* CPUID_TM excluded */
+ CPUID_IA64 |
+ CPUID_SBF
};
const struct nvmm_x86_cpuid_mask nvmm_cpuid_0007 = {
.eax = ~0,
.ebx =
- /* Excluded: TSC_ADJUST, AVX2, INVPCID, QM, AVX512*, PT, SHA. */
CPUID_SEF_FSGSBASE |
- CPUID_SEF_SGX | CPUID_SEF_BMI1 |
- CPUID_SEF_HLE | CPUID_SEF_FDPEXONLY |
- CPUID_SEF_SMEP | CPUID_SEF_BMI2 |
- CPUID_SEF_ERMS | CPUID_SEF_RTM |
- CPUID_SEF_FPUCSDS | CPUID_SEF_PQE |
- CPUID_SEF_RDSEED | CPUID_SEF_ADX |
- CPUID_SEF_SMAP | CPUID_SEF_CLFLUSHOPT |
+ /* CPUID_SEF_TSC_ADJUST excluded */
+ CPUID_SEF_SGX |
+ CPUID_SEF_BMI1 |
+ CPUID_SEF_HLE |
+ /* CPUID_SEF_AVX2 excluded */
+ CPUID_SEF_FDPEXONLY |
+ CPUID_SEF_SMEP |
+ CPUID_SEF_BMI2 |
+ CPUID_SEF_ERMS |
+ /* CPUID_SEF_INVPCID excluded, but re-included in VMX */
+ CPUID_SEF_RTM |
+ /* CPUID_SEF_QM excluded */
+ CPUID_SEF_FPUCSDS |
+ /* CPUID_SEF_MPX excluded */
+ CPUID_SEF_PQE |
+ /* CPUID_SEF_AVX512F excluded */
+ /* CPUID_SEF_AVX512DQ excluded */
+ CPUID_SEF_RDSEED |
+ CPUID_SEF_ADX |
+ CPUID_SEF_SMAP |
+ /* CPUID_SEF_AVX512_IFMA excluded */
+ CPUID_SEF_CLFLUSHOPT |
CPUID_SEF_CLWB,
+ /* CPUID_SEF_PT excluded */
+ /* CPUID_SEF_AVX512PF excluded */
+ /*
CVS commit: src/sys/dev/nvmm/x86
Module Name:src Committed By: maxv Date: Wed Aug 5 15:16:51 UTC 2020 Modified Files: src/sys/dev/nvmm/x86: nvmm_x86.c Log Message: Make it easier to understand what's going on, no functional change. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/dev/nvmm/x86/nvmm_x86.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev
Module Name:src
Committed By: martin
Date: Wed Aug 5 15:14:18 UTC 2020
Modified Files:
src/sys/dev/mii [netbsd-9]: igphy.c igphyreg.h makphy.c makphyreg.h
src/sys/dev/pci [netbsd-9]: if_wm.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1040):
sys/dev/mii/igphy.c: revision 1.35
sys/dev/mii/igphy.c: revision 1.36
sys/dev/mii/igphyreg.h: revision 1.12
sys/dev/mii/igphyreg.h: revision 1.13
sys/dev/mii/makphyreg.h: revision 1.11
sys/dev/pci/if_wm.c: revision 1.682
sys/dev/pci/if_wm.c: revision 1.683
sys/dev/pci/if_wm.c: revision 1.684
sys/dev/pci/if_wm.c: revision 1.685
sys/dev/mii/makphy.c: revision 1.66
s/MII_IGPHY_/IGPHY_/. No functional change.
Rename PSSR_* to MAKPHY_PSSR_* and IGPHY_PSSR_* to avoid conflict.
No functional change.
Setup PCS and SGMII for SFP correctly. It still doesn't support SFP
insertion/removal.
Copper:
wm2: SGMII(SFP)
wm2: 0x1043c440
makphy0 at wm2 phy 6: Marvell 88E Gigabit PHY, rev. 1
Fiber:
wm3: SERDES(SFP)
wm3: 0x10034440
wm3: 1000baseSX, 1000baseSX-FDX, auto
Explicitly cast from uint16_t to uint32_t before shifting 16bit left
when printing Image Unique ID. Found by kUBSan.
Set if_baudrate for non-MII device. Before this commit, it was 0.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.31.4.1 src/sys/dev/mii/igphy.c
cvs rdiff -u -r1.11 -r1.11.4.1 src/sys/dev/mii/igphyreg.h
cvs rdiff -u -r1.60.2.1 -r1.60.2.2 src/sys/dev/mii/makphy.c
cvs rdiff -u -r1.9.6.1 -r1.9.6.2 src/sys/dev/mii/makphyreg.h
cvs rdiff -u -r1.645.2.5 -r1.645.2.6 src/sys/dev/pci/if_wm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/mii/igphy.c
diff -u src/sys/dev/mii/igphy.c:1.31 src/sys/dev/mii/igphy.c:1.31.4.1
--- src/sys/dev/mii/igphy.c:1.31 Mon Mar 25 07:34:13 2019
+++ src/sys/dev/mii/igphy.c Wed Aug 5 15:14:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: igphy.c,v 1.31 2019/03/25 07:34:13 msaitoh Exp $ */
+/* $NetBSD: igphy.c,v 1.31.4.1 2020/08/05 15:14:18 martin Exp $ */
/*
* The Intel copyright applies to the analog register setup, and the
@@ -70,7 +70,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: igphy.c,v 1.31 2019/03/25 07:34:13 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: igphy.c,v 1.31.4.1 2020/08/05 15:14:18 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_mii.h"
@@ -270,7 +270,7 @@ igphy_load_dspcode(struct mii_softc *sc)
delay(2);
- PHY_WRITE(sc, MII_IGPHY_PAGE_SELECT, 0x);
+ PHY_WRITE(sc, IGPHY_PAGE_SELECT, 0x);
PHY_WRITE(sc, 0x, 0x0140);
delay(5000);
@@ -278,7 +278,7 @@ igphy_load_dspcode(struct mii_softc *sc)
for (i = 0; !((code[i].reg == 0) && (code[i].val == 0)); i++)
IGPHY_WRITE(sc, code[i].reg, code[i].val);
- PHY_WRITE(sc, MII_IGPHY_PAGE_SELECT, 0x);
+ PHY_WRITE(sc, IGPHY_PAGE_SELECT, 0x);
PHY_WRITE(sc, 0x, 0x3300);
delay(2);
@@ -323,9 +323,9 @@ igphy_reset(struct mii_softc *sc)
}
if (igsc->sc_mactype == WM_T_82547) {
- IGPHY_READ(sc, MII_IGPHY_ANALOG_SPARE_FUSE_STATUS, );
+ IGPHY_READ(sc, IGPHY_ANALOG_SPARE_FUSE_STATUS, );
if ((fused & ANALOG_SPARE_FUSE_ENABLED) == 0) {
- IGPHY_READ(sc, MII_IGPHY_ANALOG_FUSE_STATUS, );
+ IGPHY_READ(sc, IGPHY_ANALOG_FUSE_STATUS, );
fine = fused & ANALOG_FUSE_FINE_MASK;
coarse = fused & ANALOG_FUSE_COARSE_MASK;
@@ -340,12 +340,12 @@ igphy_reset(struct mii_softc *sc)
(fine & ANALOG_FUSE_FINE_MASK) |
(coarse & ANALOG_FUSE_COARSE_MASK);
- IGPHY_WRITE(sc, MII_IGPHY_ANALOG_FUSE_CONTROL, fused);
- IGPHY_WRITE(sc, MII_IGPHY_ANALOG_FUSE_BYPASS,
+ IGPHY_WRITE(sc, IGPHY_ANALOG_FUSE_CONTROL, fused);
+ IGPHY_WRITE(sc, IGPHY_ANALOG_FUSE_BYPASS,
ANALOG_FUSE_ENABLE_SW_CONTROL);
}
}
- PHY_WRITE(sc, MII_IGPHY_PAGE_SELECT, 0x);
+ PHY_WRITE(sc, IGPHY_PAGE_SELECT, 0x);
}
@@ -377,14 +377,14 @@ igphy_service(struct mii_softc *sc, stru
if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
break;
- PHY_READ(sc, MII_IGPHY_PORT_CTRL, );
+ PHY_READ(sc, IGPHY_PORT_CTRL, );
if (IFM_SUBTYPE(ife->ifm_media) == IFM_AUTO) {
reg |= PSCR_AUTO_MDIX;
reg &= ~PSCR_FORCE_MDI_MDIX;
- PHY_WRITE(sc, MII_IGPHY_PORT_CTRL, reg);
+ PHY_WRITE(sc, IGPHY_PORT_CTRL, reg);
} else {
reg &= ~(PSCR_AUTO_MDIX | PSCR_FORCE_MDI_MDIX);
- PHY_WRITE(sc, MII_IGPHY_PORT_CTRL, reg);
+ PHY_WRITE(sc, IGPHY_PORT_CTRL, reg);
}
mii_phy_setmedia(sc);
@@ -425,9 +425,9 @@ igphy_status(struct mii_softc *sc)
mii->mii_media_status = IFM_AVALID;
mii->mii_media_active = IFM_ETHER;
- PHY_READ(sc, MII_IGPHY_PORT_STATUS, );
+ PHY_READ(sc, IGPHY_PORT_STATUS, );
- if (pssr & PSSR_LINK_UP)
+ if (pssr & IGPHY_PSSR_LINK_UP)
mii->mii_media_status |= IFM_ACTIVE;
PHY_READ(sc, MII_BMCR, );
@@ -449,19 +449,19 @@ igphy_status(struct mii_softc *sc)
mii->mii_media_active |= IFM_NONE;
CVS commit: [netbsd-9] src/sys/dev
Module Name:src Committed By: martin Date: Wed Aug 5 15:14:18 UTC 2020 Modified Files: src/sys/dev/mii [netbsd-9]: igphy.c igphyreg.h makphy.c makphyreg.h src/sys/dev/pci [netbsd-9]: if_wm.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1040): sys/dev/mii/igphy.c: revision 1.35 sys/dev/mii/igphy.c: revision 1.36 sys/dev/mii/igphyreg.h: revision 1.12 sys/dev/mii/igphyreg.h: revision 1.13 sys/dev/mii/makphyreg.h: revision 1.11 sys/dev/pci/if_wm.c: revision 1.682 sys/dev/pci/if_wm.c: revision 1.683 sys/dev/pci/if_wm.c: revision 1.684 sys/dev/pci/if_wm.c: revision 1.685 sys/dev/mii/makphy.c: revision 1.66 s/MII_IGPHY_/IGPHY_/. No functional change. Rename PSSR_* to MAKPHY_PSSR_* and IGPHY_PSSR_* to avoid conflict. No functional change. Setup PCS and SGMII for SFP correctly. It still doesn't support SFP insertion/removal. Copper: wm2: SGMII(SFP) wm2: 0x1043c440 makphy0 at wm2 phy 6: Marvell 88E Gigabit PHY, rev. 1 Fiber: wm3: SERDES(SFP) wm3: 0x10034440 wm3: 1000baseSX, 1000baseSX-FDX, auto Explicitly cast from uint16_t to uint32_t before shifting 16bit left when printing Image Unique ID. Found by kUBSan. Set if_baudrate for non-MII device. Before this commit, it was 0. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.31.4.1 src/sys/dev/mii/igphy.c cvs rdiff -u -r1.11 -r1.11.4.1 src/sys/dev/mii/igphyreg.h cvs rdiff -u -r1.60.2.1 -r1.60.2.2 src/sys/dev/mii/makphy.c cvs rdiff -u -r1.9.6.1 -r1.9.6.2 src/sys/dev/mii/makphyreg.h cvs rdiff -u -r1.645.2.5 -r1.645.2.6 src/sys/dev/pci/if_wm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/arch/hppa
Module Name:src Committed By: martin Date: Wed Aug 5 15:06:55 UTC 2020 Modified Files: src/sys/arch/hppa/dev [netbsd-9]: cpu.c src/sys/arch/hppa/hppa [netbsd-9]: fpu.c Log Message: Pull up following revision(s) (requested by skrll in ticket #1039): sys/arch/hppa/dev/cpu.c: revision 1.2 sys/arch/hppa/hppa/fpu.c: revision 1.27 Don't KASSERT there's an FPU present. QEMU doesn't have one... To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.1.40.1 src/sys/arch/hppa/dev/cpu.c cvs rdiff -u -r1.26 -r1.26.4.1 src/sys/arch/hppa/hppa/fpu.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/arch/hppa
Module Name:src
Committed By: martin
Date: Wed Aug 5 15:06:55 UTC 2020
Modified Files:
src/sys/arch/hppa/dev [netbsd-9]: cpu.c
src/sys/arch/hppa/hppa [netbsd-9]: fpu.c
Log Message:
Pull up following revision(s) (requested by skrll in ticket #1039):
sys/arch/hppa/dev/cpu.c: revision 1.2
sys/arch/hppa/hppa/fpu.c: revision 1.27
Don't KASSERT there's an FPU present. QEMU doesn't have one...
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.40.1 src/sys/arch/hppa/dev/cpu.c
cvs rdiff -u -r1.26 -r1.26.4.1 src/sys/arch/hppa/hppa/fpu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hppa/dev/cpu.c
diff -u src/sys/arch/hppa/dev/cpu.c:1.1 src/sys/arch/hppa/dev/cpu.c:1.1.40.1
--- src/sys/arch/hppa/dev/cpu.c:1.1 Mon Feb 24 07:23:42 2014
+++ src/sys/arch/hppa/dev/cpu.c Wed Aug 5 15:06:55 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.1 2014/02/24 07:23:42 skrll Exp $ */
+/* $NetBSD: cpu.c,v 1.1.40.1 2020/08/05 15:06:55 martin Exp $ */
/* $OpenBSD: cpu.c,v 1.29 2009/02/08 18:33:28 miod Exp $ */
@@ -29,7 +29,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.1 2014/02/24 07:23:42 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.1.40.1 2020/08/05 15:06:55 martin Exp $");
#include "opt_multiprocessor.h"
@@ -150,10 +150,13 @@ cpuattach(device_t parent, device_t self
/*
* Describe the floating-point support.
*/
- KASSERT(fpu_present);
- aprint_normal("%s: %s floating point, rev %d\n", device_xname(self),
- hppa_mod_info(HPPA_TYPE_FPU, (fpu_version >> 16) & 0x1f),
- (fpu_version >> 11) & 0x1f);
+ if (fpu_present)
+ aprint_normal("%s: %s floating point, rev %d\n", device_xname(self),
+ hppa_mod_info(HPPA_TYPE_FPU, (fpu_version >> 16) & 0x1f),
+ (fpu_version >> 11) & 0x1f);
+ else
+ aprint_normal("%s: no floating point\n", device_xname(self));
+
if (cpuno >= HPPA_MAXCPUS) {
aprint_normal_dev(self, "not started\n");
Index: src/sys/arch/hppa/hppa/fpu.c
diff -u src/sys/arch/hppa/hppa/fpu.c:1.26 src/sys/arch/hppa/hppa/fpu.c:1.26.4.1
--- src/sys/arch/hppa/hppa/fpu.c:1.26 Mon Apr 15 20:45:08 2019
+++ src/sys/arch/hppa/hppa/fpu.c Wed Aug 5 15:06:55 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu.c,v 1.26 2019/04/15 20:45:08 skrll Exp $ */
+/* $NetBSD: fpu.c,v 1.26.4.1 2020/08/05 15:06:55 martin Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.26 2019/04/15 20:45:08 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.26.4.1 2020/08/05 15:06:55 martin Exp $");
#include
#include
@@ -198,7 +198,8 @@ hppa_fpu_flush(struct lwp *l)
struct pcb *pcb = lwp_getpcb(l);
struct cpu_info *ci = curcpu();
- KASSERT(fpu_present);
+ if (!fpu_present)
+ return;
/*
* If this process' state is currently in hardware, swap it out.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Wed Aug 5 14:59:42 UTC 2020
Modified Files:
src/sys/dev/pci [netbsd-9]: if_ena.c
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #1038):
sys/dev/pci/if_ena.c: revision 1.25
PR port-arm/55532: kernel panic with ena on AWS a1.2xlarge
Do not mark callout and workqueues as mpsafe unless the NET_MPSAFE option
is present.
To generate a diff of this commit:
cvs rdiff -u -r1.15.2.2 -r1.15.2.3 src/sys/dev/pci/if_ena.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_ena.c
diff -u src/sys/dev/pci/if_ena.c:1.15.2.2 src/sys/dev/pci/if_ena.c:1.15.2.3
--- src/sys/dev/pci/if_ena.c:1.15.2.2 Sun Mar 8 14:44:06 2020
+++ src/sys/dev/pci/if_ena.c Wed Aug 5 14:59:41 2020
@@ -27,11 +27,16 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
+#ifdef _KERNEL_OPT
+#include "opt_net_mpsafe.h"
+#endif
+
#include
#if 0
__FBSDID("$FreeBSD: head/sys/dev/ena/ena.c 333456 2018-05-10 09:37:54Z mw $");
#endif
-__KERNEL_RCSID(0, "$NetBSD: if_ena.c,v 1.15.2.2 2020/03/08 14:44:06 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ena.c,v 1.15.2.3 2020/08/05 14:59:41 martin Exp $");
#include
#include
@@ -56,6 +61,14 @@ __KERNEL_RCSID(0, "$NetBSD: if_ena.c,v 1
#include
+#ifdef NET_MPSAFE
+#define WQ_FLAGS WQ_MPSAFE
+#define CALLOUT_FLAGS CALLOUT_MPSAFE
+#else
+#define WQ_FLAGS 0
+#define CALLOUT_FLAGS 0
+#endif
+
/*
* Function prototypes
*/
@@ -682,7 +695,7 @@ ena_setup_tx_resources(struct ena_adapte
/* Allocate workqueues */
int rc = workqueue_create(_ring->enqueue_tq, "ena_tx_enq",
- ena_deferred_mq_start, tx_ring, 0, IPL_NET, WQ_PERCPU | WQ_MPSAFE);
+ ena_deferred_mq_start, tx_ring, 0, IPL_NET, WQ_PERCPU | WQ_FLAGS);
if (unlikely(rc != 0)) {
ena_trace(ENA_ALERT,
"Unable to create workqueue for enqueue task\n");
@@ -889,7 +902,7 @@ ena_setup_rx_resources(struct ena_adapte
/* Allocate workqueues */
int rc = workqueue_create(_ring->cmpl_tq, "ena_rx_comp",
- ena_deferred_rx_cleanup, rx_ring, 0, IPL_NET, WQ_PERCPU | WQ_MPSAFE);
+ ena_deferred_rx_cleanup, rx_ring, 0, IPL_NET, WQ_PERCPU | WQ_FLAGS);
if (unlikely(rc != 0)) {
ena_trace(ENA_ALERT,
"Unable to create workqueue for RX completion task\n");
@@ -3807,11 +3820,11 @@ ena_attach(device_t parent, device_t sel
goto err_ifp_free;
}
- callout_init(>timer_service, CALLOUT_MPSAFE);
+ callout_init(>timer_service, CALLOUT_FLAGS);
/* Initialize reset task queue */
rc = workqueue_create(>reset_tq, "ena_reset_enq",
- ena_reset_task, adapter, 0, IPL_NET, WQ_PERCPU | WQ_MPSAFE);
+ ena_reset_task, adapter, 0, IPL_NET, WQ_PERCPU | WQ_FLAGS);
if (unlikely(rc != 0)) {
ena_trace(ENA_ALERT,
"Unable to create workqueue for reset task\n");
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Wed Aug 5 14:59:42 UTC 2020 Modified Files: src/sys/dev/pci [netbsd-9]: if_ena.c Log Message: Pull up following revision(s) (requested by jmcneill in ticket #1038): sys/dev/pci/if_ena.c: revision 1.25 PR port-arm/55532: kernel panic with ena on AWS a1.2xlarge Do not mark callout and workqueues as mpsafe unless the NET_MPSAFE option is present. To generate a diff of this commit: cvs rdiff -u -r1.15.2.2 -r1.15.2.3 src/sys/dev/pci/if_ena.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/dev
Module Name:src Committed By: martin Date: Wed Aug 5 14:48:35 UTC 2020 Modified Files: src/sys/dev [netbsd-8]: dev_verbose.h Log Message: Pull up following revision(s) (requested by uwe in ticket #1584): sys/dev/dev_verbose.h: revision 1.3 DEV_VERBOSE_MODULE_DEFINE - use MODULE_CLASS_DRIVER. This makes built-in verbose modules available before the start of the autoconfiguration, when they are needed. From pgoyette@ PR kern/55535 To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.2.10.1 src/sys/dev/dev_verbose.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/dev_verbose.h diff -u src/sys/dev/dev_verbose.h:1.2 src/sys/dev/dev_verbose.h:1.2.10.1 --- src/sys/dev/dev_verbose.h:1.2 Fri Nov 13 01:37:19 2015 +++ src/sys/dev/dev_verbose.h Wed Aug 5 14:48:35 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: dev_verbose.h,v 1.2 2015/11/13 01:37:19 christos Exp $ */ +/* $NetBSD: dev_verbose.h,v 1.2.10.1 2020/08/05 14:48:35 martin Exp $ */ /* * Redistribution and use in source and binary forms, with or without @@ -79,7 +79,7 @@ tag ## verbose_modcmd(modcmd_t cmd, void return ENOTTY; \ }\ } \ -MODULE(MODULE_CLASS_MISC, tag ## verbose, deps) +MODULE(MODULE_CLASS_DRIVER, tag ## verbose, deps) #endif /* KERNEL */
CVS commit: [netbsd-8] src/sys/dev
Module Name:src Committed By: martin Date: Wed Aug 5 14:48:35 UTC 2020 Modified Files: src/sys/dev [netbsd-8]: dev_verbose.h Log Message: Pull up following revision(s) (requested by uwe in ticket #1584): sys/dev/dev_verbose.h: revision 1.3 DEV_VERBOSE_MODULE_DEFINE - use MODULE_CLASS_DRIVER. This makes built-in verbose modules available before the start of the autoconfiguration, when they are needed. From pgoyette@ PR kern/55535 To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.2.10.1 src/sys/dev/dev_verbose.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev
Module Name:src Committed By: martin Date: Wed Aug 5 14:47:04 UTC 2020 Modified Files: src/sys/dev [netbsd-9]: dev_verbose.h Log Message: Pull up following revision(s) (requested by uwe in ticket #1037): sys/dev/dev_verbose.h: revision 1.3 DEV_VERBOSE_MODULE_DEFINE - use MODULE_CLASS_DRIVER. This makes built-in verbose modules available before the start of the autoconfiguration, when they are needed. From pgoyette@ PR kern/55535 To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.2.26.1 src/sys/dev/dev_verbose.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/dev_verbose.h diff -u src/sys/dev/dev_verbose.h:1.2 src/sys/dev/dev_verbose.h:1.2.26.1 --- src/sys/dev/dev_verbose.h:1.2 Fri Nov 13 01:37:19 2015 +++ src/sys/dev/dev_verbose.h Wed Aug 5 14:47:04 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: dev_verbose.h,v 1.2 2015/11/13 01:37:19 christos Exp $ */ +/* $NetBSD: dev_verbose.h,v 1.2.26.1 2020/08/05 14:47:04 martin Exp $ */ /* * Redistribution and use in source and binary forms, with or without @@ -79,7 +79,7 @@ tag ## verbose_modcmd(modcmd_t cmd, void return ENOTTY; \ }\ } \ -MODULE(MODULE_CLASS_MISC, tag ## verbose, deps) +MODULE(MODULE_CLASS_DRIVER, tag ## verbose, deps) #endif /* KERNEL */
CVS commit: [netbsd-9] src/sys/dev
Module Name:src Committed By: martin Date: Wed Aug 5 14:47:04 UTC 2020 Modified Files: src/sys/dev [netbsd-9]: dev_verbose.h Log Message: Pull up following revision(s) (requested by uwe in ticket #1037): sys/dev/dev_verbose.h: revision 1.3 DEV_VERBOSE_MODULE_DEFINE - use MODULE_CLASS_DRIVER. This makes built-in verbose modules available before the start of the autoconfiguration, when they are needed. From pgoyette@ PR kern/55535 To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.2.26.1 src/sys/dev/dev_verbose.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/distrib/notes
Module Name:src
Committed By: martin
Date: Wed Aug 5 14:29:59 UTC 2020
Modified Files:
src/distrib/notes/common [netbsd-9]: main
src/distrib/notes/evbarm [netbsd-9]: hardware xfer
Log Message:
Pull up following revision(s) (requested by nia in ticket #1036):
distrib/notes/evbarm/hardware: revision 1.22
distrib/notes/evbarm/xfer: revision 1.5
distrib/notes/evbarm/hardware: revision 1.17
distrib/notes/common/main: revision 1.563
Note support for TI AM335x SoC
List all supported Amlogic SoCs
Remove duplicate word
Remove Arm OABI -> EABI change notice
To generate a diff of this commit:
cvs rdiff -u -r1.551.2.8 -r1.551.2.9 src/distrib/notes/common/main
cvs rdiff -u -r1.10.66.2 -r1.10.66.3 src/distrib/notes/evbarm/hardware
cvs rdiff -u -r1.2.48.1 -r1.2.48.2 src/distrib/notes/evbarm/xfer
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/notes/common/main
diff -u src/distrib/notes/common/main:1.551.2.8 src/distrib/notes/common/main:1.551.2.9
--- src/distrib/notes/common/main:1.551.2.8 Sun Jan 26 11:19:36 2020
+++ src/distrib/notes/common/main Wed Aug 5 14:29:59 2020
@@ -1,4 +1,4 @@
-.\" $NetBSD: main,v 1.551.2.8 2020/01/26 11:19:36 martin Exp $
+.\" $NetBSD: main,v 1.551.2.9 2020/08/05 14:29:59 martin Exp $
.\"
.\" Copyright (c) 1999-2012 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -822,61 +822,6 @@ A number of things have been removed fro
See the
.Dq Components removed from NetBSD
section near the beginning of this document for a list.
-.if \n[arm] \{\
-.Ss2 Important note regarding ABI change on ARM ports
-.Pp
-In
-.Nx
-7.0, most ARM ports (all but acorn32, and epoc32) have switched
-to the official standard ABI
-.Pq EABI5
-which is recommended by ARM for ELF binaries.
-.Pp
-Backwards compatibility is provided for binaries using the previous ABI
-.Pq oabi .
-A
-.Nx
-\*V
-kernel with the
-.Dv COMPAT_NETBSD32
-option enabled will allow you to execute oabi binaries.
-This option is enabled in the kernels distributed with this release.
-.Pp
-However, new binaries can not be mixed with old libraries, and shared
-libraries are incompatible.
-.Pp
-.Ic sysinst
-does not provide an automatic mechanism to partlially upgrade an old
-installation.
-There are two ways to handle the transition:
-.(enum
-.Pp
-Do a complete update.
-.Pp
-This means updating your system with
-.Ic sysinst ,
-then deleting and recompiling all other binaries, whether they were
-installed locally or through pkgsrc.
-This is the preferred, cleanest approach.
-.It
-Move your old binaries and libraries to
-.Pa /compat/netbsd32
-and replace them one by one.
-.Pp
-For example, move all of
-.Pa /usr/pkg
-to
-.Pa /compat/netbsd32/usr/pkg
-and add
-.Pa /compat/netbsd32/usr/pkg/bin
-to the end of your PATH.
-Most binaries should still run, and can be replaced over time with
-recompiled packages, which will install to
-.Pa /usr/pkg
-again.
-.enum)
-.
-.\}
.Ss "Using online NetBSD documentation"
.Pp
Documentation is available if you installed the manual
Index: src/distrib/notes/evbarm/hardware
diff -u src/distrib/notes/evbarm/hardware:1.10.66.2 src/distrib/notes/evbarm/hardware:1.10.66.3
--- src/distrib/notes/evbarm/hardware:1.10.66.2 Sun Jul 26 11:07:56 2020
+++ src/distrib/notes/evbarm/hardware Wed Aug 5 14:29:59 2020
@@ -1,4 +1,4 @@
-.\" $NetBSD: hardware,v 1.10.66.2 2020/07/26 11:07:56 martin Exp $
+.\" $NetBSD: hardware,v 1.10.66.3 2020/08/05 14:29:59 martin Exp $
.\"
.\" Copyright (c) 2001-2020 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -38,7 +38,7 @@ Broadcom BCM2836 (e.g. Raspberry Pi 2)
.It
Samsung Exynos 5422 (e.g. ODROID-XU3/XU-4)
.It
-Texas Instruments OMAP3 (e.g. BeagleBoard, BeagleBone Black...)
+Texas Instruments AM335x and OMAP3 (e.g. BeagleBoard, BeagleBone Black...)
.It
Xilinx Zynq (e.g. Zedboard, Parallella...)
.It
@@ -54,7 +54,7 @@ are also supported.
.It
Allwinner H5, H6, A64 (e.g. PINE64, Pinebook, NanoPi A64, OLinuXino...)
.It
-Amlogic S905 (e.g. ODROID-C2, Le Potato, NanoPi K2...)
+Amlogic S905, S805X, S905D, S905W, S905X (e.g. ODROID-C2, Le Potato, NanoPi K2...)
.It
Broadcom BCM2837 (e.g. Raspberry Pi 3)
.It
Index: src/distrib/notes/evbarm/xfer
diff -u src/distrib/notes/evbarm/xfer:1.2.48.1 src/distrib/notes/evbarm/xfer:1.2.48.2
--- src/distrib/notes/evbarm/xfer:1.2.48.1 Mon Jul 20 18:32:55 2020
+++ src/distrib/notes/evbarm/xfer Wed Aug 5 14:29:59 2020
@@ -1,4 +1,4 @@
-.\" $NetBSD: xfer,v 1.2.48.1 2020/07/20 18:32:55 martin Exp $
+.\" $NetBSD: xfer,v 1.2.48.2 2020/08/05 14:29:59 martin Exp $
.\"
.\" Copyright (c) 2020 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -42,7 +42,7 @@ to decompress .gz files.
.Pp
ARM devices generally also ship with a vendor-specific U-Boot
bootloader, which may be replaced with a board-specific "mainline"
-U-Boot image from pkgsrc for an an optimal NetBSD experience.
CVS commit: [netbsd-9] src/distrib/notes
Module Name:src Committed By: martin Date: Wed Aug 5 14:29:59 UTC 2020 Modified Files: src/distrib/notes/common [netbsd-9]: main src/distrib/notes/evbarm [netbsd-9]: hardware xfer Log Message: Pull up following revision(s) (requested by nia in ticket #1036): distrib/notes/evbarm/hardware: revision 1.22 distrib/notes/evbarm/xfer: revision 1.5 distrib/notes/evbarm/hardware: revision 1.17 distrib/notes/common/main: revision 1.563 Note support for TI AM335x SoC List all supported Amlogic SoCs Remove duplicate word Remove Arm OABI -> EABI change notice To generate a diff of this commit: cvs rdiff -u -r1.551.2.8 -r1.551.2.9 src/distrib/notes/common/main cvs rdiff -u -r1.10.66.2 -r1.10.66.3 src/distrib/notes/evbarm/hardware cvs rdiff -u -r1.2.48.1 -r1.2.48.2 src/distrib/notes/evbarm/xfer Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Wed Aug 5 14:18:55 UTC 2020 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ammend ticket #1582 To generate a diff of this commit: cvs rdiff -u -r1.1.2.24 -r1.1.2.25 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Wed Aug 5 14:18:55 UTC 2020 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ammend ticket #1582 To generate a diff of this commit: cvs rdiff -u -r1.1.2.24 -r1.1.2.25 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.3 diff -u src/doc/CHANGES-8.3:1.1.2.24 src/doc/CHANGES-8.3:1.1.2.25 --- src/doc/CHANGES-8.3:1.1.2.24 Sun Aug 2 09:15:57 2020 +++ src/doc/CHANGES-8.3 Wed Aug 5 14:18:54 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.24 2020/08/02 09:15:57 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.25 2020/08/05 14:18:54 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -357,12 +357,463 @@ sys/arch/x86/x86/procfs_machdep.c 1.37, Add AMD protected processor identification number (ppin). [msaitoh, ticket #1581] +external/mit/xorg/lib/libX11/extensions/Makefile up to 1.2 +external/mit/xorg/lib/libX11/Makefile up to 1.14 +external/mit/xorg/lib/libX11/Makefile.libx11up to 1.19 +external/mit/xorg/lib/libX11/Makefile.ximcp up to 1.5 +external/mit/xorg/lib/libX11/Makefile.xlibi18n up to 1.3 xsrc/external/mit/xorg-server.old/dist/dix/pixmap.c 1.2 -xsrc/external/mit/xorg-server/dist/dix/pixmap.c 1.2 +xsrc/external/mit/xorg-server/dist/dix/pixmap.c 1.2 +xsrc/external/mit/libX11/dist/include/X11/extensions/XKBgeom.h up to 1.1.1.1 +xsrc/external/mit/libX11/dist/man/xkb/XkbAllocGeomOverlayKeys.man up to 1.1.1.1 +xsrc/external/mit/libX11/dist/man/xkb/XkbGetNamedDeviceIndicator.man up to 1.1.1.1 +xsrc/external/mit/libX11/dist/man/xkb/XkbSetNamedDeviceIndicator.man up to 1.1.1.1 +xsrc/external/mit/libX11/dist/src/reallocarray.c up to 1.1.1.1 +xsrc/external/mit/libX11/dist/src/reallocarray.h up to 1.1.1.2 +xsrc/external/mit/libX11/dist/README.md up to 1.1.1.2 +xsrc/external/mit/libX11/dist/README delete +xsrc/external/mit/libX11/dist/man/xkb/XkbAllocGeomOverlayKey.man delete +xsrc/external/mit/libX11/dist/ChangeLog up to 1.1.1.21 +xsrc/external/mit/libX11/dist/Makefile.amup to 1.1.1.7 +xsrc/external/mit/libX11/dist/Makefile.inup to 1.1.1.19 +xsrc/external/mit/libX11/dist/aclocal.m4 up to 1.1.1.19 +xsrc/external/mit/libX11/dist/config.guess up to 1.1.1.14 +xsrc/external/mit/libX11/dist/config.sub up to 1.1.1.13 +xsrc/external/mit/libX11/dist/configure up to 1.1.1.21 +xsrc/external/mit/libX11/dist/configure.ac up to 1.1.1.21 +xsrc/external/mit/libX11/dist/depcompup to 1.1.1.10 +xsrc/external/mit/libX11/dist/install-sh up to 1.1.1.10 +xsrc/external/mit/libX11/dist/ltmain.sh up to 1.1.1.14 +xsrc/external/mit/libX11/dist/include/Makefile.amup to 1.1.1.3 +xsrc/external/mit/libX11/dist/include/Makefile.inup to 1.1.1.20 +xsrc/external/mit/libX11/dist/include/X11/Xlib.h up to 1.1.1.9 +xsrc/external/mit/libX11/dist/include/X11/Xlibint.h up to 1.1.1.12 +xsrc/external/mit/libX11/dist/m4/libtool.m4 up to 1.9 +xsrc/external/mit/libX11/dist/man/AllPlanes.man up to 1.1.1.5 +xsrc/external/mit/libX11/dist/man/BlackPixelOfScreen.man up to 1.1.1.4 +xsrc/external/mit/libX11/dist/man/Compose.manup to 1.1.1.6 +xsrc/external/mit/libX11/dist/man/DisplayOfCCC.man up to 1.1.1.5 +xsrc/external/mit/libX11/dist/man/ImageByteOrder.man up to 1.1.1.4 +xsrc/external/mit/libX11/dist/man/IsCursorKey.manup to 1.1.1.4 +xsrc/external/mit/libX11/dist/man/Makefile.inup to 1.1.1.19 +xsrc/external/mit/libX11/dist/man/XAddConnectionWatch.man up to 1.1.1.5 +xsrc/external/mit/libX11/dist/man/XAddHost.man up to 1.1.1.6 +xsrc/external/mit/libX11/dist/man/XAllocClassHint.man up to 1.1.1.4 +xsrc/external/mit/libX11/dist/man/XAllocColor.manup to 1.1.1.6 +xsrc/external/mit/libX11/dist/man/XAllocIconSize.man up to 1.1.1.5 +xsrc/external/mit/libX11/dist/man/XAllocSizeHints.man up to 1.1.1.4 +xsrc/external/mit/libX11/dist/man/XAllocStandardColormap.man up to 1.1.1.4 +xsrc/external/mit/libX11/dist/man/XAllocWMHints.man up to 1.1.1.4 +xsrc/external/mit/libX11/dist/man/XAllowEvents.man up to 1.1.1.4 +xsrc/external/mit/libX11/dist/man/XAnyEvent.man up to 1.1.1.4 +xsrc/external/mit/libX11/dist/man/XButtonEvent.man up to 1.1.1.4 +xsrc/external/mit/libX11/dist/man/XChangeKeyboardControl.man up to 1.1.1.4 +xsrc/external/mit/libX11/dist/man/XChangeKeyboardMapping.man up to 1.1.1.5 +xsrc/external/mit/libX11/dist/man/XChangePointerControl.man up to 1.1.1.4 +xsrc/external/mit/libX11/dist/man/XChangeSaveSet.man up to 1.1.1.4 +xsrc/external/mit/libX11/dist/man/XChangeWindowAttributes.man up to 1.1.1.4 +xsrc/external/mit/libX11/dist/man/XCirculateEvent.man up to 1.1.1.4 +xsrc/external/mit/libX11/dist/man/XCirculateRequestEvent.man up to 1.1.1.4
CVS commit: [netbsd-8] src/external/mit/xorg/lib/libX11
Module Name:src
Committed By: martin
Date: Wed Aug 5 14:16:41 UTC 2020
Modified Files:
src/external/mit/xorg/lib/libX11 [netbsd-8]: Makefile Makefile.libx11
Makefile.ximcp Makefile.xlibi18n
Added Files:
src/external/mit/xorg/lib/libX11/extensions [netbsd-8]: Makefile
Log Message:
Sync external/mit/xorg/lib/libX11 with current, requested by maya in
ticket #1582:
external/mit/xorg/lib/libX11/extensions/Makefile up to 1.2
external/mit/xorg/lib/libX11/Makefile up to 1.14
external/mit/xorg/lib/libX11/Makefile.libx11up to 1.19
external/mit/xorg/lib/libX11/Makefile.ximcp up to 1.5
external/mit/xorg/lib/libX11/Makefile.xlibi18n up to 1.3
Update libX11 from 1.6.5 to 1.6.10.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.8.1 src/external/mit/xorg/lib/libX11/Makefile
cvs rdiff -u -r1.18 -r1.18.4.1 \
src/external/mit/xorg/lib/libX11/Makefile.libx11
cvs rdiff -u -r1.4 -r1.4.8.1 src/external/mit/xorg/lib/libX11/Makefile.ximcp
cvs rdiff -u -r1.2 -r1.2.8.1 \
src/external/mit/xorg/lib/libX11/Makefile.xlibi18n
cvs rdiff -u -r0 -r1.2.6.2 \
src/external/mit/xorg/lib/libX11/extensions/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libX11/Makefile
diff -u src/external/mit/xorg/lib/libX11/Makefile:1.13 src/external/mit/xorg/lib/libX11/Makefile:1.13.8.1
--- src/external/mit/xorg/lib/libX11/Makefile:1.13 Sun Jul 19 08:18:32 2015
+++ src/external/mit/xorg/lib/libX11/Makefile Wed Aug 5 14:16:41 2020
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.13 2015/07/19 08:18:32 mrg Exp $
+# $NetBSD: Makefile,v 1.13.8.1 2020/08/05 14:16:41 martin Exp $
.include
SUBDIR= dynamic .WAIT libX11-xcb static \
- ximcp xlcDef xlcUTF8Load xlibi18n xomGeneric
+ ximcp xlcDef xlcUTF8Load xlibi18n xomGeneric \
+ extensions
INCS= ImUtil.h XKBlib.h Xcms.h Xlib-xcb.h Xlib.h XlibConf.h \
Xlibint.h Xlocale.h Xregion.h Xresource.h Xutil.h \
Index: src/external/mit/xorg/lib/libX11/Makefile.libx11
diff -u src/external/mit/xorg/lib/libX11/Makefile.libx11:1.18 src/external/mit/xorg/lib/libX11/Makefile.libx11:1.18.4.1
--- src/external/mit/xorg/lib/libX11/Makefile.libx11:1.18 Thu Feb 16 01:02:28 2017
+++ src/external/mit/xorg/lib/libX11/Makefile.libx11 Wed Aug 5 14:16:41 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.libx11,v 1.18 2017/02/16 01:02:28 rin Exp $
+# $NetBSD: Makefile.libx11,v 1.18.4.1 2020/08/05 14:16:41 martin Exp $
LIB= X11
.PATH: ${X11SRCDIR.${LIB}}/src
@@ -402,6 +402,10 @@ CPPFLAGS+= -DHAVE_SOCKLEN_T -DHAVE_STDLI
CPPFLAGS+= -DHAVE_STRING_H -DHAVE_STRTOL -DHAVE_SYS_PARAM_H
CPPFLAGS+= -DHAVE_SYS_SELECT_H -DHAVE_SYS_STAT_H -DHAVE_SYS_TYPES_H
CPPFLAGS+= -DHAVE_UNISTD_H
+CPPFLAGS+= -DHAVE_STRCASECMP -DHAVE_STRLCPY -DHAVE_STRTOL
+CPPFLAGS+= -DHAVE_SYS_FILIO_H -DHAVE_SYS_IOCTL_H -DHAVE_SYS_SOCKET_H
+
+CPPFLAGS+= -DHAVE_REALLOCARRAY -D_OPENBSD_SOURCE
CPPFLAGS+= -DUSE_XCB
SRCS+= \
Index: src/external/mit/xorg/lib/libX11/Makefile.ximcp
diff -u src/external/mit/xorg/lib/libX11/Makefile.ximcp:1.4 src/external/mit/xorg/lib/libX11/Makefile.ximcp:1.4.8.1
--- src/external/mit/xorg/lib/libX11/Makefile.ximcp:1.4 Mon Jun 13 20:03:07 2016
+++ src/external/mit/xorg/lib/libX11/Makefile.ximcp Wed Aug 5 14:16:41 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.ximcp,v 1.4 2016/06/13 20:03:07 ryoon Exp $
+# $NetBSD: Makefile.ximcp,v 1.4.8.1 2020/08/05 14:16:41 martin Exp $
.PATH: ${X11SRCDIR.X11}/modules/im/ximcp
SRCS.ximcp= \
@@ -39,8 +39,10 @@ CPPFLAGS+= \
-DTRANS_CLIENT \
-DHASXDMAUTH
-CPPFLAGS.imDefLkup.c= -Wno-error
-CPPFLAGS.imRm.c= -Wno-error
-CPPFLAGS.imTrans.c= -Wno-error
-CPPFLAGS.imLcLkup.c= -Wno-stack-protector
-CPPFLAGS.imInsClbk.c= -Wno-unused-value
+COPTS.imDefLkup.c= -Wno-error
+COPTS.imRm.c= -Wno-error
+COPTS.imTrans.c= -Wno-error
+COPTS.imLcLkup.c= -Wno-stack-protector
+COPTS.imInsClbk.c= -Wno-unused-value
+
+COPTS.imDefIm.c= ${GCC_NO_STRINGOP_OVERFLOW}
Index: src/external/mit/xorg/lib/libX11/Makefile.xlibi18n
diff -u src/external/mit/xorg/lib/libX11/Makefile.xlibi18n:1.2 src/external/mit/xorg/lib/libX11/Makefile.xlibi18n:1.2.8.1
--- src/external/mit/xorg/lib/libX11/Makefile.xlibi18n:1.2 Thu Jun 2 22:41:26 2016
+++ src/external/mit/xorg/lib/libX11/Makefile.xlibi18n Wed Aug 5 14:16:41 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xlibi18n,v 1.2 2016/06/02 22:41:26 mrg Exp $
+# $NetBSD: Makefile.xlibi18n,v 1.2.8.1 2020/08/05 14:16:41 martin Exp $
.PATH: ${X11SRCDIR.X11}/modules/lc/gen
SRCS.xlibi18n= lcGenConv.c
@@ -10,3 +10,5 @@ CPPFLAGS+= \
CPPFLAGS+= \
${XLOCALE.DEFINES} \
-DHASXDMAUTH
+
+COPTS.lcGenConv.c+= ${GCC_NO_STRINGOP_OVERFLOW}
Added files:
Index: src/external/mit/xorg/lib/libX11/extensions/Makefile
diff -u /dev/null src/external/mit/xorg/lib/libX11/extensions/Makefile:1.2.6.2
--- /dev/null Wed Aug 5 14:16:41 2020
+++
CVS commit: [netbsd-8] src/external/mit/xorg/lib/libX11
Module Name:src Committed By: martin Date: Wed Aug 5 14:16:41 UTC 2020 Modified Files: src/external/mit/xorg/lib/libX11 [netbsd-8]: Makefile Makefile.libx11 Makefile.ximcp Makefile.xlibi18n Added Files: src/external/mit/xorg/lib/libX11/extensions [netbsd-8]: Makefile Log Message: Sync external/mit/xorg/lib/libX11 with current, requested by maya in ticket #1582: external/mit/xorg/lib/libX11/extensions/Makefile up to 1.2 external/mit/xorg/lib/libX11/Makefile up to 1.14 external/mit/xorg/lib/libX11/Makefile.libx11up to 1.19 external/mit/xorg/lib/libX11/Makefile.ximcp up to 1.5 external/mit/xorg/lib/libX11/Makefile.xlibi18n up to 1.3 Update libX11 from 1.6.5 to 1.6.10. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.13.8.1 src/external/mit/xorg/lib/libX11/Makefile cvs rdiff -u -r1.18 -r1.18.4.1 \ src/external/mit/xorg/lib/libX11/Makefile.libx11 cvs rdiff -u -r1.4 -r1.4.8.1 src/external/mit/xorg/lib/libX11/Makefile.ximcp cvs rdiff -u -r1.2 -r1.2.8.1 \ src/external/mit/xorg/lib/libX11/Makefile.xlibi18n cvs rdiff -u -r0 -r1.2.6.2 \ src/external/mit/xorg/lib/libX11/extensions/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] xsrc/external/mit/libX11/dist
Module Name:xsrc Committed By: martin Date: Wed Aug 5 14:10:20 UTC 2020 Modified Files: xsrc/external/mit/libX11/dist [netbsd-8]: ChangeLog Makefile.am Makefile.in aclocal.m4 config.guess config.sub configure configure.ac depcomp install-sh ltmain.sh xsrc/external/mit/libX11/dist/include [netbsd-8]: Makefile.am Makefile.in xsrc/external/mit/libX11/dist/include/X11 [netbsd-8]: Xlib.h Xlibint.h xsrc/external/mit/libX11/dist/m4 [netbsd-8]: libtool.m4 xsrc/external/mit/libX11/dist/man [netbsd-8]: AllPlanes.man BlackPixelOfScreen.man Compose.man DisplayOfCCC.man ImageByteOrder.man IsCursorKey.man Makefile.in XAddConnectionWatch.man XAddHost.man XAllocClassHint.man XAllocColor.man XAllocIconSize.man XAllocSizeHints.man XAllocStandardColormap.man XAllocWMHints.man XAllowEvents.man XAnyEvent.man XButtonEvent.man XChangeKeyboardControl.man XChangeKeyboardMapping.man XChangePointerControl.man XChangeSaveSet.man XChangeWindowAttributes.man XCirculateEvent.man XCirculateRequestEvent.man XClearArea.man XClientMessageEvent.man XColormapEvent.man XConfigureEvent.man XConfigureRequestEvent.man XConfigureWindow.man XCopyArea.man XCreateColormap.man XCreateFontCursor.man XCreateFontSet.man XCreateGC.man XCreateIC.man XCreateOC.man XCreatePixmap.man XCreateRegion.man XCreateWindow.man XCreateWindowEvent.man XCrossingEvent.man XDefineCursor.man XDestroyWindow.man XDestroyWindowEvent.man XDrawArc.man XDrawImageString.man XDrawLine.man XDrawPoint.man XDrawRectangle.man XDrawString.man XDrawText.man XEmptyRegion.man XErrorEvent.man XExposeEvent.man XExtentsOfFontSet.man XFillRectangle.man XFilterEvent.man XFlush.man XFocusChangeEvent.man XFontSetExtents.man XFontsOfFontSet.man XFree.man XGetEventData.man XGetVisualInfo.man XGetWindowAttributes.man XGetWindowProperty.man XGetXCBConnection.man XGrabButton.man XGrabKey.man XGrabKeyboard.man XGrabPointer.man XGrabServer.man XGraphicsExposeEvent.man XGravityEvent.man XIconifyWindow.man XIfEvent.man XInitImage.man XInitThreads.man XInstallColormap.man XInternAtom.man XIntersectRegion.man XKeymapEvent.man XListFonts.man XLoadFont.man XLookupKeysym.man XMapEvent.man XMapRequestEvent.man XMapWindow.man XNextEvent.man XNoOp.man XOpenDisplay.man XOpenIM.man XOpenOM.man XParseGeometry.man XPolygonRegion.man XPropertyEvent.man XPutBackEvent.man XPutImage.man XQueryBestSize.man XQueryColor.man XQueryExtension.man XQueryPointer.man XQueryTree.man XRaiseWindow.man XReadBitmapFile.man XRecolorCursor.man XReparentEvent.man XReparentWindow.man XResizeRequestEvent.man XResourceManagerString.man XSaveContext.man XSelectInput.man XSelectionClearEvent.man XSelectionEvent.man XSelectionRequestEvent.man XSendEvent.man XSetArcMode.man XSetClipOrigin.man XSetCloseDownMode.man XSetCommand.man XSetErrorHandler.man XSetEventQueueOwner.man XSetFillStyle.man XSetFont.man XSetFontPath.man XSetICFocus.man XSetICValues.man XSetInputFocus.man XSetLineAttributes.man XSetPointerMapping.man XSetScreenSaver.man XSetSelectionOwner.man XSetState.man XSetTextProperty.man XSetTile.man XSetTransientForHint.man XSetWMClientMachine.man XSetWMColormapWindows.man XSetWMIconName.man XSetWMName.man XSetWMProperties.man XSetWMProtocols.man XStoreBytes.man XStoreColors.man XStringListToTextProperty.man XStringToKeysym.man XSupportsLocale.man XSynchronize.man XTextExtents.man XTextWidth.man XTranslateCoordinates.man XUnmapEvent.man XUnmapWindow.man XVaCreateNestedList.man XVisibilityEvent.man XWarpPointer.man XcmsAllocColor.man XcmsCCCOfColormap.man XcmsCIELabQueryMaxC.man XcmsCIELuvQueryMaxC.man XcmsColor.man XcmsConvertColors.man XcmsCreateCCC.man XcmsDefaultCCC.man XcmsQueryBlack.man XcmsQueryColor.man XcmsSetWhitePoint.man XcmsStoreColor.man XcmsTekHVCQueryMaxC.man XmbDrawImageString.man XmbDrawString.man XmbDrawText.man XmbLookupString.man XmbResetIC.man XmbTextEscapement.man XmbTextExtents.man XmbTextListToTextProperty.man XmbTextPerCharExtents.man XrmEnumerateDatabase.man XrmGetFileDatabase.man XrmGetResource.man XrmInitialize.man XrmMergeDatabases.man XrmPutResource.man XrmUniqueQuark.man xsrc/external/mit/libX11/dist/man/xkb [netbsd-8]: Makefile.am Makefile.in
CVS commit: [netbsd-8] xsrc/external/mit/libX11/dist
Module Name:xsrc Committed By: martin Date: Wed Aug 5 14:10:20 UTC 2020 Modified Files: xsrc/external/mit/libX11/dist [netbsd-8]: ChangeLog Makefile.am Makefile.in aclocal.m4 config.guess config.sub configure configure.ac depcomp install-sh ltmain.sh xsrc/external/mit/libX11/dist/include [netbsd-8]: Makefile.am Makefile.in xsrc/external/mit/libX11/dist/include/X11 [netbsd-8]: Xlib.h Xlibint.h xsrc/external/mit/libX11/dist/m4 [netbsd-8]: libtool.m4 xsrc/external/mit/libX11/dist/man [netbsd-8]: AllPlanes.man BlackPixelOfScreen.man Compose.man DisplayOfCCC.man ImageByteOrder.man IsCursorKey.man Makefile.in XAddConnectionWatch.man XAddHost.man XAllocClassHint.man XAllocColor.man XAllocIconSize.man XAllocSizeHints.man XAllocStandardColormap.man XAllocWMHints.man XAllowEvents.man XAnyEvent.man XButtonEvent.man XChangeKeyboardControl.man XChangeKeyboardMapping.man XChangePointerControl.man XChangeSaveSet.man XChangeWindowAttributes.man XCirculateEvent.man XCirculateRequestEvent.man XClearArea.man XClientMessageEvent.man XColormapEvent.man XConfigureEvent.man XConfigureRequestEvent.man XConfigureWindow.man XCopyArea.man XCreateColormap.man XCreateFontCursor.man XCreateFontSet.man XCreateGC.man XCreateIC.man XCreateOC.man XCreatePixmap.man XCreateRegion.man XCreateWindow.man XCreateWindowEvent.man XCrossingEvent.man XDefineCursor.man XDestroyWindow.man XDestroyWindowEvent.man XDrawArc.man XDrawImageString.man XDrawLine.man XDrawPoint.man XDrawRectangle.man XDrawString.man XDrawText.man XEmptyRegion.man XErrorEvent.man XExposeEvent.man XExtentsOfFontSet.man XFillRectangle.man XFilterEvent.man XFlush.man XFocusChangeEvent.man XFontSetExtents.man XFontsOfFontSet.man XFree.man XGetEventData.man XGetVisualInfo.man XGetWindowAttributes.man XGetWindowProperty.man XGetXCBConnection.man XGrabButton.man XGrabKey.man XGrabKeyboard.man XGrabPointer.man XGrabServer.man XGraphicsExposeEvent.man XGravityEvent.man XIconifyWindow.man XIfEvent.man XInitImage.man XInitThreads.man XInstallColormap.man XInternAtom.man XIntersectRegion.man XKeymapEvent.man XListFonts.man XLoadFont.man XLookupKeysym.man XMapEvent.man XMapRequestEvent.man XMapWindow.man XNextEvent.man XNoOp.man XOpenDisplay.man XOpenIM.man XOpenOM.man XParseGeometry.man XPolygonRegion.man XPropertyEvent.man XPutBackEvent.man XPutImage.man XQueryBestSize.man XQueryColor.man XQueryExtension.man XQueryPointer.man XQueryTree.man XRaiseWindow.man XReadBitmapFile.man XRecolorCursor.man XReparentEvent.man XReparentWindow.man XResizeRequestEvent.man XResourceManagerString.man XSaveContext.man XSelectInput.man XSelectionClearEvent.man XSelectionEvent.man XSelectionRequestEvent.man XSendEvent.man XSetArcMode.man XSetClipOrigin.man XSetCloseDownMode.man XSetCommand.man XSetErrorHandler.man XSetEventQueueOwner.man XSetFillStyle.man XSetFont.man XSetFontPath.man XSetICFocus.man XSetICValues.man XSetInputFocus.man XSetLineAttributes.man XSetPointerMapping.man XSetScreenSaver.man XSetSelectionOwner.man XSetState.man XSetTextProperty.man XSetTile.man XSetTransientForHint.man XSetWMClientMachine.man XSetWMColormapWindows.man XSetWMIconName.man XSetWMName.man XSetWMProperties.man XSetWMProtocols.man XStoreBytes.man XStoreColors.man XStringListToTextProperty.man XStringToKeysym.man XSupportsLocale.man XSynchronize.man XTextExtents.man XTextWidth.man XTranslateCoordinates.man XUnmapEvent.man XUnmapWindow.man XVaCreateNestedList.man XVisibilityEvent.man XWarpPointer.man XcmsAllocColor.man XcmsCCCOfColormap.man XcmsCIELabQueryMaxC.man XcmsCIELuvQueryMaxC.man XcmsColor.man XcmsConvertColors.man XcmsCreateCCC.man XcmsDefaultCCC.man XcmsQueryBlack.man XcmsQueryColor.man XcmsSetWhitePoint.man XcmsStoreColor.man XcmsTekHVCQueryMaxC.man XmbDrawImageString.man XmbDrawString.man XmbDrawText.man XmbLookupString.man XmbResetIC.man XmbTextEscapement.man XmbTextExtents.man XmbTextListToTextProperty.man XmbTextPerCharExtents.man XrmEnumerateDatabase.man XrmGetFileDatabase.man XrmGetResource.man XrmInitialize.man XrmMergeDatabases.man XrmPutResource.man XrmUniqueQuark.man xsrc/external/mit/libX11/dist/man/xkb [netbsd-8]: Makefile.am Makefile.in
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Wed Aug 5 13:48:13 UTC 2020 Modified Files: src/doc [netbsd-9]: CHANGES-9.1 Log Message: Ammend ticket #1033 To generate a diff of this commit: cvs rdiff -u -r1.1.2.88 -r1.1.2.89 src/doc/CHANGES-9.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.1 diff -u src/doc/CHANGES-9.1:1.1.2.88 src/doc/CHANGES-9.1:1.1.2.89 --- src/doc/CHANGES-9.1:1.1.2.88 Mon Aug 3 09:20:29 2020 +++ src/doc/CHANGES-9.1 Wed Aug 5 13:48:13 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.1,v 1.1.2.88 2020/08/03 09:20:29 martin Exp $ +# $NetBSD: CHANGES-9.1,v 1.1.2.89 2020/08/05 13:48:13 martin Exp $ A complete list of changes from the NetBSD 9.0 release to the NetBSD 9.1 release: @@ -3580,9 +3580,382 @@ sys/modules/nvmm/nvmm.ioconf 1.2 xsrc/external/mit/xorg-server.old/dist/dix/pixmap.c 1.2 xsrc/external/mit/xorg-server/dist/dix/pixmap.c 1.2 +xsrc/external/mit/libX11/dist/include/X11/extensions/XKBgeom.h up to 1.1.1.1 +xsrc/external/mit/libX11/dist/ChangeLog up to 1.1.1.21 +xsrc/external/mit/libX11/dist/Makefile.inup to 1.1.1.19 +xsrc/external/mit/libX11/dist/README.md up to 1.1.1.2 +xsrc/external/mit/libX11/dist/aclocal.m4 up to 1.1.1.19 +xsrc/external/mit/libX11/dist/compileup to 1.1.1.7 +xsrc/external/mit/libX11/dist/config.guess up to 1.1.1.14 +xsrc/external/mit/libX11/dist/config.sub up to 1.1.1.13 +xsrc/external/mit/libX11/dist/configure up to 1.1.1.21 +xsrc/external/mit/libX11/dist/configure.ac up to 1.1.1.21 +xsrc/external/mit/libX11/dist/depcompup to 1.1.1.10 +xsrc/external/mit/libX11/dist/install-sh up to 1.1.1.10 +xsrc/external/mit/libX11/dist/ltmain.sh up to 1.1.1.14 +xsrc/external/mit/libX11/dist/missingup to 1.1.1.9 +xsrc/external/mit/libX11/dist/test-driverup to 1.1.1.7 +xsrc/external/mit/libX11/dist/include/Makefile.amup to 1.1.1.3 +xsrc/external/mit/libX11/dist/include/Makefile.inup to 1.1.1.20 +xsrc/external/mit/libX11/dist/include/X11/Xlib.h up to 1.1.1.9 +xsrc/external/mit/libX11/dist/include/X11/Xlibint.h up to 1.1.1.12 +xsrc/external/mit/libX11/dist/m4/libtool.m4 up to 1.9 +xsrc/external/mit/libX11/dist/man/AllPlanes.man up to 1.1.1.5 +xsrc/external/mit/libX11/dist/man/BlackPixelOfScreen.man up to 1.1.1.4 +xsrc/external/mit/libX11/dist/man/Compose.manup to 1.1.1.6 +xsrc/external/mit/libX11/dist/man/DisplayOfCCC.man up to 1.1.1.5 +xsrc/external/mit/libX11/dist/man/ImageByteOrder.man up to 1.1.1.4 +xsrc/external/mit/libX11/dist/man/IsCursorKey.manup to 1.1.1.4 +xsrc/external/mit/libX11/dist/man/Makefile.inup to 1.1.1.19 +xsrc/external/mit/libX11/dist/man/XAddConnectionWatch.man up to 1.1.1.5 +xsrc/external/mit/libX11/dist/man/XAddHost.man up to 1.1.1.6 +xsrc/external/mit/libX11/dist/man/XAllocClassHint.man up to 1.1.1.4 +xsrc/external/mit/libX11/dist/man/XAllocColor.manup to 1.1.1.6 +xsrc/external/mit/libX11/dist/man/XAllocIconSize.man up to 1.1.1.5 +xsrc/external/mit/libX11/dist/man/XAllocSizeHints.man up to 1.1.1.4 +xsrc/external/mit/libX11/dist/man/XAllocStandardColormap.man up to 1.1.1.4 +xsrc/external/mit/libX11/dist/man/XAllocWMHints.man up to 1.1.1.4 +xsrc/external/mit/libX11/dist/man/XAllowEvents.man up to 1.1.1.4 +xsrc/external/mit/libX11/dist/man/XAnyEvent.man up to 1.1.1.4 +xsrc/external/mit/libX11/dist/man/XButtonEvent.man up to 1.1.1.4 +xsrc/external/mit/libX11/dist/man/XChangeKeyboardControl.man up to 1.1.1.4 +xsrc/external/mit/libX11/dist/man/XChangeKeyboardMapping.man up to 1.1.1.5 +xsrc/external/mit/libX11/dist/man/XChangePointerControl.man up to 1.1.1.4 +xsrc/external/mit/libX11/dist/man/XChangeSaveSet.man up to 1.1.1.4 +xsrc/external/mit/libX11/dist/man/XChangeWindowAttributes.man up to 1.1.1.4 +xsrc/external/mit/libX11/dist/man/XCirculateEvent.man up to 1.1.1.4 +xsrc/external/mit/libX11/dist/man/XCirculateRequestEvent.man up to 1.1.1.4 +xsrc/external/mit/libX11/dist/man/XClearArea.man up to 1.1.1.4 +xsrc/external/mit/libX11/dist/man/XClientMessageEvent.man up to 1.1.1.4 +xsrc/external/mit/libX11/dist/man/XColormapEvent.man up to 1.1.1.4 +xsrc/external/mit/libX11/dist/man/XConfigureEvent.man up to 1.1.1.4 +xsrc/external/mit/libX11/dist/man/XConfigureRequestEvent.man up to 1.1.1.4 +xsrc/external/mit/libX11/dist/man/XConfigureWindow.man up to 1.1.1.4 +xsrc/external/mit/libX11/dist/man/XCopyArea.man up to 1.1.1.5 +xsrc/external/mit/libX11/dist/man/XCreateColormap.man up to 1.1.1.5 +xsrc/external/mit/libX11/dist/man/XCreateFontCursor.man up to 1.1.1.6 +xsrc/external/mit/libX11/dist/man/XCreateFontSet.man up to 1.1.1.5 +xsrc/external/mit/libX11/dist/man/XCreateGC.man up to 1.5 +xsrc/external/mit/libX11/dist/man/XCreateIC.man up to 1.1.1.4
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Wed Aug 5 13:48:13 UTC 2020 Modified Files: src/doc [netbsd-9]: CHANGES-9.1 Log Message: Ammend ticket #1033 To generate a diff of this commit: cvs rdiff -u -r1.1.2.88 -r1.1.2.89 src/doc/CHANGES-9.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] xsrc/external/mit/libX11/dist
Module Name:xsrc Committed By: martin Date: Wed Aug 5 13:44:43 UTC 2020 Modified Files: xsrc/external/mit/libX11/dist [netbsd-9]: ChangeLog Makefile.in README.md aclocal.m4 compile config.guess config.sub configure configure.ac depcomp install-sh ltmain.sh missing test-driver xsrc/external/mit/libX11/dist/include [netbsd-9]: Makefile.am Makefile.in xsrc/external/mit/libX11/dist/include/X11 [netbsd-9]: Xlib.h Xlibint.h xsrc/external/mit/libX11/dist/m4 [netbsd-9]: libtool.m4 xsrc/external/mit/libX11/dist/man [netbsd-9]: AllPlanes.man BlackPixelOfScreen.man Compose.man DisplayOfCCC.man ImageByteOrder.man IsCursorKey.man Makefile.in XAddConnectionWatch.man XAddHost.man XAllocClassHint.man XAllocColor.man XAllocIconSize.man XAllocSizeHints.man XAllocStandardColormap.man XAllocWMHints.man XAllowEvents.man XAnyEvent.man XButtonEvent.man XChangeKeyboardControl.man XChangeKeyboardMapping.man XChangePointerControl.man XChangeSaveSet.man XChangeWindowAttributes.man XCirculateEvent.man XCirculateRequestEvent.man XClearArea.man XClientMessageEvent.man XColormapEvent.man XConfigureEvent.man XConfigureRequestEvent.man XConfigureWindow.man XCopyArea.man XCreateColormap.man XCreateFontCursor.man XCreateFontSet.man XCreateGC.man XCreateIC.man XCreateOC.man XCreatePixmap.man XCreateRegion.man XCreateWindow.man XCreateWindowEvent.man XCrossingEvent.man XDefineCursor.man XDestroyWindow.man XDestroyWindowEvent.man XDrawArc.man XDrawImageString.man XDrawLine.man XDrawPoint.man XDrawRectangle.man XDrawString.man XDrawText.man XEmptyRegion.man XErrorEvent.man XExposeEvent.man XExtentsOfFontSet.man XFillRectangle.man XFilterEvent.man XFlush.man XFocusChangeEvent.man XFontSetExtents.man XFontsOfFontSet.man XFree.man XGetEventData.man XGetVisualInfo.man XGetWindowAttributes.man XGetWindowProperty.man XGetXCBConnection.man XGrabButton.man XGrabKey.man XGrabKeyboard.man XGrabPointer.man XGrabServer.man XGraphicsExposeEvent.man XGravityEvent.man XIconifyWindow.man XIfEvent.man XInitImage.man XInitThreads.man XInstallColormap.man XInternAtom.man XIntersectRegion.man XKeymapEvent.man XListFonts.man XLoadFont.man XLookupKeysym.man XMapEvent.man XMapRequestEvent.man XMapWindow.man XNextEvent.man XNoOp.man XOpenDisplay.man XOpenIM.man XOpenOM.man XParseGeometry.man XPolygonRegion.man XPropertyEvent.man XPutBackEvent.man XPutImage.man XQueryBestSize.man XQueryColor.man XQueryExtension.man XQueryPointer.man XQueryTree.man XRaiseWindow.man XReadBitmapFile.man XRecolorCursor.man XReparentEvent.man XReparentWindow.man XResizeRequestEvent.man XResourceManagerString.man XSaveContext.man XSelectInput.man XSelectionClearEvent.man XSelectionEvent.man XSelectionRequestEvent.man XSendEvent.man XSetArcMode.man XSetClipOrigin.man XSetCloseDownMode.man XSetCommand.man XSetErrorHandler.man XSetEventQueueOwner.man XSetFillStyle.man XSetFont.man XSetFontPath.man XSetICFocus.man XSetICValues.man XSetInputFocus.man XSetLineAttributes.man XSetPointerMapping.man XSetScreenSaver.man XSetSelectionOwner.man XSetState.man XSetTextProperty.man XSetTile.man XSetTransientForHint.man XSetWMClientMachine.man XSetWMColormapWindows.man XSetWMIconName.man XSetWMName.man XSetWMProperties.man XSetWMProtocols.man XStoreBytes.man XStoreColors.man XStringListToTextProperty.man XStringToKeysym.man XSupportsLocale.man XSynchronize.man XTextExtents.man XTextWidth.man XTranslateCoordinates.man XUnmapEvent.man XUnmapWindow.man XVaCreateNestedList.man XVisibilityEvent.man XWarpPointer.man XcmsAllocColor.man XcmsCCCOfColormap.man XcmsCIELabQueryMaxC.man XcmsCIELuvQueryMaxC.man XcmsColor.man XcmsConvertColors.man XcmsCreateCCC.man XcmsDefaultCCC.man XcmsQueryBlack.man XcmsQueryColor.man XcmsSetWhitePoint.man XcmsStoreColor.man XcmsTekHVCQueryMaxC.man XmbDrawImageString.man XmbDrawString.man XmbDrawText.man XmbLookupString.man XmbResetIC.man XmbTextEscapement.man XmbTextExtents.man XmbTextListToTextProperty.man XmbTextPerCharExtents.man XrmEnumerateDatabase.man XrmGetFileDatabase.man XrmGetResource.man XrmInitialize.man XrmMergeDatabases.man XrmPutResource.man XrmUniqueQuark.man xsrc/external/mit/libX11/dist/man/xkb [netbsd-9]: Makefile.in
CVS commit: [netbsd-9] xsrc/external/mit/libX11/dist
Module Name:xsrc Committed By: martin Date: Wed Aug 5 13:44:43 UTC 2020 Modified Files: xsrc/external/mit/libX11/dist [netbsd-9]: ChangeLog Makefile.in README.md aclocal.m4 compile config.guess config.sub configure configure.ac depcomp install-sh ltmain.sh missing test-driver xsrc/external/mit/libX11/dist/include [netbsd-9]: Makefile.am Makefile.in xsrc/external/mit/libX11/dist/include/X11 [netbsd-9]: Xlib.h Xlibint.h xsrc/external/mit/libX11/dist/m4 [netbsd-9]: libtool.m4 xsrc/external/mit/libX11/dist/man [netbsd-9]: AllPlanes.man BlackPixelOfScreen.man Compose.man DisplayOfCCC.man ImageByteOrder.man IsCursorKey.man Makefile.in XAddConnectionWatch.man XAddHost.man XAllocClassHint.man XAllocColor.man XAllocIconSize.man XAllocSizeHints.man XAllocStandardColormap.man XAllocWMHints.man XAllowEvents.man XAnyEvent.man XButtonEvent.man XChangeKeyboardControl.man XChangeKeyboardMapping.man XChangePointerControl.man XChangeSaveSet.man XChangeWindowAttributes.man XCirculateEvent.man XCirculateRequestEvent.man XClearArea.man XClientMessageEvent.man XColormapEvent.man XConfigureEvent.man XConfigureRequestEvent.man XConfigureWindow.man XCopyArea.man XCreateColormap.man XCreateFontCursor.man XCreateFontSet.man XCreateGC.man XCreateIC.man XCreateOC.man XCreatePixmap.man XCreateRegion.man XCreateWindow.man XCreateWindowEvent.man XCrossingEvent.man XDefineCursor.man XDestroyWindow.man XDestroyWindowEvent.man XDrawArc.man XDrawImageString.man XDrawLine.man XDrawPoint.man XDrawRectangle.man XDrawString.man XDrawText.man XEmptyRegion.man XErrorEvent.man XExposeEvent.man XExtentsOfFontSet.man XFillRectangle.man XFilterEvent.man XFlush.man XFocusChangeEvent.man XFontSetExtents.man XFontsOfFontSet.man XFree.man XGetEventData.man XGetVisualInfo.man XGetWindowAttributes.man XGetWindowProperty.man XGetXCBConnection.man XGrabButton.man XGrabKey.man XGrabKeyboard.man XGrabPointer.man XGrabServer.man XGraphicsExposeEvent.man XGravityEvent.man XIconifyWindow.man XIfEvent.man XInitImage.man XInitThreads.man XInstallColormap.man XInternAtom.man XIntersectRegion.man XKeymapEvent.man XListFonts.man XLoadFont.man XLookupKeysym.man XMapEvent.man XMapRequestEvent.man XMapWindow.man XNextEvent.man XNoOp.man XOpenDisplay.man XOpenIM.man XOpenOM.man XParseGeometry.man XPolygonRegion.man XPropertyEvent.man XPutBackEvent.man XPutImage.man XQueryBestSize.man XQueryColor.man XQueryExtension.man XQueryPointer.man XQueryTree.man XRaiseWindow.man XReadBitmapFile.man XRecolorCursor.man XReparentEvent.man XReparentWindow.man XResizeRequestEvent.man XResourceManagerString.man XSaveContext.man XSelectInput.man XSelectionClearEvent.man XSelectionEvent.man XSelectionRequestEvent.man XSendEvent.man XSetArcMode.man XSetClipOrigin.man XSetCloseDownMode.man XSetCommand.man XSetErrorHandler.man XSetEventQueueOwner.man XSetFillStyle.man XSetFont.man XSetFontPath.man XSetICFocus.man XSetICValues.man XSetInputFocus.man XSetLineAttributes.man XSetPointerMapping.man XSetScreenSaver.man XSetSelectionOwner.man XSetState.man XSetTextProperty.man XSetTile.man XSetTransientForHint.man XSetWMClientMachine.man XSetWMColormapWindows.man XSetWMIconName.man XSetWMName.man XSetWMProperties.man XSetWMProtocols.man XStoreBytes.man XStoreColors.man XStringListToTextProperty.man XStringToKeysym.man XSupportsLocale.man XSynchronize.man XTextExtents.man XTextWidth.man XTranslateCoordinates.man XUnmapEvent.man XUnmapWindow.man XVaCreateNestedList.man XVisibilityEvent.man XWarpPointer.man XcmsAllocColor.man XcmsCCCOfColormap.man XcmsCIELabQueryMaxC.man XcmsCIELuvQueryMaxC.man XcmsColor.man XcmsConvertColors.man XcmsCreateCCC.man XcmsDefaultCCC.man XcmsQueryBlack.man XcmsQueryColor.man XcmsSetWhitePoint.man XcmsStoreColor.man XcmsTekHVCQueryMaxC.man XmbDrawImageString.man XmbDrawString.man XmbDrawText.man XmbLookupString.man XmbResetIC.man XmbTextEscapement.man XmbTextExtents.man XmbTextListToTextProperty.man XmbTextPerCharExtents.man XrmEnumerateDatabase.man XrmGetFileDatabase.man XrmGetResource.man XrmInitialize.man XrmMergeDatabases.man XrmPutResource.man XrmUniqueQuark.man xsrc/external/mit/libX11/dist/man/xkb [netbsd-9]: Makefile.in
CVS commit: src/sys/modules/nvmm
Module Name:src Committed By: maxv Date: Wed Aug 5 10:33:01 UTC 2020 Modified Files: src/sys/modules/nvmm: Makefile Log Message: Upgrade NVMM to WARNS=5. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/modules/nvmm/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/modules/nvmm/Makefile diff -u src/sys/modules/nvmm/Makefile:1.4 src/sys/modules/nvmm/Makefile:1.5 --- src/sys/modules/nvmm/Makefile:1.4 Sat Feb 23 12:27:00 2019 +++ src/sys/modules/nvmm/Makefile Wed Aug 5 10:33:01 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2019/02/23 12:27:00 maxv Exp $ +# $NetBSD: Makefile,v 1.5 2020/08/05 10:33:01 maxv Exp $ .include "../Makefile.inc" .include "../Makefile.assym" @@ -18,6 +18,6 @@ SRCS+= nvmm_x86_svm.c nvmm_x86_svmfunc.S SRCS+= nvmm_x86_vmx.c nvmm_x86_vmxfunc.S .endif -WARNS= 3 +WARNS= 5 .include
CVS commit: src/sys/modules/nvmm
Module Name:src Committed By: maxv Date: Wed Aug 5 10:33:01 UTC 2020 Modified Files: src/sys/modules/nvmm: Makefile Log Message: Upgrade NVMM to WARNS=5. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/modules/nvmm/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/nvmm/x86
Module Name:src Committed By: maxv Date: Wed Aug 5 10:31:37 UTC 2020 Modified Files: src/sys/dev/nvmm/x86: nvmm_x86_svm.c Log Message: Use ULL, to make it clear we are unsigned. To generate a diff of this commit: cvs rdiff -u -r1.65 -r1.66 src/sys/dev/nvmm/x86/nvmm_x86_svm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/nvmm/x86/nvmm_x86_svm.c diff -u src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.65 src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.66 --- src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.65 Sun Jul 19 06:56:09 2020 +++ src/sys/dev/nvmm/x86/nvmm_x86_svm.c Wed Aug 5 10:31:37 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: nvmm_x86_svm.c,v 1.65 2020/07/19 06:56:09 maxv Exp $ */ +/* $NetBSD: nvmm_x86_svm.c,v 1.66 2020/08/05 10:31:37 maxv Exp $ */ /* * Copyright (c) 2018-2020 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.65 2020/07/19 06:56:09 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.66 2020/08/05 10:31:37 maxv Exp $"); #include #include @@ -237,7 +237,7 @@ svm_stgi(void) #define VMCB_EXITCODE_AVIC_INCOMP_IPI 0x0401 #define VMCB_EXITCODE_AVIC_NOACCEL 0x0402 #define VMCB_EXITCODE_VMGEXIT 0x0403 -#define VMCB_EXITCODE_INVALID -1 +#define VMCB_EXITCODE_INVALID -1ULL /* -- */
CVS commit: src/sys/dev/nvmm/x86
Module Name:src Committed By: maxv Date: Wed Aug 5 10:31:37 UTC 2020 Modified Files: src/sys/dev/nvmm/x86: nvmm_x86_svm.c Log Message: Use ULL, to make it clear we are unsigned. To generate a diff of this commit: cvs rdiff -u -r1.65 -r1.66 src/sys/dev/nvmm/x86/nvmm_x86_svm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/nvmm/x86
Module Name:src Committed By: maxv Date: Wed Aug 5 10:20:50 UTC 2020 Modified Files: src/sys/dev/nvmm/x86: nvmm_x86_vmx.c Log Message: Simplify, remove unnecessary #ifdef DIAGNOSTIC around KASSERTs. To generate a diff of this commit: cvs rdiff -u -r1.65 -r1.66 src/sys/dev/nvmm/x86/nvmm_x86_vmx.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/nvmm/x86
Module Name:src
Committed By: maxv
Date: Wed Aug 5 10:20:50 UTC 2020
Modified Files:
src/sys/dev/nvmm/x86: nvmm_x86_vmx.c
Log Message:
Simplify, remove unnecessary #ifdef DIAGNOSTIC around KASSERTs.
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/sys/dev/nvmm/x86/nvmm_x86_vmx.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/nvmm/x86/nvmm_x86_vmx.c
diff -u src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.65 src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.66
--- src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.65 Sun Jul 19 06:56:09 2020
+++ src/sys/dev/nvmm/x86/nvmm_x86_vmx.c Wed Aug 5 10:20:50 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nvmm_x86_vmx.c,v 1.65 2020/07/19 06:56:09 maxv Exp $ */
+/* $NetBSD: nvmm_x86_vmx.c,v 1.66 2020/08/05 10:20:50 maxv Exp $ */
/*
* Copyright (c) 2018-2020 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_vmx.c,v 1.65 2020/07/19 06:56:09 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_vmx.c,v 1.66 2020/08/05 10:20:50 maxv Exp $");
#include
#include
@@ -883,15 +883,11 @@ vmx_vmcs_enter(struct nvmm_cpu *vcpu)
{
struct vmx_cpudata *cpudata = vcpu->cpudata;
struct cpu_info *vmcs_ci;
- paddr_t oldpa __diagused;
cpudata->vmcs_refcnt++;
if (cpudata->vmcs_refcnt > 1) {
-#ifdef DIAGNOSTIC
KASSERT(kpreempt_disabled());
- oldpa = vmx_vmptrst();
- KASSERT(oldpa == cpudata->vmcs_pa);
-#endif
+ KASSERT(vmx_vmptrst() == cpudata->vmcs_pa);
return;
}
@@ -921,9 +917,7 @@ vmx_vmcs_leave(struct nvmm_cpu *vcpu)
struct vmx_cpudata *cpudata = vcpu->cpudata;
KASSERT(kpreempt_disabled());
-#ifdef DIAGNOSTIC
KASSERT(vmx_vmptrst() == cpudata->vmcs_pa);
-#endif
KASSERT(cpudata->vmcs_refcnt > 0);
cpudata->vmcs_refcnt--;
@@ -941,9 +935,7 @@ vmx_vmcs_destroy(struct nvmm_cpu *vcpu)
struct vmx_cpudata *cpudata = vcpu->cpudata;
KASSERT(kpreempt_disabled());
-#ifdef DIAGNOSTIC
KASSERT(vmx_vmptrst() == cpudata->vmcs_pa);
-#endif
KASSERT(cpudata->vmcs_refcnt == 1);
cpudata->vmcs_refcnt--;
CVS commit: src/usr.bin/make
Module Name:src Committed By: dholland Date: Wed Aug 5 08:50:42 UTC 2020 Modified Files: src/usr.bin/make: make.1 Log Message: Also mention that make dependency operators must be uniform. This wasn't previously documented, I think. To generate a diff of this commit: cvs rdiff -u -r1.285 -r1.286 src/usr.bin/make/make.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/make/make.1 diff -u src/usr.bin/make/make.1:1.285 src/usr.bin/make/make.1:1.286 --- src/usr.bin/make/make.1:1.285 Wed Aug 5 08:43:24 2020 +++ src/usr.bin/make/make.1 Wed Aug 5 08:50:42 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: make.1,v 1.285 2020/08/05 08:43:24 dholland Exp $ +.\" $NetBSD: make.1,v 1.286 2020/08/05 08:50:42 dholland Exp $ .\" .\" Copyright (c) 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -455,6 +455,8 @@ the target will not be removed if .Nm is interrupted. .El +All dependency lines mentioning a particular target must use the same +operator. .Pp Targets and sources may contain the shell wildcard values .Ql \&? ,
CVS commit: src/usr.bin/make
Module Name:src Committed By: dholland Date: Wed Aug 5 08:50:42 UTC 2020 Modified Files: src/usr.bin/make: make.1 Log Message: Also mention that make dependency operators must be uniform. This wasn't previously documented, I think. To generate a diff of this commit: cvs rdiff -u -r1.285 -r1.286 src/usr.bin/make/make.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src Committed By: dholland Date: Wed Aug 5 08:43:24 UTC 2020 Modified Files: src/usr.bin/make: make.1 Log Message: Rework the description of the :, !, and :: dependence operators to make sense. Bump date. To generate a diff of this commit: cvs rdiff -u -r1.284 -r1.285 src/usr.bin/make/make.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/make/make.1 diff -u src/usr.bin/make/make.1:1.284 src/usr.bin/make/make.1:1.285 --- src/usr.bin/make/make.1:1.284 Fri Jul 31 20:22:10 2020 +++ src/usr.bin/make/make.1 Wed Aug 5 08:43:24 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: make.1,v 1.284 2020/07/31 20:22:10 sjg Exp $ +.\" $NetBSD: make.1,v 1.285 2020/08/05 08:43:24 dholland Exp $ .\" .\" Copyright (c) 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" from: @(#)make.1 8.4 (Berkeley) 3/19/94 .\" -.Dd July 31, 2020 +.Dd August 5, 2020 .Dt MAKE 1 .Os .Sh NAME @@ -419,34 +419,39 @@ or more sources. This creates a relationship where the targets .Dq depend on the sources -and are usually created from them. -The exact relationship between the target and the source is determined -by the operator that separates them. -The three operators are as follows: +and are customarily created from them. +A target is considered out-of-date if it does not exist, or if its +modification time is less than that of any of its sources. +An out-of-date target will be re-created, but not until all sources +have been examined and themselves re-created as needed. +Three operators may be used: .Bl -tag -width flag .It Ic \&: -A target is considered out-of-date if its modification time is less than -those of any of its sources. -Sources for a target accumulate over dependency lines when this operator -is used. -The target is removed if +Many dependency lines may name this target but only one may have +attached shell commands. +All sources named in all dependency lines are considered together, +and if needed the attached shell commands are run to create or +re-create the target. +If .Nm -is interrupted. +is interrupted, the target is removed. .It Ic \&! -Targets are always re-created, but not until all sources have been -examined and re-created as necessary. -Sources for a target accumulate over dependency lines when this operator -is used. -The target is removed if -.Nm -is interrupted. +The same, but the target is always re-created whether or not it is out +of date. .It Ic \&:: -If no sources are specified, the target is always re-created. -Otherwise, a target is considered out-of-date if any of its sources has -been modified more recently than the target. -Sources for a target do not accumulate over dependency lines when this -operator is used. -The target will not be removed if +Any dependency line may have attached shell commands, but each one +is handled independently: its sources are considered and the attached +shell commands are run if the target is out of date with respect to +(only) those sources. +Thus, different groups of the attached shell commands may be run +depending on the circumstances. +Furthermore, unlike +.Ic \&:, +for dependency lines with no sources, the attached shell +commands are always run. +Also unlike +.Ic \&:, +the target will not be removed if .Nm is interrupted. .El
CVS commit: src/usr.bin/make
Module Name:src Committed By: dholland Date: Wed Aug 5 08:43:24 UTC 2020 Modified Files: src/usr.bin/make: make.1 Log Message: Rework the description of the :, !, and :: dependence operators to make sense. Bump date. To generate a diff of this commit: cvs rdiff -u -r1.284 -r1.285 src/usr.bin/make/make.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
