From nobody Tue Feb 10 18:54:58 2026 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 ARC-Seal: i=1; a=rsa-sha256; t=1564152357; cv=none; d=zoho.com; s=zohoarc; b=Ewah6zIO9pZiuzWF97lsUe5y8yYbSq9dbb2JVPwcBddQHpAoyPtoKgj3iRhuI+17kOkVrtATuMNkZs/9imaGIIL8jivrQkXL65G4vTvwNQ+tOIVcz2nCuNO5YhFIa5ckCvaFZSyjgUI6g0rJmqdjji5xjVhqJuyrqQMU7q0OpYs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564152357; 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:ARC-Authentication-Results; bh=C8UmE/GwQhh6iZUSP6HpwDcWqRT3m8R4puYdlRlRZFs=; b=oQfs6lyzcysnTxXMJUpgWGM7qgjDnu8pCaynTslHiPUiiF3EJ7ITXzf2+ILvpDo3KJF8yXgS+dDlRCfbJ71n7oLMOk+wC0RiZywhtp/nPNP4OYLw+3lspWMtnN1f4T4SHuBboRg2rFgNL4D8VkisrCqEJxhtwyNuZLi2JXB59Ig= ARC-Authentication-Results: i=1; mx.zoho.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 1564152357357894.7587384739103; Fri, 26 Jul 2019 07:45:57 -0700 (PDT) Received: from localhost ([::1]:40706 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hr1Tn-0006bj-Oq for importer@patchew.org; Fri, 26 Jul 2019 10:45:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45547) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hr1Ss-0003hq-0g for qemu-devel@nongnu.org; Fri, 26 Jul 2019 10:44:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hr1Sr-0000Bb-1J for qemu-devel@nongnu.org; Fri, 26 Jul 2019 10:44:57 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:31220) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hr1Sq-0000AO-Q8 for qemu-devel@nongnu.org; Fri, 26 Jul 2019 10:44:56 -0400 Received: from pps.filterd (m0098404.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x6QEiBRe140352 for ; Fri, 26 Jul 2019 10:44:56 -0400 Received: from e06smtp04.uk.ibm.com (e06smtp04.uk.ibm.com [195.75.94.100]) by mx0a-001b2d01.pphosted.com with ESMTP id 2u02a0v18r-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 26 Jul 2019 10:44:55 -0400 Received: from localhost by e06smtp04.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 26 Jul 2019 15:44:53 +0100 Received: from b06cxnps4076.portsmouth.uk.ibm.com (9.149.109.198) 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) Fri, 26 Jul 2019 15:44:51 +0100 Received: from d06av24.portsmouth.uk.ibm.com (d06av24.portsmouth.uk.ibm.com [9.149.105.60]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x6QEioq911272316 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 26 Jul 2019 14:44:50 GMT Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 3582C42041; Fri, 26 Jul 2019 14:44:50 +0000 (GMT) Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 0677B4203F; Fri, 26 Jul 2019 14:44:50 +0000 (GMT) Received: from bahia.lan (unknown [9.145.15.116]) by d06av24.portsmouth.uk.ibm.com (Postfix) with ESMTP; Fri, 26 Jul 2019 14:44:49 +0000 (GMT) From: Greg Kurz To: David Gibson Date: Fri, 26 Jul 2019 16:44:49 +0200 In-Reply-To: <156415227297.1064338.9181963275184520284.stgit@bahia.lan> References: <156415227297.1064338.9181963275184520284.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: 19072614-0016-0000-0000-0000029677A7 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19072614-0017-0000-0000-000032F478EE Message-Id: <156415228966.1064338.190189424190233355.stgit@bahia.lan> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-07-26_10:, , 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-1906280000 definitions=main-1907260181 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 148.163.156.1 Subject: [Qemu-devel] [PATCH 3/3] spapr/irq: Drop spapr_irq_msi_reset() 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: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, =?utf-8?q?C=C3=A9dric?= Le Goater Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" PHBs already take care of clearing the MSIs from the bitmap during reset or unplug. No need to do this globally from the machine code. Rather add an assert to ensure that PHBs have acted as expected. Signed-off-by: Greg Kurz Reviewed-by: C=C3=A9dric Le Goater --- hw/ppc/spapr.c | 4 ---- hw/ppc/spapr_irq.c | 7 ++----- include/hw/ppc/spapr_irq.h | 1 - 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 5894329f29a9..855e9fbd9805 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1739,10 +1739,6 @@ static void spapr_machine_reset(MachineState *machin= e) ppc_set_compat(first_ppc_cpu, spapr->max_compat_pvr, &error_fatal); } =20 - if (!SPAPR_MACHINE_GET_CLASS(spapr)->legacy_irq_allocation) { - spapr_irq_msi_reset(spapr); - } - /* * NVLink2-connected GPU RAM needs to be placed on a separate NUMA nod= e. * We assign a new numa ID per GPU in spapr_pci_collect_nvgpu() which = is diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c index d07aed8ca9f9..c72d8433681d 100644 --- a/hw/ppc/spapr_irq.c +++ b/hw/ppc/spapr_irq.c @@ -57,11 +57,6 @@ void spapr_irq_msi_free(SpaprMachineState *spapr, int ir= q, uint32_t num) bitmap_clear(spapr->irq_map, irq - SPAPR_IRQ_MSI, num); } =20 -void spapr_irq_msi_reset(SpaprMachineState *spapr) -{ - bitmap_clear(spapr->irq_map, 0, spapr->irq_map_nr); -} - static void spapr_irq_init_kvm(SpaprMachineState *spapr, SpaprIrq *irq, Error **errp) { @@ -729,6 +724,8 @@ int spapr_irq_post_load(SpaprMachineState *spapr, int v= ersion_id) =20 void spapr_irq_reset(SpaprMachineState *spapr, Error **errp) { + assert(bitmap_empty(spapr->irq_map, spapr->irq_map_nr)); + if (spapr->irq->reset) { spapr->irq->reset(spapr, errp); } diff --git a/include/hw/ppc/spapr_irq.h b/include/hw/ppc/spapr_irq.h index f965a58f8954..44fe4f9e0e2e 100644 --- a/include/hw/ppc/spapr_irq.h +++ b/include/hw/ppc/spapr_irq.h @@ -28,7 +28,6 @@ void spapr_irq_msi_init(SpaprMachineState *spapr, uint32_= t nr_msis); int spapr_irq_msi_alloc(SpaprMachineState *spapr, uint32_t num, bool align, Error **errp); void spapr_irq_msi_free(SpaprMachineState *spapr, int irq, uint32_t num); -void spapr_irq_msi_reset(SpaprMachineState *spapr); =20 typedef struct SpaprIrq { uint32_t nr_irqs;