From patchwork Thu May 26 04:57:41 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 97496 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A7D43B6FA8 for ; Thu, 26 May 2011 14:58:27 +1000 (EST) Received: from localhost ([::1]:59325 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QPSeO-0001cm-LR for incoming@patchwork.ozlabs.org; Thu, 26 May 2011 00:58:24 -0400 Received: from eggs.gnu.org ([140.186.70.92]:58196) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QPSeG-0001ch-77 for qemu-devel@nongnu.org; Thu, 26 May 2011 00:58:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QPSeF-0007bu-5O for qemu-devel@nongnu.org; Thu, 26 May 2011 00:58:16 -0400 Received: from mail-iy0-f173.google.com ([209.85.210.173]:57653) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QPSeF-0007bp-2I for qemu-devel@nongnu.org; Thu, 26 May 2011 00:58:15 -0400 Received: by iym10 with SMTP id 10so398453iym.4 for ; Wed, 25 May 2011 21:58:13 -0700 (PDT) Received: by 10.231.196.91 with SMTP id ef27mr439894ibb.87.1306385892307; Wed, 25 May 2011 21:58:12 -0700 (PDT) MIME-Version: 1.0 Received: by 10.231.11.139 with HTTP; Wed, 25 May 2011 21:57:41 -0700 (PDT) From: Wei Liu Date: Thu, 26 May 2011 12:57:41 +0800 Message-ID: To: qemu-devel@nongnu.org X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.210.173 Cc: Anthony Perard , Stefano Stabellini Subject: [Qemu-devel] Xen: enabling emulated MSI injection X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org commit 0ad7c9289253b9fd496ac695ce5bf1f23027d97a Author: Wei Liu Date: Thu May 26 10:16:18 2011 +0800 MSI injection for Xen. This is supposed to be used in conjunction with Xen's new hypercall interface for emualted MSI injection. Signed-off-by: Wei Liu diff --git a/hw/msix.c b/hw/msix.c index af40e26..1057eff 100644 --- a/hw/msix.c +++ b/hw/msix.c @@ -15,6 +15,7 @@ #include "msix.h" #include "pci.h" #include "range.h" +#include "xen.h" /* MSI-X capability structure */ #define MSIX_TABLE_OFFSET 4 @@ -369,7 +370,12 @@ void msix_notify(PCIDevice *dev, unsigned vector) address = pci_get_long(table_entry + MSIX_MSG_UPPER_ADDR); address = (address << 32) | pci_get_long(table_entry + MSIX_MSG_ADDR); data = pci_get_long(table_entry + MSIX_MSG_DATA); - stl_phys(address, data); + + if (xen_enabled()) { + xen_hvm_inj_msi(address, data); + } else { + stl_phys(address, data); + } } void msix_reset(PCIDevice *dev) diff --git a/hw/xen.h b/hw/xen.h index d435ca0..11a3c4a 100644 --- a/hw/xen.h +++ b/hw/xen.h @@ -43,6 +43,7 @@ static inline int xen_mapcache_enabled(void) int xen_pci_slot_get_pirq(PCIDevice *pci_dev, int irq_num); void xen_piix3_set_irq(void *opaque, int irq_num, int level); void xen_piix_pci_write_config_client(uint32_t address, uint32_t val, int len); +void xen_hvm_inj_msi(uint64_t addr, uint32_t data); void xen_cmos_set_s3_resume(void *opaque, int irq, int level); qemu_irq *xen_interrupt_controller_init(void); diff --git a/xen-all.c b/xen-all.c index 0944673..a553992 100644 --- a/xen-all.c +++ b/xen-all.c @@ -100,6 +100,11 @@ void xen_piix_pci_write_config_client(uint32_t address, uint32_t val, int len) } } +void xen_hvm_inj_msi(uint64_t addr, uint32_t data) +{ + xc_hvm_inj_msi(xen_xc, xen_domid, addr, data); +} + void xen_cmos_set_s3_resume(void *opaque, int irq, int level) { pc_cmos_set_s3_resume(opaque, irq, level); diff --git a/xen-stub.c b/xen-stub.c index a4f35a1..c18c62f 100644 --- a/xen-stub.c +++ b/xen-stub.c @@ -39,3 +39,7 @@ int xen_init(void) { return -ENOSYS; } + +void xen_hvm_inj_msi(uint64_t addr, uint32_t data) +{ +}