From patchwork Tue Oct 8 17:17:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 175540 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp5998447ill; Tue, 8 Oct 2019 10:31:35 -0700 (PDT) X-Google-Smtp-Source: APXvYqxO33DH2i8R9OYZQuF9V4a+QOdCWpyXqVz8bOXkJnKQMACA8rmw6Eo+u+zKlKjAsNBhJDNQ X-Received: by 2002:ac8:ec2:: with SMTP id w2mr36517605qti.119.1570555895333; Tue, 08 Oct 2019 10:31:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570555895; cv=none; d=google.com; s=arc-20160816; b=cKFfaM1Fs+aCWDJfnVy5ka4YPrEdiOCPizuDhA/EPwYwbXKYR5bl1GfisOd2ChwIOP glrwuYjRZk5teUc/44HeVgvfXJVRqsDHwyX80rx9nDAcPulKApODZwAtITbNPQzJHFhQ KtiNZnGszazdkpubYO7DntHUu+s4A/V7BvsjyY5X9njEDoAl1eAoAK8Zx7W9mrDcJtqH ELBwqwbvqvsrbcCaElenO4J1fc0//IMsAxyVI0ns7MPloON3cB1p38gQhqnSag1JZ72N 4oDYN5TU7Q0qpQDI/SjHfUSwnBccgnWTV7btHVY626XPJekT6+xt/3BJqXYFy2WMD2tW pEqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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=YG0gX4qWdrO9GT0PeX8Gop+wch2VyWRSSaF9t3LJ9nc=; b=gZia7HaXnRHMMpOowQ6vgOCbSNVGRNt7kpoYAy53wY/JWHQv3O3fRcFlmrDBt+Ap+F /WB3uPV5Zv/dU+r0RtfyUsV6JjStXmlzL8qAFHLau+1NfGXtKfPwy6dhyxDC40fLA6R0 ns2l1Z59YnDMH2FHr92X+vPEuJhiIPAC0M5AvqJ1ILeuUO++oDEKK6EOZO5pHoW+A2Cx c1s1coNVPHdiYqMxMKqwBNbzgoRDp62kVkczGbkX14AIlfIgu8wKNurnOSrqsFH2LPm7 DUKS4vYDfAADWpDLPIFQ+GjADAzFnL69zWuC7F1JjGojHG+OUopQFgGJy+UThLLMojKa m+WQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=TpCIrSAK; 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=fail (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 70si15693024qkg.180.2019.10.08.10.31.35 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 08 Oct 2019 10:31:35 -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=fail header.i=@linaro.org header.s=google header.b=TpCIrSAK; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:59202 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iHtKe-0002d2-N8 for patch@linaro.org; Tue, 08 Oct 2019 13:31:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49069) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iHt7e-0006ok-L8 for qemu-devel@nongnu.org; Tue, 08 Oct 2019 13:18:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iHt7d-0002Oy-6n for qemu-devel@nongnu.org; Tue, 08 Oct 2019 13:18:06 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:40682) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iHt7c-0002No-RL for qemu-devel@nongnu.org; Tue, 08 Oct 2019 13:18:05 -0400 Received: by mail-wm1-x343.google.com with SMTP id b24so3925226wmj.5 for ; Tue, 08 Oct 2019 10:18:04 -0700 (PDT) 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=YG0gX4qWdrO9GT0PeX8Gop+wch2VyWRSSaF9t3LJ9nc=; b=TpCIrSAKnC+ubgTuHzcWi7xGznG+/JaMKEd1aE538WLALpO9OSGu+9B7sUshwK4tEU kkFLeaKq1pzihfNMPe41qXO/jk1Lq6L0mmna5gO3jGVQGXL2tpb2scJw5Omm7H/kZBpi exjT5XV4Qy+HFjV40S+zAhmRzRHJVjtLXezbTMkZ33PHOTtCTOlCkbsgJRwnTQrr+oQc uKXFk8NwTc5gnRnjEazCuLBOWQ2+PoEGix6fXuQIsWMfuY2cZ5OAZA3SEDYyFKHnNONt yWi8naR3uF90HtASyOVYNauz7uGwF5MY/NyZQi4SFMHLYTCZKcjMHon5/yOjTJa+Qea9 mUzQ== 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=YG0gX4qWdrO9GT0PeX8Gop+wch2VyWRSSaF9t3LJ9nc=; b=ep/EA0JkF+P1TSHXmMtYW4U8tCja4VZxkgJzfl5QkX/VKNVMVBgYQQA2WVJMuN3fu2 aJKinTMCUWpWVRvrvXfX9YqJKLo2e8wo1rocPeskzLHfP5EC9JpxcMqwe06BafsK2xgH Sa1pf1J2zKDzcDadNZKvx329dC5SivGbPfIvtwgWvk9XWJlVNtETxXPWTFsCrqySGoaS VpkLkg7uqNQRGic2q/PpiLxiQGwUsuF6mil7WWy/pDffvkCK+TIs0GErp74ZNHdkYnmM OuMZzxrmunw0VD+9cDBIfJspsrohyr5J0vfJF1fPEnOyArlrN1xNDOl4aUht/f0+qBQF rqSw== X-Gm-Message-State: APjAAAXFQmCy/SvPdb+AHGKKU8hq2HvH0gs6gtJWZ7vbwDkGC6Iiwopc B6KDM1+9vFP/7SkNsOqbOT1kDQ== X-Received: by 2002:a1c:2382:: with SMTP id j124mr5026948wmj.154.1570555083764; Tue, 08 Oct 2019 10:18:03 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id z9sm19135541wrl.35.2019.10.08.10.18.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Oct 2019 10:18:03 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH v2 16/21] hw/timer/exynos4210_rtc.c: Switch main ptimer to transaction-based API Date: Tue, 8 Oct 2019 18:17:35 +0100 Message-Id: <20191008171740.9679-17-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191008171740.9679-1-peter.maydell@linaro.org> References: <20191008171740.9679-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::343 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: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , Paolo Bonzini Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Switch the exynos41210_rtc main ptimer over to the transaction-based API, completing the transition for this device. Signed-off-by: Peter Maydell --- hw/timer/exynos4210_rtc.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) -- 2.20.1 Reviewed-by: Richard Henderson diff --git a/hw/timer/exynos4210_rtc.c b/hw/timer/exynos4210_rtc.c index b7ae99e9aa7..f85483a07f8 100644 --- a/hw/timer/exynos4210_rtc.c +++ b/hw/timer/exynos4210_rtc.c @@ -28,7 +28,6 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "qemu/log.h" -#include "qemu/main-loop.h" #include "qemu/module.h" #include "hw/sysbus.h" #include "migration/vmstate.h" @@ -195,6 +194,7 @@ static void check_alarm_raise(Exynos4210RTCState *s) * RTC update frequency * Parameters: * reg_value - current RTCCON register or his new value + * Must be called within a ptimer_transaction_begin/commit block for s->ptimer. */ static void exynos4210_rtc_update_freq(Exynos4210RTCState *s, uint32_t reg_value) @@ -402,6 +402,7 @@ static void exynos4210_rtc_write(void *opaque, hwaddr offset, break; case RTCCON: ptimer_transaction_begin(s->ptimer_1Hz); + ptimer_transaction_begin(s->ptimer); if (value & RTC_ENABLE) { exynos4210_rtc_update_freq(s, value); } @@ -432,6 +433,7 @@ static void exynos4210_rtc_write(void *opaque, hwaddr offset, } } ptimer_transaction_commit(s->ptimer_1Hz); + ptimer_transaction_commit(s->ptimer); s->reg_rtccon = value; break; case TICCNT: @@ -539,8 +541,10 @@ static void exynos4210_rtc_reset(DeviceState *d) s->reg_curticcnt = 0; + ptimer_transaction_begin(s->ptimer); exynos4210_rtc_update_freq(s, s->reg_rtccon); ptimer_stop(s->ptimer); + ptimer_transaction_commit(s->ptimer); ptimer_transaction_begin(s->ptimer_1Hz); ptimer_stop(s->ptimer_1Hz); ptimer_transaction_commit(s->ptimer_1Hz); @@ -559,12 +563,12 @@ static void exynos4210_rtc_init(Object *obj) { Exynos4210RTCState *s = EXYNOS4210_RTC(obj); SysBusDevice *dev = SYS_BUS_DEVICE(obj); - QEMUBH *bh; - bh = qemu_bh_new(exynos4210_rtc_tick, s); - s->ptimer = ptimer_init_with_bh(bh, PTIMER_POLICY_DEFAULT); + s->ptimer = ptimer_init(exynos4210_rtc_tick, s, PTIMER_POLICY_DEFAULT); + ptimer_transaction_begin(s->ptimer); ptimer_set_freq(s->ptimer, RTC_BASE_FREQ); exynos4210_rtc_update_freq(s, 0); + ptimer_transaction_commit(s->ptimer); s->ptimer_1Hz = ptimer_init(exynos4210_rtc_1Hz_tick, s, PTIMER_POLICY_DEFAULT);