From 9b92331d98e3ac8cc0a88a294ef68da69728f7cb Mon Sep 17 00:00:00 2001 From: Julien Grall Date: Wed, 1 Jul 2015 12:01:07 +0100 Subject: [PATCH] xen/arm: gic-{v2, hip04}: Remove redundant check in {gicv2, hip04gic}_init There is a global check for page alignment later within the same function. Signed-off-by: Julien Grall Cc: Zoltan Kiss Acked-by: Ian Campbell --- xen/arch/arm/gic-hip04.c | 8 ++++---- xen/arch/arm/gic-v2.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/xen/arch/arm/gic-hip04.c b/xen/arch/arm/gic-hip04.c index 669d043aba..71cdba0c1c 100644 --- a/xen/arch/arm/gic-hip04.c +++ b/xen/arch/arm/gic-hip04.c @@ -679,19 +679,19 @@ static int __init hip04gic_init(void) const struct dt_device_node *node = gicv2_info.node; res = dt_device_get_address(node, 0, &gicv2.dbase, NULL); - if ( res || !gicv2.dbase || (gicv2.dbase & ~PAGE_MASK) ) + if ( res || !gicv2.dbase ) panic("GIC-HIP04: Cannot find a valid address for the distributor"); res = dt_device_get_address(node, 1, &gicv2.cbase, NULL); - if ( res || !gicv2.cbase || (gicv2.cbase & ~PAGE_MASK) ) + if ( res || !gicv2.cbase ) panic("GIC-HIP04: Cannot find a valid address for the CPU"); res = dt_device_get_address(node, 2, &gicv2.hbase, NULL); - if ( res || !gicv2.hbase || (gicv2.hbase & ~PAGE_MASK) ) + if ( res || !gicv2.hbase ) panic("GIC-HIP04: Cannot find a valid address for the hypervisor"); res = dt_device_get_address(node, 3, &gicv2.vbase, NULL); - if ( res || !gicv2.vbase || (gicv2.vbase & ~PAGE_MASK) ) + if ( res || !gicv2.vbase ) panic("GIC-HIP04: Cannot find a valid address for the virtual CPU"); res = platform_get_irq(node, 0); diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index 9e55b21e1a..cecb0928ee 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -665,19 +665,19 @@ static int __init gicv2_init(void) const struct dt_device_node *node = gicv2_info.node; res = dt_device_get_address(node, 0, &gicv2.dbase, NULL); - if ( res || !gicv2.dbase || (gicv2.dbase & ~PAGE_MASK) ) + if ( res || !gicv2.dbase ) panic("GICv2: Cannot find a valid address for the distributor"); res = dt_device_get_address(node, 1, &gicv2.cbase, NULL); - if ( res || !gicv2.cbase || (gicv2.cbase & ~PAGE_MASK) ) + if ( res || !gicv2.cbase ) panic("GICv2: Cannot find a valid address for the CPU"); res = dt_device_get_address(node, 2, &gicv2.hbase, NULL); - if ( res || !gicv2.hbase || (gicv2.hbase & ~PAGE_MASK) ) + if ( res || !gicv2.hbase ) panic("GICv2: Cannot find a valid address for the hypervisor"); res = dt_device_get_address(node, 3, &gicv2.vbase, NULL); - if ( res || !gicv2.vbase || (gicv2.vbase & ~PAGE_MASK) ) + if ( res || !gicv2.vbase ) panic("GICv2: Cannot find a valid address for the virtual CPU"); res = platform_get_irq(node, 0); -- 2.39.5