| Message ID | 20230922175056.244940-9-Shyam-sundar.S-k@amd.com (mailing list archive) |
|---|---|
| State | Changes Requested, archived |
| Headers | show |
| Series | Introduce PMF Smart PC Solution Builder Feature | expand |
Hi Shyam, kernel test robot noticed the following build warnings: [auto build test WARNING on hid/for-next] [also build test WARNING on linus/master v6.6-rc3 next-20230925] [cannot apply to drm-misc/drm-misc-next] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch#_base_tree_information] url: https://github.com/intel-lab-lkp/linux/commits/Shyam-Sundar-S-K/platform-x86-amd-pmf-Add-PMF-TEE-interface/20230923-015418 base: https://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git for-next patch link: https://lore.kernel.org/r/20230922175056.244940-9-Shyam-sundar.S-k%40amd.com patch subject: [PATCH 08/15] platform/x86/amd/pmf: Add support to update system state reproduce: (https://download.01.org/0day-ci/archive/20230926/202309260515.5XbR6N0g-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202309260515.5XbR6N0g-lkp@intel.com/ All warnings (new ones prefixed by >>): >> Documentation/admin-guide/pmf.rst:16: WARNING: Unexpected indentation. >> Documentation/admin-guide/pmf.rst: WARNING: document isn't included in any toctree vim +16 Documentation/admin-guide/pmf.rst 13 14 Please add the following line(s) to 15 ``/etc/udev/rules.d/99-local.rules``:: > 16 DRIVERS=="amd-pmf", ACTION=="change", ENV{EVENT_ID}=="1", RUN+="/usr/bin/systemctl suspend" 17 DRIVERS=="amd-pmf", ACTION=="change", ENV{EVENT_ID}=="2", RUN+="/usr/bin/systemctl hibernate" 18 DRIVERS=="amd-pmf", ACTION=="change", ENV{EVENT_ID}=="3", RUN+="/bin/loginctl lock-sessions" 19
On Fri, 22 Sep 2023, Shyam Sundar S K wrote: > PMF driver based on the output actions from the TA can request to update > the system states like entering s0i3, lock screen etc. by generating > an uevent. Based on the udev rules set in the userspace the event id > matching the uevent shall get updated accordingly using the systemctl. > > Sample udev rules under Documentation/admin-guide/pmf.rst. > > Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com> > --- > Documentation/admin-guide/pmf.rst | 24 ++++++++++++++++ > drivers/platform/x86/amd/pmf/pmf.h | 9 ++++++ > drivers/platform/x86/amd/pmf/tee-if.c | 40 ++++++++++++++++++++++++++- > 3 files changed, 72 insertions(+), 1 deletion(-) > create mode 100644 Documentation/admin-guide/pmf.rst > > diff --git a/Documentation/admin-guide/pmf.rst b/Documentation/admin-guide/pmf.rst > new file mode 100644 > index 000000000000..b60f381410c3 > --- /dev/null > +++ b/Documentation/admin-guide/pmf.rst > @@ -0,0 +1,24 @@ > +.. SPDX-License-Identifier: GPL-2.0 > + > +Set udev rules for PMF Smart PC Builder > +--------------------------------------- > + > +AMD PMF(Platform Management Framework) Smart PC Solution builder has to set the system states > +like S0i3, Screen lock, hibernate etc, based on the output actions provided by the PMF > +TA (Trusted Application). > + > +In order for this to work the PMF driver generates a uevent for userspace to react to. Below are > +sample udev rules that can facilitate this experience when a machine has PMF Smart PC solution builder > +enabled. > + > +Please add the following line(s) to > +``/etc/udev/rules.d/99-local.rules``:: > + DRIVERS=="amd-pmf", ACTION=="change", ENV{EVENT_ID}=="1", RUN+="/usr/bin/systemctl suspend" > + DRIVERS=="amd-pmf", ACTION=="change", ENV{EVENT_ID}=="2", RUN+="/usr/bin/systemctl hibernate" > + DRIVERS=="amd-pmf", ACTION=="change", ENV{EVENT_ID}=="3", RUN+="/bin/loginctl lock-sessions" > + > +EVENT_ID values: > +1= Put the system to S0i3/S2Idle > +2= Put the system to hibernate > +3= Lock the screen > + > diff --git a/drivers/platform/x86/amd/pmf/pmf.h b/drivers/platform/x86/amd/pmf/pmf.h > index 897f61b75e2f..c5334f1177a4 100644 > --- a/drivers/platform/x86/amd/pmf/pmf.h > +++ b/drivers/platform/x86/amd/pmf/pmf.h > @@ -70,6 +70,7 @@ > #define PMF_POLICY_STT_MIN 6 > #define PMF_POLICY_STT_SKINTEMP_APU 7 > #define PMF_POLICY_STT_SKINTEMP_HS2 8 > +#define PMF_POLICY_SYSTEM_STATE 9 > #define PMF_POLICY_P3T 38 > > /* TA macros */ > @@ -436,6 +437,13 @@ struct apmf_dyn_slider_output { > } __packed; > > /* Smart PC - TA internals */ > +enum system_state { > + SYSTEM_STATE__S0i3 = 1, > + SYSTEM_STATE__S4, > + SYSTEM_STATE__SCREEN_LOCK, > + SYSTEM_STATE__MAX > +}; > + > enum ta_slider { > TA_BEST_BATTERY, /* Best Battery */ > TA_BETTER_BATTERY, /* Better Battery */ > @@ -467,6 +475,7 @@ enum ta_pmf_error_type { > }; > > struct pmf_action_table { > + enum system_state system_state; > unsigned long spl; /* in mW */ > unsigned long sppt; /* in mW */ > unsigned long sppt_apuonly; /* in mW */ > diff --git a/drivers/platform/x86/amd/pmf/tee-if.c b/drivers/platform/x86/amd/pmf/tee-if.c > index 883dd143375a..1629856c20b4 100644 > --- a/drivers/platform/x86/amd/pmf/tee-if.c > +++ b/drivers/platform/x86/amd/pmf/tee-if.c > @@ -24,6 +24,20 @@ MODULE_PARM_DESC(pb_actions_ms, "Policy binary actions sampling frequency (defau > static const uuid_t amd_pmf_ta_uuid = UUID_INIT(0x6fd93b77, 0x3fb8, 0x524d, > 0xb1, 0x2d, 0xc5, 0x29, 0xb1, 0x3d, 0x85, 0x43); > > +static const char *amd_pmf_uevent_as_str(unsigned int state) > +{ > + switch (state) { > + case SYSTEM_STATE__S0i3: > + return "S0i3"; > + case SYSTEM_STATE__S4: > + return "S4"; > + case SYSTEM_STATE__SCREEN_LOCK: > + return "SCREEN_LOCK"; > + default: > + return "Unknown Smart PC event"; > + } > +} > + > static void amd_pmf_prepare_args(struct amd_pmf_dev *dev, int cmd, > struct tee_ioctl_invoke_arg *arg, > struct tee_param *param) > @@ -42,9 +56,23 @@ static void amd_pmf_prepare_args(struct amd_pmf_dev *dev, int cmd, > param[0].u.memref.shm_offs = 0; > } > > +static int amd_pmf_update_uevents(struct amd_pmf_dev *dev, u16 event) > +{ > + char *envp[2] = {}; > + > + envp[0] = kasprintf(GFP_KERNEL, "EVENT_ID=%d", event); > + if (!envp[0]) > + return -EINVAL; > + > + kobject_uevent_env(&dev->dev->kobj, KOBJ_CHANGE, envp); > + > + kfree(envp[0]); > + return 0; > +} > + > static void amd_pmf_apply_policies(struct amd_pmf_dev *dev, struct ta_pmf_enact_result *out) > { > - u32 val; > + u32 val, event = 0; > int idx; > > for (idx = 0; idx < out->actions_count; idx++) { > @@ -113,6 +141,16 @@ static void amd_pmf_apply_policies(struct amd_pmf_dev *dev, struct ta_pmf_enact_ > dev->prev_data->p3t_limit = val; > } > break; > + > + case PMF_POLICY_SYSTEM_STATE: > + event = val + 1; > + if (dev->prev_data->system_state != event) { > + amd_pmf_update_uevents(dev, event); > + dev_dbg(dev->dev, "update SYSTEM_STATE : %s\n", > + amd_pmf_uevent_as_str(event)); > + dev->prev_data->system_state = 0; Is it intentional to assign 0 here? If it is, it makes prev_data->system_state pretty useless? > + } > + break; > } > } > } >
diff --git a/Documentation/admin-guide/pmf.rst b/Documentation/admin-guide/pmf.rst new file mode 100644 index 000000000000..b60f381410c3 --- /dev/null +++ b/Documentation/admin-guide/pmf.rst @@ -0,0 +1,24 @@ +.. SPDX-License-Identifier: GPL-2.0 + +Set udev rules for PMF Smart PC Builder +--------------------------------------- + +AMD PMF(Platform Management Framework) Smart PC Solution builder has to set the system states +like S0i3, Screen lock, hibernate etc, based on the output actions provided by the PMF +TA (Trusted Application). + +In order for this to work the PMF driver generates a uevent for userspace to react to. Below are +sample udev rules that can facilitate this experience when a machine has PMF Smart PC solution builder +enabled. + +Please add the following line(s) to +``/etc/udev/rules.d/99-local.rules``:: + DRIVERS=="amd-pmf", ACTION=="change", ENV{EVENT_ID}=="1", RUN+="/usr/bin/systemctl suspend" + DRIVERS=="amd-pmf", ACTION=="change", ENV{EVENT_ID}=="2", RUN+="/usr/bin/systemctl hibernate" + DRIVERS=="amd-pmf", ACTION=="change", ENV{EVENT_ID}=="3", RUN+="/bin/loginctl lock-sessions" + +EVENT_ID values: +1= Put the system to S0i3/S2Idle +2= Put the system to hibernate +3= Lock the screen + diff --git a/drivers/platform/x86/amd/pmf/pmf.h b/drivers/platform/x86/amd/pmf/pmf.h index 897f61b75e2f..c5334f1177a4 100644 --- a/drivers/platform/x86/amd/pmf/pmf.h +++ b/drivers/platform/x86/amd/pmf/pmf.h @@ -70,6 +70,7 @@ #define PMF_POLICY_STT_MIN 6 #define PMF_POLICY_STT_SKINTEMP_APU 7 #define PMF_POLICY_STT_SKINTEMP_HS2 8 +#define PMF_POLICY_SYSTEM_STATE 9 #define PMF_POLICY_P3T 38 /* TA macros */ @@ -436,6 +437,13 @@ struct apmf_dyn_slider_output { } __packed; /* Smart PC - TA internals */ +enum system_state { + SYSTEM_STATE__S0i3 = 1, + SYSTEM_STATE__S4, + SYSTEM_STATE__SCREEN_LOCK, + SYSTEM_STATE__MAX +}; + enum ta_slider { TA_BEST_BATTERY, /* Best Battery */ TA_BETTER_BATTERY, /* Better Battery */ @@ -467,6 +475,7 @@ enum ta_pmf_error_type { }; struct pmf_action_table { + enum system_state system_state; unsigned long spl; /* in mW */ unsigned long sppt; /* in mW */ unsigned long sppt_apuonly; /* in mW */ diff --git a/drivers/platform/x86/amd/pmf/tee-if.c b/drivers/platform/x86/amd/pmf/tee-if.c index 883dd143375a..1629856c20b4 100644 --- a/drivers/platform/x86/amd/pmf/tee-if.c +++ b/drivers/platform/x86/amd/pmf/tee-if.c @@ -24,6 +24,20 @@ MODULE_PARM_DESC(pb_actions_ms, "Policy binary actions sampling frequency (defau static const uuid_t amd_pmf_ta_uuid = UUID_INIT(0x6fd93b77, 0x3fb8, 0x524d, 0xb1, 0x2d, 0xc5, 0x29, 0xb1, 0x3d, 0x85, 0x43); +static const char *amd_pmf_uevent_as_str(unsigned int state) +{ + switch (state) { + case SYSTEM_STATE__S0i3: + return "S0i3"; + case SYSTEM_STATE__S4: + return "S4"; + case SYSTEM_STATE__SCREEN_LOCK: + return "SCREEN_LOCK"; + default: + return "Unknown Smart PC event"; + } +} + static void amd_pmf_prepare_args(struct amd_pmf_dev *dev, int cmd, struct tee_ioctl_invoke_arg *arg, struct tee_param *param) @@ -42,9 +56,23 @@ static void amd_pmf_prepare_args(struct amd_pmf_dev *dev, int cmd, param[0].u.memref.shm_offs = 0; } +static int amd_pmf_update_uevents(struct amd_pmf_dev *dev, u16 event) +{ + char *envp[2] = {}; + + envp[0] = kasprintf(GFP_KERNEL, "EVENT_ID=%d", event); + if (!envp[0]) + return -EINVAL; + + kobject_uevent_env(&dev->dev->kobj, KOBJ_CHANGE, envp); + + kfree(envp[0]); + return 0; +} + static void amd_pmf_apply_policies(struct amd_pmf_dev *dev, struct ta_pmf_enact_result *out) { - u32 val; + u32 val, event = 0; int idx; for (idx = 0; idx < out->actions_count; idx++) { @@ -113,6 +141,16 @@ static void amd_pmf_apply_policies(struct amd_pmf_dev *dev, struct ta_pmf_enact_ dev->prev_data->p3t_limit = val; } break; + + case PMF_POLICY_SYSTEM_STATE: + event = val + 1; + if (dev->prev_data->system_state != event) { + amd_pmf_update_uevents(dev, event); + dev_dbg(dev->dev, "update SYSTEM_STATE : %s\n", + amd_pmf_uevent_as_str(event)); + dev->prev_data->system_state = 0; + } + break; } } }
PMF driver based on the output actions from the TA can request to update the system states like entering s0i3, lock screen etc. by generating an uevent. Based on the udev rules set in the userspace the event id matching the uevent shall get updated accordingly using the systemctl. Sample udev rules under Documentation/admin-guide/pmf.rst. Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com> --- Documentation/admin-guide/pmf.rst | 24 ++++++++++++++++ drivers/platform/x86/amd/pmf/pmf.h | 9 ++++++ drivers/platform/x86/amd/pmf/tee-if.c | 40 ++++++++++++++++++++++++++- 3 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 Documentation/admin-guide/pmf.rst