From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A5510C433FE for ; Thu, 24 Nov 2022 15:18:49 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyDzy-0002c7-C2; Thu, 24 Nov 2022 10:18:46 -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 1oyDzu-0002aL-Fi for qemu-devel@nongnu.org; Thu, 24 Nov 2022 10:18:44 -0500 Received: from 6.mo548.mail-out.ovh.net ([188.165.58.48]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oyDzs-00059Z-Km for qemu-devel@nongnu.org; Thu, 24 Nov 2022 10:18:42 -0500 Received: from mxplan5.mail.ovh.net (unknown [10.108.1.249]) by mo548.mail-out.ovh.net (Postfix) with ESMTPS id 443992074B; Thu, 24 Nov 2022 15:18:34 +0000 (UTC) Received: from kaod.org (37.59.142.107) by DAG8EX2.mxp5.local (172.16.2.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16; Thu, 24 Nov 2022 16:18:32 +0100 Authentication-Results: garm.ovh; auth=pass (GARM-107S001b1952c19-a79f-48b9-8a59-60334ae8f2e7, DDB2ECFE20CB56AE513B1B85273A418DB31AAA82) smtp.auth=groug@kaod.org X-OVh-ClientIp: 78.197.208.248 Date: Thu, 24 Nov 2022 16:18:30 +0100 From: Greg Kurz To: Peter Maydell CC: , Michael Rolnik , "Edgar E. Iglesias" , Taylor Simpson , Song Gao , Xiaojuan Yang , Laurent Vivier , Philippe =?UTF-8?B?TWF0aGlldS1EYXVkw6k=?= , Aurelien Jarno , Jiaxun Yang , "Aleksandar Rikalo" , Chris Wulff , Marek Vasut , Stafford Horne , "Daniel Henrique Barboza" , "=?UTF-8?B?Q8OpZHJpYw==?= Le Goater" , David Gibson , "Palmer Dabbelt" , Alistair Francis , Bin Meng , Yoshinori Sato , Mark Cave-Ayland , Artyom Tarasenko , Bastian Koppelmann , Max Filippov , , , Subject: Re: [PATCH for-8.0 13/19] target/ppc: Convert to 3-phase reset Message-ID: <20221124161830.3411f177@bahia> In-Reply-To: <20221124115023.2437291-14-peter.maydell@linaro.org> References: <20221124115023.2437291-1-peter.maydell@linaro.org> <20221124115023.2437291-14-peter.maydell@linaro.org> X-Mailer: Claws Mail 4.1.1 (GTK 3.24.34; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Originating-IP: [37.59.142.107] X-ClientProxiedBy: DAG7EX1.mxp5.local (172.16.2.61) To DAG8EX2.mxp5.local (172.16.2.72) X-Ovh-Tracer-GUID: 8c723b80-b8f5-4908-94da-7a0c47feb902 X-Ovh-Tracer-Id: 10036834722037733867 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvgedrieefgdejhecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjughrpeffhffvvefukfgjfhfogggtgfhisehtjeertdertddvnecuhfhrohhmpefirhgvghcumfhurhiiuceoghhrohhugheskhgrohgurdhorhhgqeenucggtffrrghtthgvrhhnpeegkeejtdevgeekieelffdvtedvvdegtdduudeigffhhffgvdfhgeejteekheefkeenucfkphepuddvjedrtddrtddruddpfeejrdehledrudegvddruddtjeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehgrhhouhhgsehkrghougdrohhrgheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepphgvthgvrhdrmhgrhiguvghllheslhhinhgrrhhordhorhhgpdhqvghmuhdqrghrmhesnhhonhhgnhhurdhorhhgpdhjtghmvhgskhgstgesghhmrghilhdrtghomhdpkhgsrghsthhirghnsehmrghilhdruhhnihdqphgruggvrhgsohhrnhdruggvpdgrthgrrhegqhgvmhhusehgmhgrihhlrdgtohhmpdhmrghrkhdrtggrvhgvqdgrhihlrghnugesihhlrghnuggvrdgtohdruhhkpdihshgrthhosehushgvrhhsrdhsohhurhgtvghfohhrghgvrdhjphdpsghinhdrmhgvnhhgseifihhnug hrihhvvghrrdgtohhmpdgrlhhishhtrghirhdrfhhrrghntghishesfigutgdrtghomhdpphgrlhhmvghrsegurggssggvlhhtrdgtohhmpdgurghvihgusehgihgsshhonhdrughrohhpsggvrghrrdhiugdrrghupdgurghnihgvlhhhsgegudefsehgmhgrihhlrdgtohhmpdhqvghmuhdqphhptgesnhhonhhgnhhurdhorhhgpdhshhhorhhnvgesghhmrghilhdrtghomhdptghrfihulhhffhesghhmrghilhdrtghomhdprghlvghkshgrnhgurghrrdhrihhkrghlohesshihrhhmihgrrdgtohhmpdhjihgrgihunhdrhigrnhhgsehflhihghhorghtrdgtohhmpdgruhhrvghlihgvnhesrghurhgvlhefvddrnhgvthdpphhhihhlmhgusehlihhnrghrohdrohhrghdplhgruhhrvghnthesvhhivhhivghrrdgvuhdphigrnhhggihirghojhhurghnsehlohhonhhgshhonhdrtghnpdhgrghoshhonhhgsehlohhonhhgshhonhdrtghnpdhtshhimhhpshhonhesqhhuihgtihhntgdrtghomhdpvggughgrrhdrihhglhgvshhirghssehgmhgrihhlrdgtohhmpdhmrhholhhnihhksehgmhgrihhlrdgtohhmpdhqvghmuhdquggvvhgvlhesnhhonhhgnhhurdhorhhgpdhmrghrvgigseguvghngidruggvpdhqvghmuhdqrhhishgtvhesnhhonhhgnhhurdhorhhgpdgtlhhgsehkrghougdrohhrghdpoffvtefjohhsthepmhhoheegkedpmhhouggvpehsmhhtphhouhht Received-SPF: pass client-ip=188.165.58.48; envelope-from=groug@kaod.org; helo=6.mo548.mail-out.ovh.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On Thu, 24 Nov 2022 11:50:16 +0000 Peter Maydell wrote: > Convert the ppc 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 > --- Reviewed-by: Greg Kurz > target/ppc/cpu-qom.h | 4 ++-- > target/ppc/cpu_init.c | 12 ++++++++---- > 2 files changed, 10 insertions(+), 6 deletions(-) > > diff --git a/target/ppc/cpu-qom.h b/target/ppc/cpu-qom.h > index 89ff88f28c9..0fbd8b72468 100644 > --- a/target/ppc/cpu-qom.h > +++ b/target/ppc/cpu-qom.h > @@ -143,7 +143,7 @@ typedef struct PPCHash64Options PPCHash64Options; > /** > * PowerPCCPUClass: > * @parent_realize: The parent class' realize handler. > - * @parent_reset: The parent class' reset handler. > + * @parent_phases: The parent class' reset phase handlers. > * > * A PowerPC CPU model. > */ > @@ -154,7 +154,7 @@ struct PowerPCCPUClass { > > DeviceRealize parent_realize; > DeviceUnrealize parent_unrealize; > - DeviceReset parent_reset; > + ResettablePhases parent_phases; > void (*parent_parse_features)(const char *type, char *str, Error **errp); > > uint32_t pvr; > diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c > index cbf00813743..95d25856a0e 100644 > --- a/target/ppc/cpu_init.c > +++ b/target/ppc/cpu_init.c > @@ -7031,16 +7031,18 @@ static bool ppc_cpu_has_work(CPUState *cs) > return cs->interrupt_request & CPU_INTERRUPT_HARD; > } > > -static void ppc_cpu_reset(DeviceState *dev) > +static void ppc_cpu_reset_hold(Object *obj) > { > - CPUState *s = CPU(dev); > + CPUState *s = CPU(obj); > PowerPCCPU *cpu = POWERPC_CPU(s); > PowerPCCPUClass *pcc = POWERPC_CPU_GET_CLASS(cpu); > CPUPPCState *env = &cpu->env; > target_ulong msr; > int i; > > - pcc->parent_reset(dev); > + if (pcc->parent_phases.hold) { > + pcc->parent_phases.hold(obj); > + } > > msr = (target_ulong)0; > msr |= (target_ulong)MSR_HVB; > @@ -7267,6 +7269,7 @@ static void ppc_cpu_class_init(ObjectClass *oc, void *data) > PowerPCCPUClass *pcc = POWERPC_CPU_CLASS(oc); > CPUClass *cc = CPU_CLASS(oc); > DeviceClass *dc = DEVICE_CLASS(oc); > + ResettableClass *rc = RESETTABLE_CLASS(oc); > > device_class_set_parent_realize(dc, ppc_cpu_realize, > &pcc->parent_realize); > @@ -7275,7 +7278,8 @@ static void ppc_cpu_class_init(ObjectClass *oc, void *data) > pcc->pvr_match = ppc_pvr_match_default; > device_class_set_props(dc, ppc_cpu_properties); > > - device_class_set_parent_reset(dc, ppc_cpu_reset, &pcc->parent_reset); > + resettable_class_set_parent_phases(rc, NULL, ppc_cpu_reset_hold, NULL, > + &pcc->parent_phases); > > cc->class_by_name = ppc_cpu_class_by_name; > cc->has_work = ppc_cpu_has_work;