[xen master] xen/arm: vpl011: Add support for vuart console in xenconsole

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[xen master] xen/arm: vpl011: Add support for vuart console in xenconsole

patchbot
commit 7e758299dd4c6f7f3d8ed090c0a4ca2cd6e33ab6
Author:     Bhupinder Thakur <[hidden email]>
AuthorDate: Wed Sep 27 11:43:31 2017 +0530
Commit:     Stefano Stabellini <[hidden email]>
CommitDate: Tue Oct 3 15:23:37 2017 -0700

    xen/arm: vpl011: Add support for vuart console in xenconsole
   
    This patch finally adds the support for vuart console. It adds
    two new fields in the console initialization:
   
    - optional
    - use_gnttab
   
    optional flag tells whether the console is optional.
   
    use_gnttab tells whether the ring buffer should be allocated using
    grant table.
   
    The VUART console is enabled ony for ARM.
   
    Signed-off-by: Bhupinder Thakur <[hidden email]>
    Acked-by: Wei Liu <[hidden email]>
---
 tools/console/Makefile    |  3 ++-
 tools/console/daemon/io.c | 30 ++++++++++++++++++++++++++++--
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/tools/console/Makefile b/tools/console/Makefile
index c5f3f5c..84796ea 100644
--- a/tools/console/Makefile
+++ b/tools/console/Makefile
@@ -11,6 +11,7 @@ LDLIBS += $(SOCKET_LIBS)
 
 LDLIBS_xenconsoled += $(UTIL_LIBS)
 LDLIBS_xenconsoled += -lrt
+CONSOLE_CFLAGS-$(CONFIG_ARM) = -DCONFIG_ARM
 
 BIN      = xenconsoled xenconsole
 
@@ -28,7 +29,7 @@ clean:
 distclean: clean
 
 daemon/main.o: daemon/_paths.h
-daemon/io.o: CFLAGS += $(CFLAGS_libxenevtchn) $(CFLAGS_libxengnttab)
+daemon/io.o: CFLAGS += $(CFLAGS_libxenevtchn) $(CFLAGS_libxengnttab) $(CONSOLE_CFLAGS-y)
 xenconsoled: $(patsubst %.c,%.o,$(wildcard daemon/*.c))
  $(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS) $(LDLIBS_libxenevtchn) $(LDLIBS_libxengnttab) $(LDLIBS_xenconsoled) $(APPEND_LDFLAGS)
 
diff --git a/tools/console/daemon/io.c b/tools/console/daemon/io.c
index a198dbb..2615b50 100644
--- a/tools/console/daemon/io.c
+++ b/tools/console/daemon/io.c
@@ -107,12 +107,16 @@ struct console {
  xenevtchn_port_or_error_t remote_port;
  struct xencons_interface *interface;
  struct domain *d;
+ bool optional;
+ bool use_gnttab;
 };
 
 struct console_type {
  char *xsname;
  char *ttyname;
  char *log_suffix;
+ bool optional;
+ bool use_gnttab;
 };
 
 static struct console_type console_type[] = {
@@ -120,7 +124,18 @@ static struct console_type console_type[] = {
  .xsname = "/console",
  .ttyname = "tty",
  .log_suffix = "",
+ .optional = false,
+ .use_gnttab = true,
  },
+#if defined(CONFIG_ARM)
+ {
+ .xsname = "/vuart/0",
+ .ttyname = "tty",
+ .log_suffix = "-vuart0",
+ .optional = true,
+ .use_gnttab = false,
+ },
+#endif
 };
 
 #define NUM_CONSOLE_TYPE (sizeof(console_type)/sizeof(struct console_type))
@@ -654,8 +669,17 @@ static int console_create_ring(struct console *con)
  "ring-ref", "%u", &ring_ref,
  "port", "%i", &remote_port,
  NULL);
- if (err)
+
+ if (err) {
+ /*
+ * This is a normal condition for optional consoles: they might not be
+ * present on xenstore at all. In that case, just return without error.
+ */
+ if (con->optional)
+ err = 0;
+
  goto out;
+ }
 
  snprintf(path, sizeof(path), "%s/type", con->xspath);
  type = xs_read(xs, XBT_NULL, path, NULL);
@@ -669,7 +693,7 @@ static int console_create_ring(struct console *con)
  if (ring_ref != con->ring_ref && con->ring_ref != -1)
  console_unmap_interface(con);
 
- if (!con->interface && xgt_handle) {
+ if (!con->interface && xgt_handle && con->use_gnttab) {
  /* Prefer using grant table */
  con->interface = xengnttab_map_grant_ref(xgt_handle,
  dom->domid, GNTTAB_RESERVED_CONSOLE,
@@ -788,6 +812,8 @@ static int console_init(struct console *con, struct domain *dom, void **data)
  con->d = dom;
  con->ttyname = (*con_type)->ttyname;
  con->log_suffix = (*con_type)->log_suffix;
+ con->optional = (*con_type)->optional;
+ con->use_gnttab = (*con_type)->use_gnttab;
  xsname = (char *)(*con_type)->xsname;
  xspath = xs_get_domain_path(xs, dom->domid);
  s = realloc(xspath, strlen(xspath) +
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
[hidden email]
https://lists.xenproject.org/xen-changelog