{"id":819530,"url":"http://patchwork.ozlabs.org/api/patches/819530/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/150659506894.25889.3558250496380782854.stgit@aravinda/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<150659506894.25889.3558250496380782854.stgit@aravinda>","list_archive_url":null,"date":"2017-09-28T10:37:48","name":"[v5,2/6] ppc: spapr: Handle \"ibm, nmi-register\" and \"ibm, nmi-interlock\" RTAS calls","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"449c6406325e8484f462c77a656e841974edbc86","submitter":{"id":18580,"url":"http://patchwork.ozlabs.org/api/people/18580/?format=json","name":"Aravinda Prasad","email":"aravinda@linux.vnet.ibm.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/150659506894.25889.3558250496380782854.stgit@aravinda/mbox/","series":[{"id":5534,"url":"http://patchwork.ozlabs.org/api/series/5534/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=5534","date":"2017-09-28T10:37:28","name":"target-ppc/spapr: Add FWNMI support in QEMU for PowerKVM guests","version":5,"mbox":"http://patchwork.ozlabs.org/series/5534/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/819530/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/819530/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3y2rnQ6zDKz9t38\n\tfor ;\n\tThu, 28 Sep 2017 20:40:42 +1000 (AEST)","from localhost ([::1]:58373 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dxWFF-0005Ba-1T\n\tfor incoming@patchwork.ozlabs.org; Thu, 28 Sep 2017 06:40:41 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:50477)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dxWCl-0003h1-DV\n\tfor qemu-devel@nongnu.org; Thu, 28 Sep 2017 06:38:08 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dxWCh-0007fW-FJ\n\tfor qemu-devel@nongnu.org; Thu, 28 Sep 2017 06:38:07 -0400","from mx0b-001b2d01.pphosted.com ([148.163.158.5]:42738\n\thelo=mx0a-001b2d01.pphosted.com)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1dxWCh-0007fP-8n\n\tfor qemu-devel@nongnu.org; Thu, 28 Sep 2017 06:38:03 -0400","from pps.filterd (m0098413.ppops.net [127.0.0.1])\n\tby mx0b-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id\n\tv8SAXtCH046228\n\tfor ; Thu, 28 Sep 2017 06:38:00 -0400","from e31.co.us.ibm.com (e31.co.us.ibm.com [32.97.110.149])\n\tby mx0b-001b2d01.pphosted.com with ESMTP id 2d8sda2j3n-1\n\t(version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT)\n\tfor ; Thu, 28 Sep 2017 06:37:59 -0400","from localhost\n\tby e31.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use\n\tOnly! Violators will be prosecuted\n\tfor from ;\n\tThu, 28 Sep 2017 04:37:59 -0600","from b03cxnp08028.gho.boulder.ibm.com (9.17.130.20)\n\tby e31.co.us.ibm.com (192.168.1.131) with IBM ESMTP SMTP Gateway:\n\tAuthorized Use Only! Violators will be prosecuted; \n\tThu, 28 Sep 2017 04:37:56 -0600","from b03ledav001.gho.boulder.ibm.com\n\t(b03ledav001.gho.boulder.ibm.com [9.17.130.232])\n\tby b03cxnp08028.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with\n\tESMTP id v8SAbsHl29032516; Thu, 28 Sep 2017 03:37:54 -0700","from b03ledav001.gho.boulder.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id BD8716E10F;\n\tThu, 28 Sep 2017 04:37:54 -0600 (MDT)","from [127.0.1.1] (unknown [9.84.218.194])\n\tby b03ledav001.gho.boulder.ibm.com (Postfix) with ESMTP id 7FDEC6E10D;\n\tThu, 28 Sep 2017 04:37:51 -0600 (MDT)"],"From":"Aravinda Prasad ","To":"qemu-ppc@nongnu.org, qemu-devel@nongnu.org, david@gibson.dropbear.id.au","Date":"Thu, 28 Sep 2017 16:07:48 +0530","In-Reply-To":"<150659494872.25889.2069124544245723984.stgit@aravinda>","References":"<150659494872.25889.2069124544245723984.stgit@aravinda>","User-Agent":"StGit/0.17.1-dirty","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"7bit","X-TM-AS-GCONF":"00","x-cbid":"17092810-8235-0000-0000-00000C55B4CC","X-IBM-SpamModules-Scores":"","X-IBM-SpamModules-Versions":"BY=3.00007804; HX=3.00000241; KW=3.00000007;\n\tPH=3.00000004; SC=3.00000232; SDB=6.00923539; UDB=6.00464295;\n\tIPR=6.00703677; \n\tBA=6.00005611; 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.00017301;\n\tXFM=3.00000015; UTC=2017-09-28 10:37:58","X-IBM-AV-DETECTION":"SAVI=unused REMOTE=unused XFE=unused","x-cbparentid":"17092810-8236-0000-0000-00003DD3EF93","Message-Id":"<150659506894.25889.3558250496380782854.stgit@aravinda>","X-Proofpoint-Virus-Version":"vendor=fsecure engine=2.50.10432:, ,\n\tdefinitions=2017-09-28_04:, , 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-1707230000\n\tdefinitions=main-1709280158","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy]","X-Received-From":"148.163.158.5","Subject":"[Qemu-devel] [PATCH v5 2/6] ppc: spapr: Handle \"ibm,\n\tnmi-register\" and \"ibm, nmi-interlock\" RTAS calls","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"aik@ozlabs.ru, benh@au1.ibm.com, paulus@samba.org,\n\tsam.bobroff@au1.ibm.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"This patch adds support in QEMU to handle \"ibm,nmi-register\"\nand \"ibm,nmi-interlock\" RTAS calls.\n\nThe machine check notification address is saved when the\nOS issues \"ibm,nmi-register\" RTAS call.\n\nThis patch also handles the case when multiple processors\nexperience machine check at or about the same time by\nhandling \"ibm,nmi-interlock\" call. In such cases, as per\nPAPR, subsequent processors serialize waiting for the first\nprocessor to issue the \"ibm,nmi-interlock\" call. The second\nprocessor waits till the first processor, which also\nreceived a machine check error, is done reading the error\nlog. The first processor issues \"ibm,nmi-interlock\" call\nwhen the error log is consumed. This patch implements the\nreleasing part of the error-log while subsequent patch\n(which builds error log) handles the locking part.\n\nSigned-off-by: Aravinda Prasad \n---\n hw/ppc/spapr.c | 8 ++++++++\n hw/ppc/spapr_rtas.c | 35 +++++++++++++++++++++++++++++++++++\n include/hw/ppc/spapr.h | 11 ++++++++++-\n 3 files changed, 53 insertions(+), 1 deletion(-)","diff":"diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c\nindex 5deae30..d568ea6 100644\n--- a/hw/ppc/spapr.c\n+++ b/hw/ppc/spapr.c\n@@ -1477,6 +1477,11 @@ static void ppc_spapr_reset(void)\n first_ppc_cpu->env.nip = SPAPR_ENTRY_POINT;\n \n spapr->cas_reboot = false;\n+\n+ spapr->mc_status = -1;\n+ spapr->guest_machine_check_addr = 0;\n+ qemu_cond_destroy(&spapr->mc_delivery_cond);\n+ qemu_cond_init(&spapr->mc_delivery_cond);\n }\n \n static void spapr_create_nvram(sPAPRMachineState *spapr)\n@@ -2598,6 +2603,9 @@ static void ppc_spapr_init(MachineState *machine)\n \n kvmppc_spapr_enable_inkernel_multitce();\n }\n+\n+ spapr->mc_status = -1;\n+ qemu_cond_init(&spapr->mc_delivery_cond);\n }\n \n static int spapr_kvm_type(const char *vm_type)\ndiff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c\nindex cdf0b60..08e9a5e 100644\n--- a/hw/ppc/spapr_rtas.c\n+++ b/hw/ppc/spapr_rtas.c\n@@ -348,6 +348,37 @@ static void rtas_get_power_level(PowerPCCPU *cpu, sPAPRMachineState *spapr,\n rtas_st(rets, 1, 100);\n }\n \n+static void rtas_ibm_nmi_register(PowerPCCPU *cpu,\n+ sPAPRMachineState *spapr,\n+ uint32_t token, uint32_t nargs,\n+ target_ulong args,\n+ uint32_t nret, target_ulong rets)\n+{\n+ spapr->guest_machine_check_addr = rtas_ld(args, 1);\n+ rtas_st(rets, 0, RTAS_OUT_SUCCESS);\n+}\n+\n+static void rtas_ibm_nmi_interlock(PowerPCCPU *cpu,\n+ sPAPRMachineState *spapr,\n+ uint32_t token, uint32_t nargs,\n+ target_ulong args,\n+ uint32_t nret, target_ulong rets)\n+{\n+ if (!spapr->guest_machine_check_addr) {\n+ /* NMI register not called */\n+ rtas_st(rets, 0, RTAS_OUT_PARAM_ERROR);\n+ } else {\n+ /*\n+ * VCPU issuing \"ibm,nmi-interlock\" is done with NMI handling,\n+ * hence unset mc_status.\n+ */\n+ spapr->mc_status = -1;\n+ qemu_cond_signal(&spapr->mc_delivery_cond);\n+ rtas_st(rets, 0, RTAS_OUT_SUCCESS);\n+ }\n+}\n+\n+\n static struct rtas_call {\n const char *name;\n spapr_rtas_fn fn;\n@@ -489,6 +520,10 @@ static void core_rtas_register_types(void)\n rtas_set_power_level);\n spapr_rtas_register(RTAS_GET_POWER_LEVEL, \"get-power-level\",\n rtas_get_power_level);\n+ spapr_rtas_register(RTAS_IBM_NMI_REGISTER, \"ibm,nmi-register\",\n+ rtas_ibm_nmi_register);\n+ spapr_rtas_register(RTAS_IBM_NMI_INTERLOCK, \"ibm,nmi-interlock\",\n+ rtas_ibm_nmi_interlock);\n }\n \n type_init(core_rtas_register_types)\ndiff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h\nindex b395aa7..28b6e2e 100644\n--- a/include/hw/ppc/spapr.h\n+++ b/include/hw/ppc/spapr.h\n@@ -124,6 +124,13 @@ struct sPAPRMachineState {\n * occurs during the unplug process. */\n QTAILQ_HEAD(, sPAPRDIMMState) pending_dimm_unplugs;\n \n+ /* State related to \"ibm,nmi-register\" and \"ibm,nmi-interlock\" calls */\n+ target_ulong guest_machine_check_addr;\n+ /* mc_status is set to -1 if mc is not in progress, else is set to the CPU\n+ * handling the mc. */\n+ int mc_status;\n+ QemuCond mc_delivery_cond;\n+\n /*< public >*/\n char *kvm_type;\n MemoryHotplugState hotplug_memory;\n@@ -520,8 +527,10 @@ target_ulong spapr_hypercall(PowerPCCPU *cpu, target_ulong opcode,\n #define RTAS_IBM_CREATE_PE_DMA_WINDOW (RTAS_TOKEN_BASE + 0x27)\n #define RTAS_IBM_REMOVE_PE_DMA_WINDOW (RTAS_TOKEN_BASE + 0x28)\n #define RTAS_IBM_RESET_PE_DMA_WINDOW (RTAS_TOKEN_BASE + 0x29)\n+#define RTAS_IBM_NMI_REGISTER (RTAS_TOKEN_BASE + 0x2A)\n+#define RTAS_IBM_NMI_INTERLOCK (RTAS_TOKEN_BASE + 0x2B)\n \n-#define RTAS_TOKEN_MAX (RTAS_TOKEN_BASE + 0x2A)\n+#define RTAS_TOKEN_MAX (RTAS_TOKEN_BASE + 0x2C)\n \n /* RTAS ibm,get-system-parameter token values */\n #define RTAS_SYSPARM_SPLPAR_CHARACTERISTICS 20\n","prefixes":["v5","2/6"]}