intel_idle: Use __update_spec_ctrl() in intel_idle_ibrs()
authorWaiman Long <longman@redhat.com>
Thu, 27 Jul 2023 18:45:59 +0000 (14:45 -0400)
committerIngo Molnar <mingo@kernel.org>
Sat, 7 Oct 2023 09:33:28 +0000 (11:33 +0200)
commit7506203089dceb1d9e1f35d37ad2e46d44798a6d
tree69cc42d917a2eaa9ff7f344e0fdaa6f541298c50
parent2743fe89d4d41616ffbe1e7e96e443ae7a4b1cc6
intel_idle: Use __update_spec_ctrl() in intel_idle_ibrs()

When intel_idle_ibrs() is called, it modifies the SPEC_CTRL MSR to 0
in order disable IBRS. However, the new MSR value isn't reflected in
x86_spec_ctrl_current which is at odd with the other code that keep track
of its state in that percpu variable.  Use the new __update_spec_ctrl()
to have the x86_spec_ctrl_current percpu value properly updated.

Since spec-ctrl.h includes both msr.h and nospec-branch.h, we can remove
those from the include file list.

Signed-off-by: Waiman Long <longman@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: https://lore.kernel.org/r/20230727184600.26768-4-longman@redhat.com
drivers/idle/intel_idle.c