From mboxrd@z Thu Jan 1 00:00:00 1970 From: vijay.kilari@gmail.com Subject: [PATCH v5 09/22] xen/arm: ITS: Export ITS info to Virtual ITS Date: Mon, 27 Jul 2015 16:41:51 +0530 Message-ID: <1437995524-19772-10-git-send-email-vijay.kilari@gmail.com> References: <1437995524-19772-1-git-send-email-vijay.kilari@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1437995524-19772-1-git-send-email-vijay.kilari@gmail.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Ian.Campbell@citrix.com, julien.grall@citrix.com, stefano.stabellini@eu.citrix.com, stefano.stabellini@citrix.com, tim@xen.org, xen-devel@lists.xen.org Cc: Prasun.Kapoor@caviumnetworks.com, manish.jaggi@caviumnetworks.com, Vijaya Kumar K , vijay.kilari@gmail.com List-Id: xen-devel@lists.xenproject.org From: Vijaya Kumar K Export physical ITS information to virtual ITS driver Signed-off-by: Vijaya Kumar K --- xen/arch/arm/gic-v3-its.c | 27 ++++++++++++++++++++++++++- xen/arch/arm/vgic-v3-its.c | 9 +++++++++ xen/include/asm-arm/gic-its.h | 14 ++++++++++++++ 3 files changed, 49 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/gic-v3-its.c b/xen/arch/arm/gic-v3-its.c index aa4d3c5..e16fa03 100644 --- a/xen/arch/arm/gic-v3-its.c +++ b/xen/arch/arm/gic-v3-its.c @@ -94,6 +94,7 @@ static LIST_HEAD(its_nodes); static DEFINE_SPINLOCK(its_lock); static struct rdist_prop *gic_rdists; static struct rb_root rb_its_dev; +static struct gic_its_info its_data; static DEFINE_SPINLOCK(rb_its_dev_lock); #define gic_data_rdist() (this_cpu(rdist)) @@ -942,6 +943,8 @@ static int its_probe(struct dt_device_node *node) its->phys_size = its_size; typer = readl_relaxed(its_base + GITS_TYPER); its->ite_size = ((typer >> 4) & 0xf) + 1; + its_data.eventid_bits = GITS_TYPER_IDBITS(typer); + its_data.dev_bits = GITS_TYPER_DEVBITS(typer); its->cmd_base = xzalloc_bytes(ITS_CMD_QUEUE_SZ); if ( !its->cmd_base ) @@ -1032,7 +1035,10 @@ int its_cpu_init(void) int __init its_init(struct rdist_prop *rdists) { + struct its_node *its; + struct its_node_info *info; struct dt_device_node *np = NULL; + uint32_t i, nr_its = 0; static const struct dt_device_match its_device_ids[] __initconst = { @@ -1042,7 +1048,10 @@ int __init its_init(struct rdist_prop *rdists) for (np = dt_find_matching_node(NULL, its_device_ids); np; np = dt_find_matching_node(np, its_device_ids)) - its_probe(np); + { + if ( !its_probe(np) ) + nr_its++; + } if ( list_empty(&its_nodes) ) { @@ -1050,6 +1059,22 @@ int __init its_init(struct rdist_prop *rdists) return -ENXIO; } + info = xzalloc_array(struct its_node_info, nr_its); + if ( !info ) + return -ENOMEM; + + i = 0; + list_for_each_entry(its, &its_nodes, entry) + { + info[i].phys_base = its->phys_base; + info[i].phys_size = its->phys_size; + i++; + } + + its_data.nr_its = nr_its; + its_data.its_hw = info; + vits_setup_hw(&its_data); + gic_rdists = rdists; its_lpi_init(rdists->id_bits); its_alloc_lpi_tables(); diff --git a/xen/arch/arm/vgic-v3-its.c b/xen/arch/arm/vgic-v3-its.c index dfa3435..3a003d4 100644 --- a/xen/arch/arm/vgic-v3-its.c +++ b/xen/arch/arm/vgic-v3-its.c @@ -51,6 +51,15 @@ static void dump_cmd(its_cmd_block *cmd) static void dump_cmd(its_cmd_block *cmd) { do {} while ( 0 ); } #endif +static struct { + struct gic_its_info *info; +} vits_hw; + +void vits_setup_hw(struct gic_its_info *its_info) +{ + vits_hw.info = its_info; +} + static int vits_access_guest_table(struct domain *d, paddr_t entry, void *addr, uint32_t size, bool_t set) { diff --git a/xen/include/asm-arm/gic-its.h b/xen/include/asm-arm/gic-its.h index cdb786c..23ff66c 100644 --- a/xen/include/asm-arm/gic-its.h +++ b/xen/include/asm-arm/gic-its.h @@ -309,12 +309,26 @@ struct vitt { uint32_t vlpi; }; +struct its_node_info +{ + paddr_t phys_base; + unsigned long phys_size; +}; + +struct gic_its_info { + uint32_t eventid_bits; + uint32_t dev_bits; + uint32_t nr_its; + struct its_node_info *its_hw; +}; + int its_init(struct rdist_prop *rdists); int its_cpu_init(void); int vits_get_vitt_entry(struct domain *d, uint32_t devid, uint32_t event, struct vitt *entry); int vits_get_vdevice_entry(struct domain *d, uint32_t devid, struct vdevice_table *entry); +void vits_setup_hw(struct gic_its_info *info); #endif /* __ASM_ARM_GIC_ITS_H__ */ /* -- 1.7.9.5