From patchwork Mon Jan 22 03:41:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 125315 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp949219ljf; Sun, 21 Jan 2018 20:04:08 -0800 (PST) X-Google-Smtp-Source: AH8x226YBoub0rEtBFYafwZqp6oexTmJcskXsKqtceIxuIID4cuRXZHCS+TzauqDI2fOG/fgz+Jw X-Received: by 10.129.108.2 with SMTP id h2mr6212988ywc.445.1516593848539; Sun, 21 Jan 2018 20:04:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516593848; cv=none; d=google.com; s=arc-20160816; b=E7iVX4jb3W1stpOifXrs51jWv7spCJ1v6CJsAyri8Eq7+xb/2wrmgYG6WfH9tJKyGY 05U4GM9Xr4YETKHBm8iFEpNFzWxLkC6EeNRFuUMYLwPf1PmPWIAiFqxw7IyDOWuD6zIo tLC/FbwghDHu1p1Kiz80XFxIGOsKDEeBNmjC1dkgfCwyO8EsRInDfwiyw6j80X+RCak9 b1hRUNpf8jt7GSvRU2BSEltgXig0nAKmwCesaBa/I0Ypoq4Sm5OUHe2eGQIKSNKS7w3C RJ5y9tzcOpnNffYaRp2b62Edtj7/WeO3Kk0B/x9u2D2qDCZR/3221yeJwDzJLYiU6u3t jLnA== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=YPEFO9LPohXVn9BoGQ5BmL2jQ6ehS0wU1b426MxvHpg=; b=E71w/UWeBH8Ayq0nXVpPF+Q6xCPBENC+pStTyYL7qkIZRlL0s+vPf7EvYDMbwCkabe 7lso0iU3p7pfmqb4ySlv65xZZq+3e7G1yQc7zrW4YfTCS4CFNPTgHy5Jip5Tm7n2ItSJ nBO/mCxQlUzxJ3OmywBFxq+4Bx8S4w3Wa2R3ZQpPyLh3CKb3PzgUzyEJ6x7lBP6hkeXe ZR8Ddfi9CQTmKFjtptQwbdnn3JMxGwaFpdUsntzzfgRuW+becNaxvR4NTXWIatZccYPn hvGIKgWY5qRs1sN/EGjw0cyAkU/DUWxCRhX6Pel59Uf/DnVla0DO+wld0Ovp+b1Fdg6Q Y/UA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=cfbJXKRz; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id r17si1809972ybj.258.2018.01.21.20.04.08 for (version=TLS1 cipher=AES128-SHA bits=128/128); Sun, 21 Jan 2018 20:04:08 -0800 (PST) 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; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=cfbJXKRz; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:41749 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edTL5-0003nq-VR for patch@linaro.org; Sun, 21 Jan 2018 23:04:08 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60268) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edT0X-0005dT-Mv for qemu-devel@nongnu.org; Sun, 21 Jan 2018 22:42:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1edT0T-0006Wy-Be for qemu-devel@nongnu.org; Sun, 21 Jan 2018 22:42:53 -0500 Received: from mail-pf0-x243.google.com ([2607:f8b0:400e:c00::243]:35397) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1edT0T-0006WQ-3E for qemu-devel@nongnu.org; Sun, 21 Jan 2018 22:42:49 -0500 Received: by mail-pf0-x243.google.com with SMTP id t12so6084237pfg.2 for ; Sun, 21 Jan 2018 19:42:48 -0800 (PST) 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; bh=YPEFO9LPohXVn9BoGQ5BmL2jQ6ehS0wU1b426MxvHpg=; b=cfbJXKRzO/Cea2TBT/pW/wr43AHRERlewBp8mfZ+mVku/w5SwnDVrK7HycGN8keZ9t o7j4IKQDTxbjKgeI6Q5S++yXGEnOtr1O4edgsc0ehRzMCc2FnMcYHl0tUlm+a+DGdz88 JrfgwstW1a40r1E8D6/n4vpbF47a0lvOxd0Jw= 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; bh=YPEFO9LPohXVn9BoGQ5BmL2jQ6ehS0wU1b426MxvHpg=; b=XB+EF77r5CZkqHK1jIUp0icqEiFupDxa/WMpDehkzNqb3Lyng3cj2C+JvWsnB7G2Gk qcwgF+qGdKWWMXdfjSXqU1RR6A89f7+rww/2VJINqzE2nojyo1m3NvcDsXTWP4rTGLsL HFnAHJF/50gbPmDmeFv76Nfx89X0U+YhnMrRUoMxapFQ3KmPaHoo3B8bArf4ToA+3CyL ZMGHRAMFM6sHKPpzP/nAXREzsSPvXWLuOGg73ETcXRg8WkIQIKLZXq1Ghfz2ZXXpvEUX F5f8mpdTkfs1XjFAYvEwEGA7xps33jDptJt3f1IpJnEU8MrbnsJuSHLcywnq4rmWGzvY cJVA== X-Gm-Message-State: AKwxytfei8GnkqhmsjcdkYEzTP/znOjyfuYOAdd96wGxUC462ts4d5Ub v/VZoc4WDDY4JPUqCnq6LFASefXVQZQ= X-Received: by 10.99.171.78 with SMTP id k14mr6013963pgp.287.1516592567696; Sun, 21 Jan 2018 19:42:47 -0800 (PST) Received: from cloudburst.twiddle.net (174-21-6-47.tukw.qwest.net. [174.21.6.47]) by smtp.gmail.com with ESMTPSA id z125sm182023pfz.27.2018.01.21.19.42.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 21 Jan 2018 19:42:46 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 21 Jan 2018 19:41:53 -0800 Message-Id: <20180122034217.19593-20-richard.henderson@linaro.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180122034217.19593-1-richard.henderson@linaro.org> References: <20180122034217.19593-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::243 Subject: [Qemu-devel] [PULL 19/43] target/hppa: Implement the interval timer 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: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Richard Henderson --- target/hppa/cpu.h | 2 ++ target/hppa/helper.h | 3 +++ target/hppa/cpu.c | 8 ++++++++ target/hppa/int_helper.c | 6 ++++++ target/hppa/op_helper.c | 36 ++++++++++++++++++++++++++++++++++++ target/hppa/translate.c | 16 ++++++++++++---- 6 files changed, 67 insertions(+), 4 deletions(-) -- 2.14.3 diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h index fc3e62c0af..31a3702684 100644 --- a/target/hppa/cpu.h +++ b/target/hppa/cpu.h @@ -234,6 +234,7 @@ struct HPPACPU { /*< public >*/ CPUHPPAState env; + QEMUTimer *alarm_timer; }; static inline HPPACPU *hppa_env_get_cpu(CPUHPPAState *env) @@ -341,6 +342,7 @@ int hppa_cpu_handle_mmu_fault(CPUState *cpu, vaddr address, int rw, int midx); int hppa_get_physical_address(CPUHPPAState *env, vaddr addr, int mmu_idx, MMUAccessType type, hwaddr *pphys, int *pprot); extern const MemoryRegionOps hppa_io_eir_ops; +void hppa_cpu_alarm_timer(void *); #endif #endif /* HPPA_CPU_H */ diff --git a/target/hppa/helper.h b/target/hppa/helper.h index 535f086ab4..744b11cb66 100644 --- a/target/hppa/helper.h +++ b/target/hppa/helper.h @@ -77,9 +77,12 @@ DEF_HELPER_FLAGS_4(fmpynfadd_s, TCG_CALL_NO_RWG, i32, env, i32, i32, i32) DEF_HELPER_FLAGS_4(fmpyfadd_d, TCG_CALL_NO_RWG, i64, env, i64, i64, i64) DEF_HELPER_FLAGS_4(fmpynfadd_d, TCG_CALL_NO_RWG, i64, env, i64, i64, i64) +DEF_HELPER_FLAGS_0(read_interval_timer, TCG_CALL_NO_RWG, tr) + #ifndef CONFIG_USER_ONLY DEF_HELPER_1(rfi, void, env) DEF_HELPER_1(rfi_r, void, env) +DEF_HELPER_FLAGS_2(write_interval_timer, TCG_CALL_NO_RWG, void, env, tr) DEF_HELPER_FLAGS_2(write_eirr, TCG_CALL_NO_RWG, void, env, tr) DEF_HELPER_FLAGS_2(write_eiem, TCG_CALL_NO_RWG, void, env, tr) DEF_HELPER_FLAGS_2(swap_system_mask, TCG_CALL_NO_RWG, tr, env, tr) diff --git a/target/hppa/cpu.c b/target/hppa/cpu.c index 7837d10381..86f5cb0bfe 100644 --- a/target/hppa/cpu.c +++ b/target/hppa/cpu.c @@ -97,6 +97,14 @@ static void hppa_cpu_realizefn(DeviceState *dev, Error **errp) qemu_init_vcpu(cs); acc->parent_realize(dev, errp); + +#ifndef CONFIG_USER_ONLY + { + HPPACPU *cpu = HPPA_CPU(cs); + cpu->alarm_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, + hppa_cpu_alarm_timer, cpu); + } +#endif } /* Sort hppabetically by type name. */ diff --git a/target/hppa/int_helper.c b/target/hppa/int_helper.c index 74ab34f306..ee72769544 100644 --- a/target/hppa/int_helper.c +++ b/target/hppa/int_helper.c @@ -67,6 +67,12 @@ const MemoryRegionOps hppa_io_eir_ops = { .impl.max_access_size = 4, }; +void hppa_cpu_alarm_timer(void *opaque) +{ + /* Raise interrupt 0. */ + io_eir_write(opaque, 0, 0, 4); +} + void HELPER(write_eirr)(CPUHPPAState *env, target_ureg val) { env->cr[CR_EIRR] &= ~val; diff --git a/target/hppa/op_helper.c b/target/hppa/op_helper.c index 1963b2439b..6d19cab6c9 100644 --- a/target/hppa/op_helper.c +++ b/target/hppa/op_helper.c @@ -22,6 +22,8 @@ #include "exec/exec-all.h" #include "exec/helper-proto.h" #include "exec/cpu_ldst.h" +#include "qemu/timer.h" + void QEMU_NORETURN HELPER(excp)(CPUHPPAState *env, int excp) { @@ -602,7 +604,41 @@ float64 HELPER(fmpynfadd_d)(CPUHPPAState *env, float64 a, float64 b, float64 c) return ret; } +target_ureg HELPER(read_interval_timer)(void) +{ +#ifdef CONFIG_USER_ONLY + /* In user-mode, QEMU_CLOCK_VIRTUAL doesn't exist. + Just pass through the host cpu clock ticks. */ + return cpu_get_host_ticks(); +#else + /* In system mode we have access to a decent high-resolution clock. + In order to make OS-level time accounting work with the cr16, + present it with a well-timed clock fixed at 250MHz. */ + return qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) >> 2; +#endif +} + #ifndef CONFIG_USER_ONLY +void HELPER(write_interval_timer)(CPUHPPAState *env, target_ureg val) +{ + HPPACPU *cpu = hppa_env_get_cpu(env); + uint64_t current = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); + uint64_t timeout; + + /* Even in 64-bit mode, the comparator is always 32-bit. But the + value we expose to the guest is 1/4 of the speed of the clock, + so moosh in 34 bits. */ + timeout = deposit64(current, 0, 34, (uint64_t)val << 2); + + /* If the mooshing puts the clock in the past, advance to next round. */ + if (timeout < current + 1000) { + timeout += 1ULL << 34; + } + + cpu->env.cr[CR_IT] = timeout; + timer_mod(cpu->alarm_timer, timeout); +} + target_ureg HELPER(swap_system_mask)(CPUHPPAState *env, target_ureg nsm) { target_ulong psw = env->psw; diff --git a/target/hppa/translate.c b/target/hppa/translate.c index cac21dbe2f..cad661e39f 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -2027,6 +2027,7 @@ static DisasJumpType trans_mfctl(DisasContext *ctx, uint32_t insn, unsigned rt = extract32(insn, 0, 5); unsigned ctl = extract32(insn, 21, 5); TCGv_reg tmp; + DisasJumpType ret; switch (ctl) { case CR_SAR: @@ -2045,9 +2046,17 @@ static DisasJumpType trans_mfctl(DisasContext *ctx, uint32_t insn, /* FIXME: Respect PSW_S bit. */ nullify_over(ctx); tmp = dest_gpr(ctx, rt); - tcg_gen_movi_reg(tmp, 0); /* FIXME */ + if (ctx->base.tb->cflags & CF_USE_ICOUNT) { + gen_io_start(); + gen_helper_read_interval_timer(tmp); + gen_io_end(); + ret = DISAS_IAQ_N_STALE; + } else { + gen_helper_read_interval_timer(tmp); + ret = DISAS_NEXT; + } save_gpr(ctx, rt, tmp); - break; + return nullify_end(ctx, ret); case 26: case 27: break; @@ -2121,9 +2130,8 @@ static DisasJumpType trans_mtctl(DisasContext *ctx, uint32_t insn, nullify_over(ctx); switch (ctl) { case CR_IT: - /* ??? modify interval timer offset */ + gen_helper_write_interval_timer(cpu_env, reg); break; - case CR_EIRR: gen_helper_write_eirr(cpu_env, reg); break;