Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d3f1384 authored by Sinan Kaya's avatar Sinan Kaya Committed by Bjorn Helgaas
Browse files

PCI: Add pci_unmap_iospace() to unmap I/O resources 



Add pci_unmap_iospace() to undo what pci_remap_iospace() did.

This is needed to support hotplug removal of host bridges that use
pci_remap_iospace().

[bhelgaas: changelog]
Signed-off-by: default avatarSinan Kaya <okaya@codeaurora.org>
Signed-off-by: default avatarTomasz Nowicki <tn@semihalf.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
parent 5c3d14f7

drivers/pci/pci.c

+18 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/device.h>

#include <linux/pm_runtime.h>

#include <linux/pci_hotplug.h>

#include <linux/vmalloc.h>

#include <asm/setup.h>

#include <linux/aer.h>

#include "pci.h"
@@ -3165,6 +3166,23 @@ 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

 *	@res: resource to be unmapped

 *

 *	Unmap the CPU virtual address @res from virtual address space.

 *	Only architectures that have memory mapped IO functions defined

 *	(and the PCI_IOBASE value defined) should call this function.

 */

void 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));

#endif

}



static void __pci_set_master(struct pci_dev *dev, bool enable)

{

	u16 old_cmd, cmd;

include/linux/pci.h

+1 −0
Original line number Diff line number Diff line
@@ -1167,6 +1167,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)

{