From 6f1834a2baa2f2688efaa7756d000876c7898d13 Mon Sep 17 00:00:00 2001 From: Prasad Joshi Date: Sun, 23 Mar 2014 14:58:39 +0530 Subject: [PATCH 1/5] intc/openpic_kvm: Fix MemListener delete region callback function MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes d85937e683f6ff4d68293cb24c780fb1f6820d2c. Signed-off-by: Prasad Joshi Signed-off-by: Andreas Färber --- hw/intc/openpic_kvm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/intc/openpic_kvm.c b/hw/intc/openpic_kvm.c index 87fdb126cf..afa604d59b 100644 --- a/hw/intc/openpic_kvm.c +++ b/hw/intc/openpic_kvm.c @@ -200,7 +200,7 @@ static void kvm_openpic_realize(DeviceState *dev, Error **errp) qdev_init_gpio_in(dev, kvm_openpic_set_irq, OPENPIC_MAX_IRQ); opp->mem_listener.region_add = kvm_openpic_region_add; - opp->mem_listener.region_add = kvm_openpic_region_del; + opp->mem_listener.region_del = kvm_openpic_region_del; memory_listener_register(&opp->mem_listener, &address_space_memory); /* indicate pic capabilities */ From d6fb330f70831180c69899a4f8ba1a7a5fdce45c Mon Sep 17 00:00:00 2001 From: Anton Blanchard Date: Tue, 25 Mar 2014 13:40:26 +1100 Subject: [PATCH 2/5] target-ppc: POWER8 supports the MSR_LE bit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add MSR_LE to the msr_mask for POWER8. Signed-off-by: Anton Blanchard Reviewed-by: Cédric Le Goater Tested-by: Cédric Le Goater Signed-off-by: Andreas Färber --- target-ppc/translate_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 7f53c33eaf..a82c8f9504 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -7175,7 +7175,7 @@ POWERPC_FAMILY(POWER8)(ObjectClass *oc, void *data) PPC2_FP_TST_ISA206 | PPC2_BCTAR_ISA207 | PPC2_LSQ_ISA207 | PPC2_ALTIVEC_207 | PPC2_ISA205 | PPC2_ISA207S; - pcc->msr_mask = 0x800000000284FF36ULL; + pcc->msr_mask = 0x800000000284FF37ULL; pcc->mmu_model = POWERPC_MMU_2_06; #if defined(CONFIG_SOFTMMU) pcc->handle_mmu_fault = ppc_hash64_handle_mmu_fault; From 536492ebb3934a827a981be1f207cf7835a53c30 Mon Sep 17 00:00:00 2001 From: Anton Blanchard Date: Tue, 25 Mar 2014 13:40:27 +1100 Subject: [PATCH 3/5] target-ppc: POWER8 supports isel MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add PPC_ISEL to insns_flags. Signed-off-by: Anton Blanchard Reviewed-by: Cédric Le Goater Tested-by: Cédric Le Goater Signed-off-by: Andreas Färber --- target-ppc/translate_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index a82c8f9504..4fda0fd41b 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -7157,7 +7157,7 @@ POWERPC_FAMILY(POWER8)(ObjectClass *oc, void *data) pcc->pvr_mask = CPU_POWERPC_POWER8_MASK; pcc->init_proc = init_proc_POWER8; pcc->check_pow = check_pow_nocheck; - pcc->insns_flags = PPC_INSNS_BASE | PPC_STRING | PPC_MFTB | + pcc->insns_flags = PPC_INSNS_BASE | PPC_ISEL | PPC_STRING | PPC_MFTB | PPC_FLOAT | PPC_FLOAT_FSEL | PPC_FLOAT_FRES | PPC_FLOAT_FSQRT | PPC_FLOAT_FRSQRTE | PPC_FLOAT_FRSQRTES | From 5b2b7dc4e5ed10d439d1aac86879299d9f620f5b Mon Sep 17 00:00:00 2001 From: Anton Blanchard Date: Tue, 25 Mar 2014 13:40:28 +1100 Subject: [PATCH 4/5] target-ppc: POWER7+ supports the MSR_VSX bit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Without MSR_VSX we die early during a Linux boot. Signed-off-by: Anton Blanchard Reviewed-by: Cédric Le Goater Tested-by: Cédric Le Goater Signed-off-by: Andreas Färber --- target-ppc/translate_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 4fda0fd41b..87c00a1af3 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -7118,7 +7118,7 @@ POWERPC_FAMILY(POWER7P)(ObjectClass *oc, void *data) PPC2_PERM_ISA206 | PPC2_DIVE_ISA206 | PPC2_ATOMIC_ISA206 | PPC2_FP_CVT_ISA206 | PPC2_FP_TST_ISA206; - pcc->msr_mask = 0x800000000204FF37ULL; + pcc->msr_mask = 0x800000000284FF37ULL; pcc->mmu_model = POWERPC_MMU_2_06; #if defined(CONFIG_SOFTMMU) pcc->handle_mmu_fault = ppc_hash64_handle_mmu_fault; From 76ac9940c3114db35df92582f3549d9a64a369c4 Mon Sep 17 00:00:00 2001 From: Anton Blanchard Date: Tue, 25 Mar 2014 13:40:29 +1100 Subject: [PATCH 5/5] target-ppc: MSR_POW not supported on POWER7/7+/8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove MSR_POW from the msr_mask for POWER7/7P/8. Signed-off-by: Anton Blanchard Reviewed-by: Cédric Le Goater Tested-by: Cédric Le Goater Signed-off-by: Andreas Färber --- target-ppc/translate_init.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 87c00a1af3..d07e186416 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -7075,7 +7075,7 @@ POWERPC_FAMILY(POWER7)(ObjectClass *oc, void *data) PPC2_PERM_ISA206 | PPC2_DIVE_ISA206 | PPC2_ATOMIC_ISA206 | PPC2_FP_CVT_ISA206 | PPC2_FP_TST_ISA206; - pcc->msr_mask = 0x800000000284FF37ULL; + pcc->msr_mask = 0x800000000280FF37ULL; pcc->mmu_model = POWERPC_MMU_2_06; #if defined(CONFIG_SOFTMMU) pcc->handle_mmu_fault = ppc_hash64_handle_mmu_fault; @@ -7118,7 +7118,7 @@ POWERPC_FAMILY(POWER7P)(ObjectClass *oc, void *data) PPC2_PERM_ISA206 | PPC2_DIVE_ISA206 | PPC2_ATOMIC_ISA206 | PPC2_FP_CVT_ISA206 | PPC2_FP_TST_ISA206; - pcc->msr_mask = 0x800000000284FF37ULL; + pcc->msr_mask = 0x800000000280FF37ULL; pcc->mmu_model = POWERPC_MMU_2_06; #if defined(CONFIG_SOFTMMU) pcc->handle_mmu_fault = ppc_hash64_handle_mmu_fault; @@ -7175,7 +7175,7 @@ POWERPC_FAMILY(POWER8)(ObjectClass *oc, void *data) PPC2_FP_TST_ISA206 | PPC2_BCTAR_ISA207 | PPC2_LSQ_ISA207 | PPC2_ALTIVEC_207 | PPC2_ISA205 | PPC2_ISA207S; - pcc->msr_mask = 0x800000000284FF37ULL; + pcc->msr_mask = 0x800000000280FF37ULL; pcc->mmu_model = POWERPC_MMU_2_06; #if defined(CONFIG_SOFTMMU) pcc->handle_mmu_fault = ppc_hash64_handle_mmu_fault;