From nobody Tue Feb 10 00:59:15 2026 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=1669291328; cv=none; d=zohomail.com; s=zohoarc; b=flsu31lC+X37ei8FKVdPzYiRzudr8L6G298uyPQ2FcFqZl/6fIxu4Bg13CgAc8UKeRK1ajpzNcq4b1hjMneag1h7zzb+R4yblUEOP6dSzpbzHnOdgZejBaMgKzDeQSrb8I1mUsbRO9vY8efJ+IvlTYFA01SmLxsXvk33IjaZ6wI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669291328; 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=MFE1O9xiQQWnFHGp/WY//FqcZkxp+HYvGoY9ooQPAPM=; b=l8YJDP0LnX95Vvn3VEcBuRLCvjFjiOIRQD3Ujb4pbX34Wx9Sns8orG3zPL/mO0h54EnPW59NRi/d1F/655ep/+hO+FFJ3Wd3XGANAy4BCcAgC8S4pKT4M+X70ZTn70ttmQTxB9dXunAhPh7G2g2w5+agVFIMaJgsz26EyMo1ZCs= 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 1669291328459701.5664513579092; Thu, 24 Nov 2022 04:02:08 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyAkx-00044b-Tq; Thu, 24 Nov 2022 06:51:03 -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 1oyAkn-0003gj-S3 for qemu-devel@nongnu.org; Thu, 24 Nov 2022 06:50:53 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oyAkk-0004rJ-RI for qemu-devel@nongnu.org; Thu, 24 Nov 2022 06:50:53 -0500 Received: by mail-wr1-x434.google.com with SMTP id cl5so2107481wrb.9 for ; Thu, 24 Nov 2022 03:50:48 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id f14-20020a05600c154e00b003c6f3e5ba42sm6212559wmg.46.2022.11.24.03.50.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 03:50: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=MFE1O9xiQQWnFHGp/WY//FqcZkxp+HYvGoY9ooQPAPM=; b=UFoApCbZLIbcIY+4buWocXk7sDktO+kT7xCKWW5EPBLTiw9MEOFWxSARVXfa9b3T+y X78+zmD+JXHVTJA2Lg6G1RHB5upnsrfX85qgS4yyB41ILAqmsDTR0bJ8RbF5yI4T/9Bb gr+W22QsJBF/6iw2zcgtF+5fx53v9EJ4XUNt88v/ImJ5GMZV41Bk/F5Mi7mHx1sGw7G3 WnCWvBoE9sjw6tARR/rvp7lV7J5wSu6E/TFBYnYfiAQ/4t6W+RALRAqUg6BLSxpbUcjb Sa8cTGQ4hCm8KWmxxJneCqMh0gYoP982i4SHB1FQ6IUG2sW/sAMYjy6Vx6GlI6oc8Xi+ IS5g== 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=MFE1O9xiQQWnFHGp/WY//FqcZkxp+HYvGoY9ooQPAPM=; b=p54tbGY4gIIYnKPJ05wpixre15Odd03KDiLJIrQn9NX0c4fdgtLygSfhkyMEVafK4y zlUpFIJ5A7npC2ab3sPebk3LbK4utpjU4TnvdewxbQlf3Shh8iDyXQXahk/ifJzHV+i9 KbJYneL/ThwsLPxITG/VRpuk6qfwC4EdROGOaHSLl9IXcCbxuYXBf0iV8oE5drlGZ5Lr haS/BrhsMUY6IpyinPrggs/VvC+qqLeZ9fEUdzHos+x6Illg8lsBaqUDhKulqYRKlEH4 IqsdlUUEEIn28ZjmKa6C4WkQGxZtGJY77w4UOjtSaVs8MCnecqvgePdP/W/AriAhzMUJ J5cQ== X-Gm-Message-State: ANoB5pmXuOontZIaCdFC5KNquigeWIz/XdV1zpP16a0SjJHK/zdW+GkR VTCIOrLe4pP1tawPt7zNovPdghEeAFEdtg== X-Google-Smtp-Source: AA0mqf6IZXgIAVAK489mgoh3lTXHM021njbA+3C8u9cZLlfMoW3P2+i57eP/9hPwceSTr/Sd7PMmuw== X-Received: by 2002:adf:b649:0:b0:241:cefe:239b with SMTP id i9-20020adfb649000000b00241cefe239bmr13801986wre.531.1669290648550; Thu, 24 Nov 2022 03:50:48 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Cc: Peter Maydell , Michael Rolnik , "Edgar E. Iglesias" , Taylor Simpson , Song Gao , Xiaojuan Yang , Laurent Vivier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno , Jiaxun Yang , Aleksandar Rikalo , Chris Wulff , Marek Vasut , Stafford Horne , Daniel Henrique Barboza , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , David Gibson , Greg Kurz , Palmer Dabbelt , Alistair Francis , Bin Meng , Yoshinori Sato , Mark Cave-Ayland , Artyom Tarasenko , Bastian Koppelmann , Max Filippov , qemu-arm@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH for-8.0 15/19] target/rx: Convert to 3-phase reset Date: Thu, 24 Nov 2022 11:50:18 +0000 Message-Id: <20221124115023.2437291-16-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221124115023.2437291-1-peter.maydell@linaro.org> References: <20221124115023.2437291-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::434; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x434.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: 1669291329560100001 Content-Type: text/plain; charset="utf-8" Convert the rx CPU class to use 3-phase reset, so it doesn't need to use device_class_set_parent_reset() any more. Signed-off-by: Peter Maydell --- target/rx/cpu-qom.h | 4 ++-- target/rx/cpu.c | 13 ++++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/target/rx/cpu-qom.h b/target/rx/cpu-qom.h index 4533759d966..1c8466a1870 100644 --- a/target/rx/cpu-qom.h +++ b/target/rx/cpu-qom.h @@ -31,7 +31,7 @@ OBJECT_DECLARE_CPU_TYPE(RXCPU, RXCPUClass, RX_CPU) /* * RXCPUClass: * @parent_realize: The parent class' realize handler. - * @parent_reset: The parent class' reset handler. + * @parent_phases: The parent class' reset phase handlers. * * A RX CPU model. */ @@ -41,7 +41,7 @@ struct RXCPUClass { /*< public >*/ =20 DeviceRealize parent_realize; - DeviceReset parent_reset; + ResettablePhases parent_phases; }; =20 #endif diff --git a/target/rx/cpu.c b/target/rx/cpu.c index 9003c6e9fed..219ef28e463 100644 --- a/target/rx/cpu.c +++ b/target/rx/cpu.c @@ -62,14 +62,16 @@ static bool rx_cpu_has_work(CPUState *cs) (CPU_INTERRUPT_HARD | CPU_INTERRUPT_FIR); } =20 -static void rx_cpu_reset(DeviceState *dev) +static void rx_cpu_reset_hold(Object *obj) { - RXCPU *cpu =3D RX_CPU(dev); + RXCPU *cpu =3D RX_CPU(obj); RXCPUClass *rcc =3D RX_CPU_GET_CLASS(cpu); CPURXState *env =3D &cpu->env; uint32_t *resetvec; =20 - rcc->parent_reset(dev); + if (rcc->parent_phases.hold) { + rcc->parent_phases.hold(obj); + } =20 memset(env, 0, offsetof(CPURXState, end_reset_fields)); =20 @@ -215,11 +217,12 @@ static void rx_cpu_class_init(ObjectClass *klass, voi= d *data) DeviceClass *dc =3D DEVICE_CLASS(klass); CPUClass *cc =3D CPU_CLASS(klass); RXCPUClass *rcc =3D RX_CPU_CLASS(klass); + ResettableClass *rc =3D RESETTABLE_CLASS(klass); =20 device_class_set_parent_realize(dc, rx_cpu_realize, &rcc->parent_realize); - device_class_set_parent_reset(dc, rx_cpu_reset, - &rcc->parent_reset); + resettable_class_set_parent_phases(rc, NULL, rx_cpu_reset_hold, NULL, + &rcc->parent_phases); =20 cc->class_by_name =3D rx_cpu_class_by_name; cc->has_work =3D rx_cpu_has_work; --=20 2.25.1