From: Kumar Gala <galak@kernel.crashing.org>
To: hjk@hansjkoch.de
Cc: linuxppc-dev@ozlabs.org, gregkh@suse.de, linux-kernel@vger.kernel.org
Subject: [PATCH] UIO: Allow a UIO driver to override the default pgprot when we mmap
Date: Wed, 12 Oct 2011 09:43:36 -0500 [thread overview]
Message-ID: <1318430616-20351-1-git-send-email-galak@kernel.crashing.org> (raw)
For some devices the default behavior of pgprot_noncached is not
the correct flags for the address space. Provide a means for the
kernel side UIO driver to override the flags without having to
implement its own full mmap callback.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
drivers/uio/uio.c | 6 +++++-
include/linux/uio_driver.h | 2 ++
2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
index d2efe82..88f4444 100644
--- a/drivers/uio/uio.c
+++ b/drivers/uio/uio.c
@@ -656,7 +656,11 @@ static int uio_mmap_physical(struct vm_area_struct *vma)
vma->vm_flags |= VM_IO | VM_RESERVED;
- vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
+ if (idev->info->mem[mi].set_pgprot)
+ vma->vm_page_prot =
+ idev->info->mem[mi].set_pgprot(vma->vm_page_prot);
+ else
+ vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
return remap_pfn_range(vma,
vma->vm_start,
diff --git a/include/linux/uio_driver.h b/include/linux/uio_driver.h
index 665517c..4c618cd 100644
--- a/include/linux/uio_driver.h
+++ b/include/linux/uio_driver.h
@@ -28,6 +28,7 @@ struct uio_map;
* @memtype: type of memory addr points to
* @internal_addr: ioremap-ped version of addr, for driver internal use
* @map: for use by the UIO core only.
+ * @set_pgprot: allow driver to override default(noncached) pgprot
*/
struct uio_mem {
const char *name;
@@ -36,6 +37,7 @@ struct uio_mem {
int memtype;
void __iomem *internal_addr;
struct uio_map *map;
+ pgprot_t (*set_pgprot)(pgprot_t prot);
};
#define MAX_UIO_MAPS 5
--
1.7.3.4
next reply other threads:[~2011-10-12 14:43 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-12 14:43 Kumar Gala [this message]
2011-10-12 15:35 ` [PATCH] UIO: Allow a UIO driver to override the default pgprot when we mmap Hans J. Koch
2011-10-12 16:08 ` Kumar Gala
2011-10-12 16:20 ` Hans J. Koch
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=1318430616-20351-1-git-send-email-galak@kernel.crashing.org \
--to=galak@kernel.crashing.org \
--cc=gregkh@suse.de \
--cc=hjk@hansjkoch.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@ozlabs.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;
as well as URLs for NNTP newsgroup(s).