From patchwork Thu Dec 15 12:50:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 634187 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp129528pvb; Thu, 15 Dec 2022 04:55:47 -0800 (PST) X-Google-Smtp-Source: AA0mqf5zLZ+iQU0YhaB3tyADQmLyhCtTbFo3lk/ZCwAfWKR3UEtZOCyt2prGFfG1lqtBWhd473IU X-Received: by 2002:a0c:c708:0:b0:4c7:38a1:d2e4 with SMTP id w8-20020a0cc708000000b004c738a1d2e4mr40122876qvi.42.1671108947297; Thu, 15 Dec 2022 04:55:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671108947; cv=none; d=google.com; s=arc-20160816; b=GOxn/t3rodTtG8DxzSPELk/SyPFtbQHOsl8FI6nrYGkvdw03iq3Xe95Mblsz3niVZ8 5KleYPyu3UnraUgCvqQkSyD72XTmJt4zCgPZUmIfJGfGBdX+TVRDUkbAjqgnGbesuS8q sHNW3SRqfQcMU54CbXF1F6a+NyNrbecqtNS4k0UEoucYZvviP/UAe4Iy0Fe598t4GA6Y hkKoK5Yj8Tj2a+7ndaQoXwVm5TWmlnh0y9pGDYD/tT1ytO4KzIHAKHi8lKKkujf4WLCL T9MRvAcBVlCTtjaYgF5hXtgAvH9lFduJ7pPwYqXwydiRpW1u6uJ2a8fCj8dn6l0Ni0An pjFg== 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:to:from :dkim-signature; bh=FQo9Y/PQ+gSmSXMPIhENR7hhWLKzE50YR9SZb6U2RxE=; b=DOB8cGSvQfdqeZ9R/+N15vwYPkZFSfPT/GwG/4goKz6gbRQtr/o4h1yyTO4BFAxU+r hr2AfRZU3f/Ktj5tgEuSkaXtgQ5c1icJE2FLnfQX9oeJXQa90TBjxeiT/bMHw1HliKBd XeTjJD8EjdZdreeL4UrFRsHnPTiZlF+Ra21gS82tQxwGOik2+GVS6KyudCgD3GkE/5Rc t4wRu1UpFYiGPHRibvLAYo8lT6V8onNb5kDjpyzo0AuXggICn4KwkKAJ0BSTUmrq2LKB B3WVG27nLxMuAaB7YhbWwaeEGEemYPG2wleFB+4VMZ3ilgxu6L6JLwK4dFQpkfn85W8q LMqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=u7lqJVvX; 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 c68-20020a379a47000000b006ff8554866esi8537719qke.317.2022.12.15.04.55.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 Dec 2022 04:55:47 -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=u7lqJVvX; 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 1p5nhS-00073P-AD; Thu, 15 Dec 2022 07:50:58 -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 1p5nh6-0006qO-CU for qemu-devel@nongnu.org; Thu, 15 Dec 2022 07:50:36 -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 1p5nh3-00047Y-Dh for qemu-devel@nongnu.org; Thu, 15 Dec 2022 07:50:35 -0500 Received: by mail-wm1-x32f.google.com with SMTP id z8-20020a05600c220800b003d33b0bda11so660382wml.0 for ; Thu, 15 Dec 2022 04:50:33 -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:to:from:from:to:cc:subject:date:message-id :reply-to; bh=FQo9Y/PQ+gSmSXMPIhENR7hhWLKzE50YR9SZb6U2RxE=; b=u7lqJVvX0Z5ElvyiiHxYDXGrwt5vZKNRnupeVU4h9PWtDo3CcF/N577pdpRaECC0/G HJVdMYNKnRf6f2kj9R8A2X7W22zNEFP/Pbkplmt5UhY/blebG5Ez/yL826K2LkZoWfov 1Cmyb1FErNGPQSJVFjn6uk6Rxa+AhNWU7Zji+CHnQC+gaS2xrA1STPLcaD0en5rYxu0o THe2qg7Q2LPRdkZZLjhmugMSIDFbV4bpYS3bMUAd7W3ZQL1uJEZ3cUr7HCQoqFTMXa+5 9mWh7Ovt/DNk8OxUSaggYSG/6YEx+NgA3ObdZiLCL0ToxQtrSvsMr9e+jcLbChNZdpd7 fu8g== 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:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FQo9Y/PQ+gSmSXMPIhENR7hhWLKzE50YR9SZb6U2RxE=; b=fWTplq1XmoJbaWZaBNtm+hTJrFyftcZZeQmhdyGnzmZYcmkdsdRlQADFeF1hEl22uI qAJ7bfP1roZ8IlSSetNRtBbhslQ9AQh4W7G/+wRfweqlCHN+3Va9ewpy2vhdB0FfSIDz GMeDAXZ7J5zJ2ZpFrFmZuS86GYj0/NNGyGAAfNsQZEBu5DJBTTVbiBFcMYeP80NQkJRs WxdLoKpiTxpXqe31jACL3dveLjBa12cqxkMKY1EAxFkDcquxs6sS/Q3uR3VrlC+GR37z kDmT7pryrwmdix1YjmHNXS7V2bkUvBxbB2xvjExJOBoj5No5DSsTf9+PAWvkm7aAVdU2 K36A== X-Gm-Message-State: ANoB5pkMIRCBpZf9v8nGsT2U0GqByEK3Y6WfJMQZYbOnwUjix5k/sKr3 rpKLQdUkJZXYl6NfWwS4dXwZTRJw7kktDzaf X-Received: by 2002:a05:600c:500b:b0:3cf:6d5b:8768 with SMTP id n11-20020a05600c500b00b003cf6d5b8768mr21256509wmr.8.1671108632755; Thu, 15 Dec 2022 04:50:32 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id i12-20020a05600c354c00b003cfd64b6be1sm8388787wmq.27.2022.12.15.04.50.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Dec 2022 04:50:32 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 23/29] hw/intc: Convert TYPE_ARM_GICV3_ITS_COMMON to 3-phase reset Date: Thu, 15 Dec 2022 12:50:03 +0000 Message-Id: <20221215125009.980128-24-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221215125009.980128-1-peter.maydell@linaro.org> References: <20221215125009.980128-1-peter.maydell@linaro.org> MIME-Version: 1.0 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Convert the TYPE_ARM_GICV3_ITS_COMMON parent class to 3-phase reset. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-id: 20221109161444.3397405-8-peter.maydell@linaro.org --- hw/intc/arm_gicv3_its_common.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/intc/arm_gicv3_its_common.c b/hw/intc/arm_gicv3_its_common.c index 90b85f1e25c..d7532a7a899 100644 --- a/hw/intc/arm_gicv3_its_common.c +++ b/hw/intc/arm_gicv3_its_common.c @@ -122,9 +122,9 @@ void gicv3_its_init_mmio(GICv3ITSState *s, const MemoryRegionOps *ops, msi_nonbroken = true; } -static void gicv3_its_common_reset(DeviceState *dev) +static void gicv3_its_common_reset_hold(Object *obj) { - GICv3ITSState *s = ARM_GICV3_ITS_COMMON(dev); + GICv3ITSState *s = ARM_GICV3_ITS_COMMON(obj); s->ctlr = 0; s->cbaser = 0; @@ -137,8 +137,9 @@ static void gicv3_its_common_reset(DeviceState *dev) static void gicv3_its_common_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); + ResettableClass *rc = RESETTABLE_CLASS(klass); - dc->reset = gicv3_its_common_reset; + rc->phases.hold = gicv3_its_common_reset_hold; dc->vmsd = &vmstate_its; }