From nobody Mon Feb 9 11:23:24 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) client-ip=209.85.221.52; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f52.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1619281359; cv=none; d=zohomail.com; s=zohoarc; b=iLbzURa6LoxYbWakKU2A1R4MvQIOcanUU1CIHjpHXNNB69cFT6pHEDmoHLoDCbk0YpkDabkzbOFnND8X8CQcqnMwlTsUIgu3lPPc4AE5ak4pJUdTWkjSJ0jpPUuIWwfJ8p4ikus1i5bxjuJzAGMXRhF9GXMzESlfrZmSJGxtEX8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619281359; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=m7SCVR8UO3iTOtnM+SWHeXIebCCBRcm2Jf0+bqY98YY=; b=XoZUt/aH+O5x8Jm/YZzgTqcPKVQG48p6CzwHFbCBJ3VibnGbcPYpqng1lA/Q6G0pmJRqRrnFLJFouaPIXq3Bj17ltfWhoL5roAcHsvbTLwvkvv9cI8lPYbfH8TBiWWfhQEb161Zz6a42QZqjG2nmm1YBOI4arBsW0fs6R4sos9k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mx.zohomail.com with SMTPS id 1619281359849769.7091618579285; Sat, 24 Apr 2021 09:22:39 -0700 (PDT) Received: by mail-wr1-f52.google.com with SMTP id e5so22761375wrg.7 for ; Sat, 24 Apr 2021 09:22:39 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (39.red-81-40-121.staticip.rima-tde.net. [81.40.121.39]) by smtp.gmail.com with ESMTPSA id s14sm12605673wrm.51.2021.04.24.09.22.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Apr 2021 09:22:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=m7SCVR8UO3iTOtnM+SWHeXIebCCBRcm2Jf0+bqY98YY=; b=KPd8TiAr3dVt0XPsXBADdcpnxp18vBZU6UubUixBM0BUpGaY+iIl8O36RhaoerG7iX +t798YEuRqc5ZN7UrI5y/7VpolY1eWTuX8irjap8Y5IFT+lCBu2VDk1nnBzJl4BnSrQZ Dt0+8AJGN/tHCpH3W58RDTK+e08P0YSDJ2D+zg/Wqlp4UGOKE5HP+TT9DoqwHmswrxgs 0Zo3dwbaLNRh4IpzGyH3JMED6Uu5XgXtzGkTL0csrjijHcV+Zs/fnPv98VixCRolsmBq d8yTik0Mxb8qPi5mXZGR/9okXGBiqTmz7zBwy9b8Xq60DqZcoqIFwIGBxjkAKOFSrDGu VvAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=m7SCVR8UO3iTOtnM+SWHeXIebCCBRcm2Jf0+bqY98YY=; b=EpeyGF2fc/Lf/llUQhyy+ZmpJyYtzWVXs6QjmPaFWsUkH9Q5Hzm12gueYbeukWg3aM zGZsqqCQgMbTrFVrF3+WqTrr2qG/ZElUsFIrFXiS95wJjCdHQMXM7BvhxZ23Es1rV83L /LIiVXTYwapCrqSDsjTdfcQ6gmgGCTCGdjK3xO+gqptBZYvbj7T9OhuMgwRW0YFRo4e9 BCipdqCKC8R70ibdL0O9D367KWmF1/TdXemNTDKCcAHhwIGBX55QjZj28ARuAcylbame kw99d2UCVV5SFN3vog78e9qbhPGKFjd7iNUwfC8EtZ8Dz3rA1YGpGv6HhiPnFp/LhtEA HUSA== X-Gm-Message-State: AOAM530EmHqVdDGKWRHf6KF/BVto0cqRg4INI256WGWoolTXN6sotRDW NZjHoFCVA0quj3IPGmXogiI= X-Google-Smtp-Source: ABdhPJy1VX9Jdck8kwdloatkSyUdHLz+JdKmqDmi2A4a+9ULG9+IVG1AkbHK1cEZWR2OFwnVvuOI9w== X-Received: by 2002:a5d:6544:: with SMTP id z4mr3661358wrv.246.1619281358120; Sat, 24 Apr 2021 09:22:38 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , Markus Armbruster , Greg Kurz , qemu-block@nongnu.org, David Gibson , Kevin Wolf , Mark Cave-Ayland , Max Reitz , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , qemu-arm@nongnu.org, qemu-ppc@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 1/5] hw/ppc/spapr_iommu: Register machine reset handler Date: Sat, 24 Apr 2021 18:22:25 +0200 Message-Id: <20210424162229.3312116-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210424162229.3312116-1-f4bug@amsat.org> References: <20210424162229.3312116-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) The TYPE_SPAPR_TCE_TABLE device is bus-less, thus isn't reset automatically. Register a reset handler to get reset with the machine. It doesn't seem to be an issue because it is that way since the device QDev'ifycation 8 years ago, in commit a83000f5e3f ("spapr-tce: make sPAPRTCETable a proper device"). Still, correct to have a proper API usage. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/ppc/spapr_iommu.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/hw/ppc/spapr_iommu.c b/hw/ppc/spapr_iommu.c index 24537ffcbd3..f7dad1dc0fe 100644 --- a/hw/ppc/spapr_iommu.c +++ b/hw/ppc/spapr_iommu.c @@ -24,6 +24,7 @@ #include "sysemu/kvm.h" #include "kvm_ppc.h" #include "migration/vmstate.h" +#include "sysemu/reset.h" #include "sysemu/dma.h" #include "exec/address-spaces.h" #include "trace.h" @@ -302,6 +303,11 @@ static const VMStateDescription vmstate_spapr_tce_tabl= e =3D { } }; =20 +static void spapr_tce_reset_handler(void *dev) +{ + device_legacy_reset(DEVICE(dev)); +} + static void spapr_tce_table_realize(DeviceState *dev, Error **errp) { SpaprTceTable *tcet =3D SPAPR_TCE_TABLE(dev); @@ -324,6 +330,8 @@ static void spapr_tce_table_realize(DeviceState *dev, E= rror **errp) =20 vmstate_register(VMSTATE_IF(tcet), tcet->liobn, &vmstate_spapr_tce_tab= le, tcet); + + qemu_register_reset(spapr_tce_reset_handler, dev); } =20 void spapr_tce_set_need_vfio(SpaprTceTable *tcet, bool need_vfio) @@ -425,6 +433,8 @@ static void spapr_tce_table_unrealize(DeviceState *dev) { SpaprTceTable *tcet =3D SPAPR_TCE_TABLE(dev); =20 + qemu_unregister_reset(spapr_tce_reset_handler, dev); + vmstate_unregister(VMSTATE_IF(tcet), &vmstate_spapr_tce_table, tcet); =20 QLIST_REMOVE(tcet, list); --=20 2.26.3 From nobody Mon Feb 9 11:23:24 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) client-ip=209.85.221.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1619281365; cv=none; d=zohomail.com; s=zohoarc; b=Jvz7Q6tkDm4izERpe8FfFTG0VFwX+fw+/Xmjg05ZoM2O46Mv6pX61kVR2opDarjIiwJ7uzbfmXS0NbwBw8eMLMShE/iPmigPQKRMvWNqSr+9+6QiGTnPidU+rX+gLlOIr9O7z3IdBjqjeT166b/FEpUyAru1Kd2mjii/KmkSMlQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619281365; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=X33eNVwJacVSZY7X58ULYQouokNiQ8LTYhRpjXCE4zs=; b=LHy1g6eMLVnUP1+xM/lYvQaoqprPDIrgS+VMNGyP6NQeqAWP1vOlKl2nIvAzyEnP8ZZWeqBE4m6MxGDgqIXo7CZgl8LKItrotAMZV03RZoy+Yjwd7r0zE0vpABi5XZAO7aSnwiVdVb2LVcybHvskt4ZBOxep6RpXbJLXBfSg2Ak= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.zohomail.com with SMTPS id 1619281365103439.65736947336325; Sat, 24 Apr 2021 09:22:45 -0700 (PDT) Received: by mail-wr1-f49.google.com with SMTP id r7so39418882wrm.1 for ; Sat, 24 Apr 2021 09:22:44 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (39.red-81-40-121.staticip.rima-tde.net. [81.40.121.39]) by smtp.gmail.com with ESMTPSA id p18sm12586171wrs.68.2021.04.24.09.22.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Apr 2021 09:22:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=X33eNVwJacVSZY7X58ULYQouokNiQ8LTYhRpjXCE4zs=; b=KQIHaAm0XuFS9zg81Q1fYWeBBO2+qqFtwKyAz6+Fo1F25o0EAy1yUVuiVupOXodBDn bit5Ib1242pWiDdqYF2kqG0EcFdDDz5zRwKlcwIyFVdgsmZbVLNOcNibX4j0xgXVfJJn R7mnjtLGKcS8woNmVJ8pYuZyYfxAWNrfd5DxWb56XPUKlr/5Sm9bs+QYe+1TwT+nFQjb iOddIZwmY/KGtOpzNlRk+LAI2P1IqcIVdyS7NI1l5XdTacN4PHHzJ1YNw/WsrAynTMOt RHsBM5HXw8wL4Py6bRm24JpaWKoHMRninzowmFEldqCOTnzPKMrcviq9KGHJRGDiDZlx BkLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=X33eNVwJacVSZY7X58ULYQouokNiQ8LTYhRpjXCE4zs=; b=T3fk1F1G3OsIgs52Izf2zp1bR3cb8wE0R5Ndh3JmlDlfercqMe+sscvseeky7u0M6e dqxFc4UkrQingWD1MeYgKnGXkQXFQAhVFcY9F+SacOpfsqzh5+DTz2yWmBWHoeFzuN4h u0l3xVOgOtq6lLVPfx/yqwD3djRRXaxyAb8p6xEAFQ3YuotVtiKbgaaZ7zDRZ2Jv6/8l X4YawUX/rkDDiheEx4QWsXJTFTYBSmdSSnnvNABIkmCUJjRB/no0XfKQHvuBmm33TsW6 IgUXfIPwwDC5x8ILNHIXvpxGtEH/Icq9PM8yYgT5IdpjPwWUnBMtjvtsxi8Ce8w7lyU0 HbWg== X-Gm-Message-State: AOAM5306N3eCJC2FlqzxYZbeI8Tkkn3IuGh94nPqbBzdteWgjPpUSr4W qfrMcT+6WtRhv8donJ2WZKo= X-Google-Smtp-Source: ABdhPJwhXo1mSVd/CZOVyEIkEXph4MOOiWg4X3MSsJMdU/aJvxKqdc147czD93Y9GtYIWZBY4d+kRg== X-Received: by 2002:adf:f88f:: with SMTP id u15mr11724031wrp.368.1619281363227; Sat, 24 Apr 2021 09:22:43 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , Markus Armbruster , Greg Kurz , qemu-block@nongnu.org, David Gibson , Kevin Wolf , Mark Cave-Ayland , Max Reitz , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , qemu-arm@nongnu.org, qemu-ppc@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 2/5] hw/pcmcia/microdrive: Register machine reset handler Date: Sat, 24 Apr 2021 18:22:26 +0200 Message-Id: <20210424162229.3312116-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210424162229.3312116-1-f4bug@amsat.org> References: <20210424162229.3312116-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) The abstract PCMCIA_CARD is a bus-less TYPE_DEVICE, so devices implementing it are not reset automatically. Register a reset handler so children get reset on machine reset. Note, the DSCM-1XXXX device (TYPE_DSCM1XXXX) which inherits TYPE_MICRODRIVE and PCMCIA_CARD reset itself when a disk is attached or detached, but was not resetting itself on machine reset. It doesn't seem to be an issue because it is that way since the device QDev'ifycation 8 years ago, in commit d1f2c96a81a ("pcmcia: QOM'ify PCMCIACardState and MicroDriveState"). Still, correct to have a proper API usage. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/pcmcia/pcmcia.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/hw/pcmcia/pcmcia.c b/hw/pcmcia/pcmcia.c index 03d13e7d670..73656257227 100644 --- a/hw/pcmcia/pcmcia.c +++ b/hw/pcmcia/pcmcia.c @@ -6,14 +6,39 @@ =20 #include "qemu/osdep.h" #include "qemu/module.h" +#include "sysemu/reset.h" #include "hw/pcmcia.h" =20 +static void pcmcia_card_reset_handler(void *dev) +{ + device_legacy_reset(DEVICE(dev)); +} + +static void pcmcia_card_realize(DeviceState *dev, Error **errp) +{ + qemu_register_reset(pcmcia_card_reset_handler, dev); +} + +static void pcmcia_card_unrealize(DeviceState *dev) +{ + qemu_unregister_reset(pcmcia_card_reset_handler, dev); +} + +static void pcmcia_card_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + + dc->realize =3D pcmcia_card_realize; + dc->unrealize =3D pcmcia_card_unrealize; +} + static const TypeInfo pcmcia_card_type_info =3D { .name =3D TYPE_PCMCIA_CARD, .parent =3D TYPE_DEVICE, .instance_size =3D sizeof(PCMCIACardState), .abstract =3D true, .class_size =3D sizeof(PCMCIACardClass), + .class_init =3D pcmcia_card_class_init, }; =20 static void pcmcia_register_types(void) --=20 2.26.3 From nobody Mon Feb 9 11:23:24 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) client-ip=209.85.221.44; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f44.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1619281370; cv=none; d=zohomail.com; s=zohoarc; b=H+XCxpZILi6SzF1/btxQdPpJJKrQDXzOT6CnTzJV8DvxWtlnrGIG9fOj3M4pGic2CVj3l3rTuDYLoohjcQWNGhV49/nID80Z4L8RNAWz0yWWzonmCkyucoLbszm8S9Lldt2ZwAWmK14V3LoUT2qsIAUk2lVc4N+YQ/QRYVdM5Nc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619281370; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=4+QISpS2fmofHFusvT0iZzLeTqf48stVhGPP0rBj26c=; b=YT0TCWuwlkNPB1wdhSSAC5HRhLQmaYDqEpxxEseIZVW02LhF/+xI9FIrYT300NANSSNrrcWZTr1ghWLI5HNak5j9V/vkWYzs3I3Gdl7m8to1zwPFL8K2Smq6O8zWCOjRwIjwSz4tnJ2UWHDfjzg/jQYF37Iu/LNJYimtidK4Cu4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mx.zohomail.com with SMTPS id 1619281370497938.9337300522144; Sat, 24 Apr 2021 09:22:50 -0700 (PDT) Received: by mail-wr1-f44.google.com with SMTP id h4so42375780wrt.12 for ; Sat, 24 Apr 2021 09:22:49 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (39.red-81-40-121.staticip.rima-tde.net. [81.40.121.39]) by smtp.gmail.com with ESMTPSA id u14sm12782211wrq.65.2021.04.24.09.22.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Apr 2021 09:22:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4+QISpS2fmofHFusvT0iZzLeTqf48stVhGPP0rBj26c=; b=X9aNCpiU5uRRiB4ZvEDKILDSMIgY4GeFiCX/xw971wZzOSpY8Wsc5uyf8DvE63kKEO y3Ca1JRzH0MZ+qeYaWuyDw+Bczl+VD+LDFZbivN+YnBS6xFt1YFg5/7pQLWfe3qnLTNL JFLJYPoLYYEWaSPjkvdVaqrWcJRHYav3pLjhCWQkYzTmQT63Wb9D6KeCTIvqrqpWFx0P x8hiXo18CnpQN2qW+S5ZQNVL4QduF9E1v36ey08dsUFAN5i2nhcMB4olJGO3UltO/AuK EgKA0OkUBHn+7KZoZG7YZ8fBSYCnXoiVjeu3W2+Gitv3Tg3L04eU3TsI3eDXTrK29u3B esgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=4+QISpS2fmofHFusvT0iZzLeTqf48stVhGPP0rBj26c=; b=Tz9F2VkjU0oM1w9PfbGdWC+8WVqRkjfn2ZxVTPNC3ZCsLpXbL0UKLHmVSi8drFXNw9 P9x+KMyv7FO5L3ZJcDG21rwi0CcoEALBCyFtA11eEv1BB2D72RT4VNvN2jh83EjedaMT g4sq76WoxuMrd1B/xwDHQp0NhoPqj9hgrbN/4tyT3zaPet+u4DlbtviGspbaerYPEx3v hSX9o2jZUqMXQJ2MzhTV5UkxsxBNQ3pTDezqgwzIOvEDfJBTZmLn2bDg1K2HUpJzDrDi 0zV750NcRkkwpe52YhRpUs0TxHSi4hxGyI7JKq7SEK95fMPLUp/zOnvg2rb1/6DZdm24 sfiA== X-Gm-Message-State: AOAM533IMfpOZghiDOSpID+nEZdiZiY0IMqSd5ARVAYH62f/K6YP107G nteFXCh7WCcGJTTr9DnwQiA= X-Google-Smtp-Source: ABdhPJyuZ+sG+ybj1josEculdM6x9EeSooAh2Xzwzi65A6hWq2uNmqbmRZcYRivUF80+l5FPA67jNw== X-Received: by 2002:a05:6000:23c:: with SMTP id l28mr11521347wrz.79.1619281368579; Sat, 24 Apr 2021 09:22:48 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , Markus Armbruster , Greg Kurz , qemu-block@nongnu.org, David Gibson , Kevin Wolf , Mark Cave-Ayland , Max Reitz , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , qemu-arm@nongnu.org, qemu-ppc@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 3/5] hw/block/nand: Register machine reset handler Date: Sat, 24 Apr 2021 18:22:27 +0200 Message-Id: <20210424162229.3312116-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210424162229.3312116-1-f4bug@amsat.org> References: <20210424162229.3312116-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) The TYPE_NAND device is bus-less, thus isn't reset automatically. Register a reset handler to get reset with the machine. Fixed: 7426aa72c36 ("nand: Don't inherit from Sysbus") Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/block/nand.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/hw/block/nand.c b/hw/block/nand.c index 8bc80e35144..d3fb5107bfe 100644 --- a/hw/block/nand.c +++ b/hw/block/nand.c @@ -24,6 +24,7 @@ #include "hw/qdev-properties-system.h" #include "hw/block/flash.h" #include "sysemu/block-backend.h" +#include "sysemu/reset.h" #include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/error-report.h" @@ -364,6 +365,11 @@ static const VMStateDescription vmstate_nand =3D { } }; =20 +static void nand_reset_handler(void *dev) +{ + device_legacy_reset(DEVICE(dev)); +} + static void nand_realize(DeviceState *dev, Error **errp) { int pagesize; @@ -423,6 +429,13 @@ static void nand_realize(DeviceState *dev, Error **err= p) } /* Give s->ioaddr a sane value in case we save state before it is used= . */ s->ioaddr =3D s->io; + + qemu_register_reset(nand_reset_handler, dev); +} + +static void nand_unrealize(DeviceState *dev) +{ + qemu_unregister_reset(nand_reset_handler, dev); } =20 static Property nand_properties[] =3D { @@ -437,6 +450,7 @@ static void nand_class_init(ObjectClass *klass, void *d= ata) DeviceClass *dc =3D DEVICE_CLASS(klass); =20 dc->realize =3D nand_realize; + dc->unrealize =3D nand_unrealize; dc->reset =3D nand_reset; dc->vmsd =3D &vmstate_nand; device_class_set_props(dc, nand_properties); --=20 2.26.3 From nobody Mon Feb 9 11:23:24 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.47 as permitted sender) client-ip=209.85.128.47; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f47.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1619281377; cv=none; d=zohomail.com; s=zohoarc; b=g4hi8Rd04f87MaoatHs5nDVSB387PCxxMHjDuI7PN+dxHmYCShl8a3NZ/iH2RADEG8dnn0znwhqNs3ByzuG8PtYYGqAy1/jrE2bmP+77NUC67x3fd2sHQ4CAlzWZZRzEnzUjHnKOTskPYuvB1fKBUYWv/a07WsVqIEdEWPCn4HU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619281377; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=l/YNVbkdkrW9ig2CLutDkjJUIXW08deJdCzaGMC/bGQ=; b=FiL9y/CGvc66xM6pJfrs4V9EO7rkPx2rrL6aw3sa2DYcPPHBOqsUrY9v/VvGh6oLxcU43SnWIR4TZFtufkBNm9Up9vKwuBgen8jDhceBLsyjlTgyAuRLVm0FmVU9AkLBm9Vy4E2GSAmiMYkcPJRBFd4yw36XJJja23KcKFt7hBk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by mx.zohomail.com with SMTPS id 1619281377125611.9249756743312; Sat, 24 Apr 2021 09:22:57 -0700 (PDT) Received: by mail-wm1-f47.google.com with SMTP id k4-20020a7bc4040000b02901331d89fb83so2761182wmi.5 for ; Sat, 24 Apr 2021 09:22:55 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (39.red-81-40-121.staticip.rima-tde.net. [81.40.121.39]) by smtp.gmail.com with ESMTPSA id a142sm14432967wmd.7.2021.04.24.09.22.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Apr 2021 09:22:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=l/YNVbkdkrW9ig2CLutDkjJUIXW08deJdCzaGMC/bGQ=; b=aBA1vfUNtMce97eMNDPXsk42BpnzZs/8zuc91IQvrBvji1U7u5sgmWnl7eYXz+SuKy 9ZB99O9sQetXOXUF7G5phnObAiDkcXdRejbTqXol0uIdBTWM/el5pupmfZFy9lnZY7Wq Z4OLCLb8yMEi1I3j40XpZWzj5RV5QwwtVdfsKdFzw/Rw8gYCjiaOIdq/Hv8X5t7JdOHV hc/YCEK94yXx1SSHDoW4qIxJaDl6b147WcOlpcRlcybt4bKYJ4hxF69W8b1bJ+2DVUJb sJQQ4D/VZTZx0r1NBrhfRprXC7vc89CDd3IlTvo8SrwnQWwYaxpJhN85LBoBeUWYhp99 CM+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=l/YNVbkdkrW9ig2CLutDkjJUIXW08deJdCzaGMC/bGQ=; b=dq8+iBZXDFocmgGm1Py022d28krYiweuv+b8RhzCUIfoMM8eJakmmtK14c772ttpDp EfCST32yKIv43sxN4khjsFKdmNzO1ei2swBiaF5nmKdEbLpr10rD/qWVo/v9QtuncxO9 iClv6fkmOH/mw+ezKQkKw+UaHtMhg+cxpGplfRbZF+chSXvjasYhN6xnFVpEzVih41W0 1Wste6l90sd0LnWY69pQ5DX7MlDoq+tMYMUMRNtmXsWsi0k03Jb7BY6OvzEut35FJ4dO YcaVhBvEmYxjjstES2A3J+fLaQ8nrX2uyBkhkx4oFs25it0GO7ek82Jq7QE2HYuj6Fr3 dwqw== X-Gm-Message-State: AOAM530IAw39SCxvNrltcZx3Upq6xrW+G8YoxQC1SQt227w6o7vXei/0 KqPFFFB83KMK4v43zvFIfRo= X-Google-Smtp-Source: ABdhPJygIQ/b/koc21NBNJekP9t25XHEDhXl7XKQdtP3HWEguRcrfBdY8QJI9XTsGvHpoD79NbINzg== X-Received: by 2002:a05:600c:17c3:: with SMTP id y3mr11578124wmo.185.1619281374244; Sat, 24 Apr 2021 09:22:54 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , Markus Armbruster , Greg Kurz , qemu-block@nongnu.org, David Gibson , Kevin Wolf , Mark Cave-Ayland , Max Reitz , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , qemu-arm@nongnu.org, qemu-ppc@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 4/5] hw/pci-host/raven: Manually reset the OR_IRQ device Date: Sat, 24 Apr 2021 18:22:28 +0200 Message-Id: <20210424162229.3312116-5-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210424162229.3312116-1-f4bug@amsat.org> References: <20210424162229.3312116-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) The OR_IRQ device is bus-less, thus isn't reset automatically. Add the raven_pcihost_reset() handler to manually reset the OR IRQ. Fixes: f40b83a4e31 ("40p: use OR gate to wire up raven PCI interrupts") Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: David Gibson --- hw/pci-host/prep.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/hw/pci-host/prep.c b/hw/pci-host/prep.c index 0a9162fba97..275379e4c78 100644 --- a/hw/pci-host/prep.c +++ b/hw/pci-host/prep.c @@ -230,6 +230,15 @@ static void raven_change_gpio(void *opaque, int n, int= level) s->contiguous_map =3D level; } =20 +static void raven_pcihost_reset(DeviceState *dev) +{ + PREPPCIState *s =3D RAVEN_PCI_HOST_BRIDGE(dev); + + if (!s->is_legacy_prep) { + device_legacy_reset(DEVICE(&s->or_irq)); + } +} + static void raven_pcihost_realizefn(DeviceState *d, Error **errp) { SysBusDevice *dev =3D SYS_BUS_DEVICE(d); @@ -422,6 +431,7 @@ static void raven_pcihost_class_init(ObjectClass *klass= , void *data) =20 set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories); dc->realize =3D raven_pcihost_realizefn; + dc->reset =3D raven_pcihost_reset; device_class_set_props(dc, raven_pcihost_properties); dc->fw_name =3D "pci"; } --=20 2.26.3 From nobody Mon Feb 9 11:23:24 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) client-ip=209.85.221.54; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f54.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1619281381; cv=none; d=zohomail.com; s=zohoarc; b=RDNg5kqhqC2nrf8TGgIEQL6iG+cW5bXvJ+BvuU2k8UB8FWhcpG0y0pUAfkvQ7tKoa1k09ge4iJ78jAYyyHpFpu+hIEIjpFzukbgr/ZWuTi5Qx84jNfrtFypIo2VyZiTNErp8r8uVBzodY30NrfuhAdMkgRs6cmTpxXRUjXIweK8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619281381; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=YeGCMDACSQTp0mRPeTtaNv5FzsBb7YC30+puu/9npP0=; b=OvT2qsS1HaX0gG3vnnUdvpluachjSwrSPM8lXUYA8FfuEB0A3MpHRomHqmIBZN7dKpUhQbQ7wI+K6PPw+LHCcn2NuGQUpK3IWUxF1ch0dVSvJeS0fw0leNw6HChm3LDOxRME8SuuIrS13jNwnjwKZXHEF1b2QAdQm/FfHoUPJrM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mx.zohomail.com with SMTPS id 1619281381291339.8280431497717; Sat, 24 Apr 2021 09:23:01 -0700 (PDT) Received: by mail-wr1-f54.google.com with SMTP id e5so22761971wrg.7 for ; Sat, 24 Apr 2021 09:23:00 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (39.red-81-40-121.staticip.rima-tde.net. [81.40.121.39]) by smtp.gmail.com with ESMTPSA id t63sm10998616wma.20.2021.04.24.09.22.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Apr 2021 09:22:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YeGCMDACSQTp0mRPeTtaNv5FzsBb7YC30+puu/9npP0=; b=XuLXwqSX9rVMrGPsE/vDcT0Whkr/0C2J8zlWGD7B0VMbvH/uZ5A8x2YeEgS5nly5R7 KRHGCwZwYIbloJ8L1a8KRyX4+3c8Uv9XPbBiwKY1EOW6+1/6oUvPjpfanmxx2EsD+MeW d9xaBbrD5if6RI8hTDpX8YIJwhERxWnNS8ynTOLuAjmqCd3/nXWIFAiXZB6XgB5fZtaw DBj3UgysifTr3GUbZOVz0fMwRsAUAPKi+X/JPzA75Jj+b9taUb1kXebeGO7nF5o667ai V3k8DV8+71d8vhWIws10QIQqLDgeT0Im/DrDeik2xWkW+9MmzaiXVfD9AStM+J31+vkd mmeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=YeGCMDACSQTp0mRPeTtaNv5FzsBb7YC30+puu/9npP0=; b=F45s4w6GSpDs3JGgVz1ZkP8BawToHcv6C2hjToxe2tWIx3245KeVK5vtO3Oen1TGGt nZnw/nXFsyD186LobcQaFRcscGF6Q414dX9+b8Tc99iJDJfr4DxjvaEH2tLo/GC3DMkk oLXS8+nUUE8Iy63yoXv//7U0CCE61HwDtj+DHTHtHFbJwAswZ8iFoUdHY5So5FJQVvqU YQ2OPKoHaebMpgAopK2eri9AH2Lq9D4Sc/RAW5ndofRjUwCKkPMpe2aw0fLw0mqzrTFQ UZNeV0kyq7OUAW1NyIc8ofIuYmQn+/x8LEFnvFwIIgrKtLtT17smezDdIfYKZZi788Wz wX0A== X-Gm-Message-State: AOAM531j+wLMYc6TOu/PeYWEbk44qCNc/GWy6S3wN691oTktlwkIuI9M 1jmdf5Euf2Os3zFeeEntbFc= X-Google-Smtp-Source: ABdhPJxlLzpMBjzXP3JfSTD0OBnyGfkwiHB0RmAf8Szty5iLk7wVIPw+GFQhK/SvUTCwvzkZtTbWFQ== X-Received: by 2002:a5d:49ca:: with SMTP id t10mr11947552wrs.395.1619281379519; Sat, 24 Apr 2021 09:22:59 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , Markus Armbruster , Greg Kurz , qemu-block@nongnu.org, David Gibson , Kevin Wolf , Mark Cave-Ayland , Max Reitz , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , qemu-arm@nongnu.org, qemu-ppc@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 5/5] hw/arm/armsse: Manually reset the OR_IRQ devices Date: Sat, 24 Apr 2021 18:22:29 +0200 Message-Id: <20210424162229.3312116-6-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210424162229.3312116-1-f4bug@amsat.org> References: <20210424162229.3312116-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) The OR_IRQ device is bus-less, thus isn't reset automatically. Manually reset the OR IRQs in the armsse_reset() handler. Fixes: bb75e16d5e6 ("hw/arm/iotkit: Wire up MPC interrupt lines") Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/armsse.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/arm/armsse.c b/hw/arm/armsse.c index 2e5d0679e7b..7fd3fb77620 100644 --- a/hw/arm/armsse.c +++ b/hw/arm/armsse.c @@ -1668,6 +1668,10 @@ static void armsse_reset(DeviceState *dev) ARMSSE *s =3D ARM_SSE(dev); =20 s->nsccfg =3D 0; + + device_legacy_reset(DEVICE(&s->mpc_irq_orgate)); + device_legacy_reset(DEVICE(&s->ppc_irq_orgate)); + device_legacy_reset(DEVICE(&s->sec_resp_splitter)); } =20 static void armsse_class_init(ObjectClass *klass, void *data) --=20 2.26.3