Hello,
On 13/08/17 22:30, mja...@caviumnetworks.com wrote:
From: Manish Jaggi <mja...@cavium.com>
This patch extends the gicv3_iomem_deny_access functionality by adding support
for its region as well. Added function gicv3_its_deny_access.
s/its/ITS/ making clearer the commit message.
s/Added/Add/
Signed-off-by: Manish Jaggi <mja...@cavium.com>
---
xen/arch/arm/gic-v3-its.c | 19 +++++++++++++++++++
xen/arch/arm/gic-v3.c | 7 +++++++
xen/include/asm-arm/gic_v3_its.h | 8 ++++++++
3 files changed, 34 insertions(+)
diff --git a/xen/arch/arm/gic-v3-its.c b/xen/arch/arm/gic-v3-its.c
index c4f1288..f584d33 100644
--- a/xen/arch/arm/gic-v3-its.c
+++ b/xen/arch/arm/gic-v3-its.c
@@ -20,6 +20,7 @@
#include <xen/lib.h>
#include <xen/delay.h>
+#include <xen/iocap.h>
#include <xen/libfdt/libfdt.h>
#include <xen/mm.h>
#include <xen/rbtree.h>
@@ -905,6 +906,24 @@ struct pending_irq *gicv3_assign_guest_event(struct domain
*d,
return pirq;
}
+int gicv3_its_deny_access(const struct domain *d)
+{
+ int rc = 0;
+ unsigned long mfn, nr;
+ const struct host_its *its_data;
+
+ list_for_each_entry(its_data, &host_its_list, entry)
+ {
+ mfn = paddr_to_pfn(its_data->addr);
+ nr = PFN_UP(ACPI_GICV3_ITS_MEM_SIZE);
+ rc = iomem_deny_access(d, mfn, mfn + nr);
+ if ( rc )
+ break;
+ }
+
+ return rc;
+}
+
/*
* Create the respective guest DT nodes from a list of host ITSes.
* This copies the reg property, so the guest sees the ITS at the same address
diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c
index 0be8942..045d20d 100644
--- a/xen/arch/arm/gic-v3.c
+++ b/xen/arch/arm/gic-v3.c
@@ -1308,6 +1308,13 @@ static int gicv3_iomem_deny_access(const struct domain
*d)
if ( rc )
return rc;
+ if ( gicv3_its_host_has_its() )
gicv3_its_deny_access will do nothing and return 0 when there are no ITS
present. Same when Xen does not support ITS. So please drop this
pointless check.
+ {
+ rc = gicv3_its_deny_access(d);
+ if ( rc )
+ return rc;
+ }
+
for ( i = 0; i < gicv3.rdist_count; i++ )
{
mfn = gicv3.rdist_regions[i].base >> PAGE_SHIFT;
diff --git a/xen/include/asm-arm/gic_v3_its.h b/xen/include/asm-arm/gic_v3_its.h
index b9d8957..a673fba 100644
--- a/xen/include/asm-arm/gic_v3_its.h
+++ b/xen/include/asm-arm/gic_v3_its.h
@@ -139,6 +139,9 @@ void gicv3_its_dt_init(const struct dt_device_node *node);
int gicv3_its_acpi_init(struct acpi_subtable_header *header,
const unsigned long end);
#endif
Newline here please.
+/* Deny iomem access for its */
+int gicv3_its_deny_access(const struct domain *d);
+
bool gicv3_its_host_has_its(void);
unsigned int vgic_v3_its_count(const struct domain *d);
@@ -208,6 +211,11 @@ static inline int gicv3_its_acpi_init(struct
acpi_subtable_header *header,
}
#endif
+static inline int gicv3_its_deny_access(const struct domain *d)
+{
+ return 0;
+}
+
static inline bool gicv3_its_host_has_its(void)
{
return false;
Cheers,
--
Julien Grall
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
