From patchwork Mon Jan 2 03:15:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Athira Rajeev X-Patchwork-Id: 1720670 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=2404:9400:2:0:216:3eff:fee1:b9f1; helo=lists.ozlabs.org; envelope-from=linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=FGIObstr; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2404:9400:2:0:216:3eff:fee1:b9f1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Nlgzm18yVz23dw for ; Mon, 2 Jan 2023 14:18:12 +1100 (AEDT) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4Nlgzl75P1z3bTD for ; Mon, 2 Jan 2023 14:18:11 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=FGIObstr; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=linux.vnet.ibm.com (client-ip=148.163.158.5; helo=mx0a-001b2d01.pphosted.com; envelope-from=atrajeev@linux.vnet.ibm.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=FGIObstr; dkim-atps=neutral Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4Nlgwt1HhLz3bby; Mon, 2 Jan 2023 14:15:41 +1100 (AEDT) Received: from pps.filterd (m0098416.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 301K50vg010839; Mon, 2 Jan 2023 03:15:33 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding; s=pp1; bh=ZEZhGpd5OcmRlBRT0DIEjW5bp2R/P1usVwTeGOofwKc=; b=FGIObstrbGCjVAf618YDKfwRj07tvbs0ZxWQUe16coWx6H28sPQtia9MnIHaC7MWwCws adMlW99YQXRRDF+I7k0qLrSFKg7V1exy8ZGnYWtfc5FqYrqN9lwCLn3Qr05qMX5lsb8w F8cvsZ6GUetkeAcu4YNy1I+jFBUQp3LmrH3b9y0B5nie4ZUj6/kv1jqLTvplaz512HvR fnRCBrc9zl1f88pcXagsUdCozaPYJLh9ZRGYa9RluPN0Lnml6u9fM3bPXn+wXJWfTM+z H0KoaGMPhUaGdyh51S/mB+3mjt/3O5Izhvk/BTvzHPhQvP1N1J2SJLYRHvMS7nnEXQhE YQ== Received: from ppma06ams.nl.ibm.com (66.31.33a9.ip4.static.sl-reverse.com [169.51.49.102]) by mx0b-001b2d01.pphosted.com (PPS) with ESMTPS id 3mty830d3g-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 02 Jan 2023 03:15:32 +0000 Received: from pps.filterd (ppma06ams.nl.ibm.com [127.0.0.1]) by ppma06ams.nl.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 3020AtUD001428; Mon, 2 Jan 2023 03:15:31 GMT Received: from smtprelay07.fra02v.mail.ibm.com ([9.218.2.229]) by ppma06ams.nl.ibm.com (PPS) with ESMTPS id 3mtcbf9w6v-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 02 Jan 2023 03:15:31 +0000 Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay07.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 3023FRtf46072316 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 2 Jan 2023 03:15:27 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 37F0D20043; Mon, 2 Jan 2023 03:15:27 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A857F20040; Mon, 2 Jan 2023 03:15:25 +0000 (GMT) Received: from localhost.localdomain (unknown [9.43.47.130]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTP; Mon, 2 Jan 2023 03:15:25 +0000 (GMT) From: Athira Rajeev To: skiboot@lists.ozlabs.org, mpe@ellerman.id.au, maddy@linux.ibm.com Subject: [PATCH 1/3] core/device: Add function to return child node using name and length Date: Mon, 2 Jan 2023 08:45:22 +0530 Message-Id: <20230102031524.73249-1-atrajeev@linux.vnet.ibm.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: 6fSssP0TDO0lnqTs1kAIsWYfjDsvqdwE X-Proofpoint-ORIG-GUID: 6fSssP0TDO0lnqTs1kAIsWYfjDsvqdwE X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.923,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2023-01-01_11,2022-12-30_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 suspectscore=0 lowpriorityscore=0 clxscore=1011 mlxscore=0 bulkscore=0 adultscore=0 spamscore=0 mlxlogscore=999 phishscore=0 priorityscore=1501 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2301020027 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kjain@linux.ibm.com, disgoel@linux.ibm.com, linuxppc-dev@lists.ozlabs.org, mahesh@linux.ibm.com Errors-To: linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Add a function dt_find_by_name_len() that returns the child node if it matches the first "n" characters of a given name, otherwise NULL. This is helpful for cases with node name like: "name@addr". In scenarios where nodes are added with "name@addr" format and if the value of "addr" is not known, that node can't be matched with node name or addr. Hence matching with substring as node name will return the expected result. Patch adds dt_find_by_name_len() function and testcase for the same in core/test/run-device.c Signed-off-by: Athira Rajeev --- core/device.c | 20 ++++++++++++++++++++ core/test/run-device.c | 11 +++++++++++ include/device.h | 4 ++++ 3 files changed, 35 insertions(+) diff --git a/core/device.c b/core/device.c index 2de37c74..72c54e85 100644 --- a/core/device.c +++ b/core/device.c @@ -395,6 +395,26 @@ struct dt_node *dt_find_by_name(struct dt_node *root, const char *name) } +struct dt_node *dt_find_by_name_len(struct dt_node *root, + const char *name, int len) +{ + struct dt_node *child, *match; + + if (len <= 0) + return NULL; + + list_for_each(&root->children, child, list) { + if (!strncmp(child->name, name, len)) + return child; + + match = dt_find_by_name_len(child, name, len); + if (match) + return match; + } + + return NULL; +} + struct dt_node *dt_new_check(struct dt_node *parent, const char *name) { struct dt_node *node = dt_find_by_name(parent, name); diff --git a/core/test/run-device.c b/core/test/run-device.c index 4a12382b..8c552103 100644 --- a/core/test/run-device.c +++ b/core/test/run-device.c @@ -466,6 +466,17 @@ int main(void) new_prop_ph = dt_prop_get_u32(ut2, "something"); assert(!(new_prop_ph == ev1_ph)); dt_free(subtree); + + /* Test dt_find_by_name_len */ + root = dt_new_root(""); + addr1 = dt_new_addr(root, "node", 0x1); + addr2 = dt_new_addr(root, "node0_1", 0x2); + assert(dt_find_by_name(root, "node@1") == addr1); + assert(dt_find_by_name(root, "node0_1@2") == addr2); + assert(dt_find_by_name_len(root, "node@", 5) == addr1); + assert(dt_find_by_name_len(root, "node0_1@", 8) == addr2); + dt_free(root); + return 0; } diff --git a/include/device.h b/include/device.h index 93fb90ff..f5e0fb79 100644 --- a/include/device.h +++ b/include/device.h @@ -184,6 +184,10 @@ struct dt_node *dt_find_by_path(struct dt_node *root, const char *path); /* Find a child node by name */ struct dt_node *dt_find_by_name(struct dt_node *root, const char *name); +/* Find a child node by name and len */ +struct dt_node *dt_find_by_name_len(struct dt_node *root, + const char *name, int len); + /* Find a node by phandle */ struct dt_node *dt_find_by_phandle(struct dt_node *root, u32 phandle); From patchwork Mon Jan 2 03:15:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Athira Rajeev X-Patchwork-Id: 1720666 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=2404:9400:2:0:216:3eff:fee1:b9f1; helo=lists.ozlabs.org; envelope-from=linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=GrAxshiW; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2404:9400:2:0:216:3eff:fee1:b9f1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NlgxR41zPz23dw for ; Mon, 2 Jan 2023 14:16:10 +1100 (AEDT) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4NlgxK2GRNz3c6m for ; Mon, 2 Jan 2023 14:16:05 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=GrAxshiW; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=linux.vnet.ibm.com (client-ip=148.163.156.1; helo=mx0a-001b2d01.pphosted.com; envelope-from=atrajeev@linux.vnet.ibm.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=GrAxshiW; dkim-atps=neutral Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4Nlgwt0LJKz3bTD; Mon, 2 Jan 2023 14:15:41 +1100 (AEDT) Received: from pps.filterd (m0098399.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 301KpqFd020981; Mon, 2 Jan 2023 03:15:35 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=USIB5SHNBptFooRrc9W/n8uafVw0YmkhWDnkt3kEMwI=; b=GrAxshiWWPA1ggU8NZT4nlhBQBWQzIPfZu0ppNJkadVAG5m2IosOIzYwJyU91sjAILpl FWKGAOlAZ8GmmtSttxkYnekOFok7m5ks22eqwbLWD9xVVaLAlB86v81lNoH+gsu4BvHe eGHFfGhDd7gbPnjposHoDSJPrHdfxMaG5BSTK808XNSdk82waM0zuzAibyhXGI6J0diH KmS66rMYwb8/dKoJAn1fOiN51Bo9hTyOPB5h0pMiIXIMlvfNV2H/4d7iKXa4O33IAili Elxx27LFNuSH0B4u+WVdhpzZgvUP47g63uIOpnr1TxBfkKKRmG8EgCCAN/Ft48a+jtul DA== Received: from ppma04ams.nl.ibm.com (63.31.33a9.ip4.static.sl-reverse.com [169.51.49.99]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3mtxhh8sp5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 02 Jan 2023 03:15:35 +0000 Received: from pps.filterd (ppma04ams.nl.ibm.com [127.0.0.1]) by ppma04ams.nl.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 3020htD7020202; Mon, 2 Jan 2023 03:15:33 GMT Received: from smtprelay02.fra02v.mail.ibm.com ([9.218.2.226]) by ppma04ams.nl.ibm.com (PPS) with ESMTPS id 3mtcq69whd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 02 Jan 2023 03:15:33 +0000 Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay02.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 3023FTua36045182 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 2 Jan 2023 03:15:29 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4080320043; Mon, 2 Jan 2023 03:15:29 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8AC4220040; Mon, 2 Jan 2023 03:15:27 +0000 (GMT) Received: from localhost.localdomain (unknown [9.43.47.130]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTP; Mon, 2 Jan 2023 03:15:27 +0000 (GMT) From: Athira Rajeev To: skiboot@lists.ozlabs.org, mpe@ellerman.id.au, maddy@linux.ibm.com Subject: [PATCH 2/3] skiboot: Update IMC code to use dt_find_by_name_len for checking dt nodes Date: Mon, 2 Jan 2023 08:45:23 +0530 Message-Id: <20230102031524.73249-2-atrajeev@linux.vnet.ibm.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230102031524.73249-1-atrajeev@linux.vnet.ibm.com> References: <20230102031524.73249-1-atrajeev@linux.vnet.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: ICZys5mFLcAccwdlDrhX54iE2ZYCL6Hz X-Proofpoint-GUID: ICZys5mFLcAccwdlDrhX54iE2ZYCL6Hz X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.923,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2023-01-01_11,2022-12-30_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 lowpriorityscore=0 spamscore=0 phishscore=0 priorityscore=1501 suspectscore=0 bulkscore=0 mlxscore=0 clxscore=1015 malwarescore=0 adultscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2301020027 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kjain@linux.ibm.com, disgoel@linux.ibm.com, linuxppc-dev@lists.ozlabs.org, mahesh@linux.ibm.com Errors-To: linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" The nest IMC (In Memory Collection) Performance Monitoring Unit(PMU) node names are saved in nest_pmus[] array in the "hw/imc.c" IMC code. Not all the IMC PMUs listed in the device tree may be available. Nest IMC PMU names along with their bit values is represented in imc availability vector. The nest_pmus[] array is used to remove the unavailable nodes by checking this vector. To check node availability, code was using "dt_find_by_name". But since the node names have format like: "name@offset", dt_find_by_name doesn't return the expected result. Fix this by using dt_find_by_name_len. Also, instead of using char array, use a new "struct nest_pmus_struct" which saves the name as well as length parameter for dt_find_by_name_len. Signed-off-by: Athira Rajeev --- hw/imc.c | 112 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 59 insertions(+), 53 deletions(-) diff --git a/hw/imc.c b/hw/imc.c index 97e0809f..779e9634 100644 --- a/hw/imc.c +++ b/hw/imc.c @@ -37,6 +37,12 @@ static uint64_t TRACE_IMC_ADDR; static uint64_t CORE_IMC_EVENT_MASK_ADDR; static uint64_t trace_scom_val; + +struct nest_pmus_struct { + const char *name; + int len; +}; + /* * Initialise these with the pdbar and htm scom port address array * at run time, based on the processor version. @@ -49,58 +55,58 @@ static unsigned int *htm_scom_index; * imc_chip_avl_vector(in struct imc_chip_cb, look at include/imc.h). * nest_pmus[] is an array containing all the possible nest IMC PMU node names. */ -static char const *nest_pmus[] = { - "powerbus0", - "mcs0", - "mcs1", - "mcs2", - "mcs3", - "mcs4", - "mcs5", - "mcs6", - "mcs7", - "mba0", - "mba1", - "mba2", - "mba3", - "mba4", - "mba5", - "mba6", - "mba7", - "cen0", - "cen1", - "cen2", - "cen3", - "cen4", - "cen5", - "cen6", - "cen7", - "xlink0", - "xlink1", - "xlink2", - "mcd0", - "mcd1", - "phb0", - "phb1", - "phb2", - "phb3", - "phb4", - "phb5", - "nx", - "capp0", - "capp1", - "vas", - "int", - "alink0", - "alink1", - "alink2", - "alink3", - "nvlink0", - "nvlink1", - "nvlink2", - "nvlink3", - "nvlink4", - "nvlink5", +static struct nest_pmus_struct nest_pmus[] = { + { .name = "powerbus0@", .len = 10 }, + { .name = "mcs0@", .len = 5}, + { .name = "mcs1@", .len = 5}, + { .name = "mcs2@", .len = 5}, + { .name = "mcs3@", .len = 5}, + { .name = "mcs4@", .len = 5}, + { .name = "mcs5@", .len = 5}, + { .name = "mcs6@", .len = 5}, + { .name = "mcs7@", .len = 5}, + { .name = "mba0@", .len = 5}, + { .name = "mba1@", .len = 5}, + { .name = "mba2@", .len = 5}, + { .name = "mba3@", .len = 5}, + { .name = "mba4@", .len = 5}, + { .name = "mba5@", .len = 5}, + { .name = "mba6@", .len = 5}, + { .name = "mba7@", .len = 5}, + { .name = "centaur0@", .len = 9}, + { .name = "centaur1@", .len = 9}, + { .name = "centaur2@", .len = 9}, + { .name = "centaur3@", .len = 9}, + { .name = "centaur4@", .len = 9}, + { .name = "centaur5@", .len = 9}, + { .name = "centaur6@", .len = 9}, + { .name = "centaur7@", .len = 9}, + { .name = "xlink0@", .len = 7}, + { .name = "xlink1@", .len = 7}, + { .name = "xlink2@", .len = 7}, + { .name = "mcd0@", .len = 5}, + { .name = "mcd1@", .len = 5}, + { .name = "phb0@", .len = 5}, + { .name = "phb1@", .len = 5}, + { .name = "phb2@", .len = 5}, + { .name = "phb3@", .len = 5}, + { .name = "phb4@", .len = 5}, + { .name = "phb5@", .len = 5}, + { .name = "nx@", .len = 3}, + { .name = "capp0@", .len = 6}, + { .name = "capp1@", .len = 6}, + { .name = "vas@", .len = 4}, + { .name = "int@", .len = 4}, + { .name = "alink0@", .len = 7}, + { .name = "alink1@", .len = 7}, + { .name = "alink2@", .len = 7}, + { .name = "alink3@", .len = 7}, + { .name = "nvlink0@", .len = 8}, + { .name = "nvlink1@", .len = 8}, + { .name = "nvlink2@", .len = 8}, + { .name = "nvlink3@", .len = 8}, + { .name = "nvlink4@", .len = 8}, + { .name = "nvlink5@", .len = 8}, /* reserved bits : 51 - 63 */ }; @@ -412,7 +418,7 @@ static void disable_unavailable_units(struct dt_node *dev) for (i = 0; i < ARRAY_SIZE(nest_pmus); i++) { if (!(PPC_BITMASK(i, i) & avl_vec)) { /* Check if the device node exists */ - target = dt_find_by_name(dev, nest_pmus[i]); + target = dt_find_by_name_len(dev, nest_pmus[i].name, nest_pmus[i].len); if (!target) continue; /* Remove the device node */ From patchwork Mon Jan 2 03:15:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Athira Rajeev X-Patchwork-Id: 1720668 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=112.213.38.117; helo=lists.ozlabs.org; envelope-from=linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=ds9ahPwx; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NlgyZ5FKnz23dw for ; Mon, 2 Jan 2023 14:17:10 +1100 (AEDT) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4NlgyX4y21z3bTD for ; Mon, 2 Jan 2023 14:17:08 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=ds9ahPwx; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=linux.vnet.ibm.com (client-ip=148.163.156.1; helo=mx0a-001b2d01.pphosted.com; envelope-from=atrajeev@linux.vnet.ibm.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=ds9ahPwx; dkim-atps=neutral Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4Nlgwt0HNlz2xkm; Mon, 2 Jan 2023 14:15:41 +1100 (AEDT) Received: from pps.filterd (m0098399.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 301KaQxi020862; Mon, 2 Jan 2023 03:15:37 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=d+EiR0sD2epn58l5IbMc1wwMtk7xXxgCRWLeEGIABtc=; b=ds9ahPwxMfjHHY6ulaer71L+UZN9/JO29kFeJlsxnm8SA1uG75r6nqKM1xzwzQX52OHz 9Y0mgw2ObYUvV6qHLPkob0Z3YFwIy5RJcTyw6TmrTvCMzP+s8EKm9bypoRbINejng+lw jnXaCcC0q1GcVwV0tYyR/85vnb4qjHT06gE+bAfm6jyZiUX1O06/6yuAADvJkqTG0qEg 1bXcPKkPkvRsMrpmvYynXZcFFUPAhnKr3yflQ+DUFuyoLLRs0XR0Y+T4/n1o3w9x8S0n ZIcEEHb17YgHZpYMixRZkDZbwCnFRgCOck1DqgiVfcLlp6NCO6ktQfy1ShySAhq77aCK 7A== Received: from ppma03ams.nl.ibm.com (62.31.33a9.ip4.static.sl-reverse.com [169.51.49.98]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3mtxhh8spn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 02 Jan 2023 03:15:37 +0000 Received: from pps.filterd (ppma03ams.nl.ibm.com [127.0.0.1]) by ppma03ams.nl.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 3020euYf001913; Mon, 2 Jan 2023 03:15:34 GMT Received: from smtprelay04.fra02v.mail.ibm.com ([9.218.2.228]) by ppma03ams.nl.ibm.com (PPS) with ESMTPS id 3mtcq69w2p-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 02 Jan 2023 03:15:34 +0000 Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay04.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 3023FVsr22741488 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 2 Jan 2023 03:15:31 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 37C0820043; Mon, 2 Jan 2023 03:15:31 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 90DFA20040; Mon, 2 Jan 2023 03:15:29 +0000 (GMT) Received: from localhost.localdomain (unknown [9.43.47.130]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTP; Mon, 2 Jan 2023 03:15:29 +0000 (GMT) From: Athira Rajeev To: skiboot@lists.ozlabs.org, mpe@ellerman.id.au, maddy@linux.ibm.com Subject: [PATCH 3/3] skiboot: Update IMC PMU node names for power10 Date: Mon, 2 Jan 2023 08:45:24 +0530 Message-Id: <20230102031524.73249-3-atrajeev@linux.vnet.ibm.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230102031524.73249-1-atrajeev@linux.vnet.ibm.com> References: <20230102031524.73249-1-atrajeev@linux.vnet.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: gNZ7Nm46Z4dDzPMGm2zRYPGJ9pPEq3Nf X-Proofpoint-GUID: gNZ7Nm46Z4dDzPMGm2zRYPGJ9pPEq3Nf X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.923,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2023-01-01_11,2022-12-30_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 lowpriorityscore=0 spamscore=0 phishscore=0 priorityscore=1501 suspectscore=0 bulkscore=0 mlxscore=0 clxscore=1015 malwarescore=0 adultscore=0 mlxlogscore=974 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2301020027 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kjain@linux.ibm.com, disgoel@linux.ibm.com, linuxppc-dev@lists.ozlabs.org, mahesh@linux.ibm.com Errors-To: linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" The nest IMC (In Memory Collection) Performance Monitoring Unit(PMU) node names are saved as "struct nest_pmus_struct" in the "hw/imc.c" IMC code. Not all the IMC PMUs listed in the device tree may be available. Nest IMC PMU names along with their bit values is represented in imc availability vector. This struct is used to remove the unavailable nodes by checking this vector. For power10, the imc_chip_avl_vector ie, imc availability vector ( which is a part of the IMC control block structure ), has change in mapping of units and bit positions. Hence rename the existing nest_pmus array to nest_pmus_p9 and add entry for power10 as nest_pmus_p10. Also the avl_vector has another change in bit positions 11:34. These bit positions tells the availability of Xlink/Alink/CAPI. There are total 8 links and three bit field combination says which link is available. Example, 101b means X-Link is configured. Patch implements all these change to handle nest_pmus_p10. Signed-off-by: Athira Rajeev --- hw/imc.c | 195 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 185 insertions(+), 10 deletions(-) diff --git a/hw/imc.c b/hw/imc.c index 779e9634..d1adc5ef 100644 --- a/hw/imc.c +++ b/hw/imc.c @@ -55,7 +55,7 @@ static unsigned int *htm_scom_index; * imc_chip_avl_vector(in struct imc_chip_cb, look at include/imc.h). * nest_pmus[] is an array containing all the possible nest IMC PMU node names. */ -static struct nest_pmus_struct nest_pmus[] = { +static struct nest_pmus_struct nest_pmus_p9[] = { { .name = "powerbus0@", .len = 10 }, { .name = "mcs0@", .len = 5}, { .name = "mcs1@", .len = 5}, @@ -110,6 +110,67 @@ static struct nest_pmus_struct nest_pmus[] = { /* reserved bits : 51 - 63 */ }; +static struct nest_pmus_struct nest_pmus_p10[] = { + { .name = "pb@", .len = 3 }, + { .name = "mcs0@", .len = 5}, + { .name = "mcs1@", .len = 5}, + { .name = "mcs2@", .len = 5}, + { .name = "mcs3@", .len = 5}, + { .name = "mcs4@", .len = 5}, + { .name = "mcs5@", .len = 5}, + { .name = "mcs6@", .len = 5}, + { .name = "mcs7@", .len = 5}, + { .name = "pec0@", .len = 5}, + { .name = "pec1@", .len = 5}, + { .name = "NA", .len = 0}, + { .name = "NA", .len = 0}, + { .name = "NA", .len = 0}, + { .name = "NA", .len = 0}, + { .name = "NA", .len = 0}, + { .name = "NA", .len = 0}, + { .name = "NA", .len = 0}, + { .name = "NA", .len = 0}, + { .name = "NA", .len = 0}, + { .name = "NA", .len = 0}, + { .name = "NA", .len = 0}, + { .name = "NA", .len = 0}, + { .name = "NA", .len = 0}, + { .name = "NA", .len = 0}, + { .name = "NA", .len = 0}, + { .name = "NA", .len = 0}, + { .name = "NA", .len = 0}, + { .name = "NA", .len = 0}, + { .name = "NA", .len = 0}, + { .name = "NA", .len = 0}, + { .name = "NA", .len = 0}, + { .name = "NA", .len = 0}, + { .name = "NA", .len = 0}, + { .name = "NA", .len = 0}, + { .name = "phb0@", .len = 5}, + { .name = "phb1@", .len = 5}, + { .name = "phb2@", .len = 5}, + { .name = "phb3@", .len = 5}, + { .name = "phb4@", .len = 5}, + { .name = "phb5@", .len = 5}, + { .name = "ocmb0@", .len = 6}, + { .name = "ocmb1@", .len = 6}, + { .name = "ocmb2@", .len = 6}, + { .name = "ocmb3@", .len = 6}, + { .name = "ocmb4@", .len = 6}, + { .name = "ocmb5@", .len = 6}, + { .name = "ocmb6@", .len = 6}, + { .name = "ocmb7@", .len = 6}, + { .name = "ocmb8@", .len = 6}, + { .name = "ocmb9@", .len = 6}, + { .name = "ocmb10@", .len = 6}, + { .name = "ocmb11@", .len = 6}, + { .name = "ocmb12@", .len = 6}, + { .name = "ocmb13@", .len = 6}, + { .name = "ocmb14@", .len = 6}, + { .name = "ocmb15@", .len = 6}, + { .name = "nx@", .len = 3}, +}; + /* * Due to Nest HW/OCC restriction, microcode will not support individual unit * events for these nest units mcs0, mcs1 ... mcs7 in the accumulation mode. @@ -377,7 +438,7 @@ static void disable_unavailable_units(struct dt_node *dev) uint64_t avl_vec; struct imc_chip_cb *cb; struct dt_node *target; - int i; + int i, j; bool disable_all_nests = false; struct proc_chip *chip; @@ -415,14 +476,128 @@ static void disable_unavailable_units(struct dt_node *dev) avl_vec = (0xffULL) << 56; } - for (i = 0; i < ARRAY_SIZE(nest_pmus); i++) { - if (!(PPC_BITMASK(i, i) & avl_vec)) { - /* Check if the device node exists */ - target = dt_find_by_name_len(dev, nest_pmus[i].name, nest_pmus[i].len); - if (!target) - continue; - /* Remove the device node */ - dt_free(target); + if (proc_gen == proc_gen_p9) { + for (i = 0; i < ARRAY_SIZE(nest_pmus_p9); i++) { + if (!(PPC_BITMASK(i, i) & avl_vec)) { + /* Check if the device node exists */ + target = dt_find_by_name_len(dev, nest_pmus_p9[i].name, nest_pmus_p9[i].len); + if (!target) + continue; + /* Remove the device node */ + dt_free(target); + } + } + } else if (proc_gen == proc_gen_p10) { + int val; + char al[8], xl[8], otl[8], phb[8]; + for (i = 0; i < 11; i++) { + if (!(PPC_BITMASK(i, i) & avl_vec)) { + /* Check if the device node exists */ + target = dt_find_by_name_len(dev, nest_pmus_p10[i].name, nest_pmus_p10[i].len); + if (!target) + continue; + /* Remove the device node */ + dt_free(target); + } + } + + for (i = 35; i < 41; i++) { + if (!(PPC_BITMASK(i, i) & avl_vec)) { + /* Check if the device node exists for phb */ + for (j = 0; j < 3; j++) { + snprintf(phb, sizeof(phb), "phb%d_%d@", (i-35), j); + target = dt_find_by_name_len(dev, phb, 7); + if (!target) + continue; + /* Remove the device node */ + dt_free(target); + } + } + } + + for (i = 41; i < 58; i++) { + if (!(PPC_BITMASK(i, i) & avl_vec)) { + /* Check if the device node exists */ + target = dt_find_by_name_len(dev, nest_pmus_p10[i].name, nest_pmus_p10[i].len); + if (!target) + continue; + /* Remove the device node */ + dt_free(target); + } + } + + for (i=0; i<8; i++) { + val = ((avl_vec & (0x7ULL << (29 + (3 * i)))) >> (29 + (3 * i))); + switch (val) { + case 0x5: //xlink configured and functional + + snprintf(al, sizeof(al), "alink%1d@",(7-i)); + target = dt_find_by_name_len(dev, al, 7); + if (target) + dt_free(target); + + snprintf(otl, sizeof(otl),"otl%1d_0@",(7-i)); + target = dt_find_by_name_len(dev, otl, 7); + if (target) + dt_free(target); + + snprintf(otl,sizeof(otl),"otl%1d_1@",(7-i)); + target = dt_find_by_name_len(dev, otl, 7); + if (target) + dt_free(target); + + break; + case 0x6: //alink configured and functional + + snprintf(xl,sizeof(xl),"xlink%1d@",(7-i)); + target = dt_find_by_name_len(dev, xl, 7); + if (target) + dt_free(target); + + snprintf(otl,sizeof(otl),"otl%1d_0@",(7-i)); + target = dt_find_by_name_len(dev, otl, 7); + if (target) + dt_free(target); + + snprintf(otl,sizeof(otl),"otl%1d_1@",(7-i)); + target = dt_find_by_name_len(dev, otl, 7); + if (target) + dt_free(target); + break; + + case 0x7: //CAPI configured and functional + snprintf(al,sizeof(al),"alink%1d@",(7-i)); + target = dt_find_by_name_len(dev, al, 7); + if (target) + dt_free(target); + + snprintf(xl,sizeof(xl),"xlink%1d@",(7-i)); + target = dt_find_by_name_len(dev, xl, 7); + if (target) + dt_free(target); + break; + default: + snprintf(xl,sizeof(xl),"xlink%1d@",(7-i)); + target = dt_find_by_name_len(dev, xl, 7); + if (target) + dt_free(target); + + snprintf(al,sizeof(al),"alink%1d@",(7-i)); + target = dt_find_by_name_len(dev, al, 7); + if (target) + dt_free(target); + + snprintf(otl,sizeof(otl),"otl%1d_0@",(7-i)); + target = dt_find_by_name_len(dev, otl, 7); + if (target) + dt_free(target); + + snprintf(otl,sizeof(otl),"otl%1d_1@",(7-i)); + target = dt_find_by_name_len(dev, otl, 7); + if (target) + dt_free(target); + break; + } } }