| Message ID | 20240806020747.365042-5-luke@ljones.dev (mailing list archive) |
|---|---|
| State | Changes Requested, archived |
| Headers | show |
| Series | platform/x86: introduce asus-armoury | expand |
On Tue, 6 Aug 2024, Luke D. Jones wrote: > Implement the APU memory size control under the asus-armoury module using > the fw_attributes class. > > This allows the APU allocated memory size to be adjusted depending on > the users priority. A reboot is required after change. > > Signed-off-by: Luke D. Jones <luke@ljones.dev> > --- > drivers/platform/x86/asus-armoury.c | 115 +++++++++++++++++++++ > include/linux/platform_data/x86/asus-wmi.h | 1 + > 2 files changed, 116 insertions(+) > > diff --git a/drivers/platform/x86/asus-armoury.c b/drivers/platform/x86/asus-armoury.c > index 31dbdacd8978..412e75c652a4 100644 > --- a/drivers/platform/x86/asus-armoury.c > +++ b/drivers/platform/x86/asus-armoury.c > @@ -462,6 +462,120 @@ static ssize_t egpu_enable_current_value_store(struct kobject *kobj, > WMI_SHOW_INT(egpu_enable_current_value, "%d\n", ASUS_WMI_DEVID_EGPU); > ATTR_GROUP_BOOL_CUSTOM(egpu_enable, "egpu_enable", "Enable the eGPU (also disables dGPU)"); > > +/* Device memory available to APU */ > + > +static ssize_t apu_mem_current_value_show(struct kobject *kobj, > + struct kobj_attribute *attr, char *buf) > +{ > + int err; > + u32 mem; > + > + err = asus_wmi_get_devstate_dsts(ASUS_WMI_DEVID_APU_MEM, &mem); > + if (err) > + return err; > + > + switch (mem) { > + case 256: > + mem = 0; > + break; > + case 258: > + mem = 1; > + break; > + case 259: > + mem = 2; > + break; > + case 260: > + mem = 3; > + break; > + case 261: > + mem = 4; > + break; > + case 262: > + /* This is out of order and looks wrong but is correct */ > + mem = 8; > + break; > + case 263: > + mem = 5; > + break; > + case 264: > + mem = 6; > + break; > + case 265: > + mem = 7; > + break; > + default: > + mem = 4; > + break; > + } > + > + return sysfs_emit(buf, "%d\n", mem); %u > +} > + > +static ssize_t apu_mem_current_value_store(struct kobject *kobj, > + struct kobj_attribute *attr, > + const char *buf, size_t count) > +{ > + int result, err; > + u32 requested, mem; > + > + result = kstrtou32(buf, 10, &requested); > + if (result) > + return result; > + > + switch (requested) { > + case 0: > + mem = 0; > + break; > + case 1: > + mem = 258; > + break; > + case 2: > + mem = 259; > + break; > + case 3: > + mem = 260; > + break; > + case 4: > + mem = 261; > + break; > + case 5: > + mem = 263; > + break; > + case 6: > + mem = 264; > + break; > + case 7: > + mem = 265; > + break; > + case 8: > + /* This is outof order and looks wrong but is correct */ outof -> out of > + mem = 262; > + break; > + default: > + return -EIO; > + } > + > + err = asus_wmi_set_devstate(ASUS_WMI_DEVID_APU_MEM, mem, &result); > + if (err) { > + pr_warn("Failed to set apu_mem: %d\n", err); > + return err; > + } > + > + pr_info("APU memory changed to %dGB, reboot required\n", requested); %u > + sysfs_notify(kobj, NULL, attr->attr.name); > + > + asus_set_reboot_and_signal_event(); > + > + return count; > +} > + > +static ssize_t apu_mem_possible_values_show(struct kobject *kobj, > + struct kobj_attribute *attr, char *buf) > +{ > + return sysfs_emit(buf, "0;1;2;3;4;5;6;7;8\n"); IIRC, space or newline is the usual separator for possible values sysfs files. I don't think I've ever seen ; used.
On Tue, 6 Aug 2024, at 10:20 PM, Ilpo Järvinen wrote: > On Tue, 6 Aug 2024, Luke D. Jones wrote: > > > Implement the APU memory size control under the asus-armoury module using > > the fw_attributes class. > > > > This allows the APU allocated memory size to be adjusted depending on > > the users priority. A reboot is required after change. > > > > Signed-off-by: Luke D. Jones <luke@ljones.dev> > > --- > > drivers/platform/x86/asus-armoury.c | 115 +++++++++++++++++++++ > > include/linux/platform_data/x86/asus-wmi.h | 1 + > > 2 files changed, 116 insertions(+) > > > > diff --git a/drivers/platform/x86/asus-armoury.c b/drivers/platform/x86/asus-armoury.c > > index 31dbdacd8978..412e75c652a4 100644 > > --- a/drivers/platform/x86/asus-armoury.c > > +++ b/drivers/platform/x86/asus-armoury.c > > @@ -462,6 +462,120 @@ static ssize_t egpu_enable_current_value_store(struct kobject *kobj, > > WMI_SHOW_INT(egpu_enable_current_value, "%d\n", ASUS_WMI_DEVID_EGPU); > > ATTR_GROUP_BOOL_CUSTOM(egpu_enable, "egpu_enable", "Enable the eGPU (also disables dGPU)"); > > > > +/* Device memory available to APU */ > > + > > +static ssize_t apu_mem_current_value_show(struct kobject *kobj, > > + struct kobj_attribute *attr, char *buf) > > +{ > > + int err; > > + u32 mem; > > + > > + err = asus_wmi_get_devstate_dsts(ASUS_WMI_DEVID_APU_MEM, &mem); > > + if (err) > > + return err; > > + > > + switch (mem) { > > + case 256: > > + mem = 0; > > + break; > > + case 258: > > + mem = 1; > > + break; > > + case 259: > > + mem = 2; > > + break; > > + case 260: > > + mem = 3; > > + break; > > + case 261: > > + mem = 4; > > + break; > > + case 262: > > + /* This is out of order and looks wrong but is correct */ > > + mem = 8; > > + break; > > + case 263: > > + mem = 5; > > + break; > > + case 264: > > + mem = 6; > > + break; > > + case 265: > > + mem = 7; > > + break; > > + default: > > + mem = 4; > > + break; > > + } > > + > > + return sysfs_emit(buf, "%d\n", mem); > > %u > > > +} > > + > > +static ssize_t apu_mem_current_value_store(struct kobject *kobj, > > + struct kobj_attribute *attr, > > + const char *buf, size_t count) > > +{ > > + int result, err; > > + u32 requested, mem; > > + > > + result = kstrtou32(buf, 10, &requested); > > + if (result) > > + return result; > > + > > + switch (requested) { > > + case 0: > > + mem = 0; > > + break; > > + case 1: > > + mem = 258; > > + break; > > + case 2: > > + mem = 259; > > + break; > > + case 3: > > + mem = 260; > > + break; > > + case 4: > > + mem = 261; > > + break; > > + case 5: > > + mem = 263; > > + break; > > + case 6: > > + mem = 264; > > + break; > > + case 7: > > + mem = 265; > > + break; > > + case 8: > > + /* This is outof order and looks wrong but is correct */ > > outof -> out of > > > + mem = 262; > > + break; > > + default: > > + return -EIO; > > + } > > + > > + err = asus_wmi_set_devstate(ASUS_WMI_DEVID_APU_MEM, mem, &result); > > + if (err) { > > + pr_warn("Failed to set apu_mem: %d\n", err); > > + return err; > > + } > > + > > + pr_info("APU memory changed to %dGB, reboot required\n", requested); > > %u > > > + sysfs_notify(kobj, NULL, attr->attr.name); > > + > > + asus_set_reboot_and_signal_event(); > > + > > + return count; > > +} > > + > > +static ssize_t apu_mem_possible_values_show(struct kobject *kobj, > > + struct kobj_attribute *attr, char *buf) > > +{ > > + return sysfs_emit(buf, "0;1;2;3;4;5;6;7;8\n"); Ack all > IIRC, space or newline is the usual separator for possible values sysfs > files. I don't think I've ever seen ; used. The docs specify this format. https://github.com/torvalds/linux/blob/5189dafa4cf950e675f02ee04b577dfbbad0d9b1/Documentation/ABI/testing/sysfs-class-firmware-attributes#L56 Thanks, Luke. > -- > i. > > > +} > > +ATTR_GROUP_ENUM_CUSTOM(apu_mem, "apu_mem", "Set the available system memory for the APU to use"); > > + > > /* Simple attribute creation */ > > ATTR_GROUP_ROG_TUNABLE(ppt_pl1_spl, "ppt_pl1_spl", ASUS_WMI_DEVID_PPT_PL1_SPL, cpu_default, > > cpu_min, cpu_max, 1, "Set the CPU slow package limit"); > > @@ -516,6 +630,7 @@ static const struct asus_attr_group armoury_attr_groups[] = { > > { &nv_temp_target_attr_group, ASUS_WMI_DEVID_NV_THERM_TARGET }, > > { &dgpu_base_tgp_attr_group, ASUS_WMI_DEVID_DGPU_BASE_TGP }, > > { &dgpu_tgp_attr_group, ASUS_WMI_DEVID_DGPU_SET_TGP }, > > + { &apu_mem_attr_group, ASUS_WMI_DEVID_APU_MEM }, > > > > { &charge_mode_attr_group, ASUS_WMI_DEVID_CHARGE_MODE }, > > { &boot_sound_attr_group, ASUS_WMI_DEVID_BOOT_SOUND }, > > diff --git a/include/linux/platform_data/x86/asus-wmi.h b/include/linux/platform_data/x86/asus-wmi.h > > index 3ce0c63be4c1..287206a03763 100644 > > --- a/include/linux/platform_data/x86/asus-wmi.h > > +++ b/include/linux/platform_data/x86/asus-wmi.h > > @@ -135,6 +135,7 @@ > > > > #define ASUS_WMI_DEVID_DGPU_BASE_TGP 0x00120099 > > #define ASUS_WMI_DEVID_DGPU_SET_TGP 0x00120098 > > +#define ASUS_WMI_DEVID_APU_MEM 0x000600C1 > > > > /* gpu mux switch, 0 = dGPU, 1 = Optimus */ > > #define ASUS_WMI_DEVID_GPU_MUX 0x00090016 > > >
On Sun, 11 Aug 2024, Luke Jones wrote: > On Tue, 6 Aug 2024, at 10:20 PM, Ilpo Järvinen wrote: > > On Tue, 6 Aug 2024, Luke D. Jones wrote: > > > > > Implement the APU memory size control under the asus-armoury module using > > > the fw_attributes class. > > > > > > This allows the APU allocated memory size to be adjusted depending on > > > the users priority. A reboot is required after change. > > > > > > Signed-off-by: Luke D. Jones <luke@ljones.dev> > > > --- > > > + sysfs_notify(kobj, NULL, attr->attr.name); > > > + > > > + asus_set_reboot_and_signal_event(); > > > + > > > + return count; > > > +} > > > + > > > +static ssize_t apu_mem_possible_values_show(struct kobject *kobj, > > > + struct kobj_attribute *attr, char *buf) > > > +{ > > > + return sysfs_emit(buf, "0;1;2;3;4;5;6;7;8\n"); > > Ack all > > > IIRC, space or newline is the usual separator for possible values sysfs > > files. I don't think I've ever seen ; used. > > The docs specify this format. https://github.com/torvalds/linux/blob/5189dafa4cf950e675f02ee04b577dfbbad0d9b1/Documentation/ABI/testing/sysfs-class-firmware-attributes#L56 Okay, I didn't know. Please use what's documented then.
diff --git a/drivers/platform/x86/asus-armoury.c b/drivers/platform/x86/asus-armoury.c index 31dbdacd8978..412e75c652a4 100644 --- a/drivers/platform/x86/asus-armoury.c +++ b/drivers/platform/x86/asus-armoury.c @@ -462,6 +462,120 @@ static ssize_t egpu_enable_current_value_store(struct kobject *kobj, WMI_SHOW_INT(egpu_enable_current_value, "%d\n", ASUS_WMI_DEVID_EGPU); ATTR_GROUP_BOOL_CUSTOM(egpu_enable, "egpu_enable", "Enable the eGPU (also disables dGPU)"); +/* Device memory available to APU */ + +static ssize_t apu_mem_current_value_show(struct kobject *kobj, + struct kobj_attribute *attr, char *buf) +{ + int err; + u32 mem; + + err = asus_wmi_get_devstate_dsts(ASUS_WMI_DEVID_APU_MEM, &mem); + if (err) + return err; + + switch (mem) { + case 256: + mem = 0; + break; + case 258: + mem = 1; + break; + case 259: + mem = 2; + break; + case 260: + mem = 3; + break; + case 261: + mem = 4; + break; + case 262: + /* This is out of order and looks wrong but is correct */ + mem = 8; + break; + case 263: + mem = 5; + break; + case 264: + mem = 6; + break; + case 265: + mem = 7; + break; + default: + mem = 4; + break; + } + + return sysfs_emit(buf, "%d\n", mem); +} + +static ssize_t apu_mem_current_value_store(struct kobject *kobj, + struct kobj_attribute *attr, + const char *buf, size_t count) +{ + int result, err; + u32 requested, mem; + + result = kstrtou32(buf, 10, &requested); + if (result) + return result; + + switch (requested) { + case 0: + mem = 0; + break; + case 1: + mem = 258; + break; + case 2: + mem = 259; + break; + case 3: + mem = 260; + break; + case 4: + mem = 261; + break; + case 5: + mem = 263; + break; + case 6: + mem = 264; + break; + case 7: + mem = 265; + break; + case 8: + /* This is outof order and looks wrong but is correct */ + mem = 262; + break; + default: + return -EIO; + } + + err = asus_wmi_set_devstate(ASUS_WMI_DEVID_APU_MEM, mem, &result); + if (err) { + pr_warn("Failed to set apu_mem: %d\n", err); + return err; + } + + pr_info("APU memory changed to %dGB, reboot required\n", requested); + sysfs_notify(kobj, NULL, attr->attr.name); + + asus_set_reboot_and_signal_event(); + + return count; +} + +static ssize_t apu_mem_possible_values_show(struct kobject *kobj, + struct kobj_attribute *attr, char *buf) +{ + return sysfs_emit(buf, "0;1;2;3;4;5;6;7;8\n"); +} +ATTR_GROUP_ENUM_CUSTOM(apu_mem, "apu_mem", "Set the available system memory for the APU to use"); + /* Simple attribute creation */ ATTR_GROUP_ROG_TUNABLE(ppt_pl1_spl, "ppt_pl1_spl", ASUS_WMI_DEVID_PPT_PL1_SPL, cpu_default, cpu_min, cpu_max, 1, "Set the CPU slow package limit"); @@ -516,6 +630,7 @@ static const struct asus_attr_group armoury_attr_groups[] = { { &nv_temp_target_attr_group, ASUS_WMI_DEVID_NV_THERM_TARGET }, { &dgpu_base_tgp_attr_group, ASUS_WMI_DEVID_DGPU_BASE_TGP }, { &dgpu_tgp_attr_group, ASUS_WMI_DEVID_DGPU_SET_TGP }, + { &apu_mem_attr_group, ASUS_WMI_DEVID_APU_MEM }, { &charge_mode_attr_group, ASUS_WMI_DEVID_CHARGE_MODE }, { &boot_sound_attr_group, ASUS_WMI_DEVID_BOOT_SOUND }, diff --git a/include/linux/platform_data/x86/asus-wmi.h b/include/linux/platform_data/x86/asus-wmi.h index 3ce0c63be4c1..287206a03763 100644 --- a/include/linux/platform_data/x86/asus-wmi.h +++ b/include/linux/platform_data/x86/asus-wmi.h @@ -135,6 +135,7 @@ #define ASUS_WMI_DEVID_DGPU_BASE_TGP 0x00120099 #define ASUS_WMI_DEVID_DGPU_SET_TGP 0x00120098 +#define ASUS_WMI_DEVID_APU_MEM 0x000600C1 /* gpu mux switch, 0 = dGPU, 1 = Optimus */ #define ASUS_WMI_DEVID_GPU_MUX 0x00090016
Implement the APU memory size control under the asus-armoury module using the fw_attributes class. This allows the APU allocated memory size to be adjusted depending on the users priority. A reboot is required after change. Signed-off-by: Luke D. Jones <luke@ljones.dev> --- drivers/platform/x86/asus-armoury.c | 115 +++++++++++++++++++++ include/linux/platform_data/x86/asus-wmi.h | 1 + 2 files changed, 116 insertions(+)