oprofile: Grouping multiplexing code in op_model_amd.c
This patch moves some multiplexing code to the new function op_mux_fill_in_addresses(). Also, the whole multiplexing code is now at a single location. Signed-off-by: Robert Richter <robert.richter@amd.com>
This commit is contained in:
Родитель
d8471ad3ab
Коммит
7e7478c6bc
|
@ -74,6 +74,45 @@ static struct op_ibs_config ibs_config;
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
|
||||||
|
|
||||||
|
static void op_mux_fill_in_addresses(struct op_msrs * const msrs)
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
|
||||||
|
for (i = 0; i < NUM_VIRT_COUNTERS; i++) {
|
||||||
|
int hw_counter = i % NUM_COUNTERS;
|
||||||
|
if (reserve_perfctr_nmi(MSR_K7_PERFCTR0 + i))
|
||||||
|
msrs->multiplex[i].addr = MSR_K7_PERFCTR0 + hw_counter;
|
||||||
|
else
|
||||||
|
msrs->multiplex[i].addr = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void op_mux_switch_ctrl(struct op_x86_model_spec const *model,
|
||||||
|
struct op_msrs const * const msrs)
|
||||||
|
{
|
||||||
|
u64 val;
|
||||||
|
int i;
|
||||||
|
|
||||||
|
/* enable active counters */
|
||||||
|
for (i = 0; i < NUM_COUNTERS; ++i) {
|
||||||
|
int virt = op_x86_phys_to_virt(i);
|
||||||
|
if (!counter_config[virt].enabled)
|
||||||
|
continue;
|
||||||
|
rdmsrl(msrs->controls[i].addr, val);
|
||||||
|
val &= model->reserved;
|
||||||
|
val |= op_x86_get_ctrl(model, &counter_config[virt]);
|
||||||
|
wrmsrl(msrs->controls[i].addr, val);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#else
|
||||||
|
|
||||||
|
static inline void op_mux_fill_in_addresses(struct op_msrs * const msrs) { }
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
/* functions for op_amd_spec */
|
/* functions for op_amd_spec */
|
||||||
|
|
||||||
static void op_amd_fill_in_addresses(struct op_msrs * const msrs)
|
static void op_amd_fill_in_addresses(struct op_msrs * const msrs)
|
||||||
|
@ -94,15 +133,7 @@ static void op_amd_fill_in_addresses(struct op_msrs * const msrs)
|
||||||
msrs->controls[i].addr = 0;
|
msrs->controls[i].addr = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
|
op_mux_fill_in_addresses(msrs);
|
||||||
for (i = 0; i < NUM_VIRT_COUNTERS; i++) {
|
|
||||||
int hw_counter = i % NUM_COUNTERS;
|
|
||||||
if (reserve_perfctr_nmi(MSR_K7_PERFCTR0 + i))
|
|
||||||
msrs->multiplex[i].addr = MSR_K7_PERFCTR0 + hw_counter;
|
|
||||||
else
|
|
||||||
msrs->multiplex[i].addr = 0;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void op_amd_setup_ctrs(struct op_x86_model_spec const *model,
|
static void op_amd_setup_ctrs(struct op_x86_model_spec const *model,
|
||||||
|
@ -155,30 +186,6 @@ static void op_amd_setup_ctrs(struct op_x86_model_spec const *model,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
|
|
||||||
|
|
||||||
static void op_amd_switch_ctrl(struct op_x86_model_spec const *model,
|
|
||||||
struct op_msrs const * const msrs)
|
|
||||||
{
|
|
||||||
u64 val;
|
|
||||||
int i;
|
|
||||||
|
|
||||||
/* enable active counters */
|
|
||||||
for (i = 0; i < NUM_COUNTERS; ++i) {
|
|
||||||
int virt = op_x86_phys_to_virt(i);
|
|
||||||
if (!counter_config[virt].enabled)
|
|
||||||
continue;
|
|
||||||
rdmsrl(msrs->controls[i].addr, val);
|
|
||||||
val &= model->reserved;
|
|
||||||
val |= op_x86_get_ctrl(model, &counter_config[virt]);
|
|
||||||
wrmsrl(msrs->controls[i].addr, val);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef CONFIG_OPROFILE_IBS
|
#ifdef CONFIG_OPROFILE_IBS
|
||||||
|
|
||||||
static inline int
|
static inline int
|
||||||
|
@ -535,6 +542,6 @@ struct op_x86_model_spec const op_amd_spec = {
|
||||||
.stop = &op_amd_stop,
|
.stop = &op_amd_stop,
|
||||||
.shutdown = &op_amd_shutdown,
|
.shutdown = &op_amd_shutdown,
|
||||||
#ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
|
#ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
|
||||||
.switch_ctrl = &op_amd_switch_ctrl,
|
.switch_ctrl = &op_mux_switch_ctrl,
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
Загрузка…
Ссылка в новой задаче