From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753981AbdCOVX2 (ORCPT ); Wed, 15 Mar 2017 17:23:28 -0400 Received: from mail.kernel.org ([198.145.29.136]:60546 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753304AbdCOVX1 (ORCPT ); Wed, 15 Mar 2017 17:23:27 -0400 Date: Wed, 15 Mar 2017 16:23:22 -0500 From: Bjorn Helgaas To: David Woodhouse Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Mark Rutland , Catalin Marinas , Will Deacon , linux-pci@vger.kernel.org Subject: Re: [PATCH v2 1/4] arm64: enable pci resource mapping using sysfs Message-ID: <20170315212322.GA31690@bhelgaas-glaptop.roam.corp.google.com> References: <1489610540.86622.19.camel@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1489610540.86622.19.camel@infradead.org> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [+cc linux-pci] On Wed, Mar 15, 2017 at 08:42:20PM +0000, David Woodhouse wrote: > From: Brijesh Singh > > To support PCI resource mapping from userspace, pci_mmap_page_range() > must be implemented and HAVE_PCI_MMAP defined. This support was absent > for arm64. > > [dwmw2: Add WC support] > Reviewed-by: Erik Quanstrom > Reviewed-by: Anthony Liguori > Signed-off-by: Brijesh Singh > Signed-off-by: David Woodhouse > --- > v2: s/pgprot_uncached/pgprot_device/ > > arch/arm64/include/asm/pci.h | 4 ++++ > arch/arm64/kernel/pci.c | 19 +++++++++++++++++++ > 2 files changed, 23 insertions(+) > > diff --git a/arch/arm64/include/asm/pci.h b/arch/arm64/include/asm/pci.h > index b9a7ba9..f73734f 100644 > --- a/arch/arm64/include/asm/pci.h > +++ b/arch/arm64/include/asm/pci.h > @@ -37,5 +37,9 @@ static inline int pci_proc_domain(struct pci_bus *bus) > } > #endif /* CONFIG_PCI */ > > +#define HAVE_PCI_MMAP > +extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, > + enum pci_mmap_state mmap_state, int write_combine); > + > #endif /* __KERNEL__ */ > #endif /* __ASM_PCI_H */ > diff --git a/arch/arm64/kernel/pci.c b/arch/arm64/kernel/pci.c > index 4f0e3eb..9a87b2a 100644 > --- a/arch/arm64/kernel/pci.c > +++ b/arch/arm64/kernel/pci.c > @@ -228,3 +228,22 @@ void pcibios_remove_bus(struct pci_bus *bus) > } > > #endif > + > +int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, > + enum pci_mmap_state mmap_state, int write_combine) > +{ > + if (mmap_state == pci_mmap_io) > + return -EINVAL; > + > + if (write_combine) > + vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); > + else > + vma->vm_page_prot = pgprot_device(vma->vm_page_prot); > + > + if (remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff, > + vma->vm_end - vma->vm_start, > + vma->vm_page_prot)) > + return -EAGAIN; > + > + return 0; > +} > -- > dwmw2 > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel