Re: [PATCH 13/23] x86/PCI: make sure _PAGE_IOMAP it set on pcimappings

From: Jesse Barnes
Date: Tue Oct 12 2010 - 11:51:07 EST


On Tue, 12 Oct 2010 11:44:21 -0400
Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx> wrote:

> From: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>
>
> 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@xxxxxxxxxx>
> Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
> Reviewed-by: "H. Peter Anvin" <hpa@xxxxxxxxx>
> Reviewed-by: Matthew Wilcox <willy@xxxxxxxxxxxxxxx>
> Cc: x86@xxxxxxxxxx
> Cc: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx>
> ---
> arch/x86/pci/i386.c | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c
> index 5525309..8379c2c 100644
> --- a/arch/x86/pci/i386.c
> +++ b/arch/x86/pci/i386.c
> @@ -311,6 +311,8 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
> */
> prot |= _PAGE_CACHE_UC_MINUS;
>
> + prot |= _PAGE_IOMAP; /* creating a mapping for IO */
> +
> vma->vm_page_prot = __pgprot(prot);
>
> if (io_remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff,

Looks fine.

Acked-by: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx>

--
Jesse Barnes, Intel Open Source Technology Center
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/