This reverts commit d6293e7f01d0d21122484d0644aa3dccb6e50ba5. --- arch/x86/include/asm/msr-index.h | 1 - arch/x86/kernel/cpu/resctrl/core.c | 2 -- arch/x86/kernel/cpu/resctrl/internal.h | 2 -- arch/x86/kernel/cpu/resctrl/monitor.c | 20 -------------------- 4 files changed, 25 deletions(-) diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h index 0aae302e3daa..182fa1daccb6 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@ -1156,7 +1156,6 @@ #define MSR_IA32_QM_CTR 0xc8e #define MSR_IA32_PQR_ASSOC 0xc8f #define MSR_IA32_L3_CBM_BASE 0xc90 -#define MSR_RMID_SNC_CONFIG 0xca0 #define MSR_IA32_L2_CBM_BASE 0xd10 #define MSR_IA32_MBA_THRTL_BASE 0xd50 diff --git a/arch/x86/kernel/cpu/resctrl/core.c b/arch/x86/kernel/cpu/resctrl/core.c index d3a87070bda4..a1b67620ac04 100644 --- a/arch/x86/kernel/cpu/resctrl/core.c +++ b/arch/x86/kernel/cpu/resctrl/core.c @@ -615,8 +615,6 @@ static void domain_add_cpu_mon(int cpu, struct rdt_resource *r) } cpumask_set_cpu(cpu, &d->hdr.cpu_mask); - arch_mon_domain_online(r, d); - if (arch_domain_mbm_alloc(r->num_rmid, hw_dom)) { mon_domain_free(hw_dom); return; diff --git a/arch/x86/kernel/cpu/resctrl/internal.h b/arch/x86/kernel/cpu/resctrl/internal.h index 955999aecfca..16982d1baf99 100644 --- a/arch/x86/kernel/cpu/resctrl/internal.h +++ b/arch/x86/kernel/cpu/resctrl/internal.h @@ -534,8 +534,6 @@ static inline bool resctrl_arch_get_cdp_enabled(enum resctrl_res_level l) int resctrl_arch_set_cdp_enabled(enum resctrl_res_level l, bool enable); -void arch_mon_domain_online(struct rdt_resource *r, struct rdt_mon_domain *d); - /* * To return the common struct rdt_resource, which is contained in struct * rdt_hw_resource, walk the resctrl member of struct rdt_hw_resource. diff --git a/arch/x86/kernel/cpu/resctrl/monitor.c b/arch/x86/kernel/cpu/resctrl/monitor.c index a62c4dc91161..7ee4e0c90159 100644 --- a/arch/x86/kernel/cpu/resctrl/monitor.c +++ b/arch/x86/kernel/cpu/resctrl/monitor.c @@ -1091,26 +1091,6 @@ static void l3_mon_evt_init(struct rdt_resource *r) list_add_tail(&mbm_local_event.list, &r->evt_list); } -/* - * The power-on reset value of MSR_RMID_SNC_CONFIG is 0x1 - * which indicates that RMIDs are configured in legacy mode. - * This mode is incompatible with Linux resctrl semantics - * as RMIDs are partitioned between SNC nodes, which requires - * a user to know which RMID is allocated to a task. - * Clearing bit 0 reconfigures the RMID counters for use - * in RMID sharing mode. This mode is better for Linux. - * The RMID space is divided between all SNC nodes with the - * RMIDs renumbered to start from zero in each node when - * counting operations from tasks. Code to read the counters - * must adjust RMID counter numbers based on SNC node. See - * logical_rmid_to_physical_rmid() for code that does this. - */ -void arch_mon_domain_online(struct rdt_resource *r, struct rdt_mon_domain *d) -{ - if (snc_nodes_per_l3_cache > 1) - msr_clear_bit(MSR_RMID_SNC_CONFIG, 0); -} - int __init rdt_get_mon_l3_config(struct rdt_resource *r) { unsigned int mbm_offset = boot_cpu_data.x86_cache_mbm_width_offset; -- 2.25.1