From patchwork Fri Jan 29 11:00:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 373325 Delivered-To: patch@linaro.org Received: by 2002:a02:a60d:0:0:0:0:0 with SMTP id c13csp2107559jam; Fri, 29 Jan 2021 03:31:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJzjinhBotZXAdAFfdNtWwBGjYpIY7nup9UeMXKZFTjOAKvAGi8lp3ONhSeqT0HgVOKmJoVW X-Received: by 2002:a25:df8f:: with SMTP id w137mr5513452ybg.221.1611919885600; Fri, 29 Jan 2021 03:31:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611919885; cv=none; d=google.com; s=arc-20160816; b=ev8skATmaXnYLWP+7P11b3pLV69rUTM7EtA7bVntjG7PBbUIzyYXbrDnsPK2d+W/vW mnReZF4KoSJYb/eTjUQ3KDjUA3vpHMwMNnJm42tCE4ETfY1h7u63qWO9y7QPmCCZskTV 6JP0/BAkpW8nVM305OGcM22c3QsBXIwxYkd3J2aDMUPCWi3WBU6/geMFD6lGw0v26zR6 TjJhvlm4Q9M0Xr5V1aK+OSKZCe2fOVYyEcruawKk4ZenO5fWjZ7SV+/HAulpK7i4B635 PPcAe0988lb/yHM2SjqqL/4I7eEOX/jUCUAJbxyM7AXG+NYRZ9xK1cb9jRGK7oET7UZL MrgQ== 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=R5ZCiCbzgcfVwbMTe2kDZcJL0TsUz0X/IGSllnBxFwk=; b=NxefxSApiHQPtUafGEfu0DQkvlIImMvUsAWCCCqROFnW/TC2pdlCo7a3l1b8IlZYe0 554DpwF2ERe0+di2svoAOUFMNOqW5BETyyBpI6eqzGEiOi8lGzP6n4JeZn8EDL0D3h7a wuESsjBx2HDC9tLQrP229bUTQZEWIeXeXgmRTwGhm8b0yjOza7w1ztDQOi9cKdpzIwdB GunQzYy7F6BiFj0IxahOOoI6mSGUxzh1a2qXF/fLsXmS+JlkQnsIyefI9VBYrcEW69Vk AfgW+kvxgKjApPrjqzY6OL4taeyxBW3vq78HjS9MqJITU1qaWBVqY4Q26iWkfCJ5+zno zLpQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=AT3Zw4s7; 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 d136si7653421ybh.5.2021.01.29.03.31.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jan 2021 03:31:25 -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=AT3Zw4s7; 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]:47056 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l5Rzp-0003v5-00 for patch@linaro.org; Fri, 29 Jan 2021 06:31:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60094) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l5RWM-00057n-Va for qemu-devel@nongnu.org; Fri, 29 Jan 2021 06:00:59 -0500 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:36438) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l5RWH-00079I-13 for qemu-devel@nongnu.org; Fri, 29 Jan 2021 06:00:58 -0500 Received: by mail-wm1-x32a.google.com with SMTP id i9so6832697wmq.1 for ; Fri, 29 Jan 2021 03:00:52 -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=R5ZCiCbzgcfVwbMTe2kDZcJL0TsUz0X/IGSllnBxFwk=; b=AT3Zw4s7IQ+J6uq91qh3yDE91Fo8LgW7ipmi1gRDgE+UUkua3ElrKcyJMDsM4J0P+8 tIV+7dpL3D7UpaWdXUQVuyFr3GqP+rroSg2/wT66xX927Ow8f73WUij0FDrwS7FhLuxU kpgJOOC54PpBys6D6SR3+aZBDkdjQMAqQkSk/xVr3PUtKCbfeg8f6Ols5J/UKDfnM2xW jQiYrOEv+3fV2rJ2wLWOCXDzX5Dbzdl8h2kLxQo2pkZcRUFkNNPcxAxj4YG0lJ2JDYlG DFYZaeod79OumEfVNtz15Ulx8CBGlfT93S1DP4dy0jQsh0pqYjIM97SDmytq1aU2pRFR Z9+A== 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=R5ZCiCbzgcfVwbMTe2kDZcJL0TsUz0X/IGSllnBxFwk=; b=cFAxamEvVexO3rHw8bbqIcGgaddv/oBpCtF2RtFscHCJwNrcyRLb4nGG20QWDhO7mN RKo/k0rEV6UoigYOBWp6GD/Z1YFSDq88j60kfYvLoMvq/YFIZM6mCF64OZK4P+d0Uy3L 5Nla83ot4/dTVyKb5Xw8eDwly8OwDJBAgg98GTXhSlq5WeYTpLzd5eJEcNB1tvbj6rwW asJ0BWvaeIssTc+aQZLfZz37omPU+iXlhRtPZo6smvClgo07YmS8sxUs8uMXhf9YZuc+ ElxNzAGRhbWx2rGukEILZ6bmUwidqmnb/1BDJ4QosKTiXOouNA0M9ceL3CUqWjCY1Exd KFdw== X-Gm-Message-State: AOAM533IhECGGO6NmlwIoz+q/P12xiax8NKEqgFXP14eOSjsj99XE9C7 s2JpXVTwRT41ex3HlaHFK3EFq9m3etYqmA== X-Received: by 2002:a05:600c:214c:: with SMTP id v12mr3276354wml.8.1611918051534; Fri, 29 Jan 2021 03:00:51 -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.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Jan 2021 03:00:50 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 41/46] hw/watchdog/cmsdk-apb-watchdog: Convert to use Clock input Date: Fri, 29 Jan 2021 11:00:07 +0000 Message-Id: <20210129110012.8660-42-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::32a; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32a.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 watchdog device over to using its Clock input; the wdogclk_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-21-peter.maydell@linaro.org Message-id: 20210121190622.22000-21-peter.maydell@linaro.org --- hw/watchdog/cmsdk-apb-watchdog.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) -- 2.20.1 diff --git a/hw/watchdog/cmsdk-apb-watchdog.c b/hw/watchdog/cmsdk-apb-watchdog.c index b03bcb73628..9cad0c67da4 100644 --- a/hw/watchdog/cmsdk-apb-watchdog.c +++ b/hw/watchdog/cmsdk-apb-watchdog.c @@ -310,6 +310,15 @@ static void cmsdk_apb_watchdog_reset(DeviceState *dev) ptimer_transaction_commit(s->timer); } +static void cmsdk_apb_watchdog_clk_update(void *opaque) +{ + CMSDKAPBWatchdog *s = CMSDK_APB_WATCHDOG(opaque); + + ptimer_transaction_begin(s->timer); + ptimer_set_period_from_clock(s->timer, s->wdogclk, 1); + ptimer_transaction_commit(s->timer); +} + static void cmsdk_apb_watchdog_init(Object *obj) { SysBusDevice *sbd = SYS_BUS_DEVICE(obj); @@ -319,7 +328,8 @@ static void cmsdk_apb_watchdog_init(Object *obj) s, "cmsdk-apb-watchdog", 0x1000); sysbus_init_mmio(sbd, &s->iomem); sysbus_init_irq(sbd, &s->wdogint); - s->wdogclk = qdev_init_clock_in(DEVICE(s), "WDOGCLK", NULL, NULL); + s->wdogclk = qdev_init_clock_in(DEVICE(s), "WDOGCLK", + cmsdk_apb_watchdog_clk_update, s); s->is_luminary = false; s->id = cmsdk_apb_watchdog_id; @@ -329,9 +339,9 @@ static void cmsdk_apb_watchdog_realize(DeviceState *dev, Error **errp) { CMSDKAPBWatchdog *s = CMSDK_APB_WATCHDOG(dev); - if (s->wdogclk_frq == 0) { + if (!clock_has_source(s->wdogclk)) { error_setg(errp, - "CMSDK APB watchdog: wdogclk-frq property must be set"); + "CMSDK APB watchdog: WDOGCLK clock must be connected"); return; } @@ -342,7 +352,7 @@ static void cmsdk_apb_watchdog_realize(DeviceState *dev, Error **errp) PTIMER_POLICY_NO_COUNTER_ROUND_DOWN); ptimer_transaction_begin(s->timer); - ptimer_set_freq(s->timer, s->wdogclk_frq); + ptimer_set_period_from_clock(s->timer, s->wdogclk, 1); ptimer_transaction_commit(s->timer); }