From nobody Tue Feb 10 03:20:48 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1611834640; cv=none; d=zohomail.com; s=zohoarc; b=nw6nTqtXCjyveOLKdP59jfYfC6GNVsccGE44KKEvpez/nkGyrjYLkZQKAodwLOB2jEDRut/un2VFxsqM0knjdON0oSJ4ZZu6XwYLzFE4Wdiam3i2J/tmMDUEqylrcgkVSd91Wm/dKOrs7ZOP1T8cpZtccgFrS639kmqfaEofJlE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611834640; 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=yZ8xu0Lo6T+SwLC4D2n+MG9CZOTMUcUo5Src/38TuZs=; b=EEfSDAEdrzbjjC1nHz+E6uXdNM8p/GolsYBwjFmpQzTMcHGF6s9e7rH+sHu/mLrbDGzUqNHYwI/6Kit9FzVplChFGM9cHuP8SM3vxCKBT+Ri2LnByQFZdLlt7k7+8S7Zuvu+MYFR0Zt3uMZtAJ6qxnxPG2ErEkZ3FxC9R/JbHHM= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 161183464078480.02103420013577; Thu, 28 Jan 2021 03:50:40 -0800 (PST) Received: from localhost ([::1]:57562 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l55ot-00047W-Lp for importer@patchew.org; Thu, 28 Jan 2021 06:50:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34028) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l55gq-0001dZ-7b for qemu-devel@nongnu.org; Thu, 28 Jan 2021 06:42:20 -0500 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:51111) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l55gd-0006Bv-2M for qemu-devel@nongnu.org; Thu, 28 Jan 2021 06:42:19 -0500 Received: by mail-wm1-x32c.google.com with SMTP id 190so4054107wmz.0 for ; Thu, 28 Jan 2021 03:42:06 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id q9sm6431033wme.18.2021.01.28.03.42.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Jan 2021 03:42:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yZ8xu0Lo6T+SwLC4D2n+MG9CZOTMUcUo5Src/38TuZs=; b=g40UFwzgOTp7m7ioPZrkGlaY3gtXHEjV3giEP6Wq40EvOKxWkRsJpy81y164YY8mvF NgeCt/QzrnHr5Py+P8rdaSWwY1LOy6VEzLgzriUOeiBbkF1xQY89QX8TCZzIIkaxdvEI BGZpE9dSabTgaBrDMQ5MjDDOQFY9yng6uJdmUsSFg7y17CXFIeddxEN7djZBJtWnEQ2/ x60YRnj/7Wj+5w6+rYGHG36G2gz2dkLVBr794ekiRiy3oeDNti8Cdx7VAlGoxGNVGlf5 Jd6NKaNbz1MIQx8ec8EHFd4D9StJblj8re7I5ila3zAkXVIu/Wysvfi1Cyj9c54Z4fgH H2vA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yZ8xu0Lo6T+SwLC4D2n+MG9CZOTMUcUo5Src/38TuZs=; b=o8ICjrlMW1HnEpfpe4o1gEKORYZE4dJyrG1dZR2RlSeucX88qxiKxDOiKduLKNMjE+ C8phH7lwj7YiAtERWkM9mqScv3U+3z1G//fBdcvlz9NMMbyTD8evMcPDsR5wA5JZLiju YYiFvy1YdqGIEQthxjPCLgzXRKoghNj8WrVg7xPz9Y4S7ILbM7b0WsUrb1MtgvEITj7X drzif6YwDIhh4kZQvGiAly11gXJDbRkD9qFdzL26h5xsRHJ4wMhNXZX/TTqTyUnQVPqI WRvyvo/GNiQu6ly19kTtpY3/w3yoGEFJKvX+VmkU/DbTjyO6hgzW8Gd7B6B9yzfQf3dM rGQQ== X-Gm-Message-State: AOAM533Dw75oN13RHzDM4B2Dbpk4Mmvu8qXLT2UH17lgpt0vbgEoHNNO 6aIKl2xs6OFUOCUTDdDcbv+l3A== X-Google-Smtp-Source: ABdhPJz3Ju3ClAVHoeEHEAj63UJfFdyGb3g3+9ZFwP4kkh86QQzUk4Ooikt5wxpwqE/mQyVxto6Tug== X-Received: by 2002:a05:600c:2295:: with SMTP id 21mr8506158wmf.133.1611834125570; Thu, 28 Jan 2021 03:42:05 -0800 (PST) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH v2 18/25] hw/timer/cmsdk-apb-timer: Convert to use Clock input Date: Thu, 28 Jan 2021 11:41:38 +0000 Message-Id: <20210128114145.20536-19-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210128114145.20536-1-peter.maydell@linaro.org> References: <20210128114145.20536-1-peter.maydell@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::32c; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Luc Michel , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Switch the CMSDK APB timer device over to using its Clock input; the pclk-frq property is now ignored. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Luc Michel Message-id: 20210121190622.22000-19-peter.maydell@linaro.org --- hw/timer/cmsdk-apb-timer.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/hw/timer/cmsdk-apb-timer.c b/hw/timer/cmsdk-apb-timer.c index c63145ff553..f053146d88f 100644 --- a/hw/timer/cmsdk-apb-timer.c +++ b/hw/timer/cmsdk-apb-timer.c @@ -204,6 +204,15 @@ static void cmsdk_apb_timer_reset(DeviceState *dev) ptimer_transaction_commit(s->timer); } =20 +static void cmsdk_apb_timer_clk_update(void *opaque) +{ + CMSDKAPBTimer *s =3D CMSDK_APB_TIMER(opaque); + + ptimer_transaction_begin(s->timer); + ptimer_set_period_from_clock(s->timer, s->pclk, 1); + ptimer_transaction_commit(s->timer); +} + static void cmsdk_apb_timer_init(Object *obj) { SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); @@ -213,15 +222,16 @@ static void cmsdk_apb_timer_init(Object *obj) s, "cmsdk-apb-timer", 0x1000); sysbus_init_mmio(sbd, &s->iomem); sysbus_init_irq(sbd, &s->timerint); - s->pclk =3D qdev_init_clock_in(DEVICE(s), "pclk", NULL, NULL); + s->pclk =3D qdev_init_clock_in(DEVICE(s), "pclk", + cmsdk_apb_timer_clk_update, s); } =20 static void cmsdk_apb_timer_realize(DeviceState *dev, Error **errp) { CMSDKAPBTimer *s =3D CMSDK_APB_TIMER(dev); =20 - if (s->pclk_frq =3D=3D 0) { - error_setg(errp, "CMSDK APB timer: pclk-frq property must be set"); + if (!clock_has_source(s->pclk)) { + error_setg(errp, "CMSDK APB timer: pclk clock must be connected"); return; } =20 @@ -232,7 +242,7 @@ static void cmsdk_apb_timer_realize(DeviceState *dev, E= rror **errp) PTIMER_POLICY_NO_COUNTER_ROUND_DOWN); =20 ptimer_transaction_begin(s->timer); - ptimer_set_freq(s->timer, s->pclk_frq); + ptimer_set_period_from_clock(s->timer, s->pclk, 1); ptimer_transaction_commit(s->timer); } =20 --=20 2.20.1