From patchwork Thu Oct 24 16:27:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 177576 Delivered-To: patch@linaro.org Received: by 2002:a92:409a:0:0:0:0:0 with SMTP id d26csp2474349ill; Thu, 24 Oct 2019 10:09:18 -0700 (PDT) X-Google-Smtp-Source: APXvYqzuoSDv4nZBhc1CUUShQMhkF9zueJ/4iRXEsOfE6UhJspnS6W45zczVB3wGtaSBc7OZU5kO X-Received: by 2002:a0c:f984:: with SMTP id t4mr2447732qvn.23.1571936958519; Thu, 24 Oct 2019 10:09:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571936958; cv=none; d=google.com; s=arc-20160816; b=N05bAS7mS3YmljglL4EVJcScddrrKSuKOA0BO7XuALmHuv+ugKnsoz274/6dNpQ/mt 99win1/swVSyD+c1Uw2x88yKh+3p3oWHv61XfWNNhahmBlQhh4gA3VypY7VRrUY9y+LR Fp/6xw6n3yeMKTdSIVijy5DhU+i1iMvMyh/F9/usfh/KSCbwQpLEyUiQkIHJFR4GqN2k gRlN7ibjech1Ssd285WVvsC2r82zpmcxNgVc825cf43VZYA3atAhsEcDvRAaQ+WWf6eL uG1ChGCK3znmTqg/lpw10QIV1pXr+IDRhp2Z825gJhKEQMpE4IXn1pEwQ1CeaxlaaI9a oO4w== 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=8gomn01XLvBOBw7vPQuO9R/LxnmjSiX180WMSIb6GFs=; b=xL9UP4A+7EN0lEnd1KHNoAwPVoL+kHNfZz9Caip+sjWuaCOtxHS/u92YxYDGesxKCP syi5+Jd/Li/K8LmkqSNPgEhDGrdwoh/DZGjxN0WP8wAGJKVxRSqqFex3Mw4QEMaxyu/b kuhpmM9fkmBtxs+P5OZPpuccjwCWYOhycO6O3b2btU4ZRJ9XZ8sVfC3LBdw/fgWt5jvf BizFl7HlbGsejGbPaMhocBEZ9wmT+bUIB1G/p4QQyBVnh5/H6wvsLaogvpsmBc11PmmS MDC9dsZZb6lfs8CXoDYJGV3qPcvX+XDLzJVftIHWnckU7g8tFMGepw5gmZT/mhwM0lrk QZMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=bh0tUVgC; 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 b67si23136618qkd.109.2019.10.24.10.09.18 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 24 Oct 2019 10:09:18 -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=bh0tUVgC; 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]:48352 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNgbt-0006vO-Ei for patch@linaro.org; Thu, 24 Oct 2019 13:09:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58150) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNfy7-0007zY-Q0 for qemu-devel@nongnu.org; Thu, 24 Oct 2019 12:28:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iNfy6-0000xp-He for qemu-devel@nongnu.org; Thu, 24 Oct 2019 12:28:11 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:44573) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iNfy6-0000xQ-BM for qemu-devel@nongnu.org; Thu, 24 Oct 2019 12:28:10 -0400 Received: by mail-wr1-x442.google.com with SMTP id z11so3425828wro.11 for ; Thu, 24 Oct 2019 09:28:10 -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=8gomn01XLvBOBw7vPQuO9R/LxnmjSiX180WMSIb6GFs=; b=bh0tUVgC/1ZbJ36SIsl+8vE6Dh0rK+GQ7ttrbMOIz7zDP5jvg4yq9wto8Bi/0N+fNb RbZCRzahCVbNs6fCGqXsaL33FyS80pIzSg1ugDWhRHk7wzGhOiplVgm8JZo3hPaOqPT3 5AlB/ZD9zHH3f78/jdzVGTexLwjICSXqNVpBNCRdTJRGp2kK3GWCKNLXKINzjd/5uF+i 3Puh6JkPji3sSli1UsgUjPK8cbkW8f77K96uOSkaCEKdjoyf9ZLD4qHPsxJiIHcZzeZ5 BtlXraBReXp+3V+uJ7ne9+8WYUqtxse2JsrsTfL0wfKpFY8KQttxDu+YmNaACBJXkwmE zvQA== 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=8gomn01XLvBOBw7vPQuO9R/LxnmjSiX180WMSIb6GFs=; b=UbI0eIbwFZKsRIZgbXLU1whf7wPZT5b4wCmOaxKUE/sIh/qLUe0FJhXWpikZTCMWd/ 4DciBq873y8i6m+zJSRR+ihZ0hGYgdoI6I9QUkYKIwN5ARZrYZsy9tDq1dGLVmnqskDC fS/+8vF2CgicO00k6mlcTSLis5sNu3SpKqhPuqL9uIdiHm+PduXDb5bLX1GMpl0vJY0X sJd9u5KMzxPfXwfSlyijyM225d7uqcrnBUDNl6RhvuPPPxlTN7MvjLECH83W7eRstS0n THZpMOML6W+alKJEagA0d7qbAcvVOFWI/N9zHgmJy8ZEmC7Sy49kNLyGDwjfjiyLG5D3 SiKw== X-Gm-Message-State: APjAAAWIh1XJO4gtrZ+qKVk5QCPVM4cPpwz/kZVxZyIRT4v+XJdy5NAo JbNUOPb2GZWu1q4I9YFtfz3J6RFMW3M= X-Received: by 2002:a05:6000:4f:: with SMTP id k15mr4416110wrx.137.1571934489134; Thu, 24 Oct 2019 09:28:09 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id r27sm42606124wrc.55.2019.10.24.09.28.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Oct 2019 09:28:08 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 34/51] hw/watchdog/milkymist-sysctl.c: Switch to transaction-based ptimer API Date: Thu, 24 Oct 2019 17:27:07 +0100 Message-Id: <20191024162724.31675-35-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191024162724.31675-1-peter.maydell@linaro.org> References: <20191024162724.31675-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::442 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 milkymist-sysctl 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: Philippe Mathieu-Daudé Message-id: 20191021141040.11007-1-peter.maydell@linaro.org --- hw/timer/milkymist-sysctl.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) -- 2.20.1 diff --git a/hw/timer/milkymist-sysctl.c b/hw/timer/milkymist-sysctl.c index 5193c038501..7a62e212c35 100644 --- a/hw/timer/milkymist-sysctl.c +++ b/hw/timer/milkymist-sysctl.c @@ -31,7 +31,6 @@ #include "hw/ptimer.h" #include "hw/qdev-properties.h" #include "qemu/error-report.h" -#include "qemu/main-loop.h" #include "qemu/module.h" enum { @@ -71,8 +70,6 @@ struct MilkymistSysctlState { MemoryRegion regs_region; - QEMUBH *bh0; - QEMUBH *bh1; ptimer_state *ptimer0; ptimer_state *ptimer1; @@ -161,14 +158,19 @@ static void sysctl_write(void *opaque, hwaddr addr, uint64_t value, s->regs[addr] = value; break; case R_TIMER0_COMPARE: + ptimer_transaction_begin(s->ptimer0); ptimer_set_limit(s->ptimer0, value, 0); s->regs[addr] = value; + ptimer_transaction_commit(s->ptimer0); break; case R_TIMER1_COMPARE: + ptimer_transaction_begin(s->ptimer1); ptimer_set_limit(s->ptimer1, value, 0); s->regs[addr] = value; + ptimer_transaction_commit(s->ptimer1); break; case R_TIMER0_CONTROL: + ptimer_transaction_begin(s->ptimer0); s->regs[addr] = value; if (s->regs[R_TIMER0_CONTROL] & CTRL_ENABLE) { trace_milkymist_sysctl_start_timer0(); @@ -179,8 +181,10 @@ static void sysctl_write(void *opaque, hwaddr addr, uint64_t value, trace_milkymist_sysctl_stop_timer0(); ptimer_stop(s->ptimer0); } + ptimer_transaction_commit(s->ptimer0); break; case R_TIMER1_CONTROL: + ptimer_transaction_begin(s->ptimer1); s->regs[addr] = value; if (s->regs[R_TIMER1_CONTROL] & CTRL_ENABLE) { trace_milkymist_sysctl_start_timer1(); @@ -191,6 +195,7 @@ static void sysctl_write(void *opaque, hwaddr addr, uint64_t value, trace_milkymist_sysctl_stop_timer1(); ptimer_stop(s->ptimer1); } + ptimer_transaction_commit(s->ptimer1); break; case R_ICAP: sysctl_icap_write(s, value); @@ -263,8 +268,12 @@ static void milkymist_sysctl_reset(DeviceState *d) s->regs[i] = 0; } + ptimer_transaction_begin(s->ptimer0); ptimer_stop(s->ptimer0); + ptimer_transaction_commit(s->ptimer0); + ptimer_transaction_begin(s->ptimer1); ptimer_stop(s->ptimer1); + ptimer_transaction_commit(s->ptimer1); /* defaults */ s->regs[R_ICAP] = ICAP_READY; @@ -292,13 +301,15 @@ static void milkymist_sysctl_realize(DeviceState *dev, Error **errp) { MilkymistSysctlState *s = MILKYMIST_SYSCTL(dev); - s->bh0 = qemu_bh_new(timer0_hit, s); - s->bh1 = qemu_bh_new(timer1_hit, s); - s->ptimer0 = ptimer_init_with_bh(s->bh0, PTIMER_POLICY_DEFAULT); - s->ptimer1 = ptimer_init_with_bh(s->bh1, PTIMER_POLICY_DEFAULT); + s->ptimer0 = ptimer_init(timer0_hit, s, PTIMER_POLICY_DEFAULT); + s->ptimer1 = ptimer_init(timer1_hit, s, PTIMER_POLICY_DEFAULT); + ptimer_transaction_begin(s->ptimer0); ptimer_set_freq(s->ptimer0, s->freq_hz); + ptimer_transaction_commit(s->ptimer0); + ptimer_transaction_begin(s->ptimer1); ptimer_set_freq(s->ptimer1, s->freq_hz); + ptimer_transaction_commit(s->ptimer1); } static const VMStateDescription vmstate_milkymist_sysctl = {