Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0D5DDFA372A for ; Thu, 17 Oct 2019 15:38:59 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C55B72089C for ; Thu, 17 Oct 2019 15:38:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C55B72089C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kaod.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:51216 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iL7rd-0005c3-6u for qemu-devel@archiver.kernel.org; Thu, 17 Oct 2019 11:38:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49901) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iL6zZ-0004dy-LV for qemu-devel@nongnu.org; Thu, 17 Oct 2019 10:43:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iL6zY-0006Hq-2D for qemu-devel@nongnu.org; Thu, 17 Oct 2019 10:43:05 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:58914) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iL6zX-0006HK-RI for qemu-devel@nongnu.org; Thu, 17 Oct 2019 10:43:04 -0400 Received: from pps.filterd (m0098409.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x9HEgvUk067382 for ; Thu, 17 Oct 2019 10:43:01 -0400 Received: from e06smtp04.uk.ibm.com (e06smtp04.uk.ibm.com [195.75.94.100]) by mx0a-001b2d01.pphosted.com with ESMTP id 2vps54ub6j-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 17 Oct 2019 10:43:01 -0400 Received: from localhost by e06smtp04.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 17 Oct 2019 15:42:46 +0100 Received: from b06cxnps4074.portsmouth.uk.ibm.com (9.149.109.196) by e06smtp04.uk.ibm.com (192.168.101.134) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Thu, 17 Oct 2019 15:42:44 +0100 Received: from d06av26.portsmouth.uk.ibm.com (d06av26.portsmouth.uk.ibm.com [9.149.105.62]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x9HEgh6D54526138 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 17 Oct 2019 14:42:43 GMT Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5F458AE057; Thu, 17 Oct 2019 14:42:43 +0000 (GMT) Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 40B4EAE056; Thu, 17 Oct 2019 14:42:43 +0000 (GMT) Received: from smtp.tls.ibm.com (unknown [9.101.4.1]) by d06av26.portsmouth.uk.ibm.com (Postfix) with ESMTP; Thu, 17 Oct 2019 14:42:43 +0000 (GMT) Received: from yukon.tls.ibm.com (yukon.tls.ibm.com [9.101.4.25]) by smtp.tls.ibm.com (Postfix) with ESMTP id 05C1D22010B; Thu, 17 Oct 2019 16:42:43 +0200 (CEST) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: David Gibson Subject: [PATCH 1/2] spapr: Introduce a interrupt presenter reset handler Date: Thu, 17 Oct 2019 16:42:40 +0200 X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191017144241.12522-1-clg@kaod.org> References: <20191017144241.12522-1-clg@kaod.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-TM-AS-GCONF: 00 x-cbid: 19101714-0016-0000-0000-000002B8F9CE X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19101714-0017-0000-0000-0000331A233B Message-Id: <20191017144241.12522-2-clg@kaod.org> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-10-17_05:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=2 phishscore=0 bulkscore=0 spamscore=0 clxscore=1034 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=978 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1908290000 definitions=main-1910170133 Content-Transfer-Encoding: quoted-printable X-MIME-Autoconverted: from 8bit to quoted-printable by mx0a-001b2d01.pphosted.com id x9HEgvUk067382 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.156.1 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , qemu-ppc@nongnu.org, qemu-devel@nongnu.org, Greg Kurz Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" The interrupt presenters are not reseted today. Extend the sPAPR IRQ backend with a new cpu_intc_reset() handler which will be called by the CPU reset handler. spapr_realize_vcpu() is modified to call the CPU reset only after the the intc presenter has been created. Signed-off-by: C=C3=A9dric Le Goater --- include/hw/ppc/spapr_irq.h | 4 ++++ include/hw/ppc/xics.h | 1 + include/hw/ppc/xive.h | 1 + hw/intc/spapr_xive.c | 8 ++++++++ hw/intc/xics.c | 5 +++++ hw/intc/xics_spapr.c | 8 ++++++++ hw/intc/xive.c | 11 ++++++++--- hw/ppc/spapr_cpu_core.c | 8 ++++++-- hw/ppc/spapr_irq.c | 21 +++++++++++++++++++++ 9 files changed, 62 insertions(+), 5 deletions(-) diff --git a/include/hw/ppc/spapr_irq.h b/include/hw/ppc/spapr_irq.h index 5e150a667902..78327496c102 100644 --- a/include/hw/ppc/spapr_irq.h +++ b/include/hw/ppc/spapr_irq.h @@ -52,6 +52,8 @@ typedef struct SpaprInterruptControllerClass { */ int (*cpu_intc_create)(SpaprInterruptController *intc, PowerPCCPU *cpu, Error **errp); + int (*cpu_intc_reset)(SpaprInterruptController *intc, PowerPCCPU *cp= u, + Error **errp); int (*claim_irq)(SpaprInterruptController *intc, int irq, bool lsi, Error **errp); void (*free_irq)(SpaprInterruptController *intc, int irq); @@ -68,6 +70,8 @@ void spapr_irq_update_active_intc(SpaprMachineState *sp= apr); =20 int spapr_irq_cpu_intc_create(SpaprMachineState *spapr, PowerPCCPU *cpu, Error **errp); +int spapr_irq_cpu_intc_reset(SpaprMachineState *spapr, + PowerPCCPU *cpu, Error **errp); void spapr_irq_print_info(SpaprMachineState *spapr, Monitor *mon); void spapr_irq_dt(SpaprMachineState *spapr, uint32_t nr_servers, void *fdt, uint32_t phandle); diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h index 1e6a9300eb2b..602173c12250 100644 --- a/include/hw/ppc/xics.h +++ b/include/hw/ppc/xics.h @@ -161,6 +161,7 @@ void icp_set_mfrr(ICPState *icp, uint8_t mfrr); uint32_t icp_accept(ICPState *ss); uint32_t icp_ipoll(ICPState *ss, uint32_t *mfrr); void icp_eoi(ICPState *icp, uint32_t xirr); +void icp_reset(ICPState *icp); =20 void ics_write_xive(ICSState *ics, int nr, int server, uint8_t priority, uint8_t saved_priority); diff --git a/include/hw/ppc/xive.h b/include/hw/ppc/xive.h index fd3319bd3202..99381639f50c 100644 --- a/include/hw/ppc/xive.h +++ b/include/hw/ppc/xive.h @@ -415,6 +415,7 @@ uint64_t xive_tctx_tm_read(XiveTCTX *tctx, hwaddr off= set, unsigned size); =20 void xive_tctx_pic_print_info(XiveTCTX *tctx, Monitor *mon); Object *xive_tctx_create(Object *cpu, XiveRouter *xrtr, Error **errp); +void xive_tctx_reset(XiveTCTX *tctx); =20 static inline uint32_t xive_nvt_cam_line(uint8_t nvt_blk, uint32_t nvt_i= dx) { diff --git a/hw/intc/spapr_xive.c b/hw/intc/spapr_xive.c index ba32d2cc5b0f..0c3acf1a4192 100644 --- a/hw/intc/spapr_xive.c +++ b/hw/intc/spapr_xive.c @@ -553,6 +553,13 @@ static int spapr_xive_cpu_intc_create(SpaprInterrupt= Controller *intc, return 0; } =20 +static int spapr_xive_cpu_intc_reset(SpaprInterruptController *intc, + PowerPCCPU *cpu, Error **errp) +{ + xive_tctx_reset(spapr_cpu_state(cpu)->tctx); + return 0; +} + static void spapr_xive_set_irq(SpaprInterruptController *intc, int irq, = int val) { SpaprXive *xive =3D SPAPR_XIVE(intc); @@ -697,6 +704,7 @@ static void spapr_xive_class_init(ObjectClass *klass,= void *data) sicc->activate =3D spapr_xive_activate; sicc->deactivate =3D spapr_xive_deactivate; sicc->cpu_intc_create =3D spapr_xive_cpu_intc_create; + sicc->cpu_intc_reset =3D spapr_xive_cpu_intc_reset; sicc->claim_irq =3D spapr_xive_claim_irq; sicc->free_irq =3D spapr_xive_free_irq; sicc->set_irq =3D spapr_xive_set_irq; diff --git a/hw/intc/xics.c b/hw/intc/xics.c index b5ac408f7b74..652771d6a5a5 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -295,6 +295,11 @@ static void icp_reset_handler(void *dev) } } =20 +void icp_reset(ICPState *icp) +{ + icp_reset_handler(icp); +} + static void icp_realize(DeviceState *dev, Error **errp) { ICPState *icp =3D ICP(dev); diff --git a/hw/intc/xics_spapr.c b/hw/intc/xics_spapr.c index 4f64b9a9fc66..c0b2a576effe 100644 --- a/hw/intc/xics_spapr.c +++ b/hw/intc/xics_spapr.c @@ -346,6 +346,13 @@ static int xics_spapr_cpu_intc_create(SpaprInterrupt= Controller *intc, return 0; } =20 +static int xics_spapr_cpu_intc_reset(SpaprInterruptController *intc, + PowerPCCPU *cpu, Error **errp) +{ + icp_reset(spapr_cpu_state(cpu)->icp); + return 0; +} + static int xics_spapr_claim_irq(SpaprInterruptController *intc, int irq, bool lsi, Error **errp) { @@ -433,6 +440,7 @@ static void ics_spapr_class_init(ObjectClass *klass, = void *data) sicc->activate =3D xics_spapr_activate; sicc->deactivate =3D xics_spapr_deactivate; sicc->cpu_intc_create =3D xics_spapr_cpu_intc_create; + sicc->cpu_intc_reset =3D xics_spapr_cpu_intc_reset; sicc->claim_irq =3D xics_spapr_claim_irq; sicc->free_irq =3D xics_spapr_free_irq; sicc->set_irq =3D xics_spapr_set_irq; diff --git a/hw/intc/xive.c b/hw/intc/xive.c index d420c6571e14..0ae3f9b1efe4 100644 --- a/hw/intc/xive.c +++ b/hw/intc/xive.c @@ -547,7 +547,7 @@ void xive_tctx_pic_print_info(XiveTCTX *tctx, Monitor= *mon) } } =20 -static void xive_tctx_reset(void *dev) +static void xive_tctx_reset_handler(void *dev) { XiveTCTX *tctx =3D XIVE_TCTX(dev); =20 @@ -568,6 +568,11 @@ static void xive_tctx_reset(void *dev) ipb_to_pipr(tctx->regs[TM_QW3_HV_PHYS + TM_IPB]); } =20 +void xive_tctx_reset(XiveTCTX *tctx) +{ + xive_tctx_reset_handler(tctx); +} + static void xive_tctx_realize(DeviceState *dev, Error **errp) { XiveTCTX *tctx =3D XIVE_TCTX(dev); @@ -608,12 +613,12 @@ static void xive_tctx_realize(DeviceState *dev, Err= or **errp) } } =20 - qemu_register_reset(xive_tctx_reset, dev); + qemu_register_reset(xive_tctx_reset_handler, dev); } =20 static void xive_tctx_unrealize(DeviceState *dev, Error **errp) { - qemu_unregister_reset(xive_tctx_reset, dev); + qemu_unregister_reset(xive_tctx_reset_handler, dev); } =20 static int vmstate_xive_tctx_pre_save(void *opaque) diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c index 3e4302c7d596..416aa75e5fba 100644 --- a/hw/ppc/spapr_cpu_core.c +++ b/hw/ppc/spapr_cpu_core.c @@ -33,6 +33,7 @@ static void spapr_cpu_reset(void *opaque) PowerPCCPUClass *pcc =3D POWERPC_CPU_GET_CLASS(cpu); SpaprCpuState *spapr_cpu =3D spapr_cpu_state(cpu); target_ulong lpcr; + SpaprMachineState *spapr =3D SPAPR_MACHINE(qdev_get_machine()); =20 cpu_reset(cs); =20 @@ -77,9 +78,11 @@ static void spapr_cpu_reset(void *opaque) spapr_cpu->dtl_addr =3D 0; spapr_cpu->dtl_size =3D 0; =20 - spapr_caps_cpu_apply(SPAPR_MACHINE(qdev_get_machine()), cpu); + spapr_caps_cpu_apply(spapr, cpu); =20 kvm_check_mmu(cpu, &error_fatal); + + spapr_irq_cpu_intc_reset(spapr, cpu, &error_fatal); } =20 void spapr_cpu_set_entry_state(PowerPCCPU *cpu, target_ulong nip, target= _ulong r3) @@ -235,12 +238,13 @@ static void spapr_realize_vcpu(PowerPCCPU *cpu, Spa= prMachineState *spapr, kvmppc_set_papr(cpu); =20 qemu_register_reset(spapr_cpu_reset, cpu); - spapr_cpu_reset(cpu); =20 if (spapr_irq_cpu_intc_create(spapr, cpu, &local_err) < 0) { goto error_unregister; } =20 + spapr_cpu_reset(cpu); + if (!sc->pre_3_0_migration) { vmstate_register(NULL, cs->cpu_index, &vmstate_spapr_cpu_state, cpu->machine_data); diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c index bb91c61fa000..5d2b64029cd5 100644 --- a/hw/ppc/spapr_irq.c +++ b/hw/ppc/spapr_irq.c @@ -220,6 +220,27 @@ int spapr_irq_cpu_intc_create(SpaprMachineState *spa= pr, return 0; } =20 +int spapr_irq_cpu_intc_reset(SpaprMachineState *spapr, + PowerPCCPU *cpu, Error **errp) +{ + SpaprInterruptController *intcs[] =3D ALL_INTCS(spapr); + int i; + int rc; + + for (i =3D 0; i < ARRAY_SIZE(intcs); i++) { + SpaprInterruptController *intc =3D intcs[i]; + if (intc) { + SpaprInterruptControllerClass *sicc =3D SPAPR_INTC_GET_CLASS= (intc); + rc =3D sicc->cpu_intc_reset(intc, cpu, errp); + if (rc < 0) { + return rc; + } + } + } + + return 0; +} + static void spapr_set_irq(void *opaque, int irq, int level) { SpaprMachineState *spapr =3D SPAPR_MACHINE(opaque); --=20 2.21.0