From: Ian Campbell Subject: [PATCH V2 02/46] xen: arm: rename atag_paddr argument fdt_paddr Date: Thu, 14 Feb 2013 16:47:16 +0000 Message-ID: <1360860480-9245-2-git-send-email-ian.campbell@citrix.com> References: <1360860465.20449.472.camel@zakaz.uk.xensource.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1360860465.20449.472.camel@zakaz.uk.xensource.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: xen-devel@lists.xen.org Cc: stefano.stabellini@citrix.com, tim@xen.org, Ian Campbell List-Id: xen-devel@lists.xenproject.org We don't support ATAGs and this is always actually an FDT address. Signed-off-by: Ian Campbell Acked-by: Tim Deegan --- v2: Update start_secondary too, s/ATAG/DTB in head.S comments --- xen/arch/arm/arm32/head.S | 4 ++-- xen/arch/arm/setup.c | 6 +++--- xen/arch/arm/smpboot.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index 92fc36c..5ec46c3 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -73,7 +73,7 @@ past_zImage: /* Save the bootloader arguments in less-clobberable registers */ /* No need to save r1 == Unused ARM-linux machine type */ - mov r8, r2 /* r8 := ATAG base address */ + mov r8, r2 /* r8 := DTB base address */ /* Find out where we are */ ldr r0, =start @@ -334,7 +334,7 @@ launch: add sp, #STACK_SIZE /* (which grows down from the top). */ sub sp, #CPUINFO_sizeof /* Make room for CPU save record */ mov r0, r10 /* Marshal args: - phys_offset */ - mov r1, r8 /* - ATAG address */ + mov r1, r8 /* - DTB address */ movs r2, r12 /* - CPU ID */ beq start_xen /* and disappear into the land of C */ b start_secondary /* (to the appropriate entry point) */ diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 782d252..4e50b2b 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -329,7 +329,7 @@ void __init setup_cache(void) /* C entry point for boot CPU */ void __init start_xen(unsigned long boot_phys_offset, - unsigned long atag_paddr, + unsigned long fdt_paddr, unsigned long cpuid) { void *fdt; @@ -341,7 +341,7 @@ void __init start_xen(unsigned long boot_phys_offset, smp_clear_cpu_maps(); fdt = (void *)BOOT_MISC_VIRT_START - + (atag_paddr & ((1 << SECOND_SHIFT) - 1)); + + (fdt_paddr & ((1 << SECOND_SHIFT) - 1)); fdt_size = device_tree_early_init(fdt); cpus = smp_get_max_cpus(); @@ -365,7 +365,7 @@ void __init start_xen(unsigned long boot_phys_offset, set_current((struct vcpu *)0xfffff000); /* debug sanity */ idle_vcpu[0] = current; - setup_mm(atag_paddr, fdt_size); + setup_mm(fdt_paddr, fdt_size); /* Setup Hyp vector base */ WRITE_CP32((uint32_t) hyp_traps_vector, HVBAR); diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c index da4880c..60be1a4 100644 --- a/xen/arch/arm/smpboot.c +++ b/xen/arch/arm/smpboot.c @@ -132,7 +132,7 @@ make_cpus_ready(unsigned int max_cpus, unsigned long boot_phys_offset) /* Boot the current CPU */ void __cpuinit start_secondary(unsigned long boot_phys_offset, - unsigned long atag_paddr, + unsigned long fdt_paddr, unsigned long cpuid) { memset(get_cpu_info(), 0, sizeof (struct cpu_info)); -- 1.7.2.5