linux-next: manual merge of the kvm-ppc tree with the kvm tree

2012-10-11 Thread Stephen Rothwell
Hi Alexander, Today's linux-next merge of the kvm-ppc tree got a conflict in arch/powerpc/kvm/44x_emulate.c between commits from the kvm tree and the same patches plus another commit from the kvm-ppc tree. I just used the kvm-ppc tree version. This happened because 1) you rebased/rewrote

[RFC][PATCH] perf: Add a few generic stalled-cycles events

2012-10-11 Thread Sukadev Bhattiprolu
>From 89cb6a25b9f714e55a379467a832ee015014ed11 Mon Sep 17 00:00:00 2001 From: Sukadev Bhattiprolu Date: Tue, 18 Sep 2012 10:59:01 -0700 Subject: [PATCH] perf: Add a few generic stalled-cycles events The existing generic event 'stalled-cycles-backend' corresponds to PM_CMPLU_STALL event in Power7

Re: [PATCH] vfio: enabled and supported on power (v7)

2012-10-11 Thread Alex Williamson
On Thu, 2012-10-11 at 19:19 +1100, Alexey Kardashevskiy wrote: > Ok I'm back, nothing seems happened during last month :) Nope, not much ;) Note that I added a hack to avoid the INTx EOI problem, I expect it should work for you too. > On 14/09/12 14:35, Alex Williamson wrote: > > On Fri, 2012-09

Re: linux-next: manual merge of the kvm-ppc tree with the powerpc-merge tree

2012-10-11 Thread Timur Tabi
Scott Wood wrote: > For hypercalls and other paravirt. That's the point -- they're not > kernel headers. They're guest API headers. Well, IMHO, guest API != user-space. Maybe we should have a parallel mechanism to uapi to make the kvm guest header files available. -- Timur Tabi Linux kernel

Re: linux-next: manual merge of the kvm-ppc tree with the powerpc-merge tree

2012-10-11 Thread Scott Wood
On 10/11/2012 12:24:59 PM, Timur Tabi wrote: Scott Wood wrote: >> > My concern is that when I think of a user-space header file, I think >> > of a >> > user-space application that calls ioctls. I know that KVM guest >> > kernels >> > run as user-space processes, but that does not seem like a

Re: linux-next: manual merge of the kvm-ppc tree with the powerpc-merge tree

2012-10-11 Thread Timur Tabi
Scott Wood wrote: >> > My concern is that when I think of a user-space header file, I think >> > of a >> > user-space application that calls ioctls. I know that KVM guest >> > kernels >> > run as user-space processes, but that does not seem like a reason to >> > combine all of the header files

Re: linux-next: manual merge of the kvm-ppc tree with the powerpc-merge tree

2012-10-11 Thread Scott Wood
On 10/11/2012 10:55:42 AM, Timur Tabi wrote: Alexander Graf wrote: > This is about kvm_host.h, which is the part that is exported to user > space. It usually contains constants and structs that are required for > the API. Which API? I'm not familiar with KVM internals. My concern is that

Re: linux-next: manual merge of the kvm-ppc tree with the powerpc-merge tree

