From nobody Tue Feb 10 15:46:21 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1518407592470564.3094679059767; Sun, 11 Feb 2018 19:53:12 -0800 (PST) Received: from localhost ([::1]:34425 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1el5B1-0000RB-JV for importer@patchew.org; Sun, 11 Feb 2018 22:53:11 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45001) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1el4zN-0007ib-J6 for qemu-devel@nongnu.org; Sun, 11 Feb 2018 22:41:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1el4zL-0006Bp-ED for qemu-devel@nongnu.org; Sun, 11 Feb 2018 22:41:09 -0500 Received: from ozlabs.org ([103.22.144.67]:51027) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1el4zK-00068J-O7; Sun, 11 Feb 2018 22:41:07 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 3zfrzt4bqGz9t3n; Mon, 12 Feb 2018 14:40:57 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1518406858; bh=vqJ2YK7yEhUYagvuiWrtEFfhwm8qn+GOMLmmxxLgeTo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C0nUK7+K5XS2Gdoc9Pvc6H8pKmObIhXTobEWsUvenMLCllrH8WqvXRQXx89A2Pqb1 L7wn/qIX+Cccdf2DqJhhEetrk7kdgXK2OSKAmisHbOpWsgAt62wN+XookALpEOxQ1K Z19n6CKkdey2a641w8KNtjDeAszENex8gXAmvZfE= From: David Gibson To: peter.maydell@linaro.org Date: Mon, 12 Feb 2018 14:40:48 +1100 Message-Id: <20180212034054.23441-7-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180212034054.23441-1-david@gibson.dropbear.id.au> References: <20180212034054.23441-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 103.22.144.67 Subject: [Qemu-devel] [PULL 06/12] cuda: introduce CUDAState parameter to get_counter() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, mark.cave-ayland@ilande.co.uk, groug@kaod.org, qemu-devel@nongnu.org, qemu-ppc@nongnu.org, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" From: Mark Cave-Ayland This will be required shortly and also happens to match nicely with the corresponding signature for set_counter(). Signed-off-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: David Gibson --- hw/misc/macio/cuda.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/misc/macio/cuda.c b/hw/misc/macio/cuda.c index eaa8924f49..fa10b6d0c1 100644 --- a/hw/misc/macio/cuda.c +++ b/hw/misc/macio/cuda.c @@ -150,7 +150,7 @@ static uint64_t get_tb(uint64_t time, uint64_t freq) return muldiv64(time, freq, NANOSECONDS_PER_SECOND); } =20 -static unsigned int get_counter(CUDATimer *ti) +static unsigned int get_counter(CUDAState *s, CUDATimer *ti) { int64_t d; unsigned int counter; @@ -295,12 +295,12 @@ static uint64_t cuda_read(void *opaque, hwaddr addr, = unsigned size) val =3D s->dira; break; case CUDA_REG_T1CL: - val =3D get_counter(&s->timers[0]) & 0xff; + val =3D get_counter(s, &s->timers[0]) & 0xff; s->ifr &=3D ~T1_INT; cuda_update_irq(s); break; case CUDA_REG_T1CH: - val =3D get_counter(&s->timers[0]) >> 8; + val =3D get_counter(s, &s->timers[0]) >> 8; cuda_update_irq(s); break; case CUDA_REG_T1LL: @@ -311,12 +311,12 @@ static uint64_t cuda_read(void *opaque, hwaddr addr, = unsigned size) val =3D (s->timers[0].latch >> 8) & 0xff; break; case CUDA_REG_T2CL: - val =3D get_counter(&s->timers[1]) & 0xff; + val =3D get_counter(s, &s->timers[1]) & 0xff; s->ifr &=3D ~T2_INT; cuda_update_irq(s); break; case CUDA_REG_T2CH: - val =3D get_counter(&s->timers[1]) >> 8; + val =3D get_counter(s, &s->timers[1]) >> 8; break; case CUDA_REG_SR: val =3D s->sr; --=20 2.14.3