From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.4 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4871CECE58D for ; Thu, 17 Oct 2019 22:13:31 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0E58321D7A for ; Thu, 17 Oct 2019 22:13:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="fZ2d9c4M" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0E58321D7A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:33050 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLE1S-00045i-5u for qemu-devel@archiver.kernel.org; Thu, 17 Oct 2019 18:13:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34173) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLDtj-0002Kx-K8 for qemu-devel@nongnu.org; Thu, 17 Oct 2019 18:05:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iLDti-0006nP-CT for qemu-devel@nongnu.org; Thu, 17 Oct 2019 18:05:31 -0400 Received: from mail-lj1-x244.google.com ([2a00:1450:4864:20::244]:39085) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iLDti-0006k0-5F; Thu, 17 Oct 2019 18:05:30 -0400 Received: by mail-lj1-x244.google.com with SMTP id y3so4139131ljj.6; Thu, 17 Oct 2019 15:05:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=fXhMR+KY7Gl4gPZbUDX1MnG1q3fxMVAulACdibgLvQY=; b=fZ2d9c4MGEVeAOmZ3S4OMdWO8lP5RTJAZ372Z9EhYQFLlCNSSvr+3p938LWZ7ivuVm 6zHzgld1e2PEVmC+XUPr31MLqBGHJwp+r+9HSyFKS4smpO2mo/QuiN9TOv6QTV6VLLVl +J578HUrWChVCcia1py+3I4Z3RWWsgGmUcEco0a6vNGPch+YEKPJFGJvVmyK/odFJPBY JPj5m2C9+jo4hnKLSB+hzImq1j/UBK6+tY4tNPb7OPOO2W4idEd41waPZ/1xGJ+yfnlJ E3JAXLTqEEhYFXCegeVL6YaGk/LJNkDldRemaEuB9LQEc6JHArgoeRPHHFo3FDepnDpc Sikw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=fXhMR+KY7Gl4gPZbUDX1MnG1q3fxMVAulACdibgLvQY=; b=uORAg5L1vJAL0NdL7bJ/Mb9G2kQ864VoT8CVOJx+Gvq5w28PhCPK8QaZ3bfIV1xgaE p9AhmsTyZ6hU3Kkv5uZmvPXaqKFmikVJrbJImrS6y17dNAFgqs4h3xM9fq3FhAVCapT/ f3JZLTiKcBKQq1VEEAHYjmBtLN2ofFOecoUZGqjWVTTPzigRQ/OtFC4VmwlBtNztEWyz pt9anclGB/ZSkmPSI5SZ09s+HYfl18TkaJIgzpkbLfoZoNy4lM8e7APCXb06AbgwqJQT eDTT4iU1UFPC/y953qlNkSf/Q0CJ3SHLudChdvER3S3g2KWLxA7sLb2YiLbwhdW46sbq 3fsQ== X-Gm-Message-State: APjAAAW+HY9oILIK5OEv/J7Y87qQSRQUh7Wyyd+4ncMVtcJQj2bwI+uP QvWQzfdmjhqiv1ChRZYHN8a+t6bHkDgn5jcqrnQ= X-Google-Smtp-Source: APXvYqwvulMrqcFJ4ht6pmNyZ/OAA4okon3zcjPwq/ki0utQatdd/53z0pw8ChMgNFcYLKpFAxNGQY2vTgL+f7WCZiM= X-Received: by 2002:a2e:894b:: with SMTP id b11mr3922885ljk.152.1571349926910; Thu, 17 Oct 2019 15:05:26 -0700 (PDT) MIME-Version: 1.0 References: <20191017132122.4402-1-peter.maydell@linaro.org> <20191017132122.4402-2-peter.maydell@linaro.org> In-Reply-To: <20191017132122.4402-2-peter.maydell@linaro.org> From: Alistair Francis Date: Thu, 17 Oct 2019 15:00:17 -0700 Message-ID: Subject: Re: [PATCH 1/3] hw/net/fsl_etsec/etsec.c: Switch to transaction-based ptimer API To: Peter Maydell Content-Type: text/plain; charset="UTF-8" X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::244 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-devel@nongnu.org Developers" , qemu-arm , "open list:New World" , "Edgar E. Iglesias" , David Gibson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Thu, Oct 17, 2019 at 6:42 AM Peter Maydell wrote: > > 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 Alistair > --- > 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; > > /* Polling */ > - QEMUBH *bh; > struct ptimer_state *ptimer; > > /* 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" > > /* #define HEX_DUMP */ > @@ -195,9 +194,11 @@ static void write_dmactrl(eTSEC *etsec, > > 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); > } > } > > @@ -391,10 +392,10 @@ static void etsec_realize(DeviceState *dev, Error **errp) > object_get_typename(OBJECT(dev)), dev->id, etsec); > qemu_format_nic_info_str(qemu_get_queue(etsec->nic), etsec->conf.macaddr.a); > > - > - etsec->bh = qemu_bh_new(etsec_timer_hit, etsec); > - etsec->ptimer = ptimer_init_with_bh(etsec->bh, PTIMER_POLICY_DEFAULT); > + etsec->ptimer = ptimer_init(etsec_timer_hit, etsec, PTIMER_POLICY_DEFAULT); > + ptimer_transaction_begin(etsec->ptimer); > ptimer_set_freq(etsec->ptimer, 100); > + ptimer_transaction_commit(etsec->ptimer); > } > > static void etsec_instance_init(Object *obj) > -- > 2.20.1 > >