[xen master] x86: rename ARAT feature flag

[patchbot@xxxxxxx]

commit 4422643e3b6469ccf16a080a0f93b509945b0243
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Thu Jan 15 11:49:28 2026 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Thu Jan 15 11:49:28 2026 +0100

    x86: rename ARAT feature flag
    
    Add a XEN infix, to properly distinguish it from the CPUID feature flag
    (leaf 6 EAX bit 2).
    
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Reviewed-by: Jason Andryuk <jason.andryuk@xxxxxxx>
---
 xen/arch/x86/acpi/cpu_idle.c           | 4 ++--
 xen/arch/x86/cpu/amd.c                 | 2 +-
 xen/arch/x86/cpu/hygon.c               | 2 +-
 xen/arch/x86/cpu/intel.c               | 2 +-
 xen/arch/x86/cpu/mwait-idle.c          | 4 ++--
 xen/arch/x86/include/asm/cpufeatures.h | 2 +-
 xen/arch/x86/time.c                    | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c
index d60a07bfd5..7a87625077 100644
--- a/xen/arch/x86/acpi/cpu_idle.c
+++ b/xen/arch/x86/acpi/cpu_idle.c
@@ -109,7 +109,7 @@ void (*__read_mostly lapic_timer_on)(void);
 
 bool lapic_timer_init(void)
 {
-    if ( boot_cpu_has(X86_FEATURE_ARAT) )
+    if ( boot_cpu_has(X86_FEATURE_XEN_ARAT) )
     {
         lapic_timer_off = lapic_timer_nop;
         lapic_timer_on = lapic_timer_nop;
@@ -1463,7 +1463,7 @@ static void amd_cpuidle_init(struct acpi_processor_power 
*power)
 
         if ( !vendor_override )
         {
-            if ( !boot_cpu_has(X86_FEATURE_ARAT) )
+            if ( !boot_cpu_has(X86_FEATURE_XEN_ARAT) )
                 hpet_broadcast_init();
 
             if ( !lapic_timer_init() )
diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c
index 928d6bd168..8c5bdf0bd5 100644
--- a/xen/arch/x86/cpu/amd.c
+++ b/xen/arch/x86/cpu/amd.c
@@ -1239,7 +1239,7 @@ static void cf_check init_amd(struct cpuinfo_x86 *c)
         * running in deep C states.
         */
        if ( opt_arat && c->x86 > 0x11 )
-               __set_bit(X86_FEATURE_ARAT, c->x86_capability);
+               __set_bit(X86_FEATURE_XEN_ARAT, c->x86_capability);
 
        /*
         * Prior to Family 0x14, perf counters are not reset during warm reboot.
diff --git a/xen/arch/x86/cpu/hygon.c b/xen/arch/x86/cpu/hygon.c
index cab915a2fc..b99d83ed4d 100644
--- a/xen/arch/x86/cpu/hygon.c
+++ b/xen/arch/x86/cpu/hygon.c
@@ -81,7 +81,7 @@ static void cf_check init_hygon(struct cpuinfo_x86 *c)
 
        /* Hygon processors have APIC timer running in deep C states. */
        if (opt_arat)
-               __set_bit(X86_FEATURE_ARAT, c->x86_capability);
+               __set_bit(X86_FEATURE_XEN_ARAT, c->x86_capability);
 
        if (cpu_has(c, X86_FEATURE_EFRO)) {
                rdmsrl(MSR_K8_HWCR, value);
diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c
index 863edac4cd..b76797cb9a 100644
--- a/xen/arch/x86/cpu/intel.c
+++ b/xen/arch/x86/cpu/intel.c
@@ -668,7 +668,7 @@ static void cf_check init_intel(struct cpuinfo_x86 *c)
        if ( opt_arat &&
             ( c->cpuid_level >= 0x00000006 ) &&
             ( cpuid_eax(0x00000006) & (1u<<2) ) )
-               __set_bit(X86_FEATURE_ARAT, c->x86_capability);
+               __set_bit(X86_FEATURE_XEN_ARAT, c->x86_capability);
 
        if ((opt_cpu_info && !(c->apicid & (c->x86_num_siblings - 1))) ||
            c == &boot_cpu_data )
diff --git a/xen/arch/x86/cpu/mwait-idle.c b/xen/arch/x86/cpu/mwait-idle.c
index f47fdfb569..5962ec1db9 100644
--- a/xen/arch/x86/cpu/mwait-idle.c
+++ b/xen/arch/x86/cpu/mwait-idle.c
@@ -1633,7 +1633,7 @@ static int __init mwait_idle_probe(void)
        icpu = id->driver_data;
        cpuidle_state_table = icpu->state_table;
 
-       if (boot_cpu_has(X86_FEATURE_ARAT))
+       if (boot_cpu_has(X86_FEATURE_XEN_ARAT))
                lapic_timer_reliable_states = LAPIC_TIMER_ALWAYS_RELIABLE;
 
        pr_debug(PREFIX "v" MWAIT_IDLE_VERSION " model %#x\n",
@@ -1792,7 +1792,7 @@ int __init mwait_idle_init(struct notifier_block *nfb)
                return -ENODEV;
 
        err = mwait_idle_probe();
-       if (!err && !boot_cpu_has(X86_FEATURE_ARAT)) {
+       if (!err && !boot_cpu_has(X86_FEATURE_XEN_ARAT)) {
                hpet_broadcast_init();
                if (xen_cpuidle < 0 && !hpet_broadcast_is_available())
                        err = -ENODEV;
diff --git a/xen/arch/x86/include/asm/cpufeatures.h 
b/xen/arch/x86/include/asm/cpufeatures.h
index 65534863c7..bd53ba7976 100644
--- a/xen/arch/x86/include/asm/cpufeatures.h
+++ b/xen/arch/x86/include/asm/cpufeatures.h
@@ -13,7 +13,7 @@
 /* Synthetic features */
 XEN_CPUFEATURE(CONSTANT_TSC,      X86_SYNTH( 0)) /* TSC ticks at a constant 
rate */
 XEN_CPUFEATURE(NONSTOP_TSC,       X86_SYNTH( 1)) /* TSC does not stop in C 
states */
-XEN_CPUFEATURE(ARAT,              X86_SYNTH( 2)) /* Always running APIC timer 
*/
+XEN_CPUFEATURE(XEN_ARAT,          X86_SYNTH( 2)) /* Xen may utilize always 
running APIC timer */
 XEN_CPUFEATURE(ARCH_PERFMON,      X86_SYNTH( 3)) /* Intel Architectural 
PerfMon */
 XEN_CPUFEATURE(TSC_RELIABLE,      X86_SYNTH( 4)) /* TSC is known to be 
reliable */
 XEN_CPUFEATURE(XTOPOLOGY,         X86_SYNTH( 5)) /* cpu topology enum 
extensions */
diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c
index 03a383a9a5..362c76df0b 100644
--- a/xen/arch/x86/time.c
+++ b/xen/arch/x86/time.c
@@ -2644,7 +2644,7 @@ static int _disable_pit_irq(bool init)
      * XXX dom0 may rely on RTC interrupt delivery, so only enable
      * hpet_broadcast if FSB mode available or if force_hpet_broadcast.
      */
-    if ( cpuidle_using_deep_cstate() && !boot_cpu_has(X86_FEATURE_ARAT) )
+    if ( cpuidle_using_deep_cstate() && !boot_cpu_has(X86_FEATURE_XEN_ARAT) )
     {
         init ? hpet_broadcast_init() : hpet_broadcast_resume();
         if ( !hpet_broadcast_is_available() )
--
generated by git-patchbot for /home/xen/git/xen.git#master