mirror of
https://github.com/izzy2lost/xemu.git
synced 2026-07-06 00:20:22 -07:00
Merge remote-tracking branch 'remotes/kvm/uq/master' into staging
* remotes/kvm/uq/master: hw/mips: malta: Don't boot from flash with KVM T&E MAINTAINERS: Add entry for MIPS KVM target-mips: Enable KVM support in build system hw/mips: malta: Add KVM support hw/mips: In KVM mode, inject IRQ2 (I/O) interrupts via ioctls target-mips: Call kvm_mips_reset_vcpu() from mips_cpu_reset() target-mips: kvm: Add main KVM support for MIPS kvm: Allow arch to set sigmask length target-mips: get_physical_address: Add KVM awareness target-mips: get_physical_address: Add defines for segment bases hw/mips: Add API to convert KVM guest KSEG0 <-> GPA hw/mips/cputimer: Don't start periodic timer in KVM mode target-mips: Reset CPU timer consistently KVM: Fix GSI number space limit Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
@@ -176,6 +176,11 @@ M: Peter Maydell <peter.maydell@linaro.org>
|
||||
S: Maintained
|
||||
F: target-arm/kvm.c
|
||||
|
||||
MIPS
|
||||
M: James Hogan <james.hogan@imgtec.com>
|
||||
S: Maintained
|
||||
F: target-mips/kvm.c
|
||||
|
||||
PPC
|
||||
M: Alexander Graf <agraf@suse.de>
|
||||
S: Maintained
|
||||
|
||||
@@ -4828,6 +4828,9 @@ if test "$linux" = "yes" ; then
|
||||
aarch64)
|
||||
linux_arch=arm64
|
||||
;;
|
||||
mips64)
|
||||
linux_arch=mips
|
||||
;;
|
||||
*)
|
||||
# For most CPUs the kernel architecture name and QEMU CPU name match.
|
||||
linux_arch="$cpu"
|
||||
@@ -5026,7 +5029,7 @@ case "$target_name" in
|
||||
*)
|
||||
esac
|
||||
case "$target_name" in
|
||||
aarch64|arm|i386|x86_64|ppcemb|ppc|ppc64|s390x)
|
||||
aarch64|arm|i386|x86_64|ppcemb|ppc|ppc64|s390x|mipsel|mips)
|
||||
# Make sure the target and host cpus are compatible
|
||||
if test "$kvm" = "yes" -a "$target_softmmu" = "yes" -a \
|
||||
\( "$target_name" = "$cpu" -o \
|
||||
@@ -5034,6 +5037,7 @@ case "$target_name" in
|
||||
\( "$target_name" = "ppc64" -a "$cpu" = "ppc" \) -o \
|
||||
\( "$target_name" = "ppc" -a "$cpu" = "ppc64" \) -o \
|
||||
\( "$target_name" = "ppcemb" -a "$cpu" = "ppc64" \) -o \
|
||||
\( "$target_name" = "mipsel" -a "$cpu" = "mips" \) -o \
|
||||
\( "$target_name" = "x86_64" -a "$cpu" = "i386" \) -o \
|
||||
\( "$target_name" = "i386" -a "$cpu" = "x86_64" \) \) ; then
|
||||
echo "CONFIG_KVM=y" >> $config_target_mak
|
||||
|
||||
+6
-1
@@ -25,10 +25,15 @@
|
||||
|
||||
uint64_t cpu_mips_kseg0_to_phys(void *opaque, uint64_t addr)
|
||||
{
|
||||
return addr & 0x7fffffffll;
|
||||
return addr & 0x1fffffffll;
|
||||
}
|
||||
|
||||
uint64_t cpu_mips_phys_to_kseg0(void *opaque, uint64_t addr)
|
||||
{
|
||||
return addr | ~0x7fffffffll;
|
||||
}
|
||||
|
||||
uint64_t cpu_mips_kvm_um_phys_to_kseg0(void *opaque, uint64_t addr)
|
||||
{
|
||||
return addr | 0x40000000ll;
|
||||
}
|
||||
|
||||
+14
-4
@@ -23,6 +23,7 @@
|
||||
#include "hw/hw.h"
|
||||
#include "hw/mips/cpudevs.h"
|
||||
#include "qemu/timer.h"
|
||||
#include "sysemu/kvm.h"
|
||||
|
||||
#define TIMER_FREQ 100 * 1000 * 1000
|
||||
|
||||
@@ -85,7 +86,12 @@ uint32_t cpu_mips_get_count (CPUMIPSState *env)
|
||||
|
||||
void cpu_mips_store_count (CPUMIPSState *env, uint32_t count)
|
||||
{
|
||||
if (env->CP0_Cause & (1 << CP0Ca_DC))
|
||||
/*
|
||||
* This gets called from cpu_state_reset(), potentially before timer init.
|
||||
* So env->timer may be NULL, which is also the case with KVM enabled so
|
||||
* treat timer as disabled in that case.
|
||||
*/
|
||||
if (env->CP0_Cause & (1 << CP0Ca_DC) || !env->timer)
|
||||
env->CP0_Count = count;
|
||||
else {
|
||||
/* Store new count register */
|
||||
@@ -141,7 +147,11 @@ static void mips_timer_cb (void *opaque)
|
||||
|
||||
void cpu_mips_clock_init (CPUMIPSState *env)
|
||||
{
|
||||
env->timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, &mips_timer_cb, env);
|
||||
env->CP0_Compare = 0;
|
||||
cpu_mips_store_count(env, 1);
|
||||
/*
|
||||
* If we're in KVM mode, don't create the periodic timer, that is handled in
|
||||
* kernel.
|
||||
*/
|
||||
if (!kvm_enabled()) {
|
||||
env->timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, &mips_timer_cb, env);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -23,6 +23,8 @@
|
||||
#include "hw/hw.h"
|
||||
#include "hw/mips/cpudevs.h"
|
||||
#include "cpu.h"
|
||||
#include "sysemu/kvm.h"
|
||||
#include "kvm_mips.h"
|
||||
|
||||
static void cpu_mips_irq_request(void *opaque, int irq, int level)
|
||||
{
|
||||
@@ -35,8 +37,17 @@ static void cpu_mips_irq_request(void *opaque, int irq, int level)
|
||||
|
||||
if (level) {
|
||||
env->CP0_Cause |= 1 << (irq + CP0Ca_IP);
|
||||
|
||||
if (kvm_enabled() && irq == 2) {
|
||||
kvm_mips_set_interrupt(cpu, irq, level);
|
||||
}
|
||||
|
||||
} else {
|
||||
env->CP0_Cause &= ~(1 << (irq + CP0Ca_IP));
|
||||
|
||||
if (kvm_enabled() && irq == 2) {
|
||||
kvm_mips_set_interrupt(cpu, irq, level);
|
||||
}
|
||||
}
|
||||
|
||||
if (env->CP0_Cause & CP0Ca_IP_mask) {
|
||||
|
||||
+59
-20
@@ -51,6 +51,7 @@
|
||||
#include "sysemu/qtest.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include "hw/empty_slot.h"
|
||||
#include "sysemu/kvm.h"
|
||||
|
||||
//#define DEBUG_BOARD_INIT
|
||||
|
||||
@@ -603,29 +604,31 @@ static void network_init(PCIBus *pci_bus)
|
||||
*/
|
||||
|
||||
static void write_bootloader (CPUMIPSState *env, uint8_t *base,
|
||||
int64_t kernel_entry)
|
||||
int64_t run_addr, int64_t kernel_entry)
|
||||
{
|
||||
uint32_t *p;
|
||||
|
||||
/* Small bootloader */
|
||||
p = (uint32_t *)base;
|
||||
stl_p(p++, 0x0bf00160); /* j 0x1fc00580 */
|
||||
|
||||
stl_p(p++, 0x08000000 | /* j 0x1fc00580 */
|
||||
((run_addr + 0x580) & 0x0fffffff) >> 2);
|
||||
stl_p(p++, 0x00000000); /* nop */
|
||||
|
||||
/* YAMON service vector */
|
||||
stl_p(base + 0x500, 0xbfc00580); /* start: */
|
||||
stl_p(base + 0x504, 0xbfc0083c); /* print_count: */
|
||||
stl_p(base + 0x520, 0xbfc00580); /* start: */
|
||||
stl_p(base + 0x52c, 0xbfc00800); /* flush_cache: */
|
||||
stl_p(base + 0x534, 0xbfc00808); /* print: */
|
||||
stl_p(base + 0x538, 0xbfc00800); /* reg_cpu_isr: */
|
||||
stl_p(base + 0x53c, 0xbfc00800); /* unred_cpu_isr: */
|
||||
stl_p(base + 0x540, 0xbfc00800); /* reg_ic_isr: */
|
||||
stl_p(base + 0x544, 0xbfc00800); /* unred_ic_isr: */
|
||||
stl_p(base + 0x548, 0xbfc00800); /* reg_esr: */
|
||||
stl_p(base + 0x54c, 0xbfc00800); /* unreg_esr: */
|
||||
stl_p(base + 0x550, 0xbfc00800); /* getchar: */
|
||||
stl_p(base + 0x554, 0xbfc00800); /* syscon_read: */
|
||||
stl_p(base + 0x500, run_addr + 0x0580); /* start: */
|
||||
stl_p(base + 0x504, run_addr + 0x083c); /* print_count: */
|
||||
stl_p(base + 0x520, run_addr + 0x0580); /* start: */
|
||||
stl_p(base + 0x52c, run_addr + 0x0800); /* flush_cache: */
|
||||
stl_p(base + 0x534, run_addr + 0x0808); /* print: */
|
||||
stl_p(base + 0x538, run_addr + 0x0800); /* reg_cpu_isr: */
|
||||
stl_p(base + 0x53c, run_addr + 0x0800); /* unred_cpu_isr: */
|
||||
stl_p(base + 0x540, run_addr + 0x0800); /* reg_ic_isr: */
|
||||
stl_p(base + 0x544, run_addr + 0x0800); /* unred_ic_isr: */
|
||||
stl_p(base + 0x548, run_addr + 0x0800); /* reg_esr: */
|
||||
stl_p(base + 0x54c, run_addr + 0x0800); /* unreg_esr: */
|
||||
stl_p(base + 0x550, run_addr + 0x0800); /* getchar: */
|
||||
stl_p(base + 0x554, run_addr + 0x0800); /* syscon_read: */
|
||||
|
||||
|
||||
/* Second part of the bootloader */
|
||||
@@ -701,7 +704,7 @@ static void write_bootloader (CPUMIPSState *env, uint8_t *base,
|
||||
p = (uint32_t *) (base + 0x800);
|
||||
stl_p(p++, 0x03e00008); /* jr ra */
|
||||
stl_p(p++, 0x24020000); /* li v0,0 */
|
||||
/* 808 YAMON print */
|
||||
/* 808 YAMON print */
|
||||
stl_p(p++, 0x03e06821); /* move t5,ra */
|
||||
stl_p(p++, 0x00805821); /* move t3,a0 */
|
||||
stl_p(p++, 0x00a05021); /* move t2,a1 */
|
||||
@@ -774,6 +777,7 @@ static int64_t load_kernel (void)
|
||||
uint32_t *prom_buf;
|
||||
long prom_size;
|
||||
int prom_index = 0;
|
||||
uint64_t (*xlate_to_kseg0) (void *opaque, uint64_t addr);
|
||||
|
||||
#ifdef TARGET_WORDS_BIGENDIAN
|
||||
big_endian = 1;
|
||||
@@ -788,6 +792,11 @@ static int64_t load_kernel (void)
|
||||
loaderparams.kernel_filename);
|
||||
exit(1);
|
||||
}
|
||||
if (kvm_enabled()) {
|
||||
xlate_to_kseg0 = cpu_mips_kvm_um_phys_to_kseg0;
|
||||
} else {
|
||||
xlate_to_kseg0 = cpu_mips_phys_to_kseg0;
|
||||
}
|
||||
|
||||
/* load initrd */
|
||||
initrd_size = 0;
|
||||
@@ -820,7 +829,7 @@ static int64_t load_kernel (void)
|
||||
prom_set(prom_buf, prom_index++, "%s", loaderparams.kernel_filename);
|
||||
if (initrd_size > 0) {
|
||||
prom_set(prom_buf, prom_index++, "rd_start=0x%" PRIx64 " rd_size=%li %s",
|
||||
cpu_mips_phys_to_kseg0(NULL, initrd_offset), initrd_size,
|
||||
xlate_to_kseg0(NULL, initrd_offset), initrd_size,
|
||||
loaderparams.kernel_cmdline);
|
||||
} else {
|
||||
prom_set(prom_buf, prom_index++, "%s", loaderparams.kernel_cmdline);
|
||||
@@ -829,6 +838,7 @@ static int64_t load_kernel (void)
|
||||
prom_set(prom_buf, prom_index++, "memsize");
|
||||
prom_set(prom_buf, prom_index++, "%i",
|
||||
MIN(loaderparams.ram_size, 256 << 20));
|
||||
|
||||
prom_set(prom_buf, prom_index++, "modetty0");
|
||||
prom_set(prom_buf, prom_index++, "38400n8r");
|
||||
prom_set(prom_buf, prom_index++, NULL);
|
||||
@@ -863,6 +873,11 @@ static void main_cpu_reset(void *opaque)
|
||||
}
|
||||
|
||||
malta_mips_config(cpu);
|
||||
|
||||
if (kvm_enabled()) {
|
||||
/* Start running from the bootloader we wrote to end of RAM */
|
||||
env->active_tc.PC = 0x40000000 + loaderparams.ram_size;
|
||||
}
|
||||
}
|
||||
|
||||
static void cpu_request_exit(void *opaque, int irq, int level)
|
||||
@@ -878,6 +893,7 @@ static
|
||||
void mips_malta_init(MachineState *machine)
|
||||
{
|
||||
ram_addr_t ram_size = machine->ram_size;
|
||||
ram_addr_t ram_low_size;
|
||||
const char *cpu_model = machine->cpu_model;
|
||||
const char *kernel_filename = machine->kernel_filename;
|
||||
const char *kernel_cmdline = machine->kernel_cmdline;
|
||||
@@ -892,7 +908,7 @@ void mips_malta_init(MachineState *machine)
|
||||
target_long bios_size = FLASH_SIZE;
|
||||
const size_t smbus_eeprom_size = 8 * 256;
|
||||
uint8_t *smbus_eeprom_buf = g_malloc0(smbus_eeprom_size);
|
||||
int64_t kernel_entry;
|
||||
int64_t kernel_entry, bootloader_run_addr;
|
||||
PCIBus *pci_bus;
|
||||
ISABus *isa_bus;
|
||||
MIPSCPU *cpu;
|
||||
@@ -1011,14 +1027,37 @@ void mips_malta_init(MachineState *machine)
|
||||
bios = pflash_cfi01_get_memory(fl);
|
||||
fl_idx++;
|
||||
if (kernel_filename) {
|
||||
ram_low_size = MIN(ram_size, 256 << 20);
|
||||
/* For KVM T&E we reserve 1MB of RAM for running bootloader */
|
||||
if (kvm_enabled()) {
|
||||
ram_low_size -= 0x100000;
|
||||
bootloader_run_addr = 0x40000000 + ram_low_size;
|
||||
} else {
|
||||
bootloader_run_addr = 0xbfc00000;
|
||||
}
|
||||
|
||||
/* Write a small bootloader to the flash location. */
|
||||
loaderparams.ram_size = MIN(ram_size, 256 << 20);
|
||||
loaderparams.ram_size = ram_low_size;
|
||||
loaderparams.kernel_filename = kernel_filename;
|
||||
loaderparams.kernel_cmdline = kernel_cmdline;
|
||||
loaderparams.initrd_filename = initrd_filename;
|
||||
kernel_entry = load_kernel();
|
||||
write_bootloader(env, memory_region_get_ram_ptr(bios), kernel_entry);
|
||||
|
||||
write_bootloader(env, memory_region_get_ram_ptr(bios),
|
||||
bootloader_run_addr, kernel_entry);
|
||||
if (kvm_enabled()) {
|
||||
/* Write the bootloader code @ the end of RAM, 1MB reserved */
|
||||
write_bootloader(env, memory_region_get_ram_ptr(ram_low_preio) +
|
||||
ram_low_size,
|
||||
bootloader_run_addr, kernel_entry);
|
||||
}
|
||||
} else {
|
||||
/* The flash region isn't executable from a KVM T&E guest */
|
||||
if (kvm_enabled()) {
|
||||
error_report("KVM enabled but no -kernel argument was specified. "
|
||||
"Booting from flash is not supported with KVM T&E.");
|
||||
exit(1);
|
||||
}
|
||||
/* Load firmware from flash. */
|
||||
if (!dinfo) {
|
||||
/* Load a BIOS image. */
|
||||
|
||||
@@ -5,6 +5,8 @@
|
||||
/* mips_addr.c */
|
||||
uint64_t cpu_mips_kseg0_to_phys(void *opaque, uint64_t addr);
|
||||
uint64_t cpu_mips_phys_to_kseg0(void *opaque, uint64_t addr);
|
||||
uint64_t cpu_mips_kvm_um_phys_to_kseg0(void *opaque, uint64_t addr);
|
||||
|
||||
|
||||
/* mips_int.c */
|
||||
void cpu_mips_irq_init_cpu(CPUMIPSState *env);
|
||||
|
||||
@@ -336,6 +336,8 @@ int kvm_check_extension(KVMState *s, unsigned int extension);
|
||||
uint32_t kvm_arch_get_supported_cpuid(KVMState *env, uint32_t function,
|
||||
uint32_t index, int reg);
|
||||
|
||||
void kvm_set_sigmask_len(KVMState *s, unsigned int sigmask_len);
|
||||
|
||||
#if !defined(CONFIG_USER_ONLY)
|
||||
int kvm_physical_memory_addr_from_host(KVMState *s, void *ram_addr,
|
||||
hwaddr *phys_addr);
|
||||
|
||||
@@ -99,6 +99,7 @@ struct KVMState
|
||||
* they're not. Linux, glibc and *BSD all treat ioctl numbers as
|
||||
* unsigned, and treating them as signed here can break things */
|
||||
unsigned irq_set_ioctl;
|
||||
unsigned int sigmask_len;
|
||||
#ifdef KVM_CAP_IRQ_ROUTING
|
||||
struct kvm_irq_routing *irq_routes;
|
||||
int nr_allocated_irq_routes;
|
||||
@@ -939,7 +940,7 @@ void kvm_init_irq_routing(KVMState *s)
|
||||
{
|
||||
int gsi_count, i;
|
||||
|
||||
gsi_count = kvm_check_extension(s, KVM_CAP_IRQ_ROUTING);
|
||||
gsi_count = kvm_check_extension(s, KVM_CAP_IRQ_ROUTING) - 1;
|
||||
if (gsi_count > 0) {
|
||||
unsigned int gsi_bits, i;
|
||||
|
||||
@@ -1398,6 +1399,8 @@ int kvm_init(MachineClass *mc)
|
||||
assert(TARGET_PAGE_SIZE <= getpagesize());
|
||||
page_size_init();
|
||||
|
||||
s->sigmask_len = 8;
|
||||
|
||||
#ifdef KVM_CAP_SET_GUEST_DEBUG
|
||||
QTAILQ_INIT(&s->kvm_sw_breakpoints);
|
||||
#endif
|
||||
@@ -1579,6 +1582,11 @@ err:
|
||||
return ret;
|
||||
}
|
||||
|
||||
void kvm_set_sigmask_len(KVMState *s, unsigned int sigmask_len)
|
||||
{
|
||||
s->sigmask_len = sigmask_len;
|
||||
}
|
||||
|
||||
static void kvm_handle_io(uint16_t port, void *data, int direction, int size,
|
||||
uint32_t count)
|
||||
{
|
||||
@@ -2115,6 +2123,7 @@ void kvm_remove_all_breakpoints(CPUState *cpu)
|
||||
|
||||
int kvm_set_signal_mask(CPUState *cpu, const sigset_t *sigset)
|
||||
{
|
||||
KVMState *s = kvm_state;
|
||||
struct kvm_signal_mask *sigmask;
|
||||
int r;
|
||||
|
||||
@@ -2124,7 +2133,7 @@ int kvm_set_signal_mask(CPUState *cpu, const sigset_t *sigset)
|
||||
|
||||
sigmask = g_malloc(sizeof(*sigmask) + sizeof(*sigset));
|
||||
|
||||
sigmask->len = 8;
|
||||
sigmask->len = s->sigmask_len;
|
||||
memcpy(sigmask->sigset, sigset, sizeof(*sigset));
|
||||
r = kvm_vcpu_ioctl(cpu, KVM_SET_SIGNAL_MASK, sigmask);
|
||||
g_free(sigmask);
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
obj-y += translate.o dsp_helper.o op_helper.o lmi_helper.o helper.o cpu.o
|
||||
obj-y += gdbstub.o
|
||||
obj-$(CONFIG_SOFTMMU) += machine.o
|
||||
obj-$(CONFIG_KVM) += kvm.o
|
||||
|
||||
@@ -19,7 +19,9 @@
|
||||
*/
|
||||
|
||||
#include "cpu.h"
|
||||
#include "kvm_mips.h"
|
||||
#include "qemu-common.h"
|
||||
#include "sysemu/kvm.h"
|
||||
|
||||
|
||||
static void mips_cpu_set_pc(CPUState *cs, vaddr value)
|
||||
@@ -87,6 +89,12 @@ static void mips_cpu_reset(CPUState *s)
|
||||
tlb_flush(s, 1);
|
||||
|
||||
cpu_state_reset(env);
|
||||
|
||||
#ifndef CONFIG_USER_ONLY
|
||||
if (kvm_enabled()) {
|
||||
kvm_mips_reset_vcpu(cpu);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
static void mips_cpu_realizefn(DeviceState *dev, Error **errp)
|
||||
|
||||
+38
-13
@@ -24,6 +24,7 @@
|
||||
#include <signal.h>
|
||||
|
||||
#include "cpu.h"
|
||||
#include "sysemu/kvm.h"
|
||||
|
||||
enum {
|
||||
TLBRET_DIRTY = -4,
|
||||
@@ -100,7 +101,7 @@ int r4k_map_address (CPUMIPSState *env, hwaddr *physical, int *prot,
|
||||
}
|
||||
|
||||
static int get_physical_address (CPUMIPSState *env, hwaddr *physical,
|
||||
int *prot, target_ulong address,
|
||||
int *prot, target_ulong real_address,
|
||||
int rw, int access_type)
|
||||
{
|
||||
/* User mode can only access useg/xuseg */
|
||||
@@ -113,24 +114,48 @@ static int get_physical_address (CPUMIPSState *env, hwaddr *physical,
|
||||
int KX = (env->CP0_Status & (1 << CP0St_KX)) != 0;
|
||||
#endif
|
||||
int ret = TLBRET_MATCH;
|
||||
/* effective address (modified for KVM T&E kernel segments) */
|
||||
target_ulong address = real_address;
|
||||
|
||||
#if 0
|
||||
qemu_log("user mode %d h %08x\n", user_mode, env->hflags);
|
||||
#endif
|
||||
|
||||
if (address <= (int32_t)0x7FFFFFFFUL) {
|
||||
#define USEG_LIMIT 0x7FFFFFFFUL
|
||||
#define KSEG0_BASE 0x80000000UL
|
||||
#define KSEG1_BASE 0xA0000000UL
|
||||
#define KSEG2_BASE 0xC0000000UL
|
||||
#define KSEG3_BASE 0xE0000000UL
|
||||
|
||||
#define KVM_KSEG0_BASE 0x40000000UL
|
||||
#define KVM_KSEG2_BASE 0x60000000UL
|
||||
|
||||
if (kvm_enabled()) {
|
||||
/* KVM T&E adds guest kernel segments in useg */
|
||||
if (real_address >= KVM_KSEG0_BASE) {
|
||||
if (real_address < KVM_KSEG2_BASE) {
|
||||
/* kseg0 */
|
||||
address += KSEG0_BASE - KVM_KSEG0_BASE;
|
||||
} else if (real_address <= USEG_LIMIT) {
|
||||
/* kseg2/3 */
|
||||
address += KSEG2_BASE - KVM_KSEG2_BASE;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (address <= USEG_LIMIT) {
|
||||
/* useg */
|
||||
if (env->CP0_Status & (1 << CP0St_ERL)) {
|
||||
*physical = address & 0xFFFFFFFF;
|
||||
*prot = PAGE_READ | PAGE_WRITE;
|
||||
} else {
|
||||
ret = env->tlb->map_address(env, physical, prot, address, rw, access_type);
|
||||
ret = env->tlb->map_address(env, physical, prot, real_address, rw, access_type);
|
||||
}
|
||||
#if defined(TARGET_MIPS64)
|
||||
} else if (address < 0x4000000000000000ULL) {
|
||||
/* xuseg */
|
||||
if (UX && address <= (0x3FFFFFFFFFFFFFFFULL & env->SEGMask)) {
|
||||
ret = env->tlb->map_address(env, physical, prot, address, rw, access_type);
|
||||
ret = env->tlb->map_address(env, physical, prot, real_address, rw, access_type);
|
||||
} else {
|
||||
ret = TLBRET_BADADDR;
|
||||
}
|
||||
@@ -138,7 +163,7 @@ static int get_physical_address (CPUMIPSState *env, hwaddr *physical,
|
||||
/* xsseg */
|
||||
if ((supervisor_mode || kernel_mode) &&
|
||||
SX && address <= (0x7FFFFFFFFFFFFFFFULL & env->SEGMask)) {
|
||||
ret = env->tlb->map_address(env, physical, prot, address, rw, access_type);
|
||||
ret = env->tlb->map_address(env, physical, prot, real_address, rw, access_type);
|
||||
} else {
|
||||
ret = TLBRET_BADADDR;
|
||||
}
|
||||
@@ -155,31 +180,31 @@ static int get_physical_address (CPUMIPSState *env, hwaddr *physical,
|
||||
/* xkseg */
|
||||
if (kernel_mode && KX &&
|
||||
address <= (0xFFFFFFFF7FFFFFFFULL & env->SEGMask)) {
|
||||
ret = env->tlb->map_address(env, physical, prot, address, rw, access_type);
|
||||
ret = env->tlb->map_address(env, physical, prot, real_address, rw, access_type);
|
||||
} else {
|
||||
ret = TLBRET_BADADDR;
|
||||
}
|
||||
#endif
|
||||
} else if (address < (int32_t)0xA0000000UL) {
|
||||
} else if (address < (int32_t)KSEG1_BASE) {
|
||||
/* kseg0 */
|
||||
if (kernel_mode) {
|
||||
*physical = address - (int32_t)0x80000000UL;
|
||||
*physical = address - (int32_t)KSEG0_BASE;
|
||||
*prot = PAGE_READ | PAGE_WRITE;
|
||||
} else {
|
||||
ret = TLBRET_BADADDR;
|
||||
}
|
||||
} else if (address < (int32_t)0xC0000000UL) {
|
||||
} else if (address < (int32_t)KSEG2_BASE) {
|
||||
/* kseg1 */
|
||||
if (kernel_mode) {
|
||||
*physical = address - (int32_t)0xA0000000UL;
|
||||
*physical = address - (int32_t)KSEG1_BASE;
|
||||
*prot = PAGE_READ | PAGE_WRITE;
|
||||
} else {
|
||||
ret = TLBRET_BADADDR;
|
||||
}
|
||||
} else if (address < (int32_t)0xE0000000UL) {
|
||||
} else if (address < (int32_t)KSEG3_BASE) {
|
||||
/* sseg (kseg2) */
|
||||
if (supervisor_mode || kernel_mode) {
|
||||
ret = env->tlb->map_address(env, physical, prot, address, rw, access_type);
|
||||
ret = env->tlb->map_address(env, physical, prot, real_address, rw, access_type);
|
||||
} else {
|
||||
ret = TLBRET_BADADDR;
|
||||
}
|
||||
@@ -187,7 +212,7 @@ static int get_physical_address (CPUMIPSState *env, hwaddr *physical,
|
||||
/* kseg3 */
|
||||
/* XXX: debug segment is not emulated */
|
||||
if (kernel_mode) {
|
||||
ret = env->tlb->map_address(env, physical, prot, address, rw, access_type);
|
||||
ret = env->tlb->map_address(env, physical, prot, real_address, rw, access_type);
|
||||
} else {
|
||||
ret = TLBRET_BADADDR;
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,26 @@
|
||||
/*
|
||||
* This file is subject to the terms and conditions of the GNU General Public
|
||||
* License. See the file "COPYING" in the main directory of this archive
|
||||
* for more details.
|
||||
*
|
||||
* KVM/MIPS: MIPS specific KVM APIs
|
||||
*
|
||||
* Copyright (C) 2012-2014 Imagination Technologies Ltd.
|
||||
* Authors: Sanjay Lal <sanjayl@kymasys.com>
|
||||
*/
|
||||
|
||||
#ifndef __KVM_MIPS_H__
|
||||
#define __KVM_MIPS_H__
|
||||
|
||||
/**
|
||||
* kvm_mips_reset_vcpu:
|
||||
* @cpu: MIPSCPU
|
||||
*
|
||||
* Called at reset time to set kernel registers to their initial values.
|
||||
*/
|
||||
void kvm_mips_reset_vcpu(MIPSCPU *cpu);
|
||||
|
||||
int kvm_mips_set_interrupt(MIPSCPU *cpu, int irq, int level);
|
||||
int kvm_mips_set_ipi_interrupt(MIPSCPU *cpu, int irq, int level);
|
||||
|
||||
#endif /* __KVM_MIPS_H__ */
|
||||
@@ -16092,6 +16092,8 @@ void cpu_state_reset(CPUMIPSState *env)
|
||||
/* Count register increments in debug mode, EJTAG version 1 */
|
||||
env->CP0_Debug = (1 << CP0DB_CNT) | (0x1 << CP0DB_VER);
|
||||
|
||||
cpu_mips_store_count(env, 1);
|
||||
|
||||
if (env->CP0_Config3 & (1 << CP0C3_MT)) {
|
||||
int i;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user