Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp4559758pxv; Tue, 20 Jul 2021 06:39:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzUdB6cvtGQM68QvCpgx/u4TFn0cLV3RQ0nUhjUvzYmMl/9ZaXEZq94uPShdrsKnD/lrd13 X-Received: by 2002:a50:a40c:: with SMTP id u12mr23396207edb.20.1626788381423; Tue, 20 Jul 2021 06:39:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626788381; cv=none; d=google.com; s=arc-20160816; b=Citp3GrsnKthWaYnv3HaHL184e5HV0gOFL7Wt6QmsecXquYphMoDbuc55e/rFjkgwV vvYNVGm7ilVNDsMfZFVprjBEzfPkZ8vwJ8tKpX1UdY5eOhuTcYXM/AivQdlHgJ4wWGA3 loNmFT8ubFR+7vLpdwpsBsHDIKvxAbwRSP69BvzQMQKHauc6+5+q1UdGwCt+2fMmAZbc HOliN5b1kd9wBzWcfaYRzBY1BZxlkePc6/WyNSRkCRoZLL7SRKXkyiyOOJzPUeO1Pu4J TbnYbRh3f2IEavHTU5UyrN4fc2flHeaeoePbxtCR7TJ+GUeKHI8hh9qMzwtv5zlIVY4X rdxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:content-language :in-reply-to:mime-version:user-agent:date:message-id:from:references :to:subject:dkim-signature; bh=o5pdQqRiWNGRFASCzWes4gi1dLUapIknRlp9rPHW09U=; b=Y92bmAr5Rn1oQb/aUk6/GYIsp5lZRIOgKVHBWatsONgoS6+V71jdfVW8MP9EFLHpuH pgapZJZELvZe+gWd2AqThq7A/oRhlXvuxX29h512Xv274CUOUKEJ5UgrvgbMPTGC5Jy2 Z1keIelc1jS7o70MclXsgo4g6ZT/8zoYuOr4xmBxMsyfX9gqkepbEn3p3HIlQiC6Dgv4 MaCfz1QaZNfvKIq1C1ZQNhbbV0CioBWjq8HfaF8Xrdrbm68E6+5daWqOhrTWN0cyT6Hc iOwJkdn8NHHq9dY9XJsx37OcR5/Vb4AIJX7Hj2nJA9bFMEbsc1LLa+gyrA2BUYzBzXdh 2QFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=mjDRp4rI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ibm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id lv19si27834102ejb.527.2021.07.20.06.39.16; Tue, 20 Jul 2021 06:39:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=mjDRp4rI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238655AbhGTMzm (ORCPT + 99 others); Tue, 20 Jul 2021 08:55:42 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:10150 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S238463AbhGTMwm (ORCPT ); Tue, 20 Jul 2021 08:52:42 -0400 Received: from pps.filterd (m0098420.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 16KD4FbP084201; Tue, 20 Jul 2021 09:32:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=subject : to : references : from : message-id : date : mime-version : in-reply-to : content-type : content-transfer-encoding; s=pp1; bh=o5pdQqRiWNGRFASCzWes4gi1dLUapIknRlp9rPHW09U=; b=mjDRp4rIKHruSP5UVU6Mhy6IMfExebGq4bCu++9kjW3Lg0tBRT7T++xYc8r9O+jT/qTF 33aGoVFvXeRzfDh7JrnX4ODpswDqpDVSRkczAOUd6mnoAmk4KkPJBzd24dDqA/FdpvTf EQIVmT/wIdoK1F5s071tfNHzhJ3bFk9N7LHzLXkdx5ax6ApBXPFuR3nMCGvjVqAelv8W JcNP6uEdZaTnYddkPm1YVCGIkrXloS/eh70+9lyIyaZ2ebJt1Q4HUr+ucmwhxkgbOl5C 4LJH8azdYiYWKhzWSjGSZbBiXMWCPMbPXO+90Q6PXbNcnMySXJ3E59pAKrEKFfoMogzD +g== Received: from pps.reinject (localhost [127.0.0.1]) by mx0b-001b2d01.pphosted.com with ESMTP id 39wxrv9e3x-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 20 Jul 2021 09:32:49 -0400 Received: from m0098420.ppops.net (m0098420.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.43/8.16.0.43) with SMTP id 16KDQjuB023724; Tue, 20 Jul 2021 09:32:49 -0400 Received: from ppma04wdc.us.ibm.com (1a.90.2fa9.ip4.static.sl-reverse.com [169.47.144.26]) by mx0b-001b2d01.pphosted.com with ESMTP id 39wxrv9e3j-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 20 Jul 2021 09:32:49 -0400 Received: from pps.filterd (ppma04wdc.us.ibm.com [127.0.0.1]) by ppma04wdc.us.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 16KDRcxc005855; Tue, 20 Jul 2021 13:32:48 GMT Received: from b03cxnp07027.gho.boulder.ibm.com (b03cxnp07027.gho.boulder.ibm.com [9.17.130.14]) by ppma04wdc.us.ibm.com with ESMTP id 39upub2hrh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 20 Jul 2021 13:32:48 +0000 Received: from b03ledav001.gho.boulder.ibm.com (b03ledav001.gho.boulder.ibm.com [9.17.130.232]) by b03cxnp07027.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 16KDWl2u18743644 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 20 Jul 2021 13:32:47 GMT Received: from b03ledav001.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 14F446E415; Tue, 20 Jul 2021 13:32:47 +0000 (GMT) Received: from b03ledav001.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6EBDB6E3F3; Tue, 20 Jul 2021 13:32:43 +0000 (GMT) Received: from localhost.localdomain (unknown [9.199.43.23]) by b03ledav001.gho.boulder.ibm.com (Postfix) with ESMTP; Tue, 20 Jul 2021 13:32:42 +0000 (GMT) Subject: Re: [PATCH v6 1/1] powerpc/pseries: Interface to represent PAPR firmware attributes To: "Pratik R. Sampat" , mpe@ellerman.id.au, benh@kernel.crashing.org, paulus@samba.org, farosas@linux.ibm.com, linuxppc-dev@lists.ozlabs.org, kvm-ppc@vger.kernel.org, linux-kernel@vger.kernel.org, pratik.r.sampat@gmail.com References: <20210720053434.32921-1-psampat@linux.ibm.com> <20210720053434.32921-2-psampat@linux.ibm.com> From: kajoljain Message-ID: <262e4a2e-7410-a6e0-6183-06c33edc16ae@linux.ibm.com> Date: Tue, 20 Jul 2021 19:02:41 +0530 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 MIME-Version: 1.0 In-Reply-To: <20210720053434.32921-2-psampat@linux.ibm.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 X-Proofpoint-GUID: -6rNDIqvi9yUcvpgNAHpER6EJnqgZEfB X-Proofpoint-ORIG-GUID: glAfuDYXmDYKqczQkEkrcdcUTJb9Rs55 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391,18.0.790 definitions=2021-07-20_07:2021-07-19,2021-07-20 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1011 priorityscore=1501 mlxlogscore=999 impostorscore=0 malwarescore=0 bulkscore=0 phishscore=0 mlxscore=0 adultscore=0 suspectscore=0 spamscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2107200085 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 7/20/21 11:04 AM, Pratik R. Sampat wrote: > Adds a generic interface to represent the energy and frequency related > PAPR attributes on the system using the new H_CALL > "H_GET_ENERGY_SCALE_INFO". > > H_GET_EM_PARMS H_CALL was previously responsible for exporting this > information in the lparcfg, however the H_GET_EM_PARMS H_CALL > will be deprecated P10 onwards. > > The H_GET_ENERGY_SCALE_INFO H_CALL is of the following call format: > hcall( > uint64 H_GET_ENERGY_SCALE_INFO, // Get energy scale info > uint64 flags, // Per the flag request > uint64 firstAttributeId,// The attribute id > uint64 bufferAddress, // Guest physical address of the output buffer > uint64 bufferSize // The size in bytes of the output buffer > ); > > This H_CALL can query either all the attributes at once with > firstAttributeId = 0, flags = 0 as well as query only one attribute > at a time with firstAttributeId = id, flags = 1. > > The output buffer consists of the following > 1. number of attributes - 8 bytes > 2. array offset to the data location - 8 bytes > 3. version info - 1 byte > 4. A data array of size num attributes, which contains the following: > a. attribute ID - 8 bytes > b. attribute value in number - 8 bytes > c. attribute name in string - 64 bytes > d. attribute value in string - 64 bytes > > The new H_CALL exports information in direct string value format, hence > a new interface has been introduced in > /sys/firmware/papr/energy_scale_info to export this information to > userspace in an extensible pass-through format. > > The H_CALL returns the name, numeric value and string value (if exists) > > The format of exposing the sysfs information is as follows: > /sys/firmware/papr/energy_scale_info/ > |-- / > |-- desc > |-- value > |-- value_desc (if exists) > |-- / > |-- desc > |-- value > |-- value_desc (if exists) > ... > > The energy information that is exported is useful for userspace tools > such as powerpc-utils. Currently these tools infer the > "power_mode_data" value in the lparcfg, which in turn is obtained from > the to be deprecated H_GET_EM_PARMS H_CALL. > On future platforms, such userspace utilities will have to look at the > data returned from the new H_CALL being populated in this new sysfs > interface and report this information directly without the need of > interpretation. > > Signed-off-by: Pratik R. Sampat > Reviewed-by: Gautham R. Shenoy > --- > .../sysfs-firmware-papr-energy-scale-info | 26 ++ > arch/powerpc/include/asm/hvcall.h | 24 +- > arch/powerpc/kvm/trace_hv.h | 1 + > arch/powerpc/platforms/pseries/Makefile | 3 +- > .../pseries/papr_platform_attributes.c | 312 ++++++++++++++++++ > 5 files changed, 364 insertions(+), 2 deletions(-) > create mode 100644 Documentation/ABI/testing/sysfs-firmware-papr-energy-scale-info > create mode 100644 arch/powerpc/platforms/pseries/papr_platform_attributes.c > > diff --git a/Documentation/ABI/testing/sysfs-firmware-papr-energy-scale-info b/Documentation/ABI/testing/sysfs-firmware-papr-energy-scale-info > new file mode 100644 > index 000000000000..139a576c7c9d > --- /dev/null > +++ b/Documentation/ABI/testing/sysfs-firmware-papr-energy-scale-info > @@ -0,0 +1,26 @@ > +What: /sys/firmware/papr/energy_scale_info > +Date: June 2021 > +Contact: Linux for PowerPC mailing list > +Description: Directory hosting a set of platform attributes like > + energy/frequency on Linux running as a PAPR guest. > + > + Each file in a directory contains a platform > + attribute hierarchy pertaining to performance/ > + energy-savings mode and processor frequency. > + > +What: /sys/firmware/papr/energy_scale_info/ > + /sys/firmware/papr/energy_scale_info//desc > + /sys/firmware/papr/energy_scale_info//value > + /sys/firmware/papr/energy_scale_info//value_desc > +Date: June 2021 > +Contact: Linux for PowerPC mailing list > +Description: Energy, frequency attributes directory for POWERVM servers > + > + This directory provides energy, frequency, folding information. It > + contains below sysfs attributes: > + > + - desc: String description of the attribute > + > + - value: Numeric value of attribute > + > + - value_desc: String value of attribute > diff --git a/arch/powerpc/include/asm/hvcall.h b/arch/powerpc/include/asm/hvcall.h > index e3b29eda8074..c91714ea6719 100644 > --- a/arch/powerpc/include/asm/hvcall.h > +++ b/arch/powerpc/include/asm/hvcall.h > @@ -316,7 +316,8 @@ > #define H_SCM_PERFORMANCE_STATS 0x418 > #define H_RPT_INVALIDATE 0x448 > #define H_SCM_FLUSH 0x44C > -#define MAX_HCALL_OPCODE H_SCM_FLUSH > +#define H_GET_ENERGY_SCALE_INFO 0x450 > +#define MAX_HCALL_OPCODE H_GET_ENERGY_SCALE_INFO > > /* Scope args for H_SCM_UNBIND_ALL */ > #define H_UNBIND_SCOPE_ALL (0x1) > @@ -631,6 +632,27 @@ struct hv_gpci_request_buffer { > uint8_t bytes[HGPCI_MAX_DATA_BYTES]; > } __packed; > > +#define ESI_VERSION 0x1 > +#define MAX_ESI_ATTRS 10 > +#define MAX_BUF_SZ (sizeof(struct h_energy_scale_info_hdr) + \ > + (sizeof(struct energy_scale_attribute) * MAX_ESI_ATTRS)) > + > +struct energy_scale_attribute { > + __be64 id; > + __be64 value; > + unsigned char desc[64]; > + unsigned char value_desc[64]; > +} __packed; > + > +struct h_energy_scale_info_hdr { > + __be64 num_attrs; > + __be64 array_offset; > + __u8 data_header_version; > +} __packed; > + > +/* /sys/firmware/papr */ > +extern struct kobject *papr_kobj; > + > #endif /* __ASSEMBLY__ */ > #endif /* __KERNEL__ */ > #endif /* _ASM_POWERPC_HVCALL_H */ > diff --git a/arch/powerpc/kvm/trace_hv.h b/arch/powerpc/kvm/trace_hv.h > index 830a126e095d..38cd0ed0a617 100644 > --- a/arch/powerpc/kvm/trace_hv.h > +++ b/arch/powerpc/kvm/trace_hv.h > @@ -115,6 +115,7 @@ > {H_VASI_STATE, "H_VASI_STATE"}, \ > {H_ENABLE_CRQ, "H_ENABLE_CRQ"}, \ > {H_GET_EM_PARMS, "H_GET_EM_PARMS"}, \ > + {H_GET_ENERGY_SCALE_INFO, "H_GET_ENERGY_SCALE_INFO"}, \ > {H_SET_MPP, "H_SET_MPP"}, \ > {H_GET_MPP, "H_GET_MPP"}, \ > {H_HOME_NODE_ASSOCIATIVITY, "H_HOME_NODE_ASSOCIATIVITY"}, \ > diff --git a/arch/powerpc/platforms/pseries/Makefile b/arch/powerpc/platforms/pseries/Makefile > index c8a2b0b05ac0..d14fca89ac25 100644 > --- a/arch/powerpc/platforms/pseries/Makefile > +++ b/arch/powerpc/platforms/pseries/Makefile > @@ -6,7 +6,8 @@ obj-y := lpar.o hvCall.o nvram.o reconfig.o \ > of_helpers.o \ > setup.o iommu.o event_sources.o ras.o \ > firmware.o power.o dlpar.o mobility.o rng.o \ > - pci.o pci_dlpar.o eeh_pseries.o msi.o > + pci.o pci_dlpar.o eeh_pseries.o msi.o \ > + papr_platform_attributes.o > obj-$(CONFIG_SMP) += smp.o > obj-$(CONFIG_SCANLOG) += scanlog.o > obj-$(CONFIG_KEXEC_CORE) += kexec.o > diff --git a/arch/powerpc/platforms/pseries/papr_platform_attributes.c b/arch/powerpc/platforms/pseries/papr_platform_attributes.c > new file mode 100644 > index 000000000000..d0373925ad32 > --- /dev/null > +++ b/arch/powerpc/platforms/pseries/papr_platform_attributes.c > @@ -0,0 +1,312 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > +/* > + * Platform energy and frequency attributes driver > + * > + * This driver creates a sys file at /sys/firmware/papr/ which encapsulates a > + * directory structure containing files in keyword - value pairs that specify > + * energy and frequency configuration of the system. > + * > + * The format of exposing the sysfs information is as follows: > + * /sys/firmware/papr/energy_scale_info/ > + * |-- / > + * |-- desc > + * |-- value > + * |-- value_desc (if exists) > + * |-- / > + * |-- desc > + * |-- value > + * |-- value_desc (if exists) > + * > + * Copyright 2021 IBM Corp. > + */ > + > +#include > +#include > + > +#include "pseries.h" > + > +/* > + * Flag attributes to fetch either all or one attribute from the HCALL > + * flag = BE(0) => fetch all attributes with firstAttributeId = 0 > + * flag = BE(1) => fetch a single attribute with firstAttributeId = id > + */ > +#define ESI_FLAGS_ALL 0 > +#define ESI_FLAGS_SINGLE PPC_BIT(0) > + > +#define MAX_ATTRS 3 > + > +struct papr_attr { > + u64 id; > + struct kobj_attribute kobj_attr; > +}; > +struct papr_group { > + struct attribute_group pg; > + struct papr_attr pgattrs[MAX_ATTRS]; > +} *pgs; > + > +/* /sys/firmware/papr */ > +struct kobject *papr_kobj; > +/* /sys/firmware/papr/energy_scale_info */ > +struct kobject *esi_kobj; > + > +/* > + * Extract and export the description of the energy scale attributes > + */ > +static ssize_t papr_show_desc(struct kobject *kobj, > + struct kobj_attribute *kobj_attr, > + char *buf) > +{ > + struct papr_attr *pattr = container_of(kobj_attr, struct papr_attr, > + kobj_attr); > + struct h_energy_scale_info_hdr *t_hdr; > + struct energy_scale_attribute *t_esi; > + char *t_buf; > + int ret = 0; > + > + t_buf = kmalloc(MAX_BUF_SZ, GFP_KERNEL); > + if (t_buf == NULL) > + return -ENOMEM; > + > + ret = plpar_hcall_norets(H_GET_ENERGY_SCALE_INFO, ESI_FLAGS_SINGLE, > + pattr->id, virt_to_phys(t_buf), > + MAX_BUF_SZ); > + > + if (ret != H_SUCCESS) { > + pr_warn("hcall failed: H_GET_ENERGY_SCALE_INFO"); > + goto out; > + } > + > + t_hdr = (struct h_energy_scale_info_hdr *) t_buf; > + t_esi = (struct energy_scale_attribute *) > + (t_buf + be64_to_cpu(t_hdr->array_offset)); > + > + ret = snprintf(buf, sizeof(t_esi->desc), "%s\n", t_esi->desc); > + if (ret < 0) > + ret = -EIO; > +out: > + kfree(t_buf); > + > + return ret; > +} > + > +/* > + * Extract and export the numeric value of the energy scale attributes > + */ > +static ssize_t papr_show_value(struct kobject *kobj, > + struct kobj_attribute *kobj_attr, > + char *buf) > +{ > + struct papr_attr *pattr = container_of(kobj_attr, struct papr_attr, > + kobj_attr); > + struct h_energy_scale_info_hdr *t_hdr; > + struct energy_scale_attribute *t_esi; > + char *t_buf; > + int ret = 0; > + > + t_buf = kmalloc(MAX_BUF_SZ, GFP_KERNEL); > + if (t_buf == NULL) > + return -ENOMEM; > + > + ret = plpar_hcall_norets(H_GET_ENERGY_SCALE_INFO, ESI_FLAGS_SINGLE, > + pattr->id, virt_to_phys(t_buf), > + MAX_BUF_SZ); > + > + if (ret != H_SUCCESS) { > + pr_warn("hcall failed: H_GET_ENERGY_SCALE_INFO"); > + goto out; > + } > + > + t_hdr = (struct h_energy_scale_info_hdr *) t_buf; > + t_esi = (struct energy_scale_attribute *) > + (t_buf + be64_to_cpu(t_hdr->array_offset)); > + > + ret = snprintf(buf, sizeof(t_esi->value), "%llu\n", > + be64_to_cpu(t_esi->value)); > + if (ret < 0) > + ret = -EIO; > +out: > + kfree(t_buf); > + > + return ret; > +} > + > +/* > + * Extract and export the value description in string format of the energy > + * scale attributes > + */ > +static ssize_t papr_show_value_desc(struct kobject *kobj, > + struct kobj_attribute *kobj_attr, > + char *buf) > +{ > + struct papr_attr *pattr = container_of(kobj_attr, struct papr_attr, > + kobj_attr); > + struct h_energy_scale_info_hdr *t_hdr; > + struct energy_scale_attribute *t_esi; > + char *t_buf; > + int ret = 0; > + > + t_buf = kmalloc(MAX_BUF_SZ, GFP_KERNEL); > + if (t_buf == NULL) > + return -ENOMEM; > + > + ret = plpar_hcall_norets(H_GET_ENERGY_SCALE_INFO, ESI_FLAGS_SINGLE, > + pattr->id, virt_to_phys(t_buf), > + MAX_BUF_SZ); > + > + if (ret != H_SUCCESS) { > + pr_warn("hcall failed: H_GET_ENERGY_SCALE_INFO"); > + goto out; > + } > + > + t_hdr = (struct h_energy_scale_info_hdr *) t_buf; > + t_esi = (struct energy_scale_attribute *) > + (t_buf + be64_to_cpu(t_hdr->array_offset)); > + > + ret = snprintf(buf, sizeof(t_esi->value_desc), "%s\n", > + t_esi->value_desc); > + if (ret < 0) > + ret = -EIO; > +out: > + kfree(t_buf); > + > + return ret; > +} > + > +static struct papr_ops_info { > + const char *attr_name; > + ssize_t (*show)(struct kobject *kobj, struct kobj_attribute *kobj_attr, > + char *buf); > +} ops_info[MAX_ATTRS] = { > + { "desc", papr_show_desc }, > + { "value", papr_show_value }, > + { "value_desc", papr_show_value_desc }, > +}; > + > +static void add_attr(u64 id, int index, struct papr_attr *attr) > +{ > + attr->id = id; > + sysfs_attr_init(&attr->kobj_attr.attr); > + attr->kobj_attr.attr.name = ops_info[index].attr_name; > + attr->kobj_attr.attr.mode = 0444; > + attr->kobj_attr.show = ops_info[index].show; > +} > + > +static int add_attr_group(u64 id, struct papr_group *pg, bool show_val_desc) > +{ > + int i; > + > + for (i = 0; i < MAX_ATTRS; i++) { > + if (!strcmp(ops_info[i].attr_name, "value_desc") && > + !show_val_desc) { > + continue; > + } > + add_attr(id, i, &pg->pgattrs[i]); > + pg->pg.attrs[i] = &pg->pgattrs[i].kobj_attr.attr; > + } > + > + return sysfs_create_group(esi_kobj, &pg->pg); > +} > + > +static int __init papr_init(void) > +{ > + struct h_energy_scale_info_hdr *esi_hdr; > + struct energy_scale_attribute *esi_attrs; > + uint64_t num_attrs; > + int ret, idx, i; > + char *esi_buf; > + > + if (!firmware_has_feature(FW_FEATURE_LPAR)) > + return -ENXIO; > + > + esi_buf = kmalloc(MAX_BUF_SZ, GFP_KERNEL); > + if (esi_buf == NULL) > + return -ENOMEM; > + /* > + * hcall( > + * uint64 H_GET_ENERGY_SCALE_INFO, // Get energy scale info > + * uint64 flags, // Per the flag request > + * uint64 firstAttributeId, // The attribute id > + * uint64 bufferAddress, // Guest physical address of the output buffer > + * uint64 bufferSize); // The size in bytes of the output buffer > + */ > + ret = plpar_hcall_norets(H_GET_ENERGY_SCALE_INFO, ESI_FLAGS_ALL, 0, > + virt_to_phys(esi_buf), MAX_BUF_SZ); > + if (ret != H_SUCCESS) { > + pr_warn("hcall failed: H_GET_ENERGY_SCALE_INFO"); > + goto out; > + } > + > + esi_hdr = (struct h_energy_scale_info_hdr *) esi_buf; > + if (esi_hdr->data_header_version != ESI_VERSION) { > + pr_warn("H_GET_ENERGY_SCALE_INFO VER MISMATCH - EXP: 0x%x, REC: 0x%x", > + ESI_VERSION, esi_hdr->data_header_version); > + } > + > + num_attrs = be64_to_cpu(esi_hdr->num_attrs); > + esi_attrs = (struct energy_scale_attribute *) > + (esi_buf + be64_to_cpu(esi_hdr->array_offset)); > + > + pgs = kcalloc(num_attrs, sizeof(*pgs), GFP_KERNEL); > + if (!pgs) > + goto out; > + > + papr_kobj = kobject_create_and_add("papr", firmware_kobj); > + if (!papr_kobj) { > + pr_warn("kobject_create_and_add papr failed\n"); > + goto out_pgs; > + } > + > + esi_kobj = kobject_create_and_add("energy_scale_info", papr_kobj); > + if (!esi_kobj) { > + pr_warn("kobject_create_and_add energy_scale_info failed\n"); > + goto out_kobj; > + } > + > + for (idx = 0; idx < num_attrs; idx++) { > + bool show_val_desc = true; > + > + pgs[idx].pg.attrs = kcalloc(MAX_ATTRS + 1, > + sizeof(*pgs[idx].pg.attrs), > + GFP_KERNEL); > + if (!pgs[idx].pg.attrs) { > + goto out_pgattrs; > + } > + > + pgs[idx].pg.name = kasprintf(GFP_KERNEL, "%lld", > + be64_to_cpu(esi_attrs[idx].id)); > + if (pgs[idx].pg.name == NULL) { > + goto out_pgattrs; > + } > + /* Do not add the value description if it does not exist */ > + if (strnlen(esi_attrs[idx].value_desc, > + sizeof(esi_attrs[idx].value_desc)) == 0) > + show_val_desc = false; > + > + if (add_attr_group(be64_to_cpu(esi_attrs[idx].id), &pgs[idx], > + show_val_desc)) { > + pr_warn("Failed to create papr attribute group %s\n", > + pgs[idx].pg.name); > + goto out_pgattrs; > + } > + } > + > + kfree(esi_buf); > + return 0; > + > +out_pgattrs: Hi Pratik, Just a nit optimization, Can't we run this loop till idx rather then going all the way till num_attrs as you are allocating memory sequentially? Thanks, Kajol Jain > + for (i = 0; i < num_attrs ; i++) { > + kfree(pgs[i].pg.attrs); > + kfree(pgs[i].pg.name); > + } > + kobject_put(esi_kobj); > +out_kobj: > + kobject_put(papr_kobj); > +out_pgs: > + kfree(pgs); > +out: > + kfree(esi_buf); > + > + return -ENOMEM; > +} > + > +machine_device_initcall(pseries, papr_init); >