From nobody Wed Nov 12 15:02:14 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1571665843; cv=none; d=zoho.com; s=zohoarc; b=I7EsbfCVJdi1bYoYaLUYweAjGfCwWO7OpXPm/mDpeE6DEf8KRbhNHMrF78+HJRrKySXRPbun4LJMplYClDjgBMKiJtnV3Lv2KniT+H6iKXNkiaj5x2KF15jgKcy12Fx96rEtuHgpnOYU329ph25/WqtOrcytNGFCYeZQ67BlfcY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571665843; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=pPyjiLHcXCm2RhqBb6tCDKheW+xM8aFwIwX0Fdcw04Y=; b=Ma8rcz0N6gcHfLxGJ9g1+9qALF6NzDnsN4QCZ5xr3inkoPSvFwOhpW9/Z2+FSahjQS5DhIqZMzM5slA2itfybDEkNEvjYqGoOo9D1J63Q+y8N1NivKy0B/hm9Euok1R7ly/TRElF+m9MowjgpD/MGVZEluV6wRCIDVWPdFRPRL4= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1571665843198256.19141217330866; Mon, 21 Oct 2019 06:50:43 -0700 (PDT) Received: from localhost ([::1]:42328 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMY54-0006EW-5V for importer@patchew.org; Mon, 21 Oct 2019 09:50:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41527) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMXyh-0007wf-2Q for qemu-devel@nongnu.org; Mon, 21 Oct 2019 09:44:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iMXyf-0000mb-Qz for qemu-devel@nongnu.org; Mon, 21 Oct 2019 09:44:06 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:36249) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iMXyf-0000mB-K9 for qemu-devel@nongnu.org; Mon, 21 Oct 2019 09:44:05 -0400 Received: by mail-wr1-x444.google.com with SMTP id w18so13522587wrt.3 for ; Mon, 21 Oct 2019 06:44:05 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id q196sm10443689wme.23.2019.10.21.06.44.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Oct 2019 06:44:03 -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=pPyjiLHcXCm2RhqBb6tCDKheW+xM8aFwIwX0Fdcw04Y=; b=Z0cPzV6aXQz8jV+2+sVoBNTXSuMK+P8IwBt/vq84+IqAqOjUNAa7MOyZx8N9/Z9oh1 8eGqFqQBLG6Dd6wD1gScJ3wK9ru+k88hJFlrSJeRqG0U804Nd1suTNKwERF1ZXjCqaU6 Y68w7wXS9I2QyJ6eDlzCsgM8h8sb6ATPgx9a/8+7Cl9n45TEowEEj6sTnX+ftra+IqjW fVVyzn7zD1SGJ4CtwPagavaveNjhe25GjnXfu8Kzbz3Dbz1kzftI8fInKaVY918BcbQC zwZBNdw1kVYWZ8qnTQx/77CLHb++z3tloj+mZdPGbDzI7bHoqnq1u963m+qGlO0Z5O9S PVpw== 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=pPyjiLHcXCm2RhqBb6tCDKheW+xM8aFwIwX0Fdcw04Y=; b=EaGj/90b0pDYodzcL8Ruo8RqGeZvqXmFopLJYn3D6TngNJkjiD+nnwzsT9rDlAnM/7 39qSLkT/WtxD4d7klCToVhqUNwqmGcMpQlH8wnvvTiYVY8h7kEFGwqvMkFZRVWZSUKBa 1jVvPmv0QNz6ls6JnBP/sNMHenGhKy+LXgJvFsN17yUQ2fQ3+ZmUdJLweFi8a3/YbB2v K8l5BnNae+WY81qyczFEFCzEiz4Ej5VnVCKUkXs3EMsyN7lxQ8irzM47UhmBB/UmWrmx CSfdGocvlDl3FegcOA+gHQFPPFpaIy90dCw1fikQl1d1B4ft+zCyihbl2Lm1ntbzs091 Q2cA== X-Gm-Message-State: APjAAAVK9+/JE3YCRDZmHOTc9qXSGj8cdiDVzrWPnWq+ECBAEihuOOFy 21QxAcIrsKv7djhz+Cckp2b7ob2w3Qw= X-Google-Smtp-Source: APXvYqyKmJruj7Gnrsjxo/vxQ9Dpcv2YUIEjXhdNqorKOCgJIvyykoJcvD0ucZTSvOiP/NAX0NRVhA== X-Received: by 2002:a5d:6585:: with SMTP id q5mr19821855wru.74.1571665444339; Mon, 21 Oct 2019 06:44:04 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH v2 3/3] hw/timer/slavio_timer.c: Switch to transaction-based ptimer API Date: Mon, 21 Oct 2019 14:43:57 +0100 Message-Id: <20191021134357.14266-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191021134357.14266-1-peter.maydell@linaro.org> References: <20191021134357.14266-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 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=20Mathieu-Daud=C3=A9?= , KONRAD Frederic , Richard Henderson , Mark Cave-Ayland , Fabien Chouteau Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Switch the slavio_timer 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=C3=A9 Reviewed-by: Richard Henderson --- hw/timer/slavio_timer.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/hw/timer/slavio_timer.c b/hw/timer/slavio_timer.c index 890dd53f8d8..c55e8d0bf42 100644 --- a/hw/timer/slavio_timer.c +++ b/hw/timer/slavio_timer.c @@ -30,7 +30,6 @@ #include "hw/sysbus.h" #include "migration/vmstate.h" #include "trace.h" -#include "qemu/main-loop.h" #include "qemu/module.h" =20 /* @@ -213,6 +212,7 @@ static void slavio_timer_mem_writel(void *opaque, hwadd= r addr, saddr =3D addr >> 2; switch (saddr) { case TIMER_LIMIT: + ptimer_transaction_begin(t->timer); if (slavio_timer_is_user(tc)) { uint64_t count; =20 @@ -234,6 +234,7 @@ static void slavio_timer_mem_writel(void *opaque, hwadd= r addr, ptimer_set_limit(t->timer, LIMIT_TO_PERIODS(t->limit), 1); } } + ptimer_transaction_commit(t->timer); break; case TIMER_COUNTER: if (slavio_timer_is_user(tc)) { @@ -245,7 +246,9 @@ static void slavio_timer_mem_writel(void *opaque, hwadd= r addr, t->reached =3D 0; count =3D ((uint64_t)t->counthigh) << 32 | t->count; trace_slavio_timer_mem_writel_limit(timer_index, count); + ptimer_transaction_begin(t->timer); ptimer_set_count(t->timer, LIMIT_TO_PERIODS(t->limit - count)); + ptimer_transaction_commit(t->timer); } else { trace_slavio_timer_mem_writel_counter_invalid(); } @@ -253,13 +256,16 @@ static void slavio_timer_mem_writel(void *opaque, hwa= ddr addr, case TIMER_COUNTER_NORST: // set limit without resetting counter t->limit =3D val & TIMER_MAX_COUNT32; + ptimer_transaction_begin(t->timer); if (t->limit =3D=3D 0) { /* free-run */ ptimer_set_limit(t->timer, LIMIT_TO_PERIODS(TIMER_MAX_COUNT32)= , 0); } else { ptimer_set_limit(t->timer, LIMIT_TO_PERIODS(t->limit), 0); } + ptimer_transaction_commit(t->timer); break; case TIMER_STATUS: + ptimer_transaction_begin(t->timer); if (slavio_timer_is_user(tc)) { // start/stop user counter if (val & 1) { @@ -271,6 +277,7 @@ static void slavio_timer_mem_writel(void *opaque, hwadd= r addr, } } t->run =3D val & 1; + ptimer_transaction_commit(t->timer); break; case TIMER_MODE: if (timer_index =3D=3D 0) { @@ -280,6 +287,7 @@ static void slavio_timer_mem_writel(void *opaque, hwadd= r addr, unsigned int processor =3D 1 << i; CPUTimerState *curr_timer =3D &s->cputimer[i + 1]; =20 + ptimer_transaction_begin(curr_timer->timer); // check for a change in timer mode for this processor if ((val & processor) !=3D (s->cputimer_mode & processor))= { if (val & processor) { // counter -> user timer @@ -306,6 +314,7 @@ static void slavio_timer_mem_writel(void *opaque, hwadd= r addr, trace_slavio_timer_mem_writel_mode_counter(timer_i= ndex); } } + ptimer_transaction_commit(curr_timer->timer); } } else { trace_slavio_timer_mem_writel_mode_invalid(); @@ -365,10 +374,12 @@ static void slavio_timer_reset(DeviceState *d) curr_timer->count =3D 0; curr_timer->reached =3D 0; if (i <=3D s->num_cpus) { + ptimer_transaction_begin(curr_timer->timer); ptimer_set_limit(curr_timer->timer, LIMIT_TO_PERIODS(TIMER_MAX_COUNT32), 1); ptimer_run(curr_timer->timer, 0); curr_timer->run =3D 1; + ptimer_transaction_commit(curr_timer->timer); } } s->cputimer_mode =3D 0; @@ -378,7 +389,6 @@ static void slavio_timer_init(Object *obj) { SLAVIO_TIMERState *s =3D SLAVIO_TIMER(obj); SysBusDevice *dev =3D SYS_BUS_DEVICE(obj); - QEMUBH *bh; unsigned int i; TimerContext *tc; =20 @@ -390,9 +400,11 @@ static void slavio_timer_init(Object *obj) tc->s =3D s; tc->timer_index =3D i; =20 - bh =3D qemu_bh_new(slavio_timer_irq, tc); - s->cputimer[i].timer =3D ptimer_init_with_bh(bh, PTIMER_POLICY_DEF= AULT); + s->cputimer[i].timer =3D ptimer_init(slavio_timer_irq, tc, + PTIMER_POLICY_DEFAULT); + ptimer_transaction_begin(s->cputimer[i].timer); ptimer_set_period(s->cputimer[i].timer, TIMER_PERIOD); + ptimer_transaction_commit(s->cputimer[i].timer); =20 size =3D i =3D=3D 0 ? SYS_TIMER_SIZE : CPU_TIMER_SIZE; snprintf(timer_name, sizeof(timer_name), "timer-%i", i); --=20 2.20.1