xen/arm: Consolidate make_timer_node and make_timer_domU_node
v8 cover xen/arm: Consolidate make_timer_node and make_timer_domU_node
Functions make_timer_node and make_timer_domU_node are quite similar, so it is better to consolidate them to avoid discrepancy.
This patch series achives this goal in two steps:
- Extend fdt_property_interrupts to deal with other domain than the hwdom.
- Consolidate make_timer_node and make_timer_domU_node into one function:
Viktor Mitin (2):
xen/arm: extend fdt_property_interrupts to support DomU xen/arm: consolidate make_timer_node and make_timer_domU_node
xen/arch/arm/domain_build.c | 118 ++++++++++++++---------------------- 1 file changed, 44 insertions(+), 74 deletions(-)
Signature · 7 lines
2.17.1 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH v8 1/2 xen/arm: extend fdt_property_interrupts to support DomU
The domain and fdt can be found in the structure kinfo.
Rather than adding a an extra argument for the domain, pass directly kinfo. This also requires to adapt fdt_property_interrupts() prototype. A follow-up patch will need to create the interrupts for either Dom0 or DomU.
---
v7: removed extra space after sizeof in fdt_property_interrupts()
v8: updated commit message
--- xen/arch/arm/domain_build.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)
xen/arch/arm/domain_build.c +12 -8
@@ -621,17 +621,20 @@ static void __init set_interrupt(gic_interrupt_t interrupt,* "interrupts": contains the list of interrupts * "interrupt-parent": link to the GIC */ -static int __init fdt_property_interrupts (void *fdt,gic_interrupt_t *intr, +static int __init fdt_property_interrupts (const struct kernel_info *kinfo, +gic_interrupt_t *intr,unsigned num_irq) {int res; +uint32_t phandle =is_hardware_domain (kinfo->d) ? + dt_interrupt_controller->phandle :GUEST_PHANDLE_GIC ; - res =fdt_property (fdt,"interrupts" , intr,sizeof (intr[0 ]) * num_irq); + res =fdt_property (kinfo->fdt,"interrupts" , + intr,sizeof (intr[0 ]) * num_irq);if ( res )return res; - res =fdt_property_cell (fdt,"interrupt-parent" , - dt_interrupt_controller->phandle); + res =fdt_property_cell (kinfo->fdt,"interrupt-parent" , phandle);return res; }
@@ -733,7 +736,7 @@ static int __init make_hypervisor_node(struct domain *d,* TODO: Handle properly the cpumask; */ set_interrupt (intr, d->arch.evtchn_irq,0xf ,DT_IRQ_TYPE_LEVEL_LOW ); - res =fdt_property_interrupts (fdt, &intr,1 ); + res =fdt_property_interrupts (kinfo, &intr,1 );if ( res )return res;
@@ -960,8 +963,9 @@ static int __init make_gic_node(const struct domain *d, void *fdt,return res; } -static int __init make_timer_node (const struct domain *d,void *fdt) +static int __init make_timer_node (const struct kernel_info *kinfo) { +void *fdt = kinfo->fdt;static const struct dt_device_match timer_ids[]__initconst = {DT_MATCH_COMPATIBLE ("arm,armv7-timer" ),
@@ -1016,7 +1020,7 @@ static int __init make_timer_node(const struct domain *d, void *fdt)dt_dprintk (" Virt interrupt %u\n" , irq);set_interrupt (intrs[2 ], irq,0xf ,DT_IRQ_TYPE_LEVEL_LOW ); - res =fdt_property_interrupts (fdt, intrs,3 ); + res =fdt_property_interrupts (kinfo, intrs,3 );if ( res )return res;
@@ -1377,7 +1381,7 @@ static int __init handle_node(struct domain *d, struct kernel_info *kinfo,if (device_get_class (node) ==DEVICE_GIC )return make_gic_node (d, kinfo->fdt, node);if (dt_match_node (timer_matches, node) ) -return make_timer_node (d, kinfo->fdt); +return make_timer_node (kinfo);/* Skip nodes used by Xen */ if (dt_device_used_by (node) ==DOMID_XEN )
Signature · 7 lines
2.17.1 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH v8 2/2 xen/arm: consolidate make_timer_node and make_timer_domU_node
In reply to Viktor MitinFunctions make_timer_node and make_timer_domU_node are quite similar. So it is better to consolidate them to avoid discrepancy. The main difference between the functions is the timer interrupts used.
Keep the domU version for the compatible as it is simpler:
do not copy platform's 'compatible' property into hwdom device tree, instead set either arm,armv7-timer or arm,armv8-timer, depending on the platform type.
Keep the hw version for the clock as it is relevant for the both cases.
---
v4 updates:
updated "Keep the domU version for the compatible as it is simpler"
v5 updates:
- changed 'kept' to 'keep', etc.
- removed empty line
- updated indentation of parameters in functions calls
- fixed NITs
- updated commit message
v6 updates:
- move if out of outer "if"
- add full stop at the end of the last sentence
- minor rephrase of commit message
v7 updates:
- removed extra braces according to Coding style rule:
Braces should be omitted for blocks with a single statement.
--- xen/arch/arm/domain_build.c | 96 ++++++++++++------------------------- 1 file changed, 31 insertions(+), 65 deletions(-)
xen/arch/arm/domain_build.c +31 -65
@@ -973,10 +973,8 @@ static int __init make_timer_node(const struct kernel_info *kinfo) { /* sentinel */ }, };struct dt_device_node *dev; -u32 len; -const void *compatible;int res; -unsigned int irq; +unsigned int irq[MAX_TIMER_PPI ];gic_interrupt_t intrs[3 ];u32 clock_frequency;bool clock_valid;
@@ -990,35 +988,43 @@ static int __init make_timer_node(const struct kernel_info *kinfo)return -FDT_ERR_XEN (ENOENT ); } - compatible =dt_get_property (dev,"compatible" , &len); -if ( !compatible ) - { -dprintk (XENLOG_ERR ,"Can't find compatible property for timer node\n" ); -return -FDT_ERR_XEN (ENOENT ); - } - res =fdt_begin_node (fdt,"timer" );if ( res )return res; - res =fdt_property (fdt,"compatible" , compatible, len); +if ( !is_64bit_domain (kinfo->d) ) + res =fdt_property_string (fdt,"compatible" ,"arm,armv7-timer" ); +else + res =fdt_property_string (fdt,"compatible" ,"arm,armv8-timer" );if ( res )return res; -/* The timer IRQ is emulated by Xen. It always exposes an active-low -* level-sensitive interrupt */ - - irq =timer_get_irq (TIMER_PHYS_SECURE_PPI ); -dt_dprintk (" Secure interrupt %u\n" , irq); -set_interrupt (intrs[0 ], irq,0xf ,DT_IRQ_TYPE_LEVEL_LOW ); - - irq =timer_get_irq (TIMER_PHYS_NONSECURE_PPI ); -dt_dprintk (" Non secure interrupt %u\n" , irq); -set_interrupt (intrs[1 ], irq,0xf ,DT_IRQ_TYPE_LEVEL_LOW ); +/* +* The timer IRQ is emulated by Xen. +* It always exposes an active-low level-sensitive interrupt. +*/ - irq =timer_get_irq (TIMER_VIRT_PPI ); -dt_dprintk (" Virt interrupt %u\n" , irq); -set_interrupt (intrs[2 ], irq,0xf ,DT_IRQ_TYPE_LEVEL_LOW ); +if (is_hardware_domain (kinfo->d) ) + { + irq[TIMER_PHYS_SECURE_PPI ] =timer_get_irq (TIMER_PHYS_SECURE_PPI ); + irq[TIMER_PHYS_NONSECURE_PPI ] = +timer_get_irq (TIMER_PHYS_NONSECURE_PPI ); + irq[TIMER_VIRT_PPI ] =timer_get_irq (TIMER_VIRT_PPI ); + } +else + { + irq[TIMER_PHYS_SECURE_PPI ] =GUEST_TIMER_PHYS_S_PPI ; + irq[TIMER_PHYS_NONSECURE_PPI ] =GUEST_TIMER_PHYS_NS_PPI ; + irq[TIMER_VIRT_PPI ] =GUEST_TIMER_VIRT_PPI ; + } +dt_dprintk (" Secure interrupt %u\n" , irq[TIMER_PHYS_SECURE_PPI ]); +set_interrupt (intrs[0 ], irq[TIMER_PHYS_SECURE_PPI ], +0xf ,DT_IRQ_TYPE_LEVEL_LOW ); +dt_dprintk (" Non secure interrupt %u\n" , irq[TIMER_PHYS_NONSECURE_PPI ]); +set_interrupt (intrs[1 ], irq[TIMER_PHYS_NONSECURE_PPI ], +0xf ,DT_IRQ_TYPE_LEVEL_LOW ); +dt_dprintk (" Virt interrupt %u\n" , irq[TIMER_VIRT_PPI ]); +set_interrupt (intrs[2 ], irq[TIMER_VIRT_PPI ],0xf ,DT_IRQ_TYPE_LEVEL_LOW ); res =fdt_property_interrupts (kinfo, intrs,3 );if ( res )
@@ -1603,46 +1609,6 @@ static int __init make_gic_domU_node(const struct domain *d, void *fdt) } } -static int __init make_timer_domU_node (const struct domain *d,void *fdt) -{ -int res; -gic_interrupt_t intrs[3 ]; - - res =fdt_begin_node (fdt,"timer" ); -if ( res ) -return res; - -if ( !is_64bit_domain (d) ) - { - res =fdt_property_string (fdt,"compatible" ,"arm,armv7-timer" ); -if ( res ) -return res; - } -else - { - res =fdt_property_string (fdt,"compatible" ,"arm,armv8-timer" ); -if ( res ) -return res; - } - -set_interrupt (intrs[0 ],GUEST_TIMER_PHYS_S_PPI ,0xf ,DT_IRQ_TYPE_LEVEL_LOW ); -set_interrupt (intrs[1 ],GUEST_TIMER_PHYS_NS_PPI ,0xf ,DT_IRQ_TYPE_LEVEL_LOW ); -set_interrupt (intrs[2 ],GUEST_TIMER_VIRT_PPI ,0xf ,DT_IRQ_TYPE_LEVEL_LOW ); - - res =fdt_property (fdt,"interrupts" , intrs,sizeof (intrs[0 ]) *3 ); -if ( res ) -return res; - - res =fdt_property_cell (fdt,"interrupt-parent" , -GUEST_PHANDLE_GIC ); -if (res) -return res; - - res =fdt_end_node (fdt); - -return res; -} -#ifdef CONFIG_SBSA_VUART_CONSOLE static int __init make_vpl011_uart_node (const struct domain *d,void *fdt) {
@@ -1748,7 +1714,7 @@ static int __init prepare_dtb_domU(struct domain *d, struct kernel_info *kinfo)if ( ret ) goto err; - ret =make_timer_domU_node (d, kinfo->fdt); + ret =make_timer_node (kinfo);if ( ret ) goto err;
Signature · 7 lines
2.17.1 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Hi,
Please give some time for reviewers to review the full series... I am still writing an answer on patch #2 in v7...
You should at least wait for review on the series before sending a new version. This would have likely avoided to be at v8 for such series.
In this case, I don't think there was anything requiring a v8.
Cheers,
Quoted 14 lines · Viktor Mitin
Functions
make_timer_nodeandmake_timer_domU_nodeare quite similar, so it is better to consolidate them to avoid discrepancy.This patch series achives this goal in two steps:
- Extendfdt_property_interruptsto deal with other domain than the hwdom.
- Consolidatemake_timer_nodeandmake_timer_domU_nodeinto one function:Viktor Mitin (2):
xen/arm: extendfdt_property_interruptsto support DomU xen/arm: consolidatemake_timer_nodeandmake_timer_domU_nodexen/arch/arm/domain_build.c | 118 ++++++++++++++---------------------- 1 file changed, 44 insertions(+), 74 deletions(-)
Signature · 6 lines
Julien Grall _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Hi,
Quoted 10 lines · Viktor Mitin
Functions
make_timer_nodeandmake_timer_domU_nodeare quite similar, so it is better to consolidate them to avoid discrepancy.This patch series achives this goal in two steps:
- Extendfdt_property_interruptsto deal with other domain than the hwdom.
- Consolidatemake_timer_nodeandmake_timer_domU_nodeinto one function:Viktor Mitin (2):
xen/arm: extendfdt_property_interruptsto support DomU xen/arm: consolidatemake_timer_nodeandmake_timer_domU_node
I have committed the two patches. thank you!
Cheers,
Signature · 6 lines
Julien Grall _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel