[Xen-changelog] [xen stable-4.5] dt-uart: use ':' as separator between path and options

[patchbot@xxxxxxx]

commit 19283185e0cad1ccb50583e4eed5cd263f454e18
Author:     Ian Campbell <ian.campbell@xxxxxxxxxx>
AuthorDate: Thu Jan 8 11:53:55 2015 +0000
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Tue Jan 27 17:03:11 2015 +0000

    dt-uart: use ':' as separator between path and options
    
    ',' is a valid character in a device-tree path (see ePAPR v1.1 Table
    2-1), in fact ',' is actually pretty common in node names.
    
    Using ',' as a separator breaks for example on fast models. If you use
    the full path (/smb/motherboard/iofpga@3,00000000/uart@090000) rather
    than the alias then earlyprintk gives:
    
    (XEN) Looking for UART console /smb/motherboard/iofpga@3
    (XEN) Unable to find device "/smb/motherboard/iofpga@3"
    (XEN) Bad console= option 'dtuart'
    
    I actually noticed this on Jetson where the uart is
    "/serial@0,70006300" and there happened to be no alias defined.
    
    Instead use ':' as the separator, it is defined to terminate the path
    in the context of /chosen/stdout-path (Table 3-4) which is pretty
    closely analogous to the dtuart= option and so makes a pretty good
    choice (especially since the next patch adds support for stdout-path).
    
    Since no DT aware driver current supports any options there is no
    point in retaining support for ',' for backwards compatibility.
    
    Additionally, expand the buffer for the dtuart option, a path can be
    far longer than 30 characters (in fact the maximum size of a single
    node name is 31, so it's not even necessarily enough for an alias).
    128 is completely arbitrary and allows for paths at least 8 deep even
    with worst case node names.
    
    Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
    Reviewed-by: Julien Grall <julien.grall@xxxxxxxxxx>
    (cherry picked from commit f01af57300cb60ab0fd8487fb5bbbe97bee234f0)
---
 docs/misc/xen-command-line.markdown |    2 +-
 xen/drivers/char/dt-uart.c          |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/misc/xen-command-line.markdown 
b/docs/misc/xen-command-line.markdown
index 152ae03..17cf563 100644
--- a/docs/misc/xen-command-line.markdown
+++ b/docs/misc/xen-command-line.markdown
@@ -550,7 +550,7 @@ Pin dom0 vcpus to their respective pcpus
 Flag that makes a 64bit dom0 boot in PVH mode. No 32bit support at present.
 
 ### dtuart (ARM)
-> `= path [,options]`
+> `= path [:options]`
 
 > Default: `""`
 
diff --git a/xen/drivers/char/dt-uart.c b/xen/drivers/char/dt-uart.c
index fa92b5c..1197230 100644
--- a/xen/drivers/char/dt-uart.c
+++ b/xen/drivers/char/dt-uart.c
@@ -25,13 +25,13 @@
 
 /*
  * Configure UART port with a string:
- * path,options
+ * path:options
  *
  * @path: full path used in the device tree for the UART. If the path
  * doesn't start with '/', we assuming that it's an alias.
  * @options: UART speficic options (see in each UART driver)
  */
-static char __initdata opt_dtuart[30] = "";
+static char __initdata opt_dtuart[256] = "";
 string_param("dtuart", opt_dtuart);
 
 void __init dt_uart_init(void)
@@ -47,7 +47,7 @@ void __init dt_uart_init(void)
         return;
     }
 
-    options = strchr(opt_dtuart, ',');
+    options = strchr(opt_dtuart, ':');
     if ( options != NULL )
         *(options++) = '\0';
     else
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.5

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog