Re: [Xen-devel] [PATCH 03/45] xen: arm: rename atag_paddr argument fdt_paddr

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

On Thu, 2013-02-07 at 12:08 +0000, Tim Deegan wrote:
> At 15:56 +0000 on 23 Jan (1358956569), Ian Campbell wrote:
> > We don't support ATAGs and this is always actually an FDT address.
> 
> Should we also change the code in head.S that call this an ATAG?

Yes, I think we should (thought I had actually!). Looks like I missed
smpboot.c:start_secondary too (which doesn't use it but prototype is
supposed to match).

Incrementally I think that would just be:

diff -r 8e8a289bc6c6 xen/arch/arm/arm32/head.S
--- a/xen/arch/arm/arm32/head.S Thu Dec 20 10:51:55 2012 +0000
+++ b/xen/arch/arm/arm32/head.S Thu Feb 07 12:16:31 2013 +0000
@@ -73,7 +73,7 @@ past_zImage:
 
         /* Save the bootloader arguments in less-clobberable registers */
         mov   r7, r1                 /* r7 := 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
@@ -335,7 +335,7 @@ launch:
         sub   sp, #CPUINFO_sizeof    /* Make room for CPU save record */
         mov   r0, r10                /* Marshal args: - phys_offset */
         mov   r1, r7                 /*               - machine type */
-        mov   r2, r8                 /*               - ATAG address */
+        mov   r2, r8                 /*               - DTB address */
         movs  r3, r12                /*               - CPU ID */
         beq   start_xen              /* and disappear into the land of C */
         b     start_secondary        /* (to the appropriate entry point) */
diff -r 8e8a289bc6c6 xen/arch/arm/smpboot.c
--- a/xen/arch/arm/smpboot.c    Thu Dec 20 10:51:55 2012 +0000
+++ b/xen/arch/arm/smpboot.c    Thu Feb 07 12:16:31 2013 +0000
@@ -133,7 +133,7 @@ make_cpus_ready(unsigned int max_cpus, u
 /* Boot the current CPU */
 void __cpuinit start_secondary(unsigned long boot_phys_offset,
                                unsigned long arm_type,
-                               unsigned long atag_paddr,
+                               unsigned long fdt_paddr,
                                unsigned long cpuid)
 {
     memset(get_cpu_info(), 0, sizeof (struct cpu_info));



_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel