From nobody Mon Apr 29 23:08:51 2024 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=1685565401; cv=none; d=zohomail.com; s=zohoarc; b=EOfEJHuFfILxAOS+hRvSY7zXVBG6enEc4T/0XrvXtjW6IiQleKDwoBj1eHUd47+KuEZu0SYYEKVflxl4yTla8XSJiTKyAIdINq2bhPAo/TgCx0mb4tJzvNab/rhgH/PZ536Tune8ViAD0MPJsuAjyAcQtXVUyPDei0IVhKII0Yk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685565401; h=Content-Type: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=axVpU0i2p75LH2asCUomaSunVbrAGYJD7scBST0rZU4=; b=MN5oUVzW15eu/8CoouckdsKI9WzauEbors3Zy+aySNxYayIlDVV2MUYBB3wl60K8dqsV5tprigAqmVnUlrGzivrJgKRC7etayJuRzjhMlOLOOB4HdY89kLNi8ldlNK2yN0X/lB5GL5hBDtRGyTvB0LL30MbmWP6gXbyDiQmvBiQ= 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 168556540120711.809026144276459; Wed, 31 May 2023 13:36:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q4SYL-00078f-6b; Wed, 31 May 2023 16:36:17 -0400 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 1q4SYF-00075O-WD for qemu-devel@nongnu.org; Wed, 31 May 2023 16:36:12 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q4SYE-0003AO-DB for qemu-devel@nongnu.org; Wed, 31 May 2023 16:36:11 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-3f606912ebaso939665e9.3 for ; Wed, 31 May 2023 13:36:09 -0700 (PDT) Received: from localhost.localdomain ([176.176.146.12]) by smtp.gmail.com with ESMTPSA id i7-20020a05600c290700b003f42d8dd7ffsm21935638wmd.19.2023.05.31.13.36.07 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 31 May 2023 13:36:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1685565368; x=1688157368; 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=axVpU0i2p75LH2asCUomaSunVbrAGYJD7scBST0rZU4=; b=w4dI9igElL4S66mQ9PeZEGHEm2TRMeJISnLQ4j/7gJEv3yMR/8O/7L9VTf1mCwuHGy WXfNkzEDJGcf31Zj33BP1CWpJcEMpLeMfvsaSZDhD+3iWFRk1rDCv+e52/g8+bhLU6P+ PMVQvY3Urrs/G67vF7kmvVbu6vhXSTGbgIs50uwb90KOEcQ+uHR/soR2MilbxHIqAw7K g5IjRF9dxWIpcbwDfUa03Uhw4qsA4QiBc6aJM9HkGnDpuNF/xllFbfiXygllika60PS5 FRtxwwrTAE+MzNjqIr36N6rFSz0MjL1AEqiptgTt0sDtF0kR1tCGo83p3/iKrh2NcSsy hd6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685565368; x=1688157368; 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=axVpU0i2p75LH2asCUomaSunVbrAGYJD7scBST0rZU4=; b=lGnOlXgeaJxF4psj/qP8rCqQG2PEx6fg9sNgKY10GYlh3dxj0JY/Croh/Kqw0IMTQo YFYke0lBvj34tYL+DNrOlH+c+qjH74ytwviDdGlTcTSJSVMx69aIdUMkkZW4dnREknKz cDU+cX2zyvUbQhPPgEzBBPbaSuVYujOemdd9IM3OjWVe2otDmEKqCgVLbZLQinMAIWZR Rk19kwj6kyNvlzXst75pF7WNpDWD6skzmOhwTDCkpZ0Cvgy5fXU0fgtkxhkkUNgKBQ2j 8h5l7Kb257JHh0edWJkWGkb3TF8izAeupZuYoUJOzzV0qf2Qbwca150pMKRzd4O3wAra PIHw== X-Gm-Message-State: AC+VfDzOYFOuTma1c2XgOR1JIay8BYkcjl8NVlWj/QKCMrFdup0AnEBz MzY9DDtN4cBKRtZ7jvgEunjL7jeqO6uq3E3qt2w= X-Google-Smtp-Source: ACHHUZ6FyCdS4xZ2yBUhpIySH7hFdVftn0j3PcRwnQ7XYKe2OgCM+p1moYYK91D0MhnuafiA2bmbVw== X-Received: by 2002:a7b:ce91:0:b0:3f6:89a:94c8 with SMTP id q17-20020a7bce91000000b003f6089a94c8mr301976wmj.24.1685565368541; Wed, 31 May 2023 13:36:08 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , qemu-arm@nongnu.org, Peter Maydell , Sergey Kambalin , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 01/15] hw/timer/arm_timer: Declare QOM types using DEFINE_TYPES() macro Date: Wed, 31 May 2023 22:35:45 +0200 Message-Id: <20230531203559.29140-2-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230531203559.29140-1-philmd@linaro.org> References: <20230531203559.29140-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1685565403218100003 When multiple QOM types are registered in the same file, it is simpler to use the the DEFINE_TYPES() macro. Replace the type_init() / type_register_static() combination. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell --- hw/timer/arm_timer.c | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/hw/timer/arm_timer.c b/hw/timer/arm_timer.c index 69c8863472..e410b37a23 100644 --- a/hw/timer/arm_timer.c +++ b/hw/timer/arm_timer.c @@ -380,13 +380,6 @@ static void icp_pit_init(Object *obj) save themselves. */ } =20 -static const TypeInfo icp_pit_info =3D { - .name =3D TYPE_INTEGRATOR_PIT, - .parent =3D TYPE_SYS_BUS_DEVICE, - .instance_size =3D sizeof(icp_pit_state), - .instance_init =3D icp_pit_init, -}; - static Property sp804_properties[] =3D { DEFINE_PROP_UINT32("freq0", SP804State, freq0, 1000000), DEFINE_PROP_UINT32("freq1", SP804State, freq1, 1000000), @@ -402,18 +395,20 @@ static void sp804_class_init(ObjectClass *klass, void= *data) k->vmsd =3D &vmstate_sp804; } =20 -static const TypeInfo sp804_info =3D { - .name =3D TYPE_SP804, - .parent =3D TYPE_SYS_BUS_DEVICE, - .instance_size =3D sizeof(SP804State), - .instance_init =3D sp804_init, - .class_init =3D sp804_class_init, +static const TypeInfo arm_timer_types[] =3D { + { + .name =3D TYPE_INTEGRATOR_PIT, + .parent =3D TYPE_SYS_BUS_DEVICE, + .instance_size =3D sizeof(icp_pit_state), + .instance_init =3D icp_pit_init, + + }, { + .name =3D TYPE_SP804, + .parent =3D TYPE_SYS_BUS_DEVICE, + .instance_size =3D sizeof(SP804State), + .instance_init =3D sp804_init, + .class_init =3D sp804_class_init, + } }; =20 -static void arm_timer_register_types(void) -{ - type_register_static(&icp_pit_info); - type_register_static(&sp804_info); -} - -type_init(arm_timer_register_types) +DEFINE_TYPES(arm_timer_types) --=20 2.38.1 From nobody Mon Apr 29 23:08:51 2024 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=1685565413; cv=none; d=zohomail.com; s=zohoarc; b=MTKNp5/QI0v+xaxuJweyCBCi2BHJlJd4pSmCQFIpPAv1iQPttNcuDIHP/1zojCbjVw/HSaXTtoecJpo2Vx8hxUq1DXRS+M0InxJ5UlXbXt3AAbri7I6CLCtIbvZSRGKa5MYRYt6eX5vMN3c2t/CFpG8fexmWksRXIYnoBjR9Db4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685565413; h=Content-Type: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=C6ZS1kmk8mZOQBkFwaVnQN91jrsnv+kxH/BK7lbOklA=; b=krgr+q3GUYKom0FStLO50ubLiK4VQSw++hr4f6tmKYfHCuT3QA2w0Yyc5QiH2DywaUMHmU9SiO9GtuRKt/wqVlCCNWEuEZvq/JRWr0SaLhJXYuqVwjAvwA8HkCF2/WZnqDqO2kQrbjSXV6VEchB04AjKG9JtwzgHzFib5QhoXZs= 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 1685565413736513.1016007091117; Wed, 31 May 2023 13:36:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q4SYX-0007QP-KZ; Wed, 31 May 2023 16:36:31 -0400 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 1q4SYM-0007AH-Im for qemu-devel@nongnu.org; Wed, 31 May 2023 16:36:19 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q4SYJ-0003CR-U3 for qemu-devel@nongnu.org; Wed, 31 May 2023 16:36:18 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-3f6dfc4e01fso996565e9.0 for ; Wed, 31 May 2023 13:36:15 -0700 (PDT) Received: from localhost.localdomain ([176.176.146.12]) by smtp.gmail.com with ESMTPSA id w8-20020a1cf608000000b003f18b942338sm22087120wmc.3.2023.05.31.13.36.12 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 31 May 2023 13:36:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1685565374; x=1688157374; 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=C6ZS1kmk8mZOQBkFwaVnQN91jrsnv+kxH/BK7lbOklA=; b=LAa9SCOiPODw2fs1xd3Iw11oZalGADGbhZsRgQKGaYN8cy8EeYESCeRTchLpDlKFVP wPCc7lJgGgitq+x9pMGPgcp/tKfCeKeRl+6/43mXgI5P5WVdgn947ZulNo+j0c9mV5eX D9aTlsyb1jetl08tS/yZnFQeBiueBtDVGnhsr+PaKzNaYGjfbT1ZpHbu52PUq12KQLHL abdMnJTF6a7GgYjhi8dXigo7O+OlLO+NjFjtyyViBM/Crzi5BxEy+K/6aqlBSqqXA9XR klY/mGDOqqAC9KFcQXLJPrOfpWNHRhCOhvzb99VepwJTwpudF13uKk8q7Ohxt9EmqpS0 vpRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685565374; x=1688157374; 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=C6ZS1kmk8mZOQBkFwaVnQN91jrsnv+kxH/BK7lbOklA=; b=MoQhCQnjPfjN17FUeiuJWskbUbQuoKerumUVYTXr/jdsMTRokWM3HSuh/0A3UgLuts 0t07XHKONuhNTO8BbyqZ7z2QCZKATwkhNWQTSW1gmWTlQgj22dItVZ/XcHoTBI235c4x Tbpxal0q3haekCBsYUrRQUyuZzi5+fXBRzB/Q9bU0YBBomUR9v6u8LLibnOAyJ3937Gv FUlNApzXnM5CttaIsffku8vqrTv0dfZvhNYV5GTRLB0p2OCgNq5BUfqIqzg5mygFjX/K SiwTRotBxgZgRhT/9dOZcd1DM8+MM0YCNFTxwBSAz7DmeZoIN4liyG3kikc501GJcENc bDgw== X-Gm-Message-State: AC+VfDw1dL5oZryzh7fIIh50+0hXROiDpDXSRtUJ/WZoVzvc7tuSEVSH HIFWkRzct3BtbP+H9aoALXyQDwSI6ddbJi2OgWI= X-Google-Smtp-Source: ACHHUZ5KvD5/a/iI6RRFnIMP0TuPcYXEOS3g5FaSM790zheHW3CEGJUNxN6yvwXctNMU1fxnzMb+tA== X-Received: by 2002:a7b:ca59:0:b0:3f4:f7c2:d681 with SMTP id m25-20020a7bca59000000b003f4f7c2d681mr355070wml.29.1685565374223; Wed, 31 May 2023 13:36:14 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , qemu-arm@nongnu.org, Peter Maydell , Sergey Kambalin , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 02/15] hw/timer/arm_timer: Move SP804 code around Date: Wed, 31 May 2023 22:35:46 +0200 Message-Id: <20230531203559.29140-3-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230531203559.29140-1-philmd@linaro.org> References: <20230531203559.29140-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1685565414828100001 Move sp804_properties[] and sp804_class_init() around with the rest of SP804 code code. What follows the "Integrator/CP timer module." is strictly ICP related. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell --- hw/timer/arm_timer.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/hw/timer/arm_timer.c b/hw/timer/arm_timer.c index e410b37a23..36f6586f80 100644 --- a/hw/timer/arm_timer.c +++ b/hw/timer/arm_timer.c @@ -309,6 +309,21 @@ static void sp804_realize(DeviceState *dev, Error **er= rp) s->timer[1]->irq =3D qemu_allocate_irq(sp804_set_irq, s, 1); } =20 +static Property sp804_properties[] =3D { + DEFINE_PROP_UINT32("freq0", SP804State, freq0, 1000000), + DEFINE_PROP_UINT32("freq1", SP804State, freq1, 1000000), + DEFINE_PROP_END_OF_LIST(), +}; + +static void sp804_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *k =3D DEVICE_CLASS(klass); + + k->realize =3D sp804_realize; + device_class_set_props(k, sp804_properties); + k->vmsd =3D &vmstate_sp804; +} + /* Integrator/CP timer module. */ =20 #define TYPE_INTEGRATOR_PIT "integrator_pit" @@ -380,21 +395,6 @@ static void icp_pit_init(Object *obj) save themselves. */ } =20 -static Property sp804_properties[] =3D { - DEFINE_PROP_UINT32("freq0", SP804State, freq0, 1000000), - DEFINE_PROP_UINT32("freq1", SP804State, freq1, 1000000), - DEFINE_PROP_END_OF_LIST(), -}; - -static void sp804_class_init(ObjectClass *klass, void *data) -{ - DeviceClass *k =3D DEVICE_CLASS(klass); - - k->realize =3D sp804_realize; - device_class_set_props(k, sp804_properties); - k->vmsd =3D &vmstate_sp804; -} - static const TypeInfo arm_timer_types[] =3D { { .name =3D TYPE_INTEGRATOR_PIT, --=20 2.38.1 From nobody Mon Apr 29 23:08:51 2024 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=1685565470; cv=none; d=zohomail.com; s=zohoarc; b=aAzt+8zhMvD1yI8atqoSSz97RVLo7QZXpj21ZP3o7Lt5oP+xJumbjjTtqLnzK5UosWU6I7Yykw3+0xsorOt45DAA6NJk7+zE0WWOWl5fMOR7PBdMwgz9i06AjKDWANmXlfVvNwQKj9BLDVpIxJdcLxaEM1yZC4KbM8QHp3wyUhE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685565470; h=Content-Type: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=E5b8V9q6QA/WPM4HyTDg8f1UskvZE7C+FUlDujJKJpg=; b=M3Y8WvznejWQDRfpt8/PNIwf8W8OMlaMxaiiMFr8yRhMStwB3+Ncs1xdvRq/BPPfp2W/T5wDjwTg/L82V5AcejV4Q+Wxs0B4s/J4gzV9E98D9Z2dwBtboLPlFG7hqmtsnSXI8X3VQlLU2OXAZzIMutYNkDtLlIIg2OY8BMS+vQc= 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 1685565470568640.4925623868804; Wed, 31 May 2023 13:37:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q4SYe-0007af-Bc; Wed, 31 May 2023 16:36:37 -0400 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 1q4SYT-0007Iv-I0 for qemu-devel@nongnu.org; Wed, 31 May 2023 16:36:27 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q4SYP-0003Eg-VO for qemu-devel@nongnu.org; Wed, 31 May 2023 16:36:24 -0400 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-307d20548adso63680f8f.0 for ; Wed, 31 May 2023 13:36:21 -0700 (PDT) Received: from localhost.localdomain ([176.176.146.12]) by smtp.gmail.com with ESMTPSA id a14-20020adfe5ce000000b003078354f774sm7945369wrn.36.2023.05.31.13.36.18 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 31 May 2023 13:36:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1685565379; x=1688157379; 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=E5b8V9q6QA/WPM4HyTDg8f1UskvZE7C+FUlDujJKJpg=; b=X5nVFwk17NlI83u+mz3mJJemZFUKk5Ui803GxBDR5O0tTV3YOH9omve+U2DxMZxeDF RbkMEGdzE4znJvim3OhszWbHADWD/mqbUYyYvpnh4iFp+3VNH6zkqDb8GOhZqmuRNvye vShyvnlZPxA9j4+lxnvYPZYj1BA99VyHnRzd2ioDONjaHXniSeIxD0zSO3Jzj67hozrD W87QWLV/H8DtszAM+pu2U2CvEkigPj38ZEbsVWVVxlPg1f0xTy6DhoSSiTjG/epXUfLI QRvzoPJwnPku98nXWWzYlw0qZgQ1ZDUFs1A5/z/uhZlB+7b2hkHU0u/t4AQc3/YfRf8c lHYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685565379; x=1688157379; 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=E5b8V9q6QA/WPM4HyTDg8f1UskvZE7C+FUlDujJKJpg=; b=iA+pmWxugVBO376Q1xlF+XT66Eofy0Jba18NIGViytT074uoJYojqRJZ7gX8c1wNTh DhFFEeG2u2zt9014fuHc8yX9VUBgy4NkD6sDhi3zG+xAugRZtY6LhTxfQpwSA1GxvZwe 06b+9qEVPOxCFgzXNVZw/fuq6VZCFzpP/FDArlqW0BLUDCdV87tjLqkeyOgLS8V3eUpn uU02LY0mI+CyyFdePAauV7cbRGwKdso1Y7CuYLewqe9sERNSLXEYtKZJtNmtcWqmRIuu N0Mod1xyy4FgQUYMbIVBniC2dgNBF/1G5KxNemaTH4LRmUlzWHihAZmhKggiq1W8E5Ja V/Hg== X-Gm-Message-State: AC+VfDwUTXsyssgq3OrK4vtC1ItMKVS+brejmOWuokZHsLfuqDRifvSk R95ZjtGB3/9csZREr5a/cXJQ2B3t4tmpqd8Rt/s= X-Google-Smtp-Source: ACHHUZ6ZAQu3uQ+XnEHRWI7hPIoPUrWjoC0ZHywBDozr6nxArvjpdsCYFPZRCHezQJzvjAAjnqJKiQ== X-Received: by 2002:adf:f742:0:b0:306:297b:927f with SMTP id z2-20020adff742000000b00306297b927fmr154149wrp.25.1685565379692; Wed, 31 May 2023 13:36:19 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , qemu-arm@nongnu.org, Peter Maydell , Sergey Kambalin , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 03/15] hw/timer/arm_timer: Add missing sp804_unrealize() handler Date: Wed, 31 May 2023 22:35:47 +0200 Message-Id: <20230531203559.29140-4-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230531203559.29140-1-philmd@linaro.org> References: <20230531203559.29140-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::435; envelope-from=philmd@linaro.org; helo=mail-wr1-x435.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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1685565472481100007 Release the IRQs allocated in sp804_realize() in the corresponding sp804_unrealize() handler. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/timer/arm_timer.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/hw/timer/arm_timer.c b/hw/timer/arm_timer.c index 36f6586f80..5caf42649a 100644 --- a/hw/timer/arm_timer.c +++ b/hw/timer/arm_timer.c @@ -309,6 +309,15 @@ static void sp804_realize(DeviceState *dev, Error **er= rp) s->timer[1]->irq =3D qemu_allocate_irq(sp804_set_irq, s, 1); } =20 +static void sp804_unrealize(DeviceState *dev) +{ + SP804State *s =3D SP804(dev); + + for (unsigned i =3D 0; i < ARRAY_SIZE(s->timer); i++) { + qemu_free_irq(s->timer[i]->irq); + } +} + static Property sp804_properties[] =3D { DEFINE_PROP_UINT32("freq0", SP804State, freq0, 1000000), DEFINE_PROP_UINT32("freq1", SP804State, freq1, 1000000), @@ -320,6 +329,7 @@ static void sp804_class_init(ObjectClass *klass, void *= data) DeviceClass *k =3D DEVICE_CLASS(klass); =20 k->realize =3D sp804_realize; + k->unrealize =3D sp804_unrealize; device_class_set_props(k, sp804_properties); k->vmsd =3D &vmstate_sp804; } --=20 2.38.1 From nobody Mon Apr 29 23:08:51 2024 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=1685565502; cv=none; d=zohomail.com; s=zohoarc; b=UfmVUdOo1xFgU6tjMNSNX+XjHKoOtUdbXc2UHqWCV7qagSUj/eetzQWUzn8QDAPe9ddEfHXulN5GvZZdJu63q15PY+lW/r3eZV47wQjcwEoEfA5bp2IdU1VKE8CIGwWnIlhSEaK97STR4Y1sSc1kE9EwmG7ib+/rrcMcwpCZs5o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685565502; h=Content-Type: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=RDY2GDiaOE1sTafU5g56yTJAkbGCsjHJ/M+/hUiSBu4=; b=Sk4dwZY9vyhgVaz2zWkK++QblHwwYgOgB1w1M6Drerofq664CkVqJZz1AswK1JdLkM2fYsswqBj+2S8By6LvqJv3eUcUl+io/rCH/G7hK9AhJj3VH/kycQYge8ly33/LMoFGIxDD9HZEg/B/nIu9jrCjvC8GFxm9VlgYJNwlC+k= 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 168556550209995.06106741955227; Wed, 31 May 2023 13:38:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q4SYf-0007bh-Eh; Wed, 31 May 2023 16:36:37 -0400 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 1q4SYX-0007RN-Pm for qemu-devel@nongnu.org; Wed, 31 May 2023 16:36:31 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q4SYU-0003Fk-Qi for qemu-devel@nongnu.org; Wed, 31 May 2023 16:36:28 -0400 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-30ae95c4e75so60860f8f.2 for ; Wed, 31 May 2023 13:36:26 -0700 (PDT) Received: from localhost.localdomain ([176.176.146.12]) by smtp.gmail.com with ESMTPSA id c18-20020a5d4152000000b0030aeb3731d0sm7774189wrq.98.2023.05.31.13.36.24 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 31 May 2023 13:36:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1685565385; x=1688157385; 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=RDY2GDiaOE1sTafU5g56yTJAkbGCsjHJ/M+/hUiSBu4=; b=IHo+kDOwJImA5YiH2NVzB4/KqHBgQRPNvtS71relVd6IrNBqEwhZcpCTM5IYdaGu9W arrFrGjqPIakvJdSTa4c4A4epln8Jn4Lb5FolnwOOnrsUG8VqiGXz1LOQ74vcYf8zINa JV/Q7VBjDNBSWWbNnOIw0fiSjccy7kX4zOXolt9PlZ3/cDzUH14kpe3dXImpZu+PRXSu AatfMW2VMR3HMd2ZaXCNqf1tpDA4YrrpNrSOccZZtBfBcCw+jzowr9U8pq7dbZ1H4JW3 STbwV0nJUdIkCJKwPuP46P0OIHuai8gk+JKm0c4jecYBpAyqdawr/U4Tw9LI6bWBKxqX zsQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685565385; x=1688157385; 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=RDY2GDiaOE1sTafU5g56yTJAkbGCsjHJ/M+/hUiSBu4=; b=aV91ZddJ3wCHZJrgsWtRjTJbU01tZmwdoG7sm6YUw5IBrlsj2F+XYqbNZBCHgYkWlI U9LrfOAnJ6PZRvJ4YObfItRgzNL7L/ts42nJredSO1q74Q5miWpaTTybxYp/dfMfKmLV BtNbPyuEMNez2UeGhOmyX9/czAgR6DaKEESnyWqk0gg9K/enspW77dLjHjA6YKv6Fmpb 8mLuOvu+pbRxoufH/uDdZo8seuEIVLWk2oECk0M2ghKfDLoxXnpyczSkyDnDOIxC+Hhh 1Dq5Tw1v4eRThtS1pRMhTBnEOJxxkO0T9JPhWYwoj/ex7ISBjxj9lNEGcfsh5qu5HuZ6 n3wA== X-Gm-Message-State: AC+VfDwOM14qZVWXnvXEz6yMj3dxojSngyx6Y5HHJkYNoIt+y3wNE0S/ SekLjh+xoNfNigWJwo4RTPqQA63tAqgAjyttl0g= X-Google-Smtp-Source: ACHHUZ6ay/Snc/6AceBLPfvO1WttjWgSY48admO5L33lz/EcrttoLJBFWKDEeaecNAdRKorfLw0vrw== X-Received: by 2002:a5d:4d46:0:b0:30a:8e83:5b1a with SMTP id a6-20020a5d4d46000000b0030a8e835b1amr242708wru.13.1685565385335; Wed, 31 May 2023 13:36:25 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , qemu-arm@nongnu.org, Peter Maydell , Sergey Kambalin , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 04/15] hw/timer/arm_timer: Remove pointless cast from void * Date: Wed, 31 May 2023 22:35:48 +0200 Message-Id: <20230531203559.29140-5-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230531203559.29140-1-philmd@linaro.org> References: <20230531203559.29140-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::430; envelope-from=philmd@linaro.org; helo=mail-wr1-x430.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, T_SCC_BODY_TEXT_LINE=-0.01 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1685565503714100002 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell --- hw/timer/arm_timer.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/hw/timer/arm_timer.c b/hw/timer/arm_timer.c index 5caf42649a..3dda3a73f8 100644 --- a/hw/timer/arm_timer.c +++ b/hw/timer/arm_timer.c @@ -52,7 +52,7 @@ static void arm_timer_update(arm_timer_state *s) =20 static uint32_t arm_timer_read(void *opaque, hwaddr offset) { - arm_timer_state *s =3D (arm_timer_state *)opaque; + arm_timer_state *s =3D opaque; =20 switch (offset >> 2) { case 0: /* TimerLoad */ @@ -99,7 +99,7 @@ static void arm_timer_recalibrate(arm_timer_state *s, int= reload) static void arm_timer_write(void *opaque, hwaddr offset, uint32_t value) { - arm_timer_state *s =3D (arm_timer_state *)opaque; + arm_timer_state *s =3D opaque; int freq; =20 switch (offset >> 2) { @@ -154,7 +154,7 @@ static void arm_timer_write(void *opaque, hwaddr offset, =20 static void arm_timer_tick(void *opaque) { - arm_timer_state *s =3D (arm_timer_state *)opaque; + arm_timer_state *s =3D opaque; s->int_level =3D 1; arm_timer_update(s); } @@ -214,7 +214,7 @@ static const uint8_t sp804_ids[] =3D { /* Merge the IRQs from the two component devices. */ static void sp804_set_irq(void *opaque, int irq, int level) { - SP804State *s =3D (SP804State *)opaque; + SP804State *s =3D opaque; =20 s->level[irq] =3D level; qemu_set_irq(s->irq, s->level[0] || s->level[1]); @@ -223,7 +223,7 @@ static void sp804_set_irq(void *opaque, int irq, int le= vel) static uint64_t sp804_read(void *opaque, hwaddr offset, unsigned size) { - SP804State *s =3D (SP804State *)opaque; + SP804State *s =3D opaque; =20 if (offset < 0x20) { return arm_timer_read(s->timer[0], offset); @@ -255,7 +255,7 @@ static uint64_t sp804_read(void *opaque, hwaddr offset, static void sp804_write(void *opaque, hwaddr offset, uint64_t value, unsigned size) { - SP804State *s =3D (SP804State *)opaque; + SP804State *s =3D opaque; =20 if (offset < 0x20) { arm_timer_write(s->timer[0], offset, value); @@ -349,7 +349,7 @@ struct icp_pit_state { static uint64_t icp_pit_read(void *opaque, hwaddr offset, unsigned size) { - icp_pit_state *s =3D (icp_pit_state *)opaque; + icp_pit_state *s =3D opaque; int n; =20 /* ??? Don't know the PrimeCell ID for this device. */ @@ -365,7 +365,7 @@ static uint64_t icp_pit_read(void *opaque, hwaddr offse= t, static void icp_pit_write(void *opaque, hwaddr offset, uint64_t value, unsigned size) { - icp_pit_state *s =3D (icp_pit_state *)opaque; + icp_pit_state *s =3D opaque; int n; =20 n =3D offset >> 8; --=20 2.38.1 From nobody Mon Apr 29 23:08:51 2024 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=1685565627; cv=none; d=zohomail.com; s=zohoarc; b=Z90dVHaVolS/6czP45rDoZJCfmBzhNit8gbshzPOnbiGV13+tytcsdmqlklkZIM77x2ZJ4X60J/Wklzvp/wkI0ZHiHiP/sppSCxvVcsRfBjOyP27b/06rqWaVW5Qmnfc4d4y8Kc7+Ldl6NHatbsrXS4wY4gipfqlN2SOZW4ZU0E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685565627; h=Content-Type: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=+bApdHpHvphQGH6iJkkAkav6K47Z8aVKSZsLKgEzGjI=; b=ViDUIjWUEQQq9zA5m1Cbiy4hSbE2esCh2EWy8F/dZ86fjD4bPB+f7rfSmX05xerDPX5qmde+x9TCo0k3R7qPnAF1760BPJFssRqwuJRwqgKA2N0chnWXLYMTmhsFlzEeRbcj4+5RacavfsF0PVv5ukZXgfm0Df/Nd8hN9pTqkBA= 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 1685565627176241.7530321095917; Wed, 31 May 2023 13:40:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q4SYg-0007k0-5K; Wed, 31 May 2023 16:36:38 -0400 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 1q4SYc-0007W1-Po for qemu-devel@nongnu.org; Wed, 31 May 2023 16:36:35 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q4SYb-0003IX-78 for qemu-devel@nongnu.org; Wed, 31 May 2023 16:36:34 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-3f6e72a1464so921185e9.1 for ; Wed, 31 May 2023 13:36:32 -0700 (PDT) Received: from localhost.localdomain ([176.176.146.12]) by smtp.gmail.com with ESMTPSA id 9-20020a05600c028900b003f42a75ac2asm22049206wmk.23.2023.05.31.13.36.29 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 31 May 2023 13:36:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1685565391; x=1688157391; 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=+bApdHpHvphQGH6iJkkAkav6K47Z8aVKSZsLKgEzGjI=; b=SjC2KJW26ls1HD58kz7BecXkM9dZ1U5aqRtnlE3a8cX3dLlv10QWAO5aBM5LhxY6Bx Vr7E3QsiG+GmAb5ODU9i7ZhRbmF8ZlGzfQQjqsyX8Ay654cpOdtqoKSVquN81hhbVV01 u2Ymvw/N5Dyg0l2n3R7guL1BbiB18b1OI2FiBrlRKh6TOASo593nt7qg6FuxVKs2FB5G 38rWFyguhjusV/ZcSjnEO+3v34GaU+DLtVmWbrBhZ0XhuVYFsJwS6eNtBa/xWnOaRaKT 14KiOLb3cSjf5QuzWlK99B+tW8PmJGkmEPrUD4h09Bk6D+QQ/0N11ZjaZZzbIktelvgm ViBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685565391; x=1688157391; 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=+bApdHpHvphQGH6iJkkAkav6K47Z8aVKSZsLKgEzGjI=; b=eiIe1It456ARR6yMRXKhhwmRt5SiSyFbKlpPjB4l0GAhQi9JuTSYV2ks183MGYivhv /awnv+QwmQNqoRVZh0DqAQ8imtE8TvtcNgN4A57Pe1f09fKSJY0yWDu+gRHojtTk4uhc Ouu+LBVcEvIWx9j8SooaQ3JAMbyIgXlzSMjknKZMYKjmnbNODBXQ3+M5BK/B6SUJuRBj EH/8yhaMTjPLgHHb78UUBmfiLTwgI3ralzhnc3jHf1nAo7T/7GFT5a26m0FnnwSPUWB4 Oq8DOf0MOfYyPcZMwcGKCo3kDOV/1EoIM2zjmbLFyTurzm6/FBaIZrq4kQHvPabypQkt J0dg== X-Gm-Message-State: AC+VfDzXfr8A+s+AYmgWxpK/llK8iV+KIuGYjawiDSApp7sp8qT3HWOP GX49BXBNxN6R+gXdTed2y4/AbHnuQwZGBqznbtQ= X-Google-Smtp-Source: ACHHUZ715afNrjdshuSitYG2Pf7FgralJ4vDvkvh+fTW6vxsZ0Z3ZKrE329y5pBYPkvRcMgRr8b2gQ== X-Received: by 2002:a05:600c:3658:b0:3f4:2328:b5c2 with SMTP id y24-20020a05600c365800b003f42328b5c2mr260494wmq.35.1685565391086; Wed, 31 May 2023 13:36:31 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , qemu-arm@nongnu.org, Peter Maydell , Sergey Kambalin , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 05/15] hw/timer/arm_timer: CamelCase rename icp_pit_state -> IntegratorPitState Date: Wed, 31 May 2023 22:35:49 +0200 Message-Id: <20230531203559.29140-6-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230531203559.29140-1-philmd@linaro.org> References: <20230531203559.29140-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1685565629249100003 Following docs/devel/style.rst guidelines, rename icp_pit_state using CamelCase as IntegratorPitState. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell --- hw/timer/arm_timer.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/timer/arm_timer.c b/hw/timer/arm_timer.c index 3dda3a73f8..fc8d25b0dc 100644 --- a/hw/timer/arm_timer.c +++ b/hw/timer/arm_timer.c @@ -337,9 +337,9 @@ static void sp804_class_init(ObjectClass *klass, void *= data) /* Integrator/CP timer module. */ =20 #define TYPE_INTEGRATOR_PIT "integrator_pit" -OBJECT_DECLARE_SIMPLE_TYPE(icp_pit_state, INTEGRATOR_PIT) +OBJECT_DECLARE_SIMPLE_TYPE(IntegratorPitState, INTEGRATOR_PIT) =20 -struct icp_pit_state { +struct IntegratorPitState { SysBusDevice parent_obj; =20 MemoryRegion iomem; @@ -349,7 +349,7 @@ struct icp_pit_state { static uint64_t icp_pit_read(void *opaque, hwaddr offset, unsigned size) { - icp_pit_state *s =3D opaque; + IntegratorPitState *s =3D opaque; int n; =20 /* ??? Don't know the PrimeCell ID for this device. */ @@ -365,7 +365,7 @@ static uint64_t icp_pit_read(void *opaque, hwaddr offse= t, static void icp_pit_write(void *opaque, hwaddr offset, uint64_t value, unsigned size) { - icp_pit_state *s =3D opaque; + IntegratorPitState *s =3D opaque; int n; =20 n =3D offset >> 8; @@ -385,7 +385,7 @@ static const MemoryRegionOps icp_pit_ops =3D { =20 static void icp_pit_init(Object *obj) { - icp_pit_state *s =3D INTEGRATOR_PIT(obj); + IntegratorPitState *s =3D INTEGRATOR_PIT(obj); SysBusDevice *dev =3D SYS_BUS_DEVICE(obj); =20 /* Timer 0 runs at the system clock speed (40MHz). */ @@ -409,7 +409,7 @@ static const TypeInfo arm_timer_types[] =3D { { .name =3D TYPE_INTEGRATOR_PIT, .parent =3D TYPE_SYS_BUS_DEVICE, - .instance_size =3D sizeof(icp_pit_state), + .instance_size =3D sizeof(IntegratorPitState), .instance_init =3D icp_pit_init, =20 }, { --=20 2.38.1 From nobody Mon Apr 29 23:08:51 2024 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=1685565467; cv=none; d=zohomail.com; s=zohoarc; b=IhjmXsAWb3RodvtDslsYyB4QMvji2Kt4nvhvxkYmuTRAu1QeekAJA41UCkfVbcAhciM50daPmH79V9awBb/6tTPNnXs4WDjfXKCcS40n7ZdtXyDwJxu9ghioFayRucKyGhImCWEU2j0iudj+YZmp8Hv2OaZkqZBOeKQHZVp6sYc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685565467; h=Content-Type: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=MVO2YZhj70IQRx0DkEHrVUKir9ojXgRvhsJpsCyyon4=; b=eufb2lGW3jRS8GnLH0m+WYSDh3R2TNfBYZBQil4TTi7bW3GyMWVBGsycqqAHIMZHPJ7ZGnYVXWbunnoN5DHo2DO+lspqvtF/EyeRB7vUKeWngK1pfGNGcE6vz+C9D5siyG5cUKq2i2gyr6FxipOoS0CN10qXc245cgjB6NDOg/E= 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 1685565467657698.7650559458209; Wed, 31 May 2023 13:37:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q4SYi-0007oI-Cr; Wed, 31 May 2023 16:36:40 -0400 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 1q4SYh-0007m2-6C for qemu-devel@nongnu.org; Wed, 31 May 2023 16:36:39 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q4SYf-00036b-EH for qemu-devel@nongnu.org; Wed, 31 May 2023 16:36:38 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-3f6e13940daso1169305e9.0 for ; Wed, 31 May 2023 13:36:37 -0700 (PDT) Received: from localhost.localdomain ([176.176.146.12]) by smtp.gmail.com with ESMTPSA id 13-20020a05600c24cd00b003f4dde07956sm25484459wmu.42.2023.05.31.13.36.35 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 31 May 2023 13:36:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1685565396; x=1688157396; 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=MVO2YZhj70IQRx0DkEHrVUKir9ojXgRvhsJpsCyyon4=; b=YXn2bcH5uNzpFH5D4BGle4BmG26lHQu3zC1bbGEbm2HtI/SAaiSVGQtuIRNz+XkJE9 n3VMnM8nutiKJgFg0IukIhC67AEe7H3UJqGj1l41sQYA1KccB21G7bCYQzKbQ3kjZwDo GWoogoWVDhgDKhNHFmUlpvf/IT0fqSmT+FpJDp2hf8hYuFIV2frU4KfUvEsGopOgeNow /a4MNHwzvbqnccCc4qksV+dIyR1iyvQ771WgaTM6IVlHr3buvzbl9k1jDjcAT9cdxV59 28trj1mIrYvFJFJSOhgB9gQciU+neFjtoOpppWNYGgl6NjDRPfcAkja/qd41rfUNhDaQ zPAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685565396; x=1688157396; 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=MVO2YZhj70IQRx0DkEHrVUKir9ojXgRvhsJpsCyyon4=; b=NiAF/eOIfwqlVeTXC6d6pxKaqs19ZB+vTLaSe+IZEr9rupKQ12drMjst5HgRfSJrls sKmqDc16wcLPktkMEXPR6caWAOUNcFnmvktJ8N/RephEpuhsxkI+vn2vMKN7EEnU+n9B F7/qoXy4wV0ecS4tZmGklbCSHWo5wuZUsDGKjjQnV5OWH23ixC8Lp+hRafZu3mfG+CMQ K9gXbagbZQRB+zNsg9iAfIj39d5b/DQ6Q37udfYp/k8d4zxeIqZRdVYOKWqYpThFigSQ Tb+cm1hbArDKY1EwBOiABhB48xwCJ/WrR8lv2xMGA5nxJoZ10W5L0c6IPNyG3rwGXAE3 wANQ== X-Gm-Message-State: AC+VfDxO4q6Kovfuhd0A98dCJap7LFARFfB8OpKDfqPPwettvYWpW+q8 PpdvqAUhFTHWPo/W3QlrtSI7WtGxWZLzE3Th0xM= X-Google-Smtp-Source: ACHHUZ49Sa4+xsj+fUtMgYEELMVj3pVblzZFsLEGWyqsOKJ1yN899Ixb58r2LBry4hwqjsXSSZ4Hlw== X-Received: by 2002:a1c:6a09:0:b0:3f6:f2b2:15c9 with SMTP id f9-20020a1c6a09000000b003f6f2b215c9mr417614wmc.37.1685565396522; Wed, 31 May 2023 13:36:36 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , qemu-arm@nongnu.org, Peter Maydell , Sergey Kambalin , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 06/15] hw/timer/arm_timer: CamelCase rename arm_timer_state -> ArmTimerState Date: Wed, 31 May 2023 22:35:50 +0200 Message-Id: <20230531203559.29140-7-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230531203559.29140-1-philmd@linaro.org> References: <20230531203559.29140-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::336; envelope-from=philmd@linaro.org; helo=mail-wm1-x336.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, T_SCC_BODY_TEXT_LINE=-0.01 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1685565469488100003 Following docs/devel/style.rst guidelines, rename arm_timer_state as ArmTimerState. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell --- hw/timer/arm_timer.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/hw/timer/arm_timer.c b/hw/timer/arm_timer.c index fc8d25b0dc..2cd8c99b4e 100644 --- a/hw/timer/arm_timer.c +++ b/hw/timer/arm_timer.c @@ -36,11 +36,11 @@ typedef struct { int freq; int int_level; qemu_irq irq; -} arm_timer_state; +} ArmTimerState; =20 /* Check all active timers, and schedule the next timer interrupt. */ =20 -static void arm_timer_update(arm_timer_state *s) +static void arm_timer_update(ArmTimerState *s) { /* Update interrupts. */ if (s->int_level && (s->control & TIMER_CTRL_IE)) { @@ -52,7 +52,7 @@ static void arm_timer_update(arm_timer_state *s) =20 static uint32_t arm_timer_read(void *opaque, hwaddr offset) { - arm_timer_state *s =3D opaque; + ArmTimerState *s =3D opaque; =20 switch (offset >> 2) { case 0: /* TimerLoad */ @@ -79,7 +79,7 @@ static uint32_t arm_timer_read(void *opaque, hwaddr offse= t) * Reset the timer limit after settings have changed. * May only be called from inside a ptimer transaction block. */ -static void arm_timer_recalibrate(arm_timer_state *s, int reload) +static void arm_timer_recalibrate(ArmTimerState *s, int reload) { uint32_t limit; =20 @@ -99,7 +99,7 @@ static void arm_timer_recalibrate(arm_timer_state *s, int= reload) static void arm_timer_write(void *opaque, hwaddr offset, uint32_t value) { - arm_timer_state *s =3D opaque; + ArmTimerState *s =3D opaque; int freq; =20 switch (offset >> 2) { @@ -154,7 +154,7 @@ static void arm_timer_write(void *opaque, hwaddr offset, =20 static void arm_timer_tick(void *opaque) { - arm_timer_state *s =3D opaque; + ArmTimerState *s =3D opaque; s->int_level =3D 1; arm_timer_update(s); } @@ -164,19 +164,19 @@ static const VMStateDescription vmstate_arm_timer =3D= { .version_id =3D 1, .minimum_version_id =3D 1, .fields =3D (VMStateField[]) { - VMSTATE_UINT32(control, arm_timer_state), - VMSTATE_UINT32(limit, arm_timer_state), - VMSTATE_INT32(int_level, arm_timer_state), - VMSTATE_PTIMER(timer, arm_timer_state), + VMSTATE_UINT32(control, ArmTimerState), + VMSTATE_UINT32(limit, ArmTimerState), + VMSTATE_INT32(int_level, ArmTimerState), + VMSTATE_PTIMER(timer, ArmTimerState), VMSTATE_END_OF_LIST() } }; =20 -static arm_timer_state *arm_timer_init(uint32_t freq) +static ArmTimerState *arm_timer_init(uint32_t freq) { - arm_timer_state *s; + ArmTimerState *s; =20 - s =3D g_new0(arm_timer_state, 1); + s =3D g_new0(ArmTimerState, 1); s->freq =3D freq; s->control =3D TIMER_CTRL_IE; =20 @@ -198,7 +198,7 @@ struct SP804State { SysBusDevice parent_obj; =20 MemoryRegion iomem; - arm_timer_state *timer[2]; + ArmTimerState *timer[2]; uint32_t freq0, freq1; int level[2]; qemu_irq irq; @@ -343,7 +343,7 @@ struct IntegratorPitState { SysBusDevice parent_obj; =20 MemoryRegion iomem; - arm_timer_state *timer[3]; + ArmTimerState *timer[3]; }; =20 static uint64_t icp_pit_read(void *opaque, hwaddr offset, --=20 2.38.1 From nobody Mon Apr 29 23:08:51 2024 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=1685565619; cv=none; d=zohomail.com; s=zohoarc; b=RsLZiO9MUwY8Mo501IX19gIS7xjB5UZSRNTpJNduJlbJM220cNsAGaFrUPiZY3BlyVpDCwKAz33qh65tAQ0SSYDHlsXKR4EMphLUa6Yv3NfCgCsgiZ4bTvUtF/1sLVtBCYxQawVQPVnI1rXbo4TFJuBPCHSKJD/WCJouRrxQj+M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685565619; h=Content-Type: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=bxI8oOMi+OTgw+TcZSVgrTxV90PbWEXNzhwY3LKFlJ0=; b=mGbr7sbYWaC8R3AvSJKaecC01QGe+lEIVkeZUm0DXSUuOocNMZjuny11OdUBGoOkh9uoAVfG33xbpvlJ5WDYZQArDAQJ2vOiinlxTllYsnkHGRDFvEXgwicsAfQv81/eJShu+Nij9zQKuc+PzDR097KM+qFm9KlloyFPFo5E+eo= 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 1685565619032849.8531351059852; Wed, 31 May 2023 13:40:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q4SYo-0007ro-7m; Wed, 31 May 2023 16:36:46 -0400 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 1q4SYn-0007rG-82 for qemu-devel@nongnu.org; Wed, 31 May 2023 16:36:45 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q4SYl-0003Ki-Nc for qemu-devel@nongnu.org; Wed, 31 May 2023 16:36:44 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-30af56f5f52so54687f8f.1 for ; Wed, 31 May 2023 13:36:43 -0700 (PDT) Received: from localhost.localdomain ([176.176.146.12]) by smtp.gmail.com with ESMTPSA id u15-20020a05600c210f00b003f42d8dd7d1sm25676262wml.7.2023.05.31.13.36.41 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 31 May 2023 13:36:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1685565402; x=1688157402; 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=bxI8oOMi+OTgw+TcZSVgrTxV90PbWEXNzhwY3LKFlJ0=; b=w14v5IeB4aFlnV+gVzbxiX9fKxJQ8doL0ZdQ8mTnyHdU2JtCi2MnUX4uQOYYvBL0jJ IT9n3wjpilxQHV4kEyy9+sP2PS+3P8QDqXKY3grBXysI11EWUs8LPWtwQYNTwtsB+jib ABzt8+prwsgGpHEdyAp357eecu7Ft8HiWX28vKmku0fBwADJFbu/Oatf1k11pEed5Fvf gwb/MG0xxb8dfSrqKeYECcQ7A73VBsiYTS+9SHzBlxt/7C7YAX9LAAo4Li4/xJewcoWj xRfBwh4gzCBB7vgx6Jj0a8dNLovuhZ1umr2cK57dqp/jJYgj4kDWJsdWCPIQn5V3UcOl hqxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685565402; x=1688157402; 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=bxI8oOMi+OTgw+TcZSVgrTxV90PbWEXNzhwY3LKFlJ0=; b=TUoY+Lm93fhR91eWlv+m2RuAYik6FxrWDIDzCAuu0kUeB8lXE5QC7Phs2ulD3LcYEH e0Ky5hFOpvMWwNEoyDEQqDYdQT03woaMOREJVy0Z4p8MLtX0STvot+p9V0CXAQ5Qy8CQ KomwKvuJg8uGRDYBxSyVsrdpqXwq7cNNG2anZOtpdFwVNPOA4/fW/oBqlK7Zr6Ew3cBU qoQ7TfVMk5a2nThbyhG9HGhiS1Mbh6XbgSOX+dEqNDq24k1c3CUFR4UvUF1/p6aTsIPl NiDaV2K0DSHrG3Pxav6qE6FfQrdoXkrvfVoJavrsjecA2qgKddZCrsJXis6vjU4AKHPO dTNw== X-Gm-Message-State: AC+VfDzpaeW4oxxSz+m3zauHkT5kfGSkxc+SKCsvPbMuNg+U82VvLN2D xVie6t3mO2z3WOsdiWxEnJPrDH5q9OSuuz1i+s8= X-Google-Smtp-Source: ACHHUZ5D6VksYp3cDxusKzD5RZt+J8n4dcFprX65y2zFu3pBRdn5FmiwL+lLValRHK6WGiKgfU1hrA== X-Received: by 2002:a5d:65d2:0:b0:30a:bf2b:e03c with SMTP id e18-20020a5d65d2000000b0030abf2be03cmr162255wrw.23.1685565402265; Wed, 31 May 2023 13:36:42 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , qemu-arm@nongnu.org, Peter Maydell , Sergey Kambalin , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 07/15] hw/timer/arm_timer: Extract arm_timer_reset() Date: Wed, 31 May 2023 22:35:51 +0200 Message-Id: <20230531203559.29140-8-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230531203559.29140-1-philmd@linaro.org> References: <20230531203559.29140-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::42f; envelope-from=philmd@linaro.org; helo=mail-wr1-x42f.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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1685565620478100003 Extract arm_timer_reset() before converting this model to QOM/QDev in few commits. This will become our DeviceReset handler. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/timer/arm_timer.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/hw/timer/arm_timer.c b/hw/timer/arm_timer.c index 2cd8c99b4e..54318d0a57 100644 --- a/hw/timer/arm_timer.c +++ b/hw/timer/arm_timer.c @@ -172,13 +172,18 @@ static const VMStateDescription vmstate_arm_timer =3D= { } }; =20 +static void arm_timer_reset(ArmTimerState *s) +{ + s->control =3D TIMER_CTRL_IE; +} + static ArmTimerState *arm_timer_init(uint32_t freq) { ArmTimerState *s; =20 s =3D g_new0(ArmTimerState, 1); s->freq =3D freq; - s->control =3D TIMER_CTRL_IE; + arm_timer_reset(s); =20 s->timer =3D ptimer_init(arm_timer_tick, s, PTIMER_POLICY_LEGACY); vmstate_register(NULL, VMSTATE_INSTANCE_ID_ANY, &vmstate_arm_timer, s); --=20 2.38.1 From nobody Mon Apr 29 23:08:51 2024 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=1685565549; cv=none; d=zohomail.com; s=zohoarc; b=R8tR3XAc51RK3QH+Ck+NIIyiWyDDsWyJ8sFwBmAG2n5nsigv0iQFr4wCk7wt2x/26k4Z293lpeMuh6YkmCZDJw7rhuo2pDSlHGtLxyaLdo2QuAHX3Oh/05VkOsJrTeE3jBcYJYRfm0EdpMWZcPolNLDkSRbRtKzwc0uTYfMeN6g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685565549; h=Content-Type: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=cqmxkSyXDcjXzwtphH1bFAgAKMWrKTeKoHsfOWjfasw=; b=QH8+4N/vKjuLSZ74kK3op39m/6LFGegJB/e/7wk3SYpEkJHudcHPz7v2oTdspA6HPWJk+W8wfoNv2RADvxrQuHdu4XmXH0k5VB89WxZIbcPQSTIEetlabimi/a486VGmh54W/2vG28iAqfxDQATgM3r3H3kB79l7fxHGA/9ghDY= 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 1685565549300530.5229846243553; Wed, 31 May 2023 13:39:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q4SZ2-0008SA-BH; Wed, 31 May 2023 16:37:00 -0400 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 1q4SYu-0008Cy-78 for qemu-devel@nongnu.org; Wed, 31 May 2023 16:36:56 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q4SYr-0003LQ-FW for qemu-devel@nongnu.org; Wed, 31 May 2023 16:36:51 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-3f6a6b9c079so881945e9.1 for ; Wed, 31 May 2023 13:36:49 -0700 (PDT) Received: from localhost.localdomain ([176.176.146.12]) by smtp.gmail.com with ESMTPSA id x21-20020a05600c21d500b003f6041f5a6csm21998812wmj.12.2023.05.31.13.36.46 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 31 May 2023 13:36:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1685565407; x=1688157407; 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=cqmxkSyXDcjXzwtphH1bFAgAKMWrKTeKoHsfOWjfasw=; b=fpTM2ur8d/1G9NkfRgb3I606Jl5/sSIsRAUzCAFXspxNnWuxpdNYTgjl2RhyO8Gwuv QSSeXsorCiy9TQtZZ1fj1BIIFT95XvUZlg0pEnxGdvNm8mKdO8DIqQC+BcM1HodT45dw /cEam/MijEDaBdK9k5MLeFB3Ln3DUUIsD22xI05ob8GsKt30/53v7G2IqPtoD8Tmi4eI kvLyOHXDph0AwitdCnjhaP5Plsw3yNQhQM+jPrH7AkduaETdNjpEFqaCV7VAku/ii9kl IbOBevb5yl4sp/ntWilSFV3ibriKdJZRbRP5DXy3vbAm1xNhzT5MGkSPVVBzDbXM1pmS OZdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685565407; x=1688157407; 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=cqmxkSyXDcjXzwtphH1bFAgAKMWrKTeKoHsfOWjfasw=; b=fgCPxgCV52CG47aTEzBtTxBYSN+W+eTIIMth0D47pMClGbAcv3BKDJ+1oZMzxLXlPU dYacB7XrKaTATVu9rtsB8PUiPDsM5s/a5BUErcCtVmV6dhD0OnNzPuQcvHLT6iwoTKXb +3++Or+FtZsIc/403bmOlit3PoQwcCAVOC8r12Yd/1MuAphttA0f0eK2r3qedh7YTc0R bRdFr1Q8sGFP1b47YU43Bi6wcO9B6y5zkrXhqIIdfpFEX4q9N40alUuKK5LIfX4GIM3Q RxaBlUsOymXDjbrdSZJaZNzJ34vxrVfqCHKfu2Z9zAI7a5vpTu6guss5fAlZlrD0rltY ywuQ== X-Gm-Message-State: AC+VfDwCYrg2bemu6u3UIQiNufbEV+yg49cs2nz532k8kj+MDVLRV5k5 HGsiAz2BvXyX9nbVh1/2diWew4n29AOcULZWiTE= X-Google-Smtp-Source: ACHHUZ7jfKG/4zD3LGDwJ7cNnm34FZkrPsrBMmEFFM213tG6PMlxQ5mFCmzcGUm/Q4u8pr8mFXi9aA== X-Received: by 2002:a1c:cc03:0:b0:3f6:d40:c89 with SMTP id h3-20020a1ccc03000000b003f60d400c89mr306190wmb.12.1685565407595; Wed, 31 May 2023 13:36:47 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , qemu-arm@nongnu.org, Peter Maydell , Sergey Kambalin , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 08/15] hw/timer/arm_timer: Rename arm_timer_init() -> arm_timer_new() Date: Wed, 31 May 2023 22:35:52 +0200 Message-Id: <20230531203559.29140-9-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230531203559.29140-1-philmd@linaro.org> References: <20230531203559.29140-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1685565551386100001 QDev models often use foo_new() as the combination of foo_init() + foo_realize(). Here arm_timer_init() is a such combination, so rename it as arm_timer_new() to emphasis the returned device is already realized. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell --- hw/timer/arm_timer.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/timer/arm_timer.c b/hw/timer/arm_timer.c index 54318d0a57..1f4d66291a 100644 --- a/hw/timer/arm_timer.c +++ b/hw/timer/arm_timer.c @@ -177,7 +177,7 @@ static void arm_timer_reset(ArmTimerState *s) s->control =3D TIMER_CTRL_IE; } =20 -static ArmTimerState *arm_timer_init(uint32_t freq) +static ArmTimerState *arm_timer_new(uint32_t freq) { ArmTimerState *s; =20 @@ -308,8 +308,8 @@ static void sp804_realize(DeviceState *dev, Error **err= p) { SP804State *s =3D SP804(dev); =20 - s->timer[0] =3D arm_timer_init(s->freq0); - s->timer[1] =3D arm_timer_init(s->freq1); + s->timer[0] =3D arm_timer_new(s->freq0); + s->timer[1] =3D arm_timer_new(s->freq1); s->timer[0]->irq =3D qemu_allocate_irq(sp804_set_irq, s, 0); s->timer[1]->irq =3D qemu_allocate_irq(sp804_set_irq, s, 1); } @@ -394,10 +394,10 @@ static void icp_pit_init(Object *obj) SysBusDevice *dev =3D SYS_BUS_DEVICE(obj); =20 /* Timer 0 runs at the system clock speed (40MHz). */ - s->timer[0] =3D arm_timer_init(40000000); + s->timer[0] =3D arm_timer_new(40000000); /* The other two timers run at 1MHz. */ - s->timer[1] =3D arm_timer_init(1000000); - s->timer[2] =3D arm_timer_init(1000000); + s->timer[1] =3D arm_timer_new(1000000); + s->timer[2] =3D arm_timer_new(1000000); =20 sysbus_init_irq(dev, &s->timer[0]->irq); sysbus_init_irq(dev, &s->timer[1]->irq); --=20 2.38.1 From nobody Mon Apr 29 23:08:51 2024 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=1685565437; cv=none; d=zohomail.com; s=zohoarc; b=VGsWYAvBayMMlixs2hb1i8xFgRLflQIIe6jitrJagbFaJXoV9bjwPg86DpSTAFE6gO2/AnFSmZym7Ta2VHpajkmp49ulJTQ/dRyjck39L4IOt9/tyS3eXBm8cnPFoOmywBzaX1hBxUq3IAd1H36I3+PyGEosypx+tp4DTz49y+w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685565437; h=Content-Type: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=8GbaCgAoqo6igmmE7O0gpO7G+XBPsTJBXDJ3HWvHR/E=; b=N1M6fDs497qFjCcRpskx6qw/yjWoFRskNnEQ9fZOABbPJgCo96z1pEEux4H38BQz4CCS6c5dkixERKFuvrWDAaVRc2EysLk8cI+nz39IPY3mpz0O1W/dDo2T+LAhTMhsc7l5OJVmBIZgO9AQUurFckbAIWLGBYB8YIDFAMWKEFk= 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 1685565437936440.5498235880052; Wed, 31 May 2023 13:37:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q4SZ5-0000CD-Sx; Wed, 31 May 2023 16:37:03 -0400 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 1q4SYz-0008Lk-Ga for qemu-devel@nongnu.org; Wed, 31 May 2023 16:36:58 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q4SYy-0003MX-34 for qemu-devel@nongnu.org; Wed, 31 May 2023 16:36:57 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-3f606a80d34so1020725e9.0 for ; Wed, 31 May 2023 13:36:54 -0700 (PDT) Received: from localhost.localdomain ([176.176.146.12]) by smtp.gmail.com with ESMTPSA id c3-20020a05600c0ac300b003f50e88ffc1sm25717863wmr.0.2023.05.31.13.36.51 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 31 May 2023 13:36:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1685565413; x=1688157413; 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=8GbaCgAoqo6igmmE7O0gpO7G+XBPsTJBXDJ3HWvHR/E=; b=j+uiPxbaHMRXEEl+XSeqL63psaPa38DVR7H+BHKQc3i0Khj8InCAh5jzo98rL3d7yk KiaSX/TamkQeIL970sWjnjKQuZbzuFJXZ2k8ANybEHmNfWeJn0Svo2LwXduujGUAO8PX YD9oXBXXBUoELiMmEDGOO1THoXHSlX8W0xerp9NAGj5dceYAAeCS/P030Cl+9PUDY4mA LRn6j2N0bpQ+q1qb+5uHzAhQwtOkMZ5fvkNG4CyC5XIzcBpLCanCWIJVFtsy7MuBrtsq 9p9jebF1n8h/oWanA8q5jKBMxOuex7Y5Y8a4dr9Xp5En7aS89e3UipvAC9LIFR2WyABU V23Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685565413; x=1688157413; 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=8GbaCgAoqo6igmmE7O0gpO7G+XBPsTJBXDJ3HWvHR/E=; b=d6fOuLK3AXC91eS1WsGaEFxFpAQWQnQdmZtLsygw9K2YAJ3tKmFIQSVXjIOhCyoBek S6pTZRV/9h8M/qm3u7Vn6LY559IjUWrNqFm6uEn9P/qkDRqt47rcwfbVxMWpSR2PW66x Xizrb/o806X6xMlcjsotFCFFLfKynNP9JkKvtfXYLo6jZKHOeUMGgfOk5IhAIp9IOWTf lQmfGOqAq2g5Mos22vNaMYl7XmXUMWt+AZ1T0p1YQfYca+FwfLTshWontYi9q06awhSB D2owIT1ZZeWHrkSs+pTlhwhNONcSzd3F/opcQhNzEaoRERhXuBsY/308QDm2waozmYqF OKSg== X-Gm-Message-State: AC+VfDza+TbvV9M6lg5rGyNteZ8FPDt3ON0CpW3olRFu8EjdpMK2Xd5v zN0xYBA07y6NbiIm5USillU4yltE0hHxswsXLiI= X-Google-Smtp-Source: ACHHUZ6c4nAXyV/uENa1/NBu3dHlKt2EIy1DXXWiIDuXHliH2/Ij9I5UsQAj2SypVC4W8t+1kseAqQ== X-Received: by 2002:a7b:ce06:0:b0:3f6:be1:b8d9 with SMTP id m6-20020a7bce06000000b003f60be1b8d9mr345871wmc.6.1685565413088; Wed, 31 May 2023 13:36:53 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , qemu-arm@nongnu.org, Peter Maydell , Sergey Kambalin , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 09/15] hw/timer/arm_timer: Convert ArmTimerState::freq to uint32_t type Date: Wed, 31 May 2023 22:35:53 +0200 Message-Id: <20230531203559.29140-10-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230531203559.29140-1-philmd@linaro.org> References: <20230531203559.29140-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1685565438335100001 In preparation of accessing ArmTimerState::freq as a QOM property, convert it to uint32_t (so we'll be able to use DEFINE_PROP_UINT32). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell --- hw/timer/arm_timer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/timer/arm_timer.c b/hw/timer/arm_timer.c index 1f4d66291a..510ec74a51 100644 --- a/hw/timer/arm_timer.c +++ b/hw/timer/arm_timer.c @@ -33,7 +33,7 @@ typedef struct { ptimer_state *timer; uint32_t control; uint32_t limit; - int freq; + uint32_t freq; int int_level; qemu_irq irq; } ArmTimerState; --=20 2.38.1 From nobody Mon Apr 29 23:08:51 2024 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=1685565597; cv=none; d=zohomail.com; s=zohoarc; b=XeV5AJs3gredUK33R/dqjub0gR/95sCtCeyDLjWkinN4ZEu7BVIZrNQlViaouFLu62wOarXfH//0P9M8VcS/HgtMez1YfQYn+5OfJGWJrXgkGn0MRCLvQjeAwa69o2K58p6nExKWSNX7iCEdhPBwTjuEg649BG/ESItr/MUJB70= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685565597; h=Content-Type: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=uEwvjd8H0pBzSI4zIAJ+UnyR+kTgNch6Orzmem2MX0A=; b=OlwrtgPYkLgnQ+yoKPh/OGZroXdg9RNUIcj6WcFD9sz26XuEObuKn634sXsfyyENLQVlIrwM7aNFLI75RQdf320dHsJvxyU332gcwZNu3ltrvM4yA8qHX9qEJaVr4alHk5NHpAcTocvgXWRd+oDE4+i7I4GecRD92swRDfgOF50= 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 1685565597115790.2297052399165; Wed, 31 May 2023 13:39:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q4SZD-0000Rh-AH; Wed, 31 May 2023 16:37:11 -0400 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 1q4SZ4-0000AV-5j for qemu-devel@nongnu.org; Wed, 31 May 2023 16:37:02 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q4SZ2-0003NI-Jf for qemu-devel@nongnu.org; Wed, 31 May 2023 16:37:01 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-3f601c57d8dso1388085e9.0 for ; Wed, 31 May 2023 13:37:00 -0700 (PDT) Received: from localhost.localdomain ([176.176.146.12]) by smtp.gmail.com with ESMTPSA id k15-20020a05600c0b4f00b003f611b2aedesm22011624wmr.38.2023.05.31.13.36.57 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 31 May 2023 13:36:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1685565419; x=1688157419; 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=uEwvjd8H0pBzSI4zIAJ+UnyR+kTgNch6Orzmem2MX0A=; b=YWIISxO9hQd5X9nGqB5u96JUNy3fPpsO7x9uZgjm3fkI+GMCo4/lJq+GTqQXwV6QJ7 c3Fl8UvYgu5xmQUz0n4rlDV9tJmqTwHvQ2T+REUhpM7mQKFsgK6uxBMHgaE4YCxbG1vu 3uJrv/nLewPkNiPYQKJ77fl8xR6L4bhTVj4mMzZXYToiijdIXzOkKikCrNM3AGMgDXqk R0luTWqA4cslZrtbGpw2Pi/gzrRxmxwxEk4nqEFglmUI4IYJ3CvSQFSpgClV08/pCraR XIDqaE7jlYa39fWjJ4O5Dg7PjDCeCgWHKMLX4J43PM88I3RPBdStXneXc8IjySRtQraL OKcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685565419; x=1688157419; 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=uEwvjd8H0pBzSI4zIAJ+UnyR+kTgNch6Orzmem2MX0A=; b=EkrPeAaoiIy1shSnFLON4TezzZzCwAYHgr02ug6V+UDIKBBSDJ4righTkfDIQVlToy 2dHjzGmVRuCbcnEuJPDCSYpevmTwRmbmpxCap7J+C0qBvozOmARPklgZqDB645ubBz9J 7nX+zQEorlJo7nhEZNpzEiwmNYeoONSHD9yaEv7B8CCuP1z+U1ut3pjUATd/aEDSSGYL x4O9B29OmvRnFoFJU5BwWUVqJBL07SBORdGtsRGd3FRlJs+LmNdxIaBjtQYbtyS2RDbm SwoI6Xpawm/aS6uG33+TAMazNfNp+a6o/if75fHXbe9NwHnkUUoLQ2D9bpwHTnN1ux+j kwRQ== X-Gm-Message-State: AC+VfDyFkf6y1gw/MB6tIyoXTnM5uO98o30hrroBKR0hfmo2Dbjg4uC1 nT4CLVYNm/5BvtHmFwJcWJGf4pyIo7EsFfY6hRU= X-Google-Smtp-Source: ACHHUZ6sQYqy9FAy0lkMATn/+e1xJwnAIFyA5FkPNnLjs4S62WmbPa3F5zk0Jr3N6cSIJMQAJXcRgA== X-Received: by 2002:a05:600c:3d1b:b0:3f5:867:1aba with SMTP id bh27-20020a05600c3d1b00b003f508671abamr301535wmb.15.1685565418864; Wed, 31 May 2023 13:36:58 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , qemu-arm@nongnu.org, Peter Maydell , Sergey Kambalin , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 10/15] hw/timer/arm_timer: Use array of frequency in SP804State Date: Wed, 31 May 2023 22:35:54 +0200 Message-Id: <20230531203559.29140-11-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230531203559.29140-1-philmd@linaro.org> References: <20230531203559.29140-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1685565599035100003 SP804State use arrays for timers and IRQ levels. Be consistent and use another one for the frequencies. This will allow to simplify using for() loop statement in the next commit. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell --- hw/timer/arm_timer.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/timer/arm_timer.c b/hw/timer/arm_timer.c index 510ec74a51..4d31f917f6 100644 --- a/hw/timer/arm_timer.c +++ b/hw/timer/arm_timer.c @@ -204,7 +204,7 @@ struct SP804State { =20 MemoryRegion iomem; ArmTimerState *timer[2]; - uint32_t freq0, freq1; + uint32_t freq[2]; int level[2]; qemu_irq irq; }; @@ -308,8 +308,8 @@ static void sp804_realize(DeviceState *dev, Error **err= p) { SP804State *s =3D SP804(dev); =20 - s->timer[0] =3D arm_timer_new(s->freq0); - s->timer[1] =3D arm_timer_new(s->freq1); + s->timer[0] =3D arm_timer_new(s->freq[0]); + s->timer[1] =3D arm_timer_new(s->freq[1]); s->timer[0]->irq =3D qemu_allocate_irq(sp804_set_irq, s, 0); s->timer[1]->irq =3D qemu_allocate_irq(sp804_set_irq, s, 1); } @@ -324,8 +324,8 @@ static void sp804_unrealize(DeviceState *dev) } =20 static Property sp804_properties[] =3D { - DEFINE_PROP_UINT32("freq0", SP804State, freq0, 1000000), - DEFINE_PROP_UINT32("freq1", SP804State, freq1, 1000000), + DEFINE_PROP_UINT32("freq0", SP804State, freq[0], 1000000), + DEFINE_PROP_UINT32("freq1", SP804State, freq[1], 1000000), DEFINE_PROP_END_OF_LIST(), }; =20 --=20 2.38.1 From nobody Mon Apr 29 23:08:51 2024 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=1685565575; cv=none; d=zohomail.com; s=zohoarc; b=brWbIXRXlrsKeMJMuePL56Vumjpz9CNN/g+k3xEhly1XYcXhx6SyyD6mlLNDs2So0CTfboYtEpZSbufrH2aKGFHD19piQblfOyC2pUie7olWrGGaUsb0VEeQ4D2GYZ5jecwWGTbY5+vFNsUDqylqpHjzRiOeAWf38Jwv2ar5CBM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685565575; h=Content-Type: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=LEve7XoaYuxNRaMbirKWz6mHRspgIpo3ijJ/vB0fM1Q=; b=ht3ScJ1xac8GtkjQhLcAkUU7dQ+v4gX+4kqNehVygTm50AV9AvziE7P9k9X18M62A9Pxm6t6jk737LJ3zJq7IxQ+nWUHlZhsbB0ygwx/woTh1yG0TxgTRJOCxKO6rKMXuT3t8u1vzLnpZs1spLhnTWxjVawtQhKNPvjI6boKLeY= 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 1685565575476816.8350970118557; Wed, 31 May 2023 13:39:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q4SZD-0000ZB-Hd; Wed, 31 May 2023 16:37:11 -0400 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 1q4SZA-0000Oq-35 for qemu-devel@nongnu.org; Wed, 31 May 2023 16:37:09 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q4SZ8-0003O4-3V for qemu-devel@nongnu.org; Wed, 31 May 2023 16:37:07 -0400 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-30ae69ef78aso1147041f8f.1 for ; Wed, 31 May 2023 13:37:05 -0700 (PDT) Received: from localhost.localdomain ([176.176.146.12]) by smtp.gmail.com with ESMTPSA id k5-20020adff5c5000000b0030af1d87342sm8014447wrp.6.2023.05.31.13.37.03 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 31 May 2023 13:37:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1685565424; x=1688157424; 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=LEve7XoaYuxNRaMbirKWz6mHRspgIpo3ijJ/vB0fM1Q=; b=hh1ypo1VmsZGgNNC3I8aOgRxi94Eoo3p7PxerOIVHtDb+V1M6Kgn48OpidwXj+cGgH DJI1zBF6RKPUwyVRkR6cckupRnYTgEElFKDZCceO90eZgKorgesT5xTw3vWrN9yRyZOV TU2YCZuQ4f4Y0xrwXhRTKAacXI7UdWLlEP/ggdcbG3Qawoytfyh4Vxm8THaRxzCMgr5x d8FiWUQIwW1uEYVOqKNksbaOga7+Z8zGJYAcHpIqh2EbO6ULGvK7+81sIAr1gILzVXll jCa0CHrpP4XKD19Ns4xRSY1KP7KFonK6UadqOuL51qv03LHn0HcLvhNetfpTdenDE6l6 WQoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685565424; x=1688157424; 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=LEve7XoaYuxNRaMbirKWz6mHRspgIpo3ijJ/vB0fM1Q=; b=FcujveGUOJKYJ7eEKgpidRcyEPcMuCWctJ8+LW+smBfB2P9HLO3iMpnt8ANbqzRP7u eFpMuCQVYLlwEQgWHBIUvNk4QqdipnrrVau0v8UMHwu5fWEy/fwe1LVTHSIwvrO3IKHf gRWE68Qbu9eqenIjCcd/IKtkxAkV7E66+rrFdBUYHK8bzCOtmCYskQmFg8eA5BuZNMWW tB04x8Zd8CXIDn9aLVagk9h0fGemAdSLATZzDTNVrKFrdyX/WQUjRo7bw0e2WVnJ3Gxy +yRjY9l5Eae+q65JVAbRK61F6mxyNMe8jVBAlnORmz//hqtB6VtxRR2EUkVRrFwafH1B IHkA== X-Gm-Message-State: AC+VfDyBAzt7eiueo9uZoJ4lI9jUpjcmDUxpS70mYfhpvQhmZML0BzX7 zzn3xdNuvjn/YSiizbKzlt2h2gpS+L48EP1lE3g= X-Google-Smtp-Source: ACHHUZ4KcL8BEwMeZme+jPquBE8cN9ObS7+m0z3Pt4QexRKfuLdx8u9yeAV2l21S7lc4kJYFbI63rg== X-Received: by 2002:a5d:4530:0:b0:307:869c:99ce with SMTP id j16-20020a5d4530000000b00307869c99cemr161898wra.21.1685565424407; Wed, 31 May 2023 13:37:04 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , qemu-arm@nongnu.org, Peter Maydell , Sergey Kambalin , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 11/15] hw/timer/arm_timer: Iterate on timers using for() loop statement Date: Wed, 31 May 2023 22:35:55 +0200 Message-Id: <20230531203559.29140-12-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230531203559.29140-1-philmd@linaro.org> References: <20230531203559.29140-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::42b; envelope-from=philmd@linaro.org; helo=mail-wr1-x42b.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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1685565575975100003 The same pattern is used for each timer, 2 or 3 times. To avoid too much code churn in the next commits, iterate on the number of timers using a for() loop statement. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell --- hw/timer/arm_timer.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/hw/timer/arm_timer.c b/hw/timer/arm_timer.c index 4d31f917f6..19789ad2c4 100644 --- a/hw/timer/arm_timer.c +++ b/hw/timer/arm_timer.c @@ -308,10 +308,10 @@ static void sp804_realize(DeviceState *dev, Error **e= rrp) { SP804State *s =3D SP804(dev); =20 - s->timer[0] =3D arm_timer_new(s->freq[0]); - s->timer[1] =3D arm_timer_new(s->freq[1]); - s->timer[0]->irq =3D qemu_allocate_irq(sp804_set_irq, s, 0); - s->timer[1]->irq =3D qemu_allocate_irq(sp804_set_irq, s, 1); + for (unsigned i =3D 0; i < ARRAY_SIZE(s->timer); i++) { + s->timer[i] =3D arm_timer_new(s->freq[i]); + s->timer[i]->irq =3D qemu_allocate_irq(sp804_set_irq, s, i); + } } =20 static void sp804_unrealize(DeviceState *dev) @@ -390,18 +390,19 @@ static const MemoryRegionOps icp_pit_ops =3D { =20 static void icp_pit_init(Object *obj) { + static const uint32_t tmr_freq[] =3D { + /* Timer 0 runs at the system clock speed (40MHz). */ + 40000000, + /* The other two timers run at 1MHz. */ + 1000000, 1000000 + }; IntegratorPitState *s =3D INTEGRATOR_PIT(obj); SysBusDevice *dev =3D SYS_BUS_DEVICE(obj); =20 - /* Timer 0 runs at the system clock speed (40MHz). */ - s->timer[0] =3D arm_timer_new(40000000); - /* The other two timers run at 1MHz. */ - s->timer[1] =3D arm_timer_new(1000000); - s->timer[2] =3D arm_timer_new(1000000); - - sysbus_init_irq(dev, &s->timer[0]->irq); - sysbus_init_irq(dev, &s->timer[1]->irq); - sysbus_init_irq(dev, &s->timer[2]->irq); + for (unsigned i =3D 0; i < ARRAY_SIZE(s->timer); i++) { + s->timer[i] =3D arm_timer_new(tmr_freq[i]); + sysbus_init_irq(dev, &s->timer[i]->irq); + } =20 memory_region_init_io(&s->iomem, obj, &icp_pit_ops, s, "icp_pit", 0x1000); --=20 2.38.1 From nobody Mon Apr 29 23:08:51 2024 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=1685565475; cv=none; d=zohomail.com; s=zohoarc; b=DKxwq4Cjim/AbqopsCe3I4gUD9zf+kUdrUwPVnzuEipDVzaB9A9hTUSpH4sD7srmurKtXya42n4sS17EnT4hdVVqDCIflzasjetB2ANKKkk35MdTTiUfKsWdMv/un64hRpxqNu3IaoGJHrAZLPjpOyvAv5GC8ZKx5jZxzElbWTg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685565475; h=Content-Type: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=tiC6CuBtjw1sGes9CKcEGdJAP6aAhbbs6USQHp8o0zw=; b=FFaqesDclgMVAv6V3gCF6bqD2dJZ2tV7xNHnXrZgq7hhyKCDOVttFY/OQaQsesIYmVxZb7LMFW1CH5ydIXXUI2KidZFMyZtMlaG/y6Z15ODc1dvstsr0gNY5n/mtY5OhmT5lW6ypm7Zv6V5nne2aDCnkbOETEXodynUZaWm57CI= 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 1685565475058893.3844268115383; Wed, 31 May 2023 13:37:55 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q4SZU-0000zW-IP; Wed, 31 May 2023 16:37:29 -0400 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 1q4SZH-0000ny-E6 for qemu-devel@nongnu.org; Wed, 31 May 2023 16:37:17 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q4SZF-0003Oj-OQ for qemu-devel@nongnu.org; Wed, 31 May 2023 16:37:15 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-3f6dfc4dffaso1105895e9.0 for ; Wed, 31 May 2023 13:37:11 -0700 (PDT) Received: from localhost.localdomain ([176.176.146.12]) by smtp.gmail.com with ESMTPSA id z18-20020a1c4c12000000b003f423f5b659sm21831888wmf.10.2023.05.31.13.37.09 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 31 May 2023 13:37:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1685565430; x=1688157430; 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=tiC6CuBtjw1sGes9CKcEGdJAP6aAhbbs6USQHp8o0zw=; b=sX2nLNh8/HMNxHC21LnZnEMCZ/Rmlhd8lW0RsR29ykrQBgiCyzgBdUPtrVvhJs732B tVlNUl4W4V2Smc0BqEhh5fJiRFci57Q/FFJeYzh0b3FduzqKNT+Ep/lj5NkFW2EUMO3z Hqe8126wP2Of99cBHYTB+Qaa6QNoku9VsdZceuPGe0otpBHRSukx9kP7asog4M5GK1m+ sede8DgssRwf6O+/suYKTBP2KEeg926wl7n/so8aqNWbJZwDcks6t2WG4/yFeyvCrX+k jCPykDpXiSoM6LkYIosTccMu2Vv1QjNXYFNAN6UhngoPwgYjHQwsx1Fv/gpY2/ssa+Ru RmVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685565430; x=1688157430; 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=tiC6CuBtjw1sGes9CKcEGdJAP6aAhbbs6USQHp8o0zw=; b=Nt1lJ4bLvkGB9H7fCFaQDPbzO43+9veKuiZHg+ozSR5RyZimvZKw7/vE78wPxn+Bqx 0l12O6cZ6uYTZv2xRagfb/8YUOt3YOanSynyvgNjGA1BBA/tQknLv4qE4ghoRUSupF5L bLHy7FDoSOLe+S4VD7CbAvRbA3b/y9c0/vIYJUW26MQ1weYZuA+bIAfsuEjV4XPCy7Xa YFmZ0mieVpMle0omR4Qgi/5ICwMKy7snybtxg5wSjIfmzna+dPJmB3PPXdN3uQRkv2Kr f4WRr6q2uJ7qdfEVf6sUUxeMhJYtg7c0liETalncson68Qnajns2ZmeBO3rhFd3qj+eL YayQ== X-Gm-Message-State: AC+VfDxEs1Tji/JMKUN5oLlq32zQv1xP6PgKOVEdulnfESGcK++G/7Nj mPE7/YbET3MGX49U9G7Zk1f/M+XAt7koRWnCO6Q= X-Google-Smtp-Source: ACHHUZ5r5Ggb6AMqF2TJ3xs3yRxUtShUj8fYRGPEqsgnSGTqZl963vElDyasgnJQWCDEzH1T+nVq3A== X-Received: by 2002:a05:600c:2210:b0:3f7:5e3:c1f2 with SMTP id z16-20020a05600c221000b003f705e3c1f2mr321295wml.8.1685565430398; Wed, 31 May 2023 13:37:10 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , qemu-arm@nongnu.org, Peter Maydell , Sergey Kambalin , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 12/15] hw/timer/arm_timer: Pass timer output IRQ as parameter to arm_timer_new Date: Wed, 31 May 2023 22:35:56 +0200 Message-Id: <20230531203559.29140-13-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230531203559.29140-1-philmd@linaro.org> References: <20230531203559.29140-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::329; envelope-from=philmd@linaro.org; helo=mail-wm1-x329.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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1685565476493100001 Both SP804State/IcpPitState peek at ArmTimerState internal state. This is fine so far but we want to convert ArmTimerState to QOM where peeking at QOM state internal should be avoided. ArmTimerState's IRQ is just a pointer, so we can pass/set it via argument, avoiding accessing ArmTimerState internal state except from the arm_timer_*() methods. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/timer/arm_timer.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/hw/timer/arm_timer.c b/hw/timer/arm_timer.c index 19789ad2c4..6f444e1789 100644 --- a/hw/timer/arm_timer.c +++ b/hw/timer/arm_timer.c @@ -177,7 +177,7 @@ static void arm_timer_reset(ArmTimerState *s) s->control =3D TIMER_CTRL_IE; } =20 -static ArmTimerState *arm_timer_new(uint32_t freq) +static ArmTimerState *arm_timer_new(uint32_t freq, qemu_irq irq_out) { ArmTimerState *s; =20 @@ -185,6 +185,7 @@ static ArmTimerState *arm_timer_new(uint32_t freq) s->freq =3D freq; arm_timer_reset(s); =20 + s->irq =3D irq_out; s->timer =3D ptimer_init(arm_timer_tick, s, PTIMER_POLICY_LEGACY); vmstate_register(NULL, VMSTATE_INSTANCE_ID_ANY, &vmstate_arm_timer, s); return s; @@ -207,6 +208,7 @@ struct SP804State { uint32_t freq[2]; int level[2]; qemu_irq irq; + qemu_irq irq_in[2]; }; =20 static const uint8_t sp804_ids[] =3D { @@ -309,8 +311,8 @@ static void sp804_realize(DeviceState *dev, Error **err= p) SP804State *s =3D SP804(dev); =20 for (unsigned i =3D 0; i < ARRAY_SIZE(s->timer); i++) { - s->timer[i] =3D arm_timer_new(s->freq[i]); - s->timer[i]->irq =3D qemu_allocate_irq(sp804_set_irq, s, i); + s->irq_in[i] =3D qemu_allocate_irq(sp804_set_irq, s, i); + s->timer[i] =3D arm_timer_new(s->freq[i], s->irq_in[i]); } } =20 @@ -319,7 +321,7 @@ static void sp804_unrealize(DeviceState *dev) SP804State *s =3D SP804(dev); =20 for (unsigned i =3D 0; i < ARRAY_SIZE(s->timer); i++) { - qemu_free_irq(s->timer[i]->irq); + qemu_free_irq(s->irq_in[i]); } } =20 @@ -349,6 +351,7 @@ struct IntegratorPitState { =20 MemoryRegion iomem; ArmTimerState *timer[3]; + qemu_irq irq_in[3]; }; =20 static uint64_t icp_pit_read(void *opaque, hwaddr offset, @@ -400,8 +403,8 @@ static void icp_pit_init(Object *obj) SysBusDevice *dev =3D SYS_BUS_DEVICE(obj); =20 for (unsigned i =3D 0; i < ARRAY_SIZE(s->timer); i++) { - s->timer[i] =3D arm_timer_new(tmr_freq[i]); - sysbus_init_irq(dev, &s->timer[i]->irq); + s->timer[i] =3D arm_timer_new(tmr_freq[i], s->irq_in[i]); + sysbus_init_irq(dev, &s->irq_in[i]); } =20 memory_region_init_io(&s->iomem, obj, &icp_pit_ops, s, --=20 2.38.1 From nobody Mon Apr 29 23:08:51 2024 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=1685565605; cv=none; d=zohomail.com; s=zohoarc; b=U2DBTAf4aR/B19Kn14YA5TkliVzx1xTpLcM98OyFl76+0HcrhDmSu5ZC14ga9Q4F5/548xd0gGxyezHA8cZxAmmLMatCylgv9WBVBxMn6GlmM8Yk77NvPrRM1D8pQ3mKYOx67mlTC1lei8Owt0NYmKLS5iwRtjYHD0QEiuHA4jI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685565605; h=Content-Type: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=0MtX4o0Ye6nhZ4tPfz5ErTCUaJJiVijCKFgjVroPJbY=; b=jMWMr6npGvs9pFcyUuFOiGfBcCwqP7WlViay0XC1BNCwvVhf4kqFfgmc8suqLWK9vmg0kLMyRZiY58692Pb1gaMt8Ysch1CNqs0+h1VrCsBNuENcCFfbMMPruUES8s/LJIPeI1my1a+Y7Y1FGgUnH2rig2E9eDprOSzOppzA250= 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 1685565605787907.0018050054673; Wed, 31 May 2023 13:40:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q4SZX-00019i-Qe; Wed, 31 May 2023 16:37:31 -0400 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 1q4SZK-0000u2-Rr for qemu-devel@nongnu.org; Wed, 31 May 2023 16:37:20 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q4SZJ-0003Qp-DN for qemu-devel@nongnu.org; Wed, 31 May 2023 16:37:18 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-3f6dbe3c230so836425e9.3 for ; Wed, 31 May 2023 13:37:16 -0700 (PDT) Received: from localhost.localdomain ([176.176.146.12]) by smtp.gmail.com with ESMTPSA id l12-20020a5d4bcc000000b003062b2c5255sm8009613wrt.40.2023.05.31.13.37.14 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 31 May 2023 13:37:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1685565436; x=1688157436; 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=0MtX4o0Ye6nhZ4tPfz5ErTCUaJJiVijCKFgjVroPJbY=; b=WHWopqF3gbrH3Y7TxEodIal/tG9Zffcq4zvwmQyh6Nyg7ozxfG8hs6Eo9u64wCRJUV bZXjnQFbbPbMAA9EHStCXlWksjNP7OSo4+jMfCv7VG443S5As9ri3JretN2bhD6vTeGB JyZQ49S7L8spp7VsgRXQdz0Qw6qZDKQTI1Pu0C7RLqUPivpvnMIae0tnkMMZ9kklj5B1 fINrWBd7htY80RpSMkLdxFmW+uauouGypaqdEa2y8+v0iqts8pbtRNqjYB1506nj1kLh TpOKq3UYkZ9oLGv3TuBIhWetg1e/Evi5RjUgyzuWu7uZKWDE4upZJmzo5xpgPuJ/Guyh nEbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685565436; x=1688157436; 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=0MtX4o0Ye6nhZ4tPfz5ErTCUaJJiVijCKFgjVroPJbY=; b=Q9mIji7yq5tP+YdBQkia2I8D7kLj7UX//LL4KmI4d28tEBjWyx4lT5p4ANjWBjgsMC nuOZXWmk7vYaQBn/EIQ9Cd8Myevy4/SkJA06zJo3vtNanlaXDNWi2bfE1TgZmIKizyJ4 cAOEHFBzpcNlPhDhrF8NHgwn1Wf80wl02P88juCs/yzqOGqxJ3Dl5EATs9qxTqo24wHY XYdSxXdmlq5sd6Mg+xOihg2vaOZQ1oJf88MDiNeTaeljNgWa8xvOxPLeFj7MORmPg0zc ejmg+dfhW0ya9DGX+2Y/etQ+AYw2iQfGp5LC9iFv0U7ualqINfdHko6oR58e0hEnb0fb pkIg== X-Gm-Message-State: AC+VfDyXVanNjsTSdAImjtdA9TaQ4qbeuzcqOPxdH3yDyZnnzXz8Pb/Y 7ZU1j0eORLzRmOMhyu6C37IYNYI6IQo08VRbGQI= X-Google-Smtp-Source: ACHHUZ5IVVKky3zTO6Z2UkxysdptCBWY2FLw3nuDKbM0j/OlTEe+W+WVVrEFarrEBUR48V4t5SgdgQ== X-Received: by 2002:a5d:62cd:0:b0:304:b967:956f with SMTP id o13-20020a5d62cd000000b00304b967956fmr247819wrv.8.1685565435846; Wed, 31 May 2023 13:37:15 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , qemu-arm@nongnu.org, Peter Maydell , Sergey Kambalin , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 13/15] hw/timer/arm_timer: Fix misuse of SysBus IRQ in IcpPitState Date: Wed, 31 May 2023 22:35:57 +0200 Message-Id: <20230531203559.29140-14-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230531203559.29140-1-philmd@linaro.org> References: <20230531203559.29140-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1685565606433100001 SysBus IRQ are *output* IRQs. As some sort of simplification to avoid to forward it, IcpPitState misuses it as ARM timer input IRQ. Fix that by using a simple IRQ forwarder handler. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell --- hw/timer/arm_timer.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/hw/timer/arm_timer.c b/hw/timer/arm_timer.c index 6f444e1789..874f9b63bc 100644 --- a/hw/timer/arm_timer.c +++ b/hw/timer/arm_timer.c @@ -352,6 +352,7 @@ struct IntegratorPitState { MemoryRegion iomem; ArmTimerState *timer[3]; qemu_irq irq_in[3]; + qemu_irq irq[3]; }; =20 static uint64_t icp_pit_read(void *opaque, hwaddr offset, @@ -391,6 +392,13 @@ static const MemoryRegionOps icp_pit_ops =3D { .endianness =3D DEVICE_NATIVE_ENDIAN, }; =20 +static void icp_pit_fwd_irq(void *opaque, int n, int level) +{ + IntegratorPitState *s =3D opaque; + + qemu_set_irq(s->irq[n], level); +} + static void icp_pit_init(Object *obj) { static const uint32_t tmr_freq[] =3D { @@ -402,9 +410,14 @@ static void icp_pit_init(Object *obj) IntegratorPitState *s =3D INTEGRATOR_PIT(obj); SysBusDevice *dev =3D SYS_BUS_DEVICE(obj); =20 + qdev_init_gpio_in_named(DEVICE(obj), icp_pit_fwd_irq, + "timer-in", ARRAY_SIZE(s->timer)); + for (unsigned i =3D 0; i < ARRAY_SIZE(s->timer); i++) { s->timer[i] =3D arm_timer_new(tmr_freq[i], s->irq_in[i]); - sysbus_init_irq(dev, &s->irq_in[i]); + sysbus_init_irq(dev, &s->irq[i]); + sysbus_connect_irq(dev, i, + qdev_get_gpio_in_named(DEVICE(obj), "timer-in",= i)); } =20 memory_region_init_io(&s->iomem, obj, &icp_pit_ops, s, --=20 2.38.1 From nobody Mon Apr 29 23:08:51 2024 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=1685565575; cv=none; d=zohomail.com; s=zohoarc; b=hIqw7+vCJgx2EadLTpLaJvDfUmS5O0q/EOr2PrPlVmQLbl0e4VOoQctg1Kr7JX1O8yDyWRFUdwZbh9gC4eGPUqM6lwsvPR3kzmbwb1tfM0UXMRWQWNfsnhoj9K6Oh41UHvHWRwPlfeJSi0DsRqXXmoeFy/D2Z3BqCbghoBqJI6Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685565575; h=Content-Type: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=cBL0tJ6A533UUXBJlMobIsNt8VadG3dvYB/dy1tc5wE=; b=XZBc2kPOuZAfN03DgGuXGBoWx+tm6RNjRfRrfNLgz/63mtYM081zUVejvM56hi1/8E2AtJhJaa3MRKpUEqIuQD9joq+ho5y+O8GO9cKl7dA+WvNjzJbwf51hDD6yrVFAIqDnGxPFNXSTuLJWmtMf7jI9kf67fBawPIU/GHw9AwQ= 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 1685565575566878.8575619750525; Wed, 31 May 2023 13:39:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q4SZY-0001CI-AI; Wed, 31 May 2023 16:37:32 -0400 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 1q4SZQ-000105-RR for qemu-devel@nongnu.org; Wed, 31 May 2023 16:37:26 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q4SZP-0003Rb-0N for qemu-devel@nongnu.org; Wed, 31 May 2023 16:37:24 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-3f6e1394060so870965e9.3 for ; Wed, 31 May 2023 13:37:22 -0700 (PDT) Received: from localhost.localdomain ([176.176.146.12]) by smtp.gmail.com with ESMTPSA id 2-20020a05600c028200b003f42cc3262asm25508931wmk.34.2023.05.31.13.37.20 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 31 May 2023 13:37:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1685565441; x=1688157441; 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=cBL0tJ6A533UUXBJlMobIsNt8VadG3dvYB/dy1tc5wE=; b=n1B3RSb0LTIlhc44Q7x8n2DhkEDnO5z1fgGSJz0XLWBUYgBqM/hbs/MNMK9xcYWr4R 5n+kP3Z31zjxQ5tog0K1XYi9apdxEbgfkbdHfGYuNnM3Fuvcuo0ON5L9PsJMnV/OV6fS iV6prv+4kJcYvYAEs6xrgWIXxmCVKXoqWde711C2ixTY5TNY5zAKfJxynk8MW4n621HK wnNNeiOicarEiISzXKHCWZ08lH/q1JQkvUH1ascwqYUe6npr8til1UxdNfIsuDESRoPo u3KAcXGMISrm7+h1SDGof2B0aH7CezeI29ZLrEH64+0J8tKT/04EHdFrpCYSy2g7enWa Yj3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685565441; x=1688157441; 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=cBL0tJ6A533UUXBJlMobIsNt8VadG3dvYB/dy1tc5wE=; b=ZdvNv4A6SVkW0y+X4Kx+R41Tu9ecVRFtIkhLusdelhqWbaqbf2l4M5y2MXoV5q0z00 2qlsSC5/tuhs0orVvjTXwSu89ChS4DHr/WdwXz9ygfXmbrESamjuW7rBHa1gHGA7HVqj CVfODmvu7siiUaJ47qfsXG+LKB9gC1jmibfIZKs3sQbGN2gP+9DwWzEoWMxwT9L2Iojs cpcpRvRke/n8OgRHvbZmdkPTI8MoJ98QlhxDec96x+4rdgEeXX3Q1MBxFs0ESK38yVEI jmKl3aC+YQq7WYuE6j0gkJhckm4W5v87eKaUxACto/S6k2UMCsI5yLix5iseL/FU/SbC cRDw== X-Gm-Message-State: AC+VfDwhdDs6NfLOJRD/+lHqGOTworoXIuKlbjgFU5edP46Yi+iBU/rh OHeC4lQ0b5QgQS9gEYMGN4hFxy9BRIspFbhRkfc= X-Google-Smtp-Source: ACHHUZ7rc+6EOCpWD0bxvKLLnglPY0RYd6IGEW4jwTLqLF+F8IxJvD1jBy9f5E2iG6qU4nVZ3sxrjg== X-Received: by 2002:a1c:4c09:0:b0:3f6:677:3ec6 with SMTP id z9-20020a1c4c09000000b003f606773ec6mr327803wmf.30.1685565441526; Wed, 31 May 2023 13:37:21 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , qemu-arm@nongnu.org, Peter Maydell , Sergey Kambalin , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 14/15] hw/timer/arm_timer: Extract icp_pit_realize() from icp_pit_init() Date: Wed, 31 May 2023 22:35:58 +0200 Message-Id: <20230531203559.29140-15-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230531203559.29140-1-philmd@linaro.org> References: <20230531203559.29140-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::335; envelope-from=philmd@linaro.org; helo=mail-wm1-x335.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, T_SCC_BODY_TEXT_LINE=-0.01 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1685565576942100007 To make the next commit easier to digest, extract icp_pit_realize() from icp_pit_init() as a preliminary step. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/timer/arm_timer.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/hw/timer/arm_timer.c b/hw/timer/arm_timer.c index 874f9b63bc..82123b40c0 100644 --- a/hw/timer/arm_timer.c +++ b/hw/timer/arm_timer.c @@ -416,8 +416,6 @@ static void icp_pit_init(Object *obj) for (unsigned i =3D 0; i < ARRAY_SIZE(s->timer); i++) { s->timer[i] =3D arm_timer_new(tmr_freq[i], s->irq_in[i]); sysbus_init_irq(dev, &s->irq[i]); - sysbus_connect_irq(dev, i, - qdev_get_gpio_in_named(DEVICE(obj), "timer-in",= i)); } =20 memory_region_init_io(&s->iomem, obj, &icp_pit_ops, s, @@ -427,12 +425,30 @@ static void icp_pit_init(Object *obj) save themselves. */ } =20 +static void icp_pit_realize(DeviceState *dev, Error **errp) +{ + IntegratorPitState *s =3D INTEGRATOR_PIT(dev); + + for (unsigned i =3D 0; i < ARRAY_SIZE(s->timer); i++) { + sysbus_connect_irq(SYS_BUS_DEVICE(dev), i, + qdev_get_gpio_in_named(dev, "timer-in", i)); + } +} + +static void icp_pit_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *k =3D DEVICE_CLASS(klass); + + k->realize =3D icp_pit_realize; +} + static const TypeInfo arm_timer_types[] =3D { { .name =3D TYPE_INTEGRATOR_PIT, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(IntegratorPitState), .instance_init =3D icp_pit_init, + .class_init =3D icp_pit_class_init, =20 }, { .name =3D TYPE_SP804, --=20 2.38.1 From nobody Mon Apr 29 23:08:51 2024 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=1685565567; cv=none; d=zohomail.com; s=zohoarc; b=aZLm7KGiUk9ullD2Op4iiYwJMZoa1/rt42DlnSoosQFvI9CCxNEAVPZJbtYGZVjSBVoc9HDSVH+krgY0dZWeYDuZ/2DpbPMNnqSPde5dqgrRVEK9GTon9AFSikN2oS+HSLTb5W3vFmS4RjXdqDB+VBzgSluQl+p39UBj0kSb2yY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685565567; h=Content-Type: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=sjhOm08stxYpC2nNilZ+r3P5phZDhdo7hj/kLX7dCFk=; b=VtZ6+DRngCPAf9/AhGF0XufHNm7SWXuX94ZdD6QJNPE2EFQRBIaoBnfVsymES28H4XF7LM4TcENCfbnLq2JA7GLDObxDACpjk0TR2ClI+Mpc2gPlFSsxt9aMYR8ee1I3g5i/IHU4uIu4K8CtckaPrnUwe/CHtsagejCjPi2gR0M= 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 1685565567785445.99565527119034; Wed, 31 May 2023 13:39:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q4SZi-0001cH-UE; Wed, 31 May 2023 16:37:43 -0400 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 1q4SZY-0001Cp-7E for qemu-devel@nongnu.org; Wed, 31 May 2023 16:37:32 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q4SZV-0003SO-3a for qemu-devel@nongnu.org; Wed, 31 May 2023 16:37:31 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-3f68fc6b479so899435e9.2 for ; Wed, 31 May 2023 13:37:28 -0700 (PDT) Received: from localhost.localdomain ([176.176.146.12]) by smtp.gmail.com with ESMTPSA id o1-20020a5d4741000000b002f9e04459desm7783956wrs.109.2023.05.31.13.37.25 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 31 May 2023 13:37:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1685565447; x=1688157447; 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=sjhOm08stxYpC2nNilZ+r3P5phZDhdo7hj/kLX7dCFk=; b=baHRiqQebNF8k8O8SyWORZYC3mudlxAkHKFMU53zBVrnBq5ZRHFLkquBLJ4UAxY7Mb KovMzALEUVYyKFjDGheabWZ7gYzI17QHF23RLcCuRSoDDHvInhYq/pH3sqwjmAFcss5V w51rPU7bbkIK+nvs5KjbwvJLexYRXX1qjxb9JDcFjAw21MNC4KP1G8ZwN8SdQGi64R2W l2hra9gtxluhu2r2in40iwd6YW5nbrk2qVJU3LofRc8A9YFVkMDIhalpe+pTbSAg5GQv f0Uf3B8VfgvthWvybT3r5aKTQJar3b+6EjOqrZOGRTYVRRq+eRNbYl/j1EZ6mYtRPKxs AyAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685565447; x=1688157447; 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=sjhOm08stxYpC2nNilZ+r3P5phZDhdo7hj/kLX7dCFk=; b=IR+OjvHq5RzoEfNC6gjOEInHCrWXv9yGHF2oQM1wlUFXs9/i4jnVevFVbVp/HprMd8 Mglzms88elOjA3thDqoc31Xl5CRaPNOBmcmpyXtsEQEMbdsd9xmBhp8VwzP97K2jDjIa p9HJ/VRi+7DCIoFlrAxLxHcsTv+lVC6jM5GoUo+X2p24jnmP6Ptst0rubgGwnk8UIdZ3 n7ZRCOOR5k9B+eGzd3+fgSYPvbs2/6K2hydUCUxMOE3ff+d6UMzva6OB7kM3nnucFYyN B5uOYeeH8WMoAaCFSJb9kpgUsBdejmOeI+6Zl1Sust5c8rWp2bSoQ6coPUdfInMaPX08 PHYg== X-Gm-Message-State: AC+VfDxoNHRzBGa5oLQ2RpDEtUeGEZCcN2ylsDPXnvkB/t1oh6LFaGvh gVENwhtXW2xSjxpvwNR4jX2OsDyPMDekFUHXUkE= X-Google-Smtp-Source: ACHHUZ6ybnccWJwYcKd97/ZADukH+SmEZld7USlQk+XRczcaholiB4yCKLzftaBrQtsJT6HH9bY4VQ== X-Received: by 2002:a5d:5304:0:b0:30a:eda0:71c5 with SMTP id e4-20020a5d5304000000b0030aeda071c5mr222844wrv.16.1685565447037; Wed, 31 May 2023 13:37:27 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , qemu-arm@nongnu.org, Peter Maydell , Sergey Kambalin , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 15/15] hw/timer/arm_timer: QOM'ify ARM_TIMER Date: Wed, 31 May 2023 22:35:59 +0200 Message-Id: <20230531203559.29140-16-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230531203559.29140-1-philmd@linaro.org> References: <20230531203559.29140-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::335; envelope-from=philmd@linaro.org; helo=mail-wm1-x335.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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1685565569784100001 Introduce the ARM_TIMER sysbus device. arm_timer_new() is converted as QOM instance init()/finalize() handlers. Note in arm_timer_finalize() we release a ptimer handle which was previously leaked. ArmTimerState is directly embedded into SP804State/IcpPitState, and is initialized as a QOM child. Since the timer frequency belongs to ARM_TIMER, have it hold the QOM property. SP804State/IcpPitState directly access it. Similarly the SP804State/IcpPitState input IRQ becomes the ARM_TIMER sysbus output IRQ. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/timer/arm_timer.c | 109 +++++++++++++++++++++++++++---------------- 1 file changed, 70 insertions(+), 39 deletions(-) diff --git a/hw/timer/arm_timer.c b/hw/timer/arm_timer.c index 82123b40c0..a929fbba62 100644 --- a/hw/timer/arm_timer.c +++ b/hw/timer/arm_timer.c @@ -17,6 +17,7 @@ #include "qemu/module.h" #include "qemu/log.h" #include "qom/object.h" +#include "qapi/error.h" =20 /* Common timer implementation. */ =20 @@ -29,14 +30,18 @@ #define TIMER_CTRL_PERIODIC (1 << 6) #define TIMER_CTRL_ENABLE (1 << 7) =20 -typedef struct { +#define TYPE_ARM_TIMER "arm-timer" +OBJECT_DECLARE_SIMPLE_TYPE(ArmTimerState, ARM_TIMER) + +struct ArmTimerState { + SysBusDevice parent_obj; ptimer_state *timer; uint32_t control; uint32_t limit; uint32_t freq; int int_level; qemu_irq irq; -} ArmTimerState; +}; =20 /* Check all active timers, and schedule the next timer interrupt. */ =20 @@ -172,23 +177,42 @@ static const VMStateDescription vmstate_arm_timer =3D= { } }; =20 -static void arm_timer_reset(ArmTimerState *s) +static void arm_timer_reset(DeviceState *dev) { + ArmTimerState *s =3D ARM_TIMER(dev); + s->control =3D TIMER_CTRL_IE; } =20 -static ArmTimerState *arm_timer_new(uint32_t freq, qemu_irq irq_out) +static void arm_timer_init(Object *obj) { - ArmTimerState *s; + ArmTimerState *s =3D ARM_TIMER(obj); + SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); =20 - s =3D g_new0(ArmTimerState, 1); - s->freq =3D freq; - arm_timer_reset(s); - - s->irq =3D irq_out; s->timer =3D ptimer_init(arm_timer_tick, s, PTIMER_POLICY_LEGACY); - vmstate_register(NULL, VMSTATE_INSTANCE_ID_ANY, &vmstate_arm_timer, s); - return s; + + sysbus_init_irq(sbd, &s->irq); +} + +static void arm_timer_finalize(Object *obj) +{ + ArmTimerState *s =3D ARM_TIMER(obj); + + ptimer_free(s->timer); +} + +static Property arm_timer_properties[] =3D { + DEFINE_PROP_UINT32("freq", ArmTimerState, freq, 0), + DEFINE_PROP_END_OF_LIST(), +}; + +static void arm_timer_class_init(ObjectClass *oc, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(oc); + + dc->reset =3D arm_timer_reset; + dc->vmsd =3D &vmstate_arm_timer; + device_class_set_props(dc, arm_timer_properties); } =20 /* @@ -204,11 +228,9 @@ struct SP804State { SysBusDevice parent_obj; =20 MemoryRegion iomem; - ArmTimerState *timer[2]; - uint32_t freq[2]; + ArmTimerState timer[2]; int level[2]; qemu_irq irq; - qemu_irq irq_in[2]; }; =20 static const uint8_t sp804_ids[] =3D { @@ -233,10 +255,10 @@ static uint64_t sp804_read(void *opaque, hwaddr offse= t, SP804State *s =3D opaque; =20 if (offset < 0x20) { - return arm_timer_read(s->timer[0], offset); + return arm_timer_read(&s->timer[0], offset); } if (offset < 0x40) { - return arm_timer_read(s->timer[1], offset - 0x20); + return arm_timer_read(&s->timer[1], offset - 0x20); } =20 /* TimerPeriphID */ @@ -265,12 +287,12 @@ static void sp804_write(void *opaque, hwaddr offset, SP804State *s =3D opaque; =20 if (offset < 0x20) { - arm_timer_write(s->timer[0], offset, value); + arm_timer_write(&s->timer[0], offset, value); return; } =20 if (offset < 0x40) { - arm_timer_write(s->timer[1], offset - 0x20, value); + arm_timer_write(&s->timer[1], offset - 0x20, value); return; } =20 @@ -304,6 +326,12 @@ static void sp804_init(Object *obj) memory_region_init_io(&s->iomem, obj, &sp804_ops, s, "sp804", 0x1000); sysbus_init_mmio(sbd, &s->iomem); + + qdev_init_gpio_in_named(DEVICE(obj), sp804_set_irq, + "timer-in", ARRAY_SIZE(s->timer)); + for (unsigned i =3D 0; i < ARRAY_SIZE(s->timer); i++) { + object_initialize_child(obj, "timer[*]", &s->timer[i], TYPE_ARM_TI= MER); + } } =20 static void sp804_realize(DeviceState *dev, Error **errp) @@ -311,23 +339,17 @@ static void sp804_realize(DeviceState *dev, Error **e= rrp) SP804State *s =3D SP804(dev); =20 for (unsigned i =3D 0; i < ARRAY_SIZE(s->timer); i++) { - s->irq_in[i] =3D qemu_allocate_irq(sp804_set_irq, s, i); - s->timer[i] =3D arm_timer_new(s->freq[i], s->irq_in[i]); - } -} - -static void sp804_unrealize(DeviceState *dev) -{ - SP804State *s =3D SP804(dev); - - for (unsigned i =3D 0; i < ARRAY_SIZE(s->timer); i++) { - qemu_free_irq(s->irq_in[i]); + if (!sysbus_realize(SYS_BUS_DEVICE(&s->timer[i]), errp)) { + return; + } + sysbus_connect_irq(SYS_BUS_DEVICE(&s->timer[i]), 0, + qdev_get_gpio_in_named(dev, "timer-in", i)); } } =20 static Property sp804_properties[] =3D { - DEFINE_PROP_UINT32("freq0", SP804State, freq[0], 1000000), - DEFINE_PROP_UINT32("freq1", SP804State, freq[1], 1000000), + DEFINE_PROP_UINT32("freq0", SP804State, timer[0].freq, 1000000), + DEFINE_PROP_UINT32("freq1", SP804State, timer[1].freq, 1000000), DEFINE_PROP_END_OF_LIST(), }; =20 @@ -336,7 +358,6 @@ static void sp804_class_init(ObjectClass *klass, void *= data) DeviceClass *k =3D DEVICE_CLASS(klass); =20 k->realize =3D sp804_realize; - k->unrealize =3D sp804_unrealize; device_class_set_props(k, sp804_properties); k->vmsd =3D &vmstate_sp804; } @@ -350,8 +371,7 @@ struct IntegratorPitState { SysBusDevice parent_obj; =20 MemoryRegion iomem; - ArmTimerState *timer[3]; - qemu_irq irq_in[3]; + ArmTimerState timer[3]; qemu_irq irq[3]; }; =20 @@ -368,7 +388,7 @@ static uint64_t icp_pit_read(void *opaque, hwaddr offse= t, return 0; } =20 - return arm_timer_read(s->timer[n], offset & 0xff); + return arm_timer_read(&s->timer[n], offset & 0xff); } =20 static void icp_pit_write(void *opaque, hwaddr offset, @@ -383,7 +403,7 @@ static void icp_pit_write(void *opaque, hwaddr offset, return; } =20 - arm_timer_write(s->timer[n], offset & 0xff, value); + arm_timer_write(&s->timer[n], offset & 0xff, value); } =20 static const MemoryRegionOps icp_pit_ops =3D { @@ -414,7 +434,8 @@ static void icp_pit_init(Object *obj) "timer-in", ARRAY_SIZE(s->timer)); =20 for (unsigned i =3D 0; i < ARRAY_SIZE(s->timer); i++) { - s->timer[i] =3D arm_timer_new(tmr_freq[i], s->irq_in[i]); + object_initialize_child(obj, "timer[*]", &s->timer[i], TYPE_ARM_TI= MER); + qdev_prop_set_uint32(DEVICE(&s->timer[i]), "freq", tmr_freq[i]); sysbus_init_irq(dev, &s->irq[i]); } =20 @@ -430,7 +451,10 @@ static void icp_pit_realize(DeviceState *dev, Error **= errp) IntegratorPitState *s =3D INTEGRATOR_PIT(dev); =20 for (unsigned i =3D 0; i < ARRAY_SIZE(s->timer); i++) { - sysbus_connect_irq(SYS_BUS_DEVICE(dev), i, + if (!sysbus_realize(SYS_BUS_DEVICE(&s->timer[i]), errp)) { + return; + } + sysbus_connect_irq(SYS_BUS_DEVICE(&s->timer[i]), 0, qdev_get_gpio_in_named(dev, "timer-in", i)); } } @@ -444,6 +468,13 @@ static void icp_pit_class_init(ObjectClass *klass, voi= d *data) =20 static const TypeInfo arm_timer_types[] =3D { { + .name =3D TYPE_ARM_TIMER, + .parent =3D TYPE_SYS_BUS_DEVICE, + .instance_size =3D sizeof(ArmTimerState), + .instance_init =3D arm_timer_init, + .instance_finalize =3D arm_timer_finalize, + .class_init =3D arm_timer_class_init, + }, { .name =3D TYPE_INTEGRATOR_PIT, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(IntegratorPitState), --=20 2.38.1