Skip to content

Commit 5f6e839

Browse files
kmjohansenjgross1
authored andcommitted
xen: update arch/x86/include/asm/xen/cpuid.h
Update arch/x86/include/asm/xen/cpuid.h from the Xen tree to get newest definitions. This picks up some TSC mode definitions and comment formatting changes. Signed-off-by: Krister Johansen <[email protected]> Reviewed-by: Juergen Gross <[email protected]> Link: https://lore.kernel.org/r/94b9046dd0db3794f0633d134b7108508957758d.1677038165.git.kjlx@templeofstupid.com Signed-off-by: Juergen Gross <[email protected]>
1 parent 4ecc96c commit 5f6e839

File tree

1 file changed

+18
-4
lines changed

1 file changed

+18
-4
lines changed

arch/x86/include/asm/xen/cpuid.h

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,21 @@
8989
* Sub-leaf 2: EAX: host tsc frequency in kHz
9090
*/
9191

92+
#define XEN_CPUID_TSC_EMULATED (1u << 0)
93+
#define XEN_CPUID_HOST_TSC_RELIABLE (1u << 1)
94+
#define XEN_CPUID_RDTSCP_INSTR_AVAIL (1u << 2)
95+
96+
#define XEN_CPUID_TSC_MODE_DEFAULT (0)
97+
#define XEN_CPUID_TSC_MODE_ALWAYS_EMULATE (1u)
98+
#define XEN_CPUID_TSC_MODE_NEVER_EMULATE (2u)
99+
#define XEN_CPUID_TSC_MODE_PVRDTSCP (3u)
100+
92101
/*
93102
* Leaf 5 (0x40000x04)
94103
* HVM-specific features
95104
* Sub-leaf 0: EAX: Features
96105
* Sub-leaf 0: EBX: vcpu id (iff EAX has XEN_HVM_CPUID_VCPU_ID_PRESENT flag)
106+
* Sub-leaf 0: ECX: domain id (iff EAX has XEN_HVM_CPUID_DOMID_PRESENT flag)
97107
*/
98108
#define XEN_HVM_CPUID_APIC_ACCESS_VIRT (1u << 0) /* Virtualized APIC registers */
99109
#define XEN_HVM_CPUID_X2APIC_VIRT (1u << 1) /* Virtualized x2APIC accesses */
@@ -102,12 +112,16 @@
102112
#define XEN_HVM_CPUID_VCPU_ID_PRESENT (1u << 3) /* vcpu id is present in EBX */
103113
#define XEN_HVM_CPUID_DOMID_PRESENT (1u << 4) /* domid is present in ECX */
104114
/*
105-
* Bits 55:49 from the IO-APIC RTE and bits 11:5 from the MSI address can be
106-
* used to store high bits for the Destination ID. This expands the Destination
107-
* ID field from 8 to 15 bits, allowing to target APIC IDs up 32768.
115+
* With interrupt format set to 0 (non-remappable) bits 55:49 from the
116+
* IO-APIC RTE and bits 11:5 from the MSI address can be used to store
117+
* high bits for the Destination ID. This expands the Destination ID
118+
* field from 8 to 15 bits, allowing to target APIC IDs up 32768.
108119
*/
109120
#define XEN_HVM_CPUID_EXT_DEST_ID (1u << 5)
110-
/* Per-vCPU event channel upcalls */
121+
/*
122+
* Per-vCPU event channel upcalls work correctly with physical IRQs
123+
* bound to event channels.
124+
*/
111125
#define XEN_HVM_CPUID_UPCALL_VECTOR (1u << 6)
112126

113127
/*

0 commit comments

Comments
 (0)