Users control/monitor Intel Platform Shared Resource (PSR) through
related domctl-op or sysctl-op, so CONFIG_X86_PSR can be put under
SYSCTL or DOMCTL. with this change, we could remove SYSCTL-wrapping
in psr.c
Signed-off-by: Penny Zheng <penny.zh...@amd.com>
---
xen/arch/x86/Kconfig | 1 +
xen/arch/x86/psr.c | 18 ------------------
2 files changed, 1 insertion(+), 18 deletions(-)
diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig
index a45ce106e2..691edf8926 100644
--- a/xen/arch/x86/Kconfig
+++ b/xen/arch/x86/Kconfig
@@ -187,6 +187,7 @@ config TBOOT
config X86_PSR
bool "Platform Shared Resource support" if EXPERT
default INTEL
+ depends on SYSCTL || DOMCTL
help
Support of Platform Shared Resource technology, which is basis for
monitoring and control of resources like cache and memory bandwidth.
diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c
index 499d320e61..5815a35335 100644
--- a/xen/arch/x86/psr.c
+++ b/xen/arch/x86/psr.c
@@ -133,11 +133,9 @@ static const struct feat_props {
*/
enum psr_type alt_type;
-#ifdef CONFIG_SYSCTL
/* get_feat_info is used to return feature HW info through sysctl. */
bool (*get_feat_info)(const struct feat_node *feat,
uint32_t data[], unsigned int array_len);
-#endif
/* write_msr is used to write out feature MSR register. */
void (*write_msr)(unsigned int cos, uint32_t val, enum psr_type type);
@@ -420,7 +418,6 @@ static bool mba_init_feature(const struct cpuid_leaf *regs,
return true;
}
-#ifdef CONFIG_SYSCTL
static bool cf_check cat_get_feat_info(
const struct feat_node *feat, uint32_t data[], unsigned int array_len)
{
@@ -433,7 +430,6 @@ static bool cf_check cat_get_feat_info(
return true;
}
-#endif /* CONFIG_SYSCTL */
/* L3 CAT props */
static void cf_check l3_cat_write_msr(
@@ -446,14 +442,11 @@ static const struct feat_props l3_cat_props = {
.cos_num = 1,
.type[0] = PSR_TYPE_L3_CBM,
.alt_type = PSR_TYPE_UNKNOWN,
-#ifdef CONFIG_SYSCTL
.get_feat_info = cat_get_feat_info,
-#endif
.write_msr = l3_cat_write_msr,
.sanitize = cat_check_cbm,
};
-#ifdef CONFIG_SYSCTL
/* L3 CDP props */
static bool cf_check l3_cdp_get_feat_info(
const struct feat_node *feat, uint32_t data[], uint32_t array_len)
@@ -465,7 +458,6 @@ static bool cf_check l3_cdp_get_feat_info(
return true;
}
-#endif /* CONFIG_SYSCTL */
static void cf_check l3_cdp_write_msr(
unsigned int cos, uint32_t val, enum psr_type type)
@@ -481,9 +473,7 @@ static const struct feat_props l3_cdp_props = {
.type[0] = PSR_TYPE_L3_DATA,
.type[1] = PSR_TYPE_L3_CODE,
.alt_type = PSR_TYPE_L3_CBM,
-#ifdef CONFIG_SYSCTL
.get_feat_info = l3_cdp_get_feat_info,
-#endif
.write_msr = l3_cdp_write_msr,
.sanitize = cat_check_cbm,
};
@@ -499,14 +489,11 @@ static const struct feat_props l2_cat_props = {
.cos_num = 1,
.type[0] = PSR_TYPE_L2_CBM,
.alt_type = PSR_TYPE_UNKNOWN,
-#ifdef CONFIG_SYSCTL
.get_feat_info = cat_get_feat_info,
-#endif
.write_msr = l2_cat_write_msr,
.sanitize = cat_check_cbm,
};
-#ifdef CONFIG_SYSCTL
/* MBA props */
static bool cf_check mba_get_feat_info(
const struct feat_node *feat, uint32_t data[], unsigned int array_len)
@@ -521,7 +508,6 @@ static bool cf_check mba_get_feat_info(
return true;
}
-#endif /* CONFIG_SYSCTL */
static void cf_check mba_write_msr(
unsigned int cos, uint32_t val, enum psr_type type)
@@ -559,9 +545,7 @@ static const struct feat_props mba_props = {
.cos_num = 1,
.type[0] = PSR_TYPE_MBA_THRTL,
.alt_type = PSR_TYPE_UNKNOWN,
-#ifdef CONFIG_SYSCTL
.get_feat_info = mba_get_feat_info,
-#endif
.write_msr = mba_write_msr,
.sanitize = mba_sanitize_thrtl,
};
@@ -824,7 +808,6 @@ static struct psr_socket_info *get_socket_info(unsigned int
socket)
return socket_info + socket;
}
-#ifdef CONFIG_SYSCTL
int psr_get_info(unsigned int socket, enum psr_type type,
uint32_t data[], unsigned int array_len)
{
@@ -856,7 +839,6 @@ int psr_get_info(unsigned int socket, enum psr_type type,
return -EINVAL;
}
-#endif /* CONFIG_SYSCTL */
int psr_get_val(struct domain *d, unsigned int socket,
uint32_t *val, enum psr_type type)
--
2.34.1
