Bug fixes: * memory encryption: Disable mem merge (Dr. David Alan Gilbert) Features: * New EPYC CPU definitions (Babu Moger) * Denventon-v2 CPU model (Tao Xu) * New 'note' field on versioned CPU models (Tao Xu) Cleanups: * x86 CPU topology cleanups (Babu Moger) * cpu: Use DeviceClass reset instead of a special CPUClass reset (Peter Maydell) -----BEGIN PGP SIGNATURE----- iQJIBAABCAAyFiEEWjIv1avE09usz9GqKAeTb5hNxaYFAl5xdnsUHGVoYWJrb3N0 QHJlZGhhdC5jb20ACgkQKAeTb5hNxaYkGA/9Fn1tCdW/74CEREPbcKNOf8twmCr2 L4qykix7mFcZXstFhEQuoNJQMz8mEPJngOfUSQY1c9w4psf0AXE6q3wbdNcxxdj1 1/+cPbaRuoF8EKw63MgR3AaReuWtAV+sGS4+eKBMJTMUbl03pOYARE+irCWJU6rd YdP0t6CX0NWF4afv+2wMeeZVr+IcKEo81jCCCSjmM0YLkwvu0Vs5ng3jE7vtFKPj MQHMyqD/lz0FwyksBiOLwjOCbnmIydWc/8VV68UH5ulxka96jk8CwmI0+A9v2UMQ 4PjQ84UeQclJTbec+h/Qy8DoCP3qiqijFMRau2wo1UWCsAjMcaRIJjIe5CSOJFRu 3FrP2FEJCZiWjh11b/x3jIyjK6MDjv3Y1oky1j5VkCnFUNLHbXUA2KY3jaZ/pf+1 BDqa6lNDYJBN+FQQt0yXDWAdGLUxxP87S9jmU9RULzwAwCic0FxVR/a5zk9EUDi0 mA+WL0ekfhIEVACdHYuCTxujGq8QnGiCppr1Wgx3t+GgveR8AjXdd/KclcKskYiw ozbujtBPQUImuq3xi6FTkRHXuEW+zc+IFbhZ3Zq5OhmJmpdgmSHryFcKAdvNJH/z VllKAsLg1hffm+PjlpuZLBucC4PBrvHbS7htHhMaemEiJHO9V5EfGDWQdELNRM8p sKymFNs5XjzQcGE= =9fEL -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/ehabkost/tags/x86-and-machine-pull-request' into staging x86 and machine queue for 5.0 soft freeze Bug fixes: * memory encryption: Disable mem merge (Dr. David Alan Gilbert) Features: * New EPYC CPU definitions (Babu Moger) * Denventon-v2 CPU model (Tao Xu) * New 'note' field on versioned CPU models (Tao Xu) Cleanups: * x86 CPU topology cleanups (Babu Moger) * cpu: Use DeviceClass reset instead of a special CPUClass reset (Peter Maydell) # gpg: Signature made Wed 18 Mar 2020 01:16:43 GMT # gpg: using RSA key 5A322FD5ABC4D3DBACCFD1AA2807936F984DC5A6 # gpg: issuer "ehabkost@redhat.com" # gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>" [full] # Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6 * remotes/ehabkost/tags/x86-and-machine-pull-request: hw/i386: Rename apicid_from_topo_ids to x86_apicid_from_topo_ids hw/i386: Update structures to save the number of nodes per package hw/i386: Remove unnecessary initialization in x86_cpu_new machine: Add SMP Sockets in CpuTopology hw/i386: Consolidate topology functions hw/i386: Introduce X86CPUTopoInfo to contain topology info cpu: Use DeviceClass reset instead of a special CPUClass reset machine/memory encryption: Disable mem merge hw/i386: Rename X86CPUTopoInfo structure to X86CPUTopoIDs i386: Add 2nd Generation AMD EPYC processors i386: Add missing cpu feature bits in EPYC model target/i386: Add new property note to versioned CPU models target/i386: Add Denverton-v2 (no MPX) CPU model Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
226 lines
6.2 KiB
C
226 lines
6.2 KiB
C
/*
|
|
* QEMU Nios II CPU
|
|
*
|
|
* Copyright (c) 2012 Chris Wulff <crwulff@gmail.com>
|
|
*
|
|
* 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.1 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
|
|
* <http://www.gnu.org/licenses/lgpl-2.1.html>
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "qemu/module.h"
|
|
#include "qapi/error.h"
|
|
#include "cpu.h"
|
|
#include "exec/log.h"
|
|
#include "exec/gdbstub.h"
|
|
#include "hw/qdev-properties.h"
|
|
|
|
static void nios2_cpu_set_pc(CPUState *cs, vaddr value)
|
|
{
|
|
Nios2CPU *cpu = NIOS2_CPU(cs);
|
|
CPUNios2State *env = &cpu->env;
|
|
|
|
env->regs[R_PC] = value;
|
|
}
|
|
|
|
static bool nios2_cpu_has_work(CPUState *cs)
|
|
{
|
|
return cs->interrupt_request & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_NMI);
|
|
}
|
|
|
|
static void nios2_cpu_reset(DeviceState *dev)
|
|
{
|
|
CPUState *cs = CPU(dev);
|
|
Nios2CPU *cpu = NIOS2_CPU(cs);
|
|
Nios2CPUClass *ncc = NIOS2_CPU_GET_CLASS(cpu);
|
|
CPUNios2State *env = &cpu->env;
|
|
|
|
if (qemu_loglevel_mask(CPU_LOG_RESET)) {
|
|
qemu_log("CPU Reset (CPU %d)\n", cs->cpu_index);
|
|
log_cpu_state(cs, 0);
|
|
}
|
|
|
|
ncc->parent_reset(dev);
|
|
|
|
memset(env->regs, 0, sizeof(uint32_t) * NUM_CORE_REGS);
|
|
env->regs[R_PC] = cpu->reset_addr;
|
|
|
|
#if defined(CONFIG_USER_ONLY)
|
|
/* Start in user mode with interrupts enabled. */
|
|
env->regs[CR_STATUS] = CR_STATUS_U | CR_STATUS_PIE;
|
|
#else
|
|
env->regs[CR_STATUS] = 0;
|
|
#endif
|
|
}
|
|
|
|
static void nios2_cpu_initfn(Object *obj)
|
|
{
|
|
Nios2CPU *cpu = NIOS2_CPU(obj);
|
|
|
|
cpu_set_cpustate_pointers(cpu);
|
|
|
|
#if !defined(CONFIG_USER_ONLY)
|
|
mmu_init(&cpu->env);
|
|
#endif
|
|
}
|
|
|
|
static ObjectClass *nios2_cpu_class_by_name(const char *cpu_model)
|
|
{
|
|
return object_class_by_name(TYPE_NIOS2_CPU);
|
|
}
|
|
|
|
static void nios2_cpu_realizefn(DeviceState *dev, Error **errp)
|
|
{
|
|
CPUState *cs = CPU(dev);
|
|
Nios2CPUClass *ncc = NIOS2_CPU_GET_CLASS(dev);
|
|
Error *local_err = NULL;
|
|
|
|
cpu_exec_realizefn(cs, &local_err);
|
|
if (local_err != NULL) {
|
|
error_propagate(errp, local_err);
|
|
return;
|
|
}
|
|
|
|
qemu_init_vcpu(cs);
|
|
cpu_reset(cs);
|
|
|
|
ncc->parent_realize(dev, errp);
|
|
}
|
|
|
|
static bool nios2_cpu_exec_interrupt(CPUState *cs, int interrupt_request)
|
|
{
|
|
Nios2CPU *cpu = NIOS2_CPU(cs);
|
|
CPUNios2State *env = &cpu->env;
|
|
|
|
if ((interrupt_request & CPU_INTERRUPT_HARD) &&
|
|
(env->regs[CR_STATUS] & CR_STATUS_PIE)) {
|
|
cs->exception_index = EXCP_IRQ;
|
|
nios2_cpu_do_interrupt(cs);
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
|
|
static void nios2_cpu_disas_set_info(CPUState *cpu, disassemble_info *info)
|
|
{
|
|
/* NOTE: NiosII R2 is not supported yet. */
|
|
info->mach = bfd_arch_nios2;
|
|
#ifdef TARGET_WORDS_BIGENDIAN
|
|
info->print_insn = print_insn_big_nios2;
|
|
#else
|
|
info->print_insn = print_insn_little_nios2;
|
|
#endif
|
|
}
|
|
|
|
static int nios2_cpu_gdb_read_register(CPUState *cs, GByteArray *mem_buf, int n)
|
|
{
|
|
Nios2CPU *cpu = NIOS2_CPU(cs);
|
|
CPUClass *cc = CPU_GET_CLASS(cs);
|
|
CPUNios2State *env = &cpu->env;
|
|
|
|
if (n > cc->gdb_num_core_regs) {
|
|
return 0;
|
|
}
|
|
|
|
if (n < 32) { /* GP regs */
|
|
return gdb_get_reg32(mem_buf, env->regs[n]);
|
|
} else if (n == 32) { /* PC */
|
|
return gdb_get_reg32(mem_buf, env->regs[R_PC]);
|
|
} else if (n < 49) { /* Status regs */
|
|
return gdb_get_reg32(mem_buf, env->regs[n - 1]);
|
|
}
|
|
|
|
/* Invalid regs */
|
|
return 0;
|
|
}
|
|
|
|
static int nios2_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n)
|
|
{
|
|
Nios2CPU *cpu = NIOS2_CPU(cs);
|
|
CPUClass *cc = CPU_GET_CLASS(cs);
|
|
CPUNios2State *env = &cpu->env;
|
|
|
|
if (n > cc->gdb_num_core_regs) {
|
|
return 0;
|
|
}
|
|
|
|
if (n < 32) { /* GP regs */
|
|
env->regs[n] = ldl_p(mem_buf);
|
|
} else if (n == 32) { /* PC */
|
|
env->regs[R_PC] = ldl_p(mem_buf);
|
|
} else if (n < 49) { /* Status regs */
|
|
env->regs[n - 1] = ldl_p(mem_buf);
|
|
}
|
|
|
|
return 4;
|
|
}
|
|
|
|
static Property nios2_properties[] = {
|
|
DEFINE_PROP_BOOL("mmu_present", Nios2CPU, mmu_present, true),
|
|
/* ALTR,pid-num-bits */
|
|
DEFINE_PROP_UINT32("mmu_pid_num_bits", Nios2CPU, pid_num_bits, 8),
|
|
/* ALTR,tlb-num-ways */
|
|
DEFINE_PROP_UINT32("mmu_tlb_num_ways", Nios2CPU, tlb_num_ways, 16),
|
|
/* ALTR,tlb-num-entries */
|
|
DEFINE_PROP_UINT32("mmu_pid_num_entries", Nios2CPU, tlb_num_entries, 256),
|
|
DEFINE_PROP_END_OF_LIST(),
|
|
};
|
|
|
|
|
|
static void nios2_cpu_class_init(ObjectClass *oc, void *data)
|
|
{
|
|
DeviceClass *dc = DEVICE_CLASS(oc);
|
|
CPUClass *cc = CPU_CLASS(oc);
|
|
Nios2CPUClass *ncc = NIOS2_CPU_CLASS(oc);
|
|
|
|
device_class_set_parent_realize(dc, nios2_cpu_realizefn,
|
|
&ncc->parent_realize);
|
|
device_class_set_props(dc, nios2_properties);
|
|
device_class_set_parent_reset(dc, nios2_cpu_reset, &ncc->parent_reset);
|
|
|
|
cc->class_by_name = nios2_cpu_class_by_name;
|
|
cc->has_work = nios2_cpu_has_work;
|
|
cc->do_interrupt = nios2_cpu_do_interrupt;
|
|
cc->cpu_exec_interrupt = nios2_cpu_exec_interrupt;
|
|
cc->dump_state = nios2_cpu_dump_state;
|
|
cc->set_pc = nios2_cpu_set_pc;
|
|
cc->disas_set_info = nios2_cpu_disas_set_info;
|
|
cc->tlb_fill = nios2_cpu_tlb_fill;
|
|
#ifndef CONFIG_USER_ONLY
|
|
cc->do_unaligned_access = nios2_cpu_do_unaligned_access;
|
|
cc->get_phys_page_debug = nios2_cpu_get_phys_page_debug;
|
|
#endif
|
|
cc->gdb_read_register = nios2_cpu_gdb_read_register;
|
|
cc->gdb_write_register = nios2_cpu_gdb_write_register;
|
|
cc->gdb_num_core_regs = 49;
|
|
cc->tcg_initialize = nios2_tcg_init;
|
|
}
|
|
|
|
static const TypeInfo nios2_cpu_type_info = {
|
|
.name = TYPE_NIOS2_CPU,
|
|
.parent = TYPE_CPU,
|
|
.instance_size = sizeof(Nios2CPU),
|
|
.instance_init = nios2_cpu_initfn,
|
|
.class_size = sizeof(Nios2CPUClass),
|
|
.class_init = nios2_cpu_class_init,
|
|
};
|
|
|
|
static void nios2_cpu_register_types(void)
|
|
{
|
|
type_register_static(&nios2_cpu_type_info);
|
|
}
|
|
|
|
type_init(nios2_cpu_register_types)
|