2012-10-11 Thread Scott Wood
On 10/11/2012 10:56:51 AM, Alexander Graf wrote: On 11.10.2012, at 17:50, Scott Wood wrote: > On 10/11/2012 08:04:58 AM, Alexander Graf wrote: >> On 11.10.2012, at 05:32, Tabi Timur-B04825 wrote: >> > On Wed, Oct 10, 2012 at 9:47 PM, Stephen Rothwell wrote: >> > >> >> Commit 549d62d889b4 ("

[PATCH 02/12] KVM: PPC: booke: Fix get_tb() compile error on 64-bit

2012-10-11 Thread Mihai Caraman
Include header file for get_tb() declaration. Signed-off-by: Mihai Caraman --- arch/powerpc/kvm/booke.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c index 3d1f35d..7c9c389 100644 --- a/arch/powerpc/kvm/booke.c +++ b/

[PATCH 09/12] KVM: PPC: bookehv: Add guest computation mode for irq delivery

2012-10-11 Thread Mihai Caraman
When delivering guest IRQs, update MSR computation mode according to guest interrupt computation mode found in EPCR. Signed-off-by: Mihai Caraman --- v1: added intermediate msr variable. arch/powerpc/kvm/booke.c |9 - 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/ar

[PATCH 01/12] KVM: PPC: e500: Silence bogus GCC warning in tlb code

2012-10-11 Thread Mihai Caraman
64-bit GCC 4.5.1 warns about an uninitialized variable which was guarded by a flag. Initialize the variable to make it happy. Signed-off-by: Mihai Caraman --- arch/powerpc/kvm/e500_tlb.c |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/arch/powerpc/kvm/e500_tlb.c b/arch

[PATCH 11/12] KVM: PPC: booke: Add EPCR support in sregs

2012-10-11 Thread Mihai Caraman
Add KVM_SREGS_E_64 feature and EPCR spr support in get/set sregs for 64-bit hosts. Signed-off-by: Mihai Caraman --- arch/powerpc/kvm/booke.c |7 +++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c index e6159f5..d396374 1

[PATCH 12/12] KVM: PPC: booke: Get/set guest EPCR register using ONE_REG interface

2012-10-11 Thread Mihai Caraman
Implement ONE_REG interface for EPCR register adding KVM_REG_PPC_EPCR to the list of ONE_REG PPC supported registers. Signed-off-by: Mihai Caraman --- Documentation/virtual/kvm/api.txt |1 + arch/powerpc/include/asm/kvm.h|2 ++ arch/powerpc/kvm/booke.c | 16 +++

[PATCH 10/12] KVM: PPC: bookehv: Add EPCR support in mtspr/mfspr emulation

2012-10-11 Thread Mihai Caraman
Add EPCR support in booke mtspr/mfspr emulation. EPCR register is defined only for 64-bit and HV categories, we will expose it at this point only to 64-bit virtual processors running on 64-bit HV hosts. Define a reusable setter function for vcpu's EPCR. Signed-off-by: Mihai Caraman --- v1: extend

[PATCH 04/12] KVM: PPC64: bookehv: Add support for interrupt handling

2012-10-11 Thread Mihai Caraman
Add interrupt handling support for 64-bit bookehv hosts. Unify 32 and 64 bit implementations using a common stack layout and a common execution flow starting from kvm_handler_common macro. Update documentation for 64-bit input register values. This patch only address the bolted TLB miss exception h

[PATCH 05/12] KVM: PPC: e500: Add emulation helper for getting instruction ea

2012-10-11 Thread Mihai Caraman
Add emulation helper for getting instruction ea and refactor tlb instruction emulation to use it. Signed-off-by: Mihai Caraman --- v1: use _t_ype instead of _t_arget _r_egister in tlbilx emulation. arch/powerpc/include/asm/kvm_ppc.h | 11 +++ arch/powerpc/kvm/e500.h|6

[PATCH 03/12] KVM: PPC: bookehv: Remove GET_VCPU macro from exception handler

2012-10-11 Thread Mihai Caraman
GET_VCPU define will not be implemented for 64-bit for performance reasons so get rid of it also on 32-bit. Signed-off-by: Mihai Caraman --- arch/powerpc/kvm/bookehv_interrupts.S |7 ++- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/arch/powerpc/kvm/bookehv_interrupts.S

[PATCH 06/12] KVM: PPC: Mask ea's high 32-bits in 32/64 instr emulation

2012-10-11 Thread Mihai Caraman
Mask high 32 bits of effective address in emulation layer for guests running in 32-bit mode. Signed-off-by: Mihai Caraman --- v1: added BOOK3S implementation. arch/powerpc/include/asm/kvm_ppc.h | 10 ++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/arch/powerpc/inclu

[PATCH 07/12] KVM: PPC: e500: Mask MAS2 EPN high 32-bits in 32/64 tlbwe emulation

2012-10-11 Thread Mihai Caraman
Mask high 32 bits of MAS2's effective page number in tlbwe emulation for guests running in 32-bit mode. Signed-off-by: Mihai Caraman --- v1: patch splited. arch/powerpc/kvm/e500_tlb.c |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/arch/powerpc/kvm/e500_tlb.c b/arch/po

[PATCH 08/12] KVM: PPC: booke: Extend MAS2 EPN mask for 64-bit

2012-10-11 Thread Mihai Caraman
Extend MAS2 EPN mask to retain most significant bits on 64-bit hosts. Use this mask in tlb effective address accessor. Signed-off-by: Mihai Caraman --- arch/powerpc/include/asm/mmu-book3e.h |2 +- arch/powerpc/kvm/e500.h |2 +- 2 files changed, 2 insertions(+), 2 deletions(

[PATCH 00/12] KVM: PPC: 64-bit Book3E arch support

2012-10-11 Thread Mihai Caraman
This patchset adds arch support to KVM for 64-bit Book3E PowerPC procesosrs with Embedded.Hypervisor category. The support is limited to the bolted TLB miss exception handlers version and was validated on Freescale's e5500 cores using P5020DS boards. This patchset is based on Alex G. kvm-ppc-next

Re: linux-next: manual merge of the kvm-ppc tree with the powerpc-merge tree

2012-10-11 Thread David Howells
Alexander Graf wrote: > Do I have to move them to their own header file or can I just #ifdef > __KERNEL__ around the place where __ASSEMBLY__ starts to the end of the > file? That depends on whether it happens before or after my disintegration script is run on the header. Ben has pulled my powe

Re: linux-next: manual merge of the kvm-ppc tree with the powerpc-merge tree

2012-10-11 Thread Alexander Graf
On 11.10.2012, at 17:50, Scott Wood wrote: > On 10/11/2012 08:04:58 AM, Alexander Graf wrote: >> On 11.10.2012, at 05:32, Tabi Timur-B04825 wrote: >> > On Wed, Oct 10, 2012 at 9:47 PM, Stephen Rothwell >> > wrote: >> > >> >> Commit 549d62d889b4 ("KVM: PPC: use definitions in epapr header >> >>

Re: linux-next: manual merge of the kvm-ppc tree with the powerpc-merge tree

2012-10-11 Thread Timur Tabi
Alexander Graf wrote: > This is about kvm_host.h, which is the part that is exported to user > space. It usually contains constants and structs that are required for > the API. Which API? I'm not familiar with KVM internals. My concern is that when I think of a user-space header file, I think

Re: linux-next: manual merge of the kvm-ppc tree with the powerpc-merge tree

2012-10-11 Thread Scott Wood
On 10/11/2012 08:04:58 AM, Alexander Graf wrote: On 11.10.2012, at 05:32, Tabi Timur-B04825 wrote: > On Wed, Oct 10, 2012 at 9:47 PM, Stephen Rothwell wrote: > >> Commit 549d62d889b4 ("KVM: PPC: use definitions in epapr header >> for hcalls") from the kvm-ppc tree added an include of asm/

Re: linux-next: manual merge of the kvm-ppc tree with the powerpc-merge tree

2012-10-11 Thread Alexander Graf
On 11.10.2012, at 11:27, David Howells wrote: > Stephen Rothwell wrote: > >> I just removed epapr_hcalls.h from the Kbuild file as I am not sure how >> it should be broken up. David, can you have a look at this, please? > > Files should be broken up along around __KERNEL__ conditionals. If t

Re: linux-next: manual merge of the kvm-ppc tree with the powerpc-merge tree

2012-10-11 Thread Alexander Graf
On 11.10.2012, at 05:32, Tabi Timur-B04825 wrote: > On Wed, Oct 10, 2012 at 9:47 PM, Stephen Rothwell > wrote: > >> Commit 549d62d889b4 ("KVM: PPC: use definitions in epapr header >> for hcalls") from the kvm-ppc tree added an include of asm/epapr_hcall.h >> to the user visible part of asm/kvm

Re: linux-next: manual merge of the kvm-ppc tree with the powerpc-merge tree

2012-10-11 Thread David Howells
Tabi Timur-B04825 wrote: > What is include/uapi? Take a look at http://lwn.net/Articles/507794/ David ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev

Re: linux-next: manual merge of the kvm-ppc tree with the powerpc-merge tree

2012-10-11 Thread David Howells
Stephen Rothwell wrote: > I just removed epapr_hcalls.h from the Kbuild file as I am not sure how > it should be broken up. David, can you have a look at this, please? Files should be broken up along around __KERNEL__ conditionals. If there are no __KERNEL__ conditionals, it is assumed that th

[PATCH v2] powerpc: 52xx: nop out unsupported critical IRQs

2012-10-11 Thread Wolfram Sang
Currently, when booting MPC52xx based platforms, we get: mpc52xx_irqhost_map: invalid irq: virq=16, l1=0, l2=3 irq: irq-16==>hwirq-0x3 mapping failed: -22 [WARNing skipped] The warning is wrong since the mapping itself is valid. However, there is no support for that type o

Re: [PATCH] vfio: enabled and supported on power (v7)

2012-10-11 Thread Alexey Kardashevskiy
Ok I'm back, nothing seems happened during last month :) On 14/09/12 14:35, Alex Williamson wrote: On Fri, 2012-09-14 at 10:51 +1000, Alexey Kardashevskiy wrote: On 14/09/12 08:34, Alex Williamson wrote: On Tue, 2012-09-11 at 18:28 +1000, Alexey Kardashevskiy wrote: On 11/09/12 02:02, Alex W

Re: [PATCH 2/10] memory-hotplug : remove /sys/firmware/memmap/X sysfs

2012-10-11 Thread Yasuaki Ishimatsu
2012/10/06 4:36, KOSAKI Motohiro wrote: On Thu, Oct 4, 2012 at 10:26 PM, Yasuaki Ishimatsu wrote: When (hot)adding memory into system, /sys/firmware/memmap/X/{end, start, type} sysfs files are created. But there is no code to remove these files. The patch implements the function to remove them.