Commit a1515ec7 authored by Thomas Bogendoerfer's avatar Thomas Bogendoerfer

MIPS: Remove KVM_GUEST support

KVM_GUEST is broken and unmaintained, so let's remove it.
Reviewed-by: default avatarHuacai Chen <chenhuacai@kernel.org>
Reviewed-by: default avatarJiaxun Yang <jiaxun.yang@flygoat.com>
Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
parent 87aaf252
...@@ -2222,23 +2222,6 @@ config 64BIT ...@@ -2222,23 +2222,6 @@ config 64BIT
endchoice endchoice
config KVM_GUEST
bool "KVM Guest Kernel"
depends on CPU_MIPS32_R2
depends on !64BIT && BROKEN_ON_SMP
help
Select this option if building a guest kernel for KVM (Trap & Emulate)
mode.
config KVM_GUEST_TIMER_FREQ
int "Count/Compare Timer Frequency (MHz)"
depends on KVM_GUEST
default 100
help
Set this to non-zero if building a guest kernel for KVM to skip RTC
emulation when determining guest CPU Frequency. Instead, the guest's
timer frequency is specified directly.
config MIPS_VA_BITS_48 config MIPS_VA_BITS_48
bool "48 bits virtual memory" bool "48 bits virtual memory"
depends on 64BIT depends on 64BIT
......
This diff is collapsed.
...@@ -30,11 +30,7 @@ ...@@ -30,11 +30,7 @@
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#ifdef CONFIG_32BIT #ifdef CONFIG_32BIT
#ifdef CONFIG_KVM_GUEST
#define CAC_BASE _AC(0x40000000, UL)
#else
#define CAC_BASE _AC(0x80000000, UL) #define CAC_BASE _AC(0x80000000, UL)
#endif
#ifndef IO_BASE #ifndef IO_BASE
#define IO_BASE _AC(0xa0000000, UL) #define IO_BASE _AC(0xa0000000, UL)
#endif #endif
...@@ -43,12 +39,8 @@ ...@@ -43,12 +39,8 @@
#endif #endif
#ifndef MAP_BASE #ifndef MAP_BASE
#ifdef CONFIG_KVM_GUEST
#define MAP_BASE _AC(0x60000000, UL)
#else
#define MAP_BASE _AC(0xc0000000, UL) #define MAP_BASE _AC(0xc0000000, UL)
#endif #endif
#endif
/* /*
* Memory above this physical address will be considered highmem. * Memory above this physical address will be considered highmem.
...@@ -100,11 +92,7 @@ ...@@ -100,11 +92,7 @@
#endif #endif
#ifndef FIXADDR_TOP #ifndef FIXADDR_TOP
#ifdef CONFIG_KVM_GUEST
#define FIXADDR_TOP ((unsigned long)(long)(int)0x7ffe0000)
#else
#define FIXADDR_TOP ((unsigned long)(long)(int)0xfffe0000) #define FIXADDR_TOP ((unsigned long)(long)(int)0xfffe0000)
#endif #endif
#endif
#endif /* __ASM_MACH_GENERIC_SPACES_H */ #endif /* __ASM_MACH_GENERIC_SPACES_H */
...@@ -32,16 +32,11 @@ extern unsigned int vced_count, vcei_count; ...@@ -32,16 +32,11 @@ extern unsigned int vced_count, vcei_count;
extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src); extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);
#ifdef CONFIG_32BIT #ifdef CONFIG_32BIT
#ifdef CONFIG_KVM_GUEST
/* User space process size is limited to 1GB in KVM Guest Mode */
#define TASK_SIZE 0x3fff8000UL
#else
/* /*
* User space process size: 2GB. This is hardcoded into a few places, * User space process size: 2GB. This is hardcoded into a few places,
* so don't change it unless you know what you are doing. * so don't change it unless you know what you are doing.
*/ */
#define TASK_SIZE 0x80000000UL #define TASK_SIZE 0x80000000UL
#endif
#define STACK_TOP_MAX TASK_SIZE #define STACK_TOP_MAX TASK_SIZE
......
...@@ -25,11 +25,7 @@ ...@@ -25,11 +25,7 @@
*/ */
#ifdef CONFIG_32BIT #ifdef CONFIG_32BIT
#ifdef CONFIG_KVM_GUEST
#define __UA_LIMIT 0x40000000UL
#else
#define __UA_LIMIT 0x80000000UL #define __UA_LIMIT 0x80000000UL
#endif
#define __UA_ADDR ".word" #define __UA_ADDR ".word"
#define __UA_LA "la" #define __UA_LA "la"
...@@ -61,13 +57,8 @@ extern u64 __ua_limit; ...@@ -61,13 +57,8 @@ extern u64 __ua_limit;
* address in this range it's the process's problem, not ours :-) * address in this range it's the process's problem, not ours :-)
*/ */
#ifdef CONFIG_KVM_GUEST
#define KERNEL_DS ((mm_segment_t) { 0x80000000UL })
#define USER_DS ((mm_segment_t) { 0xC0000000UL })
#else
#define KERNEL_DS ((mm_segment_t) { 0UL }) #define KERNEL_DS ((mm_segment_t) { 0UL })
#define USER_DS ((mm_segment_t) { __UA_LIMIT }) #define USER_DS ((mm_segment_t) { __UA_LIMIT })
#endif
#define get_fs() (current_thread_info()->addr_limit) #define get_fs() (current_thread_info()->addr_limit)
#define set_fs(x) (current_thread_info()->addr_limit = (x)) #define set_fs(x) (current_thread_info()->addr_limit = (x))
......
...@@ -195,10 +195,6 @@ int c0_compare_int_usable(void) ...@@ -195,10 +195,6 @@ int c0_compare_int_usable(void)
unsigned int delta; unsigned int delta;
unsigned int cnt; unsigned int cnt;
#ifdef CONFIG_KVM_GUEST
return 1;
#endif
/* /*
* IP7 already pending? Try to clear it by acking the timer. * IP7 already pending? Try to clear it by acking the timer.
*/ */
......
...@@ -2,9 +2,5 @@ ...@@ -2,9 +2,5 @@
# MIPS Malta board # MIPS Malta board
# #
cflags-$(CONFIG_MIPS_MALTA) += -I$(srctree)/arch/mips/include/asm/mach-malta cflags-$(CONFIG_MIPS_MALTA) += -I$(srctree)/arch/mips/include/asm/mach-malta
ifdef CONFIG_KVM_GUEST load-$(CONFIG_MIPS_MALTA) += 0xffffffff80100000
load-$(CONFIG_MIPS_MALTA) += 0x0000000040100000
else
load-$(CONFIG_MIPS_MALTA) += 0xffffffff80100000
endif
all-$(CONFIG_MIPS_MALTA) := $(COMPRESSION_FNAME).bin all-$(CONFIG_MIPS_MALTA) := $(COMPRESSION_FNAME).bin
...@@ -66,11 +66,6 @@ static void __init estimate_frequencies(void) ...@@ -66,11 +66,6 @@ static void __init estimate_frequencies(void)
int secs; int secs;
u64 giccount = 0, gicstart = 0; u64 giccount = 0, gicstart = 0;
#if defined(CONFIG_KVM_GUEST) && CONFIG_KVM_GUEST_TIMER_FREQ
mips_hpt_frequency = CONFIG_KVM_GUEST_TIMER_FREQ * 1000000;
return;
#endif
local_irq_save(flags); local_irq_save(flags);
if (mips_gic_present()) if (mips_gic_present())
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment