From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 23 Nov 2022 07:01:17 +0000 (+0100)
Subject: fuzz refresh due to 4.19 release
X-Git-Tag: v4.9.334~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=97aa2c376d3c391fc4f766a62ff7817910a6dbca;p=thirdparty%2Fkernel%2Fstable-queue.git

fuzz refresh due to 4.19 release
---

diff --git a/queue-4.19/x86-cpu-restore-amd-s-de_cfg-msr-after-resume.patch b/queue-4.19/x86-cpu-restore-amd-s-de_cfg-msr-after-resume.patch
index 9aabca4582e..ee8a75323d6 100644
--- a/queue-4.19/x86-cpu-restore-amd-s-de_cfg-msr-after-resume.patch
+++ b/queue-4.19/x86-cpu-restore-amd-s-de_cfg-msr-after-resume.patch
@@ -30,7 +30,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/arch/x86/include/asm/msr-index.h
 +++ b/arch/x86/include/asm/msr-index.h
-@@ -389,6 +389,11 @@
+@@ -399,6 +399,11 @@
  #define MSR_AMD64_OSVW_STATUS		0xc0010141
  #define MSR_AMD64_LS_CFG		0xc0011020
  #define MSR_AMD64_DC_CFG		0xc0011022
@@ -42,7 +42,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  #define MSR_AMD64_BU_CFG2		0xc001102a
  #define MSR_AMD64_IBSFETCHCTL		0xc0011030
  #define MSR_AMD64_IBSFETCHLINAD		0xc0011031
-@@ -457,9 +462,6 @@
+@@ -467,9 +472,6 @@
  #define FAM10H_MMIO_CONF_BASE_MASK	0xfffffffULL
  #define FAM10H_MMIO_CONF_BASE_SHIFT	20
  #define MSR_FAM10H_NODE_ID		0xc001100c
@@ -63,7 +63,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  static void init_amd_ln(struct cpuinfo_x86 *c)
  {
  	/*
-@@ -951,16 +949,16 @@ static void init_amd(struct cpuinfo_x86
+@@ -960,16 +958,16 @@ static void init_amd(struct cpuinfo_x86
  		 * msr_set_bit() uses the safe accessors, too, even if the MSR
  		 * is not present.
  		 */
@@ -86,7 +86,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  		} else {
 --- a/arch/x86/kvm/svm.c
 +++ b/arch/x86/kvm/svm.c
-@@ -4154,9 +4154,9 @@ static int svm_get_msr_feature(struct kv
+@@ -4155,9 +4155,9 @@ static int svm_get_msr_feature(struct kv
  	msr->data = 0;
  
  	switch (msr->index) {
@@ -99,7 +99,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  		break;
  	default:
  		return 1;
-@@ -4258,7 +4258,7 @@ static int svm_get_msr(struct kvm_vcpu *
+@@ -4259,7 +4259,7 @@ static int svm_get_msr(struct kvm_vcpu *
  			msr_info->data = 0x1E;
  		}
  		break;
@@ -108,7 +108,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  		msr_info->data = svm->msr_decfg;
  		break;
  	default:
-@@ -4445,7 +4445,7 @@ static int svm_set_msr(struct kvm_vcpu *
+@@ -4446,7 +4446,7 @@ static int svm_set_msr(struct kvm_vcpu *
  	case MSR_VM_IGNNE:
  		vcpu_unimpl(vcpu, "unimplemented wrmsr: 0x%x data 0x%llx\n", ecx, data);
  		break;