From patchwork Thu Nov 24 11:50:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 628310 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp297683pvb; Thu, 24 Nov 2022 03:51:22 -0800 (PST) X-Google-Smtp-Source: AA0mqf7grxc+EDnaTAFrfYHx1vQUnZZuwCXvWolgYA5V8jDt+/j+8I9xSoz9jOkrc9slhI1kP01b X-Received: by 2002:a05:620a:b8d:b0:6fb:df4f:d990 with SMTP id k13-20020a05620a0b8d00b006fbdf4fd990mr23022160qkh.181.1669290681946; Thu, 24 Nov 2022 03:51:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669290681; cv=none; d=google.com; s=arc-20160816; b=VHFxTIUeyMo1YS+UsIZyyCY9GtqmBcz5YJBO503P1Mv19wLEWblOsTll9sftxBT2PY cTdJvWr1s53OtUP8halahgXFEmQcxS1VHhl3VRFr+Zs+mj1OA4Qolyx/oYq3Mjo9Og9M URH+w604xtmM/4hZGfq5iRbg1FCNyvVncc39ppmM+ThG6CEUlR3zbvVNuSsnlV46McFt 2dnGkbZqUbXk3kiYtTT3tNZ/YLhv/DGszTyRftbmQFTxVRgsXAi5S7GaG56NL8wLIS+K 7oAYKjHuQFs7Kx7qGYTQeHC2iswETvG2neqkhlXFM6F8nV3SPJTGAgTyzmEKvTyni5U0 t8gg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=S3Jdws9NvCIfw295ZttUjLBUb2PpFwX2bj3IRhSU5A8=; b=ywSOWdlrVNybZLQ1QVAsHcJTTZmX0if2OYdjiQvbEQugIHhBSjnti7H703pn8djmvn o3iu35EgDgaYf+NZcT6Xxq8PTEx3Mi1qqSTMU9RpTUWIKT3zf0WIjeNLtIumgzc4Ilnp aPsPwFJaL5JnAGSeEHXkJPjg6TGgQwbb7EJhV03EW/p3HnViBkWNvRwdulbaX8ja0hsm xrTUJk4tZytoez4489Lo9RHbhGUGH/4R1sc2YpbS5ZtQ+hlRx6Y7RkhqFhilXzNKuJEV S08/IjEi9oQYfnxsuMvKJTefaDolxDaU91U2jA2DEW+dCwfyO8Oo0Rrzgn+kWbmg0lSv ZNlw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PkOsk4qV; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id s123-20020a37a981000000b006eecf6a0862si218055qke.547.2022.11.24.03.51.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 24 Nov 2022 03:51:21 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PkOsk4qV; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyAl3-0004FI-W0; Thu, 24 Nov 2022 06:51:10 -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 1oyAkt-0003sP-0w for qemu-devel@nongnu.org; Thu, 24 Nov 2022 06:50:59 -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 1oyAkm-0004z9-AP for qemu-devel@nongnu.org; Thu, 24 Nov 2022 06:50:58 -0500 Received: by mail-wr1-x42a.google.com with SMTP id q7so1233027wrr.8 for ; Thu, 24 Nov 2022 03:50:51 -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=S3Jdws9NvCIfw295ZttUjLBUb2PpFwX2bj3IRhSU5A8=; b=PkOsk4qVuo/MuRLFUJniiaA09XU9pH14Bhn2HS7I/15mFfImb8mD686rA2KBpENcoj t5B1+DHBIu16brPpTjDUITMB57t9XUxgKnKRtFaFh9Rp44tMptZnYrvLH9zVLMBjVSum Ne8gjKKk19bR+vIxZI82oXk8vLFtCmsa+gOoiuQIIpKZbu6cgfC6J8wVQb1aTA8gjXNg AO/ZvFT9OtwVTThpiJqfUy2DuJt4yHxKsmPI1wPjCMGAsOtvJYK5hXZo4TdivFtzGLw5 YBvxhOXNFqm0qLhcryEQ2T1xH4fS9Jp5GfBSfYHd9VJAcDrcV39q5hNXVahey7IXyQNK g7cw== 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=S3Jdws9NvCIfw295ZttUjLBUb2PpFwX2bj3IRhSU5A8=; b=E0umXOxkJz4TByLI75mPGvuYpMZZbNX8hRA+Q617+SfmxEd/1VSRytknbDfTSY/zpI Nfc9Je7ILGHjqZwLQ4zFo2qFVoDNE6ATjdcKZOaIeZjdPzSLNwpDzITQ+x4uDlPFGFZU v/w0qpAO7OlKBhMsQQGGihOSwjuRnWiV1e65w04MSaNkP9kvR+inMS2Pgp5ZuDzQECXM kOUPQvLSL4XZIbczNjPXx2EYfRm41JZvkrTK8OXk/tCT42xcEtqVZ44vCLo50f00P+Z4 vhTYMhDIHnBVtWBraWO1iyhQ1wiOgZFeflHc+ZaAPPg56iJvRM9aL7pihPj6ShUYh1sD MKHQ== X-Gm-Message-State: ANoB5pnQTRU3TrIubRP2/MsrwWSKVe6lp5vBv5iWAcGmi72/yv3npP7j o944q7Du/b2Dizy2EK1BPsX0cM0zEyQ/yg== X-Received: by 2002:adf:f091:0:b0:241:b933:c416 with SMTP id n17-20020adff091000000b00241b933c416mr20770257wro.616.1669290649888; Thu, 24 Nov 2022 03:50:49 -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.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 03:50:49 -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_Mathieu-Daud=C3=A9?= , Aurelien Jarno , Jiaxun Yang , Aleksandar Rikalo , Chris Wulff , Marek Vasut , Stafford Horne , Daniel Henrique Barboza , =?utf-8?q?C=C3=A9dric_Le_G?= =?utf-8?q?oater?= , 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 16/19] target/sh4: Convert to 3-phase reset Date: Thu, 24 Nov 2022 11:50:19 +0000 Message-Id: <20221124115023.2437291-17-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 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=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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Convert the sh4 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/sh4/cpu-qom.h | 4 ++-- target/sh4/cpu.c | 12 ++++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/target/sh4/cpu-qom.h b/target/sh4/cpu-qom.h index d4192d10908..89785a90f02 100644 --- a/target/sh4/cpu-qom.h +++ b/target/sh4/cpu-qom.h @@ -34,7 +34,7 @@ OBJECT_DECLARE_CPU_TYPE(SuperHCPU, SuperHCPUClass, SUPERH_CPU) /** * SuperHCPUClass: * @parent_realize: The parent class' realize handler. - * @parent_reset: The parent class' reset handler. + * @parent_phases: The parent class' reset phase handlers. * @pvr: Processor Version Register * @prr: Processor Revision Register * @cvr: Cache Version Register @@ -47,7 +47,7 @@ struct SuperHCPUClass { /*< public >*/ DeviceRealize parent_realize; - DeviceReset parent_reset; + ResettablePhases parent_phases; uint32_t pvr; uint32_t prr; diff --git a/target/sh4/cpu.c b/target/sh4/cpu.c index 453268392bf..951eb6b9c8d 100644 --- a/target/sh4/cpu.c +++ b/target/sh4/cpu.c @@ -87,14 +87,16 @@ static bool superh_cpu_has_work(CPUState *cs) return cs->interrupt_request & CPU_INTERRUPT_HARD; } -static void superh_cpu_reset(DeviceState *dev) +static void superh_cpu_reset_hold(Object *obj) { - CPUState *s = CPU(dev); + CPUState *s = CPU(obj); SuperHCPU *cpu = SUPERH_CPU(s); SuperHCPUClass *scc = SUPERH_CPU_GET_CLASS(cpu); CPUSH4State *env = &cpu->env; - scc->parent_reset(dev); + if (scc->parent_phases.hold) { + scc->parent_phases.hold(obj); + } memset(env, 0, offsetof(CPUSH4State, end_reset_fields)); @@ -274,11 +276,13 @@ static void superh_cpu_class_init(ObjectClass *oc, void *data) DeviceClass *dc = DEVICE_CLASS(oc); CPUClass *cc = CPU_CLASS(oc); SuperHCPUClass *scc = SUPERH_CPU_CLASS(oc); + ResettableClass *rc = RESETTABLE_CLASS(oc); device_class_set_parent_realize(dc, superh_cpu_realizefn, &scc->parent_realize); - device_class_set_parent_reset(dc, superh_cpu_reset, &scc->parent_reset); + resettable_class_set_parent_phases(rc, NULL, superh_cpu_reset_hold, NULL, + &scc->parent_phases); cc->class_by_name = superh_cpu_class_by_name; cc->has_work = superh_cpu_has_work;