From patchwork Mon Oct 14 16:03:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 176278 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp4727023ill; Mon, 14 Oct 2019 09:24:39 -0700 (PDT) X-Google-Smtp-Source: APXvYqyDEk74u1DZwRtp2DH+sWGB1393fPz/xBszrDQt+wlkygyMpdktSEXpfzOmXWF7K6jpTkPo X-Received: by 2002:ac8:711a:: with SMTP id z26mr22224250qto.283.1571070279073; Mon, 14 Oct 2019 09:24:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571070279; cv=none; d=google.com; s=arc-20160816; b=ry4t78RCxQOmflFGZYKV7TIBwCdHBdMOMFIQ0tfTw5jPaxqUOX4hKBccRjxwe3Bhpb 5Ngm2ltWqP41nhimquV25EbjWsXlZWGjLZDo+spgU2vkWGB0rdudGuF/vI4CL6wziaTm 6N6VVKfdNOz4coKRuB695aXaf50xGbQyvVxkJvdgz5fJbuehfIMYyoGPgHs0IR7X+KIU XSpAPMc9yrtBtiD5Job/yYZCH+CmH8fGZt1TuXCesqugA9DxXco0PkpKWjXVdPM4udla txvFxJkVILLKr23qpyX28FvNNQeWuwfsOzm5nkyDkhY022ClFHcY+hX7SXvK5v4TJpsH lnpQ== 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=9b9GZNMAUz56Mm9M7+arYCaaqvYl4kdVBrW1fhBiXYU=; b=XWnCwyUnKRw97Wos7abHQ4K50aWy/s/maL7pqliW0QzotDJz8yFMez3nuA40Kce7rY hJ0suh/kR+NXVXlvtJzae7xZp2EKwY4HfeqRj7EQ+YgN+iuHFNrJLVpMDXPTdHy8S6ju UZJoGOPzs6iC9gBsvyujrXTfJrrhqXPkbmzqP7TeVxxXy8aDcw0S0nGRKTbofmS9JZvn 9WAs6Gp84+XrFkwLxCmv7eBpfigSOFHePDeI1aIc9glX6ZOH3z57H0MBxnZgPaMl336c R+LoDMs/PbNo0cn6TxaV/mnO1rqIvvif0wndgYI93UppJJny/M3Rra2uaBleav+i0AwM dnfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cj+8MGeh; 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 i26si19351003qti.299.2019.10.14.09.24.39 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Oct 2019 09:24:39 -0700 (PDT) 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=cj+8MGeh; 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]:53196 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iK39C-0004Zb-75 for patch@linaro.org; Mon, 14 Oct 2019 12:24:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36967) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iK2q5-0004EL-Hk for qemu-devel@nongnu.org; Mon, 14 Oct 2019 12:04:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iK2q4-0007Rt-8L for qemu-devel@nongnu.org; Mon, 14 Oct 2019 12:04:53 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:55016) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iK2q4-0007R6-1w for qemu-devel@nongnu.org; Mon, 14 Oct 2019 12:04:52 -0400 Received: by mail-wm1-x344.google.com with SMTP id p7so17866872wmp.4 for ; Mon, 14 Oct 2019 09:04:51 -0700 (PDT) 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=9b9GZNMAUz56Mm9M7+arYCaaqvYl4kdVBrW1fhBiXYU=; b=cj+8MGehiWCGG0/ZnCZ6JiJ3yvcf1zGNM6sphJa21TiEjdeGlv5j2jeOCzZLwpGXg/ 9+uE/gU5PrgwLc+es4O/s+MaCQXUENVlWJ6Jzz+CHl95Wd/LonSsZhnvtR73cnWT0X5a E/CVVNjIx1C40sm7/hX2gWRejkmuViKombllwUkaDU43ToozQtjGZbah0R12zk8AjUZT 5SVdCVCAw6cjTZWtjYZDEkSAwrFnxE6IqnnLnxYhGWxKzyQaJLEckD5sNzId9ihBjE2y 7TDfvYDCQsKWVd8yWQH2Ip5LRoqKcYhyFoBrlk4ezBoVP1HAkGU+pp/+QkyIgyMoZ1J7 YLWA== 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=9b9GZNMAUz56Mm9M7+arYCaaqvYl4kdVBrW1fhBiXYU=; b=gJb2bMpxeAxM8c7iuv5+B+5V65xw8kcyDmF7S8kMmhIe/mVb5KDAg46ahyxMaip7aS NzvH+fWWwbuMmmIuonRzZtawaU0/gAGqOGw/p3Nb+KVd3RKApT1YK2q9lyQIK0pvXAvr HqS60WTmwp36F9eBzRijtVdU232F5u3LrKj3ttPMJqWvCxO8W2k+Y8XWnXhIwqzVZkBB X08qKzebpW03abUKpr2ZEglKSAHJNpxbvkNoZfr92/XrVlBm6c6lKP0iVndgEMykBy2C rtMmbiGKuCVT2PJDPmhqZ8GXuzmMNAI2C0D9mSVYs/Fo4quO7clhOEUFa1RNPJ12GHga QhkA== X-Gm-Message-State: APjAAAUn+V1aSbjqJVP0Sb5jxYYkJlRwrN895cJhJ7uz62tC3ZmL4cCn DkCEnrScg50qBD5ZqrTjsd+cDJYhVy1S+w== X-Received: by 2002:a1c:e10a:: with SMTP id y10mr15661170wmg.29.1571069090725; Mon, 14 Oct 2019 09:04:50 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id 5sm18029779wrk.86.2019.10.14.09.04.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Oct 2019 09:04:49 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 23/68] hw/watchdog/cmsdk-apb-watchdog.c: Switch to transaction-based ptimer API Date: Mon, 14 Oct 2019 17:03:19 +0100 Message-Id: <20191014160404.19553-24-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191014160404.19553-1-peter.maydell@linaro.org> References: <20191014160404.19553-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 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 code away from bottom-half based ptimers to the new transaction-based ptimer API. This just requires adding begin/commit calls around the various places that modify the ptimer state, and using the new ptimer_init() function to create the timer. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-id: 20191008171740.9679-21-peter.maydell@linaro.org --- hw/watchdog/cmsdk-apb-watchdog.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) -- 2.20.1 diff --git a/hw/watchdog/cmsdk-apb-watchdog.c b/hw/watchdog/cmsdk-apb-watchdog.c index e42c3ebd29d..e6f3b93c44e 100644 --- a/hw/watchdog/cmsdk-apb-watchdog.c +++ b/hw/watchdog/cmsdk-apb-watchdog.c @@ -24,7 +24,6 @@ #include "qemu/log.h" #include "trace.h" #include "qapi/error.h" -#include "qemu/main-loop.h" #include "qemu/module.h" #include "sysemu/watchdog.h" #include "hw/sysbus.h" @@ -200,8 +199,10 @@ static void cmsdk_apb_watchdog_write(void *opaque, hwaddr offset, * Reset the load value and the current count, and make sure * we're counting. */ + ptimer_transaction_begin(s->timer); ptimer_set_limit(s->timer, value, 1); ptimer_run(s->timer, 0); + ptimer_transaction_commit(s->timer); break; case A_WDOGCONTROL: if (s->is_luminary && 0 != (R_WDOGCONTROL_INTEN_MASK & s->control)) { @@ -217,7 +218,9 @@ static void cmsdk_apb_watchdog_write(void *opaque, hwaddr offset, break; case A_WDOGINTCLR: s->intstatus = 0; + ptimer_transaction_begin(s->timer); ptimer_set_count(s->timer, ptimer_get_limit(s->timer)); + ptimer_transaction_commit(s->timer); cmsdk_apb_watchdog_update(s); break; case A_WDOGLOCK: @@ -299,8 +302,10 @@ static void cmsdk_apb_watchdog_reset(DeviceState *dev) s->itop = 0; s->resetstatus = 0; /* Set the limit and the count */ + ptimer_transaction_begin(s->timer); ptimer_set_limit(s->timer, 0xffffffff, 1); ptimer_run(s->timer, 0); + ptimer_transaction_commit(s->timer); } static void cmsdk_apb_watchdog_init(Object *obj) @@ -320,7 +325,6 @@ static void cmsdk_apb_watchdog_init(Object *obj) static void cmsdk_apb_watchdog_realize(DeviceState *dev, Error **errp) { CMSDKAPBWatchdog *s = CMSDK_APB_WATCHDOG(dev); - QEMUBH *bh; if (s->wdogclk_frq == 0) { error_setg(errp, @@ -328,14 +332,15 @@ static void cmsdk_apb_watchdog_realize(DeviceState *dev, Error **errp) return; } - bh = qemu_bh_new(cmsdk_apb_watchdog_tick, s); - s->timer = ptimer_init_with_bh(bh, + s->timer = ptimer_init(cmsdk_apb_watchdog_tick, s, PTIMER_POLICY_WRAP_AFTER_ONE_PERIOD | PTIMER_POLICY_TRIGGER_ONLY_ON_DECREMENT | PTIMER_POLICY_NO_IMMEDIATE_RELOAD | PTIMER_POLICY_NO_COUNTER_ROUND_DOWN); + ptimer_transaction_begin(s->timer); ptimer_set_freq(s->timer, s->wdogclk_frq); + ptimer_transaction_commit(s->timer); } static const VMStateDescription cmsdk_apb_watchdog_vmstate = {