diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2019-09-10 19:09:14 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-09-10 19:09:14 +0200 |
| commit | 32d1d15c52c17a7f0368e6a7084796e16ec481d3 (patch) | |
| tree | 1ef7e045c610279617003d750501224190f12a30 /drivers/platform/x86/intel_pmc_core.c | |
| parent | 8146856b0a2693d5f7334f720c9b39a987f7571d (diff) | |
| parent | 92f35b751c71d14250a401246f2c792e3aa5b386 (diff) | |
Merge tag 'kvmarm-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/arm updates for 5.4
- New ITS translation cache
- Allow up to 512 CPUs to be supported with GICv3 (for real this time)
- Now call kvm_arch_vcpu_blocking early in the blocking sequence
- Tidy-up device mappings in S2 when DIC is available
- Clean icache invalidation on VMID rollover
- General cleanup
Diffstat (limited to 'drivers/platform/x86/intel_pmc_core.c')
| -rw-r--r-- | drivers/platform/x86/intel_pmc_core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/platform/x86/intel_pmc_core.c b/drivers/platform/x86/intel_pmc_core.c index 235c0b89f824..c510d0d72475 100644 --- a/drivers/platform/x86/intel_pmc_core.c +++ b/drivers/platform/x86/intel_pmc_core.c @@ -812,6 +812,7 @@ static const struct x86_cpu_id intel_pmc_core_ids[] = { INTEL_CPU_FAM6(KABYLAKE_DESKTOP, spt_reg_map), INTEL_CPU_FAM6(CANNONLAKE_MOBILE, cnp_reg_map), INTEL_CPU_FAM6(ICELAKE_MOBILE, icl_reg_map), + INTEL_CPU_FAM6(ICELAKE_NNPI, icl_reg_map), {} }; |