Mercurial > illumos > git > illumos-joyent
changeset 25263:8b234f4d1c8e
[illumos-gate merge]
commit 425a83377a83720d1e9907ec3641a499a5eed18f
12998 OpenBSD needs DE_CFG MSR on AMD bhyve
commit ec82ad7502f4abb881c6b3012833e59fd3c24594
13000 bhyve sources should reflect license details
| author | Jerry Jelinek <jerry.jelinek@joyent.com> |
|---|---|
| date | Mon, 03 Aug 2020 11:33:28 +0000 |
| parents | 30063115dff3 (current diff) 487938f37bf8 (diff) |
| children | a9984e6d255f |
| files | exception_lists/copyright usr/src/contrib/bhyve/x86/specialreg.h usr/src/uts/i86pc/io/vmm/amd/svm_msr.c |
| diffstat | 7 files changed, 50 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/exception_lists/copyright Fri Jul 31 11:28:55 2020 +0000 +++ b/exception_lists/copyright Mon Aug 03 11:33:28 2020 +0000 @@ -572,3 +572,7 @@ usr/src/uts/i86pc/sys/vmm.h usr/src/uts/i86pc/sys/vmm_dev.h usr/src/uts/i86pc/sys/vmm_instruction_emul.h +usr/src/cmd/bhyve/README.license +usr/src/cmd/bhyvectl/README.license +usr/src/lib/libvmmapi/README.license +usr/src/uts/i86pc/io/vmm/README.license
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/usr/src/cmd/bhyve/README.license Mon Aug 03 11:33:28 2020 +0000 @@ -0,0 +1,5 @@ +Having been ported from FreeBSD, bhyve bears the BSD license. Subsequent +changes made to bhyve in illumos are dual-licensed under both the BSD license +and the CDDL. Use or redistribution of those subsequent changes may be done +under either license. The CDDL license header added to bhyve source files is +meant to cover only those dual-licensed modifications, not the entire file.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/usr/src/cmd/bhyvectl/README.license Mon Aug 03 11:33:28 2020 +0000 @@ -0,0 +1,5 @@ +Having been ported from FreeBSD, bhyve bears the BSD license. Subsequent +changes made to bhyve in illumos are dual-licensed under both the BSD license +and the CDDL. Use or redistribution of those subsequent changes may be done +under either license. The CDDL license header added to bhyve source files is +meant to cover only those dual-licensed modifications, not the entire file.
--- a/usr/src/contrib/bhyve/x86/specialreg.h Fri Jul 31 11:28:55 2020 +0000 +++ b/usr/src/contrib/bhyve/x86/specialreg.h Mon Aug 03 11:33:28 2020 +0000 @@ -1100,6 +1100,7 @@ #define MSR_EXTFEATURES 0xc0011005 /* Extended CPUID Features override */ #define MSR_LS_CFG 0xc0011020 #define MSR_IC_CFG 0xc0011021 /* Instruction Cache Configuration */ +#define MSR_DE_CFG 0xc0011029 /* Decode Configuration */ /* MSR_VM_CR related */ #define VM_CR_SVMDIS 0x10 /* SVM: disabled by BIOS */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/usr/src/lib/libvmmapi/README.license Mon Aug 03 11:33:28 2020 +0000 @@ -0,0 +1,5 @@ +Having been ported from FreeBSD, bhyve bears the BSD license. Subsequent +changes made to bhyve in illumos are dual-licensed under both the BSD license +and the CDDL. Use or redistribution of those subsequent changes may be done +under either license. The CDDL license header added to bhyve source files is +meant to cover only those dual-licensed modifications, not the entire file.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/usr/src/uts/i86pc/io/vmm/README.license Mon Aug 03 11:33:28 2020 +0000 @@ -0,0 +1,5 @@ +Having been ported from FreeBSD, bhyve bears the BSD license. Subsequent +changes made to bhyve in illumos are dual-licensed under both the BSD license +and the CDDL. Use or redistribution of those subsequent changes may be done +under either license. The CDDL license header added to bhyve source files is +meant to cover only those dual-licensed modifications, not the entire file.
--- a/usr/src/uts/i86pc/io/vmm/amd/svm_msr.c Fri Jul 31 11:28:55 2020 +0000 +++ b/usr/src/uts/i86pc/io/vmm/amd/svm_msr.c Mon Aug 03 11:33:28 2020 +0000 @@ -25,6 +25,18 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +/* + * This file and its contents are supplied under the terms of the + * Common Development and Distribution License ("CDDL"), version 1.0. + * You may only use this file in accordance with the terms of version + * 1.0 of the CDDL. + * + * A full copy of the text of the CDDL should have accompanied this + * source. A copy of the CDDL is also available via the Internet at + * http://www.illumos.org/license/CDDL. + * + * Copyright 2020 Oxide Computer Company + */ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); @@ -152,6 +164,14 @@ case MSR_EXTFEATURES: *result = 0; break; + case MSR_DE_CFG: + /* + * MSR_DE_CFG is used for a vast array of AMD errata, spanning + * from family 10h to 17h. In the future, it might make sense + * to more thoroughly emulate its contents. + */ + *result = 0; + break; default: error = EINVAL; break; @@ -177,7 +197,11 @@ case MSR_MTRR16kBase ... MSR_MTRR16kBase + 1: case MSR_MTRR64kBase: case MSR_SYSCFG: - break; /* Ignore writes */ + /* Ignore writes */ + break; + case MSR_DE_CFG: + /* Ignore writes for now. (See: svm_rdmsr) */ + break; case MSR_AMDK8_IPM: /* * Ignore writes to the "Interrupt Pending Message" MSR.