Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/726442/?format=api
{ "id": 726442, "url": "http://patchwork.ozlabs.org/api/patches/726442/?format=api", "web_url": "http://patchwork.ozlabs.org/project/skiboot/patch/1486717462-5016-3-git-send-email-clombard@linux.vnet.ibm.com/", "project": { "id": 44, "url": "http://patchwork.ozlabs.org/api/projects/44/?format=api", "name": "skiboot firmware development", "link_name": "skiboot", "list_id": "skiboot.lists.ozlabs.org", "list_email": "skiboot@lists.ozlabs.org", "web_url": "http://github.com/open-power/skiboot", "scm_url": "http://github.com/open-power/skiboot", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<1486717462-5016-3-git-send-email-clombard@linux.vnet.ibm.com>", "list_archive_url": null, "date": "2017-02-10T09:04:20", "name": "[2/4] capi: Move phb3 capp registers to specialized files", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "bf7040a09f96853105e93baf2c89c1608f9703c7", "submitter": { "id": 67351, "url": "http://patchwork.ozlabs.org/api/people/67351/?format=api", "name": "Christophe Lombard", "email": "clombard@linux.vnet.ibm.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/skiboot/patch/1486717462-5016-3-git-send-email-clombard@linux.vnet.ibm.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/726442/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/726442/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "skiboot@lists.ozlabs.org" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "skiboot@lists.ozlabs.org" ], "Received": [ "from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\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 3vKTYY26n6z9s2G\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 10 Feb 2017 20:05:21 +1100 (AEDT)", "from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 3vKTYY1BXFzDq5s\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 10 Feb 2017 20:05:21 +1100 (AEDT)", "from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com\n\t[148.163.158.5])\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 3vKTY95LGMzDqC0\n\tfor <skiboot@lists.ozlabs.org>; Fri, 10 Feb 2017 20:05:01 +1100 (AEDT)", "from pps.filterd (m0098416.ppops.net [127.0.0.1])\n\tby mx0b-001b2d01.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id\n\tv1A8x47d062511\n\tfor <skiboot@lists.ozlabs.org>; Fri, 10 Feb 2017 04:04:58 -0500", "from e06smtp15.uk.ibm.com (e06smtp15.uk.ibm.com [195.75.94.111])\n\tby mx0b-001b2d01.pphosted.com with ESMTP id 28gr4ek3hr-1\n\t(version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT)\n\tfor <skiboot@lists.ozlabs.org>; Fri, 10 Feb 2017 04:04:58 -0500", "from localhost\n\tby e06smtp15.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use\n\tOnly! Violators will be prosecuted\n\tfor <skiboot@lists.ozlabs.org> from <clombard@linux.vnet.ibm.com>;\n\tFri, 10 Feb 2017 09:04:56 -0000", "from d06dlp01.portsmouth.uk.ibm.com (9.149.20.13)\n\tby e06smtp15.uk.ibm.com (192.168.101.145) with IBM ESMTP SMTP\n\tGateway: Authorized Use Only! Violators will be prosecuted; \n\tFri, 10 Feb 2017 09:04:54 -0000", "from b06cxnps3074.portsmouth.uk.ibm.com\n\t(d06relay09.portsmouth.uk.ibm.com [9.149.109.194])\n\tby d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id\n\tB40BB17D8042\n\tfor <skiboot@lists.ozlabs.org>; Fri, 10 Feb 2017 09:07:58 +0000 (GMT)", "from d06av23.portsmouth.uk.ibm.com (d06av23.portsmouth.uk.ibm.com\n\t[9.149.105.59])\n\tby b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with\n\tESMTP id v1A94RU712124620; Fri, 10 Feb 2017 09:04:27 GMT", "from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id 6D0DFA405E;\n\tFri, 10 Feb 2017 09:04:24 +0000 (GMT)", "from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id C8F21A4059;\n\tFri, 10 Feb 2017 09:04:23 +0000 (GMT)", "from lombard-w520.ibm.com (unknown [9.164.182.111])\n\tby d06av23.portsmouth.uk.ibm.com (Postfix) with ESMTP;\n\tFri, 10 Feb 2017 09:04:23 +0000 (GMT)" ], "From": "Christophe Lombard <clombard@linux.vnet.ibm.com>", "To": "skiboot@lists.ozlabs.org, fbarrat@linux.vnet.ibm.com, imunsie@au1.ibm.com,\n\tandrew.donnellan@au1.ibm.com, christophe_lombard@fr.ibm.com", "Date": "Fri, 10 Feb 2017 10:04:20 +0100", "X-Mailer": "git-send-email 2.7.4", "In-Reply-To": "<1486717462-5016-1-git-send-email-clombard@linux.vnet.ibm.com>", "References": "<1486717462-5016-1-git-send-email-clombard@linux.vnet.ibm.com>", "X-TM-AS-GCONF": "00", "X-Content-Scanned": "Fidelis XPS MAILER", "x-cbid": "17021009-0020-0000-0000-00000303FBD6", "X-IBM-AV-DETECTION": "SAVI=unused REMOTE=unused XFE=unused", "x-cbparentid": "17021009-0021-0000-0000-00004057835C", "Message-Id": "<1486717462-5016-3-git-send-email-clombard@linux.vnet.ibm.com>", "X-Proofpoint-Virus-Version": "vendor=fsecure engine=2.50.10432:, ,\n\tdefinitions=2017-02-10_03:, , signatures=0", "X-Proofpoint-Spam-Details": "rule=outbound_notspam policy=outbound score=0\n\tspamscore=0 suspectscore=0\n\tmalwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam\n\tadjust=0 reason=mlx scancount=1 engine=8.0.1-1612050000\n\tdefinitions=main-1702100090", "Subject": "[Skiboot] [PATCH 2/4] capi: Move phb3 capp registers to specialized\n\tfiles", "X-BeenThere": "skiboot@lists.ozlabs.org", "X-Mailman-Version": "2.1.23", "Precedence": "list", "List-Id": "Mailing list for skiboot development <skiboot.lists.ozlabs.org>", "List-Unsubscribe": "<https://lists.ozlabs.org/options/skiboot>,\n\t<mailto:skiboot-request@lists.ozlabs.org?subject=unsubscribe>", "List-Archive": "<http://lists.ozlabs.org/pipermail/skiboot/>", "List-Post": "<mailto:skiboot@lists.ozlabs.org>", "List-Help": "<mailto:skiboot-request@lists.ozlabs.org?subject=help>", "List-Subscribe": "<https://lists.ozlabs.org/listinfo/skiboot>,\n\t<mailto:skiboot-request@lists.ozlabs.org?subject=subscribe>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"utf-8\"", "Content-Transfer-Encoding": "base64", "Errors-To": "skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org", "Sender": "\"Skiboot\"\n\t<skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org>" }, "content": "The definitions of the CAPP registers for PHB3 are moved in a specific\nfile.\nThe updated file capp.h will be used for the common functionalities\nabout the CAPP for PHB3 and PHB4.\n\nSigned-off-by: Christophe Lombard <clombard@linux.vnet.ibm.com>\n---\n core/hmi.c | 2 +-\n hw/phb3.c | 1 +\n include/capp.h | 29 -----------------------------\n include/phb3-capp.h | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++\n 4 files changed, 52 insertions(+), 30 deletions(-)\n create mode 100644 include/phb3-capp.h", "diff": "diff --git a/core/hmi.c b/core/hmi.c\nindex 6fe060d..eb43807 100644\n--- a/core/hmi.c\n+++ b/core/hmi.c\n@@ -19,7 +19,7 @@\n #include <processor.h>\n #include <chiptod.h>\n #include <xscom.h>\n-#include <capp.h>\n+#include <phb3-capp.h>\n #include <pci.h>\n #include <cpu.h>\n #include <chip.h>\ndiff --git a/hw/phb3.c b/hw/phb3.c\nindex 4010739..f0e957c 100644\n--- a/hw/phb3.c\n+++ b/hw/phb3.c\n@@ -30,6 +30,7 @@\n #include <affinity.h>\n #include <phb3.h>\n #include <phb3-regs.h>\n+#include <phb3-capp.h>\n #include <capp.h>\n #include <fsp.h>\n #include <chip.h>\ndiff --git a/include/capp.h b/include/capp.h\nindex c76258b..d0c28c9 100644\n--- a/include/capp.h\n+++ b/include/capp.h\n@@ -62,33 +62,4 @@ enum capp_reg {\n \tapc_master_powerbus_ctrl\t= 0xB\n };\n \n-#define CAPP_SNP_ARRAY_ADDR_REG\t\t\t0x2013028\n-#define CAPP_APC_MASTER_ARRAY_ADDR_REG\t\t0x201302A\n-#define CAPP_SNP_ARRAY_WRITE_REG\t\t0x2013801\n-#define CAPP_APC_MASTER_ARRAY_WRITE_REG\t\t0x2013802\n-\n-#define CAPP_FIR 0x2013000\n-#define CAPP_ERR_RPT_CLR 0x2013013\n-#define APC_MASTER_PB_CTRL\t\t\t0x2013018\n-#define APC_MASTER_CAPI_CTRL\t\t\t0x2013019\n-#define TRANSPORT_CONTROL\t\t\t0x201301C\n-#define CANNED_PRESP_MAP0\t\t\t0x201301D\n-#define CANNED_PRESP_MAP1\t\t\t0x201301E\n-#define CANNED_PRESP_MAP2\t\t\t0x201301F\n-#define CAPP_ERR_STATUS_CTRL\t\t\t0x201300E\n-#define FLUSH_SUE_STATE_MAP\t\t\t0x201300F\n-#define CAPP_TB\t\t\t\t\t0x2013026\n-#define CAPP_TFMR\t\t\t\t0x2013027\n-#define CAPP_EPOCH_TIMER_CTRL\t\t\t0x201302C\n-#define FLUSH_UOP_CONFIG1\t\t\t0x2013803\n-#define FLUSH_UOP_CONFIG2\t\t\t0x2013804\n-#define SNOOP_CAPI_CONFIG\t\t\t0x201301A\n-\n-/*\n- * Naples has two CAPP units, statically mapped:\n- * CAPP0 attached to PHB0, and CAPP1 attached to PHB1.\n- * The addresses of CAPP1 XSCOMS registers are 0x180 away.\n- */\n-#define CAPP1_REG_OFFSET 0x180\n-\n #endif /* __CAPP_H */\ndiff --git a/include/phb3-capp.h b/include/phb3-capp.h\nnew file mode 100644\nindex 0000000..3834ef4\n--- /dev/null\n+++ b/include/phb3-capp.h\n@@ -0,0 +1,50 @@\n+/* Copyright 2013-2017 IBM Corp.\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * \thttp://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n+ * implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+\n+#ifndef __PHB3_CAPP_H\n+#define __PHB3_CAPP_H\n+\n+\n+#define CAPP_SNP_ARRAY_ADDR_REG \t\t0x2013028\n+#define CAPP_APC_MASTER_ARRAY_ADDR_REG\t\t0x201302A\n+#define CAPP_SNP_ARRAY_WRITE_REG\t\t0x2013801\n+#define CAPP_APC_MASTER_ARRAY_WRITE_REG \t0x2013802\n+\n+#define CAPP_FIR\t\t\t\t0x2013000\n+#define CAPP_ERR_RPT_CLR\t\t\t0x2013013\n+#define APC_MASTER_PB_CTRL\t\t\t0x2013018\n+#define APC_MASTER_CAPI_CTRL\t\t\t0x2013019\n+#define TRANSPORT_CONTROL\t\t\t0x201301C\n+#define CANNED_PRESP_MAP0\t\t\t0x201301D\n+#define CANNED_PRESP_MAP1\t\t\t0x201301E\n+#define CANNED_PRESP_MAP2\t\t\t0x201301F\n+#define CAPP_ERR_STATUS_CTRL\t\t\t0x201300E\n+#define FLUSH_SUE_STATE_MAP\t\t\t0x201300F\n+#define CAPP_TB \t\t\t\t0x2013026\n+#define CAPP_TFMR\t\t\t\t0x2013027\n+#define CAPP_EPOCH_TIMER_CTRL\t\t\t0x201302C\n+#define FLUSH_UOP_CONFIG1\t\t\t0x2013803\n+#define FLUSH_UOP_CONFIG2\t\t\t0x2013804\n+#define SNOOP_CAPI_CONFIG\t\t\t0x201301A\n+\n+/*\n+ * Naples has two CAPP units, statically mapped:\n+ * CAPP0 attached to PHB0, and CAPP1 attached to PHB1.\n+ * The addresses of CAPP1 XSCOMS registers are 0x180 away.\n+ */\n+#define CAPP1_REG_OFFSET 0x180\n+\n+#endif /* __PHB3_CAPP_H */\n", "prefixes": [ "2/4" ] }