From: Will Deacon <will.deacon@arm.com>
To: kvm@vger.kernel.org
Cc: penberg@kernel.org, marc.zyngier@arm.com, anup@brainfault.org,
rusty@rustcorp.com.au, pranavkumar@linaro.org,
michael@ellerman.id.au, Will Deacon <will.deacon@arm.com>
Subject: [RFC PATCH 03/11] kvm tools: arm: add ioport window to virtual memory map
Date: Wed, 1 May 2013 16:50:08 +0100 [thread overview]
Message-ID: <1367423416-24640-4-git-send-email-will.deacon@arm.com> (raw)
In-Reply-To: <1367423416-24640-1-git-send-email-will.deacon@arm.com>
Whilst ARM neither needs or wants a complete x86 legacy ioport emulation,
the 8250 is a useful alternative to virtio-console, so carve out 64k at the
bottom of our virtual memory map where we can add ioports if we choose.
Signed-off-by: Will Deacon <will.deacon@arm.com>
---
tools/kvm/arm/include/arm-common/kvm-arch.h | 12 ++++++++++--
tools/kvm/arm/kvm-cpu.c | 9 +++++++--
2 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/tools/kvm/arm/include/arm-common/kvm-arch.h b/tools/kvm/arm/include/arm-common/kvm-arch.h
index 7860e17..03ead5b 100644
--- a/tools/kvm/arm/include/arm-common/kvm-arch.h
+++ b/tools/kvm/arm/include/arm-common/kvm-arch.h
@@ -5,7 +5,8 @@
#include <linux/const.h>
#include <linux/types.h>
-#define ARM_MMIO_AREA _AC(0x0000000000000000, UL)
+#define ARM_IOPORT_AREA _AC(0x0000000000000000, UL)
+#define ARM_MMIO_AREA _AC(0x0000000000010000, UL)
#define ARM_AXI_AREA _AC(0x0000000040000000, UL)
#define ARM_MEMORY_AREA _AC(0x0000000080000000, UL)
@@ -16,7 +17,8 @@
#define ARM_GIC_CPUI_BASE (ARM_GIC_DIST_BASE - ARM_GIC_CPUI_SIZE)
#define ARM_GIC_SIZE (ARM_GIC_DIST_SIZE + ARM_GIC_CPUI_SIZE)
-#define ARM_VIRTIO_MMIO_SIZE (ARM_AXI_AREA - ARM_GIC_SIZE)
+#define ARM_IOPORT_SIZE (ARM_MMIO_AREA - ARM_IOPORT_AREA)
+#define ARM_VIRTIO_MMIO_SIZE (ARM_AXI_AREA - (ARM_MMIO_AREA + ARM_GIC_SIZE))
#define ARM_PCI_MMIO_SIZE (ARM_MEMORY_AREA - ARM_AXI_AREA)
#define KVM_PCI_MMIO_AREA ARM_AXI_AREA
@@ -24,6 +26,12 @@
#define VIRTIO_DEFAULT_TRANS VIRTIO_MMIO
+static inline bool arm_addr_in_ioport_region(u64 phys_addr)
+{
+ u64 limit = ARM_IOPORT_AREA + ARM_IOPORT_SIZE;
+ return phys_addr >= ARM_IOPORT_AREA && phys_addr < limit;
+}
+
static inline bool arm_addr_in_virtio_mmio_region(u64 phys_addr)
{
u64 limit = KVM_VIRTIO_MMIO_AREA + ARM_VIRTIO_MMIO_SIZE;
diff --git a/tools/kvm/arm/kvm-cpu.c b/tools/kvm/arm/kvm-cpu.c
index 6d4f306..d31e7b1 100644
--- a/tools/kvm/arm/kvm-cpu.c
+++ b/tools/kvm/arm/kvm-cpu.c
@@ -101,10 +101,15 @@ bool kvm_cpu__handle_exit(struct kvm_cpu *vcpu)
bool kvm_cpu__emulate_mmio(struct kvm *kvm, u64 phys_addr, u8 *data, u32 len,
u8 is_write)
{
- if (arm_addr_in_virtio_mmio_region(phys_addr))
+ if (arm_addr_in_virtio_mmio_region(phys_addr)) {
return kvm__emulate_mmio(kvm, phys_addr, data, len, is_write);
- else if (arm_addr_in_pci_mmio_region(phys_addr))
+ } else if (arm_addr_in_ioport_region(phys_addr)) {
+ int direction = is_write ? KVM_EXIT_IO_OUT : KVM_EXIT_IO_IN;
+ u16 port = phys_addr & USHRT_MAX;
+ return kvm__emulate_io(kvm, port, data, direction, len, 1);
+ } else if (arm_addr_in_pci_mmio_region(phys_addr)) {
die("PCI emulation not supported on ARM!");
+ }
return false;
}
--
1.8.0
next prev parent reply other threads:[~2013-05-01 15:50 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-01 15:50 [RFC PATCH 00/11] kvm tools: allow ioport emulation to be used on ARM Will Deacon
2013-05-01 15:50 ` [RFC PATCH 01/11] kvm tools: makefile: factor out libfdt inclusion Will Deacon
2013-05-01 15:50 ` [RFC PATCH 02/11] kvm tools: virtio: move fdt node generation into core mmio code Will Deacon
2013-05-01 15:50 ` Will Deacon [this message]
2013-05-01 15:50 ` [RFC PATCH 04/11] kvm tools: console: unconditionally output to any console Will Deacon
2013-05-03 9:19 ` Pekka Enberg
2013-05-03 16:02 ` Sasha Levin
2013-05-03 16:09 ` Will Deacon
2013-05-06 21:04 ` Sasha Levin
2013-05-07 2:48 ` Anup Patel
2013-05-05 10:16 ` Asias He
2013-05-01 15:50 ` [RFC PATCH 05/11] kvm tools: allow ioports to be offset from 0 Will Deacon
2013-05-01 15:50 ` [RFC PATCH 06/11] kvm tools: ioport: add arch callback to remap IRQ lines for ioport devices Will Deacon
2013-05-01 15:50 ` [RFC PATCH 07/11] kvm tools: ioport: allow ioport devices to generate fdt nodes Will Deacon
2013-05-01 15:50 ` [RFC PATCH 08/11] kvm tools: 8250: add fdt node generation Will Deacon
2013-05-01 15:50 ` [RFC PATCH 09/11] kvm tools: 8250: add address qualifier to uart name in fdt node Will Deacon
2013-05-01 15:50 ` [RFC PATCH 10/11] kvm tools: ARM: generate fdt nodes for ioport devices Will Deacon
2013-05-01 15:50 ` [RFC PATCH 11/11] kvm tools: ARM: add 8250 console callback to periodic poll Will Deacon
2013-05-03 6:53 ` [RFC PATCH 00/11] kvm tools: allow ioport emulation to be used on ARM Michael Ellerman
2013-05-14 15:29 ` Pekka Enberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1367423416-24640-4-git-send-email-will.deacon@arm.com \
--to=will.deacon@arm.com \
--cc=anup@brainfault.org \
--cc=kvm@vger.kernel.org \
--cc=marc.zyngier@arm.com \
--cc=michael@ellerman.id.au \
--cc=penberg@kernel.org \
--cc=pranavkumar@linaro.org \
--cc=rusty@rustcorp.com.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox