From nobody Mon Apr 7 18:18:59 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=pass; 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=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1571937138; cv=none; d=zoho.com; s=zohoarc; b=ahSwvosgSvpzCFMehAPnWVMp/iOiRoOeevnelbw1rCYUOTdvxffrTrnc2A8l3OY0BhnkqSbHNXUeL+Y9WpcqbW24IOmOp43UzTjmys0z4BrSUrpY/8PkFGjF0DxnCv47gSOYNXuSIHKiU5TZmtqzI/DGkuFJxqFcbBZ39zVUbC4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571937138; h=Content-Transfer-Encoding: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=J21kyHeYFa+RY7GcWXJAZvmmTTUgznnvXHxn75vs05A=; b=nT2VOXSIHfxsjXW+SzIHp51Z9jXR2CmcGvKVe0qaGuMAZQPrv+6ngYrwrLeCTTOpXiroTGsj7hbxSTlVjboOt/FIbabGWNX0RO+IcbXbmoimH9k6SP2iMDwSr3LJiwMnR+Tn3NTULWC2CtTrRP/boDTPGKRMXd6PgWjUovnSWhk= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; 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=pass 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 1571937138426717.405671280007; Thu, 24 Oct 2019 10:12:18 -0700 (PDT) Received: from localhost ([::1]:48390 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNgej-00041e-Dk for importer@patchew.org; Thu, 24 Oct 2019 13:12:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58148) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNfy7-0007z8-KI for qemu-devel@nongnu.org; Thu, 24 Oct 2019 12:28:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iNfy6-0000xi-FA 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]:39015) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iNfy6-0000xE-9N for qemu-devel@nongnu.org; Thu, 24 Oct 2019 12:28:10 -0400 Received: by mail-wr1-x442.google.com with SMTP id a11so10714966wra.6 for ; 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.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Oct 2019 09:28:07 -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=J21kyHeYFa+RY7GcWXJAZvmmTTUgznnvXHxn75vs05A=; b=c1UvOL+ZcoyfHigvuNr9oOa5gz0YKfEj0cmPw1DuUWoh8Vs8g4zcGqK/GoizhB01UP 8xAwfC+vkMGHnUyb/m1jmCr291Rf+v8Ope1LltBpzSPj4WIJPVDRq/QNaZreT5XIm/+Q AVuYYP3aA0tMqDIqo25vzdFAhWGJj/1NHXBxPd6LgoPGIn5fTIb8PIomw6egGo/L7EE0 oxDnVPLalMSAbL1R4VQpCcf2FJX+rSFgT4PzbH/aAdmN6L8s/5PvdcUfdOSntg4p7B3i RoM7zlKrpqtkvEs1/I9gGZIrqNGecTdjCfjQVxtTWKLXrDK/SpZhtdWgAxg+EB1gbcK/ dowg== 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=J21kyHeYFa+RY7GcWXJAZvmmTTUgznnvXHxn75vs05A=; b=nTVFQvhvE/xcTeGfFk4MWdicMrLU2lylXFGzEi2cN4o4xNn3VodQyl7ZTAwzx9sTkU ThBEYhvGDjWeUkw0ZaNeRRfNZurAf7SZ6Xtb3KMVbw1VzE0l7KeiXgVpqkBytdjfQu/d uUtsx+B8ka1b6TTOBfICT+oUijY5OJ3ZCdalAKbZr6VfGFRJ+4wuB2QMDppj3dhysz4R iQ/tg0ySH0vHdBWzIFK9C+TLRL6JtcEfgVuQBMolmgYVbVKaCzzj/vDA6zPajTb1+4Xi 1dfYp+IuCN4QaKccMTL/ez3hmA/hLKABqulCXxdAAiINi+0G1JjKwT8JijyL/j8r5v9Y wsrw== X-Gm-Message-State: APjAAAUHaFmKAUy5EcBwBt3CyUzA7fzVF96zmjzjSByZjRSYVekd/PT9 bJHXhBhPFCv2IJwx31/Grri8+zNVl8E= X-Google-Smtp-Source: APXvYqyU26pU3Oi9FioIDWaPoR2V09qVT2df71ZItWcrVijFyRQkeq7EbhYgIQ6QIeW9TMouPIOzpQ== X-Received: by 2002:adf:f04e:: with SMTP id t14mr4448645wro.106.1571934488067; Thu, 24 Oct 2019 09:28:08 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 33/51] hw/m68k/mcf5206.c: Switch to transaction-based ptimer API Date: Thu, 24 Oct 2019 17:27:06 +0100 Message-Id: <20191024162724.31675-34-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 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::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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" Switch the mcf5206 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: Thomas Huth Message-id: 20191021140600.10725-1-peter.maydell@linaro.org --- hw/m68k/mcf5206.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/hw/m68k/mcf5206.c b/hw/m68k/mcf5206.c index a49096367cb..b155dd81705 100644 --- a/hw/m68k/mcf5206.c +++ b/hw/m68k/mcf5206.c @@ -8,7 +8,6 @@ =20 #include "qemu/osdep.h" #include "qemu/error-report.h" -#include "qemu/main-loop.h" #include "cpu.h" #include "hw/hw.h" #include "hw/irq.h" @@ -57,10 +56,12 @@ static void m5206_timer_recalibrate(m5206_timer_state *= s) int prescale; int mode; =20 + ptimer_transaction_begin(s->timer); ptimer_stop(s->timer); =20 - if ((s->tmr & TMR_RST) =3D=3D 0) - return; + if ((s->tmr & TMR_RST) =3D=3D 0) { + goto exit; + } =20 prescale =3D (s->tmr >> 8) + 1; mode =3D (s->tmr >> 1) & 3; @@ -78,6 +79,8 @@ static void m5206_timer_recalibrate(m5206_timer_state *s) ptimer_set_limit(s->timer, s->trr, 0); =20 ptimer_run(s->timer, 0); +exit: + ptimer_transaction_commit(s->timer); } =20 static void m5206_timer_trigger(void *opaque) @@ -123,7 +126,9 @@ static void m5206_timer_write(m5206_timer_state *s, uin= t32_t addr, uint32_t val) s->tcr =3D val; break; case 0xc: + ptimer_transaction_begin(s->timer); ptimer_set_count(s->timer, val); + ptimer_transaction_commit(s->timer); break; case 0x11: s->ter &=3D ~val; @@ -137,11 +142,9 @@ static void m5206_timer_write(m5206_timer_state *s, ui= nt32_t addr, uint32_t val) static m5206_timer_state *m5206_timer_init(qemu_irq irq) { m5206_timer_state *s; - QEMUBH *bh; =20 s =3D g_new0(m5206_timer_state, 1); - bh =3D qemu_bh_new(m5206_timer_trigger, s); - s->timer =3D ptimer_init_with_bh(bh, PTIMER_POLICY_DEFAULT); + s->timer =3D ptimer_init(m5206_timer_trigger, s, PTIMER_POLICY_DEFAULT= ); s->irq =3D irq; m5206_timer_reset(s); return s; --=20 2.20.1