Re: [Xen-devel] [PATCH 35/57] ARM: new VGIC: Add GICv2 MMIO handling framework

2018-03-07 Thread Julien Grall 

Hi Andre,

On 03/05/2018 04:03 PM, Andre Przywara wrote:

Create vgic-mmio-v2.c to describe GICv2 emulation specific handlers
using the initializer macros provided by the VGIC MMIO framework.
Provide a function to register the GICv2 distributor registers to
the Xen MMIO framework.
The actual handler functions are still stubs in this patch.

This is based on Linux commit fb848db39661, written by Andre Przywara.

Signed-off-by: Andre Przywara 


Reviewed-by: Julien Grall 

Cheers,

--
Julien Grall

___
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

[Xen-devel] [PATCH 35/57] ARM: new VGIC: Add GICv2 MMIO handling framework

2018-03-05 Thread Andre Przywara 
Create vgic-mmio-v2.c to describe GICv2 emulation specific handlers
using the initializer macros provided by the VGIC MMIO framework.
Provide a function to register the GICv2 distributor registers to
the Xen MMIO framework.
The actual handler functions are still stubs in this patch.

This is based on Linux commit fb848db39661, written by Andre Przywara.

Signed-off-by: Andre Przywara 
---
Changelog RFC ... v1:
- drop (dummy) user interface entries
- use frame number instead of physical address

 xen/arch/arm/vgic/vgic-mmio-v2.c | 83 
 xen/arch/arm/vgic/vgic-mmio.c| 25 
 xen/arch/arm/vgic/vgic-mmio.h|  2 +
 xen/arch/arm/vgic/vgic.h |  2 +
 4 files changed, 112 insertions(+)
 create mode 100644 xen/arch/arm/vgic/vgic-mmio-v2.c

diff --git a/xen/arch/arm/vgic/vgic-mmio-v2.c b/xen/arch/arm/vgic/vgic-mmio-v2.c
new file mode 100644
index 00..6f10cf16ca
--- /dev/null
+++ b/xen/arch/arm/vgic/vgic-mmio-v2.c
@@ -0,0 +1,83 @@
+/*
+ * VGICv2 MMIO handling functions
+ * Imported from Linux ("new" KVM VGIC) and heavily adapted to Xen.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include 
+#include 
+#include 
+#include 
+
+#include "vgic.h"
+#include "vgic-mmio.h"
+
+static const struct vgic_register_region vgic_v2_dist_registers[] = {
+REGISTER_DESC_WITH_LENGTH(GICD_CTLR,
+vgic_mmio_read_raz, vgic_mmio_write_wi, 12,
+VGIC_ACCESS_32bit),
+REGISTER_DESC_WITH_BITS_PER_IRQ(GICD_IGROUPR,
+vgic_mmio_read_rao, vgic_mmio_write_wi, 1,
+VGIC_ACCESS_32bit),
+REGISTER_DESC_WITH_BITS_PER_IRQ(GICD_ISENABLER,
+vgic_mmio_read_raz, vgic_mmio_write_wi, 1,
+VGIC_ACCESS_32bit),
+REGISTER_DESC_WITH_BITS_PER_IRQ(GICD_ICENABLER,
+vgic_mmio_read_raz, vgic_mmio_write_wi, 1,
+VGIC_ACCESS_32bit),
+REGISTER_DESC_WITH_BITS_PER_IRQ(GICD_ISPENDR,
+vgic_mmio_read_raz, vgic_mmio_write_wi, 1,
+VGIC_ACCESS_32bit),
+REGISTER_DESC_WITH_BITS_PER_IRQ(GICD_ICPENDR,
+vgic_mmio_read_raz, vgic_mmio_write_wi, 1,
+VGIC_ACCESS_32bit),
+REGISTER_DESC_WITH_BITS_PER_IRQ(GICD_ISACTIVER,
+vgic_mmio_read_raz, vgic_mmio_write_wi, 1,
+VGIC_ACCESS_32bit),
+REGISTER_DESC_WITH_BITS_PER_IRQ(GICD_ICACTIVER,
+vgic_mmio_read_raz, vgic_mmio_write_wi, 1,
+VGIC_ACCESS_32bit),
+REGISTER_DESC_WITH_BITS_PER_IRQ(GICD_IPRIORITYR,
+vgic_mmio_read_raz, vgic_mmio_write_wi, 8,
+VGIC_ACCESS_32bit | VGIC_ACCESS_8bit),
+REGISTER_DESC_WITH_BITS_PER_IRQ(GICD_ITARGETSR,
+vgic_mmio_read_raz, vgic_mmio_write_wi, 8,
+VGIC_ACCESS_32bit | VGIC_ACCESS_8bit),
+REGISTER_DESC_WITH_BITS_PER_IRQ(GICD_ICFGR,
+vgic_mmio_read_raz, vgic_mmio_write_wi, 2,
+VGIC_ACCESS_32bit),
+REGISTER_DESC_WITH_LENGTH(GICD_SGIR,
+vgic_mmio_read_raz, vgic_mmio_write_wi, 4,
+VGIC_ACCESS_32bit),
+REGISTER_DESC_WITH_LENGTH(GICD_CPENDSGIR,
+vgic_mmio_read_raz, vgic_mmio_write_wi, 16,
+VGIC_ACCESS_32bit | VGIC_ACCESS_8bit),
+REGISTER_DESC_WITH_LENGTH(GICD_SPENDSGIR,
+vgic_mmio_read_raz, vgic_mmio_write_wi, 16,
+VGIC_ACCESS_32bit | VGIC_ACCESS_8bit),
+};
+
+unsigned int vgic_v2_init_dist_iodev(struct vgic_io_device *dev)
+{
+dev->regions = vgic_v2_dist_registers;
+dev->nr_regions = ARRAY_SIZE(vgic_v2_dist_registers);
+
+return SZ_4K;
+}
+
+/*
+ * Local variables:
+ * mode: C
+ * c-file-style: "BSD"
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
diff --git a/xen/arch/arm/vgic/vgic-mmio.c b/xen/arch/arm/vgic/vgic-mmio.c
index 393460d25a..284a92d288 100644
--- a/xen/arch/arm/vgic/vgic-mmio.c
+++ b/xen/arch/arm/vgic/vgic-mmio.c
@@ -170,6 +170,31 @@ struct mmio_handler_ops vgic_io_ops = {
 .write = dispatch_mmio_write,
 };
 
+int vgic_register_dist_iodev(struct domain *d, gfn_t dist_base_fn,
+ enum vgic_type type)
+{
+struct vgic_io_device *io_device = >arch.vgic.dist_iodev;
+unsigned int len;
+
+switch ( type )
+{
+case VGIC_V2:
+len = vgic_v2_init_dist_iodev(io_device);
+break;
+default:
+BUG();
+}
+
+io_device->base_fn = dist_base_fn;
+io_device->iodev_type = IODEV_DIST;
+io_device->redist_vcpu = NULL;
+
+register_mmio_handler(d, _io_ops, gfn_to_gaddr(dist_base_fn), len,
+  io_device);
+
+return 0;
+}
+
 /*
  * Local variables:
  * mode: C
diff --git a/xen/arch/arm/vgic/vgic-mmio.h