mirror of
https://github.com/torvalds/linux.git
synced 2024-11-05 03:21:32 +00:00
18cb657ca1
and branch 'for-linus' of git://xenbits.xen.org/people/sstabellini/linux-pvhvm * 'for-linus' of git://xenbits.xen.org/people/sstabellini/linux-pvhvm: xen: register xen pci notifier xen: initialize cpu masks for pv guests in xen_smp_init xen: add a missing #include to arch/x86/pci/xen.c xen: mask the MTRR feature from the cpuid xen: make hvc_xen console work for dom0. xen: add the direct mapping area for ISA bus access xen: Initialize xenbus for dom0. xen: use vcpu_ops to setup cpu masks xen: map a dummy page for local apic and ioapic in xen_set_fixmap xen: remap MSIs into pirqs when running as initial domain xen: remap GSIs as pirqs when running as initial domain xen: introduce XEN_DOM0 as a silent option xen: map MSIs into pirqs xen: support GSI -> pirq remapping in PV on HVM guests xen: add xen hvm acpi_register_gsi variant acpi: use indirect call to register gsi in different modes xen: implement xen_hvm_register_pirq xen: get the maximum number of pirqs from xen xen: support pirq != irq * 'stable/xen-pcifront-0.8.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: (27 commits) X86/PCI: Remove the dependency on isapnp_disable. xen: Update Makefile with CONFIG_BLOCK dependency for biomerge.c MAINTAINERS: Add myself to the Xen Hypervisor Interface and remove Chris Wright. x86: xen: Sanitse irq handling (part two) swiotlb-xen: On x86-32 builts, select SWIOTLB instead of depending on it. MAINTAINERS: Add myself for Xen PCI and Xen SWIOTLB maintainer. xen/pci: Request ACS when Xen-SWIOTLB is activated. xen-pcifront: Xen PCI frontend driver. xenbus: prevent warnings on unhandled enumeration values xenbus: Xen paravirtualised PCI hotplug support. xen/x86/PCI: Add support for the Xen PCI subsystem x86: Introduce x86_msi_ops msi: Introduce default_[teardown|setup]_msi_irqs with fallback. x86/PCI: Export pci_walk_bus function. x86/PCI: make sure _PAGE_IOMAP it set on pci mappings x86/PCI: Clean up pci_cache_line_size xen: fix shared irq device passthrough xen: Provide a variant of xen_poll_irq with timeout. xen: Find an unbound irq number in reverse order (high to low). xen: statically initialize cpu_evtchn_mask_p ... Fix up trivial conflicts in drivers/pci/Makefile
272 lines
6.2 KiB
C
272 lines
6.2 KiB
C
/*
|
|
* xen console driver interface to hvc_console.c
|
|
*
|
|
* (c) 2007 Gerd Hoffmann <kraxel@suse.de>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*/
|
|
|
|
#include <linux/console.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/err.h>
|
|
#include <linux/init.h>
|
|
#include <linux/types.h>
|
|
|
|
#include <asm/xen/hypervisor.h>
|
|
|
|
#include <xen/xen.h>
|
|
#include <xen/page.h>
|
|
#include <xen/events.h>
|
|
#include <xen/interface/io/console.h>
|
|
#include <xen/hvc-console.h>
|
|
|
|
#include "hvc_console.h"
|
|
|
|
#define HVC_COOKIE 0x58656e /* "Xen" in hex */
|
|
|
|
static struct hvc_struct *hvc;
|
|
static int xencons_irq;
|
|
|
|
/* ------------------------------------------------------------------ */
|
|
|
|
static unsigned long console_pfn = ~0ul;
|
|
|
|
static inline struct xencons_interface *xencons_interface(void)
|
|
{
|
|
if (console_pfn == ~0ul)
|
|
return mfn_to_virt(xen_start_info->console.domU.mfn);
|
|
else
|
|
return __va(console_pfn << PAGE_SHIFT);
|
|
}
|
|
|
|
static inline void notify_daemon(void)
|
|
{
|
|
/* Use evtchn: this is called early, before irq is set up. */
|
|
notify_remote_via_evtchn(xen_start_info->console.domU.evtchn);
|
|
}
|
|
|
|
static int __write_console(const char *data, int len)
|
|
{
|
|
struct xencons_interface *intf = xencons_interface();
|
|
XENCONS_RING_IDX cons, prod;
|
|
int sent = 0;
|
|
|
|
cons = intf->out_cons;
|
|
prod = intf->out_prod;
|
|
mb(); /* update queue values before going on */
|
|
BUG_ON((prod - cons) > sizeof(intf->out));
|
|
|
|
while ((sent < len) && ((prod - cons) < sizeof(intf->out)))
|
|
intf->out[MASK_XENCONS_IDX(prod++, intf->out)] = data[sent++];
|
|
|
|
wmb(); /* write ring before updating pointer */
|
|
intf->out_prod = prod;
|
|
|
|
if (sent)
|
|
notify_daemon();
|
|
return sent;
|
|
}
|
|
|
|
static int domU_write_console(uint32_t vtermno, const char *data, int len)
|
|
{
|
|
int ret = len;
|
|
|
|
/*
|
|
* Make sure the whole buffer is emitted, polling if
|
|
* necessary. We don't ever want to rely on the hvc daemon
|
|
* because the most interesting console output is when the
|
|
* kernel is crippled.
|
|
*/
|
|
while (len) {
|
|
int sent = __write_console(data, len);
|
|
|
|
data += sent;
|
|
len -= sent;
|
|
|
|
if (unlikely(len))
|
|
HYPERVISOR_sched_op(SCHEDOP_yield, NULL);
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
static int domU_read_console(uint32_t vtermno, char *buf, int len)
|
|
{
|
|
struct xencons_interface *intf = xencons_interface();
|
|
XENCONS_RING_IDX cons, prod;
|
|
int recv = 0;
|
|
|
|
cons = intf->in_cons;
|
|
prod = intf->in_prod;
|
|
mb(); /* get pointers before reading ring */
|
|
BUG_ON((prod - cons) > sizeof(intf->in));
|
|
|
|
while (cons != prod && recv < len)
|
|
buf[recv++] = intf->in[MASK_XENCONS_IDX(cons++, intf->in)];
|
|
|
|
mb(); /* read ring before consuming */
|
|
intf->in_cons = cons;
|
|
|
|
notify_daemon();
|
|
return recv;
|
|
}
|
|
|
|
static struct hv_ops domU_hvc_ops = {
|
|
.get_chars = domU_read_console,
|
|
.put_chars = domU_write_console,
|
|
.notifier_add = notifier_add_irq,
|
|
.notifier_del = notifier_del_irq,
|
|
.notifier_hangup = notifier_hangup_irq,
|
|
};
|
|
|
|
static int dom0_read_console(uint32_t vtermno, char *buf, int len)
|
|
{
|
|
return HYPERVISOR_console_io(CONSOLEIO_read, len, buf);
|
|
}
|
|
|
|
/*
|
|
* Either for a dom0 to write to the system console, or a domU with a
|
|
* debug version of Xen
|
|
*/
|
|
static int dom0_write_console(uint32_t vtermno, const char *str, int len)
|
|
{
|
|
int rc = HYPERVISOR_console_io(CONSOLEIO_write, len, (char *)str);
|
|
if (rc < 0)
|
|
return 0;
|
|
|
|
return len;
|
|
}
|
|
|
|
static struct hv_ops dom0_hvc_ops = {
|
|
.get_chars = dom0_read_console,
|
|
.put_chars = dom0_write_console,
|
|
.notifier_add = notifier_add_irq,
|
|
.notifier_del = notifier_del_irq,
|
|
.notifier_hangup = notifier_hangup_irq,
|
|
};
|
|
|
|
static int __init xen_hvc_init(void)
|
|
{
|
|
struct hvc_struct *hp;
|
|
struct hv_ops *ops;
|
|
|
|
if (!xen_pv_domain())
|
|
return -ENODEV;
|
|
|
|
if (xen_initial_domain()) {
|
|
ops = &dom0_hvc_ops;
|
|
xencons_irq = bind_virq_to_irq(VIRQ_CONSOLE, 0);
|
|
} else {
|
|
if (!xen_start_info->console.domU.evtchn)
|
|
return -ENODEV;
|
|
|
|
ops = &domU_hvc_ops;
|
|
xencons_irq = bind_evtchn_to_irq(xen_start_info->console.domU.evtchn);
|
|
}
|
|
if (xencons_irq < 0)
|
|
xencons_irq = 0; /* NO_IRQ */
|
|
|
|
hp = hvc_alloc(HVC_COOKIE, xencons_irq, ops, 256);
|
|
if (IS_ERR(hp))
|
|
return PTR_ERR(hp);
|
|
|
|
hvc = hp;
|
|
|
|
console_pfn = mfn_to_pfn(xen_start_info->console.domU.mfn);
|
|
|
|
return 0;
|
|
}
|
|
|
|
void xen_console_resume(void)
|
|
{
|
|
if (xencons_irq)
|
|
rebind_evtchn_irq(xen_start_info->console.domU.evtchn, xencons_irq);
|
|
}
|
|
|
|
static void __exit xen_hvc_fini(void)
|
|
{
|
|
if (hvc)
|
|
hvc_remove(hvc);
|
|
}
|
|
|
|
static int xen_cons_init(void)
|
|
{
|
|
struct hv_ops *ops;
|
|
|
|
if (!xen_pv_domain())
|
|
return 0;
|
|
|
|
if (xen_initial_domain())
|
|
ops = &dom0_hvc_ops;
|
|
else
|
|
ops = &domU_hvc_ops;
|
|
|
|
hvc_instantiate(HVC_COOKIE, 0, ops);
|
|
return 0;
|
|
}
|
|
|
|
module_init(xen_hvc_init);
|
|
module_exit(xen_hvc_fini);
|
|
console_initcall(xen_cons_init);
|
|
|
|
#ifdef CONFIG_EARLY_PRINTK
|
|
static void xenboot_write_console(struct console *console, const char *string,
|
|
unsigned len)
|
|
{
|
|
unsigned int linelen, off = 0;
|
|
const char *pos;
|
|
|
|
dom0_write_console(0, string, len);
|
|
|
|
if (xen_initial_domain())
|
|
return;
|
|
|
|
domU_write_console(0, "(early) ", 8);
|
|
while (off < len && NULL != (pos = strchr(string+off, '\n'))) {
|
|
linelen = pos-string+off;
|
|
if (off + linelen > len)
|
|
break;
|
|
domU_write_console(0, string+off, linelen);
|
|
domU_write_console(0, "\r\n", 2);
|
|
off += linelen + 1;
|
|
}
|
|
if (off < len)
|
|
domU_write_console(0, string+off, len-off);
|
|
}
|
|
|
|
struct console xenboot_console = {
|
|
.name = "xenboot",
|
|
.write = xenboot_write_console,
|
|
.flags = CON_PRINTBUFFER | CON_BOOT | CON_ANYTIME,
|
|
};
|
|
#endif /* CONFIG_EARLY_PRINTK */
|
|
|
|
void xen_raw_console_write(const char *str)
|
|
{
|
|
dom0_write_console(0, str, strlen(str));
|
|
}
|
|
|
|
void xen_raw_printk(const char *fmt, ...)
|
|
{
|
|
static char buf[512];
|
|
va_list ap;
|
|
|
|
va_start(ap, fmt);
|
|
vsnprintf(buf, sizeof(buf), fmt, ap);
|
|
va_end(ap);
|
|
|
|
xen_raw_console_write(buf);
|
|
}
|