Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp756579pxj; Wed, 16 Jun 2021 12:52:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz2C/jhBPrf2ezKzLK96rVM59nqhgPBJE7SmpuBlO93ifL1M7kU5+zhI/4g//1P6+y8ViQp X-Received: by 2002:a05:6638:2211:: with SMTP id l17mr979007jas.40.1623873165758; Wed, 16 Jun 2021 12:52:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623873165; cv=none; d=google.com; s=arc-20160816; b=NqvFogTb8CZ/qHJ/SDivdkhPV0kgMNHkR/EKQ9hWd1GgsUmOM2MHXJ3Kg6Wl9z6Xfe hPzqP0sv5YGQOsOG8V3XDmeKh3uwSPJaI7yLHerzS7L09hUuF9ig2PxVgag+muOl3Ap3 VdLar5R8eMnYDyQd2Y3E8yG3BtqEpuGPLLCFPO31kEqzkAm2CbTT+Pjl93MPq7YuF/T1 E8TZIq2PFNfZ2wKbnWN1vh5QS0TK0SMZWIStieBft8iX/BMO7vvDMWAc4oOEPjrZ1g5d xOQwR2Vym9NVpgWGeCjepxHdwd5jS6bx0ASuGgHj2cTgfXiJBiEgoQ3LnzuvGz8QlFai Ld4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=8DtMCMqgeX2BO51SEIzg5IKwtyEVpnzZVrii7iY3v14=; b=znKk+YIClgkzJnx8HSomu/1VFFeX/CoOmxwq3OlF90vYW/Geueor+EbXwzwsOpzPON GOUsbn85dM+ldzx4hD5c3o3Tw7o82ztQhRs7HXjOjcj9wJ8ufMFVdyfK2AS+qJ7dpepw Cdt5vgfZl5tKWUIQrVyG3xXi8kpr+JCO8aWD3ctq/KYFP6dYy5GBmHnZMTkpd4QM8pR6 uhQio6lDY73GU+e1HRBHPkZR9KtJz/gIcXZ11yThowra6eD8xJKiA5NDilzsqDvy+yBy Ruq3Eontq92eemylJKnbW9HV9Uoa0qkbSbEIgGN0ak6Od4DNYd8LBk47l5KU4xjybs4Z 1mMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b="H/npBXYA"; 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 e4si3458628ile.128.2021.06.16.12.52.33; Wed, 16 Jun 2021 12:52:45 -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="H/npBXYA"; 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 S233527AbhFPNpZ (ORCPT + 99 others); Wed, 16 Jun 2021 09:45:25 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:2120 "EHLO mx0b-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233489AbhFPNpM (ORCPT ); Wed, 16 Jun 2021 09:45:12 -0400 Received: from pps.filterd (m0098417.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 15GDYFlC123163; Wed, 16 Jun 2021 09:42:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=8DtMCMqgeX2BO51SEIzg5IKwtyEVpnzZVrii7iY3v14=; b=H/npBXYAr4kMfYzG2vTqI9UTDMb5adS4OTif5NJCwNB94mswKKyyj7uKrrg6AbZ8NgwX xylOO4IUDYdyJ6jeQ0fXhuNGjKoa4sKQVtSVvdRM718vXPHusi6VpFCvUIt9gR28Jszv HA7NKGO5/VvrxQh+BFRXXjQ2m9JYoN2VD4yUN55s6Vu14+xdjtbij6e4Pm6OqTxkFFk3 QNKoT6len/Y243K+0DSxhvPw6yI1c+i+ZJXvQqNAASg90qOxTmf/2wAvaeVDLdkzkmZ/ cKcVmgU0JGvzMJKNG59hpudVZnpJ3OsEvuxfrap/zjYfSg3QZMi+gaBkQDsDG7f2NAN2 eQ== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 397exgq0hn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 16 Jun 2021 09:42:50 -0400 Received: from m0098417.ppops.net (m0098417.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.43/8.16.0.43) with SMTP id 15GDYdRm124903; Wed, 16 Jun 2021 09:42:49 -0400 Received: from ppma06fra.de.ibm.com (48.49.7a9f.ip4.static.sl-reverse.com [159.122.73.72]) by mx0a-001b2d01.pphosted.com with ESMTP id 397exgq0h8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 16 Jun 2021 09:42:49 -0400 Received: from pps.filterd (ppma06fra.de.ibm.com [127.0.0.1]) by ppma06fra.de.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 15GDglf4023313; Wed, 16 Jun 2021 13:42:47 GMT Received: from b06avi18878370.portsmouth.uk.ibm.com (b06avi18878370.portsmouth.uk.ibm.com [9.149.26.194]) by ppma06fra.de.ibm.com with ESMTP id 394m6h9608-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 16 Jun 2021 13:42:47 +0000 Received: from d06av23.portsmouth.uk.ibm.com (d06av23.portsmouth.uk.ibm.com [9.149.105.59]) by b06avi18878370.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 15GDfcTF27984230 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 16 Jun 2021 13:41:38 GMT Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2B972A4040; Wed, 16 Jun 2021 13:42:45 +0000 (GMT) Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 93EB2A404D; Wed, 16 Jun 2021 13:42:43 +0000 (GMT) Received: from pratiks-thinkpad.ibmuc.com (unknown [9.79.208.82]) by d06av23.portsmouth.uk.ibm.com (Postfix) with ESMTP; Wed, 16 Jun 2021 13:42:43 +0000 (GMT) From: "Pratik R. Sampat" To: mpe@ellerman.id.au, benh@kernel.crashing.org, paulus@samba.org, linuxppc-dev@lists.ozlabs.org, kvm-ppc@vger.kernel.org, linux-kernel@vger.kernel.org, psampat@linux.ibm.com, pratik.r.sampat@gmail.com Subject: [PATCH 1/1] powerpc/pseries: Interface to represent PAPR firmware attributes Date: Wed, 16 Jun 2021 19:12:40 +0530 Message-Id: <20210616134240.62195-2-psampat@linux.ibm.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210616134240.62195-1-psampat@linux.ibm.com> References: <20210616134240.62195-1-psampat@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: ixIkH9VUeuRvX4TNNfY9w2W6C8VnWomG X-Proofpoint-GUID: k11_G_oOH2hPOVclozNhydpiRU13z2EX X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391,18.0.761 definitions=2021-06-16_07:2021-06-15,2021-06-16 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 lowpriorityscore=0 malwarescore=0 adultscore=0 mlxlogscore=999 priorityscore=1501 mlxscore=0 bulkscore=0 impostorscore=0 clxscore=1015 spamscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2106160078 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 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 --- .../sysfs-firmware-papr-energy-scale-info | 26 ++ arch/powerpc/include/asm/hvcall.h | 21 +- arch/powerpc/kvm/trace_hv.h | 1 + arch/powerpc/platforms/pseries/Makefile | 3 +- .../pseries/papr_platform_attributes.c | 292 ++++++++++++++++++ 5 files changed, 341 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..499bc1ae173a --- /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: Director hosting a set of platform attributes 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: PAPR attributes directory for POWERVM servers + + This directory provides PAPR information. It + contains below sysfs attributes: + + - desc: File contains the name of 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..19a2a8c77a49 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,24 @@ struct hv_gpci_request_buffer { uint8_t bytes[HGPCI_MAX_DATA_BYTES]; } __packed; +#define MAX_EM_ATTRS 10 +#define MAX_EM_DATA_BYTES \ + (sizeof(struct energy_scale_attributes) * MAX_EM_ATTRS) +struct energy_scale_attributes { + __be64 attr_id; + __be64 attr_value; + unsigned char attr_desc[64]; + unsigned char attr_value_desc[64]; +} __packed; + +struct hv_energy_scale_buffer { + __be64 num_attr; + __be64 array_offset; + __u8 data_header_version; + unsigned char data[MAX_EM_DATA_BYTES]; +} __packed; + + #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..498c74a5e9ab --- /dev/null +++ b/arch/powerpc/platforms/pseries/papr_platform_attributes.c @@ -0,0 +1,292 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * PAPR platform energy attributes driver + * + * This driver creates a sys file at /sys/firmware/papr/ which contains + * files keyword - value pairs that specify energy configuration of the system. + * + * Copyright 2021 IBM Corp. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "pseries.h" + +#define MAX_ATTRS 3 +#define MAX_NAME_LEN 16 + +struct papr_attr { + u64 id; + struct kobj_attribute attr; +}; +struct papr_group { + char name[MAX_NAME_LEN]; + struct attribute_group pg; + struct papr_attr *pgattrs; +} *pgs; + +struct kobject *papr_kobj; +struct kobject *escale_kobj; +struct hv_energy_scale_buffer *em_buf; +struct energy_scale_attributes *ea; + +static ssize_t papr_show_desc(struct kobject *kobj, + struct kobj_attribute *attr, + char *buf) +{ + struct papr_attr *pattr = container_of(attr, struct papr_attr, attr); + int idx, ret = 0; + + /* + * We do not expect the name to change, hence use the old value + * and save a HCALL + */ + for (idx = 0; idx < be64_to_cpu(em_buf->num_attr); idx++) { + if (pattr->id == be64_to_cpu(ea[idx].attr_id)) { + ret = sprintf(buf, "%s\n", ea[idx].attr_desc); + if (ret < 0) + ret = -EIO; + break; + } + } + + return ret; +} + +static ssize_t papr_show_value(struct kobject *kobj, + struct kobj_attribute *attr, + char *buf) +{ + struct papr_attr *pattr = container_of(attr, struct papr_attr, attr); + struct hv_energy_scale_buffer *t_buf; + struct energy_scale_attributes *t_ea; + int data_offset, ret = 0; + + t_buf = kmalloc(sizeof(*t_buf), GFP_KERNEL); + if (t_buf == NULL) + return -ENOMEM; + + ret = plpar_hcall_norets(H_GET_ENERGY_SCALE_INFO, 0, + pattr->id, virt_to_phys(t_buf), + sizeof(*t_buf)); + + if (ret != H_SUCCESS) { + pr_warn("hcall failed: H_GET_ENERGY_SCALE_INFO"); + goto out; + } + + data_offset = be64_to_cpu(t_buf->array_offset) - + (sizeof(t_buf->num_attr) + + sizeof(t_buf->array_offset) + + sizeof(t_buf->data_header_version)); + + t_ea = (struct energy_scale_attributes *) &t_buf->data[data_offset]; + + ret = sprintf(buf, "%llu\n", be64_to_cpu(t_ea->attr_value)); + if (ret < 0) + ret = -EIO; +out: + kfree(t_buf); + + return ret; +} + +static ssize_t papr_show_value_desc(struct kobject *kobj, + struct kobj_attribute *attr, + char *buf) +{ + struct papr_attr *pattr = container_of(attr, struct papr_attr, attr); + struct hv_energy_scale_buffer *t_buf; + struct energy_scale_attributes *t_ea; + int data_offset, ret = 0; + + t_buf = kmalloc(sizeof(*t_buf), GFP_KERNEL); + if (t_buf == NULL) + return -ENOMEM; + + ret = plpar_hcall_norets(H_GET_ENERGY_SCALE_INFO, 0, + pattr->id, virt_to_phys(t_buf), + sizeof(*t_buf)); + + if (ret != H_SUCCESS) { + pr_warn("hcall failed: H_GET_ENERGY_SCALE_INFO"); + goto out; + } + + data_offset = be64_to_cpu(t_buf->array_offset) - + (sizeof(t_buf->num_attr) + + sizeof(t_buf->array_offset) + + sizeof(t_buf->data_header_version)); + + t_ea = (struct energy_scale_attributes *) &t_buf->data[data_offset]; + + ret = sprintf(buf, "%s\n", t_ea->attr_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 *attr, + char *buf); +} ops_info[] = { + { "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->attr.attr); + attr->attr.attr.name = ops_info[index].attr_name; + attr->attr.attr.mode = 0444; + attr->attr.show = ops_info[index].show; +} + +static int add_attr_group(u64 id, int len, struct papr_group *pg, + bool show_val_desc) +{ + int i; + + for (i = 0; i < len; 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].attr.attr; + } + + return sysfs_create_group(escale_kobj, &pg->pg); +} + + +static int __init papr_init(void) +{ + uint64_t num_attr; + int ret, idx, i, data_offset; + + em_buf = kmalloc(sizeof(*em_buf), GFP_KERNEL); + if (em_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, 0, 0, + virt_to_phys(em_buf), sizeof(*em_buf)); + + if (!firmware_has_feature(FW_FEATURE_LPAR) || ret != H_SUCCESS || + em_buf->data_header_version != 0x1) { + pr_warn("hcall failed: H_GET_ENERGY_SCALE_INFO"); + goto out; + } + + num_attr = be64_to_cpu(em_buf->num_attr); + + /* + * Typecast the energy buffer to the attribute structure at the offset + * specified in the buffer + */ + data_offset = be64_to_cpu(em_buf->array_offset) - + (sizeof(em_buf->num_attr) + + sizeof(em_buf->array_offset) + + sizeof(em_buf->data_header_version)); + + ea = (struct energy_scale_attributes *) &em_buf->data[data_offset]; + + pgs = kcalloc(num_attr, sizeof(*pgs), GFP_KERNEL); + if (!pgs) + goto out_pgs; + + papr_kobj = kobject_create_and_add("papr", firmware_kobj); + if (!papr_kobj) { + pr_warn("kobject_create_and_add papr failed\n"); + goto out_kobj; + } + + escale_kobj = kobject_create_and_add("energy_scale_info", papr_kobj); + if (!escale_kobj) { + pr_warn("kobject_create_and_add energy_scale_info failed\n"); + goto out_ekobj; + } + + for (idx = 0; idx < num_attr; idx++) { + char buf[4]; + bool show_val_desc = true; + + pgs[idx].pgattrs = kcalloc(MAX_ATTRS, + sizeof(*pgs[idx].pgattrs), + GFP_KERNEL); + if (!pgs[idx].pgattrs) + goto out_kobj; + + pgs[idx].pg.attrs = kcalloc(MAX_ATTRS + 1, + sizeof(*pgs[idx].pg.attrs), + GFP_KERNEL); + if (!pgs[idx].pg.attrs) { + kfree(pgs[idx].pgattrs); + goto out_kobj; + } + + sprintf(buf, "%lld", be64_to_cpu(ea[idx].attr_id)); + pgs[idx].pg.name = buf; + + /* Do not add the value description if it does not exist */ + if (strlen(ea[idx].attr_value_desc) == 0) + show_val_desc = false; + + if (add_attr_group(be64_to_cpu(ea[idx].attr_id), + MAX_ATTRS, &pgs[idx], show_val_desc)) { + pr_warn("Failed to create papr attribute group %s\n", + pgs[idx].pg.name); + goto out_pgattrs; + } + } + + return 0; + +out_pgattrs: + for (i = 0; i < MAX_ATTRS; i++) { + kfree(pgs[i].pgattrs); + kfree(pgs[i].pg.attrs); + } +out_ekobj: + kobject_put(escale_kobj); +out_kobj: + kobject_put(papr_kobj); +out_pgs: + kfree(pgs); +out: + kfree(em_buf); + + return -ENOMEM; +} + +machine_device_initcall(pseries, papr_init); -- 2.30.2