On Fri, Mar 23, 2018 at 09:11:30AM -0400, Kan Liang wrote: > @@ -3067,7 +3069,15 @@ void bdx_uncore_cpu_init(void) > /* BDX-DE doesn't have SBOX */ > if (boot_cpu_data.x86_model == 86) > uncore_msr_uncores[BDX_MSR_UNCORE_SBOX] = NULL; > - > + /* Detect systems with no SBOXes */
That really wants { }. > + else if (uncore_extra_pci_dev[pkg].dev[HSWEP_PCI_PCU_3]) { > + u32 capid4; > + pci_read_config_dword( > + uncore_extra_pci_dev[pkg].dev[HSWEP_PCI_PCU_3], > + 0x94, &capid4); > + if (((capid4 >> 6) & 0x3) == 0) > + bdx_msr_uncores[BDX_MSR_UNCORE_SBOX] = NULL; > + } > hswep_uncore_pcu.constraints = bdx_uncore_pcu_constraints; > } Otherwise these look fine to me; Acked-by: Peter Zijlstra (Intel) <pet...@infradead.org> Thomas will you magic them into tip?