From: Rusty Russell <rusty@rustcorp.com.au>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: lkml - Kernel Mailing List <linux-kernel@vger.kernel.org>,
virtualization <virtualization@lists.linux-foundation.org>,
Jeff Garzik <jeff@garzik.org>,
Christoph Hellwig <hch@infradead.org>
Subject: [PATCH 2/5] lguest guest feedback tidyups
Date: Fri, 11 May 2007 11:21:30 +1000 [thread overview]
Message-ID: <1178846490.23513.27.camel@localhost.localdomain> (raw)
In-Reply-To: <1178846354.23513.23.camel@localhost.localdomain>
1) send-dma and bind-dma hypercall wrappers for drivers to use,
2) formalization of the convention that devices can use the irq
corresponding to their index on the lguest_bus.
3) ___force to shut up sparse: guests *can* use ioremap as virtual mem.
4) lguest.c should include "lguest_bus.h" for lguest_devices declaration.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
---
drivers/lguest/lguest.c | 20 ++++++++++++++++++++
drivers/lguest/lguest_bus.c | 2 +-
include/linux/lguest_bus.h | 13 ++++++++++++-
3 files changed, 33 insertions(+), 2 deletions(-)
===================================================================
--- a/include/linux/lguest_bus.h
+++ b/include/linux/lguest_bus.h
@@ -7,7 +7,6 @@
struct lguest_device {
/* Unique busid, and index into lguest_page->devices[] */
- /* By convention, each device can use irq index+1 if it wants to. */
unsigned int index;
struct device dev;
@@ -15,6 +14,18 @@ struct lguest_device {
/* Driver can hang data off here. */
void *private;
};
+
+/* By convention, each device can use irq index+1 if it wants to. */
+static inline int lgdev_irq(const struct lguest_device *dev)
+{
+ return dev->index + 1;
+}
+
+/* dma args must not be vmalloced! */
+void lguest_send_dma(unsigned long key, struct lguest_dma *dma);
+int lguest_bind_dma(unsigned long key, struct lguest_dma *dmas,
+ unsigned int num, u8 irq);
+void lguest_unbind_dma(unsigned long key, struct lguest_dma *dmas);
struct lguest_driver {
const char *name;
===================================================================
--- a/drivers/lguest/lguest.c
+++ b/drivers/lguest/lguest.c
@@ -27,6 +27,7 @@
#include <linux/interrupt.h>
#include <linux/lguest.h>
#include <linux/lguest_launcher.h>
+#include <linux/lguest_bus.h>
#include <asm/paravirt.h>
#include <asm/param.h>
#include <asm/page.h>
@@ -99,6 +100,25 @@ void async_hcall(unsigned long call,
next_call = 0;
}
local_irq_restore(flags);
+}
+
+void lguest_send_dma(unsigned long key, struct lguest_dma *dma)
+{
+ dma->used_len = 0;
+ hcall(LHCALL_SEND_DMA, key, __pa(dma), 0);
+}
+
+int lguest_bind_dma(unsigned long key, struct lguest_dma *dmas,
+ unsigned int num, u8 irq)
+{
+ if (!hcall(LHCALL_BIND_DMA, key, __pa(dmas), (num << 8) | irq))
+ return -ENOMEM;
+ return 0;
+}
+
+void lguest_unbind_dma(unsigned long key, struct lguest_dma *dmas)
+{
+ hcall(LHCALL_BIND_DMA, key, __pa(dmas), 0);
}
static unsigned long save_fl(void)
===================================================================
--- a/drivers/lguest/lguest_bus.c
+++ b/drivers/lguest/lguest_bus.c
@@ -136,7 +136,7 @@ static int __init lguest_bus_init(void)
return 0;
/* Devices are in page above top of "normal" mem. */
- lguest_devices = ioremap(max_pfn << PAGE_SHIFT, PAGE_SIZE);
+ lguest_devices = (__force void*)ioremap(max_pfn<<PAGE_SHIFT,PAGE_SIZE);
if (bus_register(&lguest_bus.bus) != 0
|| device_register(&lguest_bus.dev) != 0)
next prev parent reply other threads:[~2007-05-11 1:21 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-05-11 1:17 [PATCH 0/5] lguest feedback tidyups Rusty Russell
2007-05-11 1:19 ` [PATCH 1/5] lguest host " Rusty Russell
2007-05-11 1:21 ` Rusty Russell [this message]
2007-05-11 1:22 ` [PATCH 3/5] lguest network driver " Rusty Russell
2007-05-11 1:23 ` [PATCH 4/5] lguest block " Rusty Russell
2007-05-11 1:24 ` [PATCH 5/5] lguest console " Rusty Russell
2007-05-13 4:08 ` [PATCH 4/5] lguest block " Rusty Russell
2007-05-13 3:52 ` [PATCH 3/5] lguest network " Rusty Russell
2007-05-13 4:12 ` Rusty Russell
2007-05-11 6:56 ` [PATCH 2/5] lguest guest " Christoph Hellwig
2007-05-11 7:31 ` Rusty Russell
2007-05-11 7:40 ` Christoph Hellwig
2007-05-13 1:00 ` Rusty Russell
2007-05-13 3:48 ` Rusty Russell
2007-05-13 18:43 ` Al Viro
2007-05-14 7:11 ` Rusty Russell
2007-05-13 4:07 ` [PATCH 1/5] lguest host " Rusty Russell
2007-05-13 18:47 ` Al Viro
2007-05-14 1:30 ` Rusty Russell
2007-05-13 18:39 ` Al Viro
2007-05-14 1:44 ` Rusty Russell
2007-05-14 5:38 ` Rusty Russell
2007-05-11 6:53 ` [PATCH 0/5] lguest " Christoph Hellwig
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=1178846490.23513.27.camel@localhost.localdomain \
--to=rusty@rustcorp.com.au \
--cc=akpm@linux-foundation.org \
--cc=hch@infradead.org \
--cc=jeff@garzik.org \
--cc=linux-kernel@vger.kernel.org \
--cc=virtualization@lists.linux-foundation.org \
/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