diff options
| -rw-r--r-- | exception_lists/copyright | 4 | ||||
| -rw-r--r-- | usr/src/cmd/bhyve/README.license | 5 | ||||
| -rw-r--r-- | usr/src/cmd/bhyvectl/README.license | 5 | ||||
| -rw-r--r-- | usr/src/contrib/bhyve/x86/specialreg.h | 1 | ||||
| -rw-r--r-- | usr/src/lib/libvmmapi/README.license | 5 | ||||
| -rw-r--r-- | usr/src/uts/i86pc/io/vmm/README.license | 5 | ||||
| -rw-r--r-- | usr/src/uts/i86pc/io/vmm/amd/svm_msr.c | 26 |
7 files changed, 50 insertions, 1 deletions
diff --git a/exception_lists/copyright b/exception_lists/copyright index 45c53c793c..5e5e6a8f42 100644 --- a/exception_lists/copyright +++ b/exception_lists/copyright @@ -572,3 +572,7 @@ usr/src/uts/i86pc/io/vmm/x86.[ch] 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 diff --git a/usr/src/cmd/bhyve/README.license b/usr/src/cmd/bhyve/README.license new file mode 100644 index 0000000000..55ad5d596d --- /dev/null +++ b/usr/src/cmd/bhyve/README.license @@ -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. diff --git a/usr/src/cmd/bhyvectl/README.license b/usr/src/cmd/bhyvectl/README.license new file mode 100644 index 0000000000..55ad5d596d --- /dev/null +++ b/usr/src/cmd/bhyvectl/README.license @@ -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. diff --git a/usr/src/contrib/bhyve/x86/specialreg.h b/usr/src/contrib/bhyve/x86/specialreg.h index f528bad55c..b170cf3981 100644 --- a/usr/src/contrib/bhyve/x86/specialreg.h +++ b/usr/src/contrib/bhyve/x86/specialreg.h @@ -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 */ diff --git a/usr/src/lib/libvmmapi/README.license b/usr/src/lib/libvmmapi/README.license new file mode 100644 index 0000000000..55ad5d596d --- /dev/null +++ b/usr/src/lib/libvmmapi/README.license @@ -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. diff --git a/usr/src/uts/i86pc/io/vmm/README.license b/usr/src/uts/i86pc/io/vmm/README.license new file mode 100644 index 0000000000..55ad5d596d --- /dev/null +++ b/usr/src/uts/i86pc/io/vmm/README.license @@ -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. diff --git a/usr/src/uts/i86pc/io/vmm/amd/svm_msr.c b/usr/src/uts/i86pc/io/vmm/amd/svm_msr.c index 0c1ce0e4e0..75502d3c8e 100644 --- a/usr/src/uts/i86pc/io/vmm/amd/svm_msr.c +++ b/usr/src/uts/i86pc/io/vmm/amd/svm_msr.c @@ -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 @@ svm_rdmsr(struct svm_softc *sc, int vcpu, u_int num, uint64_t *result, 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 @@ svm_wrmsr(struct svm_softc *sc, int vcpu, u_int num, uint64_t val, bool *retu) 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. |