From nobody Mon Apr 29 03:29:12 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1669377266; cv=none; d=zohomail.com; s=zohoarc; b=YLypCKKU7/+J3SosDQ5fg7QbxQbsekobptI4dVvDKCJNxfQZj7tfDKBwnXmQ5vROx24HguFdafIpD0Hsirk/9Egh8Y1WFGHtX7pw1PJD4Xk/hHskYQ989zy1cU1UJH38eg1O/jED+/kEaupf+EYHR9egI6mae+Dk91+sL6oegn8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669377266; h=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=uOuixkaZOsz8kew6uKue8ojhSe9BS7w0yC1difWNjKs=; b=HMI6Xjp6+Gw4dxiLNfCaKd24scmVxfBVviW3NJ3QFfqS7ENxnH44nk+9gOma9hIoErJFPrFEiTEkPLTEkvE3iPzw4p3HZZDQoStJ+H9OdWUXBaGbkk4tauSWxBo8XasOftkKbO0xsUzsK35QrjMGpGhbJZHDSxskPoP43lLtxOo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1669377266953674.9209839995935; Fri, 25 Nov 2022 03:54:26 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyXGC-0005Yn-Mo; Fri, 25 Nov 2022 06:52:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oyXGA-0005Up-Lg for qemu-devel@nongnu.org; Fri, 25 Nov 2022 06:52:46 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oyXG8-00038m-Sf for qemu-devel@nongnu.org; Fri, 25 Nov 2022 06:52:46 -0500 Received: by mail-wm1-x32f.google.com with SMTP id t4so3258677wmj.5 for ; Fri, 25 Nov 2022 03:52:44 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id u17-20020a05600c19d100b003c6f8d30e40sm9728258wmq.31.2022.11.25.03.52.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Nov 2022 03:52:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=uOuixkaZOsz8kew6uKue8ojhSe9BS7w0yC1difWNjKs=; b=lfilWOLQOB3NIzj+/afjB3+GXq/10vQPKwV8F1dAUutcnLToFhU1Tkox11QoMvil/Q ny9v+ZFCAdO5+nlbzt2C5NBGZNkOwZPE6tkTOsJF/f2Obu/joL1SgxFouTTNUdlYQ3P7 TOvjg557qtAiDpmNmI8LF+qbq8heed3zuS/VTXJQmOPSLp6wZ6IKCtkSG6Krux4FeqF2 J5LmgwantD0mPgwUe3PjjXkXJ3zcThmwOgvvWbGerhW6nmU0CrjYKc0yTXBg1pg9o3IO 6CjJny/Jj274nYiSjZQlVndaGHxWUtBtUAUfUS31bF8BEcABR/SX7leR26tbWrcH4ukG sg+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uOuixkaZOsz8kew6uKue8ojhSe9BS7w0yC1difWNjKs=; b=WBmtAZ1HmojveH8+ykbmVnLVaGMFoWdxzLoxQYa4uGmu4AJXI9VeAfj78agiI+zOnv CvtJYlJjXbzaZ/NC20zrkTnVc6eS7QUM0bVDQVwC4spqhAPgNUghVHsQgJWJMT8Pcx2d 9WrN92hwAi6uk2dc6PKnie+JNJZUzXAbVRyNO1ldnG3/rET51w3lhfmQ8PPXRVmY+gup hAr9tu77RkHHNGqEASnBAlv7D6GsWvqCwJ7HaWBMNMOo70B9O0/LYgOgJhVxSOXk+U3A +lAjxhdAw1BXgZqljEkqs1mgEV1FbpEryLJjWIwIU0g2fVveAfxzUycUBmnBB5pafVy1 lB2A== X-Gm-Message-State: ANoB5pl32dn26AfP/f2vAmDZ8HAbTMtq8CsoVsvdRA0dgqee9SmlvIMD as7Li2sZPZLPXn28vKcfFu2jrYEswbs6hw== X-Google-Smtp-Source: AA0mqf4ij+kOi6EcluKR9n2u5X7I0N/TEdNvhGJMmYmX2E5PGCkEY+3lrGKBDZBCmCbgGw5fzn+U8g== X-Received: by 2002:a05:600c:1c12:b0:3c6:d8ba:eeb5 with SMTP id j18-20020a05600c1c1200b003c6d8baeeb5mr31232379wms.201.1669377163502; Fri, 25 Nov 2022 03:52:43 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , "Michael S. Tsirkin" , Daniel Henrique Barboza , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Greg Kurz , Marcel Apfelbaum , qemu-ppc@nongnu.org Subject: [PATCH for-8.0 1/7] hw/virtio: Convert TYPE_VIRTIO_PCI to 3-phase reset Date: Fri, 25 Nov 2022 11:52:34 +0000 Message-Id: <20221125115240.3005559-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221125115240.3005559-1-peter.maydell@linaro.org> References: <20221125115240.3005559-1-peter.maydell@linaro.org> MIME-Version: 1.0 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: pass client-ip=2a00:1450:4864:20::32f; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1669377267767100001 Content-Type: text/plain; charset="utf-8" Convert the TYPE_VIRTIO_PCI class to 3-phase reset. This is necessary so that we can convert the subclass TYPE_VIRTIO_VGA_BASE also to 3-phase reset. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Daniel Henrique Barboza --- hw/virtio/virtio-pci.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index a1c9dfa7bb5..7873083b860 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -2008,9 +2008,10 @@ static void virtio_pci_reset(DeviceState *qdev) } } =20 -static void virtio_pci_bus_reset(DeviceState *qdev) +static void virtio_pci_bus_reset_hold(Object *obj) { - PCIDevice *dev =3D PCI_DEVICE(qdev); + PCIDevice *dev =3D PCI_DEVICE(obj); + DeviceState *qdev =3D DEVICE(obj); =20 virtio_pci_reset(qdev); =20 @@ -2071,6 +2072,7 @@ static void virtio_pci_class_init(ObjectClass *klass,= void *data) DeviceClass *dc =3D DEVICE_CLASS(klass); PCIDeviceClass *k =3D PCI_DEVICE_CLASS(klass); VirtioPCIClass *vpciklass =3D VIRTIO_PCI_CLASS(klass); + ResettableClass *rc =3D RESETTABLE_CLASS(klass); =20 device_class_set_props(dc, virtio_pci_properties); k->realize =3D virtio_pci_realize; @@ -2080,7 +2082,7 @@ static void virtio_pci_class_init(ObjectClass *klass,= void *data) k->class_id =3D PCI_CLASS_OTHERS; device_class_set_parent_realize(dc, virtio_pci_dc_realize, &vpciklass->parent_dc_realize); - dc->reset =3D virtio_pci_bus_reset; + rc->phases.hold =3D virtio_pci_bus_reset_hold; } =20 static const TypeInfo virtio_pci_info =3D { --=20 2.25.1 From nobody Mon Apr 29 03:29:12 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1669377282; cv=none; d=zohomail.com; s=zohoarc; b=SWV/9j/LGKOZAz2LpbhYNaebYZz5bfuBzc2zGwCf284AH3AqLpWzVwUTNKZLT0rWyukms7MT8C5gGy0Bnt734vOOUL6YcwDjvR8DUXeeH7/HF72T44nJSt1rJmhj1/SZT0cyzHr7e9V1EWEn4xhl/4f5mrG/COicAYV8zXMroY8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669377282; h=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=s28HkAEMCk57TyI0FXFERjAS9/PKS+59lX976L2sL8o=; b=Ra4IeqJo5lwZx9QN54oRU0zNOZNrRZ2ZaCeEHlrcpik0l7Ib3U65hppIQSJOMsFGfY4qLufZxZQPLOuEkpzg/TabfFsdXGQHooRtPj83hgLJob+Udk4JO2w/luRSCyzkqJogDXvOOIF6mzFZdcqDFKYdf9O7y7p+it+7/dJpPPI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1669377282203127.4280312245429; Fri, 25 Nov 2022 03:54:42 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyXGD-0005Zi-5w; Fri, 25 Nov 2022 06:52:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oyXGB-0005XA-R0 for qemu-devel@nongnu.org; Fri, 25 Nov 2022 06:52:47 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oyXGA-000390-1m for qemu-devel@nongnu.org; Fri, 25 Nov 2022 06:52:47 -0500 Received: by mail-wm1-x333.google.com with SMTP id h131-20020a1c2189000000b003d02dd48c45so166540wmh.0 for ; Fri, 25 Nov 2022 03:52:45 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id u17-20020a05600c19d100b003c6f8d30e40sm9728258wmq.31.2022.11.25.03.52.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Nov 2022 03:52:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=s28HkAEMCk57TyI0FXFERjAS9/PKS+59lX976L2sL8o=; b=YSkgwhJoTfdg0iDC+4au1XEJJ+8CmZQLK4XrYxPqIGxckEhmjkI6vn3768ieAis94N knV6DIKmiVaTYCvCSa8Pu2GC2xr5aAPk+NmmW6Pou9RtFr+pWHAyuOCrCN74jx9bAzXQ +4PycKvqYIWJmTRsIGmQGdCg+QNQnT5zlz90o3jdK+L3EX1ifNbZ03fcxU2Enu6ORKMd 3uP07XR3SKNC/ZHmZXPs+6+YqV5FaQ9E1x2mb5Ptls7d6pw07N2VqiHRN4HfiQe50bz8 wiDRod4WR5CcstakLKCnk4cyMQhRHQ8I82yrmiJ4Oebr93PvTh2AX3PGJbU1hZ9AAPWP +mpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=s28HkAEMCk57TyI0FXFERjAS9/PKS+59lX976L2sL8o=; b=bzy0k415YNJ9js3SyGjg/4ELTcIbeTSH40WoL1Nwwkl0WlqabToQnKv4hbreHa+zrp aTkQZSzBoaJKrhaGcCzYxYHVU2qgzLc4DKwWQO0Lbl4BdNxeUFYLC5xEhojuq295lhJK ix/R9qqvukuMRZE+aM+RGQNLIAYFTWoeXZLiRDFI4e4rsq8Dps7WwIQt7j6D/R9lkL/U mv5jXZc/0CAnsMqK8x2sXubRqrZBXOb/pxk5yIpFU4Aj4DiuUFzB0zk22tvI5d+pJ6u6 5wqB5xemEK6KwJaKco+jPaSqV9syPo2rIrpXqjBdDoIAz/qiI9G6NrOQ+BQhiQtQdL6T Ka7A== X-Gm-Message-State: ANoB5pn54GPfvuJQlF0wdge+B3rdfaW+LsHspa+yGUlhcsmDdHOyKGdP IZQuAYZTssLctxBUDUgW+pWoTfnqAiwzPA== X-Google-Smtp-Source: AA0mqf4ldShfVfYENoYw7SQLc0SV7XhcD+85LzPMjGqQFQikBDeT6Rb5gu7qWX9O8bB79Tq2H/8SEg== X-Received: by 2002:a05:600c:4894:b0:3b4:91f1:da83 with SMTP id j20-20020a05600c489400b003b491f1da83mr16823006wmp.127.1669377164396; Fri, 25 Nov 2022 03:52:44 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , "Michael S. Tsirkin" , Daniel Henrique Barboza , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Greg Kurz , Marcel Apfelbaum , qemu-ppc@nongnu.org Subject: [PATCH for-8.0 2/7] hw/display/virtio-vga: Convert TYPE_VIRTIO_VGA_BASE to 3-phase reset Date: Fri, 25 Nov 2022 11:52:35 +0000 Message-Id: <20221125115240.3005559-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221125115240.3005559-1-peter.maydell@linaro.org> References: <20221125115240.3005559-1-peter.maydell@linaro.org> MIME-Version: 1.0 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: pass client-ip=2a00:1450:4864:20::333; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x333.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1669377283739100002 Content-Type: text/plain; charset="utf-8" Convert the TYPE_VIRTIO_VGA_BASE class to 3-phase reset, so we don't need to use device_class_set_parent_reset() any more. Note that this is an abstract class itself; none of the subclasses override its reset method. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Daniel Henrique Barboza --- hw/display/virtio-vga.h | 2 +- hw/display/virtio-vga.c | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/hw/display/virtio-vga.h b/hw/display/virtio-vga.h index 977ad5edc29..0bd9db1ceea 100644 --- a/hw/display/virtio-vga.h +++ b/hw/display/virtio-vga.h @@ -23,7 +23,7 @@ struct VirtIOVGABase { struct VirtIOVGABaseClass { VirtioPCIClass parent_class; =20 - DeviceReset parent_reset; + ResettablePhases parent_phases; }; =20 #endif /* VIRTIO_VGA_H */ diff --git a/hw/display/virtio-vga.c b/hw/display/virtio-vga.c index 4dcb34c4a74..e6fb0aa876c 100644 --- a/hw/display/virtio-vga.c +++ b/hw/display/virtio-vga.c @@ -165,13 +165,15 @@ static void virtio_vga_base_realize(VirtIOPCIProxy *v= pci_dev, Error **errp) } } =20 -static void virtio_vga_base_reset(DeviceState *dev) +static void virtio_vga_base_reset_hold(Object *obj) { - VirtIOVGABaseClass *klass =3D VIRTIO_VGA_BASE_GET_CLASS(dev); - VirtIOVGABase *vvga =3D VIRTIO_VGA_BASE(dev); + VirtIOVGABaseClass *klass =3D VIRTIO_VGA_BASE_GET_CLASS(obj); + VirtIOVGABase *vvga =3D VIRTIO_VGA_BASE(obj); =20 /* reset virtio-gpu */ - klass->parent_reset(dev); + if (klass->parent_phases.hold) { + klass->parent_phases.hold(obj); + } =20 /* reset vga */ vga_common_reset(&vvga->vga); @@ -203,13 +205,14 @@ static void virtio_vga_base_class_init(ObjectClass *k= lass, void *data) VirtioPCIClass *k =3D VIRTIO_PCI_CLASS(klass); VirtIOVGABaseClass *v =3D VIRTIO_VGA_BASE_CLASS(klass); PCIDeviceClass *pcidev_k =3D PCI_DEVICE_CLASS(klass); + ResettableClass *rc =3D RESETTABLE_CLASS(klass); =20 set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories); device_class_set_props(dc, virtio_vga_base_properties); dc->vmsd =3D &vmstate_virtio_vga_base; dc->hotpluggable =3D false; - device_class_set_parent_reset(dc, virtio_vga_base_reset, - &v->parent_reset); + resettable_class_set_parent_phases(rc, NULL, virtio_vga_base_reset_hol= d, + NULL, &v->parent_phases); =20 k->realize =3D virtio_vga_base_realize; pcidev_k->romfile =3D "vgabios-virtio.bin"; --=20 2.25.1 From nobody Mon Apr 29 03:29:12 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1669377212; cv=none; d=zohomail.com; s=zohoarc; b=L4O81Ht4pEf2hwXWePxVBhBjJl3Zojxg92Ryc9VGCOHV8fdECpwLZ6vSGguN/ZQCd1KrvbZAdB9K4v9IOZgWSrkggqnh+CeLGImJTUBJugaZSUW1uk06UyY4IG/ZUg0Tpn+SduJdTX1D+cGux92n+ufxpQ1AwqVqZkhXXNJhGOQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669377212; h=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=mCVlswDC9lwKyFBztWRL0YIC/KZJpgpptO+kyEAjxcg=; b=Il8ddF5rvB73BmWdkZS9SvyPtiXY7Q1sFQAVjDseARO7jmTCGCS3N25j5GmwPSVf34zq/xznQiaa7iQMBGhlUXGNSOUcy5Na35KnsWaYowbZoZd4YOblEN5ay11uqnytoErkjj+gklaijU8uV+D8MIHwSceMaL5rDDqr+0Vypik= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16693772120167.2618823957340055; Fri, 25 Nov 2022 03:53:32 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyXGF-0005em-FF; Fri, 25 Nov 2022 06:52:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oyXGD-0005bF-Ua for qemu-devel@nongnu.org; Fri, 25 Nov 2022 06:52:49 -0500 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oyXGA-00039G-Rf for qemu-devel@nongnu.org; Fri, 25 Nov 2022 06:52:49 -0500 Received: by mail-wr1-x430.google.com with SMTP id z4so6419145wrr.3 for ; Fri, 25 Nov 2022 03:52:46 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id u17-20020a05600c19d100b003c6f8d30e40sm9728258wmq.31.2022.11.25.03.52.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Nov 2022 03:52:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mCVlswDC9lwKyFBztWRL0YIC/KZJpgpptO+kyEAjxcg=; b=w2PUQOIw3UeznxPGzVRgTGLt8tCJAQE29DyLXuwwuSx2OdcNDYDw6Vh3Je4D7iFtn+ H4H5QJFq19B61M5lovgMklSEodClfjnV/594HIcMETnxoME3MkuEEiR9k3Imolz7oZBf 6KfzNt8JkqM1xT7Ni+CPWBWbkHBhjwnWCIs+SbEHIlVjauxMdg3fxuSwXoe0JPz3V7AJ D+4rcgm+6L9bQDmvKFE3C8mXjhnSi4JR/Ck+cfhFMaKWtr1s7yBa70SeigmMpex+ameB nuijq843OkKpWiEuYAHAHtTT7TIPQ8ZrPZNtyY2VTL1//pAmG0FiwZaiagUltOrFFDvG ZP+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mCVlswDC9lwKyFBztWRL0YIC/KZJpgpptO+kyEAjxcg=; b=5Hrpv7NMhKZGDu0GrQywaRQ6jOp1QCaxCisIgOrn1JIFTjCF9jHl8SnqFAUK7T6HWf /XfbEIW+EYMGMy7tBicTZSRA4BxZTIkrmIiutgiv/0QjdGYxoUDGdsdPqFsh/1D+toAU py0s/8xRyB/ShhvK6t1RLU1UHuDTutz30RB3Hb+MYVe4NYjjQ5ymHBToR6mh7TYvqK1F kLf+NM6zZ/+K0Sh2zebWeMmer+OERjGelMRVIv3aZukRXrJTcxYEXeT7vmPSH4pKk/YY 1X3LYzHiulVb0VSCaAk5aDdC+Fo+zcXK/inHnRJ45CwYT34NU87dMe83Zr+vdrtSMqr3 swfQ== X-Gm-Message-State: ANoB5pnkPnlvjMuNAmsDIwMbAZKoOBnHwDGbQVvakUXo3iY0tpwAyI3K Z7OpsQfu1FZZUXHrKPmGiQRJ83iA27afgw== X-Google-Smtp-Source: AA0mqf5s8UEDxvS+9cRt2rJ4F64e1QBrtilORmhIsm1c0eB+jWG+pz7tPLBJ4MT5mGdo+62D3hzR/A== X-Received: by 2002:adf:c64e:0:b0:236:78cd:f3d2 with SMTP id u14-20020adfc64e000000b0023678cdf3d2mr23799409wrg.719.1669377165410; Fri, 25 Nov 2022 03:52:45 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , "Michael S. Tsirkin" , Daniel Henrique Barboza , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Greg Kurz , Marcel Apfelbaum , qemu-ppc@nongnu.org Subject: [PATCH for-8.0 3/7] pci: Convert TYPE_PCIE_ROOT_PORT to 3-phase reset Date: Fri, 25 Nov 2022 11:52:36 +0000 Message-Id: <20221125115240.3005559-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221125115240.3005559-1-peter.maydell@linaro.org> References: <20221125115240.3005559-1-peter.maydell@linaro.org> MIME-Version: 1.0 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: pass client-ip=2a00:1450:4864:20::430; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x430.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1669377213483100003 Content-Type: text/plain; charset="utf-8" Convert the TYPE_PCIE_ROOT_PORT device to 3-phase reset; this is a necessary precursor to converting any of its child classes. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Daniel Henrique Barboza --- hw/pci-bridge/pcie_root_port.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/hw/pci-bridge/pcie_root_port.c b/hw/pci-bridge/pcie_root_port.c index 460e48269d4..36bc0bafa7e 100644 --- a/hw/pci-bridge/pcie_root_port.c +++ b/hw/pci-bridge/pcie_root_port.c @@ -43,9 +43,10 @@ static void rp_write_config(PCIDevice *d, uint32_t addre= ss, pcie_aer_root_write_config(d, address, val, len, root_cmd); } =20 -static void rp_reset(DeviceState *qdev) +static void rp_reset_hold(Object *obj) { - PCIDevice *d =3D PCI_DEVICE(qdev); + PCIDevice *d =3D PCI_DEVICE(obj); + DeviceState *qdev =3D DEVICE(obj); =20 rp_aer_vector_update(d); pcie_cap_root_reset(d); @@ -171,13 +172,14 @@ static void rp_class_init(ObjectClass *klass, void *d= ata) { DeviceClass *dc =3D DEVICE_CLASS(klass); PCIDeviceClass *k =3D PCI_DEVICE_CLASS(klass); + ResettableClass *rc =3D RESETTABLE_CLASS(klass); =20 k->is_bridge =3D true; k->config_write =3D rp_write_config; k->realize =3D rp_realize; k->exit =3D rp_exit; set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories); - dc->reset =3D rp_reset; + rc->phases.hold =3D rp_reset_hold; device_class_set_props(dc, rp_props); } =20 --=20 2.25.1 From nobody Mon Apr 29 03:29:12 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1669377268; cv=none; d=zohomail.com; s=zohoarc; b=M87F/4fepuJI+M1onJowUoH7lFEPrD5kIsVho0H2llVZDpAxL1BxsaY6wt+IBr/KcvqQzTfb5OpDrPf4YGW5PQ6WPVgN4om3Gb3VnXZL4zClFBmUUzVEZSB/tREE0/DzSklS6xgrCio0NOz+RAu5TsxeXK4aJyXTrHVK6CCpl2o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669377268; h=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=IJ4qIWoL++eMLbfkZYy8FK1zBpGEGlxYqMfghUQB7Bo=; b=ffG9OrhbYNR85qAK5bCHgYF6Su8TXtnV8/WYtIL7qklKkNNX0BzKSkjZGZLK6GQ6n1HgXzjn006B5Ft+f8DEtIh7HqLNwxggz4rCe8pIviCJKNodBfXwBfAKlznAVvCNn3D0mMOwttzvg51CpRhCu93JYE8lNmazeFp1WOHG82g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1669377268891419.1141856899857; Fri, 25 Nov 2022 03:54:28 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyXGE-0005cw-NL; Fri, 25 Nov 2022 06:52:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oyXGD-0005aK-GZ for qemu-devel@nongnu.org; Fri, 25 Nov 2022 06:52:49 -0500 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oyXGB-00039m-LZ for qemu-devel@nongnu.org; Fri, 25 Nov 2022 06:52:49 -0500 Received: by mail-wr1-x42a.google.com with SMTP id z4so6419207wrr.3 for ; Fri, 25 Nov 2022 03:52:47 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id u17-20020a05600c19d100b003c6f8d30e40sm9728258wmq.31.2022.11.25.03.52.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Nov 2022 03:52:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=IJ4qIWoL++eMLbfkZYy8FK1zBpGEGlxYqMfghUQB7Bo=; b=I03GyLlm6xvIPuzXmo0VyCmTFs6tYqQRsk0ZYaqZ0qL4XJik/tA9pDtvNgkB6YEVX2 Td03n2wQ3aGadKiO2MQ7iPAM2jPxTGq4NhNJxqNWLi16v7x1BmTJz4p4Fn3u9xp3gAdS lwqLqobyI2G3TDaAbsVzIO+7PBaE9/GXpP/g4LTOQcFqLtzD2UOhBqVg7fmZBwIyXZ// U2xhmvpkoMRbUhrNvD4HFZwtRTMgvvNmVmihqjEdnRj5PyjiBmuQMv8kkLXVRUEkIQya K2keY/HPrJ0QOMcp/5eJOZGvldXeaEMf4Ysesub6Q2+dJg1OFZSPJQvYm3hUpE8C02Un SuLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IJ4qIWoL++eMLbfkZYy8FK1zBpGEGlxYqMfghUQB7Bo=; b=UHZTIH2rRBmNODuA/HYbTYaR0D+autAn3twnM36J6vFficuyx2im92LufquBDu+3mV AWyj8dlc+Y+glZiVuaDs/fQWPwa0eciwss8ln15FR9HV1hHllf7FTl/xjwacCOJ5u43v F4eBZ9JoBheHvj0bDwqmdoIFwzLq+R6/1xZKSydHQdFcLxSIUvss4QgxakEZdRPLgtJN 7ZiHTn6r5rQ3Pz2ye3fC0/lUFDKDfUCpTIKlK4EjEM+4Ci0z1KYvAbMc/v9kcnTO6DCF 7J7dSaxDh92C8LHZuhCVGLCqQ+Lpb6n04/JTmmS37Gvh3bkdJNgZPu5AWvtDceYtJig0 +OCw== X-Gm-Message-State: ANoB5pnywbe648FPceoKRXVW2GDQXKM89cLJEEx7lyZSlIN+mDo6GWpE ZYDDFO/CfZVibhoAh9k0192f70dEIDepHQ== X-Google-Smtp-Source: AA0mqf7Lo6Wldp+ruEMndQ3TG5/wSzIgxz4+GGfI0x8JdoHfgf/duLD5jDx4UNUWGIOqnW1ACm5C5Q== X-Received: by 2002:adf:fec7:0:b0:236:8d39:6f84 with SMTP id q7-20020adffec7000000b002368d396f84mr21857705wrs.152.1669377166321; Fri, 25 Nov 2022 03:52:46 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , "Michael S. Tsirkin" , Daniel Henrique Barboza , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Greg Kurz , Marcel Apfelbaum , qemu-ppc@nongnu.org Subject: [PATCH for-8.0 4/7] pci: Convert child classes of TYPE_PCIE_ROOT_PORT to 3-phase reset Date: Fri, 25 Nov 2022 11:52:37 +0000 Message-Id: <20221125115240.3005559-5-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221125115240.3005559-1-peter.maydell@linaro.org> References: <20221125115240.3005559-1-peter.maydell@linaro.org> MIME-Version: 1.0 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: pass client-ip=2a00:1450:4864:20::42a; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1669377269745100007 Content-Type: text/plain; charset="utf-8" Convert the TYPE_CXL_ROOT_PORT and TYPE_PNV_PHB_ROOT_PORT classes to 3-phase reset, so they don't need to use the deprecated device_class_set_parent_reset() function any more. We have to do both in the same commit, because they keep the parent_reset field in their common parent class's class struct. Note that pnv_phb_root_port_class_init() was pointlessly setting dc->reset twice, once by calling device_class_set_parent_reset() and once directly. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Daniel Henrique Barboza --- include/hw/pci/pcie_port.h | 2 +- hw/pci-bridge/cxl_root_port.c | 14 +++++++++----- hw/pci-host/pnv_phb.c | 18 ++++++++++-------- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/include/hw/pci/pcie_port.h b/include/hw/pci/pcie_port.h index 7b8193061ac..d9b5d075049 100644 --- a/include/hw/pci/pcie_port.h +++ b/include/hw/pci/pcie_port.h @@ -80,7 +80,7 @@ DECLARE_CLASS_CHECKERS(PCIERootPortClass, PCIE_ROOT_PORT, struct PCIERootPortClass { PCIDeviceClass parent_class; DeviceRealize parent_realize; - DeviceReset parent_reset; + ResettablePhases parent_phases; =20 uint8_t (*aer_vector)(const PCIDevice *dev); int (*interrupts_init)(PCIDevice *dev, Error **errp); diff --git a/hw/pci-bridge/cxl_root_port.c b/hw/pci-bridge/cxl_root_port.c index fb213fa06ef..6664783974c 100644 --- a/hw/pci-bridge/cxl_root_port.c +++ b/hw/pci-bridge/cxl_root_port.c @@ -138,12 +138,14 @@ static void cxl_rp_realize(DeviceState *dev, Error **= errp) component_bar); } =20 -static void cxl_rp_reset(DeviceState *dev) +static void cxl_rp_reset_hold(Object *obj) { - PCIERootPortClass *rpc =3D PCIE_ROOT_PORT_GET_CLASS(dev); - CXLRootPort *crp =3D CXL_ROOT_PORT(dev); + PCIERootPortClass *rpc =3D PCIE_ROOT_PORT_GET_CLASS(obj); + CXLRootPort *crp =3D CXL_ROOT_PORT(obj); =20 - rpc->parent_reset(dev); + if (rpc->parent_phases.hold) { + rpc->parent_phases.hold(obj); + } =20 latch_registers(crp); } @@ -199,6 +201,7 @@ static void cxl_root_port_class_init(ObjectClass *oc, v= oid *data) { DeviceClass *dc =3D DEVICE_CLASS(oc); PCIDeviceClass *k =3D PCI_DEVICE_CLASS(oc); + ResettableClass *rc =3D RESETTABLE_CLASS(oc); PCIERootPortClass *rpc =3D PCIE_ROOT_PORT_CLASS(oc); =20 k->vendor_id =3D PCI_VENDOR_ID_INTEL; @@ -209,7 +212,8 @@ static void cxl_root_port_class_init(ObjectClass *oc, v= oid *data) k->config_write =3D cxl_rp_write_config; =20 device_class_set_parent_realize(dc, cxl_rp_realize, &rpc->parent_reali= ze); - device_class_set_parent_reset(dc, cxl_rp_reset, &rpc->parent_reset); + resettable_class_set_parent_phases(rc, NULL, cxl_rp_reset_hold, NULL, + &rpc->parent_phases); =20 rpc->aer_offset =3D GEN_PCIE_ROOT_PORT_AER_OFFSET; rpc->acs_offset =3D GEN_PCIE_ROOT_PORT_ACS_OFFSET; diff --git a/hw/pci-host/pnv_phb.c b/hw/pci-host/pnv_phb.c index 0b26b43736f..c62b08538ac 100644 --- a/hw/pci-host/pnv_phb.c +++ b/hw/pci-host/pnv_phb.c @@ -199,14 +199,16 @@ static void pnv_phb_class_init(ObjectClass *klass, vo= id *data) dc->user_creatable =3D true; } =20 -static void pnv_phb_root_port_reset(DeviceState *dev) +static void pnv_phb_root_port_reset_hold(Object *obj) { - PCIERootPortClass *rpc =3D PCIE_ROOT_PORT_GET_CLASS(dev); - PnvPHBRootPort *phb_rp =3D PNV_PHB_ROOT_PORT(dev); - PCIDevice *d =3D PCI_DEVICE(dev); + PCIERootPortClass *rpc =3D PCIE_ROOT_PORT_GET_CLASS(obj); + PnvPHBRootPort *phb_rp =3D PNV_PHB_ROOT_PORT(obj); + PCIDevice *d =3D PCI_DEVICE(obj); uint8_t *conf =3D d->config; =20 - rpc->parent_reset(dev); + if (rpc->parent_phases.hold) { + rpc->parent_phases.hold(obj); + } =20 if (phb_rp->version =3D=3D 3) { return; @@ -300,6 +302,7 @@ static Property pnv_phb_root_port_properties[] =3D { static void pnv_phb_root_port_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); + ResettableClass *rc =3D RESETTABLE_CLASS(klass); PCIDeviceClass *k =3D PCI_DEVICE_CLASS(klass); PCIERootPortClass *rpc =3D PCIE_ROOT_PORT_CLASS(klass); =20 @@ -308,9 +311,8 @@ static void pnv_phb_root_port_class_init(ObjectClass *k= lass, void *data) device_class_set_props(dc, pnv_phb_root_port_properties); device_class_set_parent_realize(dc, pnv_phb_root_port_realize, &rpc->parent_realize); - device_class_set_parent_reset(dc, pnv_phb_root_port_reset, - &rpc->parent_reset); - dc->reset =3D &pnv_phb_root_port_reset; + resettable_class_set_parent_phases(rc, NULL, pnv_phb_root_port_reset_h= old, + NULL, &rpc->parent_phases); dc->user_creatable =3D true; =20 k->vendor_id =3D PCI_VENDOR_ID_IBM; --=20 2.25.1 From nobody Mon Apr 29 03:29:12 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1669377192; cv=none; d=zohomail.com; s=zohoarc; b=ftk1p2kdVSHE53ZrE9kwljyyZhTpihfxzAnVgEOkEMUuVnImhANqg3zU1hiBxw92oEz+N0sk8fReAmgjK1zpQV3wy2I2cxTujgZaMFCji8+WqB+jX9S5AXxNO8TCne+sLXfPpOztCS1azm9EoIrrIeRTOUNdRQv1mbWNJpRkEf0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669377192; h=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=Q7QwRIJ7+JF6N2x5NqeLNiV3OMXYdz7GNPaIQ9AMgrE=; b=OQlOjOw2P8Ij84KwopmeZjVNEo0MTCgqvYXFgju2MW1iUF9jsWbe6tA3XDS5NOEy7nS5AETNmJM764cpJfdrnSQZJDvt9OH4vDQvvRcxwE+oMoP0YGMYdCI2XYdpYnxHqlavgaVyl4dzXIZqCrvKOw9bKFc0DD91wo0UzckrpK0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1669377192072773.3186473396639; Fri, 25 Nov 2022 03:53:12 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyXGF-0005dc-05; Fri, 25 Nov 2022 06:52:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oyXGE-0005bx-AJ for qemu-devel@nongnu.org; Fri, 25 Nov 2022 06:52:50 -0500 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oyXGC-00039z-Kf for qemu-devel@nongnu.org; Fri, 25 Nov 2022 06:52:50 -0500 Received: by mail-wr1-x436.google.com with SMTP id cl5so6391571wrb.9 for ; Fri, 25 Nov 2022 03:52:48 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id u17-20020a05600c19d100b003c6f8d30e40sm9728258wmq.31.2022.11.25.03.52.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Nov 2022 03:52:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Q7QwRIJ7+JF6N2x5NqeLNiV3OMXYdz7GNPaIQ9AMgrE=; b=XTVE4DpXJVw6z6EV8X3Dx7NfrSpPK4+oRSFFAVqd5qvhaWyN8nUVlhLV5bF4++IGV4 u7vpoOfdg+XTgaXqOtKi7MuR5AePQWu2v6NfC/0iqcCv7pk0G/KufzzpEGodFvBx7Tw6 mq5cntrwCp+d0fISg5RghulN/nEHcejfbEGgypbzN6VXTkkAQSaQYClByHpx3OSjO2k+ kqkIRyjoSELb++Z+mMqTDxTMYnBJzXsaTdkxckvjwriRYxOFRIWyLMd2opZw8nz8vASo ZpJQdsA2AmsyCw7edGy9PPQ0oKECc596a9uCH0X0t6YeHkKxKQxndjahnlGmXU1xwm6U Qokw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Q7QwRIJ7+JF6N2x5NqeLNiV3OMXYdz7GNPaIQ9AMgrE=; b=aFPSft6cLoNpTfBRifutgCMG2dlbHRM8l95eSvbcS3bKr4FlnFKrCwPxQwM4oee/QB FF0e3QkE0AIZ4Xn9Sby6u/z9z8uELu7C4OCPQe7/g48BblyxLzVrJGsKG/QFvcmfky0w SekmZMhPK/6AtTNgs5M9osum5IGtToDsgPV8D5QLaZnpqweiWuKYhXU6phCdvHkRJDSG lS9SscNriQ50VwwyE98D8SsVjsapzgXy8J8vyglbfSH/JKiD5ZLySSsRAYMdPK/QtaJL iWqF0vP9JHyJLbXnd4ATmDsprGmMmDVM8lWXTgKr+2AesL1RxfVf3LaRCqcn87sD58Xs HZ3g== X-Gm-Message-State: ANoB5pncUckE79O+wPrRASuDHBj7KWq8C5iV1AQpw4n2u0vwsLjP/O8K hjiqdSkKE/fRteor3AIlbxVLBT9B4fTK4A== X-Google-Smtp-Source: AA0mqf6WElggmOF82EqhuYw86XXlR8Bqps0bERtyLPwtYOM+lEkooRTjwOuQpX0Xq+xNGFzhhoszQQ== X-Received: by 2002:adf:eb8f:0:b0:22e:48ee:dc64 with SMTP id t15-20020adfeb8f000000b0022e48eedc64mr22570649wrn.319.1669377167319; Fri, 25 Nov 2022 03:52:47 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , "Michael S. Tsirkin" , Daniel Henrique Barboza , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Greg Kurz , Marcel Apfelbaum , qemu-ppc@nongnu.org Subject: [PATCH for-8.0 5/7] hw/intc/xics: Reset TYPE_ICS objects with device_cold_reset() Date: Fri, 25 Nov 2022 11:52:38 +0000 Message-Id: <20221125115240.3005559-6-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221125115240.3005559-1-peter.maydell@linaro.org> References: <20221125115240.3005559-1-peter.maydell@linaro.org> MIME-Version: 1.0 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: pass client-ip=2a00:1450:4864:20::436; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x436.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1669377193585100003 Content-Type: text/plain; charset="utf-8" The realize method for the TYPE_ICS class uses qemu_register_reset() to register a reset handler, as a workaround for the fact that currently objects which directly inherit from TYPE_DEVICE don't get automatically reset. However, the reset function directly calls ics_reset(), which is the function that implements the legacy reset method. This means that only the parent class's data gets reset, and a subclass which also needs to handle reset, like TYPE_PHB3_MSI, has to register its own reset function. Make the TYPE_ICS reset function call device_cold_reset() instead: this will handle reset for both the parent class and the subclass, and will work whether the classes are using legacy reset or 3-phase reset. This allows us to remove the reset function that the subclass currently has to set up. Signed-off-by: Peter Maydell Reviewed-by: C=C3=A9dric Le Goater Reviewed-by: Greg Kurz Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Daniel Henrique Barboza --- hw/intc/xics.c | 2 +- hw/pci-host/pnv_phb3_msi.c | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/hw/intc/xics.c b/hw/intc/xics.c index dcd021af668..dd130467ccc 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -593,7 +593,7 @@ static void ics_reset(DeviceState *dev) =20 static void ics_reset_handler(void *dev) { - ics_reset(dev); + device_cold_reset(dev); } =20 static void ics_realize(DeviceState *dev, Error **errp) diff --git a/hw/pci-host/pnv_phb3_msi.c b/hw/pci-host/pnv_phb3_msi.c index 2f4112907b8..ae908fd9e41 100644 --- a/hw/pci-host/pnv_phb3_msi.c +++ b/hw/pci-host/pnv_phb3_msi.c @@ -239,11 +239,6 @@ static void phb3_msi_reset(DeviceState *dev) msi->rba_sum =3D 0; } =20 -static void phb3_msi_reset_handler(void *dev) -{ - phb3_msi_reset(dev); -} - void pnv_phb3_msi_update_config(Phb3MsiState *msi, uint32_t base, uint32_t count) { @@ -272,8 +267,6 @@ static void phb3_msi_realize(DeviceState *dev, Error **= errp) } =20 msi->qirqs =3D qemu_allocate_irqs(phb3_msi_set_irq, msi, ics->nr_irqs); - - qemu_register_reset(phb3_msi_reset_handler, dev); } =20 static void phb3_msi_instance_init(Object *obj) --=20 2.25.1 From nobody Mon Apr 29 03:29:12 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1669377305; cv=none; d=zohomail.com; s=zohoarc; b=Jk1CmQHHzA0Tm6IuluEHvlCyAWrsfSK+3jf8sylY+kCRWkKbUvff+Cs9hF1ePaW+ai+P5RQUdcapHcu+v8L7cnM16u9CD/Jc5V0Ux57ZrzQQ+J87+7UpkvTAiO9rGHsPQqNvfuyVLAVBOQ/yR3cddgXidU2utmKv0oc9jgYvEBk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669377305; h=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=M9Mj8OvxgQeFGTHRLXh76jvK7T283WvCeQVqE6RZnIQ=; b=SBufDm3v9O96K7xk6zhL6mneRZZF9PBECYWJoKyLulwVmspgYpBRSSWTOWdwXiXAHTi4AF0g+LPXEz6jmH977qW9Evp2g42Zo2+P046OSnsyW8arFhpCotxh8VEg8MechkHG+L+VqAk/Lj5dspSIph7/0u4seHCoLu/lFur3t5w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1669377305917582.4648768949456; Fri, 25 Nov 2022 03:55:05 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyXGH-0005kT-Qc; Fri, 25 Nov 2022 06:52:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oyXGF-0005ft-Ox for qemu-devel@nongnu.org; Fri, 25 Nov 2022 06:52:51 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oyXGC-00038m-U4 for qemu-devel@nongnu.org; Fri, 25 Nov 2022 06:52:51 -0500 Received: by mail-wm1-x32f.google.com with SMTP id t4so3258798wmj.5 for ; Fri, 25 Nov 2022 03:52:48 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id u17-20020a05600c19d100b003c6f8d30e40sm9728258wmq.31.2022.11.25.03.52.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Nov 2022 03:52:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=M9Mj8OvxgQeFGTHRLXh76jvK7T283WvCeQVqE6RZnIQ=; b=Pd7sKA+NVzZOXEhPFVAcnsoWlLImj/LIz5q5pBXPOzfTZmGDwCdK0uRvZuhLdzxo2G ONJe+r811Dkax/Ek+Ntb01y5P8ai9R7JFElchQ/R43tpfBENrpM3bNQTaULflViAxqPe RwfiZz+Xqq0kVQfqDCsy1jAZPVdxVJZdrVxUcg7td5z6C1xHGefa77ILb0J42HHaef01 +mLkptfHoaVuGv1hwFjA44w3KsrQCmmg2+PM6J33IP+EHMxLUr1J4Jv7IGzyxTGig8gR NizhSdAP5ib0dZIg15OWvTVlPKwG+xhgQrx3E1PDp2qvkmwVQD6On0QAw+rjA3W3xC2v Vi2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=M9Mj8OvxgQeFGTHRLXh76jvK7T283WvCeQVqE6RZnIQ=; b=1rkpSZaJjDHGDw8HXKQ64MGJVPsAcFyXNXJBFebS4WxgefVa8XA+F8zl5a0kE+Z+8v MbCfHEgeVRax0mSiGtJSoCEvP7rx1kUBkEtgXamHw3TJMzttuE6fLMlh8fcIEaftmpX5 GjsIvvLDlmpAiaMvFk4/L8FNQKQveAEu2amMyk7LFVoCkuE/L+ez8nLTOia8fFMCvd/q OWNLlBTaSk8Op6b7uyrRxFBN52NRaJbsrg6lgtV4GPCgqKAJFxwxWzSm3QncGvKrAfHo BNrf1muv1F3lWz96Uv0PytNwsKkb8fIHCmeQ7QjW24c4oLcO1PDlpenNO4wWo3yjrnSm MbaA== X-Gm-Message-State: ANoB5pkKgrADrh3P2JA1FQi/6DgNOIZVxpRVs/GSi18fidWzqu591gj3 7wChIuJKl4Zwxmkai2QuKJn1oE3Vj8lUqw== X-Google-Smtp-Source: AA0mqf4bwlL58+BbUERw8a2DEXwxKBFKjVp9vEXvjJScs2v0siVcwyHZwEYkWQFwmBz8MZ02mVgz+A== X-Received: by 2002:a05:600c:358c:b0:3c6:c089:9810 with SMTP id p12-20020a05600c358c00b003c6c0899810mr30075234wmq.60.1669377168244; Fri, 25 Nov 2022 03:52:48 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , "Michael S. Tsirkin" , Daniel Henrique Barboza , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Greg Kurz , Marcel Apfelbaum , qemu-ppc@nongnu.org Subject: [PATCH for-8.0 6/7] hw/intc/xics: Convert TYPE_ICS to 3-phase reset Date: Fri, 25 Nov 2022 11:52:39 +0000 Message-Id: <20221125115240.3005559-7-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221125115240.3005559-1-peter.maydell@linaro.org> References: <20221125115240.3005559-1-peter.maydell@linaro.org> MIME-Version: 1.0 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: pass client-ip=2a00:1450:4864:20::32f; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1669377307887100003 Content-Type: text/plain; charset="utf-8" Convert the TYPE_ICS class to 3-phase reset; this will allow us to convert the TYPE_PHB3_MSI class which inherits from it. Signed-off-by: Peter Maydell Reviewed-by: C=C3=A9dric Le Goater Reviewed-by: Greg Kurz Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Daniel Henrique Barboza --- hw/intc/xics.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/hw/intc/xics.c b/hw/intc/xics.c index dd130467ccc..c7f8abd71e4 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -564,9 +564,9 @@ static void ics_reset_irq(ICSIRQState *irq) irq->saved_priority =3D 0xff; } =20 -static void ics_reset(DeviceState *dev) +static void ics_reset_hold(Object *obj) { - ICSState *ics =3D ICS(dev); + ICSState *ics =3D ICS(obj); g_autofree uint8_t *flags =3D g_malloc(ics->nr_irqs); int i; =20 @@ -584,7 +584,7 @@ static void ics_reset(DeviceState *dev) if (kvm_irqchip_in_kernel()) { Error *local_err =3D NULL; =20 - ics_set_kvm_state(ICS(dev), &local_err); + ics_set_kvm_state(ics, &local_err); if (local_err) { error_report_err(local_err); } @@ -688,16 +688,17 @@ static Property ics_properties[] =3D { static void ics_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); + ResettableClass *rc =3D RESETTABLE_CLASS(klass); =20 dc->realize =3D ics_realize; device_class_set_props(dc, ics_properties); - dc->reset =3D ics_reset; dc->vmsd =3D &vmstate_ics; /* * Reason: part of XICS interrupt controller, needs to be wired up, * e.g. by spapr_irq_init(). */ dc->user_creatable =3D false; + rc->phases.hold =3D ics_reset_hold; } =20 static const TypeInfo ics_info =3D { --=20 2.25.1 From nobody Mon Apr 29 03:29:12 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1669377294; cv=none; d=zohomail.com; s=zohoarc; b=RMenf78j1VvsA4/8g+9X/MUWpxxT02LuGUaOzPy+iyVriQF+IGirQOme16XuUsFJlEzDQs3DCY71eBNFfHXnX99L6eeYi9kfptSK2HecXb13we2TdV8/TJNlxVAiWvhca+PAUkv7KoBB4Wv1wfrvcxlhojN/BJnmedzFbUujgpQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669377294; h=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=JK4BwjUjq8SMTmsNOtUO5YdKWY0srVFYt//aP/k+QgA=; b=Y6PK0Z5ESL/U6SF4YWIZsgXDFcgEpIAR5Kv+J3jI5zTH8K+I+dtjAeUzO8MjBJC4Grfj7oF0r9c0VXYdxgwXXiU0/+HQYzHcER4pALtpA5k2E8M74nczy+rxqM7JhntDwAS8/TR25tXIjZGCDwY1Zeq7hFCM7W1vwkhzt07vg3E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1669377294186667.2337820685063; Fri, 25 Nov 2022 03:54:54 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyXGI-0005lZ-5L; Fri, 25 Nov 2022 06:52:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oyXGH-0005jp-CG for qemu-devel@nongnu.org; Fri, 25 Nov 2022 06:52:53 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oyXGF-0003At-M1 for qemu-devel@nongnu.org; Fri, 25 Nov 2022 06:52:53 -0500 Received: by mail-wm1-x331.google.com with SMTP id j5-20020a05600c410500b003cfa9c0ea76so3225414wmi.3 for ; Fri, 25 Nov 2022 03:52:50 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id u17-20020a05600c19d100b003c6f8d30e40sm9728258wmq.31.2022.11.25.03.52.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Nov 2022 03:52:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JK4BwjUjq8SMTmsNOtUO5YdKWY0srVFYt//aP/k+QgA=; b=TcMiNe5qph7XT4bxapz8Lbi+HIkmiXXNZiOV5Yx1gmBgUcLSlJFd0YV12qmpFJzbLt o5sEXiKvy6cc7yQdLpOrcl4tPyxLs5sFlKxgJa5mNYV/Dj2w1JBgqIEw0JlclDk8tFAK p30/VOMBysf19DhjD/yfXvZJLrpyf/0nqXSwFGFvbyZT8bwOqsJt6pSTJDQjs0YLOVO1 i1wpBs5lbr+uTm7k3WsSZkoiI0wYf370xjK+3eqTtO2mwsPbCTFokaFihbP8Sbj/x1HK +pgp1tRtyAeBGn3CtVTWec1fDSvn2ueLwYP2zWMh2sLlSlQCcWOtpC0BUGRXPMYj33EZ OnOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JK4BwjUjq8SMTmsNOtUO5YdKWY0srVFYt//aP/k+QgA=; b=VVuQ8mG3K2lBfIFtt2vNp200OUL0UaWWs7OTpxh3FIoWdQ4+JDzVNMIvy3gzYqsZHq oPbKsgF/j12CUOO6CO/EFGivqy27jwNUnpL1WVNJNS5a6m88zDkE+bc5ta0e1sockNvE nnkkkk0CFXuJKBVAE/4/Xk1qJ95iUzxaD91Wdz62JYZoLOp+Rv0Dj3F9QSxoQ/GjbQwe drrygSl1GpykgOv2mat7WdjGpTURwN0P8OzsK2AxJ4Dk0CoU5sdWP2fZvUZsbb7BDXqj 9phTqRUx4B1ZlvXZZCFsRiAlew8ITekkv6GUM+hJ/jiVYXrO2UUsQz6xtZOqfr1rjggY Ko1A== X-Gm-Message-State: ANoB5pkLu4ws8+EyFF0lvP31IdATG4RqsdQGBlscuC513cZlPFlaOC4q Vo9jjPo1ML6hmIZKtBPzQNZkjGlbMTXVkw== X-Google-Smtp-Source: AA0mqf7IMp7QZO81Avos7hnJfv4HZfGWxF04BivZroOWaNMisrojQSuOiouu6As1vdgw+HuaXhR6RA== X-Received: by 2002:a1c:f401:0:b0:3cf:8731:8110 with SMTP id z1-20020a1cf401000000b003cf87318110mr13902642wma.32.1669377169243; Fri, 25 Nov 2022 03:52:49 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , "Michael S. Tsirkin" , Daniel Henrique Barboza , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Greg Kurz , Marcel Apfelbaum , qemu-ppc@nongnu.org Subject: [PATCH for-8.0 7/7] hw/pci-host/pnv_phb3_msi: Convert TYPE_PHB3_MSI to 3-phase reset Date: Fri, 25 Nov 2022 11:52:40 +0000 Message-Id: <20221125115240.3005559-8-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221125115240.3005559-1-peter.maydell@linaro.org> References: <20221125115240.3005559-1-peter.maydell@linaro.org> MIME-Version: 1.0 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: pass client-ip=2a00:1450:4864:20::331; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1669377295814100003 Content-Type: text/plain; charset="utf-8" Convert the TYPE_PHB3_MSI class to 3-phase reset, so we can avoid using the device_class_set_parent_reset() function. Signed-off-by: Peter Maydell Reviewed-by: C=C3=A9dric Le Goater Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Daniel Henrique Barboza --- include/hw/ppc/xics.h | 2 +- hw/pci-host/pnv_phb3_msi.c | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h index 00b80b08c27..95ead0dd7c9 100644 --- a/include/hw/ppc/xics.h +++ b/include/hw/ppc/xics.h @@ -95,7 +95,7 @@ struct ICSStateClass { DeviceClass parent_class; =20 DeviceRealize parent_realize; - DeviceReset parent_reset; + ResettablePhases parent_phases; =20 void (*reject)(ICSState *s, uint32_t irq); void (*resend)(ICSState *s); diff --git a/hw/pci-host/pnv_phb3_msi.c b/hw/pci-host/pnv_phb3_msi.c index ae908fd9e41..41e63b066f9 100644 --- a/hw/pci-host/pnv_phb3_msi.c +++ b/hw/pci-host/pnv_phb3_msi.c @@ -228,12 +228,14 @@ static void phb3_msi_resend(ICSState *ics) } } =20 -static void phb3_msi_reset(DeviceState *dev) +static void phb3_msi_reset_hold(Object *obj) { - Phb3MsiState *msi =3D PHB3_MSI(dev); - ICSStateClass *icsc =3D ICS_GET_CLASS(dev); + Phb3MsiState *msi =3D PHB3_MSI(obj); + ICSStateClass *icsc =3D ICS_GET_CLASS(obj); =20 - icsc->parent_reset(dev); + if (icsc->parent_phases.hold) { + icsc->parent_phases.hold(obj); + } =20 memset(msi->rba, 0, sizeof(msi->rba)); msi->rba_sum =3D 0; @@ -287,11 +289,12 @@ static void phb3_msi_class_init(ObjectClass *klass, v= oid *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); ICSStateClass *isc =3D ICS_CLASS(klass); + ResettableClass *rc =3D RESETTABLE_CLASS(klass); =20 device_class_set_parent_realize(dc, phb3_msi_realize, &isc->parent_realize); - device_class_set_parent_reset(dc, phb3_msi_reset, - &isc->parent_reset); + resettable_class_set_parent_phases(rc, NULL, phb3_msi_reset_hold, NULL, + &isc->parent_phases); =20 isc->reject =3D phb3_msi_reject; isc->resend =3D phb3_msi_resend; --=20 2.25.1