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=1571319820; cv=none; d=zoho.com; s=zohoarc; b=H2Jhs6n/4H2IdaJMRF6aiI6uBDZMr0tUE/zRlfUGwZyRaku+I5PpEuOU3gSsNFsApFrxWv9FEvw8DKMcUp/VVu2dmCiuXiuwvUM7UFQ88a95LPeSfTAq/90oS1Np7bCuiwK2rb/B2eYo6IzOh8c6/h2Uybw85ksemU9JaWEjHW8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571319820; 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=We+bFOtG4HDLIryRINVpil47T9Rtk94/5StL1YZ+S34=; b=DiZJH1w+IZJPP3Vlz/WDeUSg2UwDobyPuJ599sowvXX+iSdglLhH2Hl62sMbLYBj5sLHT8BJk+trO5kMvUQkhdFb/4r2+F8mE3a/jsRlTr84AqBvXds22ArWsfbPQolDY9hhGk7Berl039MVfBtwep6nXgkpMYj0ekxe5EQa3vc= 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 1571319820035960.6696640804179; Thu, 17 Oct 2019 06:43:40 -0700 (PDT) Received: from localhost ([::1]:48210 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iL642-0007GQ-Ea for importer@patchew.org; Thu, 17 Oct 2019 09:43:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34919) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iL5ib-0004z3-0s for qemu-devel@nongnu.org; Thu, 17 Oct 2019 09:21:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iL5iZ-0000Mj-R5 for qemu-devel@nongnu.org; Thu, 17 Oct 2019 09:21:28 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:52265) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iL5iZ-0000M0-Kh for qemu-devel@nongnu.org; Thu, 17 Oct 2019 09:21:27 -0400 Received: by mail-wm1-x343.google.com with SMTP id r19so2561941wmh.2 for ; Thu, 17 Oct 2019 06:21:27 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id e9sm11543164wme.3.2019.10.17.06.21.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Oct 2019 06:21:25 -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=We+bFOtG4HDLIryRINVpil47T9Rtk94/5StL1YZ+S34=; b=sm1p9J+UWdsFztZfvPafIqHp2g6sBQ3CVtW5d4OPtsJq308+fAxTstwTvA4uuqnsLC aQ1LmsWEwBfrG3VMCwn2/thu2B6190edOQFAB1sVWUBsjGo2asNeHPFx0EFCwq8Ney4g XGoDtiR6bfs0rNWHJXcV/vJukRmlgq2NSKyZMH/8z/V1Ph8G4V+maAwPDniB+iDivv1k LpuXMKskq/LnWcxPWQ4TXS1/UzOQtXTduyWlNX3EPADLkS/NWaB0pp7So4Mt1DlIxw2C +QZBdTlZeDo7oKeB48B/jXV46K3tJ34qx9I4FprX2Zrfqa/i5RBaEybb3hnRtE/pZqOP Pggg== 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=We+bFOtG4HDLIryRINVpil47T9Rtk94/5StL1YZ+S34=; b=Xvf4AvdvBaUlvFuljEla3NLzUWqMV7jUhwIWaNQ6NVRdR5a/suFNqiuxYWZ806ovRx 9EqTBDVQyIy7Ow4yGpt5nZHqqtPqpj5YHTXcLTjBLPByZa2yOZBdoHK30gyoaKvgX9Vm Pg680cNkKIm3qA8+eQS4LsKFK97VaGoY5dVd98NEVN1B5/gNkgXiELStp1pyXzMP90W6 wmuEa4bne/lnQNnpko5aNLRT+PlMM3aJwyjYlSVu5U6mo0x8LfHO2BK9UOlhv+qFla1B V4i1mhMVhrZWKjJxBZ/te7pZ0kaPqskDNL17kKcGFNSiMr4xEhAvYLlZEQpE22qicgNR 0J9Q== X-Gm-Message-State: APjAAAXk52MrqoqNNomh/AHBDnz1vR+OXa6MZj9sa90+vI7Rn0bf7dlw lsu/X+ajpQSsUKfw9v4SHz3KISse3KsQbQ== X-Google-Smtp-Source: APXvYqwEI0440tYtGdgGBI9YcKj1Qvj1PCUIVxCQpQ6XRG5iY3PFrVJZcSx5cEIA4veWpBJDnPenYw== X-Received: by 2002:a7b:c3d2:: with SMTP id t18mr3069113wmj.66.1571318486414; Thu, 17 Oct 2019 06:21:26 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH 1/3] hw/net/fsl_etsec/etsec.c: Switch to transaction-based ptimer API Date: Thu, 17 Oct 2019 14:21:20 +0100 Message-Id: <20191017132122.4402-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191017132122.4402-1-peter.maydell@linaro.org> References: <20191017132122.4402-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::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: Jason Wang , Alistair Francis , qemu-arm@nongnu.org, qemu-ppc@nongnu.org, "Edgar E. Iglesias" , David Gibson 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 fsl_etsec 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: Alistair Francis Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/net/fsl_etsec/etsec.h | 1 - hw/net/fsl_etsec/etsec.c | 9 +++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/net/fsl_etsec/etsec.h b/hw/net/fsl_etsec/etsec.h index 09d05c21338..7951c3ad65f 100644 --- a/hw/net/fsl_etsec/etsec.h +++ b/hw/net/fsl_etsec/etsec.h @@ -141,7 +141,6 @@ typedef struct eTSEC { uint16_t phy_control; =20 /* Polling */ - QEMUBH *bh; struct ptimer_state *ptimer; =20 /* Whether we should flush the rx queue when buffer becomes available.= */ diff --git a/hw/net/fsl_etsec/etsec.c b/hw/net/fsl_etsec/etsec.c index d9b3e8c691e..717de76569a 100644 --- a/hw/net/fsl_etsec/etsec.c +++ b/hw/net/fsl_etsec/etsec.c @@ -34,7 +34,6 @@ #include "etsec.h" #include "registers.h" #include "qemu/log.h" -#include "qemu/main-loop.h" #include "qemu/module.h" =20 /* #define HEX_DUMP */ @@ -195,9 +194,11 @@ static void write_dmactrl(eTSEC *etsec, =20 if (!(value & DMACTRL_WOP)) { /* Start polling */ + ptimer_transaction_begin(etsec->ptimer); ptimer_stop(etsec->ptimer); ptimer_set_count(etsec->ptimer, 1); ptimer_run(etsec->ptimer, 1); + ptimer_transaction_commit(etsec->ptimer); } } =20 @@ -391,10 +392,10 @@ static void etsec_realize(DeviceState *dev, Error **e= rrp) object_get_typename(OBJECT(dev)), dev->id, e= tsec); qemu_format_nic_info_str(qemu_get_queue(etsec->nic), etsec->conf.macad= dr.a); =20 - - etsec->bh =3D qemu_bh_new(etsec_timer_hit, etsec); - etsec->ptimer =3D ptimer_init_with_bh(etsec->bh, PTIMER_POLICY_DEFAULT= ); + etsec->ptimer =3D ptimer_init(etsec_timer_hit, etsec, PTIMER_POLICY_DE= FAULT); + ptimer_transaction_begin(etsec->ptimer); ptimer_set_freq(etsec->ptimer, 100); + ptimer_transaction_commit(etsec->ptimer); } =20 static void etsec_instance_init(Object *obj) --=20 2.20.1