From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756311AbdDMHhx (ORCPT ); Thu, 13 Apr 2017 03:37:53 -0400 Received: from bastet.se.axis.com ([195.60.68.11]:41095 "EHLO bastet.se.axis.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755953AbdDMHhu (ORCPT ); Thu, 13 Apr 2017 03:37:50 -0400 Date: Thu, 13 Apr 2017 09:37:47 +0200 From: Jesper Nilsson To: David Woodhouse Cc: linux-pci@vger.kernel.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 12/27] cris: Use generic pci_mmap_resource_range() Message-ID: <20170413073747.GA26295@axis.com> References: <828502b94cf12a278d4b1e43e98d0f4d3fd71ef2.1491999859.git.dwmw2@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <828502b94cf12a278d4b1e43e98d0f4d3fd71ef2.1491999859.git.dwmw2@infradead.org> User-Agent: Mutt/1.5.23 (2014-03-12) X-TM-AS-GCONF: 00 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Apr 12, 2017 at 01:26:01PM +0100, David Woodhouse wrote: > From: David Woodhouse > > Signed-off-by: David Woodhouse For the CRIS part: Acked-by: Jesper Nilsson > --- > arch/cris/arch-v32/drivers/pci/bios.c | 23 ----------------------- > arch/cris/include/asm/pci.h | 1 + > 2 files changed, 1 insertion(+), 23 deletions(-) > > diff --git a/arch/cris/arch-v32/drivers/pci/bios.c b/arch/cris/arch-v32/drivers/pci/bios.c > index a589686d..394c2a73 100644 > --- a/arch/cris/arch-v32/drivers/pci/bios.c > +++ b/arch/cris/arch-v32/drivers/pci/bios.c > @@ -14,29 +14,6 @@ void pcibios_set_master(struct pci_dev *dev) > pci_write_config_byte(dev, PCI_LATENCY_TIMER, lat); > } > > -int pci_mmap_page_range(struct pci_dev *dev, int bar, > - struct vm_area_struct *vma, > - enum pci_mmap_state mmap_state, int write_combine) > -{ > - unsigned long prot; > - > - /* Leave vm_pgoff as-is, the PCI space address is the physical > - * address on this platform. > - */ > - prot = pgprot_val(vma->vm_page_prot); > - vma->vm_page_prot = __pgprot(prot); > - > - /* Write-combine setting is ignored, it is changed via the mtrr > - * interfaces on this platform. > - */ > - 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; > -} > - > resource_size_t > pcibios_align_resource(void *data, const struct resource *res, > resource_size_t size, resource_size_t align) > diff --git a/arch/cris/include/asm/pci.h b/arch/cris/include/asm/pci.h > index 65198cb..6e50533 100644 > --- a/arch/cris/include/asm/pci.h > +++ b/arch/cris/include/asm/pci.h > @@ -42,6 +42,7 @@ struct pci_dev; > #define PCI_DMA_BUS_IS_PHYS (1) > > #define HAVE_PCI_MMAP > +#define ARCH_GENERIC_PCI_MMAP_RESOURCE > > #endif /* __KERNEL__ */ > > -- > 2.9.3 /^JN - Jesper Nilsson -- Jesper Nilsson -- jesper.nilsson@axis.com