From patchwork Sun Jan 28 23:15:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 126120 Delivered-To: patch@linaro.org Received: by 10.46.84.92 with SMTP id y28csp1986816ljd; Sun, 28 Jan 2018 15:43:16 -0800 (PST) X-Google-Smtp-Source: AH8x224KvGturJTRnNzz6ZG+IEBf3oKX8GVgY6yW2C+L1/OpSQ+AgeWvumxXcf2sRdTmD8J+IZg2 X-Received: by 10.129.52.151 with SMTP id b145mr16178389ywa.487.1517182996520; Sun, 28 Jan 2018 15:43:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517182996; cv=none; d=google.com; s=arc-20160816; b=ARn6lKFS6tb4hivHQ8yYDLmUxxrmePV/gXb/ycyLQycmuMjbcAjGOS2Oeb0Gh4Ph7S nv1DmklPp7RG/bu0JA9vdpmQLPxKY6lbRgwOmoXDuNgdxPzVtW0xsvtkKgahs94EXeZo fdreyeXUEoMH7QvhEkAzv6Wjfhki6O3IBxoE+VOUqqCWFMvqNiQMxoYL/slgX1qSlLBw QRZaV40hbi2wYAJYa1EjyXBhKfFLSva5dCcVMdfBPQOz4US9Bg3Zhk22M7vDYs0nHF4k keZHgpZmX3hjIYmfRFXbxaRwW2zq+wufpKjQd/Fi5zXsdEVV2MHgAHLdAigQoAPN54fq PZ+A== 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=qI/Ji4p2Kfz/djZEwJij3SxvPSBvBw2Be/srmKYWaVo=; b=P/G0zm3O+K+OGQZ+fiXzulHgcisUqxSyh/xryOmY92POA3BQ0T73l9V+f2Xz6xVSqH sq7cR1ALDnzVelGAVDHlwd3ii3zXn3348C7cSl5yeTIiYvNTt6GsxUx77GvkxV0xajPy k9KJzrWZmzqaX0RgiFRD1LmjGgiMOpkl9XKwp2c8L3H1NxF3ooqTcGexbIhs2/fsNW0R JidhNr6bfURZKrdTV0EVh3xCBBiIFW6wlYyWbhk0JHAjQ9f1WRtxGSrSOBkHUNkPZ9hF B+APS1Ly7sxTzzRv318V19eR/p+0Tj/Mmu40D5eYMljUb+nVF/MjuJGuWwlQwEJZr7Nj INjg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=aACSlRb1; 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 u10si3421725ybm.595.2018.01.28.15.43.16 for (version=TLS1 cipher=AES128-SHA bits=128/128); Sun, 28 Jan 2018 15:43:16 -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=aACSlRb1; 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]:45083 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1efwbT-00069N-OB for patch@linaro.org; Sun, 28 Jan 2018 18:43:15 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52293) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1efwBT-00036Y-OK for qemu-devel@nongnu.org; Sun, 28 Jan 2018 18:16:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1efwBO-0000GR-Vu for qemu-devel@nongnu.org; Sun, 28 Jan 2018 18:16:23 -0500 Received: from mail-pg0-x243.google.com ([2607:f8b0:400e:c05::243]:43528) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1efwBO-0000Fi-N7 for qemu-devel@nongnu.org; Sun, 28 Jan 2018 18:16:18 -0500 Received: by mail-pg0-x243.google.com with SMTP id n17so2997729pgf.10 for ; Sun, 28 Jan 2018 15:16:18 -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=qI/Ji4p2Kfz/djZEwJij3SxvPSBvBw2Be/srmKYWaVo=; b=aACSlRb1jbHKXKPrnWAC2+D9Dj31Zc91I2IgSakx/XWTD5UDf/eOOMF8MFXEOQqRH3 Oh+CCxgwjb+6KQuC13GbjldVBwOyL8SwLybiB8o0+kEWAmuz5pEfwU3IXrPTEWwCbH1a WMNF5lcRBroME0JkOXlROAOQCHteO1lCJPx5U= 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=qI/Ji4p2Kfz/djZEwJij3SxvPSBvBw2Be/srmKYWaVo=; b=uOzssz5bgHs0FQDAl4BxzvqFUPZIu9Ihda0TccO35Ep0HNy/YKxW2fDECL++geLEfB Zw5LwbxZTLhvi3/uT70LbTGlnAFuR8SSxudkwn3+goQ12oE8QnHFaDJM7lm5tj/3bCbf XANn2p9Yn+DaGuK52q39kHlCqYCEIrHcowoZ7zZ61xGAQPXb5NBEoFPtAEiqlRzlLVOi SWsX6kyTQjpTUmsYYcXDUrGxOk/AuQnaTQX+AMqIu0AGRAz4yUf94XJ84PDPSzc5Sqc3 ByKqwa7uCJK+JKhssUsqxqIf/4dwYiuQ9jI1lUf2XmzU9uzZ3f/BqVAzvP6M2Cp81/// ePhA== X-Gm-Message-State: AKwxyteSuZNxrvWLuBfDOuNS8jxHQgbgarjmJ8mbkQWViS4wnXY7O/57 l3IHsu8ydYswTe3Xg+MYGEQPQzb1Vyo= X-Received: by 2002:a17:902:828b:: with SMTP id y11-v6mr4358418pln.358.1517181377401; Sun, 28 Jan 2018 15:16:17 -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 r27sm26949344pfj.75.2018.01.28.15.16.15 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 28 Jan 2018 15:16:16 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 28 Jan 2018 15:15:15 -0800 Message-Id: <20180128231528.22719-31-richard.henderson@linaro.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180128231528.22719-1-richard.henderson@linaro.org> References: <20180128231528.22719-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:c05::243 Subject: [Qemu-devel] [PULL v4 30/43] target/hppa: Add migration for the cpu 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 | 1 + target/hppa/cpu.c | 1 + target/hppa/machine.c | 181 ++++++++++++++++++++++++++++++++++++++++++++++ target/hppa/Makefile.objs | 1 + 4 files changed, 184 insertions(+) create mode 100644 target/hppa/machine.c -- 2.14.3 diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h index 40700f8425..5fab9e1394 100644 --- a/target/hppa/cpu.h +++ b/target/hppa/cpu.h @@ -352,6 +352,7 @@ int hppa_cpu_handle_mmu_fault(CPUState *cpu, vaddr address, int size, int hppa_get_physical_address(CPUHPPAState *env, vaddr addr, int mmu_idx, int type, hwaddr *pphys, int *pprot); extern const MemoryRegionOps hppa_io_eir_ops; +extern const struct VMStateDescription vmstate_hppa_cpu; void hppa_cpu_alarm_timer(void *); #endif void QEMU_NORETURN hppa_dynamic_excp(CPUHPPAState *env, int excp, uintptr_t ra); diff --git a/target/hppa/cpu.c b/target/hppa/cpu.c index 6be6eb0a7b..5213347720 100644 --- a/target/hppa/cpu.c +++ b/target/hppa/cpu.c @@ -184,6 +184,7 @@ static void hppa_cpu_class_init(ObjectClass *oc, void *data) cc->handle_mmu_fault = hppa_cpu_handle_mmu_fault; #else cc->get_phys_page_debug = hppa_cpu_get_phys_page_debug; + dc->vmsd = &vmstate_hppa_cpu; #endif cc->do_unaligned_access = hppa_cpu_do_unaligned_access; cc->disas_set_info = hppa_cpu_disas_set_info; diff --git a/target/hppa/machine.c b/target/hppa/machine.c new file mode 100644 index 0000000000..8e077788c3 --- /dev/null +++ b/target/hppa/machine.c @@ -0,0 +1,181 @@ +/* + * HPPA interrupt helper routines + * + * Copyright (c) 2017 Richard Henderson + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see . + */ + +#include "qemu/osdep.h" +#include "qemu-common.h" +#include "cpu.h" +#include "hw/hw.h" +#include "hw/boards.h" +#include "migration/cpu.h" + +#if TARGET_REGISTER_BITS == 64 +#define qemu_put_betr qemu_put_be64 +#define qemu_get_betr qemu_get_be64 +#define VMSTATE_UINTTL_V(_f, _s, _v) \ + VMSTATE_UINT64_V(_f, _s, _v) +#define VMSTATE_UINTTL_ARRAY_V(_f, _s, _n, _v) \ + VMSTATE_UINT64_ARRAY_V(_f, _s, _n, _v) +#else +#define qemu_put_betr qemu_put_be32 +#define qemu_get_betr qemu_get_be32 +#define VMSTATE_UINTTR_V(_f, _s, _v) \ + VMSTATE_UINT32_V(_f, _s, _v) +#define VMSTATE_UINTTR_ARRAY_V(_f, _s, _n, _v) \ + VMSTATE_UINT32_ARRAY_V(_f, _s, _n, _v) +#endif + +#define VMSTATE_UINTTR(_f, _s) \ + VMSTATE_UINTTR_V(_f, _s, 0) +#define VMSTATE_UINTTR_ARRAY(_f, _s, _n) \ + VMSTATE_UINTTR_ARRAY_V(_f, _s, _n, 0) + + +static int get_psw(QEMUFile *f, void *opaque, size_t size, VMStateField *field) +{ + CPUHPPAState *env = opaque; + cpu_hppa_put_psw(env, qemu_get_betr(f)); + return 0; +} + +static int put_psw(QEMUFile *f, void *opaque, size_t size, + VMStateField *field, QJSON *vmdesc) +{ + CPUHPPAState *env = opaque; + qemu_put_betr(f, cpu_hppa_get_psw(env)); + return 0; +} + +static const VMStateInfo vmstate_psw = { + .name = "psw", + .get = get_psw, + .put = put_psw, +}; + +/* FIXME: Use the PA2.0 format, which is a superset of the PA1.1 format. */ +static int get_tlb(QEMUFile *f, void *opaque, size_t size, VMStateField *field) +{ + hppa_tlb_entry *ent = opaque; + uint32_t val; + + memset(ent, 0, sizeof(*ent)); + + ent->va_b = qemu_get_be64(f); + ent->pa = qemu_get_betr(f); + val = qemu_get_be32(f); + + ent->entry_valid = extract32(val, 0, 1); + ent->access_id = extract32(val, 1, 18); + ent->u = extract32(val, 19, 1); + ent->ar_pl2 = extract32(val, 20, 2); + ent->ar_pl1 = extract32(val, 22, 2); + ent->ar_type = extract32(val, 24, 3); + ent->b = extract32(val, 27, 1); + ent->d = extract32(val, 28, 1); + ent->t = extract32(val, 29, 1); + + ent->va_e = ent->va_b + TARGET_PAGE_SIZE - 1; + return 0; +} + +static int put_tlb(QEMUFile *f, void *opaque, size_t size, + VMStateField *field, QJSON *vmdesc) +{ + hppa_tlb_entry *ent = opaque; + uint32_t val = 0; + + if (ent->entry_valid) { + val = 1; + val = deposit32(val, 1, 18, ent->access_id); + val = deposit32(val, 19, 1, ent->u); + val = deposit32(val, 20, 2, ent->ar_pl2); + val = deposit32(val, 22, 2, ent->ar_pl1); + val = deposit32(val, 24, 3, ent->ar_type); + val = deposit32(val, 27, 1, ent->b); + val = deposit32(val, 28, 1, ent->d); + val = deposit32(val, 29, 1, ent->t); + } + + qemu_put_be64(f, ent->va_b); + qemu_put_betr(f, ent->pa); + qemu_put_be32(f, val); + return 0; +} + +static const VMStateInfo vmstate_tlb = { + .name = "tlb entry", + .get = get_tlb, + .put = put_tlb, +}; + +static VMStateField vmstate_env_fields[] = { + VMSTATE_UINTTR_ARRAY(gr, CPUHPPAState, 32), + VMSTATE_UINT64_ARRAY(fr, CPUHPPAState, 32), + VMSTATE_UINT64_ARRAY(sr, CPUHPPAState, 8), + VMSTATE_UINTTR_ARRAY(cr, CPUHPPAState, 32), + VMSTATE_UINTTR_ARRAY(cr_back, CPUHPPAState, 2), + VMSTATE_UINTTR_ARRAY(shadow, CPUHPPAState, 7), + + /* Save the architecture value of the psw, not the internally + expanded version. Since this architecture value does not + exist in memory to be stored, this requires a but of hoop + jumping. We want OFFSET=0 so that we effectively pass ENV + to the helper functions, and we need to fill in the name by + hand since there's no field of that name. */ + { + .name = "psw", + .version_id = 0, + .size = sizeof(uint64_t), + .info = &vmstate_psw, + .flags = VMS_SINGLE, + .offset = 0 + }, + + VMSTATE_UINTTR(iaoq_f, CPUHPPAState), + VMSTATE_UINTTR(iaoq_b, CPUHPPAState), + VMSTATE_UINT64(iasq_f, CPUHPPAState), + VMSTATE_UINT64(iasq_b, CPUHPPAState), + + VMSTATE_UINT32(fr0_shadow, CPUHPPAState), + + VMSTATE_ARRAY(tlb, CPUHPPAState, ARRAY_SIZE(((CPUHPPAState *)0)->tlb), + 0, vmstate_tlb, hppa_tlb_entry), + VMSTATE_UINT32(tlb_last, CPUHPPAState), + + VMSTATE_END_OF_LIST() +}; + +static const VMStateDescription vmstate_env = { + .name = "env", + .version_id = 1, + .minimum_version_id = 1, + .fields = vmstate_env_fields, +}; + +static VMStateField vmstate_cpu_fields[] = { + VMSTATE_CPU(), + VMSTATE_STRUCT(env, HPPACPU, 1, vmstate_env, CPUHPPAState), + VMSTATE_END_OF_LIST() +}; + +const VMStateDescription vmstate_hppa_cpu = { + .name = "cpu", + .version_id = 1, + .minimum_version_id = 1, + .fields = vmstate_cpu_fields, +}; diff --git a/target/hppa/Makefile.objs b/target/hppa/Makefile.objs index dcd60a6839..3359da5341 100644 --- a/target/hppa/Makefile.objs +++ b/target/hppa/Makefile.objs @@ -1,2 +1,3 @@ obj-y += translate.o helper.o cpu.o op_helper.o gdbstub.o mem_helper.o obj-y += int_helper.o +obj-$(CONFIG_SOFTMMU) += machine.o