From nobody Wed Nov 12 15:02:12 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=1571320138; cv=none; d=zoho.com; s=zohoarc; b=b5Sq/7q73as58CwJkn6VK2cHL1E0qvDxD92cycOofxYIW16SkooAb8+eDpmGGHoy+bEy5Q/cWDeDhfPyTIhsXya+dGqt/RddFURXaoWG68gnp+ovrX2vEh1EBaAKv82SHjAo1SXTuJTFVmrFq9903fCo8GSc4dfgnuAmzgqySfE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571320138; h=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=ubzqTky8oXQWHb54LycWqoQN2mw2t/0StAg0pETjdLY=; b=V3K0NRk9pWWPQiv1qmZM60HXz2lcY/auP7a4TlVz9vOF+z85J1Uzcen1u/8nm0TIWml4T4MBbDy2F60JrpZZZRcj4YNiCv1SR9F0dptCRAJGPaB6ST43Aq7Loa90ASmpPT3E6GVsYAhdPMx9Q/0+ndMct3Jw948MOmNbip8fWec= 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 1571320137974852.900081413854; Thu, 17 Oct 2019 06:48:57 -0700 (PDT) Received: from localhost ([::1]:48308 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iL692-00033g-8c for importer@patchew.org; Thu, 17 Oct 2019 09:48:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35263) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iL5l2-00009G-GU for qemu-devel@nongnu.org; Thu, 17 Oct 2019 09:24:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iL5l1-0000wT-8q for qemu-devel@nongnu.org; Thu, 17 Oct 2019 09:24:00 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:40169) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iL5l1-0000wB-2K for qemu-devel@nongnu.org; Thu, 17 Oct 2019 09:23:59 -0400 Received: by mail-wr1-x443.google.com with SMTP id o28so2338618wro.7 for ; Thu, 17 Oct 2019 06:23:58 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id z9sm2270302wrp.26.2019.10.17.06.23.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Oct 2019 06:23:56 -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=ubzqTky8oXQWHb54LycWqoQN2mw2t/0StAg0pETjdLY=; b=ZuyvpQ1hTrRZAMvlys+wfq5OXOBcOObZwbCwFYv0rkDnqE6Ntag9SCmiisciiJKqUT w0C7qAPuo3OiLPtBtI3eRn6xGIj7fD3OKqN2PnNRzPEgr6UX67f09lnG+PGLTHzKMdHA XlcxZGkidzGBycEALG0uixAkQyCBiFGs5nJAAt6fBTWlCwqSZlyY1WGvDErJgBlQ4BB+ WRRbaEr686VOUAGWHp3yuDV4NEAyHQRRzdUC68LQftybKm66el1tHwlNahNC0Y06kX2Z xUaizJx0CHo89yTjeJ/Q26VgNyvAZCyI39LsduZkdob38tEUxj1xqFgYu2mH/apxJaTC sOeA== 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=ubzqTky8oXQWHb54LycWqoQN2mw2t/0StAg0pETjdLY=; b=GJ4gq38t/Jq4d/kgKsjfkJyx33kQGclMkm6VH0vDB7/LYysg5mDVETvDmy46oc7d2D 3VBh4/oSR/dYxSh5AnSqH2QoKNHWybcsh1YyCVnez5C1BS5aXGSPpfylWdQ3kdPb4XQ3 eqaipd16ha7CyS9VK8c0+AsuyL4hGXRbbRucJNCfmOQoaRSfolul4Zqiwi4uJKksuXWw ILUZ051MffnCRcsOnKUnDFsM1egbyKX0/AAjHqKwE1rA+8uCdtLfRIkz2+N27MYAIbQJ 7EV1DxACPZP4zbupjCj7jRPWkB+01Dy2o39j0hWHuUQZsReDFJ6PxwD9QkRqH+DiqhE3 Hinw== X-Gm-Message-State: APjAAAWDM0aQv0pAWenrS34ls3DpfRiFDQRGguKyTtZmxOZ9pyVlCOMC zczoHd/QmM+I6FJKjrINNcI4DTyGpL/9Ag== X-Google-Smtp-Source: APXvYqy57JUqLxTr/bl80CQbDzP9FGIBDAdtW2s7C0GBngdK1APk+6cS9VoTJq+8g0pjRQJSyrKmhA== X-Received: by 2002:adf:92a5:: with SMTP id 34mr2863485wrn.337.1571318637031; Thu, 17 Oct 2019 06:23:57 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH 2/2] hw/timer/slavio_timer.c: Switch to transaction-based ptimer API Date: Thu, 17 Oct 2019 14:23:51 +0100 Message-Id: <20191017132351.4762-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191017132351.4762-1-peter.maydell@linaro.org> References: <20191017132351.4762-1-peter.maydell@linaro.org> MIME-Version: 1.0 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::443 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: KONRAD Frederic , 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) Content-Type: text/plain; charset="utf-8" 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 692d213897d..0e2efe6fe89 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 @@ -236,6 +236,7 @@ static void slavio_timer_mem_writel(void *opaque, hwadd= r addr, } } } + ptimer_transaction_commit(t->timer); break; case TIMER_COUNTER: if (slavio_timer_is_user(tc)) { @@ -247,7 +248,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(); } @@ -255,13 +258,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) { @@ -273,6 +279,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) { @@ -282,6 +289,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 @@ -308,6 +316,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(); @@ -367,10 +376,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; @@ -380,7 +391,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 @@ -392,9 +402,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