On Sat, 30 Sep 2023, Shyam Sundar S K wrote: > On 9/26/2023 10:38 PM, Ilpo Järvinen wrote: > > On Fri, 22 Sep 2023, Shyam Sundar S K wrote: > > > >> PMF driver sends changing inputs from each subystem to TA for evaluating > >> the conditions in the policy binary. > >> > >> Add initial support of plumbing in the PMF driver for Smart PC to get > >> information from other subsystems in the kernel. > >> > >> Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@xxxxxxx> > >> --- > >> drivers/platform/x86/amd/pmf/Makefile | 2 +- > >> drivers/platform/x86/amd/pmf/pmf.h | 18 ++++ > >> drivers/platform/x86/amd/pmf/spc.c | 118 ++++++++++++++++++++++++++ > >> drivers/platform/x86/amd/pmf/tee-if.c | 3 + > >> 4 files changed, 140 insertions(+), 1 deletion(-) > >> create mode 100644 drivers/platform/x86/amd/pmf/spc.c > >> > >> diff --git a/drivers/platform/x86/amd/pmf/Makefile b/drivers/platform/x86/amd/pmf/Makefile > >> index d2746ee7369f..6b26e48ce8ad 100644 > >> --- a/drivers/platform/x86/amd/pmf/Makefile > >> +++ b/drivers/platform/x86/amd/pmf/Makefile > >> @@ -7,4 +7,4 @@ > >> obj-$(CONFIG_AMD_PMF) += amd-pmf.o > >> amd-pmf-objs := core.o acpi.o sps.o \ > >> auto-mode.o cnqf.o \ > >> - tee-if.o > >> + tee-if.o spc.o > >> diff --git a/drivers/platform/x86/amd/pmf/pmf.h b/drivers/platform/x86/amd/pmf/pmf.h > >> index 81acf2a37366..e64b4d285624 100644 > >> --- a/drivers/platform/x86/amd/pmf/pmf.h > >> +++ b/drivers/platform/x86/amd/pmf/pmf.h > >> @@ -146,6 +146,21 @@ struct smu_pmf_metrics { > >> u16 infra_gfx_maxfreq; /* in MHz */ > >> u16 skin_temp; /* in centi-Celsius */ > >> u16 device_state; > >> + u16 curtemp; /* in centi-Celsius */ > >> + u16 filter_alpha_value; > >> + u16 avg_gfx_clkfrequency; > >> + u16 avg_fclk_frequency; > >> + u16 avg_gfx_activity; > >> + u16 avg_socclk_frequency; > >> + u16 avg_vclk_frequency; > >> + u16 avg_vcn_activity; > >> + u16 avg_dram_reads; > >> + u16 avg_dram_writes; > >> + u16 avg_socket_power; > >> + u16 avg_core_power[2]; > >> + u16 avg_core_c0residency[16]; > >> + u16 spare1; > >> + u32 metrics_counter; > >> } __packed; > >> > >> enum amd_stt_skin_temp { > >> @@ -592,4 +607,7 @@ extern const struct attribute_group cnqf_feature_attribute_group; > >> int amd_pmf_init_smart_pc(struct amd_pmf_dev *dev); > >> void amd_pmf_deinit_smart_pc(struct amd_pmf_dev *dev); > >> int apmf_check_smart_pc(struct amd_pmf_dev *pmf_dev); > >> + > >> +/* Smart PC - TA interfaces */ > >> +void amd_pmf_populate_ta_inputs(struct amd_pmf_dev *dev, struct ta_pmf_enact_table *in); > >> #endif /* PMF_H */ > >> diff --git a/drivers/platform/x86/amd/pmf/spc.c b/drivers/platform/x86/amd/pmf/spc.c > >> new file mode 100644 > >> index 000000000000..08159cd5f853 > >> --- /dev/null > >> +++ b/drivers/platform/x86/amd/pmf/spc.c > >> @@ -0,0 +1,118 @@ > >> +// SPDX-License-Identifier: GPL-2.0 > >> +/* > >> + * AMD Platform Management Framework Driver - Smart PC Capabilities > >> + * > >> + * Copyright (c) 2023, Advanced Micro Devices, Inc. > >> + * All Rights Reserved. > >> + * > >> + * Authors: Shyam Sundar S K <Shyam-sundar.S-k@xxxxxxx> > >> + * Patil Rajesh Reddy <Patil.Reddy@xxxxxxx> > >> + */ > >> + > >> +#include <acpi/button.h> > >> +#include <linux/power_supply.h> > >> +#include "pmf.h" > >> + > >> +static void amd_pmf_get_smu_info(struct amd_pmf_dev *dev, struct ta_pmf_enact_table *in) > >> +{ > >> + u16 max, avg = 0; > >> + int i; > >> + > >> + memset(dev->buf, 0, sizeof(dev->m_table)); > >> + amd_pmf_send_cmd(dev, SET_TRANSFER_TABLE, 0, 7, NULL); > >> + memcpy(&dev->m_table, dev->buf, sizeof(dev->m_table)); > >> + > >> + in->ev_info.socket_power = dev->m_table.apu_power + dev->m_table.dgpu_power; > >> + in->ev_info.skin_temperature = dev->m_table.skin_temp; > >> + > >> + /* get the avg C0 residency of all the cores */ > >> + for (i = 0; i < ARRAY_SIZE(dev->m_table.avg_core_c0residency); i++) > >> + avg += dev->m_table.avg_core_c0residency[i]; > > > > Is this safe from overflow? > > Yes I think. Can you elaborate a bit more please if there a overflow > and I am missing it? You're adding 16 * u16 together into a single u16 here. If it overflows, the average of averages calculated below will be pseudo-garbage. (I don't know what's the maximum value in the field so it could be safe). > Thanks, > Shyam > > > > >> + > >> + /* get the max C0 residency of all the cores */ > >> + max = dev->m_table.avg_core_c0residency[0]; > >> + for (i = 1; i < ARRAY_SIZE(dev->m_table.avg_core_c0residency); i++) { > >> + if (dev->m_table.avg_core_c0residency[i] > max) > >> + max = dev->m_table.avg_core_c0residency[i]; Why this is done in the different loop? AFAICT, it could be in the same loop as avg calculation above. (I know you start from = 1 but it won't change the result when starting with 0 index). > >> + } > >> + > >> + in->ev_info.avg_c0residency = avg / ARRAY_SIZE(dev->m_table.avg_core_c0residency); -- i. > >> + in->ev_info.max_c0residency = max; > >> + in->ev_info.gfx_busy = dev->m_table.avg_gfx_activity; > >> +} > >> + > >> +static const char * const pmf_battery_supply_name[] = { > >> + "BATT", > >> + "BAT0", > >> +}; > >> + > >> +static int get_battery_prop(enum power_supply_property prop) > >> +{ > >> + union power_supply_propval value; > >> + struct power_supply *psy; > >> + int i, ret = -EINVAL; > >> + > >> + for (i = 0; i < ARRAY_SIZE(pmf_battery_supply_name); i++) { > >> + psy = power_supply_get_by_name(pmf_battery_supply_name[i]); > >> + if (!psy) > >> + continue; > >> + > >> + ret = power_supply_get_property(psy, prop, &value); > >> + if (ret) { > >> + power_supply_put(psy); > >> + return ret; > >> + } > >> + } > >> + > >> + return value.intval; > >> +} > >> + > >> +static int amd_pmf_get_battery_info(struct amd_pmf_dev *dev, struct ta_pmf_enact_table *in) > >> +{ > >> + int val; > >> + > >> + val = get_battery_prop(POWER_SUPPLY_PROP_PRESENT); > >> + if (val != 1) > >> + return -EINVAL; > >> + > >> + in->ev_info.bat_percentage = get_battery_prop(POWER_SUPPLY_PROP_CAPACITY); > >> + /* all values in mWh metrics */ > >> + in->ev_info.bat_design = get_battery_prop(POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN) / 1000; > >> + in->ev_info.full_charge_capacity = get_battery_prop(POWER_SUPPLY_PROP_ENERGY_FULL) / 1000; > >> + in->ev_info.drain_rate = get_battery_prop(POWER_SUPPLY_PROP_POWER_NOW) / 1000; > > > > You don't need literal, use the defines provided in linux/units.h. > > > >> + > >> + return 0; > >> +} > >> + > >> +static int amd_pmf_get_slider_info(struct amd_pmf_dev *dev, struct ta_pmf_enact_table *in) > >> +{ > >> + int val; > >> + > >> + switch (dev->current_profile) { > >> + case PLATFORM_PROFILE_PERFORMANCE: > >> + val = TA_BEST_PERFORMANCE; > >> + break; > >> + case PLATFORM_PROFILE_BALANCED: > >> + val = TA_BETTER_PERFORMANCE; > >> + break; > >> + case PLATFORM_PROFILE_LOW_POWER: > >> + val = TA_BEST_BATTERY; > >> + break; > >> + default: > >> + dev_err(dev->dev, "Unknown Platform Profile.\n"); > >> + return -EOPNOTSUPP; > >> + } > >> + in->ev_info.power_slider = val; > >> + > >> + return 0; > >> +} > >> + > >> +void amd_pmf_populate_ta_inputs(struct amd_pmf_dev *dev, struct ta_pmf_enact_table *in) > >> +{ > >> + /* TA side lid open is 1 and close is 0, hence the ! here */ > >> + in->ev_info.lid_state = !acpi_lid_open(); > >> + in->ev_info.power_source = amd_pmf_get_power_source(); > >> + amd_pmf_get_smu_info(dev, in); > >> + amd_pmf_get_battery_info(dev, in); > >> + amd_pmf_get_slider_info(dev, in); > >> +} > >> diff --git a/drivers/platform/x86/amd/pmf/tee-if.c b/drivers/platform/x86/amd/pmf/tee-if.c > >> index a8b05e746efd..eb25d5ce3a9a 100644 > >> --- a/drivers/platform/x86/amd/pmf/tee-if.c > >> +++ b/drivers/platform/x86/amd/pmf/tee-if.c > >> @@ -113,6 +113,7 @@ static int amd_pmf_invoke_cmd_enact(struct amd_pmf_dev *dev) > >> { > >> struct ta_pmf_shared_memory *ta_sm = NULL; > >> struct ta_pmf_enact_result *out = NULL; > >> + struct ta_pmf_enact_table *in = NULL; > >> struct tee_param param[MAX_TEE_PARAM]; > >> struct tee_ioctl_invoke_arg arg; > >> int ret = 0; > >> @@ -123,11 +124,13 @@ static int amd_pmf_invoke_cmd_enact(struct amd_pmf_dev *dev) > >> memset(dev->shbuf, 0, dev->policy_sz); > >> ta_sm = (struct ta_pmf_shared_memory *)dev->shbuf; > >> out = &ta_sm->pmf_output.policy_apply_table; > >> + in = &ta_sm->pmf_input.enact_table; > >> > >> memset(ta_sm, 0, sizeof(struct ta_pmf_shared_memory)); > >> ta_sm->command_id = TA_PMF_COMMAND_POLICY_BUILDER__ENACT_POLICIES; > >> ta_sm->if_version = PMF_TA_IF_VERSION__MAJOR; > >> > >> + amd_pmf_populate_ta_inputs(dev, in); > >> amd_pmf_prepare_args(dev, TA_PMF_COMMAND_POLICY_BUILDER__ENACT_POLICIES, &arg, param); > >> > >> ret = tee_client_invoke_func(dev->tee_ctx, &arg, param); > >> > > >