Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966778AbcCPXO6 (ORCPT ); Wed, 16 Mar 2016 19:14:58 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:42938 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966261AbcCPXOz (ORCPT ); Wed, 16 Mar 2016 19:14:55 -0400 Subject: Re: [PATCH 1/2] pci: add pci_unmap_iospace function for PCI_IOBASE To: linux-pci@vger.kernel.org, linux-acpi@vger.kernel.org, timur@codeaurora.org, cov@codeaurora.org, jcm@redhat.com References: <1457389310-3538-1-git-send-email-okaya@codeaurora.org> Cc: agross@codeaurora.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org From: Sinan Kaya Message-ID: <56E9E8EB.6040707@codeaurora.org> Date: Wed, 16 Mar 2016 19:14:51 -0400 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 MIME-Version: 1.0 In-Reply-To: <1457389310-3538-1-git-send-email-okaya@codeaurora.org> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2672 Lines: 78 Bjorn, Any feedback here? On 3/7/2016 5:21 PM, Sinan Kaya wrote: > The PCI_IOBASE needs to be released after hotplug removal so that it can be > re-added back by the pci_remap_iospace function during insertion. > > Adding unmap function to follow IO remap function. > > Signed-off-by: Sinan Kaya > --- > drivers/pci/pci.c | 25 +++++++++++++++++++++++++ > include/linux/pci.h | 1 + > 2 files changed, 26 insertions(+) > > diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c > index 3a516c0..f5faed2 100644 > --- a/drivers/pci/pci.c > +++ b/drivers/pci/pci.c > @@ -26,6 +26,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -3169,6 +3170,30 @@ int __weak pci_remap_iospace(const struct resource *res, phys_addr_t phys_addr) > #endif > } > > +/** > + * pci_unmap_iospace - Unmap the memory mapped I/O space > + * @virt_addr: virtual address to be unmapped > + * @size: size of the physical address to be unmapped > + * > + * Unmap the CPU virtual address @virt_addr from virtual address space. > + * Only architectures that have memory mapped IO functions defined > + * (and the PCI_IOBASE value defined) should call this function. > + */ > +void __weak pci_unmap_iospace(struct resource *res) > +{ > +#if defined(PCI_IOBASE) && defined(CONFIG_MMU) > + unsigned long vaddr = (unsigned long)PCI_IOBASE + res->start; > + > + unmap_kernel_range(vaddr, resource_size(res)); > +#else > + /* > + * This architecture does not have memory mapped I/O space, > + * so this function should never be called. > + */ > + WARN_ONCE(1, "This architecture does not support memory mapped I/O\n"); > +#endif > +} > + > static void __pci_set_master(struct pci_dev *dev, bool enable) > { > u16 old_cmd, cmd; > diff --git a/include/linux/pci.h b/include/linux/pci.h > index 398ae7e..c6e3f0e 100644 > --- a/include/linux/pci.h > +++ b/include/linux/pci.h > @@ -1172,6 +1172,7 @@ int pci_register_io_range(phys_addr_t addr, resource_size_t size); > unsigned long pci_address_to_pio(phys_addr_t addr); > phys_addr_t pci_pio_to_address(unsigned long pio); > int pci_remap_iospace(const struct resource *res, phys_addr_t phys_addr); > +void pci_unmap_iospace(struct resource *res); > > static inline pci_bus_addr_t pci_bus_address(struct pci_dev *pdev, int bar) > { > Sinan -- Sinan Kaya Qualcomm Technologies, Inc. on behalf of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project