Re: [PATCH v4 1/3] KVM: PPC: epapr: Factor out the epapr init
flat view
From: Scott Wood <hidden>
Date: 2012-02-16 17:13:33
Also in:
kvm
On 02/16/2012 03:26 AM, Liu Yu wrote:
from the kvm guest paravirt init code. Signed-off-by: Liu Yu <redacted> --- v4: 1. code cleanup 2. move kvm_hypercall_start() to epapr_hypercall_start() arch/powerpc/Kconfig | 4 ++ arch/powerpc/include/asm/epapr_hcalls.h | 2 + arch/powerpc/kernel/Makefile | 1 + arch/powerpc/kernel/epapr.S | 25 ++++++++++++++++ arch/powerpc/kernel/epapr_para.c | 49 +++++++++++++++++++++++++++++++ arch/powerpc/kernel/kvm.c | 28 ++---------------- arch/powerpc/kernel/kvm_emul.S | 10 ------ arch/powerpc/kvm/Kconfig | 1 + 8 files changed, 85 insertions(+), 35 deletions(-) create mode 100644 arch/powerpc/kernel/epapr.S create mode 100644 arch/powerpc/kernel/epapr_para.c
The comment about spelling out "paravirt" wasnn't meant to be restricted to the kconfig symbol. There are lots of words that begin with "para", and ePAPR isn't just about virtualization.
quoted hunk ↗ jump to hunk
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 1919634..1262b43 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig@@ -202,6 +202,10 @@ config EPAPR_BOOT Used to allow a board to specify it wants an ePAPR compliant wrapper. default n +config EPAPR_PARAVIRT + bool + default n
Why isn't this user-selectable? It's useful on its own.
quoted hunk ↗ jump to hunk
diff --git a/arch/powerpc/kernel/epapr.S b/arch/powerpc/kernel/epapr.S new file mode 100644 index 0000000..697b390 --- /dev/null +++ b/arch/powerpc/kernel/epapr.S
epapr-hcall.S
quoted hunk ↗ jump to hunk
+bool epapr_para_enabled = false; + +static int __init epapr_para_init(void) +{ + struct device_node *hyper_node; + const u32 *insts; + int len, i; + + hyper_node = of_find_node_by_path("/hypervisor"); + if (!hyper_node) + return -ENODEV; + + insts = of_get_property(hyper_node, "hcall-instructions", &len); + if (!(len % 4) && (len >= (4 * 4))) { + for (i = 0; i < (len / 4); i++) + epapr_hypercall_start[i] = insts[i]; + flush_icache_range((ulong)epapr_hypercall_start, + (ulong)epapr_hypercall_start + len); + + epapr_para_enabled = true; + }
Use patch_instruction(), fix the if test, and remove unnecessary parentheses. Print an error if the if test fails, but return silently if the property is absent. Please make asm/epapr_hcalls.h and asm/fsl_hcalls.h work with this as well. -Scott