mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Jeremy Fitzhardinge <jeremy@goop.org>
To: Ingo Molnar <mingo@elte.hu>
Cc: the arch/x86 maintainers <x86@kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Xen-devel <xen-devel@lists.xensource.com>,
	Greg KH <gregkh@suse.de>, Jens Axboe <jens.axboe@oracle.com>,
	Chris Wright <chrisw@redhat.com>,
	kurt.hackel@oracle.com, Andrew Morton <akpm@linux-foundation.org>,
	Ky Srinivasan <ksrinivasan@novell.com>,
	Beulich <jbeulich@novell.com>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	Matthew Wilcox <matthew@wil.cx>,
	Jesse Barnes <jbarnes@virtuousgeek.org>,
	Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Subject: [PATCH 08/10] x86/pci: make sure _PAGE_IOMAP it set on pci mappings
Date: Wed, 27 May 2009 00:24:40 -0700	[thread overview]
Message-ID: <1243409082-21349-9-git-send-email-jeremy@goop.org> (raw)
In-Reply-To: <1243409082-21349-1-git-send-email-jeremy@goop.org>

From: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>

When mapping pci space via /sys or /proc, make sure we're really
doing a hardware mapping by setting _PAGE_IOMAP.

[ Impact: bugfix; make PCI mappings map the right pages ]

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Reviewed-by: "H. Peter Anvin" <hpa@zytor.com>
Reviewed-by: Matthew Wilcox <willy@linux.intel.com>
---
 arch/x86/pci/i386.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c
index a85bef2..88a1080 100644
--- a/arch/x86/pci/i386.c
+++ b/arch/x86/pci/i386.c
@@ -278,6 +278,9 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
 		return -EINVAL;
 
 	prot = pgprot_val(vma->vm_page_prot);
+
+	prot |= _PAGE_IOMAP;	/* creating a mapping for IO */
+
 	if (pat_enabled && write_combine)
 		prot |= _PAGE_CACHE_WC;
 	else if (pat_enabled || boot_cpu_data.x86 > 3)
-- 
1.6.0.6


  parent reply	other threads:[~2009-05-27  7:27 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-05-27  7:24 [GIT PULL REPOST] xen/dom0/pci - Xen dom0 PCI access Jeremy Fitzhardinge
2009-05-27  7:24 ` [PATCH 01/10] xen: Don't disable the I/O space Jeremy Fitzhardinge
2009-05-27  7:24 ` [PATCH 02/10] xen: Allow unprivileged Xen domains to create iomap pages Jeremy Fitzhardinge
2009-05-27  7:24 ` [PATCH 03/10] Xen: Rename the balloon lock Jeremy Fitzhardinge
2009-05-27  7:24 ` [PATCH 04/10] xen: Add xen_create_contiguous_region Jeremy Fitzhardinge
2009-05-27  7:24 ` [PATCH 05/10] x86/PCI: Clean up pci_cache_line_size Jeremy Fitzhardinge
2009-05-27  7:24 ` [PATCH 06/10] x86/PCI: Enable scanning of all pci functions Jeremy Fitzhardinge
2009-05-27  7:24 ` [PATCH 07/10] Xen/x86/PCI: Add support for the Xen PCI subsystem Jeremy Fitzhardinge
2009-05-27  7:24 ` Jeremy Fitzhardinge [this message]
2009-05-27  7:24 ` [PATCH 09/10] xen/pci: clean up Kconfig a bit Jeremy Fitzhardinge
2009-05-27  7:24 ` [PATCH 10/10] xen: define BIOVEC_PHYS_MERGEABLE() Jeremy Fitzhardinge
  -- strict thread matches above, loose matches on Subject: below --
2009-05-12 21:48 [GIT PULL] xen dom0 PCI access Jeremy Fitzhardinge
2009-05-12 21:48 ` [PATCH 08/10] x86/pci: make sure _PAGE_IOMAP it set on pci mappings Jeremy Fitzhardinge

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=1243409082-21349-9-git-send-email-jeremy@goop.org \
    --to=jeremy@goop.org \
    --cc=akpm@linux-foundation.org \
    --cc=chrisw@redhat.com \
    --cc=gregkh@suse.de \
    --cc=jbarnes@virtuousgeek.org \
    --cc=jbeulich@novell.com \
    --cc=jens.axboe@oracle.com \
    --cc=jeremy.fitzhardinge@citrix.com \
    --cc=ksrinivasan@novell.com \
    --cc=kurt.hackel@oracle.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=matthew@wil.cx \
    --cc=mingo@elte.hu \
    --cc=torvalds@linux-foundation.org \
    --cc=x86@kernel.org \
    --cc=xen-devel@lists.xensource.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

all inboxes | Powered by JetHome®