* [GIT PULL] KVM/ARM Updates for 3.12
@ 2013-08-30 22:59 Christoffer Dall
2013-08-30 22:59 ` [PATCH 1/4] ARM: KVM: Fix kvm_set_pte assignment Christoffer Dall
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Christoffer Dall @ 2013-08-30 22:59 UTC (permalink / raw)
To: linux-arm-kernel
Hi Gleb and Paolo,
The following changes since commit cc2df20c7c4ce594c3e17e9cc260c330646012c8:
KVM: x86: Update symbolic exit codes (2013-08-13 16:58:42 +0200)
are available in the git repository at:
git://git.linaro.org/people/cdall/linux-kvm-arm.git tags/kvm-arm-for-3.12
for you to fetch changes up to 1fe40f6d39d23f39e643607a3e1883bfc74f1244:
ARM: KVM: Add newlines to panic strings (2013-08-30 15:48:02 -0700)
----------------------------------------------------------------
KVM/ARM Updates for Linux 3.12
----------------------------------------------------------------
Christoffer Dall (4):
ARM: KVM: Fix kvm_set_pte assignment
ARM: KVM: Simplify tracepoint text
ARM: KVM: Work around older compiler bug
ARM: KVM: Add newlines to panic strings
arch/arm/include/asm/kvm_mmu.h | 2 +-
arch/arm/kvm/interrupts.S | 8 ++++----
arch/arm/kvm/reset.c | 2 +-
arch/arm/kvm/trace.h | 7 +++----
4 files changed, 9 insertions(+), 10 deletions(-)
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/4] ARM: KVM: Fix kvm_set_pte assignment
2013-08-30 22:59 [GIT PULL] KVM/ARM Updates for 3.12 Christoffer Dall
@ 2013-08-30 22:59 ` Christoffer Dall
2013-08-30 22:59 ` [PATCH 2/4] ARM: KVM: Simplify tracepoint text Christoffer Dall
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Christoffer Dall @ 2013-08-30 22:59 UTC (permalink / raw)
To: linux-arm-kernel
THe kvm_set_pte function was actually assigning the entire struct to the
structure member, which should work because the structure only has that
one member, but it is still not very nice.
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
---
arch/arm/include/asm/kvm_mmu.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/include/asm/kvm_mmu.h b/arch/arm/include/asm/kvm_mmu.h
index 472ac70..9b28c41 100644
--- a/arch/arm/include/asm/kvm_mmu.h
+++ b/arch/arm/include/asm/kvm_mmu.h
@@ -64,7 +64,7 @@ void kvm_clear_hyp_idmap(void);
static inline void kvm_set_pte(pte_t *pte, pte_t new_pte)
{
- pte_val(*pte) = new_pte;
+ *pte = new_pte;
/*
* flush_pmd_entry just takes a void pointer and cleans the necessary
* cache entries, so we can reuse the function for ptes.
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/4] ARM: KVM: Simplify tracepoint text
2013-08-30 22:59 [GIT PULL] KVM/ARM Updates for 3.12 Christoffer Dall
2013-08-30 22:59 ` [PATCH 1/4] ARM: KVM: Fix kvm_set_pte assignment Christoffer Dall
@ 2013-08-30 22:59 ` Christoffer Dall
2013-08-30 22:59 ` [PATCH 3/4] ARM: KVM: Work around older compiler bug Christoffer Dall
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Christoffer Dall @ 2013-08-30 22:59 UTC (permalink / raw)
To: linux-arm-kernel
The tracepoint for kvm_guest_fault was extremely long, make it a
slightly bit shorter.
Cc: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
---
arch/arm/kvm/trace.h | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/arch/arm/kvm/trace.h b/arch/arm/kvm/trace.h
index a8e73ed..b1d640f 100644
--- a/arch/arm/kvm/trace.h
+++ b/arch/arm/kvm/trace.h
@@ -59,10 +59,9 @@ TRACE_EVENT(kvm_guest_fault,
__entry->ipa = ipa;
),
- TP_printk("guest fault at PC %#08lx (hxfar %#08lx, "
- "ipa %#16llx, hsr %#08lx",
- __entry->vcpu_pc, __entry->hxfar,
- __entry->ipa, __entry->hsr)
+ TP_printk("ipa %#llx, hsr %#08lx, hxfar %#08lx, pc %#08lx",
+ __entry->ipa, __entry->hsr,
+ __entry->hxfar, __entry->vcpu_pc)
);
TRACE_EVENT(kvm_irq_line,
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/4] ARM: KVM: Work around older compiler bug
2013-08-30 22:59 [GIT PULL] KVM/ARM Updates for 3.12 Christoffer Dall
2013-08-30 22:59 ` [PATCH 1/4] ARM: KVM: Fix kvm_set_pte assignment Christoffer Dall
2013-08-30 22:59 ` [PATCH 2/4] ARM: KVM: Simplify tracepoint text Christoffer Dall
@ 2013-08-30 22:59 ` Christoffer Dall
2013-08-30 22:59 ` [PATCH 4/4] ARM: KVM: Add newlines to panic strings Christoffer Dall
2013-09-01 7:53 ` [GIT PULL] KVM/ARM Updates for 3.12 Gleb Natapov
4 siblings, 0 replies; 6+ messages in thread
From: Christoffer Dall @ 2013-08-30 22:59 UTC (permalink / raw)
To: linux-arm-kernel
Compilers before 4.6 do not behave well with unnamed fields in structure
initializers and therefore produces build errors:
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=10676
By refering to the unnamed union using braces, both older and newer
compilers produce the same result.
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Reported-by: Russell King <linux@arm.linux.org.uk>
Tested-by: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
---
arch/arm/kvm/reset.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/kvm/reset.c b/arch/arm/kvm/reset.c
index b7840e7..71e08ba 100644
--- a/arch/arm/kvm/reset.c
+++ b/arch/arm/kvm/reset.c
@@ -40,7 +40,7 @@ static struct kvm_regs a15_regs_reset = {
};
static const struct kvm_irq_level a15_vtimer_irq = {
- .irq = 27,
+ { .irq = 27 },
.level = 1,
};
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 4/4] ARM: KVM: Add newlines to panic strings
2013-08-30 22:59 [GIT PULL] KVM/ARM Updates for 3.12 Christoffer Dall
` (2 preceding siblings ...)
2013-08-30 22:59 ` [PATCH 3/4] ARM: KVM: Work around older compiler bug Christoffer Dall
@ 2013-08-30 22:59 ` Christoffer Dall
2013-09-01 7:53 ` [GIT PULL] KVM/ARM Updates for 3.12 Gleb Natapov
4 siblings, 0 replies; 6+ messages in thread
From: Christoffer Dall @ 2013-08-30 22:59 UTC (permalink / raw)
To: linux-arm-kernel
The panic strings are hard to read and on narrow terminals some
characters are simply truncated off the panic message.
Make is slightly prettier with a newline in the Hyp panic strings.
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
---
arch/arm/kvm/interrupts.S | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/kvm/interrupts.S b/arch/arm/kvm/interrupts.S
index 16cd4ba..85dd84b 100644
--- a/arch/arm/kvm/interrupts.S
+++ b/arch/arm/kvm/interrupts.S
@@ -492,10 +492,10 @@ __kvm_hyp_code_end:
.section ".rodata"
und_die_str:
- .ascii "unexpected undefined exception in Hyp mode at: %#08x"
+ .ascii "unexpected undefined exception in Hyp mode at: %#08x\n"
pabt_die_str:
- .ascii "unexpected prefetch abort in Hyp mode at: %#08x"
+ .ascii "unexpected prefetch abort in Hyp mode at: %#08x\n"
dabt_die_str:
- .ascii "unexpected data abort in Hyp mode at: %#08x"
+ .ascii "unexpected data abort in Hyp mode at: %#08x\n"
svc_die_str:
- .ascii "unexpected HVC/SVC trap in Hyp mode at: %#08x"
+ .ascii "unexpected HVC/SVC trap in Hyp mode at: %#08x\n"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [GIT PULL] KVM/ARM Updates for 3.12
2013-08-30 22:59 [GIT PULL] KVM/ARM Updates for 3.12 Christoffer Dall
` (3 preceding siblings ...)
2013-08-30 22:59 ` [PATCH 4/4] ARM: KVM: Add newlines to panic strings Christoffer Dall
@ 2013-09-01 7:53 ` Gleb Natapov
4 siblings, 0 replies; 6+ messages in thread
From: Gleb Natapov @ 2013-09-01 7:53 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Aug 30, 2013 at 03:59:53PM -0700, Christoffer Dall wrote:
> Hi Gleb and Paolo,
>
> The following changes since commit cc2df20c7c4ce594c3e17e9cc260c330646012c8:
>
> KVM: x86: Update symbolic exit codes (2013-08-13 16:58:42 +0200)
>
> are available in the git repository at:
>
> git://git.linaro.org/people/cdall/linux-kvm-arm.git tags/kvm-arm-for-3.12
>
> for you to fetch changes up to 1fe40f6d39d23f39e643607a3e1883bfc74f1244:
>
> ARM: KVM: Add newlines to panic strings (2013-08-30 15:48:02 -0700)
>
Pulled, thanks.
> ----------------------------------------------------------------
> KVM/ARM Updates for Linux 3.12
>
> ----------------------------------------------------------------
> Christoffer Dall (4):
> ARM: KVM: Fix kvm_set_pte assignment
> ARM: KVM: Simplify tracepoint text
> ARM: KVM: Work around older compiler bug
> ARM: KVM: Add newlines to panic strings
>
> arch/arm/include/asm/kvm_mmu.h | 2 +-
> arch/arm/kvm/interrupts.S | 8 ++++----
> arch/arm/kvm/reset.c | 2 +-
> arch/arm/kvm/trace.h | 7 +++----
> 4 files changed, 9 insertions(+), 10 deletions(-)
--
Gleb.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-09-01 7:53 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-30 22:59 [GIT PULL] KVM/ARM Updates for 3.12 Christoffer Dall
2013-08-30 22:59 ` [PATCH 1/4] ARM: KVM: Fix kvm_set_pte assignment Christoffer Dall
2013-08-30 22:59 ` [PATCH 2/4] ARM: KVM: Simplify tracepoint text Christoffer Dall
2013-08-30 22:59 ` [PATCH 3/4] ARM: KVM: Work around older compiler bug Christoffer Dall
2013-08-30 22:59 ` [PATCH 4/4] ARM: KVM: Add newlines to panic strings Christoffer Dall
2013-09-01 7:53 ` [GIT PULL] KVM/ARM Updates for 3.12 Gleb Natapov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).