From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762408AbZE0H1H (ORCPT ); Wed, 27 May 2009 03:27:07 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1762127AbZE0HZY (ORCPT ); Wed, 27 May 2009 03:25:24 -0400 Received: from claw.goop.org ([74.207.240.146]:33605 "EHLO claw.goop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761194AbZE0HZV (ORCPT ); Wed, 27 May 2009 03:25:21 -0400 From: Jeremy Fitzhardinge To: Ingo Molnar Cc: the arch/x86 maintainers , Linux Kernel Mailing List , Xen-devel , Greg KH , Jens Axboe , Chris Wright , kurt.hackel@oracle.com, Andrew Morton , Ky Srinivasan , Beulich , Linus Torvalds , Matthew Wilcox , Jesse Barnes , Jeremy Fitzhardinge Subject: [PATCH 08/10] x86/pci: make sure _PAGE_IOMAP it set on pci mappings Date: Wed, 27 May 2009 00:24:40 -0700 Message-Id: <1243409082-21349-9-git-send-email-jeremy@goop.org> X-Mailer: git-send-email 1.6.0.6 In-Reply-To: <1243409082-21349-1-git-send-email-jeremy@goop.org> References: <1243409082-21349-1-git-send-email-jeremy@goop.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jeremy Fitzhardinge 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 Reviewed-by: "H. Peter Anvin" Reviewed-by: Matthew Wilcox --- 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