From: andre.przywara@arm•com (Andre Przywara)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH v3 10/55] KVM: arm/arm64: Export mmio_read/write_bus
Date: Wed, 18 May 2016 15:18:13 +0100 [thread overview]
Message-ID: <573C79A5.6080008@arm.com> (raw)
In-Reply-To: <1462531568-9799-11-git-send-email-andre.przywara@arm.com>
On 06/05/16 11:45, Andre Przywara wrote:
> From: Christoffer Dall <christoffer.dall@linaro•org>
>
> Rename mmio_{read,write}_bus to kvm_mmio_{read,write}_bus and export
> them out of mmio.c.
> This will be needed later for the new VGIC implementation.
>
> Signed-off-by: Christoffer Dall <christoffer.dall@linaro•org>
> Signed-off-by: Andre Przywara <andre.przywara@arm•com>
Reviewed-by: Andre Przywara <andre.przywara@arm•com>
Thanks,
Andre.
> ---
> arch/arm/include/asm/kvm_mmio.h | 3 +++
> arch/arm/kvm/mmio.c | 10 +++++-----
> arch/arm64/include/asm/kvm_mmio.h | 3 +++
> 3 files changed, 11 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/include/asm/kvm_mmio.h b/arch/arm/include/asm/kvm_mmio.h
> index d8e90c8..f3a7de7 100644
> --- a/arch/arm/include/asm/kvm_mmio.h
> +++ b/arch/arm/include/asm/kvm_mmio.h
> @@ -28,6 +28,9 @@ struct kvm_decode {
> bool sign_extend;
> };
>
> +void kvm_mmio_write_buf(void *buf, unsigned int len, unsigned long data);
> +unsigned long kvm_mmio_read_buf(const void *buf, unsigned int len);
> +
> int kvm_handle_mmio_return(struct kvm_vcpu *vcpu, struct kvm_run *run);
> int io_mem_abort(struct kvm_vcpu *vcpu, struct kvm_run *run,
> phys_addr_t fault_ipa);
> diff --git a/arch/arm/kvm/mmio.c b/arch/arm/kvm/mmio.c
> index 0158e9e..10f80a6 100644
> --- a/arch/arm/kvm/mmio.c
> +++ b/arch/arm/kvm/mmio.c
> @@ -23,7 +23,7 @@
>
> #include "trace.h"
>
> -static void mmio_write_buf(char *buf, unsigned int len, unsigned long data)
> +void kvm_mmio_write_buf(void *buf, unsigned int len, unsigned long data)
> {
> void *datap = NULL;
> union {
> @@ -55,7 +55,7 @@ static void mmio_write_buf(char *buf, unsigned int len, unsigned long data)
> memcpy(buf, datap, len);
> }
>
> -static unsigned long mmio_read_buf(char *buf, unsigned int len)
> +unsigned long kvm_mmio_read_buf(const void *buf, unsigned int len)
> {
> unsigned long data = 0;
> union {
> @@ -66,7 +66,7 @@ static unsigned long mmio_read_buf(char *buf, unsigned int len)
>
> switch (len) {
> case 1:
> - data = buf[0];
> + data = *(u8 *)buf;
> break;
> case 2:
> memcpy(&tmp.hword, buf, len);
> @@ -103,7 +103,7 @@ int kvm_handle_mmio_return(struct kvm_vcpu *vcpu, struct kvm_run *run)
> if (len > sizeof(unsigned long))
> return -EINVAL;
>
> - data = mmio_read_buf(run->mmio.data, len);
> + data = kvm_mmio_read_buf(run->mmio.data, len);
>
> if (vcpu->arch.mmio_decode.sign_extend &&
> len < sizeof(unsigned long)) {
> @@ -189,7 +189,7 @@ int io_mem_abort(struct kvm_vcpu *vcpu, struct kvm_run *run,
> len);
>
> trace_kvm_mmio(KVM_TRACE_MMIO_WRITE, len, fault_ipa, data);
> - mmio_write_buf(data_buf, len, data);
> + kvm_mmio_write_buf(data_buf, len, data);
>
> ret = kvm_io_bus_write(vcpu, KVM_MMIO_BUS, fault_ipa, len,
> data_buf);
> diff --git a/arch/arm64/include/asm/kvm_mmio.h b/arch/arm64/include/asm/kvm_mmio.h
> index fe612a9..75ea420 100644
> --- a/arch/arm64/include/asm/kvm_mmio.h
> +++ b/arch/arm64/include/asm/kvm_mmio.h
> @@ -30,6 +30,9 @@ struct kvm_decode {
> bool sign_extend;
> };
>
> +void kvm_mmio_write_buf(void *buf, unsigned int len, unsigned long data);
> +unsigned long kvm_mmio_read_buf(const void *buf, unsigned int len);
> +
> int kvm_handle_mmio_return(struct kvm_vcpu *vcpu, struct kvm_run *run);
> int io_mem_abort(struct kvm_vcpu *vcpu, struct kvm_run *run,
> phys_addr_t fault_ipa);
>
next prev parent reply other threads:[~2016-05-18 14:18 UTC|newest]
Thread overview: 200+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-06 10:45 [PATCH v3 00/55] KVM: arm/arm64: Rework virtual GIC emulation Andre Przywara
2016-05-06 10:45 ` [PATCH v3 01/55] KVM: arm/arm64: vgic: streamline vgic_update_irq_pending() interface Andre Przywara
2016-05-06 10:45 ` [PATCH v3 02/55] KVM: arm/arm64: vgic: avoid map in kvm_vgic_inject_mapped_irq() Andre Przywara
2016-05-06 10:45 ` [PATCH v3 03/55] KVM: arm/arm64: vgic: avoid map in kvm_vgic_map_is_active() Andre Przywara
2016-05-06 10:45 ` [PATCH v3 04/55] KVM: arm/arm64: vgic: avoid map in kvm_vgic_unmap_phys_irq() Andre Przywara
2016-05-06 10:45 ` [PATCH v3 05/55] KVM: arm/arm64: Remove the IRQ field from struct irq_phys_map Andre Przywara
2016-05-06 10:45 ` [PATCH v3 06/55] KVM: arm/arm64: arch_timer: Remove irq_phys_map Andre Przywara
2016-05-10 8:33 ` Eric Auger
2016-05-06 10:45 ` [PATCH v3 07/55] KVM: arm/arm64: vgic: Remove irq_phys_map from interface Andre Przywara
2016-05-06 10:45 ` [PATCH v3 08/55] KVM: arm/arm64: Get rid of vgic_cpu->nr_lr Andre Przywara
2016-05-18 10:43 ` Andre Przywara
2016-05-06 10:45 ` [PATCH v3 09/55] KVM: arm/arm64: Fix MMIO emulation data handling Andre Przywara
2016-05-10 8:57 ` Marc Zyngier
2016-05-18 11:02 ` Andre Przywara
2016-05-06 10:45 ` [PATCH v3 10/55] KVM: arm/arm64: Export mmio_read/write_bus Andre Przywara
2016-05-10 8:59 ` Marc Zyngier
2016-05-18 14:18 ` Andre Przywara [this message]
2016-05-06 10:45 ` [PATCH v3 11/55] KVM: arm/arm64: pmu: abstract access to number of SPIs Andre Przywara
2016-05-10 9:00 ` Marc Zyngier
2016-05-10 9:52 ` Eric Auger
2016-05-10 10:04 ` Marc Zyngier
2016-05-10 14:35 ` [PATCH v3a] " Andre Przywara
2016-05-10 14:58 ` Andrew Jones
2016-05-11 13:52 ` Andre Przywara
2016-05-10 15:22 ` Marc Zyngier
2016-05-06 10:45 ` [PATCH v3 12/55] KVM: arm/arm64: move GICv2 emulation defines into arm-gic-v3.h Andre Przywara
2016-05-10 9:02 ` Marc Zyngier
2016-05-06 10:45 ` [PATCH v3 13/55] KVM: arm/arm64: vgic-new: Add data structure definitions Andre Przywara
2016-05-10 9:05 ` Marc Zyngier
2016-05-12 12:12 ` Christoffer Dall
2016-05-12 12:17 ` Marc Zyngier
2016-05-12 12:23 ` Christoffer Dall
2016-05-12 13:25 ` Andre Przywara
2016-05-12 13:48 ` Christoffer Dall
2016-05-06 10:45 ` [PATCH v3 14/55] KVM: arm/arm64: vgic-new: Add acccessor to new struct vgic_irq instance Andre Przywara
2016-05-10 9:22 ` Marc Zyngier
2016-05-11 9:20 ` Andre Przywara
2016-05-10 9:35 ` Eric Auger
2016-05-06 10:45 ` [PATCH v3 15/55] KVM: arm/arm64: vgic-new: Implement virtual IRQ injection Andre Przywara
2016-05-10 9:25 ` Eric Auger
2016-05-10 9:39 ` Marc Zyngier
2016-05-10 12:08 ` Christoffer Dall
2016-05-06 10:45 ` [PATCH v3 16/55] KVM: arm/arm64: vgic-new: Add IRQ sorting Andre Przywara
2016-05-10 9:29 ` Eric Auger
2016-05-10 9:48 ` Marc Zyngier
2016-05-06 10:45 ` [PATCH v3 17/55] KVM: arm/arm64: vgic-new: Add IRQ sync/flush framework Andre Przywara
2016-05-10 13:11 ` Christoffer Dall
2016-05-10 13:53 ` Eric Auger
2016-05-10 15:20 ` Eric Auger
2016-05-10 17:32 ` Marc Zyngier
2016-05-12 11:46 ` Christoffer Dall
2016-05-12 15:08 ` Andre Przywara
2016-05-06 10:45 ` [PATCH v3 18/55] KVM: arm/arm64: vgic-new: Add GICv2 world switch backend Andre Przywara
2016-05-10 13:30 ` Christoffer Dall
2016-05-10 13:42 ` Marc Zyngier
2016-05-10 13:49 ` Eric Auger
2016-05-10 14:11 ` Christoffer Dall
2016-05-10 14:35 ` Marc Zyngier
2016-05-10 14:45 ` Marc Zyngier
2016-05-11 9:38 ` Christoffer Dall
2016-05-10 14:10 ` Eric Auger
2016-05-11 11:30 ` Andre Przywara
2016-05-11 11:38 ` Eric Auger
2016-05-11 13:09 ` Andre Przywara
2016-05-11 12:26 ` Christoffer Dall
2016-05-11 13:13 ` Andre Przywara
2016-05-06 10:45 ` [PATCH v3 19/55] KVM: arm/arm64: vgic-new: Add GICv3 " Andre Przywara
2016-05-06 19:07 ` Tom Hanson
2016-05-10 14:04 ` Christoffer Dall
2016-05-10 14:15 ` Peter Maydell
2016-05-10 14:22 ` Marc Zyngier
2016-05-11 9:39 ` Christoffer Dall
2016-05-10 15:28 ` Eric Auger
2016-05-10 17:35 ` Marc Zyngier
2016-05-06 10:45 ` [PATCH v3 20/55] KVM: arm/arm64: vgic-new: Implement kvm_vgic_vcpu_pending_irq Andre Przywara
2016-05-10 10:22 ` Marc Zyngier
2016-05-10 14:18 ` Christoffer Dall
2016-05-06 10:45 ` [PATCH v3 21/55] KVM: arm/arm64: vgic-new: Add MMIO handling framework Andre Przywara
2016-05-11 9:46 ` Christoffer Dall
2016-05-06 10:45 ` [PATCH v3 22/55] KVM: arm/arm64: vgic-new: Add GICv2 " Andre Przywara
2016-05-11 9:50 ` Christoffer Dall
2016-05-06 10:45 ` [PATCH v3 23/55] KVM: arm/arm64: vgic-new: Add CTLR, TYPER and IIDR handlers Andre Przywara
2016-05-11 12:05 ` Christoffer Dall
2016-05-11 12:47 ` Andre Przywara
2016-05-11 12:51 ` Marc Zyngier
2016-05-11 13:15 ` Christoffer Dall
2016-05-11 13:27 ` Marc Zyngier
2016-05-11 13:36 ` Andre Przywara
2016-05-11 14:40 ` Marc Zyngier
2016-05-11 13:38 ` Christoffer Dall
2016-05-06 10:45 ` [PATCH v3 24/55] KVM: arm/arm64: vgic-new: Add ENABLE registers handlers Andre Przywara
2016-05-10 10:28 ` Marc Zyngier
2016-05-11 12:34 ` Christoffer Dall
2016-05-11 13:04 ` Andre Przywara
2016-05-11 13:14 ` Christoffer Dall
2016-05-11 13:24 ` Andre Przywara
2016-05-11 13:41 ` Christoffer Dall
2016-05-11 13:16 ` Christoffer Dall
2016-05-11 13:13 ` Marc Zyngier
2016-05-11 13:39 ` Andre Przywara
2016-05-11 14:26 ` Marc Zyngier
2016-05-11 13:47 ` Christoffer Dall
2016-05-11 14:18 ` Andre Przywara
2016-05-11 14:28 ` Andre Przywara
2016-05-06 10:45 ` [PATCH v3 25/55] KVM: arm/arm64: vgic-new: Add PENDING " Andre Przywara
2016-05-10 10:49 ` Marc Zyngier
2016-05-11 13:11 ` Christoffer Dall
2016-05-06 10:45 ` [PATCH v3 26/55] KVM: arm/arm64: vgic-new: Add ACTIVE " Andre Przywara
2016-05-10 12:09 ` Christoffer Dall
2016-05-10 12:14 ` Marc Zyngier
2016-05-10 13:04 ` Andre Przywara
2016-05-10 13:12 ` Christoffer Dall
2016-05-06 10:45 ` [PATCH v3 27/55] KVM: arm/arm64: vgic-new: Add PRIORITY " Andre Przywara
2016-05-11 13:37 ` Christoffer Dall
2016-05-12 9:10 ` Marc Zyngier
2016-05-12 9:56 ` Peter Maydell
2016-05-12 10:09 ` Marc Zyngier
2016-05-06 10:45 ` [PATCH v3 28/55] KVM: arm/arm64: vgic-new: Add CONFIG " Andre Przywara
2016-05-12 8:32 ` Christoffer Dall
2016-05-06 10:45 ` [PATCH v3 29/55] KVM: arm/arm64: vgic-new: Add TARGET " Andre Przywara
2016-05-12 8:35 ` Christoffer Dall
2016-05-12 8:39 ` Marc Zyngier
2016-05-12 8:54 ` Christoffer Dall
2016-05-06 10:45 ` [PATCH v3 30/55] KVM: arm/arm64: vgic-new: Add SGIR register handler Andre Przywara
2016-05-12 8:40 ` Christoffer Dall
2016-05-06 10:45 ` [PATCH v3 31/55] KVM: arm/arm64: vgic-new: Add SGIPENDR register handlers Andre Przywara
2016-05-12 9:09 ` Christoffer Dall
2016-05-06 10:45 ` [PATCH v3 32/55] KVM: arm/arm64: vgic-new: Add GICv3 MMIO handling framework Andre Przywara
2016-05-09 17:18 ` Marc Zyngier
2016-05-09 17:51 ` Chalamarla, Tirumalesh
2016-05-10 10:58 ` [PATCH] KVM: arm/arm64: vgic-new: fix overlap check for device addresses Andre Przywara
2016-05-10 13:16 ` Marc Zyngier
2016-05-10 17:18 ` [PATCH v2] " Andre Przywara
2016-05-12 19:43 ` Christoffer Dall
2016-05-12 10:26 ` [PATCH v3 32/55] KVM: arm/arm64: vgic-new: Add GICv3 MMIO handling framework Christoffer Dall
2016-05-12 10:52 ` Andre Przywara
2016-05-12 10:58 ` Marc Zyngier
2016-05-06 10:45 ` [PATCH v3 33/55] KVM: arm/arm64: vgic-new: Add GICv3 CTLR, IIDR, TYPER handlers Andre Przywara
2016-05-12 11:47 ` Christoffer Dall
2016-05-12 12:33 ` Andre Przywara
2016-05-06 10:45 ` [PATCH v3 34/55] KVM: arm/arm64: vgic-new: Add GICv3 redistributor IIDR and TYPER handler Andre Przywara
2016-05-12 11:59 ` Christoffer Dall
2016-05-06 10:45 ` [PATCH v3 35/55] KVM: arm/arm64: vgic-new: Add GICv3 IDREGS register handler Andre Przywara
2016-05-12 12:12 ` Christoffer Dall
2016-05-12 12:37 ` Andre Przywara
2016-05-06 10:45 ` [PATCH v3 36/55] KVM: arm/arm64: vgic-new: Add GICv3 IROUTER register handlers Andre Przywara
2016-05-12 12:21 ` Christoffer Dall
2016-05-12 12:37 ` Marc Zyngier
2016-05-12 13:41 ` Christoffer Dall
2016-05-12 14:00 ` Andre Przywara
2016-05-12 14:20 ` Marc Zyngier
2016-05-06 10:45 ` [PATCH v3 37/55] KVM: arm/arm64: vgic-new: Add GICv3 SGI system register trap handler Andre Przywara
2016-05-12 12:40 ` Christoffer Dall
2016-05-06 10:45 ` [PATCH v3 38/55] KVM: arm/arm64: vgic-new: vgic_kvm_device: KVM device ops registration Andre Przywara
2016-05-13 10:11 ` Christoffer Dall
2016-05-06 10:45 ` [PATCH v3 39/55] KVM: arm/arm64: vgic-new: vgic_kvm_device: KVM_DEV_ARM_VGIC_GRP_NR_IRQS Andre Przywara
2016-05-13 10:11 ` Christoffer Dall
2016-05-06 10:45 ` [PATCH v3 40/55] KVM: arm/arm64: vgic-new: vgic_kvm_device: KVM_DEV_ARM_VGIC_GRP_CTRL Andre Przywara
2016-05-13 10:11 ` Christoffer Dall
2016-05-06 10:45 ` [PATCH v3 41/55] KVM: arm/arm64: vgic-new: vgic_kvm_device: implement kvm_vgic_addr Andre Przywara
2016-05-13 10:12 ` Christoffer Dall
2016-05-06 10:45 ` [PATCH v3 42/55] KVM: arm/arm64: vgic-new: vgic_kvm_device: KVM_DEV_ARM_VGIC_GRP_ADDR Andre Przywara
2016-05-13 10:12 ` Christoffer Dall
2016-05-06 10:45 ` [PATCH v3 43/55] KVM: arm/arm64: vgic-new: vgic_kvm_device: access to VGIC registers Andre Przywara
2016-05-12 18:30 ` Christoffer Dall
2016-05-13 12:24 ` Andre Przywara
2016-05-13 12:29 ` Christoffer Dall
2016-05-13 12:30 ` Marc Zyngier
2016-05-06 10:45 ` [PATCH v3 44/55] KVM: arm/arm64: vgic-new: Export register access interface Andre Przywara
2016-05-06 10:45 ` [PATCH v3 45/55] KVM: arm/arm64: vgic-new: Add userland access to VGIC dist registers Andre Przywara
2016-05-12 18:41 ` Christoffer Dall
2016-05-12 19:10 ` Andre Przywara
2016-05-13 7:51 ` Christoffer Dall
2016-05-06 10:45 ` [PATCH v3 46/55] KVM: arm/arm64: vgic-new: Add GICH_VMCR accessors Andre Przywara
2016-05-12 18:43 ` Christoffer Dall
2016-05-06 10:46 ` [PATCH v3 47/55] KVM: arm/arm64: vgic-new: Add userland GIC CPU interface access Andre Przywara
2016-05-09 17:27 ` Marc Zyngier
2016-05-11 8:24 ` Andre Przywara
2016-05-12 18:47 ` Christoffer Dall
2016-05-12 18:52 ` Andre Przywara
2016-05-13 7:53 ` Christoffer Dall
2016-05-13 10:44 ` Andre Przywara
2016-05-13 11:54 ` Christoffer Dall
2016-05-13 12:23 ` Andre Przywara
2016-05-13 12:32 ` Christoffer Dall
2016-05-06 10:46 ` [PATCH v3 48/55] KVM: arm/arm64: vgic-new: vgic_init: implement kvm_vgic_hyp_init Andre Przywara
2016-05-12 19:00 ` Christoffer Dall
2016-05-06 10:46 ` [PATCH v3 49/55] KVM: arm/arm64: vgic-new: vgic_init: implement vgic_create Andre Przywara
2016-05-12 19:08 ` Christoffer Dall
2016-05-06 10:46 ` [PATCH v3 50/55] KVM: arm/arm64: vgic-new: vgic_init: implement vgic_init Andre Przywara
2016-05-12 19:25 ` Christoffer Dall
2016-05-06 10:46 ` [PATCH v3 51/55] KVM: arm/arm64: vgic-new: vgic_init: implement map_resources Andre Przywara
2016-05-12 19:28 ` Christoffer Dall
2016-05-06 10:46 ` [PATCH v3 52/55] KVM: arm/arm64: vgic-new: Add vgic_v2/v3_enable Andre Przywara
2016-05-12 19:30 ` Christoffer Dall
2016-05-06 10:46 ` [PATCH v3 53/55] KVM: arm/arm64: vgic-new: Wire up irqfd injection Andre Przywara
2016-05-12 19:33 ` Christoffer Dall
2016-05-06 10:46 ` [PATCH v3 54/55] KVM: arm/arm64: vgic-new: implement mapped IRQ handling Andre Przywara
2016-05-12 19:36 ` Christoffer Dall
2016-05-06 10:46 ` [PATCH v3 55/55] KVM: arm/arm64: vgic-new: enable build Andre Przywara
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=573C79A5.6080008@arm.com \
--to=andre.przywara@arm$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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