From patchwork Sat Oct 25 08:24:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "john.liuli" X-Patchwork-Id: 402988 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 8D6AE140096 for ; Sat, 25 Oct 2014 19:28:05 +1100 (AEDT) Received: from localhost ([::1]:52540 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xhwhf-0002Dz-NT for incoming@patchwork.ozlabs.org; Sat, 25 Oct 2014 04:28:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33580) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XhwhC-0001Z0-QH for qemu-devel@nongnu.org; Sat, 25 Oct 2014 04:27:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xhwh7-0008KQ-VR for qemu-devel@nongnu.org; Sat, 25 Oct 2014 04:27:34 -0400 Received: from szxga01-in.huawei.com ([119.145.14.64]:26913) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xhwh6-0007uM-IW for qemu-devel@nongnu.org; Sat, 25 Oct 2014 04:27:29 -0400 Received: from 172.24.2.119 (EHLO szxeml422-hub.china.huawei.com) ([172.24.2.119]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CDJ80807; Sat, 25 Oct 2014 16:26:19 +0800 (CST) Received: from localhost (10.142.143.9) by szxeml422-hub.china.huawei.com (10.82.67.161) with Microsoft SMTP Server id 14.3.158.1; Sat, 25 Oct 2014 16:26:07 +0800 From: "john.liuli" To: Date: Sat, 25 Oct 2014 16:24:53 +0800 Message-ID: <1414225494-2208-2-git-send-email-john.liuli@huawei.com> X-Mailer: git-send-email 1.9.0.msysgit.0 In-Reply-To: <1414225494-2208-1-git-send-email-john.liuli@huawei.com> References: <1414225494-2208-1-git-send-email-john.liuli@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.142.143.9] X-CFilter-Loop: Reflected X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 119.145.14.64 Cc: joel.schopp@amd.com, yingshiuan.pan@gmail.com, mst@redhat.com, Li Liu , remy.gauguey@cea.fr, rusty@rustcorp.com.au, qemu-devel@nongnu.org, n.nikolaev@virtualopensystems.com, virtualization@lists.linux-foundation.org, peter.huangpeng@huawei.com Subject: [Qemu-devel] [RFC PATCH 1/2] Add a new register offset let interrupt reason available 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 From: Li Liu Add a new register offset VIRTIO_MMIO_ISRMEM which help to estblish a shared memory region between virtio-mmio driver and qemu with two purposes: 1.Guest virtio-mmio driver can get the interrupt reason. 2.Check irqfd enabled or not to register different irq handler. Signed-off-by: Li Liu --- drivers/virtio/virtio_mmio.c | 21 ++++++++++++++++++++- include/linux/virtio_mmio.h | 3 +++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c index ef9a165..28ddb55 100644 --- a/drivers/virtio/virtio_mmio.c +++ b/drivers/virtio/virtio_mmio.c @@ -122,6 +122,8 @@ struct virtio_mmio_device { /* a list of queues so we can dispatch IRQs */ spinlock_t lock; struct list_head virtqueues; + + uint8_t *isr_mem; }; struct virtio_mmio_vq_info { @@ -443,6 +445,7 @@ static int virtio_mmio_probe(struct platform_device *pdev) struct virtio_mmio_device *vm_dev; struct resource *mem; unsigned long magic; + int err; mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!mem) @@ -481,6 +484,15 @@ static int virtio_mmio_probe(struct platform_device *pdev) return -ENXIO; } + vm_dev->isr_mem = alloc_pages_exact(PAGE_SIZE, GFP_KERNEL|__GFP_ZERO); + if (vm_dev->isr_mem == NULL) { + dev_err(&pdev->dev, "Allocate isr memory failed!\n"); + return -ENOMEM; + } + + writel(virt_to_phys(vm_dev->isr_mem), + vm_dev->base + VIRTIO_MMIO_ISRMEM); + vm_dev->vdev.id.device = readl(vm_dev->base + VIRTIO_MMIO_DEVICE_ID); vm_dev->vdev.id.vendor = readl(vm_dev->base + VIRTIO_MMIO_VENDOR_ID); @@ -488,13 +500,20 @@ static int virtio_mmio_probe(struct platform_device *pdev) platform_set_drvdata(pdev, vm_dev); - return register_virtio_device(&vm_dev->vdev); + err = register_virtio_device(&vm_dev->vdev); + if (err) { + free_pages_exact(vm_dev->isr_mem, PAGE_SIZE); + vm_dev->isr_mem = NULL; + } + + return err; } static int virtio_mmio_remove(struct platform_device *pdev) { struct virtio_mmio_device *vm_dev = platform_get_drvdata(pdev); + free_pages_exact(vm_dev->isr_mem, PAGE_SIZE); unregister_virtio_device(&vm_dev->vdev); return 0; diff --git a/include/linux/virtio_mmio.h b/include/linux/virtio_mmio.h index 5c7b6f0..b1e3ec7 100644 --- a/include/linux/virtio_mmio.h +++ b/include/linux/virtio_mmio.h @@ -95,6 +95,9 @@ /* Device status register - Read Write */ #define VIRTIO_MMIO_STATUS 0x070 +/* Allocate ISRMEM for interrupt reason - Write Only */ +#define VIRTIO_MMIO_ISRMEM 0x080 + /* The config space is defined by each driver as * the per-driver configuration space - Read Write */ #define VIRTIO_MMIO_CONFIG 0x100