From patchwork Mon May 18 19:15:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 48702 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f71.google.com (mail-wg0-f71.google.com [74.125.82.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id AB54C214BA for ; Mon, 18 May 2015 19:16:51 +0000 (UTC) Received: by wgwl7 with SMTP id l7sf11892602wgw.0 for ; Mon, 18 May 2015 12:16:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=lkJicdhdcyQvUAgr3f5kVJASIedtwwbciZasx2M+OaE=; b=AuNg1XOWyY9JKBVxzWS/WuA0qOKuBBYASsINPH9sKEw7tMTGKyH8Nw1lkz6zABeKjA nevXnqoF2xhKeeOSF5Zr4EpqwVainrFDNJGSk+XQSWNQrIbNm7ZRGOXTRn9fPsgWanNo nUETIXEFPi5/Sv3VZnlzfIKc93DUlKet1n1l875nBbVPhjXC16sZ5wdphrfjp1Xbinqg isucV/QD60qJmM7miWv9O4fT2ZcBrg4euz6QjoB08BpLSqs3MjH9PzHDmnwqFDeYrGSA ZyAkAQk7lpwLAg/WDfi6ysc0v6WVY5KJ7Ohk+0drqnR/MYZpMhLM6voB6uxwpGR6Jm7A HjlA== X-Gm-Message-State: ALoCoQng+byTpgbQUyYQC7KkVGYUJELurn7pE/LGVBgbY5k+5B3l1WSrXQWVgLem9Ir2MFLfsdVj X-Received: by 10.112.83.172 with SMTP id r12mr7672749lby.23.1431976610938; Mon, 18 May 2015 12:16:50 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.207.65 with SMTP id lu1ls734814lac.104.gmail; Mon, 18 May 2015 12:16:50 -0700 (PDT) X-Received: by 10.152.43.110 with SMTP id v14mr18358308lal.4.1431976610792; Mon, 18 May 2015 12:16:50 -0700 (PDT) Received: from mail-la0-f43.google.com (mail-la0-f43.google.com. [209.85.215.43]) by mx.google.com with ESMTPS id pf2si7289108lbc.2.2015.05.18.12.16.50 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 May 2015 12:16:50 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.43 as permitted sender) client-ip=209.85.215.43; Received: by lagr1 with SMTP id r1so152692730lag.0 for ; Mon, 18 May 2015 12:16:50 -0700 (PDT) X-Received: by 10.112.199.133 with SMTP id jk5mr19032403lbc.32.1431976610703; Mon, 18 May 2015 12:16:50 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp280441lbb; Mon, 18 May 2015 12:16:49 -0700 (PDT) X-Received: by 10.55.56.205 with SMTP id f196mr32901112qka.68.1431976607598; Mon, 18 May 2015 12:16:47 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id n74si11209942qgd.119.2015.05.18.12.16.46 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 18 May 2015 12:16:47 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:42640 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YuQWs-0002ic-30 for patch@linaro.org; Mon, 18 May 2015 15:16:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42345) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YuQVf-0001X3-8h for qemu-devel@nongnu.org; Mon, 18 May 2015 15:15:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YuQVe-0008VP-4F for qemu-devel@nongnu.org; Mon, 18 May 2015 15:15:31 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:34173) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YuQVd-0008QT-Ny for qemu-devel@nongnu.org; Mon, 18 May 2015 15:15:29 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1YuQVW-0007vX-6z for qemu-devel@nongnu.org; Mon, 18 May 2015 20:15:22 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 18 May 2015 20:15:19 +0100 Message-Id: <1431976521-30352-20-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1431976521-30352-1-git-send-email-peter.maydell@linaro.org> References: <1431976521-30352-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Subject: [Qemu-devel] [PULL 19/21] target-arm: Correct accessfn for CNTP_{CT}VAL_EL0 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.43 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: "Edgar E. Iglesias" Signed-off-by: Edgar E. Iglesias Message-id: 1431499963-1019-2-git-send-email-edgar.iglesias@gmail.com Signed-off-by: Peter Maydell --- target-arm/helper.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target-arm/helper.c b/target-arm/helper.c index 86011d5..b6d2310 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -1353,6 +1353,7 @@ static const ARMCPRegInfo generic_timer_cp_reginfo[] = { { .name = "CNTP_TVAL_EL0", .state = ARM_CP_STATE_AA64, .opc0 = 3, .opc1 = 3, .crn = 14, .crm = 2, .opc2 = 0, .type = ARM_CP_NO_RAW | ARM_CP_IO, .access = PL1_RW | PL0_R, + .accessfn = gt_ptimer_access, .readfn = gt_tval_read, .writefn = gt_tval_write, }, { .name = "CNTV_TVAL", .cp = 15, .crn = 14, .crm = 3, .opc1 = 0, .opc2 = 0, @@ -1401,7 +1402,7 @@ static const ARMCPRegInfo generic_timer_cp_reginfo[] = { .access = PL1_RW | PL0_R, .type = ARM_CP_IO, .fieldoffset = offsetof(CPUARMState, cp15.c14_timer[GTIMER_PHYS].cval), - .resetvalue = 0, .accessfn = gt_vtimer_access, + .resetvalue = 0, .accessfn = gt_ptimer_access, .writefn = gt_cval_write, .raw_writefn = raw_write, }, { .name = "CNTV_CVAL", .cp = 15, .crm = 14, .opc1 = 3,