Merge branch 'kvm-5.20-early-patches' into HEAD

[linux-block.git] / arch / x86 / kvm / x86.c

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index e9473c7c73903a4fba783cb2c98bf04bdd63c1d7..921b1139c3030fb4c063d7f732e054ab61d97efc 100644 (file)
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -3234,10 +3234,13 @@ static int set_msr_mce(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
                        /* only 0 or all 1s can be written to IA32_MCi_CTL
                         * some Linux kernels though clear bit 10 in bank 4 to
                         * workaround a BIOS/GART TBL issue on AMD K8s, ignore
-                        * this to avoid an uncatched #GP in the guest
+                        * this to avoid an uncatched #GP in the guest.
+                        *
+                        * UNIXWARE clears bit 0 of MC1_CTL to ignore
+                        * correctable, single-bit ECC data errors.
                         */
                        if ((offset & 0x3) == 0 &&
-                           data != 0 && (data | (1 << 10)) != ~(u64)0)
+                           data != 0 && (data | (1 << 10) | 1) != ~(u64)0)
                                return -1;
 
                        /* MCi_STATUS */