Received: by 2002:adf:ef42:0:0:0:0:0 with SMTP id c2csp587095wrp; Wed, 18 Sep 2019 22:58:01 -0700 (PDT) X-Google-Smtp-Source: APXvYqyv79S9cJkvzQtmL69fGo2980C/lIw9o0ibL78pJhYgFGtWdIcLc6yBr+RWBy+rv6Y8JfHc X-Received: by 2002:ac8:3a86:: with SMTP id x6mr1500555qte.316.1568872681840; Wed, 18 Sep 2019 22:58:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568872681; cv=none; d=google.com; s=arc-20160816; b=jq8yq5nh+0MhYL3eC8J0dmycnSzAx0yZbPoKYLvI88Hk3RFA1ZoprTolwLcJLhqauu O5K39R6VVjqx1wxsvUBnOr8K3doruS9uaEmkpyjHpW5f3aH0oT0DkWZhq2KOoAcN3+Yg TCwYDNdYH2Oz2xBxQCJsb0OZKV/SjJrIjaH4O+X6WS+/Q8ryxdoi1Z3UydeQaAYgAnXj RG8rdsbjtUYVC5Adq2BhMAIwpCHRgH3T3xPbJgllYcw0epcTg1jgo6u5wgnGd6kFyMTf wDMdFkCGbuH708CLAzrxDKuNfeWF2ODrLcDAQ8nDEM8F5bEt0XHTk/Gehw63yBRE/ovw mQHg== 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:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from; bh=RSuS1ug1PeRKK+uvesAQPiP0wIBYvM+rUaxDl3Pt8/o=; b=yOhJFS891U0OlwsivvZGrTythW/fCQLkIcqv700Xis2tdUYlK3JBrUsLHtGpVAKPv1 UowV47TSrdipjlMtiphca7LND7G5lVGBRKQNiWQfzZLRXwbgQ8JO66qfHx4pt20NwMcA BfCAgbs96K5n55/jTw7k07OxAQMTJ9H8fafj8kukgYX4/QPAkFHFUWzhzDPBFMMKDJR4 oLLxo/Up14Lcuh60BgKq63XuuGSMQFUcyCi0rsliSh5r6OCUiTkhHaSRpsZFxIS0idK0 4ObHNchCUtJbSeMsUdVzJ3vCPfNvqotxOEvOKC/bQogzFYmkMHc/pQrrMsOu2nDZF+xH jrrg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id c78si563724qkb.296.2019.09.18.22.58.01 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 18 Sep 2019 22:58:01 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org" Received: from localhost ([::1]:37890 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iApS4-0000w9-JB for alex.bennee@linaro.org; Thu, 19 Sep 2019 01:58:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42427) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iApL8-0000uO-G6 for qemu-arm@nongnu.org; Thu, 19 Sep 2019 01:50:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iApL7-0007s5-5z for qemu-arm@nongnu.org; Thu, 19 Sep 2019 01:50:50 -0400 Received: from 10.mo5.mail-out.ovh.net ([46.105.52.148]:57372) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iApL7-0007rG-1C for qemu-arm@nongnu.org; Thu, 19 Sep 2019 01:50:49 -0400 Received: from player788.ha.ovh.net (unknown [10.108.57.44]) by mo5.mail-out.ovh.net (Postfix) with ESMTP id B5CF124EFCE for ; Thu, 19 Sep 2019 07:50:47 +0200 (CEST) Received: from kaod.org (lfbn-1-2240-157.w90-76.abo.wanadoo.fr [90.76.60.157]) (Authenticated sender: clg@kaod.org) by player788.ha.ovh.net (Postfix) with ESMTPSA id 3C3D49F173A3; Thu, 19 Sep 2019 05:50:41 +0000 (UTC) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: Peter Maydell Date: Thu, 19 Sep 2019 07:49:46 +0200 Message-Id: <20190919055002.6729-6-clg@kaod.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190919055002.6729-1-clg@kaod.org> References: <20190919055002.6729-1-clg@kaod.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Ovh-Tracer-Id: 1672805790456449809 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedufedrudelgdelhecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 46.105.52.148 Subject: [Qemu-arm] [PATCH 05/21] aspeed/timer: Add support for control register 3 X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Jeffery , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , qemu-arm@nongnu.org, qemu-devel@nongnu.org, Joel Stanley Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: jAn7Rd+aQavn The AST2500 timer has a third control register that is used to implement a set-to-clear feature for the main control register. This models the behaviour expected by the AST2500 while maintaining the same behaviour for the AST2400. The vmstate version is not increased yet because the structure is modified again in the following patches. Based on previous work from Joel Stanley. Signed-off-by: C=C3=A9dric Le Goater --- include/hw/timer/aspeed_timer.h | 1 + hw/timer/aspeed_timer.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/include/hw/timer/aspeed_timer.h b/include/hw/timer/aspeed_ti= mer.h index a791fee276f4..1e0288ebc49f 100644 --- a/include/hw/timer/aspeed_timer.h +++ b/include/hw/timer/aspeed_timer.h @@ -58,6 +58,7 @@ typedef struct AspeedTimerCtrlState { =20 uint32_t ctrl; uint32_t ctrl2; + uint32_t ctrl3; AspeedTimer timers[ASPEED_TIMER_NR_TIMERS]; =20 AspeedSCUState *scu; diff --git a/hw/timer/aspeed_timer.c b/hw/timer/aspeed_timer.c index c78bc1bd2d25..d70e78a0293e 100644 --- a/hw/timer/aspeed_timer.c +++ b/hw/timer/aspeed_timer.c @@ -498,6 +498,8 @@ static uint64_t aspeed_2500_timer_read(AspeedTimerCtr= lState *s, hwaddr offset) =20 switch (offset) { case 0x38: + value =3D s->ctrl3 & BIT(0); + break; case 0x3C: default: qemu_log_mask(LOG_GUEST_ERROR, "%s: Bad offset 0x%" HWADDR_PRIx = "\n", @@ -511,9 +513,24 @@ static uint64_t aspeed_2500_timer_read(AspeedTimerCt= rlState *s, hwaddr offset) static void aspeed_2500_timer_write(AspeedTimerCtrlState *s, hwaddr offs= et, uint64_t value) { + const uint32_t tv =3D (uint32_t)(value & 0xFFFFFFFF); + uint8_t command; + switch (offset) { case 0x38: + command =3D (value >> 1) & 0xFF; + if (command =3D=3D 0xAE) { + s->ctrl3 =3D 0x1; + } else if (command =3D=3D 0xEA) { + s->ctrl3 =3D 0x0; + } + break; case 0x3C: + if (s->ctrl3 & BIT(0)) { + aspeed_timer_set_ctrl(s, s->ctrl & ~tv); + } + break; + default: qemu_log_mask(LOG_GUEST_ERROR, "%s: Bad offset 0x%" HWADDR_PRIx = "\n", __func__, offset); @@ -574,6 +591,7 @@ static void aspeed_timer_reset(DeviceState *dev) } s->ctrl =3D 0; s->ctrl2 =3D 0; + s->ctrl3 =3D 0; } =20 static const VMStateDescription vmstate_aspeed_timer =3D { @@ -597,6 +615,7 @@ static const VMStateDescription vmstate_aspeed_timer_= state =3D { .fields =3D (VMStateField[]) { VMSTATE_UINT32(ctrl, AspeedTimerCtrlState), VMSTATE_UINT32(ctrl2, AspeedTimerCtrlState), + VMSTATE_UINT32(ctrl3, AspeedTimerCtrlState), VMSTATE_STRUCT_ARRAY(timers, AspeedTimerCtrlState, ASPEED_TIMER_NR_TIMERS, 1, vmstate_aspeed_t= imer, AspeedTimer), --=20 2.21.0