From: "john.liuli" <john.liuli@huawei.com>
To: linux-kernel@vger.kernel.org
Cc: joel.schopp@amd.com, yingshiuan.pan@gmail.com, mst@redhat.com,
Li Liu <john.liuli@huawei.com>,
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
Date: Sat, 25 Oct 2014 16:24:53 +0800 [thread overview]
Message-ID: <1414225494-2208-2-git-send-email-john.liuli@huawei.com> (raw)
In-Reply-To: <1414225494-2208-1-git-send-email-john.liuli@huawei.com>
From: Li Liu <john.liuli@huawei.com>
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 <john.liuli@huawei.com>
---
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
--
1.7.9.5
next prev parent reply other threads:[~2014-10-25 8:27 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-25 8:24 [Qemu-devel] [RFC PATCH 0/2] virtio-mmio: add irqfd support for vhost-net based on virtio-mmio john.liuli
2014-10-25 8:24 ` john.liuli [this message]
2014-10-26 12:01 ` [Qemu-devel] [RFC PATCH 1/2] Add a new register offset let interrupt reason available Michael S. Tsirkin
2014-10-25 8:24 ` [Qemu-devel] [RFC PATCH 2/2] Assign a new irq handler while irqfd enabled john.liuli
2014-10-26 11:56 ` Michael S. Tsirkin
2014-10-27 11:04 ` Li Liu
2014-10-27 12:03 ` Michael S. Tsirkin
2014-10-26 11:52 ` [Qemu-devel] [RFC PATCH 0/2] virtio-mmio: add irqfd support for vhost-net based on virtio-mmio Michael S. Tsirkin
2014-10-27 9:19 ` Li Liu
2014-10-27 10:48 ` Michael S. Tsirkin
2014-10-27 9:37 ` Peter Maydell
2014-10-27 11:23 ` Li Liu
2014-10-27 11:58 ` Peter Maydell
2014-11-05 9:30 ` Christoffer Dall
2014-11-05 8:43 ` Eric Auger
2014-11-06 1:59 ` Shannon Zhao
2014-11-06 9:24 ` Li Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1414225494-2208-2-git-send-email-john.liuli@huawei.com \
--to=john.liuli@huawei.com \
--cc=joel.schopp@amd.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mst@redhat.com \
--cc=n.nikolaev@virtualopensystems.com \
--cc=peter.huangpeng@huawei.com \
--cc=qemu-devel@nongnu.org \
--cc=remy.gauguey@cea.fr \
--cc=rusty@rustcorp.com.au \
--cc=virtualization@lists.linux-foundation.org \
--cc=yingshiuan.pan@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).