Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.2/patches/794513/?format=api
{ "id": 794513, "url": "http://patchwork.ozlabs.org/api/1.2/patches/794513/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linuxppc-dev/patch/67551d00-5e79-8839-2040-81949f71ef3a@linux.vnet.ibm.com/", "project": { "id": 2, "url": "http://patchwork.ozlabs.org/api/1.2/projects/2/?format=api", "name": "Linux PPC development", "link_name": "linuxppc-dev", "list_id": "linuxppc-dev.lists.ozlabs.org", "list_email": "linuxppc-dev@lists.ozlabs.org", "web_url": "https://github.com/linuxppc/wiki/wiki", "scm_url": "https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git", "webscm_url": "https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/", "list_archive_url": "https://lore.kernel.org/linuxppc-dev/", "list_archive_url_format": "https://lore.kernel.org/linuxppc-dev/{}/", "commit_url_format": "https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/commit/?id={}" }, "msgid": "<67551d00-5e79-8839-2040-81949f71ef3a@linux.vnet.ibm.com>", "list_archive_url": "https://lore.kernel.org/linuxppc-dev/67551d00-5e79-8839-2040-81949f71ef3a@linux.vnet.ibm.com/", "date": "2017-07-27T16:10:01", "name": "[2/4] pseries/drc-info: Search DRC properties for CPU indexes", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": false, "hash": "3174f5f326cdbfdb0b9e0490f7ed33801c135153", "submitter": { "id": 65104, "url": "http://patchwork.ozlabs.org/api/1.2/people/65104/?format=api", "name": "Michael Bringmann", "email": "mwb@linux.vnet.ibm.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/linuxppc-dev/patch/67551d00-5e79-8839-2040-81949f71ef3a@linux.vnet.ibm.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/794513/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/794513/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org>", "X-Original-To": [ "patchwork-incoming@ozlabs.org", "linuxppc-dev@lists.ozlabs.org" ], "Delivered-To": [ "patchwork-incoming@ozlabs.org", "linuxppc-dev@lists.ozlabs.org" ], "Received": [ "from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68])\n\t(using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xJHBB56Lvz9s0Z\n\tfor <patchwork-incoming@ozlabs.org>;\n\tFri, 28 Jul 2017 02:14:58 +1000 (AEST)", "from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 3xJHBB414gzDrMh\n\tfor <patchwork-incoming@ozlabs.org>;\n\tFri, 28 Jul 2017 02:14:58 +1000 (AEST)", "from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com\n\t[148.163.156.1])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby lists.ozlabs.org (Postfix) with ESMTPS id 3xJH4c51qLzDrKR\n\tfor <linuxppc-dev@lists.ozlabs.org>;\n\tFri, 28 Jul 2017 02:10:08 +1000 (AEST)", "from pps.filterd (m0098404.ppops.net [127.0.0.1])\n\tby mx0a-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id\n\tv6RG8SsE018491\n\tfor <linuxppc-dev@lists.ozlabs.org>; Thu, 27 Jul 2017 12:10:06 -0400", "from e32.co.us.ibm.com (e32.co.us.ibm.com [32.97.110.150])\n\tby mx0a-001b2d01.pphosted.com with ESMTP id 2byk5cgwyw-1\n\t(version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT)\n\tfor <linuxppc-dev@lists.ozlabs.org>; Thu, 27 Jul 2017 12:10:06 -0400", "from localhost\n\tby e32.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use\n\tOnly! Violators will be prosecuted\n\tfor <linuxppc-dev@lists.ozlabs.org> from <mwb@linux.vnet.ibm.com>;\n\tThu, 27 Jul 2017 10:10:05 -0600", "from b03cxnp08025.gho.boulder.ibm.com (9.17.130.17)\n\tby e32.co.us.ibm.com (192.168.1.132) with IBM ESMTP SMTP Gateway:\n\tAuthorized Use Only! Violators will be prosecuted; \n\tThu, 27 Jul 2017 10:10:03 -0600", "from b03ledav002.gho.boulder.ibm.com\n\t(b03ledav002.gho.boulder.ibm.com [9.17.130.233])\n\tby b03cxnp08025.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with\n\tESMTP id v6RGA1SQ1573188; Thu, 27 Jul 2017 09:10:02 -0700", "from b03ledav002.gho.boulder.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id 6B36813604B;\n\tThu, 27 Jul 2017 10:10:02 -0600 (MDT)", "from oc1554177480.ibm.com (unknown [9.53.92.155])\n\tby b03ledav002.gho.boulder.ibm.com (Postfix) with ESMTP id\n\t16306136049; Thu, 27 Jul 2017 10:10:02 -0600 (MDT)" ], "To": "linuxppc-dev@lists.ozlabs.org", "From": "Michael Bringmann <mwb@linux.vnet.ibm.com>", "Subject": "[PATCH 2/4] pseries/drc-info: Search DRC properties for CPU indexes", "Organization": "IBM Linux Technology Center", "In-Reply-To": "<e884f428-c76d-112a-aa2f-f57a94de55fb@linux.vnet.ibm.com>", "Date": "Thu, 27 Jul 2017 11:10:01 -0500", "User-Agent": "Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101\n\tThunderbird/52.2.0", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=utf-8", "Content-Language": "en-US", "Content-Transfer-Encoding": "8bit", "X-TM-AS-GCONF": "00", "x-cbid": "17072716-0004-0000-0000-000012A98EA7", "X-IBM-SpamModules-Scores": "", "X-IBM-SpamModules-Versions": "BY=3.00007436; HX=3.00000241; KW=3.00000007;\n\tPH=3.00000004; SC=3.00000214; SDB=6.00893701; UDB=6.00446819;\n\tIPR=6.00673861; \n\tBA=6.00005495; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009;\n\tZB=6.00000000; \n\tZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00016409;\n\tXFM=3.00000015; UTC=2017-07-27 16:10:03", "X-IBM-AV-DETECTION": "SAVI=unused REMOTE=unused XFE=unused", "x-cbparentid": "17072716-0005-0000-0000-0000806E9986", "Message-Id": "<67551d00-5e79-8839-2040-81949f71ef3a@linux.vnet.ibm.com>", "X-Proofpoint-Virus-Version": "vendor=fsecure engine=2.50.10432:, ,\n\tdefinitions=2017-07-27_08:, , signatures=0", "X-Proofpoint-Spam-Details": "rule=outbound_notspam policy=outbound score=0\n\tspamscore=0 suspectscore=1\n\tmalwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam\n\tadjust=0 reason=mlx scancount=1 engine=8.0.1-1706020000\n\tdefinitions=main-1707270254", "X-BeenThere": "linuxppc-dev@lists.ozlabs.org", "X-Mailman-Version": "2.1.23", "Precedence": "list", "List-Id": "Linux on PowerPC Developers Mail List\n\t<linuxppc-dev.lists.ozlabs.org>", "List-Unsubscribe": "<https://lists.ozlabs.org/options/linuxppc-dev>,\n\t<mailto:linuxppc-dev-request@lists.ozlabs.org?subject=unsubscribe>", "List-Archive": "<http://lists.ozlabs.org/pipermail/linuxppc-dev/>", "List-Post": "<mailto:linuxppc-dev@lists.ozlabs.org>", "List-Help": "<mailto:linuxppc-dev-request@lists.ozlabs.org?subject=help>", "List-Subscribe": "<https://lists.ozlabs.org/listinfo/linuxppc-dev>,\n\t<mailto:linuxppc-dev-request@lists.ozlabs.org?subject=subscribe>", "Cc": "nfont@linux.vnet.ibm.com, Michael Bringmann <mwb@linux.vnet.ibm.com>", "Errors-To": "linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org", "Sender": "\"Linuxppc-dev\"\n\t<linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org>" }, "content": "pseries/drc-info: Provide parallel routines to convert between\ndrc_index and CPU numbers at runtime, using the older device-tree\nproperties (\"ibm,drc-indexes\", \"ibm,drc-names\", \"ibm,drc-types\"\nand \"ibm,drc-power-domains\"), or the new property \"ibm,drc-info\".\n\nSigned-off-by: Michael Bringmann <mwb@linux.vnet.ibm.com>\n---\n arch/powerpc/include/asm/prom.h | 7 +\n arch/powerpc/platforms/pseries/of_helpers.c | 79 ++++++++++++\n arch/powerpc/platforms/pseries/pseries_energy.c | 150 +++++++++++++++++++----\n 3 files changed, 210 insertions(+), 26 deletions(-)\n---\nChanges in V2:\n -- Minor changes to integrate to latest 4.13 code", "diff": "diff --git a/arch/powerpc/include/asm/prom.h b/arch/powerpc/include/asm/prom.h\nindex 4fb02cc..d469d7c 100644\n--- a/arch/powerpc/include/asm/prom.h\n+++ b/arch/powerpc/include/asm/prom.h\n@@ -96,6 +96,13 @@ struct of_drconf_cell {\n #define DRCONF_MEM_AI_INVALID\t0x00000040\n #define DRCONF_MEM_RESERVED\t0x00000080\n \n+extern int of_one_drc_info(struct property **prop, void **curval,\n+\t\t\tchar **dtype, char **dname,\n+\t\t\tu32 *drc_index_start_p,\n+\t\t\tu32 *num_sequential_elems_p,\n+\t\t\tu32 *sequential_inc_p,\n+\t\t\tu32 *last_drc_index_p);\n+\n /*\n * There are two methods for telling firmware what our capabilities are.\n * Newer machines have an \"ibm,client-architecture-support\" method on the\ndiff --git a/arch/powerpc/platforms/pseries/of_helpers.c b/arch/powerpc/platforms/pseries/of_helpers.c\nindex 2798933..1d59939 100644\n--- a/arch/powerpc/platforms/pseries/of_helpers.c\n+++ b/arch/powerpc/platforms/pseries/of_helpers.c\n@@ -36,3 +36,82 @@ struct device_node *pseries_of_derive_parent(const char *path)\n \t\tkfree(parent_path);\n \treturn parent ? parent : ERR_PTR(-EINVAL);\n }\n+\n+\n+/* Helper Routines to convert between drc_index to cpu numbers */\n+\n+int of_one_drc_info(struct property **prop, void **curval,\n+\t\t\tchar **dtype, char **dname,\n+\t\t\tu32 *drc_index_start_p,\n+\t\t\tu32 *num_sequential_elems_p,\n+\t\t\tu32 *sequential_inc_p,\n+\t\t\tu32 *last_drc_index_p)\n+{\n+\tchar *drc_type, *drc_name_prefix;\n+\tu32 drc_index_start, num_sequential_elems, dummy;\n+\tu32 sequential_inc, last_drc_index;\n+\tconst char *p;\n+\tconst __be32 *p2;\n+\n+\tdrc_index_start = num_sequential_elems = 0;\n+\tsequential_inc = last_drc_index = 0;\n+\n+\t/* Get drc-type:encode-string */\n+\tp = drc_type = (*curval);\n+\tp = of_prop_next_string(*prop, p);\n+\tif (!p)\n+\t\treturn -EINVAL;\n+\n+\t/* Get drc-name-prefix:encode-string */\n+\tdrc_name_prefix = (char *)p;\n+\tp = of_prop_next_string(*prop, p);\n+\tif (!p)\n+\t\treturn -EINVAL;\n+\n+\t/* Get drc-index-start:encode-int */\n+\tp2 = (const __be32 *)p;\n+\tp2 = of_prop_next_u32(*prop, p2, &drc_index_start);\n+\tif (!p2)\n+\t\treturn -EINVAL;\n+\n+\t/* Get/skip drc-name-suffix-start:encode-int */\n+\tp2 = of_prop_next_u32(*prop, p2, &dummy);\n+\tif (!p)\n+\t\treturn -EINVAL;\n+\n+\t/* Get number-sequential-elements:encode-int */\n+\tp2 = of_prop_next_u32(*prop, p2, &num_sequential_elems);\n+\tif (!p2)\n+\t\treturn -EINVAL;\n+\n+\t/* Get sequential-increment:encode-int */\n+\tp2 = of_prop_next_u32(*prop, p2, &sequential_inc);\n+\tif (!p2)\n+\t\treturn -EINVAL;\n+\n+\t/* Get/skip drc-power-domain:encode-int */\n+\tp2 = of_prop_next_u32(*prop, p2, &dummy);\n+\tif (!p2)\n+\t\treturn -EINVAL;\n+\n+\t/* Should now know end of current entry */\n+\t(*curval) = (void *)p2;\n+\tlast_drc_index = drc_index_start +\n+\t\t\t((num_sequential_elems-1)*sequential_inc);\n+\n+\tif (dtype)\n+\t\t*dtype = drc_type;\n+\tif (dname)\n+\t\t*dname = drc_name_prefix;\n+\tif (drc_index_start_p)\n+\t\t*drc_index_start_p = drc_index_start;\n+\tif (num_sequential_elems_p)\n+\t\t*num_sequential_elems_p = num_sequential_elems;\n+\tif (sequential_inc_p)\n+\t\t*sequential_inc_p = sequential_inc;\n+\tif (last_drc_index_p)\n+\t\t*last_drc_index_p = last_drc_index;\n+\n+\treturn 0;\n+}\n+EXPORT_SYMBOL(of_one_drc_info);\ndiff --git a/arch/powerpc/platforms/pseries/pseries_energy.c b/arch/powerpc/platforms/pseries/pseries_energy.c\nindex 164a13d..865c2af 100644\n--- a/arch/powerpc/platforms/pseries/pseries_energy.c\n+++ b/arch/powerpc/platforms/pseries/pseries_energy.c\n@@ -22,6 +22,7 @@\n #include <asm/page.h>\n #include <asm/hvcall.h>\n #include <asm/firmware.h>\n+#include <asm/prom.h>\n \n \n #define MODULE_VERS \"1.0\"\n@@ -38,7 +39,6 @@\n static u32 cpu_to_drc_index(int cpu)\n {\n \tstruct device_node *dn = NULL;\n-\tconst int *indexes;\n \tint i;\n \tint rc = 1;\n \tu32 ret = 0;\n@@ -46,18 +46,65 @@ static u32 cpu_to_drc_index(int cpu)\n \tdn = of_find_node_by_path(\"/cpus\");\n \tif (dn == NULL)\n \t\tgoto err;\n-\tindexes = of_get_property(dn, \"ibm,drc-indexes\", NULL);\n-\tif (indexes == NULL)\n-\t\tgoto err_of_node_put;\n+\n \t/* Convert logical cpu number to core number */\n \ti = cpu_core_index_of_thread(cpu);\n-\t/*\n-\t * The first element indexes[0] is the number of drc_indexes\n-\t * returned in the list. Hence i+1 will get the drc_index\n-\t * corresponding to core number i.\n-\t */\n-\tWARN_ON(i > indexes[0]);\n-\tret = indexes[i + 1];\n+\n+\tif (firmware_has_feature(FW_FEATURE_DRC_INFO)) {\n+\t\tstruct property *info = NULL;\n+\t\tint j, check_val = i;\n+\t\tu32 num_set_entries;\n+\t\tu32 drc_index_start = 0;\n+\t\tu32 last_drc_index = 0;\n+\t\tu32 num_sequential_elems = 0;\n+\t\tu32 sequential_inc = 0;\n+\t\tchar *dtype;\n+\t\tchar *dname;\n+\t\tvoid *value;\n+\n+\t\tinfo = of_find_property(dn, \"ibm,drc-info\", NULL);\n+\t\tif (info == NULL)\n+\t\t\tgoto err_of_node_put;\n+\n+\t\tvalue = info->value;\n+\t\tvalue = (void *)of_prop_next_u32(info, value, &num_set_entries);\n+\t\tif (!value)\n+\t\t\tgoto err_of_node_put;\n+\n+\t\tfor (j = 0; j < num_set_entries; j++) {\n+\n+\t\t\tof_one_drc_info(&info, &value, &dtype, &dname,\n+\t\t\t\t\t&drc_index_start,\n+\t\t\t\t\t&num_sequential_elems,\n+\t\t\t\t\t&sequential_inc, &last_drc_index);\n+\t\t\tif (strcmp(dtype, \"CPU\"))\n+\t\t\t\tgoto err;\n+\n+\t\t\tif (check_val < last_drc_index)\n+\t\t\t\tbreak;\n+\n+\t\t\tWARN_ON(((check_val-drc_index_start)%\n+\t\t\t\t\tsequential_inc) != 0);\n+\t\t}\n+\t\tWARN_ON((num_sequential_elems == 0) || (sequential_inc == 0));\n+\n+\t\tret = last_drc_index + (check_val*sequential_inc);\n+\t} else {\n+\t\tconst __be32 *indexes;\n+\n+\t\tindexes = of_get_property(dn, \"ibm,drc-indexes\", NULL);\n+\t\tif (indexes == NULL)\n+\t\t\tgoto err_of_node_put;\n+\n+\t\t/*\n+\t\t * The first element indexes[0] is the number of drc_indexes\n+\t\t * returned in the list. Hence i+1 will get the drc_index\n+\t\t * corresponding to core number i.\n+\t\t */\n+\t\tWARN_ON(i > indexes[0]);\n+\t\tret = indexes[i + 1];\n+\t}\n+\n \trc = 0;\n \n err_of_node_put:\n@@ -72,34 +119,85 @@ static int drc_index_to_cpu(u32 drc_index)\n {\n \tstruct device_node *dn = NULL;\n \tconst int *indexes;\n-\tint i, cpu = 0;\n+\tint thread = 0, cpu = 0;\n \tint rc = 1;\n \n \tdn = of_find_node_by_path(\"/cpus\");\n \tif (dn == NULL)\n \t\tgoto err;\n-\tindexes = of_get_property(dn, \"ibm,drc-indexes\", NULL);\n-\tif (indexes == NULL)\n-\t\tgoto err_of_node_put;\n-\t/*\n-\t * First element in the array is the number of drc_indexes\n-\t * returned. Search through the list to find the matching\n-\t * drc_index and get the core number\n-\t */\n-\tfor (i = 0; i < indexes[0]; i++) {\n-\t\tif (indexes[i + 1] == drc_index)\n+\n+\tif (firmware_has_feature(FW_FEATURE_DRC_INFO)) {\n+\t\tstruct property *info = NULL;\n+\t\tint j;\n+\t\tu32 num_set_entries;\n+\t\tu32 drc_index_start = 0;\n+\t\tu32 last_drc_index = 0;\n+\t\tu32 num_sequential_elems = 0;\n+\t\tu32 sequential_inc = 0;\n+\t\tchar *dtype, *dname;\n+\t\tvoid *value;\n+\n+\t\tinfo = of_find_property(dn, \"ibm,drc-info\", NULL);\n+\t\tif (info == NULL)\n+\t\t\tgoto err_of_node_put;\n+\n+\t\tvalue = info->value;\n+\t\tvalue = (void *)of_prop_next_u32(info, value, &num_set_entries);\n+\t\tif (!value)\n+\t\t\tgoto err_of_node_put;\n+\n+\t\tfor (j = 0; j < num_set_entries; j++) {\n+\n+\t\t\tof_one_drc_info(&info, &value, &dtype, &dname,\n+\t\t\t\t\t&drc_index_start,\n+\t\t\t\t\t&num_sequential_elems,\n+\t\t\t\t\t&sequential_inc, &last_drc_index);\n+\t\t\tif (strcmp(dtype, \"CPU\"))\n+\t\t\t\tgoto err;\n+\n+\t\t\tWARN_ON(drc_index < drc_index_start);\n+\t\t\tWARN_ON(((drc_index-drc_index_start)%\n+\t\t\t\t\tsequential_inc) != 0);\n+\n+\t\t\tif (drc_index > last_drc_index) {\n+\t\t\t\tcpu += ((last_drc_index-drc_index_start)/\n+\t\t\t\t\tsequential_inc);\n+\t\t\t\tcontinue;\n+\t\t\t} else {\n+\t\t\t\tcpu += ((drc_index-drc_index_start)/\n+\t\t\t\t\tsequential_inc);\n+\t\t\t}\n+\n+\t\t\tthread = cpu_first_thread_of_core(cpu);\n+\t\t\trc = 0;\n \t\t\tbreak;\n+\t\t}\n+\t} else {\n+\t\tunsigned long int i;\n+\n+\t\tindexes = of_get_property(dn, \"ibm,drc-indexes\", NULL);\n+\t\tif (indexes == NULL)\n+\t\t\tgoto err_of_node_put;\n+\t\t/*\n+\t\t * First element in the array is the number of drc_indexes\n+\t\t * returned. Search through the list to find the matching\n+\t\t * drc_index and get the core number\n+\t\t */\n+\t\tfor (i = 0; i < indexes[0]; i++) {\n+\t\t\tif (indexes[i + 1] == drc_index)\n+\t\t\t\tbreak;\n+\t\t}\n+\t\t/* Convert core number to logical cpu number */\n+\t\tthread = cpu_first_thread_of_core(i);\n+\t\trc = 0;\n \t}\n-\t/* Convert core number to logical cpu number */\n-\tcpu = cpu_first_thread_of_core(i);\n-\trc = 0;\n \n err_of_node_put:\n \tof_node_put(dn);\n err:\n \tif (rc)\n \t\tprintk(KERN_WARNING \"drc_index_to_cpu(%d) failed\", drc_index);\n-\treturn cpu;\n+\treturn thread;\n }\n \n /*\n", "prefixes": [ "2/4" ] }