Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp28250imu; Fri, 14 Dec 2018 12:52:55 -0800 (PST) X-Google-Smtp-Source: AFSGD/UFefGyGg/N0bOUHZDRAKiBJQrZ3cOZBQ0AEwEvQwyLuHQcrUwhQMpr7B9txQRxNjN9noh+ X-Received: by 2002:a63:5722:: with SMTP id l34mr4054955pgb.118.1544820775819; Fri, 14 Dec 2018 12:52:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544820775; cv=none; d=google.com; s=arc-20160816; b=EnI9AG+pIbIB5Y0GIXxKCxCBSKbdApgNCfY5pk4vfFE1Y9z5fKYfATJuxF+5opUS7y j/37ZX4OC36nBLaooaGqoVaUdhm0vxyMipard0Vtetol36UxhcTrJDowoQhChXTt5B3v 5hyh+jrS08tJwGdcf0YXzIBD69rpL0CLqIM7+p5sYrcL6Q+DeUmkA+v1bIAd8D5Yw0x9 9cOswppx1XeywwI+VFV1IDi1isv3sIgNMzjYuOztUqABW7qgxijR78jqU7z8hvedIEDS rcz0DKFx9jJ0N9NsgivUhIzt3NB7O859633eoezvpw997S6XEjT63K7OEWzXJaGHnQDZ Zl+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:content-transfer-encoding :mime-version:user-agent:references:in-reply-to:date:cc:to:from :subject; bh=tkO65hQEPErPEr57PxeD25n8w+Jj/Fl//XeWlK5J3LI=; b=RKz+qTalXVUVaLaW6BXm9U+XBrrdSB3TMSXl5lGYD0U9xTxgsUOlZ2UVferNn4dnFV PKE6nZyWcSqATsPZc0Wuw3aPTmDLkbH+MQTq5yKL50rnUneFNnVH+sBlQs7kp2hX+aNg GdqBpIDmkSp2I0elYokTcIpPoT/cetAUnS8lnIKW804TSUQcr/xX0BcsxNLULXftxLOM xYhcvM0bnh6oZFE1rIPEEFCHHAfoAY6E1eKlxj+rHVcDNYWTPOu7O3eRCdnVnx/lOxkx A1XNZGeevpnUJEFPrjIKTs89GrOGpp1hT0t391djGgPIhtPSha8LVJrd4nCbXyKgORLT AF8A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r81si5454435pfr.164.2018.12.14.12.52.40; Fri, 14 Dec 2018 12:52:55 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730905AbeLNUvH (ORCPT + 99 others); Fri, 14 Dec 2018 15:51:07 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:36376 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730734AbeLNUvH (ORCPT ); Fri, 14 Dec 2018 15:51:07 -0500 Received: from pps.filterd (m0098396.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id wBEKmwZK025236 for ; Fri, 14 Dec 2018 15:51:05 -0500 Received: from e34.co.us.ibm.com (e34.co.us.ibm.com [32.97.110.152]) by mx0a-001b2d01.pphosted.com with ESMTP id 2pchv3n5mf-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 14 Dec 2018 15:51:05 -0500 Received: from localhost by e34.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 14 Dec 2018 20:51:04 -0000 Received: from b03cxnp08026.gho.boulder.ibm.com (9.17.130.18) by e34.co.us.ibm.com (192.168.1.134) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Fri, 14 Dec 2018 20:51:01 -0000 Received: from b03ledav004.gho.boulder.ibm.com (b03ledav004.gho.boulder.ibm.com [9.17.130.235]) by b03cxnp08026.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id wBEKp0K210878982 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 14 Dec 2018 20:51:00 GMT Received: from b03ledav004.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 874BC78064; Fri, 14 Dec 2018 20:51:00 +0000 (GMT) Received: from b03ledav004.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 661BA7805E; Fri, 14 Dec 2018 20:51:00 +0000 (GMT) Received: from powerkvm6.aus.stglabs.ibm.com (unknown [9.40.192.78]) by b03ledav004.gho.boulder.ibm.com (Postfix) with ESMTP; Fri, 14 Dec 2018 20:51:00 +0000 (GMT) Received: from powerkvm6.aus.stglabs.ibm.com (localhost [IPv6:::1]) by powerkvm6.aus.stglabs.ibm.com (Postfix) with ESMTP id 1300440E516A; Fri, 14 Dec 2018 14:51:00 -0600 (CST) Subject: [RFC 3/6] pseries/drcinfo: Pseries impl of arch_find_drc_info From: Michael Bringmann To: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Cc: Michael Ellerman , Tyrel Datwyler , Thomas Falcon , Juliet Kim Date: Fri, 14 Dec 2018 14:51:00 -0600 In-Reply-To: <20181214204914.16435.59083.stgit@powerkvm6.aus.stglabs.ibm.com> References: <20181214204914.16435.59083.stgit@powerkvm6.aus.stglabs.ibm.com> User-Agent: StGit/0.18-105-g416a-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 x-cbid: 18121420-0016-0000-0000-000009649E9D X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00010225; HX=3.00000242; KW=3.00000007; PH=3.00000004; SC=3.00000271; SDB=6.01131804; UDB=6.00588226; IPR=6.00911936; MB=3.00024694; MTD=3.00000008; XFM=3.00000015; UTC=2018-12-14 20:51:03 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18121420-0017-0000-0000-0000416902C5 Message-Id: <20181214205047.16435.19045.stgit@powerkvm6.aus.stglabs.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-12-14_12:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=946 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1812140176 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch provides a common interface to parse ibm,drc-indexes, ibm,drc-names, ibm,drc-types, ibm,drc-power-domains, or ibm,drc-info. The generic interface arch_find_drc_match is provided which accepts callback functions that may be applied to examine the data for each entry. Signed-off-by: Michael Bringmann --- arch/powerpc/include/asm/prom.h | 3 arch/powerpc/platforms/pseries/of_helpers.c | 299 +++++++++++++++++++++++++++ include/linux/topology.h | 2 3 files changed, 298 insertions(+), 6 deletions(-) diff --git a/arch/powerpc/include/asm/prom.h b/arch/powerpc/include/asm/prom.h index b04c5ce..910d1dc 100644 --- a/arch/powerpc/include/asm/prom.h +++ b/arch/powerpc/include/asm/prom.h @@ -91,9 +91,6 @@ struct of_drc_info { u32 last_drc_index; }; -extern int of_read_drc_info_cell(struct property **prop, - const __be32 **curval, struct of_drc_info *data); - /* * There are two methods for telling firmware what our capabilities are. diff --git a/arch/powerpc/platforms/pseries/of_helpers.c b/arch/powerpc/platforms/pseries/of_helpers.c index 0185e50..11c90cd 100644 --- a/arch/powerpc/platforms/pseries/of_helpers.c +++ b/arch/powerpc/platforms/pseries/of_helpers.c @@ -1,5 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 +#define pr_fmt(fmt) "drc: " fmt + #include #include #include @@ -11,6 +13,12 @@ #define MAX_DRC_NAME_LEN 64 +static int drc_debug; +#define dbg(args...) if (drc_debug) { printk(KERN_DEBUG args); } +#define err(arg...) printk(KERN_ERR args); +#define info(arg...) printk(KERN_INFO args); +#define warn(arg...) printk(KERN_WARNING args); + /** * pseries_of_derive_parent - basically like dirname(1) * @path: the full_name of a node to be added to the tree @@ -46,7 +54,8 @@ struct device_node *pseries_of_derive_parent(const char *path) /* Helper Routines to convert between drc_index to cpu numbers */ -int of_read_drc_info_cell(struct property **prop, const __be32 **curval, +static int of_read_drc_info_cell(struct property **prop, + const __be32 **curval, struct of_drc_info *data) { const char *p; @@ -90,4 +99,290 @@ int of_read_drc_info_cell(struct property **prop, const __be32 **curval, return 0; } -EXPORT_SYMBOL(of_read_drc_info_cell); + +static int walk_drc_info(struct device_node *dn, + bool (*usercb)(struct of_drc_info *drc, + void *data, + int *ret_code), + char *opt_drc_type, + void *data) +{ + struct property *info; + unsigned int entries; + struct of_drc_info drc; + const __be32 *value; + int j, ret_code = -EINVAL; + bool done = false; + + info = of_find_property(dn, "ibm,drc-info", NULL); + if (info == NULL) + return -EINVAL; + + value = info->value; + entries = of_read_number(value++, 1); + + for (j = 0, done = 0; (j < entries) && (!done); j++) { + of_read_drc_info_cell(&info, &value, &drc); + + if (opt_drc_type && strcmp(opt_drc_type, drc.drc_type)) + continue; + + done = usercb(&drc, data, &ret_code); + } + + return ret_code; +} + +static int get_children_props(struct device_node *dn, const int **drc_indexes, + const int **drc_names, const int **drc_types, + const int **drc_power_domains) +{ + const int *indexes, *names, *types, *domains; + + indexes = of_get_property(dn, "ibm,drc-indexes", NULL); + names = of_get_property(dn, "ibm,drc-names", NULL); + types = of_get_property(dn, "ibm,drc-types", NULL); + domains = of_get_property(dn, "ibm,drc-power-domains", NULL); + + if (!indexes || !names || !types || !domains) { + /* Slot does not have dynamically-removable children */ + return -EINVAL; + } + if (drc_indexes) + *drc_indexes = indexes; + if (drc_names) + /* &drc_names[1] contains NULL terminated slot names */ + *drc_names = names; + if (drc_types) + /* &drc_types[1] contains NULL terminated slot types */ + *drc_types = types; + if (drc_power_domains) + *drc_power_domains = domains; + + return 0; +} + +static int is_php_type(char *drc_type) +{ + unsigned long value; + char *endptr; + + /* PCI Hotplug nodes have an integer for drc_type */ + value = simple_strtoul(drc_type, &endptr, 10); + if (endptr == drc_type) + return 0; + + return 1; +} + +/** + * is_php_dn() - return 1 if this is a hotpluggable pci slot, else 0 + * @dn: target &device_node + * @indexes: passed to get_children_props() + * @names: passed to get_children_props() + * @types: returned from get_children_props() + * @power_domains: + * + * This routine will return true only if the device node is + * a hotpluggable slot. This routine will return false + * for built-in pci slots (even when the built-in slots are + * dlparable.) + */ +static int is_php_dn(struct device_node *dn, const int **indexes, + const int **names, const int **types, + const int **power_domains) +{ + const int *drc_types; + int rc; + + rc = get_children_props(dn, indexes, names, &drc_types, + power_domains); + if (rc < 0) + return 0; + + if (!is_php_type((char *) &drc_types[1])) + return 0; + + *types = drc_types; + return 1; +} + +struct find_drc_match_cb_struct { + struct device_node *dn; + bool (*usercb)(struct device_node *dn, + u32 drc_index, char *drc_name, + char *drc_type, u32 drc_power_domain, + void *data); + char *drc_type; + char *drc_name; + u32 drc_index; + bool match_drc_index; + bool add_slot; + void *data; +}; + +static int find_drc_match_v1(struct device_node *dn, void *data) +{ + struct find_drc_match_cb_struct *cdata = data; + int i, retval = 0; + const int *indexes, *names, *types, *domains; + char *name, *type; + struct device_node *root = dn; + + if (cdata->match_drc_index) + root = dn->parent; + + if (cdata->add_slot) { + /* If this is not a hotplug slot, return without doing + * anything. + */ + if (!is_php_dn(root, &indexes, &names, &types, &domains)) + return 0; + } else { + if (get_children_props(root, &indexes, &names, &types, + &domains) < 0) + return 0; + } + + dbg("Entry %s: dn=%pOF\n", __func__, dn); + + name = (char *) &names[1]; + type = (char *) &types[1]; + for (i = 0; i < be32_to_cpu(indexes[0]); i++) { + + if (cdata->match_drc_index && + ((unsigned int) indexes[i + 1] != cdata->drc_index)) { + name += strlen(name) + 1; + type += strlen(type) + 1; + continue; + } + + if (((cdata->drc_name == NULL) || + (cdata->drc_name && !strcmp(cdata->drc_name, name))) && + ((cdata->drc_type == NULL) || + (cdata->drc_type && !strcmp(cdata->drc_type, type)))) { + + if (cdata->usercb) { + retval = cdata->usercb(dn, + be32_to_cpu(indexes[i + 1]), + name, type, + be32_to_cpu(domains[i + 1]), + cdata->data); + if (!retval) + return retval; + } else { + return 0; + } + } + + name += strlen(name) + 1; + type += strlen(type) + 1; + } + + dbg("%s - Exit: rc[%d]\n", __func__, retval); + + /* XXX FIXME: reports a failure only if last entry in loop failed */ + return retval; +} + +static bool find_drc_match_v2_cb(struct of_drc_info *drc, void *data, + int *ret_code) +{ + struct find_drc_match_cb_struct *cdata = data; + u32 drc_index; + char drc_name[MAX_DRC_NAME_LEN]; + int i, retval; + + (*ret_code) = -EINVAL; + + /* This set not a PHP type? */ + if (cdata->add_slot) { + if (!is_php_type((char *) drc->drc_type)) { + return false; + } + } + + /* Anything to use from this set? */ + if (cdata->match_drc_index && (cdata->drc_index > drc->last_drc_index)) + return false; + if ((cdata->drc_type && strcmp(cdata->drc_type, drc->drc_type)) + return false; + + /* Check the drc-index entries of this set */ + for (i = 0, drc_index = drc->drc_index_start; + i < drc->num_sequential_elems; i++, drc_index++) { + + if (cdata->match_drc_index && (cdata->drc_index != drc_index)) + continue; + + sprintf(drc_name, "%s%d", drc->drc_name_prefix, + drc_index - drc->drc_index_start + + drc->drc_name_suffix_start); + + if ((cdata->drc_name == NULL) || + (cdata->drc_name && !strcmp(cdata->drc_name, drc_name))) { + + if (cdata->usercb) { + retval = cdata->usercb(cdata->dn, + drc_index, drc_name, + drc->drc_type, + drc->drc_power_domain, + cdata->data); + if (!retval) { + (*ret_code) = retval; + return true; + } + } else { + (*ret_code) = 0; + return true; + } + } + } + + (*ret_code) = retval; + return false; +} + +static int find_drc_match_v2(struct device_node *dn, void *data) +{ + struct find_drc_match_cb_struct *cdata = data; + struct device_node *root = cdata->dn; + + if (!cdata->add_slot) { + if (!cdata->drc_type || + (cdata->drc_type && strcmp(cdata->drc_type, "SLOT"))) + root = dn->parent; + } + + return walk_drc_info(root, find_drc_match_v2_cb, NULL, data); +} + +int arch_find_drc_match(struct device_node *dn, + bool (*usercb)(struct device_node *dn, + u32 drc_index, char *drc_name, + char *drc_type, u32 drc_power_domain, + void *data), + char *opt_drc_type, char *opt_drc_name, + bool match_drc_index, bool add_slot, + void *data) +{ + struct find_drc_match_cb_struct cdata = { dn, usercb, + opt_drc_type, opt_drc_name, 0, + match_drc_index, add_slot, data }; + + if (match_drc_index) { + const int *my_index = + of_get_property(dn, "ibm,my-drc-index", NULL); + if (!my_index) { + /* Node isn't DLPAR/hotplug capable */ + return -EINVAL; + } + cdata.drc_index = *my_index; + } + + if (firmware_has_feature(FW_FEATURE_DRC_INFO)) + return find_drc_match_v2(dn, &cdata); + else + return find_drc_match_v1(dn, &cdata); +} +EXPORT_SYMBOL(arch_find_drc_match); diff --git a/include/linux/topology.h b/include/linux/topology.h index df97f5f..c3dfa53 100644 --- a/include/linux/topology.h +++ b/include/linux/topology.h @@ -50,7 +50,7 @@ int arch_find_drc_match(struct device_node *dn, char *drc_type, u32 drc_power_domain, void *data), char *opt_drc_type, char *opt_drc_name, - bool match_drc_index, bool ck_php_type, + bool match_drc_index, bool add_slot, void *data); /* Conform to ACPI 2.0 SLIT distance definitions */