From nobody Fri Nov 7 13:05:14 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1547746078425575.1735510176815; Thu, 17 Jan 2019 09:27:58 -0800 (PST) Received: from localhost ([127.0.0.1]:48684 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gkBSP-0003gX-C4 for importer@patchew.org; Thu, 17 Jan 2019 12:27:57 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38122) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gkBHe-0003ZS-Kq for qemu-devel@nongnu.org; Thu, 17 Jan 2019 12:16:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gkBHc-0002GD-OR for qemu-devel@nongnu.org; Thu, 17 Jan 2019 12:16:50 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:43592) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gkBHc-0001nw-Aw for qemu-devel@nongnu.org; Thu, 17 Jan 2019 12:16:48 -0500 Received: from pps.filterd (m0098396.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id x0HHF5S9052863 for ; Thu, 17 Jan 2019 12:16:29 -0500 Received: from e06smtp07.uk.ibm.com (e06smtp07.uk.ibm.com [195.75.94.103]) by mx0a-001b2d01.pphosted.com with ESMTP id 2q2wxeg1va-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 17 Jan 2019 12:16:29 -0500 Received: from localhost by e06smtp07.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 17 Jan 2019 17:16:26 -0000 Received: from b06cxnps4076.portsmouth.uk.ibm.com (9.149.109.198) by e06smtp07.uk.ibm.com (192.168.101.137) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Thu, 17 Jan 2019 17:16:20 -0000 Received: from b06wcsmtp001.portsmouth.uk.ibm.com (b06wcsmtp001.portsmouth.uk.ibm.com [9.149.105.160]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x0HHGJhS54394910 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 17 Jan 2019 17:16:19 GMT Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id CF8E3A405F; Thu, 17 Jan 2019 17:16:19 +0000 (GMT) Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B4B17A405C; Thu, 17 Jan 2019 17:16:19 +0000 (GMT) Received: from smtp.lab.toulouse-stg.fr.ibm.com (unknown [9.101.4.1]) by b06wcsmtp001.portsmouth.uk.ibm.com (Postfix) with ESMTP; Thu, 17 Jan 2019 17:16:19 +0000 (GMT) Received: from bahia.lan (sig-9-145-42-56.uk.ibm.com [9.145.42.56]) by smtp.lab.toulouse-stg.fr.ibm.com (Postfix) with ESMTP id 85D77220129; Thu, 17 Jan 2019 18:16:18 +0100 (CET) From: Greg Kurz To: David Gibson Date: Thu, 17 Jan 2019 18:16:18 +0100 In-Reply-To: <154774526588.1208625.11295698301887807297.stgit@bahia.lan> References: <154774526588.1208625.11295698301887807297.stgit@bahia.lan> User-Agent: StGit/unknown-version MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 x-cbid: 19011717-0028-0000-0000-0000033A8CBB X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19011717-0029-0000-0000-000023F7B8E1 Message-Id: <154774537811.1208625.5130988447516010112.stgit@bahia.lan> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-01-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=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1901170123 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.156.1 Subject: [Qemu-devel] [PATCH v3 17/19] spapr_irq: Expose the phandle of the interrupt controller X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , Cornelia Huck , Gerd Hoffmann , Michael Roth , "Michael S. Tsirkin" , Alexey Kardashevskiy , David Hildenbrand , qemu-devel@nongnu.org, Greg Kurz , qemu-s390x@nongnu.org, Dmitry Fleytman , qemu-ppc@nongnu.org, =?utf-8?q?C=C3=A9dric?= Le Goater , Marcel Apfelbaum , Paolo Bonzini , Eduardo Habkost Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" This will be used by PHB hotplug in order to create the "interrupt-map" property of the PHB node. Signed-off-by: Greg Kurz --- hw/ppc/spapr_irq.c | 44 ++++++++++++++++++++++++++++++++++++++++= +++- include/hw/ppc/spapr_irq.h | 3 +++ 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c index b3e0713428ed..93243cfd0644 100644 --- a/hw/ppc/spapr_irq.c +++ b/hw/ppc/spapr_irq.c @@ -243,6 +243,11 @@ static void spapr_irq_reset_xics(sPAPRMachineState *sp= apr, Error **errp) /* TODO: create the KVM XICS device */ } =20 +static const char *spapr_irq_get_nodename_xics(sPAPRMachineState *spapr) +{ + return xics_spapr_get_nodename(); +} + #define SPAPR_IRQ_XICS_NR_IRQS 0x1000 #define SPAPR_IRQ_XICS_NR_MSIS \ (XICS_IRQ_BASE + SPAPR_IRQ_XICS_NR_IRQS - SPAPR_IRQ_MSI) @@ -263,6 +268,7 @@ sPAPRIrq spapr_irq_xics =3D { .post_load =3D spapr_irq_post_load_xics, .reset =3D spapr_irq_reset_xics, .set_irq =3D spapr_irq_set_irq_xics, + .get_nodename =3D spapr_irq_get_nodename_xics, }; =20 /* @@ -401,6 +407,11 @@ static void spapr_irq_set_irq_xive(void *opaque, int s= rcno, int val) xive_source_set_irq(&spapr->xive->source, srcno, val); } =20 +static const char *spapr_irq_get_nodename_xive(sPAPRMachineState *spapr) +{ + return spapr_xive_get_nodename(spapr->xive); +} + /* * XIVE uses the full IRQ number space. Set it to 8K to be compatible * with XICS. @@ -425,6 +436,7 @@ sPAPRIrq spapr_irq_xive =3D { .post_load =3D spapr_irq_post_load_xive, .reset =3D spapr_irq_reset_xive, .set_irq =3D spapr_irq_set_irq_xive, + .get_nodename =3D spapr_irq_get_nodename_xive, }; =20 /* @@ -588,6 +600,11 @@ static void spapr_irq_set_irq_dual(void *opaque, int s= rcno, int val) spapr_irq_current(spapr)->set_irq(spapr, srcno, val); } =20 +static const char *spapr_irq_get_nodename_dual(sPAPRMachineState *spapr) +{ + return spapr_irq_current(spapr)->get_nodename(spapr); +} + /* * Define values in sync with the XIVE and XICS backend */ @@ -609,7 +626,8 @@ sPAPRIrq spapr_irq_dual =3D { .cpu_intc_create =3D spapr_irq_cpu_intc_create_dual, .post_load =3D spapr_irq_post_load_dual, .reset =3D spapr_irq_reset_dual, - .set_irq =3D spapr_irq_set_irq_dual + .set_irq =3D spapr_irq_set_irq_dual, + .get_nodename =3D spapr_irq_get_nodename_dual, }; =20 /* @@ -680,6 +698,29 @@ void spapr_irq_dt_populate(sPAPRMachineState *spapr, u= int32_t nr_servers, _FDT(fdt_setprop_cell(fdt, node, "phandle", phandle)); } =20 +uint32_t spapr_irq_get_phandle(sPAPRMachineState *spapr, void *fdt, + Error **errp) +{ + const char *nodename =3D spapr->irq->get_nodename(spapr); + int phandle, offset; + + offset =3D fdt_subnode_offset(fdt, 0, nodename); + if (offset < 0) { + error_setg(errp, "Can't find node \"%s\": %s", nodename, + fdt_strerror(offset)); + return -1; + } + + phandle =3D fdt_get_phandle(fdt, offset); + if (phandle < 0) { + error_setg(errp, "Can't get phandle of node \"%s\": %s", + nodename, fdt_strerror(phandle)); + return -1; + } + + return phandle; +} + /* * XICS legacy routines - to deprecate one day */ @@ -752,4 +793,5 @@ sPAPRIrq spapr_irq_xics_legacy =3D { .cpu_intc_create =3D spapr_irq_cpu_intc_create_xics, .post_load =3D spapr_irq_post_load_xics, .set_irq =3D spapr_irq_set_irq_xics, + .get_nodename =3D spapr_irq_get_nodename_xics, }; diff --git a/include/hw/ppc/spapr_irq.h b/include/hw/ppc/spapr_irq.h index dfed6b7e9976..d44d659231a6 100644 --- a/include/hw/ppc/spapr_irq.h +++ b/include/hw/ppc/spapr_irq.h @@ -48,6 +48,7 @@ typedef struct sPAPRIrq { int (*post_load)(sPAPRMachineState *spapr, int version_id); void (*reset)(sPAPRMachineState *spapr, Error **errp); void (*set_irq)(void *opaque, int srcno, int val); + const char *(*get_nodename)(sPAPRMachineState *spapr); } sPAPRIrq; =20 extern sPAPRIrq spapr_irq_xics; @@ -65,6 +66,8 @@ int spapr_irq_post_load(sPAPRMachineState *spapr, int ver= sion_id); void spapr_irq_reset(sPAPRMachineState *spapr, Error **errp); void spapr_irq_dt_populate(sPAPRMachineState *spapr, uint32_t nr_servers, void *fdt, uint32_t phandle); +uint32_t spapr_irq_get_phandle(sPAPRMachineState *spapr, void *fdt, + Error **errp); =20 /* * XICS legacy routines