lkml.org 
[lkml]   [2019]   [Aug]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    SubjectRe: [PATCH] x86/cpu: Add new Airmont variant to Intel family
    From
    Date

    Hi Peter,

    On 23/8/2019 5:03 PM, Peter Zijlstra wrote:
    > On Thu, Aug 22, 2019 at 01:35:44PM -0700, Luck, Tony wrote:
    >
    >> From: Tony Luck <tony.luck@intel.com>
    >>
    >> One of the use cases for this processor is as a network
    >> processor. So give it an "_NP" tag for now. Could be changed
    >> later if it turns out to group with some other tag.
    >>
    >> Signed-off-by: Tony Luck <tony.luck@intel.com>
    >> ---
    >> arch/x86/include/asm/intel-family.h | 1 +
    >> 1 file changed, 1 insertion(+)
    >>
    >> diff --git a/arch/x86/include/asm/intel-family.h b/arch/x86/include/asm/intel-family.h
    >> index 5c05b2d389c3..23ed388a3a56 100644
    >> --- a/arch/x86/include/asm/intel-family.h
    >> +++ b/arch/x86/include/asm/intel-family.h
    >> @@ -95,6 +95,7 @@
    >>
    >> #define INTEL_FAM6_ATOM_AIRMONT 0x4C /* Cherry Trail, Braswell */
    >> #define INTEL_FAM6_ATOM_AIRMONT_MID 0x5A /* Moorefield */
    >> +#define INTEL_FAM6_ATOM_AIRMONT_NP 0x75 /* Lightning Mountain */
    >>
    >> #define INTEL_FAM6_ATOM_GOLDMONT 0x5C /* Apollo Lake */
    >> #define INTEL_FAM6_ATOM_GOLDMONT_D 0x5F /* Denverton */
    > Since it is 'just another airmont' with bits on, should we not then also
    > add it to all ATOM_AIRMONT sites already present in the kernel?
    >
    > something like the below; except there were a few sites I skipped
    > because 'no clue'.
    >
    > Also, while going over that, it looked like we missed AIRMONT_MID from a
    > few sites.
    >
    > I'm thinking we want to add as many of these sites as possible and
    > correct when adding a new define; esp. for older microarchs that are
    > already well supported.


    [PATCH v2 3/3] that i had sent with this series adds these changes which

    are applicable to _NP. Please see below link:

    https://lkml.org/lkml/2019/8/16/170

    Above patch might have missed few additional points which still apply.

    Regards,

    Rahul



    > ---
    >
    > diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c
    > index 648260b5f367..56e6875b6882 100644
    > --- a/arch/x86/events/intel/core.c
    > +++ b/arch/x86/events/intel/core.c
    > @@ -4647,6 +4647,7 @@ __init int intel_pmu_init(void)
    > case INTEL_FAM6_ATOM_SILVERMONT_MID:
    > case INTEL_FAM6_ATOM_AIRMONT:
    > case INTEL_FAM6_ATOM_AIRMONT_MID:
    > + case INTEL_FAM6_ATOM_AIRMONT_NP:
    > memcpy(hw_cache_event_ids, slm_hw_cache_event_ids,
    > sizeof(hw_cache_event_ids));
    > memcpy(hw_cache_extra_regs, slm_hw_cache_extra_regs,
    > diff --git a/arch/x86/events/intel/cstate.c b/arch/x86/events/intel/cstate.c
    > index 688592b34564..1e999092de22 100644
    > --- a/arch/x86/events/intel/cstate.c
    > +++ b/arch/x86/events/intel/cstate.c
    > @@ -602,6 +602,7 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = {
    > X86_CSTATES_MODEL(INTEL_FAM6_ATOM_SILVERMONT, slm_cstates),
    > X86_CSTATES_MODEL(INTEL_FAM6_ATOM_SILVERMONT_X, slm_cstates),
    > X86_CSTATES_MODEL(INTEL_FAM6_ATOM_AIRMONT, slm_cstates),
    > + X86_CSTATES_MODEL(INTEL_FAM6_ATOM_AIRMONT_NP, slm_cstates),
    >
    > X86_CSTATES_MODEL(INTEL_FAM6_BROADWELL_CORE, snb_cstates),
    > X86_CSTATES_MODEL(INTEL_FAM6_BROADWELL_XEON_D, snb_cstates),
    > diff --git a/arch/x86/events/msr.c b/arch/x86/events/msr.c
    > index 9431447541e9..fe2323f114c0 100644
    > --- a/arch/x86/events/msr.c
    > +++ b/arch/x86/events/msr.c
    > @@ -72,6 +72,7 @@ static bool test_intel(int idx, void *data)
    > case INTEL_FAM6_ATOM_SILVERMONT:
    > case INTEL_FAM6_ATOM_SILVERMONT_X:
    > case INTEL_FAM6_ATOM_AIRMONT:
    > + case INTEL_FAM6_ATOM_AIRMONT_NP:
    >
    > case INTEL_FAM6_ATOM_GOLDMONT:
    > case INTEL_FAM6_ATOM_GOLDMONT_X:
    > diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
    > index 5cc2d51cc25e..a3ccee6a16a5 100644
    > --- a/arch/x86/kernel/cpu/common.c
    > +++ b/arch/x86/kernel/cpu/common.c
    > @@ -1053,6 +1053,7 @@ static const __initconst struct x86_cpu_id cpu_vuln_whitelist[] = {
    > VULNWL_INTEL(ATOM_SILVERMONT_X, NO_SSB | NO_L1TF | MSBDS_ONLY | NO_SWAPGS),
    > VULNWL_INTEL(ATOM_SILVERMONT_MID, NO_SSB | NO_L1TF | MSBDS_ONLY | NO_SWAPGS),
    > VULNWL_INTEL(ATOM_AIRMONT, NO_SSB | NO_L1TF | MSBDS_ONLY | NO_SWAPGS),
    > + VULNWL_INTEL(ATOM_AIRMONT_NP, NO_SSB | NO_L1TF | MSBDS_ONLY | NO_SWAPGS),
    > VULNWL_INTEL(XEON_PHI_KNL, NO_SSB | NO_L1TF | MSBDS_ONLY | NO_SWAPGS),
    > VULNWL_INTEL(XEON_PHI_KNM, NO_SSB | NO_L1TF | MSBDS_ONLY | NO_SWAPGS),
    >
    > diff --git a/arch/x86/kernel/tsc_msr.c b/arch/x86/kernel/tsc_msr.c
    > index 067858fe4db8..bde7a0c8fa8b 100644
    > --- a/arch/x86/kernel/tsc_msr.c
    > +++ b/arch/x86/kernel/tsc_msr.c
    > @@ -64,6 +64,7 @@ static const struct x86_cpu_id tsc_msr_cpu_ids[] = {
    > INTEL_CPU_FAM6(ATOM_SILVERMONT, freq_desc_byt),
    > INTEL_CPU_FAM6(ATOM_SILVERMONT_MID, freq_desc_tng),
    > INTEL_CPU_FAM6(ATOM_AIRMONT, freq_desc_cht),
    > + INTEL_CPU_FAM6(ATOM_AIRMONT_NP, freq_desc_cht),
    > INTEL_CPU_FAM6(ATOM_AIRMONT_MID, freq_desc_ann),
    > {}
    > };
    > diff --git a/arch/x86/platform/atom/punit_atom_debug.c b/arch/x86/platform/atom/punit_atom_debug.c
    > index ee6b0780bea1..52990f68af70 100644
    > --- a/arch/x86/platform/atom/punit_atom_debug.c
    > +++ b/arch/x86/platform/atom/punit_atom_debug.c
    > @@ -125,6 +125,7 @@ static const struct x86_cpu_id intel_punit_cpu_ids[] = {
    > ICPU(INTEL_FAM6_ATOM_SILVERMONT, punit_device_byt),
    > ICPU(INTEL_FAM6_ATOM_SILVERMONT_MID, punit_device_tng),
    > ICPU(INTEL_FAM6_ATOM_AIRMONT, punit_device_cht),
    > + ICPU(INTEL_FAM6_ATOM_AIRMONT_NP, punit_device_cht),
    > {}
    > };
    >
    > diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c
    > index d696f165a50e..4da3aef37836 100644
    > --- a/drivers/acpi/acpi_lpss.c
    > +++ b/drivers/acpi/acpi_lpss.c
    > @@ -313,6 +313,7 @@ static const struct lpss_device_desc bsw_spi_dev_desc = {
    > static const struct x86_cpu_id lpss_cpu_ids[] = {
    > ICPU(INTEL_FAM6_ATOM_SILVERMONT), /* Valleyview, Bay Trail */
    > ICPU(INTEL_FAM6_ATOM_AIRMONT), /* Braswell, Cherry Trail */
    > + ICPU(INTEL_FAM6_ATOM_AIRMONT_NP), /* Braswell, Cherry Trail */
    > {}
    > };
    >
    > diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
    > index cc27d4c59dca..878f5dcce41b 100644
    > --- a/drivers/cpufreq/intel_pstate.c
    > +++ b/drivers/cpufreq/intel_pstate.c
    > @@ -1879,6 +1879,7 @@ static const struct x86_cpu_id intel_pstate_cpu_ids[] = {
    > ICPU(INTEL_FAM6_HASWELL_GT3E, core_funcs),
    > ICPU(INTEL_FAM6_BROADWELL_GT3E, core_funcs),
    > ICPU(INTEL_FAM6_ATOM_AIRMONT, airmont_funcs),
    > + ICPU(INTEL_FAM6_ATOM_AIRMONT_NP, airmont_funcs),
    > ICPU(INTEL_FAM6_SKYLAKE_MOBILE, core_funcs),
    > ICPU(INTEL_FAM6_BROADWELL_X, core_funcs),
    > ICPU(INTEL_FAM6_SKYLAKE_DESKTOP, core_funcs),
    > diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
    > index fa5ff77b8fe4..277757386ddc 100644
    > --- a/drivers/idle/intel_idle.c
    > +++ b/drivers/idle/intel_idle.c
    > @@ -1070,6 +1070,7 @@ static const struct x86_cpu_id intel_idle_ids[] __initconst = {
    > INTEL_CPU_FAM6(ATOM_SILVERMONT, idle_cpu_byt),
    > INTEL_CPU_FAM6(ATOM_SILVERMONT_MID, idle_cpu_tangier),
    > INTEL_CPU_FAM6(ATOM_AIRMONT, idle_cpu_cht),
    > + INTEL_CPU_FAM6(ATOM_AIRMONT_NP, idle_cpu_cht),
    > INTEL_CPU_FAM6(IVYBRIDGE, idle_cpu_ivb),
    > INTEL_CPU_FAM6(IVYBRIDGE_X, idle_cpu_ivt),
    > INTEL_CPU_FAM6(HASWELL_CORE, idle_cpu_hsw),
    > diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c
    > index 6df481896b5f..3104ada7d046 100644
    > --- a/drivers/powercap/intel_rapl_common.c
    > +++ b/drivers/powercap/intel_rapl_common.c
    > @@ -981,6 +981,7 @@ static const struct x86_cpu_id rapl_ids[] __initconst = {
    >
    > INTEL_CPU_FAM6(ATOM_SILVERMONT, rapl_defaults_byt),
    > INTEL_CPU_FAM6(ATOM_AIRMONT, rapl_defaults_cht),
    > + INTEL_CPU_FAM6(ATOM_AIRMONT_NP, rapl_defaults_cht),
    > INTEL_CPU_FAM6(ATOM_SILVERMONT_MID, rapl_defaults_tng),
    > INTEL_CPU_FAM6(ATOM_AIRMONT_MID, rapl_defaults_ann),
    > INTEL_CPU_FAM6(ATOM_GOLDMONT, rapl_defaults_core),
    > diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
    > index 75fc4fb9901c..3ba4f2a77d3e 100644
    > --- a/tools/power/x86/turbostat/turbostat.c
    > +++ b/tools/power/x86/turbostat/turbostat.c
    > @@ -3228,6 +3228,7 @@ int probe_nhm_msrs(unsigned int family, unsigned int model)
    > pkg_cstate_limits = slv_pkg_cstate_limits;
    > break;
    > case INTEL_FAM6_ATOM_AIRMONT: /* AMT */
    > + case INTEL_FAM6_ATOM_AIRMONT_NP: /* AMT */
    > pkg_cstate_limits = amt_pkg_cstate_limits;
    > no_MSR_MISC_PWR_MGMT = 1;
    > break;

    \
     
     \ /
      Last update: 2019-08-23 11:24    [W:4.964 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site