From nobody Thu Mar 28 11:24:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1605894721; cv=none; d=zohomail.com; s=zohoarc; b=UkPjssc+MpH5ref2mJMdTBNeJJvBv3NgMYcBTCalrmGDkRgHOgJcGnEgyh6izMITKamNCkxH+rWmCgeIqiK6E+ZAPkTFxtfQOJ2WPQBYb3zBt1N0rPhfR1bMRHkpYEeLnUihO/rK8UhB8uNDV79lNSNMBODzwp8tiEL+hRgjMPY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605894721; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=GX4vT/gqtCUV+r686OSwJFMoWsGOjJCPa5OTpobImt4=; b=kPVsaKN8tZWQ32wc7dxe0SSzNX081AQcpgTUBCqJMZ8rCq8tUDo9GPLxEVSnfp5ddlp7ADq77CXvbvm0lMAxQzcNhBgaokQpxfxOs0TGuoPcob775HsZaUVZjLX5+cM+kN6zpa+LJV/CXyVGZDLw9C1Fp3QzmhGBPX2B00gQCBM= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.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 1605894721346187.49473831177886; Fri, 20 Nov 2020 09:52:01 -0800 (PST) Received: from localhost ([::1]:47494 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kgAZk-0005k2-8k for importer@patchew.org; Fri, 20 Nov 2020 12:52:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55266) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kgAV5-0008UQ-Bk for qemu-devel@nongnu.org; Fri, 20 Nov 2020 12:47:14 -0500 Received: from us-smtp-delivery-44.mimecast.com ([205.139.111.44]:57426) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kgAV2-00057T-IT for qemu-devel@nongnu.org; Fri, 20 Nov 2020 12:47:11 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-96-V5AcIn0DNTi4B4PYRgb2-A-1; Fri, 20 Nov 2020 12:46:51 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5095B80ED8A; Fri, 20 Nov 2020 17:46:50 +0000 (UTC) Received: from bahia.redhat.com (ovpn-112-44.ams2.redhat.com [10.36.112.44]) by smtp.corp.redhat.com (Postfix) with ESMTP id C44735C1D5; Fri, 20 Nov 2020 17:46:48 +0000 (UTC) X-MC-Unique: V5AcIn0DNTi4B4PYRgb2-A-1 From: Greg Kurz To: qemu-devel@nongnu.org Subject: [PATCH for-6.0 1/8] spapr/xive: Turn some sanity checks into assertions Date: Fri, 20 Nov 2020 18:46:39 +0100 Message-Id: <20201120174646.619395-2-groug@kaod.org> In-Reply-To: <20201120174646.619395-1-groug@kaod.org> References: <20201120174646.619395-1-groug@kaod.org> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=groug@kaod.org X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: kaod.org Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: softfail client-ip=205.139.111.44; envelope-from=groug@kaod.org; helo=us-smtp-delivery-44.mimecast.com X-Spam_score_int: -11 X-Spam_score: -1.2 X-Spam_bar: - X-Spam_report: (-1.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_SOFTFAIL=0.665 autolearn=no autolearn_force=no X-Spam_action: no action 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: Greg Kurz , qemu-ppc@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The sPAPR XIVE device is created by the machine in spapr_irq_init(). The latter overrides any value provided by the user with -global for the "nr-irqs" and "nr-ends" properties with strictly positive values. It seems reasonable to assume these properties should never be 0, which wouldn't make much sense by the way. Signed-off-by: Greg Kurz Reviewed-by: C=C3=A9dric Le Goater --- hw/intc/spapr_xive.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/hw/intc/spapr_xive.c b/hw/intc/spapr_xive.c index 1fa09f287ac0..60e0d5769dcc 100644 --- a/hw/intc/spapr_xive.c +++ b/hw/intc/spapr_xive.c @@ -296,22 +296,16 @@ static void spapr_xive_realize(DeviceState *dev, Erro= r **errp) XiveENDSource *end_xsrc =3D &xive->end_source; Error *local_err =3D NULL; =20 + /* Set by spapr_irq_init() */ + g_assert(xive->nr_irqs); + g_assert(xive->nr_ends); + sxc->parent_realize(dev, &local_err); if (local_err) { error_propagate(errp, local_err); return; } =20 - if (!xive->nr_irqs) { - error_setg(errp, "Number of interrupt needs to be greater 0"); - return; - } - - if (!xive->nr_ends) { - error_setg(errp, "Number of interrupt needs to be greater 0"); - return; - } - /* * Initialize the internal sources, for IPIs and virtual devices. */ --=20 2.26.2 From nobody Thu Mar 28 11:24:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1605894877; cv=none; d=zohomail.com; s=zohoarc; b=Eyb0/X0j+P244XqN1/hq6lzC7Yzq7zV2qsw0CX1PEMzBvnHXamNkqdizP1s8AWeFvwlojUBqVY71jd4RBRW/5NfVtocV+ERrs8X6eWY0zfvh9+BMz+EsQoiD/WlF+aPR2LfYqP71IhjBDjelw6iCvKl4XRTH9cHldwBuaJNLgxs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605894877; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=QwsK0QAxjuqRHvy92YQbwKqaOoj98+2JbUzXhobqxwA=; b=EGuxZYiq5xmx/WYgbkISKswAHba27TK3fqkDPTlZEmHQLYFNL4uSLkO8of5qkbxUYW0HVFDe+gPIUkantkdMzu02r5kN815Q+I4SWStWMfe6cSdyIn4oVqgrC2Frl9jn2jKwpRCLOYFTq9uVaZ0HreNtIozPELgk2lssPPq0cuc= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.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 1605894877961453.96245894038077; Fri, 20 Nov 2020 09:54:37 -0800 (PST) Received: from localhost ([::1]:55610 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kgAcG-0000jg-V1 for importer@patchew.org; Fri, 20 Nov 2020 12:54:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55238) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kgAV4-0008UJ-KZ for qemu-devel@nongnu.org; Fri, 20 Nov 2020 12:47:14 -0500 Received: from us-smtp-delivery-44.mimecast.com ([207.211.30.44]:58220) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kgAV2-00057J-I2 for qemu-devel@nongnu.org; Fri, 20 Nov 2020 12:47:09 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-381-DYWRbe43PmCKn5it_ST3jg-1; Fri, 20 Nov 2020 12:46:53 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C4A76107AD29; Fri, 20 Nov 2020 17:46:51 +0000 (UTC) Received: from bahia.redhat.com (ovpn-112-44.ams2.redhat.com [10.36.112.44]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9C24B5C1D5; Fri, 20 Nov 2020 17:46:50 +0000 (UTC) X-MC-Unique: DYWRbe43PmCKn5it_ST3jg-1 From: Greg Kurz To: qemu-devel@nongnu.org Subject: [PATCH for-6.0 2/8] spapr/xive: Introduce spapr_xive_nr_ends() Date: Fri, 20 Nov 2020 18:46:40 +0100 Message-Id: <20201120174646.619395-3-groug@kaod.org> In-Reply-To: <20201120174646.619395-1-groug@kaod.org> References: <20201120174646.619395-1-groug@kaod.org> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=groug@kaod.org X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: kaod.org Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: softfail client-ip=207.211.30.44; envelope-from=groug@kaod.org; helo=us-smtp-delivery-44.mimecast.com X-Spam_score_int: -11 X-Spam_score: -1.2 X-Spam_bar: - X-Spam_report: (-1.2 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_SOFTFAIL=0.665 autolearn=no autolearn_force=no X-Spam_action: no action 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: Greg Kurz , qemu-ppc@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" We're going to kill the "nr_ends" field in a subsequent patch. Prepare ground by using an helper instead of peeking into the sPAPR XIVE structure directly. Signed-off-by: Greg Kurz --- include/hw/ppc/spapr_xive.h | 1 + hw/intc/spapr_xive.c | 23 ++++++++++++++--------- hw/intc/spapr_xive_kvm.c | 4 ++-- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/include/hw/ppc/spapr_xive.h b/include/hw/ppc/spapr_xive.h index 26c8d90d7196..4b967f13c030 100644 --- a/include/hw/ppc/spapr_xive.h +++ b/include/hw/ppc/spapr_xive.h @@ -75,6 +75,7 @@ void spapr_xive_map_mmio(SpaprXive *xive); =20 int spapr_xive_end_to_target(uint8_t end_blk, uint32_t end_idx, uint32_t *out_server, uint8_t *out_prio); +uint32_t spapr_xive_nr_ends(const SpaprXive *xive); =20 /* * KVM XIVE device helpers diff --git a/hw/intc/spapr_xive.c b/hw/intc/spapr_xive.c index 60e0d5769dcc..f473ad9cba47 100644 --- a/hw/intc/spapr_xive.c +++ b/hw/intc/spapr_xive.c @@ -192,7 +192,7 @@ void spapr_xive_pic_print_info(SpaprXive *xive, Monitor= *mon) uint32_t end_idx =3D xive_get_field64(EAS_END_INDEX, eas->w); XiveEND *end; =20 - assert(end_idx < xive->nr_ends); + assert(end_idx < spapr_xive_nr_ends(xive)); end =3D &xive->endt[end_idx]; =20 if (xive_end_is_valid(end)) { @@ -270,7 +270,7 @@ static void spapr_xive_reset(void *dev) } =20 /* Clear all ENDs */ - for (i =3D 0; i < xive->nr_ends; i++) { + for (i =3D 0; i < spapr_xive_nr_ends(xive); i++) { spapr_xive_end_reset(&xive->endt[i]); } } @@ -288,6 +288,11 @@ static void spapr_xive_instance_init(Object *obj) xive->fd =3D -1; } =20 +uint32_t spapr_xive_nr_ends(const SpaprXive *xive) +{ + return xive->nr_ends; +} + static void spapr_xive_realize(DeviceState *dev, Error **errp) { SpaprXive *xive =3D SPAPR_XIVE(dev); @@ -336,7 +341,7 @@ static void spapr_xive_realize(DeviceState *dev, Error = **errp) * Allocate the routing tables */ xive->eat =3D g_new0(XiveEAS, xive->nr_irqs); - xive->endt =3D g_new0(XiveEND, xive->nr_ends); + xive->endt =3D g_new0(XiveEND, spapr_xive_nr_ends(xive)); =20 xive->nodename =3D g_strdup_printf("interrupt-controller@%" PRIx64, xive->tm_base + XIVE_TM_USER_PAGE * (1 << TM_SH= IFT)); @@ -375,7 +380,7 @@ static int spapr_xive_get_end(XiveRouter *xrtr, { SpaprXive *xive =3D SPAPR_XIVE(xrtr); =20 - if (end_idx >=3D xive->nr_ends) { + if (end_idx >=3D spapr_xive_nr_ends(xive)) { return -1; } =20 @@ -389,7 +394,7 @@ static int spapr_xive_write_end(XiveRouter *xrtr, uint8= _t end_blk, { SpaprXive *xive =3D SPAPR_XIVE(xrtr); =20 - if (end_idx >=3D xive->nr_ends) { + if (end_idx >=3D spapr_xive_nr_ends(xive)) { return -1; } =20 @@ -1138,7 +1143,7 @@ static target_ulong h_int_get_source_config(PowerPCCP= U *cpu, /* EAS_END_BLOCK is unused on sPAPR */ end_idx =3D xive_get_field64(EAS_END_INDEX, eas.w); =20 - assert(end_idx < xive->nr_ends); + assert(end_idx < spapr_xive_nr_ends(xive)); end =3D &xive->endt[end_idx]; =20 nvt_blk =3D xive_get_field32(END_W6_NVT_BLOCK, end->w6); @@ -1216,7 +1221,7 @@ static target_ulong h_int_get_queue_info(PowerPCCPU *= cpu, return H_P2; } =20 - assert(end_idx < xive->nr_ends); + assert(end_idx < spapr_xive_nr_ends(xive)); end =3D &xive->endt[end_idx]; =20 args[0] =3D xive->end_base + (1ull << (end_xsrc->esb_shift + 1)) * end= _idx; @@ -1304,7 +1309,7 @@ static target_ulong h_int_set_queue_config(PowerPCCPU= *cpu, return H_P2; } =20 - assert(end_idx < xive->nr_ends); + assert(end_idx < spapr_xive_nr_ends(xive)); memcpy(&end, &xive->endt[end_idx], sizeof(XiveEND)); =20 switch (qsize) { @@ -1470,7 +1475,7 @@ static target_ulong h_int_get_queue_config(PowerPCCPU= *cpu, return H_P2; } =20 - assert(end_idx < xive->nr_ends); + assert(end_idx < spapr_xive_nr_ends(xive)); end =3D &xive->endt[end_idx]; =20 args[0] =3D 0; diff --git a/hw/intc/spapr_xive_kvm.c b/hw/intc/spapr_xive_kvm.c index 66bf4c06fe55..1566016f0e28 100644 --- a/hw/intc/spapr_xive_kvm.c +++ b/hw/intc/spapr_xive_kvm.c @@ -531,7 +531,7 @@ static int kvmppc_xive_get_queues(SpaprXive *xive, Erro= r **errp) int i; int ret; =20 - for (i =3D 0; i < xive->nr_ends; i++) { + for (i =3D 0; i < spapr_xive_nr_ends(xive); i++) { if (!xive_end_is_valid(&xive->endt[i])) { continue; } @@ -701,7 +701,7 @@ int kvmppc_xive_post_load(SpaprXive *xive, int version_= id) assert(xive->fd !=3D -1); =20 /* Restore the ENDT first. The targetting depends on it. */ - for (i =3D 0; i < xive->nr_ends; i++) { + for (i =3D 0; i < spapr_xive_nr_ends(xive); i++) { if (!xive_end_is_valid(&xive->endt[i])) { continue; } --=20 2.26.2 From nobody Thu Mar 28 11:24:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1605894604; cv=none; d=zohomail.com; s=zohoarc; b=eXzruU8aGfddUVroUNvvIuALug5pOpbNN7LoCxIbj/TMXhTI2f3SSQfm7ZKQihAkXdfWm1OFqVQCEbi0SaSTYA+KloWeeO4rLWihEoTvdssLf4eeIkTApsTEPkabbpb2fCN71xSz0h8lFpm8GI+IdjZLWK6f5SQpb9nixHgmWr0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605894604; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UHmTiVucAbxmAm7AoWrZPeZbutqhBxXLuE3vKcmf8tM=; b=kizrx74ePkmujqdNzzwANR8MfFihrgMpSRwLtEhtwhcO5E17CVuMiP+RHCvtPNt4Fnk456NfhPbzrM4XjJOCBRFop33CBPCBMkc7b9w1Me3bUHn+9Fx8UGrIOcWLLkY6ggcMgGgSGoxd7H+xvr4oMvxFTGyIjaTP5f5d0fMUBzM= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.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 1605894604330458.3267532014801; Fri, 20 Nov 2020 09:50:04 -0800 (PST) Received: from localhost ([::1]:41870 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kgAXr-0003Gm-65 for importer@patchew.org; Fri, 20 Nov 2020 12:50:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55240) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kgAV4-0008UK-Ks for qemu-devel@nongnu.org; Fri, 20 Nov 2020 12:47:14 -0500 Received: from us-smtp-delivery-44.mimecast.com ([207.211.30.44]:31230) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kgAUw-00058h-Ur for qemu-devel@nongnu.org; Fri, 20 Nov 2020 12:47:10 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-467-Wx5zvgiBNhq2AqZzyYiYSw-1; Fri, 20 Nov 2020 12:46:54 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4634D80ED8A; Fri, 20 Nov 2020 17:46:53 +0000 (UTC) Received: from bahia.redhat.com (ovpn-112-44.ams2.redhat.com [10.36.112.44]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1DA3B5C1D5; Fri, 20 Nov 2020 17:46:51 +0000 (UTC) X-MC-Unique: Wx5zvgiBNhq2AqZzyYiYSw-1 From: Greg Kurz To: qemu-devel@nongnu.org Subject: [PATCH for-6.0 3/8] spapr/xive: Add "nr-servers" property Date: Fri, 20 Nov 2020 18:46:41 +0100 Message-Id: <20201120174646.619395-4-groug@kaod.org> In-Reply-To: <20201120174646.619395-1-groug@kaod.org> References: <20201120174646.619395-1-groug@kaod.org> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: kaod.org Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: softfail client-ip=207.211.30.44; envelope-from=groug@kaod.org; helo=us-smtp-delivery-44.mimecast.com X-Spam_score_int: -11 X-Spam_score: -1.2 X-Spam_bar: - X-Spam_report: (-1.2 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_SOFTFAIL=0.665 autolearn=no autolearn_force=no X-Spam_action: no action 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: Greg Kurz , qemu-ppc@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The sPAPR XIVE object has an "nr-ends" property that is used to size the END table. This property is set by the machine code to a value derived from spapr_max_server_number(). spapr_max_server_number() is also used to inform the KVM XIVE device about the range of vCPU ids it might be exposed to, in order to optimize resource allocation in the HW. This is enough motivation to introduce an "nr-servers" property and to use it for both purposes. The existing "nr-ends" property is now longer used. It is kept around though because it is exposed to -global. It will continue to be ignored as before without causing QEMU to exit. The associated nr_ends field cannot be dropped from SpaprXive because it is explicitly used by vmstate_spapr_xive(). It is thus renamed to nr_ends_vmstate. Signed-off-by: Greg Kurz --- include/hw/ppc/spapr_xive.h | 16 +++++++++++++++- hw/intc/spapr_xive.c | 28 ++++++++++++++++++++++------ hw/ppc/spapr_irq.c | 6 +----- 3 files changed, 38 insertions(+), 12 deletions(-) diff --git a/include/hw/ppc/spapr_xive.h b/include/hw/ppc/spapr_xive.h index 4b967f13c030..7123ea07ed78 100644 --- a/include/hw/ppc/spapr_xive.h +++ b/include/hw/ppc/spapr_xive.h @@ -23,6 +23,16 @@ typedef struct SpaprXive { XiveRouter parent; =20 + /* + * The XIVE device needs to know the highest vCPU id it might + * be exposed to in order to size the END table. It may also + * propagate the value to the KVM XIVE device in order to + * optimize resource allocation in the HW. + * This must be set to a non-null value using the "nr-servers" + * property, before realizing the device. + */ + uint32_t nr_servers; + /* Internal interrupt source for IPIs and virtual devices */ XiveSource source; hwaddr vc_base; @@ -38,7 +48,11 @@ typedef struct SpaprXive { XiveEAS *eat; uint32_t nr_irqs; XiveEND *endt; - uint32_t nr_ends; + /* + * This is derived from nr_servers but it must be kept around because + * vmstate_spapr_xive uses it. + */ + uint32_t nr_ends_vmstate; =20 /* TIMA mapping address */ hwaddr tm_base; diff --git a/hw/intc/spapr_xive.c b/hw/intc/spapr_xive.c index f473ad9cba47..e4dbf9c2c409 100644 --- a/hw/intc/spapr_xive.c +++ b/hw/intc/spapr_xive.c @@ -99,6 +99,12 @@ int spapr_xive_end_to_target(uint8_t end_blk, uint32_t e= nd_idx, return 0; } =20 +/* + * 8 XIVE END structures per CPU. One for each available + * priority + */ +#define spapr_xive_cpu_end_idx(vcpu, prio) (((vcpu) << 3) + prio) + static void spapr_xive_cpu_to_end(PowerPCCPU *cpu, uint8_t prio, uint8_t *out_end_blk, uint32_t *out_end_= idx) { @@ -109,7 +115,7 @@ static void spapr_xive_cpu_to_end(PowerPCCPU *cpu, uint= 8_t prio, } =20 if (out_end_idx) { - *out_end_idx =3D (cpu->vcpu_id << 3) + prio; + *out_end_idx =3D spapr_xive_cpu_end_idx(cpu->vcpu_id, prio); } } =20 @@ -290,7 +296,8 @@ static void spapr_xive_instance_init(Object *obj) =20 uint32_t spapr_xive_nr_ends(const SpaprXive *xive) { - return xive->nr_ends; + g_assert(xive->nr_servers); + return spapr_xive_cpu_end_idx(xive->nr_servers, 0); } =20 static void spapr_xive_realize(DeviceState *dev, Error **errp) @@ -303,7 +310,7 @@ static void spapr_xive_realize(DeviceState *dev, Error = **errp) =20 /* Set by spapr_irq_init() */ g_assert(xive->nr_irqs); - g_assert(xive->nr_ends); + g_assert(xive->nr_servers); =20 sxc->parent_realize(dev, &local_err); if (local_err) { @@ -360,6 +367,8 @@ static void spapr_xive_realize(DeviceState *dev, Error = **errp) sysbus_mmio_map(SYS_BUS_DEVICE(xive), 0, xive->vc_base); sysbus_mmio_map(SYS_BUS_DEVICE(xive), 1, xive->end_base); sysbus_mmio_map(SYS_BUS_DEVICE(xive), 2, xive->tm_base); + + xive->nr_ends_vmstate =3D spapr_xive_nr_ends(xive); } =20 static int spapr_xive_get_eas(XiveRouter *xrtr, uint8_t eas_blk, @@ -547,7 +556,7 @@ static const VMStateDescription vmstate_spapr_xive =3D { VMSTATE_UINT32_EQUAL(nr_irqs, SpaprXive, NULL), VMSTATE_STRUCT_VARRAY_POINTER_UINT32(eat, SpaprXive, nr_irqs, vmstate_spapr_xive_eas, XiveEAS), - VMSTATE_STRUCT_VARRAY_POINTER_UINT32(endt, SpaprXive, nr_ends, + VMSTATE_STRUCT_VARRAY_POINTER_UINT32(endt, SpaprXive, nr_ends_vmst= ate, vmstate_spapr_xive_end, XiveE= ND), VMSTATE_END_OF_LIST() }, @@ -591,7 +600,14 @@ static void spapr_xive_free_irq(SpaprInterruptControll= er *intc, int lisn) =20 static Property spapr_xive_properties[] =3D { DEFINE_PROP_UINT32("nr-irqs", SpaprXive, nr_irqs, 0), - DEFINE_PROP_UINT32("nr-ends", SpaprXive, nr_ends, 0), + /* + * "nr-ends" is deprecated by "nr-servers" since QEMU 6.0. + * It is just kept around because it is exposed to the user + * through -global and we don't want it to fail, even if + * the value is actually overridden internally. + */ + DEFINE_PROP_UINT32("nr-ends", SpaprXive, nr_ends_vmstate, 0), + DEFINE_PROP_UINT32("nr-servers", SpaprXive, nr_servers, 0), DEFINE_PROP_UINT64("vc-base", SpaprXive, vc_base, SPAPR_XIVE_VC_BASE), DEFINE_PROP_UINT64("tm-base", SpaprXive, tm_base, SPAPR_XIVE_TM_BASE), DEFINE_PROP_UINT8("hv-prio", SpaprXive, hv_prio, 7), @@ -742,7 +758,7 @@ static int spapr_xive_activate(SpaprInterruptController= *intc, SpaprXive *xive =3D SPAPR_XIVE(intc); =20 if (kvm_enabled()) { - int rc =3D spapr_irq_init_kvm(kvmppc_xive_connect, intc, nr_server= s, + int rc =3D spapr_irq_init_kvm(kvmppc_xive_connect, intc, xive->nr_= servers, errp); if (rc < 0) { return rc; diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c index f59960339ec3..8c5627225636 100644 --- a/hw/ppc/spapr_irq.c +++ b/hw/ppc/spapr_irq.c @@ -330,11 +330,7 @@ void spapr_irq_init(SpaprMachineState *spapr, Error **= errp) =20 dev =3D qdev_new(TYPE_SPAPR_XIVE); qdev_prop_set_uint32(dev, "nr-irqs", smc->nr_xirqs + SPAPR_XIRQ_BA= SE); - /* - * 8 XIVE END structures per CPU. One for each available - * priority - */ - qdev_prop_set_uint32(dev, "nr-ends", nr_servers << 3); + qdev_prop_set_uint32(dev, "nr-servers", nr_servers); object_property_set_link(OBJECT(dev), "xive-fabric", OBJECT(spapr), &error_abort); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); --=20 2.26.2 From nobody Thu Mar 28 11:24:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1605894540; cv=none; d=zohomail.com; s=zohoarc; b=k1Ap24N+tcxH4IjUCF9u7YuIIFYv3rK+9HLH6FawptMdXqCducJPtEjXLHakrYusZwZBEyIpW9H6FgJrcDN0t/OqZ0qxvquITQgzWtsVolIqaDGJYYJMQxU6rCj1sgDNqpJRoHFUlEjuSUpr/ufJCL0RDVGderEmrQZFkqSg9ME= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605894540; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=5SzzXLJLagFuPCI6HxJ4XXl3qqgmlp3qjOpDAz+PV+o=; b=GP29kyH8MwWBYKMQGchjm3b6+FI/A3sPBWhajYP+oYxIVfRJBw9ja9kN12hWC8QeH7XAb2T6BSpcUw67kGiyRAAPjidzZI+afDhQW9Fip79wqFf0h9Mi7bVDgaBZdEcPcfTIqYSKjyP+M/JTQFFEN4dfn7UzuBy9ve4RL1P6vFg= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.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 1605894540767516.7073593056115; Fri, 20 Nov 2020 09:49:00 -0800 (PST) Received: from localhost ([::1]:38296 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kgAWp-0001mk-Mf for importer@patchew.org; Fri, 20 Nov 2020 12:48:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55090) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kgAUv-0008Qx-Oc for qemu-devel@nongnu.org; Fri, 20 Nov 2020 12:47:02 -0500 Received: from us-smtp-delivery-44.mimecast.com ([205.139.111.44]:58736) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kgAUt-000588-UW for qemu-devel@nongnu.org; Fri, 20 Nov 2020 12:47:01 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-538-WD4bcnprPv-SeQuirOs03g-1; Fri, 20 Nov 2020 12:46:56 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BA6FB1DDEE; Fri, 20 Nov 2020 17:46:54 +0000 (UTC) Received: from bahia.redhat.com (ovpn-112-44.ams2.redhat.com [10.36.112.44]) by smtp.corp.redhat.com (Postfix) with ESMTP id 926BF5C1D5; Fri, 20 Nov 2020 17:46:53 +0000 (UTC) X-MC-Unique: WD4bcnprPv-SeQuirOs03g-1 From: Greg Kurz To: qemu-devel@nongnu.org Subject: [PATCH for-6.0 4/8] spapr/xive: Add "nr-ipis" property Date: Fri, 20 Nov 2020 18:46:42 +0100 Message-Id: <20201120174646.619395-5-groug@kaod.org> In-Reply-To: <20201120174646.619395-1-groug@kaod.org> References: <20201120174646.619395-1-groug@kaod.org> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=groug@kaod.org X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: kaod.org Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: softfail client-ip=205.139.111.44; envelope-from=groug@kaod.org; helo=us-smtp-delivery-44.mimecast.com X-Spam_score_int: -11 X-Spam_score: -1.2 X-Spam_bar: - X-Spam_report: (-1.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_SOFTFAIL=0.665 autolearn=no autolearn_force=no X-Spam_action: no action 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: Greg Kurz , qemu-ppc@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The sPAPR XIVE device exposes a range of LISNs that the guest uses for IPIs. This range is currently sized according to the highest vCPU id, ie. spapr_max_server_number(), as obtained from the machine through the "nr_servers" argument of the generic spapr_irq_dt() call. This makes sense for the "ibm,interrupt-server-ranges" property of sPAPR XICS, but certainly not for "ibm,xive-lisn-ranges". The range should be sized to the maximum number of possible vCPUs. It happens that spapr_max_server_number() =3D=3D smp.max_cpus in practice with the machine default settings. This might not be the case though when VSMT is in use : we can end up with a much larger range (up to 8 times bigger) than needed and waste LISNs. But most importantly, this lures people into thinking that IPI numbers are always equal to vCPU ids, which is wrong and bit us recently: https://lists.gnu.org/archive/html/qemu-devel/2020-11/msg01476.html Introduce an "nr-ipis" property that the machine sets to smp.max_cpus before realizing the deice. Use that instead of "nr_servers" in spapr_xive_dt(). Have the machine to claim the same number of IPIs in spapr_irq_init(). This doesn't cause any guest visible change when using the machine default settings (ie. VSMT =3D=3D smp.threads). Signed-off-by: Greg Kurz Reviewed-by: David Gibson --- include/hw/ppc/spapr_xive.h | 8 ++++++++ hw/intc/spapr_xive.c | 4 +++- hw/ppc/spapr_irq.c | 4 +++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/include/hw/ppc/spapr_xive.h b/include/hw/ppc/spapr_xive.h index 7123ea07ed78..69b9fbc1b9a5 100644 --- a/include/hw/ppc/spapr_xive.h +++ b/include/hw/ppc/spapr_xive.h @@ -43,6 +43,14 @@ typedef struct SpaprXive { =20 /* DT */ gchar *nodename; + /* + * The sPAPR XIVE device needs to know how many vCPUs it + * might be exposed to in order to size the IPI range in + * "ibm,interrupt-server-ranges". It is the purpose of the + * "nr-ipis" property which *must* be set to a non-null + * value before realizing the sPAPR XIVE device. + */ + uint32_t nr_ipis; =20 /* Routing table */ XiveEAS *eat; diff --git a/hw/intc/spapr_xive.c b/hw/intc/spapr_xive.c index e4dbf9c2c409..d13a2955ce9b 100644 --- a/hw/intc/spapr_xive.c +++ b/hw/intc/spapr_xive.c @@ -311,6 +311,7 @@ static void spapr_xive_realize(DeviceState *dev, Error = **errp) /* Set by spapr_irq_init() */ g_assert(xive->nr_irqs); g_assert(xive->nr_servers); + g_assert(xive->nr_ipis); =20 sxc->parent_realize(dev, &local_err); if (local_err) { @@ -608,6 +609,7 @@ static Property spapr_xive_properties[] =3D { */ DEFINE_PROP_UINT32("nr-ends", SpaprXive, nr_ends_vmstate, 0), DEFINE_PROP_UINT32("nr-servers", SpaprXive, nr_servers, 0), + DEFINE_PROP_UINT32("nr-ipis", SpaprXive, nr_ipis, 0), DEFINE_PROP_UINT64("vc-base", SpaprXive, vc_base, SPAPR_XIVE_VC_BASE), DEFINE_PROP_UINT64("tm-base", SpaprXive, tm_base, SPAPR_XIVE_TM_BASE), DEFINE_PROP_UINT8("hv-prio", SpaprXive, hv_prio, 7), @@ -698,7 +700,7 @@ static void spapr_xive_dt(SpaprInterruptController *int= c, uint32_t nr_servers, /* Interrupt number ranges for the IPIs */ uint32_t lisn_ranges[] =3D { cpu_to_be32(SPAPR_IRQ_IPI), - cpu_to_be32(SPAPR_IRQ_IPI + nr_servers), + cpu_to_be32(SPAPR_IRQ_IPI + xive->nr_ipis), }; /* * EQ size - the sizes of pages supported by the system 4K, 64K, diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c index 8c5627225636..a0fc474ecb06 100644 --- a/hw/ppc/spapr_irq.c +++ b/hw/ppc/spapr_irq.c @@ -325,12 +325,14 @@ void spapr_irq_init(SpaprMachineState *spapr, Error *= *errp) =20 if (spapr->irq->xive) { uint32_t nr_servers =3D spapr_max_server_number(spapr); + uint32_t max_cpus =3D MACHINE(spapr)->smp.max_cpus; DeviceState *dev; int i; =20 dev =3D qdev_new(TYPE_SPAPR_XIVE); qdev_prop_set_uint32(dev, "nr-irqs", smc->nr_xirqs + SPAPR_XIRQ_BA= SE); qdev_prop_set_uint32(dev, "nr-servers", nr_servers); + qdev_prop_set_uint32(dev, "nr-ipis", max_cpus); object_property_set_link(OBJECT(dev), "xive-fabric", OBJECT(spapr), &error_abort); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); @@ -338,7 +340,7 @@ void spapr_irq_init(SpaprMachineState *spapr, Error **e= rrp) spapr->xive =3D SPAPR_XIVE(dev); =20 /* Enable the CPU IPIs */ - for (i =3D 0; i < nr_servers; ++i) { + for (i =3D 0; i < max_cpus; ++i) { SpaprInterruptControllerClass *sicc =3D SPAPR_INTC_GET_CLASS(spapr->xive); =20 --=20 2.26.2 From nobody Thu Mar 28 11:24:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1605894597; cv=none; d=zohomail.com; s=zohoarc; b=FjiI/s2WFwrcG0T56ecV/iEMdv/9Mrd9IjRMtsONCjYMtjBnGLxD6ezT1aZoeMhyhax7/H7HEgRbeg4GghQJCyX9B8RdxD/eb7QJGXAhzEfs7G6z1RfeCfcg90EyFIiBIZErOuvZrW1obw4SII323n9B7dxKbE0LQMTkRj7Kggo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605894597; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=85A3rwvUHC/quR8XZnO5jiCSHKmMe0IiQMByRRr23d4=; b=nBvKD+nA6k+ozW2U2qmi1E6gQtWc1HWamXJyaPW0IXEncn97S9SWJoFa7ug0SYLXcysUnIkrCqXT28o4qCO2dNNuRpoxW3AGzQwA4gT1k8ZtG8CQjJkIBL7t7EPUizrzquU2zaEP8Ib4ncrUs5uXoWQ9AakjCNliK/qmLmLXcwI= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.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 1605894597670310.62611965253177; Fri, 20 Nov 2020 09:49:57 -0800 (PST) Received: from localhost ([::1]:41398 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kgAXk-00034e-Hj for importer@patchew.org; Fri, 20 Nov 2020 12:49:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55116) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kgAUx-0008RS-6N for qemu-devel@nongnu.org; Fri, 20 Nov 2020 12:47:07 -0500 Received: from us-smtp-delivery-44.mimecast.com ([207.211.30.44]:39261) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kgAUt-00058D-Vl for qemu-devel@nongnu.org; Fri, 20 Nov 2020 12:47:02 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-281-tYPiPneZMIixWPmnIleXWw-1; Fri, 20 Nov 2020 12:46:57 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 40F0610051C6; Fri, 20 Nov 2020 17:46:56 +0000 (UTC) Received: from bahia.redhat.com (ovpn-112-44.ams2.redhat.com [10.36.112.44]) by smtp.corp.redhat.com (Postfix) with ESMTP id 131BD5C1D5; Fri, 20 Nov 2020 17:46:54 +0000 (UTC) X-MC-Unique: tYPiPneZMIixWPmnIleXWw-1 From: Greg Kurz To: qemu-devel@nongnu.org Subject: [PATCH for-6.0 5/8] spapr/xics: Drop unused argument to xics_kvm_has_broken_disconnect() Date: Fri, 20 Nov 2020 18:46:43 +0100 Message-Id: <20201120174646.619395-6-groug@kaod.org> In-Reply-To: <20201120174646.619395-1-groug@kaod.org> References: <20201120174646.619395-1-groug@kaod.org> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=groug@kaod.org X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: kaod.org Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: softfail client-ip=207.211.30.44; envelope-from=groug@kaod.org; helo=us-smtp-delivery-44.mimecast.com X-Spam_score_int: -11 X-Spam_score: -1.2 X-Spam_bar: - X-Spam_report: (-1.2 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_SOFTFAIL=0.665 autolearn=no autolearn_force=no X-Spam_action: no action 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: Greg Kurz , qemu-ppc@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Never used from the start. Signed-off-by: Greg Kurz Reviewed-by: C=C3=A9dric Le Goater --- include/hw/ppc/xics_spapr.h | 2 +- hw/intc/xics_kvm.c | 2 +- hw/ppc/spapr_irq.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/hw/ppc/xics_spapr.h b/include/hw/ppc/xics_spapr.h index 0b8182e40b33..de752c0d2c7e 100644 --- a/include/hw/ppc/xics_spapr.h +++ b/include/hw/ppc/xics_spapr.h @@ -38,6 +38,6 @@ DECLARE_INSTANCE_CHECKER(ICSState, ICS_SPAPR, int xics_kvm_connect(SpaprInterruptController *intc, uint32_t nr_servers, Error **errp); void xics_kvm_disconnect(SpaprInterruptController *intc); -bool xics_kvm_has_broken_disconnect(SpaprMachineState *spapr); +bool xics_kvm_has_broken_disconnect(void); =20 #endif /* XICS_SPAPR_H */ diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c index 68bb1914b9bb..570d635bcc08 100644 --- a/hw/intc/xics_kvm.c +++ b/hw/intc/xics_kvm.c @@ -484,7 +484,7 @@ void xics_kvm_disconnect(SpaprInterruptController *intc) * support destruction of a KVM XICS device while the VM is running. * Required to start a spapr machine with ic-mode=3Ddual,kernel-irqchip=3D= on. */ -bool xics_kvm_has_broken_disconnect(SpaprMachineState *spapr) +bool xics_kvm_has_broken_disconnect(void) { int rc; =20 diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c index a0fc474ecb06..2dacbecfd5fd 100644 --- a/hw/ppc/spapr_irq.c +++ b/hw/ppc/spapr_irq.c @@ -186,7 +186,7 @@ static int spapr_irq_check(SpaprMachineState *spapr, Er= ror **errp) if (kvm_enabled() && spapr->irq =3D=3D &spapr_irq_dual && kvm_kernel_irqchip_required() && - xics_kvm_has_broken_disconnect(spapr)) { + xics_kvm_has_broken_disconnect()) { error_setg(errp, "KVM is incompatible with ic-mode=3Ddual,kernel-irqchip=3Don"); error_append_hint(errp, --=20 2.26.2 From nobody Thu Mar 28 11:24:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1605894796; cv=none; d=zohomail.com; s=zohoarc; b=NuP27QYokEtXXMOsPXO1y78OXxhq0064PMLiI8nFaIbTjvg1nEhRQzlT1XrMhVB0/2Ru2aqxcerEzo+u1vcvNvAIFyfSZXp+07y2ZH1Hf8Qpors+2YgyHlMFNTcpuLT9thANcRmWA77bSYl/doXbzSIEz8UNTZ9DcQHJEZYlUfQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605894796; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=nFaz54Um+Y4WGI6FibpKjsmCBUy8a1TvEURJTk1MMBw=; b=n4O+unRkbaWBjOrxVP/O5sYxiUvHF3IgQXw0J1naSe8botlVOdN0Qrc+5pTelDf/Oa+i80yLEUmlu/rET+Po10Mpwe2HFc/VJ5CDGEIF+2pBx9l4W3T6zetr6/BWz5MNiIqU8pstOl9Xbt07v5PL1DiUswmKujqboYxg+pOVrkQ= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.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 1605894796075709.430829665681; Fri, 20 Nov 2020 09:53:16 -0800 (PST) Received: from localhost ([::1]:50674 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kgAaw-00072o-JT for importer@patchew.org; Fri, 20 Nov 2020 12:53:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55244) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kgAV4-0008UL-MY for qemu-devel@nongnu.org; Fri, 20 Nov 2020 12:47:14 -0500 Received: from us-smtp-delivery-44.mimecast.com ([205.139.111.44]:40289) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kgAV2-00058v-Hm for qemu-devel@nongnu.org; Fri, 20 Nov 2020 12:47:10 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-46-uCgy60zVPv-0a9BOzGv59A-1; Fri, 20 Nov 2020 12:46:58 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B1B318030A2; Fri, 20 Nov 2020 17:46:57 +0000 (UTC) Received: from bahia.redhat.com (ovpn-112-44.ams2.redhat.com [10.36.112.44]) by smtp.corp.redhat.com (Postfix) with ESMTP id 894D85C1D5; Fri, 20 Nov 2020 17:46:56 +0000 (UTC) X-MC-Unique: uCgy60zVPv-0a9BOzGv59A-1 From: Greg Kurz To: qemu-devel@nongnu.org Subject: [PATCH for-6.0 6/8] spapr/xics: Add "nr-servers" property Date: Fri, 20 Nov 2020 18:46:44 +0100 Message-Id: <20201120174646.619395-7-groug@kaod.org> In-Reply-To: <20201120174646.619395-1-groug@kaod.org> References: <20201120174646.619395-1-groug@kaod.org> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=groug@kaod.org X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: kaod.org Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: softfail client-ip=205.139.111.44; envelope-from=groug@kaod.org; helo=us-smtp-delivery-44.mimecast.com X-Spam_score_int: -11 X-Spam_score: -1.2 X-Spam_bar: - X-Spam_report: (-1.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_SOFTFAIL=0.665 autolearn=no autolearn_force=no X-Spam_action: no action 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: Greg Kurz , qemu-ppc@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The sPAPR ICS device exposes the range of vCPU ids it can handle in the "ibm,interrupt-server-ranges" FDT property. The highest vCPU id, ie. spapr_max_server_number(), is obtained from the machine through the "nr_servers" argument of the generic spapr_irq_dt() call. We want to drop the "nr_servers" argument from the API because it doesn't make sense for the sPAPR XIVE device actually. On POWER9, we also pass the highest vCPU id to the KVM XICS-on-XIVE device, in order to optimize resource allocation in the HW. This is enough motivation to introduce an "nr-servers" property and to use it for both purposes. Signed-off-by: Greg Kurz --- include/hw/ppc/spapr.h | 4 ++-- include/hw/ppc/xics_spapr.h | 21 +++++++++++++++++--- hw/intc/xics_kvm.c | 2 +- hw/intc/xics_spapr.c | 38 ++++++++++++++++++++++++------------- hw/ppc/spapr.c | 5 +++-- hw/ppc/spapr_irq.c | 7 +++++-- 6 files changed, 54 insertions(+), 23 deletions(-) diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 2e89e36cfbdc..b76c84a2f884 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -10,7 +10,7 @@ #include "hw/ppc/spapr_irq.h" #include "qom/object.h" #include "hw/ppc/spapr_xive.h" /* For SpaprXive */ -#include "hw/ppc/xics.h" /* For ICSState */ +#include "hw/ppc/xics_spapr.h" /* For IcsSpaprState */ #include "hw/ppc/spapr_tpm_proxy.h" =20 struct SpaprVioBus; @@ -230,7 +230,7 @@ struct SpaprMachineState { SpaprIrq *irq; qemu_irq *qirqs; SpaprInterruptController *active_intc; - ICSState *ics; + IcsSpaprState *ics; SpaprXive *xive; =20 bool cmd_line_caps[SPAPR_CAP_NUM]; diff --git a/include/hw/ppc/xics_spapr.h b/include/hw/ppc/xics_spapr.h index de752c0d2c7e..1a483a873b62 100644 --- a/include/hw/ppc/xics_spapr.h +++ b/include/hw/ppc/xics_spapr.h @@ -28,12 +28,27 @@ #define XICS_SPAPR_H =20 #include "hw/ppc/spapr.h" +#include "hw/ppc/xics.h" #include "qom/object.h" =20 +typedef struct IcsSpaprState { + /*< private >*/ + ICPState parent_obj; + + /* + * The ICS needs to know the upper limit to vCPU ids it + * might be exposed to in order to size the vCPU id range + * in "ibm,interrupt-server-ranges" and to optimize HW + * resource allocation when using the XICS-on-XIVE KVM + * device. It is the purpose of the "nr-servers" property + * which *must* be set to a non-null value before realizing + * the ICS. + */ + uint32_t nr_servers; +} IcsSpaprState; + #define TYPE_ICS_SPAPR "ics-spapr" -/* This is reusing the ICSState typedef from TYPE_ICS */ -DECLARE_INSTANCE_CHECKER(ICSState, ICS_SPAPR, - TYPE_ICS_SPAPR) +DECLARE_INSTANCE_CHECKER(IcsSpaprState, ICS_SPAPR, TYPE_ICS_SPAPR) =20 int xics_kvm_connect(SpaprInterruptController *intc, uint32_t nr_servers, Error **errp); diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c index 570d635bcc08..ecbbda0e249b 100644 --- a/hw/intc/xics_kvm.c +++ b/hw/intc/xics_kvm.c @@ -350,7 +350,7 @@ void ics_kvm_set_irq(ICSState *ics, int srcno, int val) int xics_kvm_connect(SpaprInterruptController *intc, uint32_t nr_servers, Error **errp) { - ICSState *ics =3D ICS_SPAPR(intc); + ICSState *ics =3D ICS(intc); int rc; CPUState *cs; Error *local_err =3D NULL; diff --git a/hw/intc/xics_spapr.c b/hw/intc/xics_spapr.c index 8ae4f41459c3..ce147e8980ed 100644 --- a/hw/intc/xics_spapr.c +++ b/hw/intc/xics_spapr.c @@ -34,6 +34,7 @@ #include "hw/ppc/xics.h" #include "hw/ppc/xics_spapr.h" #include "hw/ppc/fdt.h" +#include "hw/qdev-properties.h" #include "qapi/visitor.h" =20 /* @@ -154,7 +155,7 @@ static void rtas_set_xive(PowerPCCPU *cpu, SpaprMachine= State *spapr, uint32_t nargs, target_ulong args, uint32_t nret, target_ulong rets) { - ICSState *ics =3D spapr->ics; + ICSState *ics =3D ICS(spapr->ics); uint32_t nr, srcno, server, priority; =20 CHECK_EMULATED_XICS_RTAS(spapr, rets); @@ -189,7 +190,7 @@ static void rtas_get_xive(PowerPCCPU *cpu, SpaprMachine= State *spapr, uint32_t nargs, target_ulong args, uint32_t nret, target_ulong rets) { - ICSState *ics =3D spapr->ics; + ICSState *ics =3D ICS(spapr->ics); uint32_t nr, srcno; =20 CHECK_EMULATED_XICS_RTAS(spapr, rets); @@ -221,7 +222,7 @@ static void rtas_int_off(PowerPCCPU *cpu, SpaprMachineS= tate *spapr, uint32_t nargs, target_ulong args, uint32_t nret, target_ulong rets) { - ICSState *ics =3D spapr->ics; + ICSState *ics =3D ICS(spapr->ics); uint32_t nr, srcno; =20 CHECK_EMULATED_XICS_RTAS(spapr, rets); @@ -254,7 +255,7 @@ static void rtas_int_on(PowerPCCPU *cpu, SpaprMachineSt= ate *spapr, uint32_t nargs, target_ulong args, uint32_t nret, target_ulong rets) { - ICSState *ics =3D spapr->ics; + ICSState *ics =3D ICS(spapr->ics); uint32_t nr, srcno; =20 CHECK_EMULATED_XICS_RTAS(spapr, rets); @@ -285,10 +286,13 @@ static void rtas_int_on(PowerPCCPU *cpu, SpaprMachine= State *spapr, =20 static void ics_spapr_realize(DeviceState *dev, Error **errp) { - ICSState *ics =3D ICS_SPAPR(dev); - ICSStateClass *icsc =3D ICS_GET_CLASS(ics); + IcsSpaprState *sics =3D ICS_SPAPR(dev); + ICSStateClass *icsc =3D ICS_GET_CLASS(dev); Error *local_err =3D NULL; =20 + /* Set by spapr_irq_init() */ + g_assert(sics->nr_servers); + icsc->parent_realize(dev, &local_err); if (local_err) { error_propagate(errp, local_err); @@ -312,7 +316,7 @@ static void xics_spapr_dt(SpaprInterruptController *int= c, uint32_t nr_servers, void *fdt, uint32_t phandle) { uint32_t interrupt_server_ranges_prop[] =3D { - 0, cpu_to_be32(nr_servers), + 0, cpu_to_be32(ICS_SPAPR(intc)->nr_servers), }; int node; =20 @@ -333,7 +337,7 @@ static void xics_spapr_dt(SpaprInterruptController *int= c, uint32_t nr_servers, static int xics_spapr_cpu_intc_create(SpaprInterruptController *intc, PowerPCCPU *cpu, Error **errp) { - ICSState *ics =3D ICS_SPAPR(intc); + ICSState *ics =3D ICS(intc); Object *obj; SpaprCpuState *spapr_cpu =3D spapr_cpu_state(cpu); =20 @@ -364,7 +368,7 @@ static void xics_spapr_cpu_intc_destroy(SpaprInterruptC= ontroller *intc, static int xics_spapr_claim_irq(SpaprInterruptController *intc, int irq, bool lsi, Error **errp) { - ICSState *ics =3D ICS_SPAPR(intc); + ICSState *ics =3D ICS(intc); =20 assert(ics); assert(ics_valid_irq(ics, irq)); @@ -380,7 +384,7 @@ static int xics_spapr_claim_irq(SpaprInterruptControlle= r *intc, int irq, =20 static void xics_spapr_free_irq(SpaprInterruptController *intc, int irq) { - ICSState *ics =3D ICS_SPAPR(intc); + ICSState *ics =3D ICS(intc); uint32_t srcno =3D irq - ics->offset; =20 assert(ics_valid_irq(ics, irq)); @@ -390,7 +394,7 @@ static void xics_spapr_free_irq(SpaprInterruptControlle= r *intc, int irq) =20 static void xics_spapr_set_irq(SpaprInterruptController *intc, int irq, in= t val) { - ICSState *ics =3D ICS_SPAPR(intc); + ICSState *ics =3D ICS(intc); uint32_t srcno =3D irq - ics->offset; =20 ics_set_irq(ics, srcno, val); @@ -398,7 +402,7 @@ static void xics_spapr_set_irq(SpaprInterruptController= *intc, int irq, int val) =20 static void xics_spapr_print_info(SpaprInterruptController *intc, Monitor = *mon) { - ICSState *ics =3D ICS_SPAPR(intc); + ICSState *ics =3D ICS(intc); CPUState *cs; =20 CPU_FOREACH(cs) { @@ -426,7 +430,8 @@ static int xics_spapr_activate(SpaprInterruptController= *intc, uint32_t nr_servers, Error **errp) { if (kvm_enabled()) { - return spapr_irq_init_kvm(xics_kvm_connect, intc, nr_servers, errp= ); + return spapr_irq_init_kvm(xics_kvm_connect, intc, + ICS_SPAPR(intc)->nr_servers, errp); } return 0; } @@ -438,6 +443,11 @@ static void xics_spapr_deactivate(SpaprInterruptContro= ller *intc) } } =20 +static Property ics_spapr_properties[] =3D { + DEFINE_PROP_UINT32("nr-servers", IcsSpaprState, nr_servers, 0), + DEFINE_PROP_END_OF_LIST(), +}; + static void ics_spapr_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); @@ -446,6 +456,7 @@ static void ics_spapr_class_init(ObjectClass *klass, vo= id *data) =20 device_class_set_parent_realize(dc, ics_spapr_realize, &isc->parent_realize); + device_class_set_props(dc, ics_spapr_properties); sicc->activate =3D xics_spapr_activate; sicc->deactivate =3D xics_spapr_deactivate; sicc->cpu_intc_create =3D xics_spapr_cpu_intc_create; @@ -462,6 +473,7 @@ static void ics_spapr_class_init(ObjectClass *klass, vo= id *data) static const TypeInfo ics_spapr_info =3D { .name =3D TYPE_ICS_SPAPR, .parent =3D TYPE_ICS, + .instance_size =3D sizeof(IcsSpaprState), .class_init =3D ics_spapr_class_init, .interfaces =3D (InterfaceInfo[]) { { TYPE_SPAPR_INTC }, diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 12a012d9dd09..21de0456446b 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -4218,15 +4218,16 @@ static void spapr_phb_placement(SpaprMachineState *= spapr, uint32_t index, static ICSState *spapr_ics_get(XICSFabric *dev, int irq) { SpaprMachineState *spapr =3D SPAPR_MACHINE(dev); + ICSState *ics =3D ICS(spapr->ics); =20 - return ics_valid_irq(spapr->ics, irq) ? spapr->ics : NULL; + return ics_valid_irq(ics, irq) ? ics : NULL; } =20 static void spapr_ics_resend(XICSFabric *dev) { SpaprMachineState *spapr =3D SPAPR_MACHINE(dev); =20 - ics_resend(spapr->ics); + ics_resend(ICS(spapr->ics)); } =20 static ICPState *spapr_icp_get(XICSFabric *xi, int vcpu_id) diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c index 2dacbecfd5fd..be6f4041e433 100644 --- a/hw/ppc/spapr_irq.c +++ b/hw/ppc/spapr_irq.c @@ -316,6 +316,9 @@ void spapr_irq_init(SpaprMachineState *spapr, Error **e= rrp) object_property_set_link(obj, ICS_PROP_XICS, OBJECT(spapr), &error_abort); object_property_set_int(obj, "nr-irqs", smc->nr_xirqs, &error_abor= t); + object_property_set_uint(obj, "nr-servers", + spapr_max_server_number(spapr), + &error_abort); if (!qdev_realize(DEVICE(obj), NULL, errp)) { return; } @@ -426,7 +429,7 @@ qemu_irq spapr_qirq(SpaprMachineState *spapr, int irq) assert(irq < (smc->nr_xirqs + SPAPR_XIRQ_BASE)); =20 if (spapr->ics) { - assert(ics_valid_irq(spapr->ics, irq)); + assert(ics_valid_irq(ICS(spapr->ics), irq)); } if (spapr->xive) { assert(irq < spapr->xive->nr_irqs); @@ -556,7 +559,7 @@ static int ics_find_free_block(ICSState *ics, int num, = int alignnum) =20 int spapr_irq_find(SpaprMachineState *spapr, int num, bool align, Error **= errp) { - ICSState *ics =3D spapr->ics; + ICSState *ics =3D ICS(spapr->ics); int first =3D -1; =20 assert(ics); --=20 2.26.2 From nobody Thu Mar 28 11:24:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1605895035; cv=none; d=zohomail.com; s=zohoarc; b=eE8LowGnTngLGOpVCh5VAyNUq/+LYKyIqkznGCAJvkHSacPlm9On8GxCM0AnrmlsDy0ZOND2ugTs1WcPqa7vgyh8S7wgujSBQ5AIoEMWcXZmLpgnndGsb005ZX8T7SksWu1RUUXvXAb8xZ8PRpQrgJWfb7hrRNCcXTWecfMpO8M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605895035; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=czq1anVPwmZYA+xXOzFuZ7sdUy/B6HxlhIKcPXGM2VM=; b=YmnKRY3HnvRXEy3nnS32GywS0+qDtHNvXYxqOF4yL9/ukVHHapn6T22daEn9lIGcDmg9gsZsjE3oAjKMzE5yfn0YEbjlocDKOan57g1Gr2lr6z6aZW7+a6wGlDgLLf+Bkcn5zHVWsmQMM2UqI/DQqNk3SGLnYvW4vBIiWFWWJgE= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.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 1605895035626857.6468856998047; Fri, 20 Nov 2020 09:57:15 -0800 (PST) Received: from localhost ([::1]:60526 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kgAeo-00030p-LE for importer@patchew.org; Fri, 20 Nov 2020 12:57:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55330) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kgAV7-0008UY-0m for qemu-devel@nongnu.org; Fri, 20 Nov 2020 12:47:14 -0500 Received: from us-smtp-delivery-44.mimecast.com ([205.139.111.44]:43338) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kgAV2-00059G-JN for qemu-devel@nongnu.org; Fri, 20 Nov 2020 12:47:12 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-510-XutxK6N-Oo2VrwJAmco-EA-1; Fri, 20 Nov 2020 12:47:00 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 30BCB80ED8A; Fri, 20 Nov 2020 17:46:59 +0000 (UTC) Received: from bahia.redhat.com (ovpn-112-44.ams2.redhat.com [10.36.112.44]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0A6935C1D5; Fri, 20 Nov 2020 17:46:57 +0000 (UTC) X-MC-Unique: XutxK6N-Oo2VrwJAmco-EA-1 From: Greg Kurz To: qemu-devel@nongnu.org Subject: [PATCH for-6.0 7/8] spapr: Drop "nr_servers" argument of the sPAPR IC activate() operation Date: Fri, 20 Nov 2020 18:46:45 +0100 Message-Id: <20201120174646.619395-8-groug@kaod.org> In-Reply-To: <20201120174646.619395-1-groug@kaod.org> References: <20201120174646.619395-1-groug@kaod.org> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: kaod.org Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: softfail client-ip=205.139.111.44; envelope-from=groug@kaod.org; helo=us-smtp-delivery-44.mimecast.com X-Spam_score_int: -11 X-Spam_score: -1.2 X-Spam_bar: - X-Spam_report: (-1.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_SOFTFAIL=0.665 autolearn=no autolearn_force=no X-Spam_action: no action 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: Greg Kurz , qemu-ppc@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" This argument isn't used by the backends anymore. Signed-off-by: Greg Kurz --- include/hw/ppc/spapr_irq.h | 3 +-- hw/intc/spapr_xive.c | 3 +-- hw/intc/xics_spapr.c | 3 +-- hw/ppc/spapr_irq.c | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/include/hw/ppc/spapr_irq.h b/include/hw/ppc/spapr_irq.h index c22a72c9e270..3e1c619d4c06 100644 --- a/include/hw/ppc/spapr_irq.h +++ b/include/hw/ppc/spapr_irq.h @@ -43,8 +43,7 @@ DECLARE_CLASS_CHECKERS(SpaprInterruptControllerClass, SPA= PR_INTC, struct SpaprInterruptControllerClass { InterfaceClass parent; =20 - int (*activate)(SpaprInterruptController *intc, uint32_t nr_servers, - Error **errp); + int (*activate)(SpaprInterruptController *intc, Error **errp); void (*deactivate)(SpaprInterruptController *intc); =20 /* diff --git a/hw/intc/spapr_xive.c b/hw/intc/spapr_xive.c index d13a2955ce9b..8331026fdb12 100644 --- a/hw/intc/spapr_xive.c +++ b/hw/intc/spapr_xive.c @@ -754,8 +754,7 @@ static void spapr_xive_dt(SpaprInterruptController *int= c, uint32_t nr_servers, plat_res_int_priorities, sizeof(plat_res_int_prioriti= es))); } =20 -static int spapr_xive_activate(SpaprInterruptController *intc, - uint32_t nr_servers, Error **errp) +static int spapr_xive_activate(SpaprInterruptController *intc, Error **err= p) { SpaprXive *xive =3D SPAPR_XIVE(intc); =20 diff --git a/hw/intc/xics_spapr.c b/hw/intc/xics_spapr.c index ce147e8980ed..8810bd93c856 100644 --- a/hw/intc/xics_spapr.c +++ b/hw/intc/xics_spapr.c @@ -426,8 +426,7 @@ static int xics_spapr_post_load(SpaprInterruptControlle= r *intc, int version_id) return 0; } =20 -static int xics_spapr_activate(SpaprInterruptController *intc, - uint32_t nr_servers, Error **errp) +static int xics_spapr_activate(SpaprInterruptController *intc, Error **err= p) { if (kvm_enabled()) { return spapr_irq_init_kvm(xics_kvm_connect, intc, diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c index be6f4041e433..f2897fbc942a 100644 --- a/hw/ppc/spapr_irq.c +++ b/hw/ppc/spapr_irq.c @@ -480,7 +480,6 @@ static void set_active_intc(SpaprMachineState *spapr, SpaprInterruptController *new_intc) { SpaprInterruptControllerClass *sicc; - uint32_t nr_servers =3D spapr_max_server_number(spapr); =20 assert(new_intc); =20 @@ -498,7 +497,7 @@ static void set_active_intc(SpaprMachineState *spapr, =20 sicc =3D SPAPR_INTC_GET_CLASS(new_intc); if (sicc->activate) { - sicc->activate(new_intc, nr_servers, &error_fatal); + sicc->activate(new_intc, &error_fatal); } =20 spapr->active_intc =3D new_intc; --=20 2.26.2 From nobody Thu Mar 28 11:24:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1605894938; cv=none; d=zohomail.com; s=zohoarc; b=fWJFqZajNf29OtR1HUlxSzwGlzeYOIQU1zGi0THohCdpoD5tS9qMu3J3wM+U5OQ7u5NE33iNcd8AybuHdtgyvVqJNS9Y9GYHt/7dcEXUJjXcZtxcsCuhwCH7homF7OMYKcJtUHZozAg+nWZ8C5sF7SOiMglTSgilyVYW1EvEdj8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605894938; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=R+u2qXHZAuNvoYiSpKhiD9vR2h4hIpqstRGqBt7JAio=; b=CztQ1to76E66Y45QjpqR77E8y91QyO764EACtG91B9z5T2KUVgN+aKYtfHmZz1PZaUta2fNkrFCSBYDY7qAHMp21lXGcuWYr31CuKBSHBZd/MevHl5HJ1Olgex1S9UwsMR6l/fG6GFjm1C1loCRJB45uAGixT5RAOPxtR0P+ric= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.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 160589493841850.798967057063464; Fri, 20 Nov 2020 09:55:38 -0800 (PST) Received: from localhost ([::1]:58010 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kgAdE-0001n7-Rm for importer@patchew.org; Fri, 20 Nov 2020 12:55:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55344) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kgAV7-0008Ub-FI for qemu-devel@nongnu.org; Fri, 20 Nov 2020 12:47:14 -0500 Received: from us-smtp-delivery-44.mimecast.com ([205.139.111.44]:28593) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kgAV4-0005A8-EH for qemu-devel@nongnu.org; Fri, 20 Nov 2020 12:47:13 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-334-D7kk5PBqMCKGEAOnqprtmw-1; Fri, 20 Nov 2020 12:47:03 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A74B680ED9D; Fri, 20 Nov 2020 17:47:00 +0000 (UTC) Received: from bahia.redhat.com (ovpn-112-44.ams2.redhat.com [10.36.112.44]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7DE865C1D5; Fri, 20 Nov 2020 17:46:59 +0000 (UTC) X-MC-Unique: D7kk5PBqMCKGEAOnqprtmw-1 From: Greg Kurz To: qemu-devel@nongnu.org Subject: [PATCH for-6.0 8/8] spapr: Drop "nr_servers" argument of the sPAPR IC dt() operation Date: Fri, 20 Nov 2020 18:46:46 +0100 Message-Id: <20201120174646.619395-9-groug@kaod.org> In-Reply-To: <20201120174646.619395-1-groug@kaod.org> References: <20201120174646.619395-1-groug@kaod.org> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=groug@kaod.org X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: kaod.org Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: softfail client-ip=205.139.111.44; envelope-from=groug@kaod.org; helo=us-smtp-delivery-44.mimecast.com X-Spam_score_int: -11 X-Spam_score: -1.2 X-Spam_bar: - X-Spam_report: (-1.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_SOFTFAIL=0.665 autolearn=no autolearn_force=no X-Spam_action: no action 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: Greg Kurz , qemu-ppc@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" This argument isn't used by the backends anymore. Signed-off-by: Greg Kurz --- include/hw/ppc/spapr_irq.h | 6 ++---- hw/intc/spapr_xive.c | 4 ++-- hw/intc/xics_spapr.c | 4 ++-- hw/ppc/spapr.c | 2 +- hw/ppc/spapr_irq.c | 5 ++--- 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/include/hw/ppc/spapr_irq.h b/include/hw/ppc/spapr_irq.h index 3e1c619d4c06..e2519e4bc596 100644 --- a/include/hw/ppc/spapr_irq.h +++ b/include/hw/ppc/spapr_irq.h @@ -61,8 +61,7 @@ struct SpaprInterruptControllerClass { /* These methods should only be called on the active intc */ void (*set_irq)(SpaprInterruptController *intc, int irq, int val); void (*print_info)(SpaprInterruptController *intc, Monitor *mon); - void (*dt)(SpaprInterruptController *intc, uint32_t nr_servers, - void *fdt, uint32_t phandle); + void (*dt)(SpaprInterruptController *intc, void *fdt, uint32_t phandle= ); int (*post_load)(SpaprInterruptController *intc, int version_id); }; =20 @@ -73,8 +72,7 @@ int spapr_irq_cpu_intc_create(struct SpaprMachineState *s= papr, void spapr_irq_cpu_intc_reset(struct SpaprMachineState *spapr, PowerPCCPU = *cpu); void spapr_irq_cpu_intc_destroy(struct SpaprMachineState *spapr, PowerPCCP= U *cpu); void spapr_irq_print_info(struct SpaprMachineState *spapr, Monitor *mon); -void spapr_irq_dt(struct SpaprMachineState *spapr, uint32_t nr_servers, - void *fdt, uint32_t phandle); +void spapr_irq_dt(struct SpaprMachineState *spapr, void *fdt, uint32_t pha= ndle); =20 uint32_t spapr_irq_nr_msis(struct SpaprMachineState *spapr); int spapr_irq_msi_alloc(struct SpaprMachineState *spapr, uint32_t num, boo= l align, diff --git a/hw/intc/spapr_xive.c b/hw/intc/spapr_xive.c index 8331026fdb12..749cff9bf2b9 100644 --- a/hw/intc/spapr_xive.c +++ b/hw/intc/spapr_xive.c @@ -691,8 +691,8 @@ static void spapr_xive_print_info(SpaprInterruptControl= ler *intc, Monitor *mon) spapr_xive_pic_print_info(xive, mon); } =20 -static void spapr_xive_dt(SpaprInterruptController *intc, uint32_t nr_serv= ers, - void *fdt, uint32_t phandle) +static void spapr_xive_dt(SpaprInterruptController *intc, void *fdt, + uint32_t phandle) { SpaprXive *xive =3D SPAPR_XIVE(intc); int node; diff --git a/hw/intc/xics_spapr.c b/hw/intc/xics_spapr.c index 8810bd93c856..a790b59f1bbc 100644 --- a/hw/intc/xics_spapr.c +++ b/hw/intc/xics_spapr.c @@ -312,8 +312,8 @@ static void ics_spapr_realize(DeviceState *dev, Error *= *errp) spapr_register_hypercall(H_IPOLL, h_ipoll); } =20 -static void xics_spapr_dt(SpaprInterruptController *intc, uint32_t nr_serv= ers, - void *fdt, uint32_t phandle) +static void xics_spapr_dt(SpaprInterruptController *intc, void *fdt, + uint32_t phandle) { uint32_t interrupt_server_ranges_prop[] =3D { 0, cpu_to_be32(ICS_SPAPR(intc)->nr_servers), diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 21de0456446b..595dd1b81ce1 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1164,7 +1164,7 @@ void *spapr_build_fdt(SpaprMachineState *spapr, bool = reset, size_t space) _FDT(fdt_setprop_cell(fdt, 0, "#size-cells", 2)); =20 /* /interrupt controller */ - spapr_irq_dt(spapr, spapr_max_server_number(spapr), fdt, PHANDLE_INTC); + spapr_irq_dt(spapr, fdt, PHANDLE_INTC); =20 ret =3D spapr_dt_memory(spapr, fdt); if (ret < 0) { diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c index f2897fbc942a..f93476d00a59 100644 --- a/hw/ppc/spapr_irq.c +++ b/hw/ppc/spapr_irq.c @@ -271,13 +271,12 @@ void spapr_irq_print_info(SpaprMachineState *spapr, M= onitor *mon) sicc->print_info(spapr->active_intc, mon); } =20 -void spapr_irq_dt(SpaprMachineState *spapr, uint32_t nr_servers, - void *fdt, uint32_t phandle) +void spapr_irq_dt(SpaprMachineState *spapr, void *fdt, uint32_t phandle) { SpaprInterruptControllerClass *sicc =3D SPAPR_INTC_GET_CLASS(spapr->active_intc); =20 - sicc->dt(spapr->active_intc, nr_servers, fdt, phandle); + sicc->dt(spapr->active_intc, fdt, phandle); } =20 uint32_t spapr_irq_nr_msis(SpaprMachineState *spapr) --=20 2.26.2