On 24.11.2025 12:19, Kevin Lampis wrote: > struct cpuinfo_x86 > .x86 => .family > .x86_vendor => .vendor > .x86_model => .model > .x86_mask => .stepping > > No functional change. > > Signed-off-by: Kevin Lampis <[email protected]>
Reviewed-by: Jan Beulich <[email protected]> with a few nits (can likely be taken care of while committing): > @@ -458,7 +458,7 @@ static void Intel_errata_workarounds(struct cpuinfo_x86 > *c) > { > uint64_t val; > > - if ((c->x86 == 15) && (c->x86_model == 1) && (c->x86_mask == 1)) { > + if ( c->vfm == INTEL_P4_WILLAMETTE && c->stepping == 1 ) { If already you do adjustments towards Xen style, the figure brace also wants moving. > @@ -657,9 +659,11 @@ static void cf_check init_intel(struct cpuinfo_x86 *c) > /* Work around errata */ > Intel_errata_workarounds(c); > > - if ((c->x86 == 0xf && c->x86_model >= 0x03) || > - (c->x86 == 0x6 && c->x86_model >= 0x0e)) > + if ((c->family == 0xf && c->model >= 0x03) || > + (c->family == 0x6 && c->model >= 0x0e)) Bogus indentation would also want adjusting while touching the line, and ... > + { > __set_bit(X86_FEATURE_CONSTANT_TSC, c->x86_capability); > + } ... I don't see why figure braces would need adding here. > --- a/xen/arch/x86/include/asm/intel-family.h > +++ b/xen/arch/x86/include/asm/intel-family.h > @@ -179,6 +179,10 @@ > #define INTEL_XEON_PHI_KNL IFM(6, 0x57) /* Knights Landing */ > #define INTEL_XEON_PHI_KNM IFM(6, 0x85) /* Knights Mill */ > > +/* Family 15 - NetBurst */ > +#define INTEL_P4_WILLAMETTE IFM(15, 0x01) /* Also Xeon Foster */ > +#define INTEL_P4_PRESCOTT IFM(15, 0x03) For this likely Andrew's wider patch may want to go in first, so this part could then be dropped. Jan
