| Message ID | 20170316112030.20419-2-andre.przywara@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Andre, On 03/16/2017 11:20 AM, Andre Przywara wrote: > diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig > index 2e023d1..bf64c61 100644 > --- a/xen/arch/arm/Kconfig > +++ b/xen/arch/arm/Kconfig > @@ -45,6 +45,10 @@ config ACPI > config HAS_GICV3 > bool > > +config HAS_ITS > + bool "GICv3 ITS MSI controller support" > + depends on HAS_GICV3 IIRC, we discussed that GICv3 ITS will be a technical preview for Xen 4.9. I think case I think it should depends on EXPERT mode to avoid been shipped by default. > + > endmenu > > menu "ARM errata workaround via the alternative framework" [...] > diff --git a/xen/arch/arm/gic-v3-its.c b/xen/arch/arm/gic-v3-its.c > new file mode 100644 > index 0000000..4056e5b > --- /dev/null > +++ b/xen/arch/arm/gic-v3-its.c > @@ -0,0 +1,73 @@ > +/* > + * xen/arch/arm/gic-v3-its.c > + * > + * ARM GICv3 Interrupt Translation Service (ITS) support > + * > + * Copyright (C) 2016,2017 - ARM Ltd > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License as published by > + * the Free Software Foundation; under version 2 of the License. > + * > + * 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. > + * > + * You should have received a copy of the GNU General Public License > + * along with this program; If not, see <http://www.gnu.org/licenses/>. > + */ > + > +#include <xen/lib.h> > +#include <asm/gic_v3_defs.h> > +#include <asm/gic_v3_its.h> > + > +LIST_HEAD(host_its_list); On the previous version we agreed that host_its_list should be confined to gic-v3-its.c. So why is it still exported? [...] > diff --git a/xen/include/asm-arm/gic_v3_its.h b/xen/include/asm-arm/gic_v3_its.h > new file mode 100644 > index 0000000..765a655 > --- /dev/null > +++ b/xen/include/asm-arm/gic_v3_its.h > @@ -0,0 +1,67 @@ [...] > +#else > + > +static LIST_HEAD(host_its_list); This is quite ugly and could really be avoided if the host_its_list was confined as we agreed in the previous version. Cheers,
Hi, On 21/03/17 20:17, Julien Grall wrote: > Hi Andre, > > On 03/16/2017 11:20 AM, Andre Przywara wrote: >> diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig >> index 2e023d1..bf64c61 100644 >> --- a/xen/arch/arm/Kconfig >> +++ b/xen/arch/arm/Kconfig >> @@ -45,6 +45,10 @@ config ACPI >> config HAS_GICV3 >> bool >> >> +config HAS_ITS >> + bool "GICv3 ITS MSI controller support" >> + depends on HAS_GICV3 > > IIRC, we discussed that GICv3 ITS will be a technical preview for Xen > 4.9. I think case I think it should depends on EXPERT mode to avoid been > shipped by default. > >> + >> endmenu >> >> menu "ARM errata workaround via the alternative framework" > > [...] > >> diff --git a/xen/arch/arm/gic-v3-its.c b/xen/arch/arm/gic-v3-its.c >> new file mode 100644 >> index 0000000..4056e5b >> --- /dev/null >> +++ b/xen/arch/arm/gic-v3-its.c >> @@ -0,0 +1,73 @@ >> +/* >> + * xen/arch/arm/gic-v3-its.c >> + * >> + * ARM GICv3 Interrupt Translation Service (ITS) support >> + * >> + * Copyright (C) 2016,2017 - ARM Ltd >> + * >> + * This program is free software; you can redistribute it and/or modify >> + * it under the terms of the GNU General Public License as published by >> + * the Free Software Foundation; under version 2 of the License. >> + * >> + * 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. >> + * >> + * You should have received a copy of the GNU General Public License >> + * along with this program; If not, see <http://www.gnu.org/licenses/>. >> + */ >> + >> +#include <xen/lib.h> >> +#include <asm/gic_v3_defs.h> >> +#include <asm/gic_v3_its.h> >> + >> +LIST_HEAD(host_its_list); > > On the previous version we agreed that host_its_list should be confined > to gic-v3-its.c. So why is it still exported? Because I need it later on in vgic-v3.c, when creating virtual ITSes that mimic the host ITSes, see patch 25/27. I haven't found a neat solution for that yet. For the rest of the code you will see that every other reference to the host_its_list has been removed, so it is *mostly* confined to gic-v3-its.c by now. > > [...] > >> diff --git a/xen/include/asm-arm/gic_v3_its.h >> b/xen/include/asm-arm/gic_v3_its.h >> new file mode 100644 >> index 0000000..765a655 >> --- /dev/null >> +++ b/xen/include/asm-arm/gic_v3_its.h >> @@ -0,0 +1,67 @@ > > > [...] > >> +#else >> + >> +static LIST_HEAD(host_its_list); > > This is quite ugly and could really be avoided if the host_its_list was > confined as we agreed in the previous version. I think you said that you are fine with an export if it cannot easily be avoided. Cheers, Andre.
Hi Andre, On 23/03/17 10:57, Andre Przywara wrote: > On 21/03/17 20:17, Julien Grall wrote: >> On 03/16/2017 11:20 AM, Andre Przywara wrote: >>> diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig >>> index 2e023d1..bf64c61 100644 >>> diff --git a/xen/arch/arm/gic-v3-its.c b/xen/arch/arm/gic-v3-its.c >>> new file mode 100644 >>> index 0000000..4056e5b >>> --- /dev/null >>> +++ b/xen/arch/arm/gic-v3-its.c >>> @@ -0,0 +1,73 @@ >>> +/* >>> + * xen/arch/arm/gic-v3-its.c >>> + * >>> + * ARM GICv3 Interrupt Translation Service (ITS) support >>> + * >>> + * Copyright (C) 2016,2017 - ARM Ltd >>> + * >>> + * This program is free software; you can redistribute it and/or modify >>> + * it under the terms of the GNU General Public License as published by >>> + * the Free Software Foundation; under version 2 of the License. >>> + * >>> + * 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. >>> + * >>> + * You should have received a copy of the GNU General Public License >>> + * along with this program; If not, see <http://www.gnu.org/licenses/>. >>> + */ >>> + >>> +#include <xen/lib.h> >>> +#include <asm/gic_v3_defs.h> >>> +#include <asm/gic_v3_its.h> >>> + >>> +LIST_HEAD(host_its_list); >> >> On the previous version we agreed that host_its_list should be confined >> to gic-v3-its.c. So why is it still exported? > > Because I need it later on in vgic-v3.c, when creating virtual ITSes > that mimic the host ITSes, see patch 25/27. I haven't found a neat > solution for that yet. I will have a look. Cheers,
diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index 2e023d1..bf64c61 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -45,6 +45,10 @@ config ACPI config HAS_GICV3 bool +config HAS_ITS + bool "GICv3 ITS MSI controller support" + depends on HAS_GICV3 + endmenu menu "ARM errata workaround via the alternative framework" diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 7afb8a3..54860e0 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -18,6 +18,7 @@ obj-$(EARLY_PRINTK) += early_printk.o obj-y += gic.o obj-y += gic-v2.o obj-$(CONFIG_HAS_GICV3) += gic-v3.o +obj-$(CONFIG_HAS_ITS) += gic-v3-its.o obj-y += guestcopy.o obj-y += hvm.o obj-y += io.o diff --git a/xen/arch/arm/gic-v3-its.c b/xen/arch/arm/gic-v3-its.c new file mode 100644 index 0000000..4056e5b --- /dev/null +++ b/xen/arch/arm/gic-v3-its.c @@ -0,0 +1,73 @@ +/* + * xen/arch/arm/gic-v3-its.c + * + * ARM GICv3 Interrupt Translation Service (ITS) support + * + * Copyright (C) 2016,2017 - ARM Ltd + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; under version 2 of the License. + * + * 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. + * + * You should have received a copy of the GNU General Public License + * along with this program; If not, see <http://www.gnu.org/licenses/>. + */ + +#include <xen/lib.h> +#include <asm/gic_v3_defs.h> +#include <asm/gic_v3_its.h> + +LIST_HEAD(host_its_list); + +bool gicv3_its_host_has_its(void) +{ + return !list_empty(&host_its_list); +} + +/* Scan the DT for any ITS nodes and create a list of host ITSes out of it. */ +void gicv3_its_dt_init(const struct dt_device_node *node) +{ + const struct dt_device_node *its = NULL; + struct host_its *its_data; + + /* + * Check for ITS MSI subnodes. If any, add the ITS register + * frames to the ITS list. + */ + dt_for_each_child_node(node, its) + { + uint64_t addr, size; + + if ( !dt_device_is_compatible(its, "arm,gic-v3-its") ) + continue; + + if ( dt_device_get_address(its, 0, &addr, &size) ) + panic("GICv3: Cannot find a valid ITS frame address"); + + its_data = xzalloc(struct host_its); + if ( !its_data ) + panic("GICv3: Cannot allocate memory for ITS frame"); + + its_data->addr = addr; + its_data->size = size; + its_data->dt_node = its; + + printk("GICv3: Found ITS @0x%lx\n", addr); + + list_add_tail(&its_data->entry, &host_its_list); + } +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c index 955591b..1512521 100644 --- a/xen/arch/arm/gic-v3.c +++ b/xen/arch/arm/gic-v3.c @@ -43,6 +43,7 @@ #include <asm/device.h> #include <asm/gic.h> #include <asm/gic_v3_defs.h> +#include <asm/gic_v3_its.h> #include <asm/cpufeature.h> #include <asm/acpi.h> @@ -1228,11 +1229,12 @@ static void __init gicv3_dt_init(void) */ res = dt_device_get_address(node, 1 + gicv3.rdist_count, &cbase, &csize); - if ( res ) - return; + if ( !res ) + dt_device_get_address(node, 1 + gicv3.rdist_count + 2, + &vbase, &vsize); - dt_device_get_address(node, 1 + gicv3.rdist_count + 2, - &vbase, &vsize); + /* Check for ITS child nodes and build the host ITS list accordingly. */ + gicv3_its_dt_init(node); } static int gicv3_iomem_deny_access(const struct domain *d) diff --git a/xen/include/asm-arm/gic_v3_its.h b/xen/include/asm-arm/gic_v3_its.h new file mode 100644 index 0000000..765a655 --- /dev/null +++ b/xen/include/asm-arm/gic_v3_its.h @@ -0,0 +1,67 @@ +/* + * ARM GICv3 ITS support + * + * Andre Przywara <andre.przywara@arm.com> + * Copyright (c) 2016,2017 ARM Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; under version 2 of the License. + * + * 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. + * + * You should have received a copy of the GNU General Public License + * along with this program; If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef __ASM_ARM_ITS_H__ +#define __ASM_ARM_ITS_H__ + +#include <xen/device_tree.h> + +/* data structure for each hardware ITS */ +struct host_its { + struct list_head entry; + const struct dt_device_node *dt_node; + paddr_t addr; + paddr_t size; +}; + + +#ifdef CONFIG_HAS_ITS + +extern struct list_head host_its_list; + +/* Parse the host DT and pick up all host ITSes. */ +void gicv3_its_dt_init(const struct dt_device_node *node); + +bool gicv3_its_host_has_its(void); + +#else + +static LIST_HEAD(host_its_list); + +static inline void gicv3_its_dt_init(const struct dt_device_node *node) +{ +} + +static inline bool gicv3_its_host_has_its(void) +{ + return false; +} + +#endif /* CONFIG_HAS_ITS */ + +#endif + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */
Parse the DT GIC subnodes to find every ITS MSI controller the hardware offers. Store that information in a list to both propagate all of them later to Dom0, but also to be able to iterate over all ITSes. This introduces an ITS Kconfig option. Signed-off-by: Andre Przywara <andre.przywara@arm.com> --- xen/arch/arm/Kconfig | 4 +++ xen/arch/arm/Makefile | 1 + xen/arch/arm/gic-v3-its.c | 73 ++++++++++++++++++++++++++++++++++++++++ xen/arch/arm/gic-v3.c | 10 +++--- xen/include/asm-arm/gic_v3_its.h | 67 ++++++++++++++++++++++++++++++++++++ 5 files changed, 151 insertions(+), 4 deletions(-) create mode 100644 xen/arch/arm/gic-v3-its.c create mode 100644 xen/include/asm-arm/gic_v3_its.h