From patchwork Thu Oct 17 13:28:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 176650 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp973039ill; Thu, 17 Oct 2019 07:03:28 -0700 (PDT) X-Google-Smtp-Source: APXvYqzRLcUpXS6RaF1irV4AStTWcjiqz2tYaa/NcRNVEyVoI1NSa2oArp84GJXej0XrSIGEXhqS X-Received: by 2002:a0c:e6a6:: with SMTP id j6mr3982934qvn.74.1571321008252; Thu, 17 Oct 2019 07:03:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571321008; cv=none; d=google.com; s=arc-20160816; b=Kf2Xt4AFU31hE7/XcIOBc/bODvs/9UVVXdTA3QGBxt4+sgbellM3BmT75b49dpgR+D yxGeU2qPnXAdZ7veJhS5suVut78utNIwmvMbCtqDbcp+hX+9RWI25OnBSb/p8S9Si9K3 O0qTwI5HhbJVozQisJcavGw/Am5nM2DokY5AOMHs0RgUo7b7UdsBun4h4jFpCOSfsiPs 8P0qaFtgxAqQSmlZraidt/2j88dL+HssjnR+CEmRQU6SMRlhQ2ZDWaZHzHWkZmd3M4p/ lbLAqHQiXHoWI+u9/Hdv/FfIBVldRkz0/TCSdzYcG6p+9ByRmRYQUyCVkYrnMfe6ASDg 982w== 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=e2Ij4RQysVJcdo+i7dvWapjtIXrPIwRATrfBcMlAk+I=; b=eVia1Tz1BbZzBCmZrlPnvcxAlp+3L3rzGnoSEur5LyIjzbiermNR16E7mzzPXF9qcr gQOeMcxTE6era4aKhnAlkXT5VzyTILpiTaepT4vNXf83fcJJ+/0fZ071ZUGY3GbKymDj MxVxgyKth60tE++DACAG18Unzn+qo8pUFViQJhd2VAXTnQs1XMnIDuxI5g8H5y3Q6qyq MTWm9n2qWaEr+6RykrDSOQ7UkAIzIJEbzMp+JCcc0VKS6OsxyS3UUqekH0tqQ5yDtQp8 ttvN1WMZQ/U5QszA0R1dMOl9PEkK/GLAot5v+BWh2PCebSWa1pzKddEdeyxkDMDUO1wY DVOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lRqagTtB; 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 z124si2038596qka.1.2019.10.17.07.03.28 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 17 Oct 2019 07:03:28 -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=lRqagTtB; 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]:48704 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iL6ND-0005uZ-5J for patch@linaro.org; Thu, 17 Oct 2019 10:03:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36115) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iL5q3-0006i3-81 for qemu-devel@nongnu.org; Thu, 17 Oct 2019 09:29:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iL5q2-0002Ya-0Q for qemu-devel@nongnu.org; Thu, 17 Oct 2019 09:29:11 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:54153) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iL5q1-0002YN-Qr for qemu-devel@nongnu.org; Thu, 17 Oct 2019 09:29:09 -0400 Received: by mail-wm1-x343.google.com with SMTP id i16so2577612wmd.3 for ; Thu, 17 Oct 2019 06:29:09 -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=e2Ij4RQysVJcdo+i7dvWapjtIXrPIwRATrfBcMlAk+I=; b=lRqagTtBFoxIc0/CA2ni0W+tWpGc03zj4lnjzYXwmZIFfPoTGUm8FFp06jsLNojK/Q yRHK6ku3OZbhF6slx4KWmzBUfV6nCybuJja64uhSI08wFFgdGbgJfJUZgPQEcsKmoIVf va+rqB4fve1TjOL5F4rvMJIupVfof+hbCd8f+5e8AR+bTuxrTvEv40+PsCO6efrMuOXC x+mLy5PsTShOIsGL8Iadq67hq9eU2UtFFzMknfEmbnQnPgQTcYqqiauxd+3g1glptDTy tPSXH+S6WpqeY26qx0mtGlKS36raKvz1fRYoapdAcrC/Rz+CyklEVuvdsEqBBdIMF6R3 daPA== 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=e2Ij4RQysVJcdo+i7dvWapjtIXrPIwRATrfBcMlAk+I=; b=ulijadOVMq12mu1LOuW/eoUVkQpNKisIl1liKyosFk1MTR+g1tbPlQVJAYKZN3vijR AD6J42zhir+1PzrB9U/KRyyLR5/utWhUcQDaefssomWRn301L39wkYbDZ2hJr6HmmcVi QdBOJnavn4JcWK1Qv678DPvGDmLs408VE5p7dfoUb8spxYZ6UEoNgNqFkcjB1rzqHowL a8mhNJ5wxl0U/xDwS73YVp9GHlTtRwV6aXSFVd8+FSGNovRXhrZtYXAIO5IrpTp/jtmi FzspkJdtdh3gVFU68LZh5R5gPSuiATDhpYtgFQlLRGJmFTUgK+vch+fF4LNzjlB6YNBL kuSg== X-Gm-Message-State: APjAAAUOydS7kyEqAXPVUwm03oHrkKlKdibg95cPH/a2nFStsK8rq3k+ AYdQ88v7Ls88qh9lAJgM6LEqNS4dKsw0Gw== X-Received: by 2002:a1c:5408:: with SMTP id i8mr2908630wmb.149.1571318948583; Thu, 17 Oct 2019 06:29:08 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id n15sm2703392wrw.47.2019.10.17.06.29.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Oct 2019 06:29:08 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH 1/8] hw/timer/puv3_ost.c: Switch to transaction-based ptimer API Date: Thu, 17 Oct 2019 14:28:58 +0100 Message-Id: <20191017132905.5604-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191017132905.5604-1-peter.maydell@linaro.org> References: <20191017132905.5604-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: Thomas Huth , "Edgar E. Iglesias" , Michael Walle , Guan Xuetao , Magnus Damm Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Switch the puv3_ost 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 --- hw/timer/puv3_ost.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) -- 2.20.1 Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé diff --git a/hw/timer/puv3_ost.c b/hw/timer/puv3_ost.c index 0898da5ce97..697519593bb 100644 --- a/hw/timer/puv3_ost.c +++ b/hw/timer/puv3_ost.c @@ -13,7 +13,6 @@ #include "hw/sysbus.h" #include "hw/irq.h" #include "hw/ptimer.h" -#include "qemu/main-loop.h" #include "qemu/module.h" #undef DEBUG_PUV3 @@ -27,7 +26,6 @@ typedef struct PUV3OSTState { SysBusDevice parent_obj; MemoryRegion iomem; - QEMUBH *bh; qemu_irq irq; ptimer_state *ptimer; @@ -68,6 +66,7 @@ static void puv3_ost_write(void *opaque, hwaddr offset, DPRINTF("offset 0x%x, value 0x%x\n", offset, value); switch (offset) { case 0x00: /* Match Register 0 */ + ptimer_transaction_begin(s->ptimer); s->reg_OSMR0 = value; if (s->reg_OSMR0 > s->reg_OSCR) { ptimer_set_count(s->ptimer, s->reg_OSMR0 - s->reg_OSCR); @@ -76,6 +75,7 @@ static void puv3_ost_write(void *opaque, hwaddr offset, (0xffffffff - s->reg_OSCR)); } ptimer_run(s->ptimer, 2); + ptimer_transaction_commit(s->ptimer); break; case 0x14: /* Status Register */ assert(value == 0); @@ -128,9 +128,10 @@ static void puv3_ost_realize(DeviceState *dev, Error **errp) sysbus_init_irq(sbd, &s->irq); - s->bh = qemu_bh_new(puv3_ost_tick, s); - s->ptimer = ptimer_init_with_bh(s->bh, PTIMER_POLICY_DEFAULT); + s->ptimer = ptimer_init(puv3_ost_tick, s, PTIMER_POLICY_DEFAULT); + ptimer_transaction_begin(s->ptimer); ptimer_set_freq(s->ptimer, 50 * 1000 * 1000); + ptimer_transaction_commit(s->ptimer); memory_region_init_io(&s->iomem, OBJECT(s), &puv3_ost_ops, s, "puv3_ost", PUV3_REGS_OFFSET);