From: Bjorn Helgaas <helgaas@kernel.org>
To: David Woodhouse <dwmw2@infradead.org>
Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
Mark Rutland <mark.rutland@arm.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will.deacon@arm.com>,
linux-pci@vger.kernel.org
Subject: Re: [PATCH v2 1/4] arm64: enable pci resource mapping using sysfs
Date: Wed, 15 Mar 2017 16:23:22 -0500 [thread overview]
Message-ID: <20170315212322.GA31690@bhelgaas-glaptop.roam.corp.google.com> (raw)
In-Reply-To: <1489610540.86622.19.camel@infradead.org>
[+cc linux-pci]
On Wed, Mar 15, 2017 at 08:42:20PM +0000, David Woodhouse wrote:
> From: Brijesh Singh <brijess@amazon.com>
>
> 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 <quanstro@amazon.com>
> Reviewed-by: Anthony Liguori <aliguori@amazon.com>
> Signed-off-by: Brijesh Singh <brijess@amazon.com>
> Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
> ---
> 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
prev parent reply other threads:[~2017-03-15 21:23 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-15 20:42 David Woodhouse
2017-03-15 21:23 ` Bjorn Helgaas [this message]
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=20170315212322.GA31690@bhelgaas-glaptop.roam.corp.google.com \
--to=helgaas@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=dwmw2@infradead.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=will.deacon@arm.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®