Merge branch 'stable/drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

* 'stable/drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen/pciback: Have 'passthrough' option instead of XEN_PCIDEV_BACKEND_PASS and XEN_PCIDEV_BACKEND_VPCI
  xen/pciback: Remove the DEBUG option.
  xen/pciback: Drop two backends, squash and cleanup some code.
  xen/pciback: Print out the MSI/MSI-X (PIRQ) values
  xen/pciback: Don't setup an fake IRQ handler for SR-IOV devices.
  xen: rename pciback module to xen-pciback.
  xen/pciback: Fine-grain the spinlocks and fix BUG: scheduling while atomic cases.
  xen/pciback: Allocate IRQ handler for device that is shared with guest.
  xen/pciback: Disable MSI/MSI-X when reseting a device
  xen/pciback: guest SR-IOV support for PV guest
  xen/pciback: Register the owner (domain) of the PCI device.
  xen/pciback: Cleanup the driver based on checkpatch warnings and errors.
  xen/pciback: xen pci backend driver.
  xen: tmem: self-ballooning and frontswap-selfshrinking
  xen: Add module alias to autoload backend drivers
  xen: Populate xenbus device attributes
  xen: Add __attribute__((format(printf... where appropriate
  xen: prepare tmem shim to handle frontswap
  xen: allow enable use of VGA console on dom0

4 files changed, 87 insertions, 1 deletions

diff --git a/arch/x86/xen/Makefile b/arch/x86/xen/Makefile
index 17c565de3d64..a6575b949b11 100644
--- a/arch/x86/xen/Makefile
+++ b/arch/x86/xen/Makefile
@@ -18,5 +18,5 @@ obj-y		:= enlighten.o setup.o multicalls.o mmu.o irq.o \
 obj-$(CONFIG_SMP)               += smp.o
 obj-$(CONFIG_PARAVIRT_SPINLOCKS)+= spinlock.o
 obj-$(CONFIG_XEN_DEBUG_FS)      += debugfs.o
-
+obj-$(CONFIG_XEN_DOM0)          += vga.o
 obj-$(CONFIG_SWIOTLB_XEN)       += pci-swiotlb-xen.o
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 5525163a0398..53257421082b 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -1248,6 +1248,14 @@ asmlinkage void __init xen_start_kernel(void)
                 if (pci_xen)
                         x86_init.pci.arch_init = pci_xen_init;
         } else {
+                const struct dom0_vga_console_info *info =
+                        (void *)((char *)xen_start_info +
+                                 xen_start_info->console.dom0.info_off);
+
+                xen_init_vga(info, xen_start_info->console.dom0.info_size);
+                xen_start_info->console.domU.mfn = 0;
+                xen_start_info->console.domU.evtchn = 0;
+
                 /* Make sure ACS will be enabled */
                 pci_request_acs();
         }
diff --git a/arch/x86/xen/vga.c b/arch/x86/xen/vga.c
new file mode 100644
index 000000000000..1cd7f4d11e29
--- /dev/null
+++ b/arch/x86/xen/vga.c
@@ -0,0 +1,67 @@
+#include <linux/screen_info.h>
+#include <linux/init.h>
+
+#include <asm/bootparam.h>
+#include <asm/setup.h>
+
+#include <xen/interface/xen.h>
+
+#include "xen-ops.h"
+
+void __init xen_init_vga(const struct dom0_vga_console_info *info, size_t size)
+{
+        struct screen_info *screen_info = &boot_params.screen_info;
+
+        /* This is drawn from a dump from vgacon:startup in
+         * standard Linux. */
+        screen_info->orig_video_mode = 3;
+        screen_info->orig_video_isVGA = 1;
+        screen_info->orig_video_lines = 25;
+        screen_info->orig_video_cols = 80;
+        screen_info->orig_video_ega_bx = 3;
+        screen_info->orig_video_points = 16;
+        screen_info->orig_y = screen_info->orig_video_lines - 1;
+
+        switch (info->video_type) {
+        case XEN_VGATYPE_TEXT_MODE_3:
+                if (size < offsetof(struct dom0_vga_console_info, u.text_mode_3)
+                    + sizeof(info->u.text_mode_3))
+                        break;
+                screen_info->orig_video_lines = info->u.text_mode_3.rows;
+                screen_info->orig_video_cols = info->u.text_mode_3.columns;
+                screen_info->orig_x = info->u.text_mode_3.cursor_x;
+                screen_info->orig_y = info->u.text_mode_3.cursor_y;
+                screen_info->orig_video_points =
+                        info->u.text_mode_3.font_height;
+                break;
+
+        case XEN_VGATYPE_VESA_LFB:
+                if (size < offsetof(struct dom0_vga_console_info,
+                                    u.vesa_lfb.gbl_caps))
+                        break;
+                screen_info->orig_video_isVGA = VIDEO_TYPE_VLFB;
+                screen_info->lfb_width = info->u.vesa_lfb.width;
+                screen_info->lfb_height = info->u.vesa_lfb.height;
+                screen_info->lfb_depth = info->u.vesa_lfb.bits_per_pixel;
+                screen_info->lfb_base = info->u.vesa_lfb.lfb_base;
+                screen_info->lfb_size = info->u.vesa_lfb.lfb_size;
+                screen_info->lfb_linelength = info->u.vesa_lfb.bytes_per_line;
+                screen_info->red_size = info->u.vesa_lfb.red_size;
+                screen_info->red_pos = info->u.vesa_lfb.red_pos;
+                screen_info->green_size = info->u.vesa_lfb.green_size;
+                screen_info->green_pos = info->u.vesa_lfb.green_pos;
+                screen_info->blue_size = info->u.vesa_lfb.blue_size;
+                screen_info->blue_pos = info->u.vesa_lfb.blue_pos;
+                screen_info->rsvd_size = info->u.vesa_lfb.rsvd_size;
+                screen_info->rsvd_pos = info->u.vesa_lfb.rsvd_pos;
+                if (size >= offsetof(struct dom0_vga_console_info,
+                                     u.vesa_lfb.gbl_caps)
+                    + sizeof(info->u.vesa_lfb.gbl_caps))
+                        screen_info->capabilities = info->u.vesa_lfb.gbl_caps;
+                if (size >= offsetof(struct dom0_vga_console_info,
+                                     u.vesa_lfb.mode_attrs)
+                    + sizeof(info->u.vesa_lfb.mode_attrs))
+                        screen_info->vesa_attributes = info->u.vesa_lfb.mode_attrs;
+                break;
+        }
+}
diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
index 97dfdc8757b3..b095739ccd4c 100644
--- a/arch/x86/xen/xen-ops.h
+++ b/arch/x86/xen/xen-ops.h
@@ -88,6 +88,17 @@ static inline void xen_uninit_lock_cpu(int cpu)
 }
 #endif
 
+struct dom0_vga_console_info;
+
+#ifdef CONFIG_XEN_DOM0
+void __init xen_init_vga(const struct dom0_vga_console_info *, size_t size);
+#else
+static inline void __init xen_init_vga(const struct dom0_vga_console_info *info,
+                                       size_t size)
+{
+}
+#endif
+
 /* Declare an asm function, along with symbols needed to make it
    inlineable */
 #define DECL_ASM(ret, name, ...)                \