| Message ID | 20240716051612.64842-5-luke@ljones.dev (mailing list archive) |
|---|---|
| State | Changes Requested, archived |
| Headers | show |
| Series | platform/x86: introduce asus-bioscfg | expand |
Hi, On 7/16/24 7:16 AM, Luke D. Jones wrote: > Implement Intel core enablement under the asus-bioscfg module using the > fw_attributes class. > > This allows users to enable or disable preformance or efficiency cores > depending on their requirements. After change a reboot is required. Not a full revieew, just a quick remark. You say this this requires a reboot, but this patch does not update asus_bios_requires_reboot() Regards, Hans > > Signed-off-by: Luke D. Jones <luke@ljones.dev> > --- > drivers/platform/x86/asus-bioscfg.c | 206 +++++++++++++++++++++ > drivers/platform/x86/asus-bioscfg.h | 29 +++ > include/linux/platform_data/x86/asus-wmi.h | 4 + > 3 files changed, 239 insertions(+) > > diff --git a/drivers/platform/x86/asus-bioscfg.c b/drivers/platform/x86/asus-bioscfg.c > index 57efe50e0d19..6d39e45591e8 100644 > --- a/drivers/platform/x86/asus-bioscfg.c > +++ b/drivers/platform/x86/asus-bioscfg.c > @@ -41,6 +41,18 @@ MODULE_ALIAS("wmi:"ASUS_NB_WMI_EVENT_GUID); > #define ASUS_MINI_LED_2024_STRONG 0x01 > #define ASUS_MINI_LED_2024_OFF 0x02 > > +enum cpu_core_type { > + CPU_CORE_PERF = 0, > + CPU_CORE_POWER, > +}; > + > +enum cpu_core_value { > + CPU_CORE_DEFAULT = 0, > + CPU_CORE_MIN, > + CPU_CORE_MAX, > + CPU_CORE_CURRENT, > +}; > + > /* Default limits for tunables available on ASUS ROG laptops */ > #define PPT_CPU_LIMIT_MIN 5 > #define PPT_CPU_LIMIT_MAX 150 > @@ -75,6 +87,10 @@ struct rog_tunables { > u32 nv_temp_default; > u32 nv_temp_max; > u32 nv_temp_target; > + > + u32 min_perf_cores; > + u32 max_perf_cores; > + u32 max_power_cores; > }; > > static const struct class *fw_attr_class; > @@ -540,6 +556,191 @@ static ssize_t apu_mem_possible_values_show(struct kobject *kobj, > } > ATTR_GROUP_ENUM_CUSTOM(apu_mem, "apu_mem", "Set the available system memory for the APU to use"); > > +static int asus_bios_set_max_cores(void) > +{ > + u32 cores; > + int err; > + > + asus_bios.rog_tunables->min_perf_cores = 4; > + asus_bios.rog_tunables->max_perf_cores = 4; > + asus_bios.rog_tunables->max_power_cores = 8; > + > + err = asus_wmi_get_devstate_dsts(ASUS_WMI_DEVID_CORES_MAX, &cores); > + if (err) > + return err; > + > + cores &= ~ASUS_WMI_DSTS_PRESENCE_BIT; > + asus_bios.rog_tunables->max_power_cores = (cores & 0xff00) >> 8; > + asus_bios.rog_tunables->max_perf_cores = cores & 0xff; > + > + return 0; > +} > + > +static ssize_t cores_value_show(struct kobject *kobj, > + struct kobj_attribute *attr, char *buf, > + enum cpu_core_type core_type, > + enum cpu_core_value core_value) > +{ > + u32 cores; > + int err; > + > + switch (core_value) { > + case CPU_CORE_DEFAULT: > + case CPU_CORE_MAX: > + if (core_type == CPU_CORE_PERF) > + return sysfs_emit(buf, "%d\n", asus_bios.rog_tunables->max_perf_cores); > + else > + return sysfs_emit(buf, "%d\n", asus_bios.rog_tunables->max_power_cores); > + case CPU_CORE_MIN: > + if (core_type == CPU_CORE_PERF) > + return sysfs_emit(buf, "%d\n", asus_bios.rog_tunables->min_perf_cores); > + else > + return sysfs_emit(buf, "%d\n", 0); > + default: > + break; > + } > + > + err = asus_wmi_get_devstate_dsts(ASUS_WMI_DEVID_CORES, &cores); > + if (err) > + return err; > + > + cores &= ~ASUS_WMI_DSTS_PRESENCE_BIT; > + if (core_type == CPU_CORE_PERF) > + cores &= 0xff; > + else > + cores = (cores & 0xff00) >> 8; > + return sysfs_emit(buf, "%d\n", cores); > +} > + > +static ssize_t cores_current_value_store(struct kobject *kobj, > + struct kobj_attribute *attr, const char *buf, > + enum cpu_core_type core_type) > +{ > + int result, err; > + u32 cores, currentv, min, max; > + > + result = kstrtou32(buf, 10, &cores); > + if (result) > + return result; > + > + if (core_type == CPU_CORE_PERF) { > + min = asus_bios.rog_tunables->min_perf_cores; > + max = asus_bios.rog_tunables->max_perf_cores; > + } else { > + min = 0; > + max = asus_bios.rog_tunables->max_power_cores; > + } > + if (cores < min || cores > max) > + return -EINVAL; > + > + err = asus_wmi_get_devstate_dsts(ASUS_WMI_DEVID_CORES, ¤tv); > + if (err) > + return err; > + > + if (core_type == CPU_CORE_PERF) > + cores |= (currentv & 0xff00); > + else > + cores |= currentv & 0xff; > + > + if (cores == currentv) > + return 0; > + > + err = asus_wmi_set_devstate(ASUS_WMI_DEVID_CORES, cores, &result); > + if (err) { > + pr_warn("Failed to set perfromance core count: %d\n", err); > + return err; > + } > + > + if (result > 1) { > + pr_warn("Failed to set performance core count (result): 0x%x\n", result); > + return -EIO; > + } > + > + pr_info("CPU core count changed, reboot required\n"); > + sysfs_notify(kobj, NULL, attr->attr.name); > + asus_set_reboot_and_signal_event(); > + > + return 0; > +} > + > +static ssize_t cores_performance_min_value_show(struct kobject *kobj, > + struct kobj_attribute *attr, char *buf) > +{ > + return cores_value_show(kobj, attr, buf, CPU_CORE_PERF, CPU_CORE_MIN); > +} > + > +static ssize_t cores_performance_max_value_show(struct kobject *kobj, > + struct kobj_attribute *attr, char *buf) > +{ > + return cores_value_show(kobj, attr, buf, CPU_CORE_PERF, CPU_CORE_MAX); > +} > + > +static ssize_t cores_performance_default_value_show(struct kobject *kobj, > + struct kobj_attribute *attr, char *buf) > +{ > + return cores_value_show(kobj, attr, buf, CPU_CORE_PERF, CPU_CORE_DEFAULT); > +} > + > +static ssize_t cores_performance_current_value_show(struct kobject *kobj, > + struct kobj_attribute *attr, char *buf) > +{ > + return cores_value_show(kobj, attr, buf, CPU_CORE_PERF, CPU_CORE_CURRENT); > +} > + > +static ssize_t cores_performance_current_value_store(struct kobject *kobj, > + struct kobj_attribute *attr, > + const char *buf, size_t count) > +{ > + int err; > + > + err = cores_current_value_store(kobj, attr, buf, CPU_CORE_PERF); > + if (err) > + return err; > + > + return count; > +} > +ATTR_GROUP_CORES_RW(cores_performance, "cores_performance", ASUS_WMI_DEVID_CORES, > + "Set the max available performance cores"); > + > +static ssize_t cores_efficiency_min_value_show(struct kobject *kobj, > + struct kobj_attribute *attr, char *buf) > +{ > + return cores_value_show(kobj, attr, buf, CPU_CORE_POWER, CPU_CORE_MIN); > +} > + > +static ssize_t cores_efficiency_max_value_show(struct kobject *kobj, > + struct kobj_attribute *attr, char *buf) > +{ > + return cores_value_show(kobj, attr, buf, CPU_CORE_POWER, CPU_CORE_MAX); > +} > + > +static ssize_t cores_efficiency_default_value_show(struct kobject *kobj, > + struct kobj_attribute *attr, char *buf) > +{ > + return cores_value_show(kobj, attr, buf, CPU_CORE_POWER, CPU_CORE_DEFAULT); > +} > + > +static ssize_t cores_efficiency_current_value_show(struct kobject *kobj, > + struct kobj_attribute *attr, char *buf) > +{ > + return cores_value_show(kobj, attr, buf, CPU_CORE_POWER, CPU_CORE_CURRENT); > +} > + > +static ssize_t cores_efficiency_current_value_store(struct kobject *kobj, > + struct kobj_attribute *attr, > + const char *buf, size_t count) > +{ > + int err; > + > + err = cores_current_value_store(kobj, attr, buf, CPU_CORE_POWER); > + if (err) > + return err; > + > + return count; > +} > +ATTR_GROUP_CORES_RW(cores_efficiency, "cores_efficiency", ASUS_WMI_DEVID_CORES, > + "Set the max available efficiency cores"); > + > /* Simple attribute creation */ > ATTR_GROUP_ENUM_INT_RW(thermal_policy, "thermal_policy", ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY, > 0, 3, "0;1;2", "Set the thermal profile: 0=normal, 1=performance, 2=quiet"); > @@ -636,6 +837,11 @@ static int asus_fw_attr_add(void) > if (asus_wmi_is_present(ASUS_WMI_DEVID_EGPU_CONNECTED)) > sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &egpu_connected_attr_group); > > + if (asus_wmi_is_present(ASUS_WMI_DEVID_CORES_MAX) && !asus_bios_set_max_cores()) { > + sysfs_create_group(&asus_bios.fw_attr_kset->kobj, &cores_performance_attr_group); > + sysfs_create_group(&asus_bios.fw_attr_kset->kobj, &cores_efficiency_attr_group); > + } > + > if (asus_wmi_is_present(ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY)) > sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &thermal_policy_attr_group); > if (asus_wmi_is_present(ASUS_WMI_DEVID_PPT_PL1_SPL)) > diff --git a/drivers/platform/x86/asus-bioscfg.h b/drivers/platform/x86/asus-bioscfg.h > index 2da55a91ff0b..bae1976eda3f 100644 > --- a/drivers/platform/x86/asus-bioscfg.h > +++ b/drivers/platform/x86/asus-bioscfg.h > @@ -244,6 +244,35 @@ static const struct attribute_group _attrname##_attr_group = { \ > .attrs = _attrname##_attrs \ > } > > +/* CPU core attributes need a little different in setup */ > +#define ATTR_GROUP_CORES_RW(_attrname, _fsname, _dispname) \ > +__ATTR_SHOW_FMT(scalar_increment, _attrname, "%d\n", 1); \ > +__ATTR_SHOW_FMT(display_name, _attrname, "%s\n", _dispname); \ > +static struct kobj_attribute attr_##_attrname##_current_value = \ > + __ASUS_ATTR_RW(_attrname, current_value); \ > +static struct kobj_attribute attr_##_attrname##_default_value = \ > + __ASUS_ATTR_RO(_attrname, default_value); \ > +static struct kobj_attribute attr_##_attrname##_min_value = \ > + __ASUS_ATTR_RO(_attrname, min_value); \ > +static struct kobj_attribute attr_##_attrname##_max_value = \ > + __ASUS_ATTR_RO(_attrname, max_value); \ > +static struct kobj_attribute attr_##_attrname##_type = \ > + __ASUS_ATTR_RO_AS(type, int_type_show); \ > +static struct attribute *_attrname##_attrs[] = { \ > + &attr_##_attrname##_current_value.attr, \ > + &attr_##_attrname##_default_value.attr, \ > + &attr_##_attrname##_min_value.attr, \ > + &attr_##_attrname##_max_value.attr, \ > + &attr_##_attrname##_scalar_increment.attr, \ > + &attr_##_attrname##_display_name.attr, \ > + &attr_##_attrname##_type.attr, \ > + NULL \ > +}; \ > +static const struct attribute_group _attrname##_attr_group = { \ > + .name = _fsname, \ > + .attrs = _attrname##_attrs \ > +} > + > /* ROG PPT attributes need a little different in setup */ > #define ATTR_GROUP_PPT_RW(_attrname, _fsname, _wmi, _default, \ > _min, _max, _incstep, _dispname) \ > diff --git a/include/linux/platform_data/x86/asus-wmi.h b/include/linux/platform_data/x86/asus-wmi.h > index e3d511918416..d8f713ed3ea3 100644 > --- a/include/linux/platform_data/x86/asus-wmi.h > +++ b/include/linux/platform_data/x86/asus-wmi.h > @@ -128,6 +128,10 @@ > /* dgpu on/off */ > #define ASUS_WMI_DEVID_DGPU 0x00090020 > > +/* Intel E-core and P-core configuration in a format 0x0[E]0[P] */ > +#define ASUS_WMI_DEVID_CORES 0x001200D2 > + /* Maximum Intel E-core and P-core availability */ > +#define ASUS_WMI_DEVID_CORES_MAX 0x001200D3 > #define ASUS_WMI_DEVID_DGPU_BASE_TGP 0x00120099 > #define ASUS_WMI_DEVID_DGPU_SET_TGP 0x00120098 > #define ASUS_WMI_DEVID_APU_MEM 0x000600C1
On Tue, 16 Jul 2024, at 9:25 PM, Hans de Goede wrote: > Hi, > > On 7/16/24 7:16 AM, Luke D. Jones wrote: > > Implement Intel core enablement under the asus-bioscfg module using the > > fw_attributes class. > > > > This allows users to enable or disable preformance or efficiency cores > > depending on their requirements. After change a reboot is required. > > Not a full revieew, just a quick remark. You say this this > requires a reboot, but this patch does not update asus_bios_requires_reboot() > Thanks for catching that! Regards, Luke. > > > > > > Signed-off-by: Luke D. Jones <luke@ljones.dev> > > --- > > drivers/platform/x86/asus-bioscfg.c | 206 +++++++++++++++++++++ > > drivers/platform/x86/asus-bioscfg.h | 29 +++ > > include/linux/platform_data/x86/asus-wmi.h | 4 + > > 3 files changed, 239 insertions(+) > > > > diff --git a/drivers/platform/x86/asus-bioscfg.c b/drivers/platform/x86/asus-bioscfg.c > > index 57efe50e0d19..6d39e45591e8 100644 > > --- a/drivers/platform/x86/asus-bioscfg.c > > +++ b/drivers/platform/x86/asus-bioscfg.c > > @@ -41,6 +41,18 @@ MODULE_ALIAS("wmi:"ASUS_NB_WMI_EVENT_GUID); > > #define ASUS_MINI_LED_2024_STRONG 0x01 > > #define ASUS_MINI_LED_2024_OFF 0x02 > > > > +enum cpu_core_type { > > + CPU_CORE_PERF = 0, > > + CPU_CORE_POWER, > > +}; > > + > > +enum cpu_core_value { > > + CPU_CORE_DEFAULT = 0, > > + CPU_CORE_MIN, > > + CPU_CORE_MAX, > > + CPU_CORE_CURRENT, > > +}; > > + > > /* Default limits for tunables available on ASUS ROG laptops */ > > #define PPT_CPU_LIMIT_MIN 5 > > #define PPT_CPU_LIMIT_MAX 150 > > @@ -75,6 +87,10 @@ struct rog_tunables { > > u32 nv_temp_default; > > u32 nv_temp_max; > > u32 nv_temp_target; > > + > > + u32 min_perf_cores; > > + u32 max_perf_cores; > > + u32 max_power_cores; > > }; > > > > static const struct class *fw_attr_class; > > @@ -540,6 +556,191 @@ static ssize_t apu_mem_possible_values_show(struct kobject *kobj, > > } > > ATTR_GROUP_ENUM_CUSTOM(apu_mem, "apu_mem", "Set the available system memory for the APU to use"); > > > > +static int asus_bios_set_max_cores(void) > > +{ > > + u32 cores; > > + int err; > > + > > + asus_bios.rog_tunables->min_perf_cores = 4; > > + asus_bios.rog_tunables->max_perf_cores = 4; > > + asus_bios.rog_tunables->max_power_cores = 8; > > + > > + err = asus_wmi_get_devstate_dsts(ASUS_WMI_DEVID_CORES_MAX, &cores); > > + if (err) > > + return err; > > + > > + cores &= ~ASUS_WMI_DSTS_PRESENCE_BIT; > > + asus_bios.rog_tunables->max_power_cores = (cores & 0xff00) >> 8; > > + asus_bios.rog_tunables->max_perf_cores = cores & 0xff; > > + > > + return 0; > > +} > > + > > +static ssize_t cores_value_show(struct kobject *kobj, > > + struct kobj_attribute *attr, char *buf, > > + enum cpu_core_type core_type, > > + enum cpu_core_value core_value) > > +{ > > + u32 cores; > > + int err; > > + > > + switch (core_value) { > > + case CPU_CORE_DEFAULT: > > + case CPU_CORE_MAX: > > + if (core_type == CPU_CORE_PERF) > > + return sysfs_emit(buf, "%d\n", asus_bios.rog_tunables->max_perf_cores); > > + else > > + return sysfs_emit(buf, "%d\n", asus_bios.rog_tunables->max_power_cores); > > + case CPU_CORE_MIN: > > + if (core_type == CPU_CORE_PERF) > > + return sysfs_emit(buf, "%d\n", asus_bios.rog_tunables->min_perf_cores); > > + else > > + return sysfs_emit(buf, "%d\n", 0); > > + default: > > + break; > > + } > > + > > + err = asus_wmi_get_devstate_dsts(ASUS_WMI_DEVID_CORES, &cores); > > + if (err) > > + return err; > > + > > + cores &= ~ASUS_WMI_DSTS_PRESENCE_BIT; > > + if (core_type == CPU_CORE_PERF) > > + cores &= 0xff; > > + else > > + cores = (cores & 0xff00) >> 8; > > + return sysfs_emit(buf, "%d\n", cores); > > +} > > + > > +static ssize_t cores_current_value_store(struct kobject *kobj, > > + struct kobj_attribute *attr, const char *buf, > > + enum cpu_core_type core_type) > > +{ > > + int result, err; > > + u32 cores, currentv, min, max; > > + > > + result = kstrtou32(buf, 10, &cores); > > + if (result) > > + return result; > > + > > + if (core_type == CPU_CORE_PERF) { > > + min = asus_bios.rog_tunables->min_perf_cores; > > + max = asus_bios.rog_tunables->max_perf_cores; > > + } else { > > + min = 0; > > + max = asus_bios.rog_tunables->max_power_cores; > > + } > > + if (cores < min || cores > max) > > + return -EINVAL; > > + > > + err = asus_wmi_get_devstate_dsts(ASUS_WMI_DEVID_CORES, ¤tv); > > + if (err) > > + return err; > > + > > + if (core_type == CPU_CORE_PERF) > > + cores |= (currentv & 0xff00); > > + else > > + cores |= currentv & 0xff; > > + > > + if (cores == currentv) > > + return 0; > > + > > + err = asus_wmi_set_devstate(ASUS_WMI_DEVID_CORES, cores, &result); > > + if (err) { > > + pr_warn("Failed to set perfromance core count: %d\n", err); > > + return err; > > + } > > + > > + if (result > 1) { > > + pr_warn("Failed to set performance core count (result): 0x%x\n", result); > > + return -EIO; > > + } > > + > > + pr_info("CPU core count changed, reboot required\n"); > > + sysfs_notify(kobj, NULL, attr->attr.name); > > + asus_set_reboot_and_signal_event(); > > + > > + return 0; > > +} > > + > > +static ssize_t cores_performance_min_value_show(struct kobject *kobj, > > + struct kobj_attribute *attr, char *buf) > > +{ > > + return cores_value_show(kobj, attr, buf, CPU_CORE_PERF, CPU_CORE_MIN); > > +} > > + > > +static ssize_t cores_performance_max_value_show(struct kobject *kobj, > > + struct kobj_attribute *attr, char *buf) > > +{ > > + return cores_value_show(kobj, attr, buf, CPU_CORE_PERF, CPU_CORE_MAX); > > +} > > + > > +static ssize_t cores_performance_default_value_show(struct kobject *kobj, > > + struct kobj_attribute *attr, char *buf) > > +{ > > + return cores_value_show(kobj, attr, buf, CPU_CORE_PERF, CPU_CORE_DEFAULT); > > +} > > + > > +static ssize_t cores_performance_current_value_show(struct kobject *kobj, > > + struct kobj_attribute *attr, char *buf) > > +{ > > + return cores_value_show(kobj, attr, buf, CPU_CORE_PERF, CPU_CORE_CURRENT); > > +} > > + > > +static ssize_t cores_performance_current_value_store(struct kobject *kobj, > > + struct kobj_attribute *attr, > > + const char *buf, size_t count) > > +{ > > + int err; > > + > > + err = cores_current_value_store(kobj, attr, buf, CPU_CORE_PERF); > > + if (err) > > + return err; > > + > > + return count; > > +} > > +ATTR_GROUP_CORES_RW(cores_performance, "cores_performance", ASUS_WMI_DEVID_CORES, > > + "Set the max available performance cores"); > > + > > +static ssize_t cores_efficiency_min_value_show(struct kobject *kobj, > > + struct kobj_attribute *attr, char *buf) > > +{ > > + return cores_value_show(kobj, attr, buf, CPU_CORE_POWER, CPU_CORE_MIN); > > +} > > + > > +static ssize_t cores_efficiency_max_value_show(struct kobject *kobj, > > + struct kobj_attribute *attr, char *buf) > > +{ > > + return cores_value_show(kobj, attr, buf, CPU_CORE_POWER, CPU_CORE_MAX); > > +} > > + > > +static ssize_t cores_efficiency_default_value_show(struct kobject *kobj, > > + struct kobj_attribute *attr, char *buf) > > +{ > > + return cores_value_show(kobj, attr, buf, CPU_CORE_POWER, CPU_CORE_DEFAULT); > > +} > > + > > +static ssize_t cores_efficiency_current_value_show(struct kobject *kobj, > > + struct kobj_attribute *attr, char *buf) > > +{ > > + return cores_value_show(kobj, attr, buf, CPU_CORE_POWER, CPU_CORE_CURRENT); > > +} > > + > > +static ssize_t cores_efficiency_current_value_store(struct kobject *kobj, > > + struct kobj_attribute *attr, > > + const char *buf, size_t count) > > +{ > > + int err; > > + > > + err = cores_current_value_store(kobj, attr, buf, CPU_CORE_POWER); > > + if (err) > > + return err; > > + > > + return count; > > +} > > +ATTR_GROUP_CORES_RW(cores_efficiency, "cores_efficiency", ASUS_WMI_DEVID_CORES, > > + "Set the max available efficiency cores"); > > + > > /* Simple attribute creation */ > > ATTR_GROUP_ENUM_INT_RW(thermal_policy, "thermal_policy", ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY, > > 0, 3, "0;1;2", "Set the thermal profile: 0=normal, 1=performance, 2=quiet"); > > @@ -636,6 +837,11 @@ static int asus_fw_attr_add(void) > > if (asus_wmi_is_present(ASUS_WMI_DEVID_EGPU_CONNECTED)) > > sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &egpu_connected_attr_group); > > > > + if (asus_wmi_is_present(ASUS_WMI_DEVID_CORES_MAX) && !asus_bios_set_max_cores()) { > > + sysfs_create_group(&asus_bios.fw_attr_kset->kobj, &cores_performance_attr_group); > > + sysfs_create_group(&asus_bios.fw_attr_kset->kobj, &cores_efficiency_attr_group); > > + } > > + > > if (asus_wmi_is_present(ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY)) > > sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &thermal_policy_attr_group); > > if (asus_wmi_is_present(ASUS_WMI_DEVID_PPT_PL1_SPL)) > > diff --git a/drivers/platform/x86/asus-bioscfg.h b/drivers/platform/x86/asus-bioscfg.h > > index 2da55a91ff0b..bae1976eda3f 100644 > > --- a/drivers/platform/x86/asus-bioscfg.h > > +++ b/drivers/platform/x86/asus-bioscfg.h > > @@ -244,6 +244,35 @@ static const struct attribute_group _attrname##_attr_group = { \ > > .attrs = _attrname##_attrs \ > > } > > > > +/* CPU core attributes need a little different in setup */ > > +#define ATTR_GROUP_CORES_RW(_attrname, _fsname, _dispname) \ > > +__ATTR_SHOW_FMT(scalar_increment, _attrname, "%d\n", 1); \ > > +__ATTR_SHOW_FMT(display_name, _attrname, "%s\n", _dispname); \ > > +static struct kobj_attribute attr_##_attrname##_current_value = \ > > + __ASUS_ATTR_RW(_attrname, current_value); \ > > +static struct kobj_attribute attr_##_attrname##_default_value = \ > > + __ASUS_ATTR_RO(_attrname, default_value); \ > > +static struct kobj_attribute attr_##_attrname##_min_value = \ > > + __ASUS_ATTR_RO(_attrname, min_value); \ > > +static struct kobj_attribute attr_##_attrname##_max_value = \ > > + __ASUS_ATTR_RO(_attrname, max_value); \ > > +static struct kobj_attribute attr_##_attrname##_type = \ > > + __ASUS_ATTR_RO_AS(type, int_type_show); \ > > +static struct attribute *_attrname##_attrs[] = { \ > > + &attr_##_attrname##_current_value.attr, \ > > + &attr_##_attrname##_default_value.attr, \ > > + &attr_##_attrname##_min_value.attr, \ > > + &attr_##_attrname##_max_value.attr, \ > > + &attr_##_attrname##_scalar_increment.attr, \ > > + &attr_##_attrname##_display_name.attr, \ > > + &attr_##_attrname##_type.attr, \ > > + NULL \ > > +}; \ > > +static const struct attribute_group _attrname##_attr_group = { \ > > + .name = _fsname, \ > > + .attrs = _attrname##_attrs \ > > +} > > + > > /* ROG PPT attributes need a little different in setup */ > > #define ATTR_GROUP_PPT_RW(_attrname, _fsname, _wmi, _default, \ > > _min, _max, _incstep, _dispname) \ > > diff --git a/include/linux/platform_data/x86/asus-wmi.h b/include/linux/platform_data/x86/asus-wmi.h > > index e3d511918416..d8f713ed3ea3 100644 > > --- a/include/linux/platform_data/x86/asus-wmi.h > > +++ b/include/linux/platform_data/x86/asus-wmi.h > > @@ -128,6 +128,10 @@ > > /* dgpu on/off */ > > #define ASUS_WMI_DEVID_DGPU 0x00090020 > > > > +/* Intel E-core and P-core configuration in a format 0x0[E]0[P] */ > > +#define ASUS_WMI_DEVID_CORES 0x001200D2 > > + /* Maximum Intel E-core and P-core availability */ > > +#define ASUS_WMI_DEVID_CORES_MAX 0x001200D3 > > #define ASUS_WMI_DEVID_DGPU_BASE_TGP 0x00120099 > > #define ASUS_WMI_DEVID_DGPU_SET_TGP 0x00120098 > > #define ASUS_WMI_DEVID_APU_MEM 0x000600C1 > >
On Tue, 16 Jul 2024, at 9:41 PM, Luke Jones wrote: > > > On Tue, 16 Jul 2024, at 9:25 PM, Hans de Goede wrote: > > Hi, > > > > On 7/16/24 7:16 AM, Luke D. Jones wrote: > > > Implement Intel core enablement under the asus-bioscfg module using the > > > fw_attributes class. > > > > > > This allows users to enable or disable preformance or efficiency cores > > > depending on their requirements. After change a reboot is required. > > > > Not a full revieew, just a quick remark. You say this this > > requires a reboot, but this patch does not update asus_bios_requires_reboot() > > > > Thanks for catching that! Huh.. Okay looks like asus_bios_requires_reboot() got screwed up with the rebase editing I've done. The return statement is followed by a line that will never ge run too. > > > > > > > > > > > Signed-off-by: Luke D. Jones <luke@ljones.dev> > > > --- > > > drivers/platform/x86/asus-bioscfg.c | 206 +++++++++++++++++++++ > > > drivers/platform/x86/asus-bioscfg.h | 29 +++ > > > include/linux/platform_data/x86/asus-wmi.h | 4 + > > > 3 files changed, 239 insertions(+) > > > > > > diff --git a/drivers/platform/x86/asus-bioscfg.c b/drivers/platform/x86/asus-bioscfg.c > > > index 57efe50e0d19..6d39e45591e8 100644 > > > --- a/drivers/platform/x86/asus-bioscfg.c > > > +++ b/drivers/platform/x86/asus-bioscfg.c > > > @@ -41,6 +41,18 @@ MODULE_ALIAS("wmi:"ASUS_NB_WMI_EVENT_GUID); > > > #define ASUS_MINI_LED_2024_STRONG 0x01 > > > #define ASUS_MINI_LED_2024_OFF 0x02 > > > > > > +enum cpu_core_type { > > > + CPU_CORE_PERF = 0, > > > + CPU_CORE_POWER, > > > +}; > > > + > > > +enum cpu_core_value { > > > + CPU_CORE_DEFAULT = 0, > > > + CPU_CORE_MIN, > > > + CPU_CORE_MAX, > > > + CPU_CORE_CURRENT, > > > +}; > > > + > > > /* Default limits for tunables available on ASUS ROG laptops */ > > > #define PPT_CPU_LIMIT_MIN 5 > > > #define PPT_CPU_LIMIT_MAX 150 > > > @@ -75,6 +87,10 @@ struct rog_tunables { > > > u32 nv_temp_default; > > > u32 nv_temp_max; > > > u32 nv_temp_target; > > > + > > > + u32 min_perf_cores; > > > + u32 max_perf_cores; > > > + u32 max_power_cores; > > > }; > > > > > > static const struct class *fw_attr_class; > > > @@ -540,6 +556,191 @@ static ssize_t apu_mem_possible_values_show(struct kobject *kobj, > > > } > > > ATTR_GROUP_ENUM_CUSTOM(apu_mem, "apu_mem", "Set the available system memory for the APU to use"); > > > > > > +static int asus_bios_set_max_cores(void) > > > +{ > > > + u32 cores; > > > + int err; > > > + > > > + asus_bios.rog_tunables->min_perf_cores = 4; > > > + asus_bios.rog_tunables->max_perf_cores = 4; > > > + asus_bios.rog_tunables->max_power_cores = 8; > > > + > > > + err = asus_wmi_get_devstate_dsts(ASUS_WMI_DEVID_CORES_MAX, &cores); > > > + if (err) > > > + return err; > > > + > > > + cores &= ~ASUS_WMI_DSTS_PRESENCE_BIT; > > > + asus_bios.rog_tunables->max_power_cores = (cores & 0xff00) >> 8; > > > + asus_bios.rog_tunables->max_perf_cores = cores & 0xff; > > > + > > > + return 0; > > > +} > > > + > > > +static ssize_t cores_value_show(struct kobject *kobj, > > > + struct kobj_attribute *attr, char *buf, > > > + enum cpu_core_type core_type, > > > + enum cpu_core_value core_value) > > > +{ > > > + u32 cores; > > > + int err; > > > + > > > + switch (core_value) { > > > + case CPU_CORE_DEFAULT: > > > + case CPU_CORE_MAX: > > > + if (core_type == CPU_CORE_PERF) > > > + return sysfs_emit(buf, "%d\n", asus_bios.rog_tunables->max_perf_cores); > > > + else > > > + return sysfs_emit(buf, "%d\n", asus_bios.rog_tunables->max_power_cores); > > > + case CPU_CORE_MIN: > > > + if (core_type == CPU_CORE_PERF) > > > + return sysfs_emit(buf, "%d\n", asus_bios.rog_tunables->min_perf_cores); > > > + else > > > + return sysfs_emit(buf, "%d\n", 0); > > > + default: > > > + break; > > > + } > > > + > > > + err = asus_wmi_get_devstate_dsts(ASUS_WMI_DEVID_CORES, &cores); > > > + if (err) > > > + return err; > > > + > > > + cores &= ~ASUS_WMI_DSTS_PRESENCE_BIT; > > > + if (core_type == CPU_CORE_PERF) > > > + cores &= 0xff; > > > + else > > > + cores = (cores & 0xff00) >> 8; > > > + return sysfs_emit(buf, "%d\n", cores); > > > +} > > > + > > > +static ssize_t cores_current_value_store(struct kobject *kobj, > > > + struct kobj_attribute *attr, const char *buf, > > > + enum cpu_core_type core_type) > > > +{ > > > + int result, err; > > > + u32 cores, currentv, min, max; > > > + > > > + result = kstrtou32(buf, 10, &cores); > > > + if (result) > > > + return result; > > > + > > > + if (core_type == CPU_CORE_PERF) { > > > + min = asus_bios.rog_tunables->min_perf_cores; > > > + max = asus_bios.rog_tunables->max_perf_cores; > > > + } else { > > > + min = 0; > > > + max = asus_bios.rog_tunables->max_power_cores; > > > + } > > > + if (cores < min || cores > max) > > > + return -EINVAL; > > > + > > > + err = asus_wmi_get_devstate_dsts(ASUS_WMI_DEVID_CORES, ¤tv); > > > + if (err) > > > + return err; > > > + > > > + if (core_type == CPU_CORE_PERF) > > > + cores |= (currentv & 0xff00); > > > + else > > > + cores |= currentv & 0xff; > > > + > > > + if (cores == currentv) > > > + return 0; > > > + > > > + err = asus_wmi_set_devstate(ASUS_WMI_DEVID_CORES, cores, &result); > > > + if (err) { > > > + pr_warn("Failed to set perfromance core count: %d\n", err); > > > + return err; > > > + } > > > + > > > + if (result > 1) { > > > + pr_warn("Failed to set performance core count (result): 0x%x\n", result); > > > + return -EIO; > > > + } > > > + > > > + pr_info("CPU core count changed, reboot required\n"); > > > + sysfs_notify(kobj, NULL, attr->attr.name); > > > + asus_set_reboot_and_signal_event(); > > > + > > > + return 0; > > > +} > > > + > > > +static ssize_t cores_performance_min_value_show(struct kobject *kobj, > > > + struct kobj_attribute *attr, char *buf) > > > +{ > > > + return cores_value_show(kobj, attr, buf, CPU_CORE_PERF, CPU_CORE_MIN); > > > +} > > > + > > > +static ssize_t cores_performance_max_value_show(struct kobject *kobj, > > > + struct kobj_attribute *attr, char *buf) > > > +{ > > > + return cores_value_show(kobj, attr, buf, CPU_CORE_PERF, CPU_CORE_MAX); > > > +} > > > + > > > +static ssize_t cores_performance_default_value_show(struct kobject *kobj, > > > + struct kobj_attribute *attr, char *buf) > > > +{ > > > + return cores_value_show(kobj, attr, buf, CPU_CORE_PERF, CPU_CORE_DEFAULT); > > > +} > > > + > > > +static ssize_t cores_performance_current_value_show(struct kobject *kobj, > > > + struct kobj_attribute *attr, char *buf) > > > +{ > > > + return cores_value_show(kobj, attr, buf, CPU_CORE_PERF, CPU_CORE_CURRENT); > > > +} > > > + > > > +static ssize_t cores_performance_current_value_store(struct kobject *kobj, > > > + struct kobj_attribute *attr, > > > + const char *buf, size_t count) > > > +{ > > > + int err; > > > + > > > + err = cores_current_value_store(kobj, attr, buf, CPU_CORE_PERF); > > > + if (err) > > > + return err; > > > + > > > + return count; > > > +} > > > +ATTR_GROUP_CORES_RW(cores_performance, "cores_performance", ASUS_WMI_DEVID_CORES, > > > + "Set the max available performance cores"); > > > + > > > +static ssize_t cores_efficiency_min_value_show(struct kobject *kobj, > > > + struct kobj_attribute *attr, char *buf) > > > +{ > > > + return cores_value_show(kobj, attr, buf, CPU_CORE_POWER, CPU_CORE_MIN); > > > +} > > > + > > > +static ssize_t cores_efficiency_max_value_show(struct kobject *kobj, > > > + struct kobj_attribute *attr, char *buf) > > > +{ > > > + return cores_value_show(kobj, attr, buf, CPU_CORE_POWER, CPU_CORE_MAX); > > > +} > > > + > > > +static ssize_t cores_efficiency_default_value_show(struct kobject *kobj, > > > + struct kobj_attribute *attr, char *buf) > > > +{ > > > + return cores_value_show(kobj, attr, buf, CPU_CORE_POWER, CPU_CORE_DEFAULT); > > > +} > > > + > > > +static ssize_t cores_efficiency_current_value_show(struct kobject *kobj, > > > + struct kobj_attribute *attr, char *buf) > > > +{ > > > + return cores_value_show(kobj, attr, buf, CPU_CORE_POWER, CPU_CORE_CURRENT); > > > +} > > > + > > > +static ssize_t cores_efficiency_current_value_store(struct kobject *kobj, > > > + struct kobj_attribute *attr, > > > + const char *buf, size_t count) > > > +{ > > > + int err; > > > + > > > + err = cores_current_value_store(kobj, attr, buf, CPU_CORE_POWER); > > > + if (err) > > > + return err; > > > + > > > + return count; > > > +} > > > +ATTR_GROUP_CORES_RW(cores_efficiency, "cores_efficiency", ASUS_WMI_DEVID_CORES, > > > + "Set the max available efficiency cores"); > > > + > > > /* Simple attribute creation */ > > > ATTR_GROUP_ENUM_INT_RW(thermal_policy, "thermal_policy", ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY, > > > 0, 3, "0;1;2", "Set the thermal profile: 0=normal, 1=performance, 2=quiet"); > > > @@ -636,6 +837,11 @@ static int asus_fw_attr_add(void) > > > if (asus_wmi_is_present(ASUS_WMI_DEVID_EGPU_CONNECTED)) > > > sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &egpu_connected_attr_group); > > > > > > + if (asus_wmi_is_present(ASUS_WMI_DEVID_CORES_MAX) && !asus_bios_set_max_cores()) { > > > + sysfs_create_group(&asus_bios.fw_attr_kset->kobj, &cores_performance_attr_group); > > > + sysfs_create_group(&asus_bios.fw_attr_kset->kobj, &cores_efficiency_attr_group); > > > + } > > > + > > > if (asus_wmi_is_present(ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY)) > > > sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &thermal_policy_attr_group); > > > if (asus_wmi_is_present(ASUS_WMI_DEVID_PPT_PL1_SPL)) > > > diff --git a/drivers/platform/x86/asus-bioscfg.h b/drivers/platform/x86/asus-bioscfg.h > > > index 2da55a91ff0b..bae1976eda3f 100644 > > > --- a/drivers/platform/x86/asus-bioscfg.h > > > +++ b/drivers/platform/x86/asus-bioscfg.h > > > @@ -244,6 +244,35 @@ static const struct attribute_group _attrname##_attr_group = { \ > > > .attrs = _attrname##_attrs \ > > > } > > > > > > +/* CPU core attributes need a little different in setup */ > > > +#define ATTR_GROUP_CORES_RW(_attrname, _fsname, _dispname) \ > > > +__ATTR_SHOW_FMT(scalar_increment, _attrname, "%d\n", 1); \ > > > +__ATTR_SHOW_FMT(display_name, _attrname, "%s\n", _dispname); \ > > > +static struct kobj_attribute attr_##_attrname##_current_value = \ > > > + __ASUS_ATTR_RW(_attrname, current_value); \ > > > +static struct kobj_attribute attr_##_attrname##_default_value = \ > > > + __ASUS_ATTR_RO(_attrname, default_value); \ > > > +static struct kobj_attribute attr_##_attrname##_min_value = \ > > > + __ASUS_ATTR_RO(_attrname, min_value); \ > > > +static struct kobj_attribute attr_##_attrname##_max_value = \ > > > + __ASUS_ATTR_RO(_attrname, max_value); \ > > > +static struct kobj_attribute attr_##_attrname##_type = \ > > > + __ASUS_ATTR_RO_AS(type, int_type_show); \ > > > +static struct attribute *_attrname##_attrs[] = { \ > > > + &attr_##_attrname##_current_value.attr, \ > > > + &attr_##_attrname##_default_value.attr, \ > > > + &attr_##_attrname##_min_value.attr, \ > > > + &attr_##_attrname##_max_value.attr, \ > > > + &attr_##_attrname##_scalar_increment.attr, \ > > > + &attr_##_attrname##_display_name.attr, \ > > > + &attr_##_attrname##_type.attr, \ > > > + NULL \ > > > +}; \ > > > +static const struct attribute_group _attrname##_attr_group = { \ > > > + .name = _fsname, \ > > > + .attrs = _attrname##_attrs \ > > > +} > > > + > > > /* ROG PPT attributes need a little different in setup */ > > > #define ATTR_GROUP_PPT_RW(_attrname, _fsname, _wmi, _default, \ > > > _min, _max, _incstep, _dispname) \ > > > diff --git a/include/linux/platform_data/x86/asus-wmi.h b/include/linux/platform_data/x86/asus-wmi.h > > > index e3d511918416..d8f713ed3ea3 100644 > > > --- a/include/linux/platform_data/x86/asus-wmi.h > > > +++ b/include/linux/platform_data/x86/asus-wmi.h > > > @@ -128,6 +128,10 @@ > > > /* dgpu on/off */ > > > #define ASUS_WMI_DEVID_DGPU 0x00090020 > > > > > > +/* Intel E-core and P-core configuration in a format 0x0[E]0[P] */ > > > +#define ASUS_WMI_DEVID_CORES 0x001200D2 > > > + /* Maximum Intel E-core and P-core availability */ > > > +#define ASUS_WMI_DEVID_CORES_MAX 0x001200D3 > > > #define ASUS_WMI_DEVID_DGPU_BASE_TGP 0x00120099 > > > #define ASUS_WMI_DEVID_DGPU_SET_TGP 0x00120098 > > > #define ASUS_WMI_DEVID_APU_MEM 0x000600C1 > > > >
diff --git a/drivers/platform/x86/asus-bioscfg.c b/drivers/platform/x86/asus-bioscfg.c index 57efe50e0d19..6d39e45591e8 100644 --- a/drivers/platform/x86/asus-bioscfg.c +++ b/drivers/platform/x86/asus-bioscfg.c @@ -41,6 +41,18 @@ MODULE_ALIAS("wmi:"ASUS_NB_WMI_EVENT_GUID); #define ASUS_MINI_LED_2024_STRONG 0x01 #define ASUS_MINI_LED_2024_OFF 0x02 +enum cpu_core_type { + CPU_CORE_PERF = 0, + CPU_CORE_POWER, +}; + +enum cpu_core_value { + CPU_CORE_DEFAULT = 0, + CPU_CORE_MIN, + CPU_CORE_MAX, + CPU_CORE_CURRENT, +}; + /* Default limits for tunables available on ASUS ROG laptops */ #define PPT_CPU_LIMIT_MIN 5 #define PPT_CPU_LIMIT_MAX 150 @@ -75,6 +87,10 @@ struct rog_tunables { u32 nv_temp_default; u32 nv_temp_max; u32 nv_temp_target; + + u32 min_perf_cores; + u32 max_perf_cores; + u32 max_power_cores; }; static const struct class *fw_attr_class; @@ -540,6 +556,191 @@ static ssize_t apu_mem_possible_values_show(struct kobject *kobj, } ATTR_GROUP_ENUM_CUSTOM(apu_mem, "apu_mem", "Set the available system memory for the APU to use"); +static int asus_bios_set_max_cores(void) +{ + u32 cores; + int err; + + asus_bios.rog_tunables->min_perf_cores = 4; + asus_bios.rog_tunables->max_perf_cores = 4; + asus_bios.rog_tunables->max_power_cores = 8; + + err = asus_wmi_get_devstate_dsts(ASUS_WMI_DEVID_CORES_MAX, &cores); + if (err) + return err; + + cores &= ~ASUS_WMI_DSTS_PRESENCE_BIT; + asus_bios.rog_tunables->max_power_cores = (cores & 0xff00) >> 8; + asus_bios.rog_tunables->max_perf_cores = cores & 0xff; + + return 0; +} + +static ssize_t cores_value_show(struct kobject *kobj, + struct kobj_attribute *attr, char *buf, + enum cpu_core_type core_type, + enum cpu_core_value core_value) +{ + u32 cores; + int err; + + switch (core_value) { + case CPU_CORE_DEFAULT: + case CPU_CORE_MAX: + if (core_type == CPU_CORE_PERF) + return sysfs_emit(buf, "%d\n", asus_bios.rog_tunables->max_perf_cores); + else + return sysfs_emit(buf, "%d\n", asus_bios.rog_tunables->max_power_cores); + case CPU_CORE_MIN: + if (core_type == CPU_CORE_PERF) + return sysfs_emit(buf, "%d\n", asus_bios.rog_tunables->min_perf_cores); + else + return sysfs_emit(buf, "%d\n", 0); + default: + break; + } + + err = asus_wmi_get_devstate_dsts(ASUS_WMI_DEVID_CORES, &cores); + if (err) + return err; + + cores &= ~ASUS_WMI_DSTS_PRESENCE_BIT; + if (core_type == CPU_CORE_PERF) + cores &= 0xff; + else + cores = (cores & 0xff00) >> 8; + return sysfs_emit(buf, "%d\n", cores); +} + +static ssize_t cores_current_value_store(struct kobject *kobj, + struct kobj_attribute *attr, const char *buf, + enum cpu_core_type core_type) +{ + int result, err; + u32 cores, currentv, min, max; + + result = kstrtou32(buf, 10, &cores); + if (result) + return result; + + if (core_type == CPU_CORE_PERF) { + min = asus_bios.rog_tunables->min_perf_cores; + max = asus_bios.rog_tunables->max_perf_cores; + } else { + min = 0; + max = asus_bios.rog_tunables->max_power_cores; + } + if (cores < min || cores > max) + return -EINVAL; + + err = asus_wmi_get_devstate_dsts(ASUS_WMI_DEVID_CORES, ¤tv); + if (err) + return err; + + if (core_type == CPU_CORE_PERF) + cores |= (currentv & 0xff00); + else + cores |= currentv & 0xff; + + if (cores == currentv) + return 0; + + err = asus_wmi_set_devstate(ASUS_WMI_DEVID_CORES, cores, &result); + if (err) { + pr_warn("Failed to set perfromance core count: %d\n", err); + return err; + } + + if (result > 1) { + pr_warn("Failed to set performance core count (result): 0x%x\n", result); + return -EIO; + } + + pr_info("CPU core count changed, reboot required\n"); + sysfs_notify(kobj, NULL, attr->attr.name); + asus_set_reboot_and_signal_event(); + + return 0; +} + +static ssize_t cores_performance_min_value_show(struct kobject *kobj, + struct kobj_attribute *attr, char *buf) +{ + return cores_value_show(kobj, attr, buf, CPU_CORE_PERF, CPU_CORE_MIN); +} + +static ssize_t cores_performance_max_value_show(struct kobject *kobj, + struct kobj_attribute *attr, char *buf) +{ + return cores_value_show(kobj, attr, buf, CPU_CORE_PERF, CPU_CORE_MAX); +} + +static ssize_t cores_performance_default_value_show(struct kobject *kobj, + struct kobj_attribute *attr, char *buf) +{ + return cores_value_show(kobj, attr, buf, CPU_CORE_PERF, CPU_CORE_DEFAULT); +} + +static ssize_t cores_performance_current_value_show(struct kobject *kobj, + struct kobj_attribute *attr, char *buf) +{ + return cores_value_show(kobj, attr, buf, CPU_CORE_PERF, CPU_CORE_CURRENT); +} + +static ssize_t cores_performance_current_value_store(struct kobject *kobj, + struct kobj_attribute *attr, + const char *buf, size_t count) +{ + int err; + + err = cores_current_value_store(kobj, attr, buf, CPU_CORE_PERF); + if (err) + return err; + + return count; +} +ATTR_GROUP_CORES_RW(cores_performance, "cores_performance", ASUS_WMI_DEVID_CORES, + "Set the max available performance cores"); + +static ssize_t cores_efficiency_min_value_show(struct kobject *kobj, + struct kobj_attribute *attr, char *buf) +{ + return cores_value_show(kobj, attr, buf, CPU_CORE_POWER, CPU_CORE_MIN); +} + +static ssize_t cores_efficiency_max_value_show(struct kobject *kobj, + struct kobj_attribute *attr, char *buf) +{ + return cores_value_show(kobj, attr, buf, CPU_CORE_POWER, CPU_CORE_MAX); +} + +static ssize_t cores_efficiency_default_value_show(struct kobject *kobj, + struct kobj_attribute *attr, char *buf) +{ + return cores_value_show(kobj, attr, buf, CPU_CORE_POWER, CPU_CORE_DEFAULT); +} + +static ssize_t cores_efficiency_current_value_show(struct kobject *kobj, + struct kobj_attribute *attr, char *buf) +{ + return cores_value_show(kobj, attr, buf, CPU_CORE_POWER, CPU_CORE_CURRENT); +} + +static ssize_t cores_efficiency_current_value_store(struct kobject *kobj, + struct kobj_attribute *attr, + const char *buf, size_t count) +{ + int err; + + err = cores_current_value_store(kobj, attr, buf, CPU_CORE_POWER); + if (err) + return err; + + return count; +} +ATTR_GROUP_CORES_RW(cores_efficiency, "cores_efficiency", ASUS_WMI_DEVID_CORES, + "Set the max available efficiency cores"); + /* Simple attribute creation */ ATTR_GROUP_ENUM_INT_RW(thermal_policy, "thermal_policy", ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY, 0, 3, "0;1;2", "Set the thermal profile: 0=normal, 1=performance, 2=quiet"); @@ -636,6 +837,11 @@ static int asus_fw_attr_add(void) if (asus_wmi_is_present(ASUS_WMI_DEVID_EGPU_CONNECTED)) sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &egpu_connected_attr_group); + if (asus_wmi_is_present(ASUS_WMI_DEVID_CORES_MAX) && !asus_bios_set_max_cores()) { + sysfs_create_group(&asus_bios.fw_attr_kset->kobj, &cores_performance_attr_group); + sysfs_create_group(&asus_bios.fw_attr_kset->kobj, &cores_efficiency_attr_group); + } + if (asus_wmi_is_present(ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY)) sysfs_create_group(&asus_bioscfg.fw_attr_kset->kobj, &thermal_policy_attr_group); if (asus_wmi_is_present(ASUS_WMI_DEVID_PPT_PL1_SPL)) diff --git a/drivers/platform/x86/asus-bioscfg.h b/drivers/platform/x86/asus-bioscfg.h index 2da55a91ff0b..bae1976eda3f 100644 --- a/drivers/platform/x86/asus-bioscfg.h +++ b/drivers/platform/x86/asus-bioscfg.h @@ -244,6 +244,35 @@ static const struct attribute_group _attrname##_attr_group = { \ .attrs = _attrname##_attrs \ } +/* CPU core attributes need a little different in setup */ +#define ATTR_GROUP_CORES_RW(_attrname, _fsname, _dispname) \ +__ATTR_SHOW_FMT(scalar_increment, _attrname, "%d\n", 1); \ +__ATTR_SHOW_FMT(display_name, _attrname, "%s\n", _dispname); \ +static struct kobj_attribute attr_##_attrname##_current_value = \ + __ASUS_ATTR_RW(_attrname, current_value); \ +static struct kobj_attribute attr_##_attrname##_default_value = \ + __ASUS_ATTR_RO(_attrname, default_value); \ +static struct kobj_attribute attr_##_attrname##_min_value = \ + __ASUS_ATTR_RO(_attrname, min_value); \ +static struct kobj_attribute attr_##_attrname##_max_value = \ + __ASUS_ATTR_RO(_attrname, max_value); \ +static struct kobj_attribute attr_##_attrname##_type = \ + __ASUS_ATTR_RO_AS(type, int_type_show); \ +static struct attribute *_attrname##_attrs[] = { \ + &attr_##_attrname##_current_value.attr, \ + &attr_##_attrname##_default_value.attr, \ + &attr_##_attrname##_min_value.attr, \ + &attr_##_attrname##_max_value.attr, \ + &attr_##_attrname##_scalar_increment.attr, \ + &attr_##_attrname##_display_name.attr, \ + &attr_##_attrname##_type.attr, \ + NULL \ +}; \ +static const struct attribute_group _attrname##_attr_group = { \ + .name = _fsname, \ + .attrs = _attrname##_attrs \ +} + /* ROG PPT attributes need a little different in setup */ #define ATTR_GROUP_PPT_RW(_attrname, _fsname, _wmi, _default, \ _min, _max, _incstep, _dispname) \ diff --git a/include/linux/platform_data/x86/asus-wmi.h b/include/linux/platform_data/x86/asus-wmi.h index e3d511918416..d8f713ed3ea3 100644 --- a/include/linux/platform_data/x86/asus-wmi.h +++ b/include/linux/platform_data/x86/asus-wmi.h @@ -128,6 +128,10 @@ /* dgpu on/off */ #define ASUS_WMI_DEVID_DGPU 0x00090020 +/* Intel E-core and P-core configuration in a format 0x0[E]0[P] */ +#define ASUS_WMI_DEVID_CORES 0x001200D2 + /* Maximum Intel E-core and P-core availability */ +#define ASUS_WMI_DEVID_CORES_MAX 0x001200D3 #define ASUS_WMI_DEVID_DGPU_BASE_TGP 0x00120099 #define ASUS_WMI_DEVID_DGPU_SET_TGP 0x00120098 #define ASUS_WMI_DEVID_APU_MEM 0x000600C1
Implement Intel core enablement under the asus-bioscfg module using the fw_attributes class. This allows users to enable or disable preformance or efficiency cores depending on their requirements. After change a reboot is required. Signed-off-by: Luke D. Jones <luke@ljones.dev> --- drivers/platform/x86/asus-bioscfg.c | 206 +++++++++++++++++++++ drivers/platform/x86/asus-bioscfg.h | 29 +++ include/linux/platform_data/x86/asus-wmi.h | 4 + 3 files changed, 239 insertions(+)