From patchwork Fri Jan 29 11:00:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 373326 Delivered-To: patch@linaro.org Received: by 2002:a02:a60d:0:0:0:0:0 with SMTP id c13csp2108680jam; Fri, 29 Jan 2021 03:32:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJzlOBraD6pFFV/LUg7VYJDseIHQtVLjbys7aH515TPMwByzVI7/hiho6zOFTswwvjed6EFu X-Received: by 2002:a25:9902:: with SMTP id z2mr5141385ybn.339.1611919973064; Fri, 29 Jan 2021 03:32:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611919973; cv=none; d=google.com; s=arc-20160816; b=l04OkT3GOg2l+eXbehOD0ME5XQsWp5GrLRTR2n8UcaBw1IGJUIGqO4ZBecynmyNO+i P5vMZU2okItAMKJhx6G2An1aCdnLzL14azqBVCU7q+9Srr8i3d6mgzM6ejdoL2tZGcPD VVK2BS4Oj+Fpxri00pjZo5qNFQmZJ+Fz4R32sg9HQvMp5CJiyDGjBc9O7/335ZBjWvCc qWKebVEgqcebWAI5ORARYdVh7JiEbcXWTpYAEQkSsfiCAcPbBLXfUS24VmZTNR12JLb0 GyDCn8lvjshCaja7uy5tA6kx/fBuXbwqKFG4aw+sxd/8CdRakG47WNs+3zcjNpfSHzl+ Ie9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=8Q/Zx+LStNTVndvw6F2NG1TWQc+T3iIwGsQdHvDIx/0=; b=gZk76UiRTnvS9JHQ2B1yhRmDb0FKFs4cg/t3I+0h8DHlgET4N1Pvcw0Z9QM11+t/Ml 9wRxLWPNWKFamWRKcMEJvYCte4ZpKatLiwUY98CpW91ztE5nFKpww/9Taiv5Bg4YJNxf YanKF15pdOnz+eGmplXzhnlcxbHeciU9dkKXbjIBA5x8h4VaYtOIel3IzWzL6hzo9MLE Yq5KRBPE/kGda3tZfYXhEo0mT32TzrZioLcLb76YDAjhcZJVIlxE562gZUGN9jL/8/S3 XPoGXgk8d3v7z0zmqjHMQwDurtySJt8svYecJQLEHwYl6Qw5A47ZG0bnjQH7k10lMMNS Pe1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HfVbjkYT; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id k23si9439624ybj.464.2021.01.29.03.32.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jan 2021 03:32:53 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HfVbjkYT; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:51320 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l5S1E-0005iW-Gy for patch@linaro.org; Fri, 29 Jan 2021 06:32:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60124) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l5RWO-00059k-C4 for qemu-devel@nongnu.org; Fri, 29 Jan 2021 06:01:01 -0500 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:38032) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l5RWF-00078t-3D for qemu-devel@nongnu.org; Fri, 29 Jan 2021 06:01:00 -0500 Received: by mail-wm1-x32c.google.com with SMTP id y187so6820757wmd.3 for ; Fri, 29 Jan 2021 03:00:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=8Q/Zx+LStNTVndvw6F2NG1TWQc+T3iIwGsQdHvDIx/0=; b=HfVbjkYTzqbcX0nMRtcelGrLtq+CiluMFUEtWKKDx/xsGIeS73m/o2+OzMITHKnYZv atNlTGaYDOvdlc0eXPPWkSjMeC2rul4EBfyGSJWoO7/z4O1eSNGcTBcjqtLFLgLDs0vZ 8dpmxbD3I0VseSmD3LZowQ6CWEr/FbFEceswHvCGTWRZQKkvoKXa1Eb0Tdm4ZJ8EdHw9 MnCjmG7lR9y7eBIMGWW0K6tnOkUwKe/ncfH0ks2mObTqWEfiI/9WGxf+HsJnxWV6ugUk XWd9XVN1ZTuDR7GVvHCF+WM37YxLYPZbtpwT0cAZ6bBO5FoOwpGejxfDpilv7shaKBA2 i05A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8Q/Zx+LStNTVndvw6F2NG1TWQc+T3iIwGsQdHvDIx/0=; b=g9uN1K8BWnTjh2oS2jMu0qTRq0Vr5t9GSh/tGjQWn1aBwBFeresMnN9IWJsdiSxRnO elOy6mhGd3gFpzQcIQxe/MNYqfu6FxWmmjASxmKqXQkdFH1G1jKSKv86ufWKDKwTdQWT 27nJixbQfGT9bSnYq/I3RZPKtHtnmNnJNkcPPDCvY8ItJ8iUI88ESyEk68rI3j10rImr azhghdLcMTNjcWMO0+u9Rt8nMFMTWJVBiN7DRMBVxBbDfkBQME02QPK2k42h7GxfDcc3 b0stVbRS9AkYgKTbgP1p/tO0umMCBNHI/krKDBQoCBIssnHMMQJGbQaM9DXLxy1LEBv3 zkkg== X-Gm-Message-State: AOAM530RilXUEgfqZsembx1b1QF3iikAlRO8TpyAn8CzmuV5b6ZQko+g OmVdYq44ZlQvPNrJyIdawbCUmK8hkJZkNw== X-Received: by 2002:a1c:1d12:: with SMTP id d18mr3160744wmd.121.1611918049784; Fri, 29 Jan 2021 03:00:49 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id w20sm9268761wmm.12.2021.01.29.03.00.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Jan 2021 03:00:49 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 39/46] hw/timer/cmsdk-apb-timer: Convert to use Clock input Date: Fri, 29 Jan 2021 11:00:05 +0000 Message-Id: <20210129110012.8660-40-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210129110012.8660-1-peter.maydell@linaro.org> References: <20210129110012.8660-1-peter.maydell@linaro.org> MIME-Version: 1.0 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=ham 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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é Reviewed-by: Luc Michel Tested-by: Philippe Mathieu-Daudé Message-id: 20210128114145.20536-19-peter.maydell@linaro.org Message-id: 20210121190622.22000-19-peter.maydell@linaro.org --- hw/timer/cmsdk-apb-timer.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) -- 2.20.1 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); } +static void cmsdk_apb_timer_clk_update(void *opaque) +{ + CMSDKAPBTimer *s = 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 = 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 = qdev_init_clock_in(DEVICE(s), "pclk", NULL, NULL); + s->pclk = qdev_init_clock_in(DEVICE(s), "pclk", + cmsdk_apb_timer_clk_update, s); } static void cmsdk_apb_timer_realize(DeviceState *dev, Error **errp) { CMSDKAPBTimer *s = CMSDK_APB_TIMER(dev); - if (s->pclk_frq == 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; } @@ -232,7 +242,7 @@ static void cmsdk_apb_timer_realize(DeviceState *dev, Error **errp) PTIMER_POLICY_NO_COUNTER_ROUND_DOWN); 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); }