mirror of
https://github.com/torvalds/linux
synced 2024-10-05 02:44:13 +00:00
Merge branch 'pci/devres'
- Unmap MMIO mappings in pci_iounmap() to avoid a leak when ARCH_HAS_GENERIC_IOPORT_MAP is defined (Philipp Stanner) - Move pci_iomap.c to drivers/pci/ since it's all PCI-related (Philipp Stanner) - Move other PCI-related devres code from lib/devres.c to drivers/pci/ (Philipp Stanner) - Move other devres code from pci.c to devres.c (Philipp Stanner) * pci/devres: PCI: Move devres code from pci.c to devres.c PCI: Move PCI-specific devres code to drivers/pci/ PCI: Move pci_iomap.c to drivers/pci/ pci_iounmap(): Fix MMIO mapping leak
This commit is contained in:
Bjorn Helgaas
commit
47c94b2de5
|
|
@ -517,6 +517,3 @@ Public Functions Provided
|
|||
|
||||
.. kernel-doc:: arch/x86/include/asm/io.h
|
||||
:internal:
|
||||
|
||||
.. kernel-doc:: lib/pci_iomap.c
|
||||
:export:
|
||||
|
|
|
|||
|
|
@ -4,6 +4,12 @@ PCI Support Library
|
|||
.. kernel-doc:: drivers/pci/pci.c
|
||||
:export:
|
||||
|
||||
.. kernel-doc:: drivers/pci/iomap.c
|
||||
:export:
|
||||
|
||||
.. kernel-doc:: drivers/pci/devres.c
|
||||
:export:
|
||||
|
||||
.. kernel-doc:: drivers/pci/pci-driver.c
|
||||
:export:
|
||||
|
||||
|
|
|
|||
|
|
@ -16954,7 +16954,6 @@ F: include/asm-generic/pci*
|
|||
F: include/linux/of_pci.h
|
||||
F: include/linux/pci*
|
||||
F: include/uapi/linux/pci*
|
||||
F: lib/pci*
|
||||
|
||||
PCIE DRIVER FOR AMAZON ANNAPURNA LABS
|
||||
M: Jonathan Chocron <jonnyc@amazon.com>
|
||||
|
|
|
|||
|
|
@ -13,6 +13,11 @@ config FORCE_PCI
|
|||
select HAVE_PCI
|
||||
select PCI
|
||||
|
||||
# select this to provide a generic PCI iomap,
|
||||
# without PCI itself having to be defined
|
||||
config GENERIC_PCI_IOMAP
|
||||
bool
|
||||
|
||||
menuconfig PCI
|
||||
bool "PCI support"
|
||||
depends on HAVE_PCI
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
obj-$(CONFIG_PCI) += access.o bus.o probe.o host-bridge.o \
|
||||
remove.o pci.o pci-driver.o search.o \
|
||||
pci-sysfs.o rom.o setup-res.o irq.o vpd.o \
|
||||
setup-bus.o vc.o mmap.o setup-irq.o
|
||||
setup-bus.o vc.o mmap.o setup-irq.o devres.o
|
||||
|
||||
obj-$(CONFIG_PCI) += msi/
|
||||
obj-$(CONFIG_PCI) += pcie/
|
||||
|
|
@ -14,6 +14,7 @@ ifdef CONFIG_PCI
|
|||
obj-$(CONFIG_PROC_FS) += proc.o
|
||||
obj-$(CONFIG_SYSFS) += slot.o
|
||||
obj-$(CONFIG_ACPI) += pci-acpi.o
|
||||
obj-$(CONFIG_GENERIC_PCI_IOMAP) += iomap.o
|
||||
endif
|
||||
|
||||
obj-$(CONFIG_OF) += of.o
|
||||
|
|
|
|||
448
drivers/pci/devres.c
Normal file
448
drivers/pci/devres.c
Normal file
|
|
@ -0,0 +1,448 @@
|
|||
// SPDX-License-Identifier: GPL-2.0
|
||||
#include <linux/device.h>
|
||||
#include <linux/pci.h>
|
||||
#include "pci.h"
|
||||
|
||||
/*
|
||||
* PCI iomap devres
|
||||
*/
|
||||
#define PCIM_IOMAP_MAX PCI_STD_NUM_BARS
|
||||
|
||||
struct pcim_iomap_devres {
|
||||
void __iomem *table[PCIM_IOMAP_MAX];
|
||||
};
|
||||
|
||||
|
||||
static void devm_pci_unmap_iospace(struct device *dev, void *ptr)
|
||||
{
|
||||
struct resource **res = ptr;
|
||||
|
||||
pci_unmap_iospace(*res);
|
||||
}
|
||||
|
||||
/**
|
||||
* devm_pci_remap_iospace - Managed pci_remap_iospace()
|
||||
* @dev: Generic device to remap IO address for
|
||||
* @res: Resource describing the I/O space
|
||||
* @phys_addr: physical address of range to be mapped
|
||||
*
|
||||
* Managed pci_remap_iospace(). Map is automatically unmapped on driver
|
||||
* detach.
|
||||
*/
|
||||
int devm_pci_remap_iospace(struct device *dev, const struct resource *res,
|
||||
phys_addr_t phys_addr)
|
||||
{
|
||||
const struct resource **ptr;
|
||||
int error;
|
||||
|
||||
ptr = devres_alloc(devm_pci_unmap_iospace, sizeof(*ptr), GFP_KERNEL);
|
||||
if (!ptr)
|
||||
return -ENOMEM;
|
||||
|
||||
error = pci_remap_iospace(res, phys_addr);
|
||||
if (error) {
|
||||
devres_free(ptr);
|
||||
} else {
|
||||
*ptr = res;
|
||||
devres_add(dev, ptr);
|
||||
}
|
||||
|
||||
return error;
|
||||
}
|
||||
EXPORT_SYMBOL(devm_pci_remap_iospace);
|
||||
|
||||
/**
|
||||
* devm_pci_remap_cfgspace - Managed pci_remap_cfgspace()
|
||||
* @dev: Generic device to remap IO address for
|
||||
* @offset: Resource address to map
|
||||
* @size: Size of map
|
||||
*
|
||||
* Managed pci_remap_cfgspace(). Map is automatically unmapped on driver
|
||||
* detach.
|
||||
*/
|
||||
void __iomem *devm_pci_remap_cfgspace(struct device *dev,
|
||||
resource_size_t offset,
|
||||
resource_size_t size)
|
||||
{
|
||||
void __iomem **ptr, *addr;
|
||||
|
||||
ptr = devres_alloc(devm_ioremap_release, sizeof(*ptr), GFP_KERNEL);
|
||||
if (!ptr)
|
||||
return NULL;
|
||||
|
||||
addr = pci_remap_cfgspace(offset, size);
|
||||
if (addr) {
|
||||
*ptr = addr;
|
||||
devres_add(dev, ptr);
|
||||
} else
|
||||
devres_free(ptr);
|
||||
|
||||
return addr;
|
||||
}
|
||||
EXPORT_SYMBOL(devm_pci_remap_cfgspace);
|
||||
|
||||
/**
|
||||
* devm_pci_remap_cfg_resource - check, request region and ioremap cfg resource
|
||||
* @dev: generic device to handle the resource for
|
||||
* @res: configuration space resource to be handled
|
||||
*
|
||||
* Checks that a resource is a valid memory region, requests the memory
|
||||
* region and ioremaps with pci_remap_cfgspace() API that ensures the
|
||||
* proper PCI configuration space memory attributes are guaranteed.
|
||||
*
|
||||
* All operations are managed and will be undone on driver detach.
|
||||
*
|
||||
* Returns a pointer to the remapped memory or an ERR_PTR() encoded error code
|
||||
* on failure. Usage example::
|
||||
*
|
||||
* res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
* base = devm_pci_remap_cfg_resource(&pdev->dev, res);
|
||||
* if (IS_ERR(base))
|
||||
* return PTR_ERR(base);
|
||||
*/
|
||||
void __iomem *devm_pci_remap_cfg_resource(struct device *dev,
|
||||
struct resource *res)
|
||||
{
|
||||
resource_size_t size;
|
||||
const char *name;
|
||||
void __iomem *dest_ptr;
|
||||
|
||||
BUG_ON(!dev);
|
||||
|
||||
if (!res || resource_type(res) != IORESOURCE_MEM) {
|
||||
dev_err(dev, "invalid resource\n");
|
||||
return IOMEM_ERR_PTR(-EINVAL);
|
||||
}
|
||||
|
||||
size = resource_size(res);
|
||||
|
||||
if (res->name)
|
||||
name = devm_kasprintf(dev, GFP_KERNEL, "%s %s", dev_name(dev),
|
||||
res->name);
|
||||
else
|
||||
name = devm_kstrdup(dev, dev_name(dev), GFP_KERNEL);
|
||||
if (!name)
|
||||
return IOMEM_ERR_PTR(-ENOMEM);
|
||||
|
||||
if (!devm_request_mem_region(dev, res->start, size, name)) {
|
||||
dev_err(dev, "can't request region for resource %pR\n", res);
|
||||
return IOMEM_ERR_PTR(-EBUSY);
|
||||
}
|
||||
|
||||
dest_ptr = devm_pci_remap_cfgspace(dev, res->start, size);
|
||||
if (!dest_ptr) {
|
||||
dev_err(dev, "ioremap failed for resource %pR\n", res);
|
||||
devm_release_mem_region(dev, res->start, size);
|
||||
dest_ptr = IOMEM_ERR_PTR(-ENOMEM);
|
||||
}
|
||||
|
||||
return dest_ptr;
|
||||
}
|
||||
EXPORT_SYMBOL(devm_pci_remap_cfg_resource);
|
||||
|
||||
/**
|
||||
* pcim_set_mwi - a device-managed pci_set_mwi()
|
||||
* @dev: the PCI device for which MWI is enabled
|
||||
*
|
||||
* Managed pci_set_mwi().
|
||||
*
|
||||
* RETURNS: An appropriate -ERRNO error value on error, or zero for success.
|
||||
*/
|
||||
int pcim_set_mwi(struct pci_dev *dev)
|
||||
{
|
||||
struct pci_devres *dr;
|
||||
|
||||
dr = find_pci_dr(dev);
|
||||
if (!dr)
|
||||
return -ENOMEM;
|
||||
|
||||
dr->mwi = 1;
|
||||
return pci_set_mwi(dev);
|
||||
}
|
||||
EXPORT_SYMBOL(pcim_set_mwi);
|
||||
|
||||
|
||||
static void pcim_release(struct device *gendev, void *res)
|
||||
{
|
||||
struct pci_dev *dev = to_pci_dev(gendev);
|
||||
struct pci_devres *this = res;
|
||||
int i;
|
||||
|
||||
for (i = 0; i < DEVICE_COUNT_RESOURCE; i++)
|
||||
if (this->region_mask & (1 << i))
|
||||
pci_release_region(dev, i);
|
||||
|
||||
if (this->mwi)
|
||||
pci_clear_mwi(dev);
|
||||
|
||||
if (this->restore_intx)
|
||||
pci_intx(dev, this->orig_intx);
|
||||
|
||||
if (this->enabled && !this->pinned)
|
||||
pci_disable_device(dev);
|
||||
}
|
||||
|
||||
/*
|
||||
* TODO: After the last four callers in pci.c are ported, find_pci_dr()
|
||||
* needs to be made static again.
|
||||
*/
|
||||
struct pci_devres *find_pci_dr(struct pci_dev *pdev)
|
||||
{
|
||||
if (pci_is_managed(pdev))
|
||||
return devres_find(&pdev->dev, pcim_release, NULL, NULL);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static struct pci_devres *get_pci_dr(struct pci_dev *pdev)
|
||||
{
|
||||
struct pci_devres *dr, *new_dr;
|
||||
|
||||
dr = devres_find(&pdev->dev, pcim_release, NULL, NULL);
|
||||
if (dr)
|
||||
return dr;
|
||||
|
||||
new_dr = devres_alloc(pcim_release, sizeof(*new_dr), GFP_KERNEL);
|
||||
if (!new_dr)
|
||||
return NULL;
|
||||
return devres_get(&pdev->dev, new_dr, NULL, NULL);
|
||||
}
|
||||
|
||||
/**
|
||||
* pcim_enable_device - Managed pci_enable_device()
|
||||
* @pdev: PCI device to be initialized
|
||||
*
|
||||
* Managed pci_enable_device().
|
||||
*/
|
||||
int pcim_enable_device(struct pci_dev *pdev)
|
||||
{
|
||||
struct pci_devres *dr;
|
||||
int rc;
|
||||
|
||||
dr = get_pci_dr(pdev);
|
||||
if (unlikely(!dr))
|
||||
return -ENOMEM;
|
||||
if (dr->enabled)
|
||||
return 0;
|
||||
|
||||
rc = pci_enable_device(pdev);
|
||||
if (!rc) {
|
||||
pdev->is_managed = 1;
|
||||
dr->enabled = 1;
|
||||
}
|
||||
return rc;
|
||||
}
|
||||
EXPORT_SYMBOL(pcim_enable_device);
|
||||
|
||||
/**
|
||||
* pcim_pin_device - Pin managed PCI device
|
||||
* @pdev: PCI device to pin
|
||||
*
|
||||
* Pin managed PCI device @pdev. Pinned device won't be disabled on
|
||||
* driver detach. @pdev must have been enabled with
|
||||
* pcim_enable_device().
|
||||
*/
|
||||
void pcim_pin_device(struct pci_dev *pdev)
|
||||
{
|
||||
struct pci_devres *dr;
|
||||
|
||||
dr = find_pci_dr(pdev);
|
||||
WARN_ON(!dr || !dr->enabled);
|
||||
if (dr)
|
||||
dr->pinned = 1;
|
||||
}
|
||||
EXPORT_SYMBOL(pcim_pin_device);
|
||||
|
||||
static void pcim_iomap_release(struct device *gendev, void *res)
|
||||
{
|
||||
struct pci_dev *dev = to_pci_dev(gendev);
|
||||
struct pcim_iomap_devres *this = res;
|
||||
int i;
|
||||
|
||||
for (i = 0; i < PCIM_IOMAP_MAX; i++)
|
||||
if (this->table[i])
|
||||
pci_iounmap(dev, this->table[i]);
|
||||
}
|
||||
|
||||
/**
|
||||
* pcim_iomap_table - access iomap allocation table
|
||||
* @pdev: PCI device to access iomap table for
|
||||
*
|
||||
* Access iomap allocation table for @dev. If iomap table doesn't
|
||||
* exist and @pdev is managed, it will be allocated. All iomaps
|
||||
* recorded in the iomap table are automatically unmapped on driver
|
||||
* detach.
|
||||
*
|
||||
* This function might sleep when the table is first allocated but can
|
||||
* be safely called without context and guaranteed to succeed once
|
||||
* allocated.
|
||||
*/
|
||||
void __iomem * const *pcim_iomap_table(struct pci_dev *pdev)
|
||||
{
|
||||
struct pcim_iomap_devres *dr, *new_dr;
|
||||
|
||||
dr = devres_find(&pdev->dev, pcim_iomap_release, NULL, NULL);
|
||||
if (dr)
|
||||
return dr->table;
|
||||
|
||||
new_dr = devres_alloc_node(pcim_iomap_release, sizeof(*new_dr), GFP_KERNEL,
|
||||
dev_to_node(&pdev->dev));
|
||||
if (!new_dr)
|
||||
return NULL;
|
||||
dr = devres_get(&pdev->dev, new_dr, NULL, NULL);
|
||||
return dr->table;
|
||||
}
|
||||
EXPORT_SYMBOL(pcim_iomap_table);
|
||||
|
||||
/**
|
||||
* pcim_iomap - Managed pcim_iomap()
|
||||
* @pdev: PCI device to iomap for
|
||||
* @bar: BAR to iomap
|
||||
* @maxlen: Maximum length of iomap
|
||||
*
|
||||
* Managed pci_iomap(). Map is automatically unmapped on driver
|
||||
* detach.
|
||||
*/
|
||||
void __iomem *pcim_iomap(struct pci_dev *pdev, int bar, unsigned long maxlen)
|
||||
{
|
||||
void __iomem **tbl;
|
||||
|
||||
BUG_ON(bar >= PCIM_IOMAP_MAX);
|
||||
|
||||
tbl = (void __iomem **)pcim_iomap_table(pdev);
|
||||
if (!tbl || tbl[bar]) /* duplicate mappings not allowed */
|
||||
return NULL;
|
||||
|
||||
tbl[bar] = pci_iomap(pdev, bar, maxlen);
|
||||
return tbl[bar];
|
||||
}
|
||||
EXPORT_SYMBOL(pcim_iomap);
|
||||
|
||||
/**
|
||||
* pcim_iounmap - Managed pci_iounmap()
|
||||
* @pdev: PCI device to iounmap for
|
||||
* @addr: Address to unmap
|
||||
*
|
||||
* Managed pci_iounmap(). @addr must have been mapped using pcim_iomap().
|
||||
*/
|
||||
void pcim_iounmap(struct pci_dev *pdev, void __iomem *addr)
|
||||
{
|
||||
void __iomem **tbl;
|
||||
int i;
|
||||
|
||||
pci_iounmap(pdev, addr);
|
||||
|
||||
tbl = (void __iomem **)pcim_iomap_table(pdev);
|
||||
BUG_ON(!tbl);
|
||||
|
||||
for (i = 0; i < PCIM_IOMAP_MAX; i++)
|
||||
if (tbl[i] == addr) {
|
||||
tbl[i] = NULL;
|
||||
return;
|
||||
}
|
||||
WARN_ON(1);
|
||||
}
|
||||
EXPORT_SYMBOL(pcim_iounmap);
|
||||
|
||||
/**
|
||||
* pcim_iomap_regions - Request and iomap PCI BARs
|
||||
* @pdev: PCI device to map IO resources for
|
||||
* @mask: Mask of BARs to request and iomap
|
||||
* @name: Name used when requesting regions
|
||||
*
|
||||
* Request and iomap regions specified by @mask.
|
||||
*/
|
||||
int pcim_iomap_regions(struct pci_dev *pdev, int mask, const char *name)
|
||||
{
|
||||
void __iomem * const *iomap;
|
||||
int i, rc;
|
||||
|
||||
iomap = pcim_iomap_table(pdev);
|
||||
if (!iomap)
|
||||
return -ENOMEM;
|
||||
|
||||
for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
|
||||
unsigned long len;
|
||||
|
||||
if (!(mask & (1 << i)))
|
||||
continue;
|
||||
|
||||
rc = -EINVAL;
|
||||
len = pci_resource_len(pdev, i);
|
||||
if (!len)
|
||||
goto err_inval;
|
||||
|
||||
rc = pci_request_region(pdev, i, name);
|
||||
if (rc)
|
||||
goto err_inval;
|
||||
|
||||
rc = -ENOMEM;
|
||||
if (!pcim_iomap(pdev, i, 0))
|
||||
goto err_region;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
err_region:
|
||||
pci_release_region(pdev, i);
|
||||
err_inval:
|
||||
while (--i >= 0) {
|
||||
if (!(mask & (1 << i)))
|
||||
continue;
|
||||
pcim_iounmap(pdev, iomap[i]);
|
||||
pci_release_region(pdev, i);
|
||||
}
|
||||
|
||||
return rc;
|
||||
}
|
||||
EXPORT_SYMBOL(pcim_iomap_regions);
|
||||
|
||||
/**
|
||||
* pcim_iomap_regions_request_all - Request all BARs and iomap specified ones
|
||||
* @pdev: PCI device to map IO resources for
|
||||
* @mask: Mask of BARs to iomap
|
||||
* @name: Name used when requesting regions
|
||||
*
|
||||
* Request all PCI BARs and iomap regions specified by @mask.
|
||||
*/
|
||||
int pcim_iomap_regions_request_all(struct pci_dev *pdev, int mask,
|
||||
const char *name)
|
||||
{
|
||||
int request_mask = ((1 << 6) - 1) & ~mask;
|
||||
int rc;
|
||||
|
||||
rc = pci_request_selected_regions(pdev, request_mask, name);
|
||||
if (rc)
|
||||
return rc;
|
||||
|
||||
rc = pcim_iomap_regions(pdev, mask, name);
|
||||
if (rc)
|
||||
pci_release_selected_regions(pdev, request_mask);
|
||||
return rc;
|
||||
}
|
||||
EXPORT_SYMBOL(pcim_iomap_regions_request_all);
|
||||
|
||||
/**
|
||||
* pcim_iounmap_regions - Unmap and release PCI BARs
|
||||
* @pdev: PCI device to map IO resources for
|
||||
* @mask: Mask of BARs to unmap and release
|
||||
*
|
||||
* Unmap and release regions specified by @mask.
|
||||
*/
|
||||
void pcim_iounmap_regions(struct pci_dev *pdev, int mask)
|
||||
{
|
||||
void __iomem * const *iomap;
|
||||
int i;
|
||||
|
||||
iomap = pcim_iomap_table(pdev);
|
||||
if (!iomap)
|
||||
return;
|
||||
|
||||
for (i = 0; i < PCIM_IOMAP_MAX; i++) {
|
||||
if (!(mask & (1 << i)))
|
||||
continue;
|
||||
|
||||
pcim_iounmap(pdev, iomap[i]);
|
||||
pci_release_region(pdev, i);
|
||||
}
|
||||
}
|
||||
EXPORT_SYMBOL(pcim_iounmap_regions);
|
||||
|
|
@ -9,7 +9,6 @@
|
|||
|
||||
#include <linux/export.h>
|
||||
|
||||
#ifdef CONFIG_PCI
|
||||
/**
|
||||
* pci_iomap_range - create a virtual mapping cookie for a PCI BAR
|
||||
* @dev: PCI device that owns the BAR
|
||||
|
|
@ -170,11 +169,9 @@ void pci_iounmap(struct pci_dev *dev, void __iomem *p)
|
|||
|
||||
if (addr >= start && addr < start + IO_SPACE_LIMIT)
|
||||
return;
|
||||
iounmap(p);
|
||||
#endif
|
||||
iounmap(p);
|
||||
}
|
||||
EXPORT_SYMBOL(pci_iounmap);
|
||||
|
||||
#endif /* ARCH_WANTS_GENERIC_PCI_IOUNMAP */
|
||||
|
||||
#endif /* CONFIG_PCI */
|
||||
|
|
@ -2130,107 +2130,6 @@ int pci_enable_device(struct pci_dev *dev)
|
|||
}
|
||||
EXPORT_SYMBOL(pci_enable_device);
|
||||
|
||||
/*
|
||||
* Managed PCI resources. This manages device on/off, INTx/MSI/MSI-X
|
||||
* on/off and BAR regions. pci_dev itself records MSI/MSI-X status, so
|
||||
* there's no need to track it separately. pci_devres is initialized
|
||||
* when a device is enabled using managed PCI device enable interface.
|
||||
*/
|
||||
struct pci_devres {
|
||||
unsigned int enabled:1;
|
||||
unsigned int pinned:1;
|
||||
unsigned int orig_intx:1;
|
||||
unsigned int restore_intx:1;
|
||||
unsigned int mwi:1;
|
||||
u32 region_mask;
|
||||
};
|
||||
|
||||
static void pcim_release(struct device *gendev, void *res)
|
||||
{
|
||||
struct pci_dev *dev = to_pci_dev(gendev);
|
||||
struct pci_devres *this = res;
|
||||
int i;
|
||||
|
||||
for (i = 0; i < DEVICE_COUNT_RESOURCE; i++)
|
||||
if (this->region_mask & (1 << i))
|
||||
pci_release_region(dev, i);
|
||||
|
||||
if (this->mwi)
|
||||
pci_clear_mwi(dev);
|
||||
|
||||
if (this->restore_intx)
|
||||
pci_intx(dev, this->orig_intx);
|
||||
|
||||
if (this->enabled && !this->pinned)
|
||||
pci_disable_device(dev);
|
||||
}
|
||||
|
||||
static struct pci_devres *get_pci_dr(struct pci_dev *pdev)
|
||||
{
|
||||
struct pci_devres *dr, *new_dr;
|
||||
|
||||
dr = devres_find(&pdev->dev, pcim_release, NULL, NULL);
|
||||
if (dr)
|
||||
return dr;
|
||||
|
||||
new_dr = devres_alloc(pcim_release, sizeof(*new_dr), GFP_KERNEL);
|
||||
if (!new_dr)
|
||||
return NULL;
|
||||
return devres_get(&pdev->dev, new_dr, NULL, NULL);
|
||||
}
|
||||
|
||||
static struct pci_devres *find_pci_dr(struct pci_dev *pdev)
|
||||
{
|
||||
if (pci_is_managed(pdev))
|
||||
return devres_find(&pdev->dev, pcim_release, NULL, NULL);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/**
|
||||
* pcim_enable_device - Managed pci_enable_device()
|
||||
* @pdev: PCI device to be initialized
|
||||
*
|
||||
* Managed pci_enable_device().
|
||||
*/
|
||||
int pcim_enable_device(struct pci_dev *pdev)
|
||||
{
|
||||
struct pci_devres *dr;
|
||||
int rc;
|
||||
|
||||
dr = get_pci_dr(pdev);
|
||||
if (unlikely(!dr))
|
||||
return -ENOMEM;
|
||||
if (dr->enabled)
|
||||
return 0;
|
||||
|
||||
rc = pci_enable_device(pdev);
|
||||
if (!rc) {
|
||||
pdev->is_managed = 1;
|
||||
dr->enabled = 1;
|
||||
}
|
||||
return rc;
|
||||
}
|
||||
EXPORT_SYMBOL(pcim_enable_device);
|
||||
|
||||
/**
|
||||
* pcim_pin_device - Pin managed PCI device
|
||||
* @pdev: PCI device to pin
|
||||
*
|
||||
* Pin managed PCI device @pdev. Pinned device won't be disabled on
|
||||
* driver detach. @pdev must have been enabled with
|
||||
* pcim_enable_device().
|
||||
*/
|
||||
void pcim_pin_device(struct pci_dev *pdev)
|
||||
{
|
||||
struct pci_devres *dr;
|
||||
|
||||
dr = find_pci_dr(pdev);
|
||||
WARN_ON(!dr || !dr->enabled);
|
||||
if (dr)
|
||||
dr->pinned = 1;
|
||||
}
|
||||
EXPORT_SYMBOL(pcim_pin_device);
|
||||
|
||||
/*
|
||||
* pcibios_device_add - provide arch specific hooks when adding device dev
|
||||
* @dev: the PCI device being added
|
||||
|
|
@ -4325,133 +4224,6 @@ void pci_unmap_iospace(struct resource *res)
|
|||
}
|
||||
EXPORT_SYMBOL(pci_unmap_iospace);
|
||||
|
||||
static void devm_pci_unmap_iospace(struct device *dev, void *ptr)
|
||||
{
|
||||
struct resource **res = ptr;
|
||||
|
||||
pci_unmap_iospace(*res);
|
||||
}
|
||||
|
||||
/**
|
||||
* devm_pci_remap_iospace - Managed pci_remap_iospace()
|
||||
* @dev: Generic device to remap IO address for
|
||||
* @res: Resource describing the I/O space
|
||||
* @phys_addr: physical address of range to be mapped
|
||||
*
|
||||
* Managed pci_remap_iospace(). Map is automatically unmapped on driver
|
||||
* detach.
|
||||
*/
|
||||
int devm_pci_remap_iospace(struct device *dev, const struct resource *res,
|
||||
phys_addr_t phys_addr)
|
||||
{
|
||||
const struct resource **ptr;
|
||||
int error;
|
||||
|
||||
ptr = devres_alloc(devm_pci_unmap_iospace, sizeof(*ptr), GFP_KERNEL);
|
||||
if (!ptr)
|
||||
return -ENOMEM;
|
||||
|
||||
error = pci_remap_iospace(res, phys_addr);
|
||||
if (error) {
|
||||
devres_free(ptr);
|
||||
} else {
|
||||
*ptr = res;
|
||||
devres_add(dev, ptr);
|
||||
}
|
||||
|
||||
return error;
|
||||
}
|
||||
EXPORT_SYMBOL(devm_pci_remap_iospace);
|
||||
|
||||
/**
|
||||
* devm_pci_remap_cfgspace - Managed pci_remap_cfgspace()
|
||||
* @dev: Generic device to remap IO address for
|
||||
* @offset: Resource address to map
|
||||
* @size: Size of map
|
||||
*
|
||||
* Managed pci_remap_cfgspace(). Map is automatically unmapped on driver
|
||||
* detach.
|
||||
*/
|
||||
void __iomem *devm_pci_remap_cfgspace(struct device *dev,
|
||||
resource_size_t offset,
|
||||
resource_size_t size)
|
||||
{
|
||||
void __iomem **ptr, *addr;
|
||||
|
||||
ptr = devres_alloc(devm_ioremap_release, sizeof(*ptr), GFP_KERNEL);
|
||||
if (!ptr)
|
||||
return NULL;
|
||||
|
||||
addr = pci_remap_cfgspace(offset, size);
|
||||
if (addr) {
|
||||
*ptr = addr;
|
||||
devres_add(dev, ptr);
|
||||
} else
|
||||
devres_free(ptr);
|
||||
|
||||
return addr;
|
||||
}
|
||||
EXPORT_SYMBOL(devm_pci_remap_cfgspace);
|
||||
|
||||
/**
|
||||
* devm_pci_remap_cfg_resource - check, request region and ioremap cfg resource
|
||||
* @dev: generic device to handle the resource for
|
||||
* @res: configuration space resource to be handled
|
||||
*
|
||||
* Checks that a resource is a valid memory region, requests the memory
|
||||
* region and ioremaps with pci_remap_cfgspace() API that ensures the
|
||||
* proper PCI configuration space memory attributes are guaranteed.
|
||||
*
|
||||
* All operations are managed and will be undone on driver detach.
|
||||
*
|
||||
* Returns a pointer to the remapped memory or an ERR_PTR() encoded error code
|
||||
* on failure. Usage example::
|
||||
*
|
||||
* res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
* base = devm_pci_remap_cfg_resource(&pdev->dev, res);
|
||||
* if (IS_ERR(base))
|
||||
* return PTR_ERR(base);
|
||||
*/
|
||||
void __iomem *devm_pci_remap_cfg_resource(struct device *dev,
|
||||
struct resource *res)
|
||||
{
|
||||
resource_size_t size;
|
||||
const char *name;
|
||||
void __iomem *dest_ptr;
|
||||
|
||||
BUG_ON(!dev);
|
||||
|
||||
if (!res || resource_type(res) != IORESOURCE_MEM) {
|
||||
dev_err(dev, "invalid resource\n");
|
||||
return IOMEM_ERR_PTR(-EINVAL);
|
||||
}
|
||||
|
||||
size = resource_size(res);
|
||||
|
||||
if (res->name)
|
||||
name = devm_kasprintf(dev, GFP_KERNEL, "%s %s", dev_name(dev),
|
||||
res->name);
|
||||
else
|
||||
name = devm_kstrdup(dev, dev_name(dev), GFP_KERNEL);
|
||||
if (!name)
|
||||
return IOMEM_ERR_PTR(-ENOMEM);
|
||||
|
||||
if (!devm_request_mem_region(dev, res->start, size, name)) {
|
||||
dev_err(dev, "can't request region for resource %pR\n", res);
|
||||
return IOMEM_ERR_PTR(-EBUSY);
|
||||
}
|
||||
|
||||
dest_ptr = devm_pci_remap_cfgspace(dev, res->start, size);
|
||||
if (!dest_ptr) {
|
||||
dev_err(dev, "ioremap failed for resource %pR\n", res);
|
||||
devm_release_mem_region(dev, res->start, size);
|
||||
dest_ptr = IOMEM_ERR_PTR(-ENOMEM);
|
||||
}
|
||||
|
||||
return dest_ptr;
|
||||
}
|
||||
EXPORT_SYMBOL(devm_pci_remap_cfg_resource);
|
||||
|
||||
static void __pci_set_master(struct pci_dev *dev, bool enable)
|
||||
{
|
||||
u16 old_cmd, cmd;
|
||||
|
|
@ -4601,27 +4373,6 @@ int pci_set_mwi(struct pci_dev *dev)
|
|||
}
|
||||
EXPORT_SYMBOL(pci_set_mwi);
|
||||
|
||||
/**
|
||||
* pcim_set_mwi - a device-managed pci_set_mwi()
|
||||
* @dev: the PCI device for which MWI is enabled
|
||||
*
|
||||
* Managed pci_set_mwi().
|
||||
*
|
||||
* RETURNS: An appropriate -ERRNO error value on error, or zero for success.
|
||||
*/
|
||||
int pcim_set_mwi(struct pci_dev *dev)
|
||||
{
|
||||
struct pci_devres *dr;
|
||||
|
||||
dr = find_pci_dr(dev);
|
||||
if (!dr)
|
||||
return -ENOMEM;
|
||||
|
||||
dr->mwi = 1;
|
||||
return pci_set_mwi(dev);
|
||||
}
|
||||
EXPORT_SYMBOL(pcim_set_mwi);
|
||||
|
||||
/**
|
||||
* pci_try_set_mwi - enables memory-write-invalidate PCI transaction
|
||||
* @dev: the PCI device for which MWI is enabled
|
||||
|
|
|
|||
|
|
@ -808,6 +808,27 @@ static inline pci_power_t mid_pci_get_power_state(struct pci_dev *pdev)
|
|||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Managed PCI resources. This manages device on/off, INTx/MSI/MSI-X
|
||||
* on/off and BAR regions. pci_dev itself records MSI/MSI-X status, so
|
||||
* there's no need to track it separately. pci_devres is initialized
|
||||
* when a device is enabled using managed PCI device enable interface.
|
||||
*
|
||||
* TODO: Struct pci_devres and find_pci_dr() only need to be here because
|
||||
* they're used in pci.c. Port or move these functions to devres.c and
|
||||
* then remove them from here.
|
||||
*/
|
||||
struct pci_devres {
|
||||
unsigned int enabled:1;
|
||||
unsigned int pinned:1;
|
||||
unsigned int orig_intx:1;
|
||||
unsigned int restore_intx:1;
|
||||
unsigned int mwi:1;
|
||||
u32 region_mask;
|
||||
};
|
||||
|
||||
struct pci_devres *find_pci_dr(struct pci_dev *pdev);
|
||||
|
||||
/*
|
||||
* Config Address for PCI Configuration Mechanism #1
|
||||
*
|
||||
|
|
|
|||
|
|
@ -70,9 +70,6 @@ source "lib/math/Kconfig"
|
|||
config NO_GENERIC_PCI_IOPORT_MAP
|
||||
bool
|
||||
|
||||
config GENERIC_PCI_IOMAP
|
||||
bool
|
||||
|
||||
config GENERIC_IOMAP
|
||||
bool
|
||||
select GENERIC_PCI_IOMAP
|
||||
|
|
|
|||
|
|
@ -153,7 +153,6 @@ CFLAGS_debug_info.o += $(call cc-option, -femit-struct-debug-detailed=any)
|
|||
obj-y += math/ crypto/
|
||||
|
||||
obj-$(CONFIG_GENERIC_IOMAP) += iomap.o
|
||||
obj-$(CONFIG_GENERIC_PCI_IOMAP) += pci_iomap.o
|
||||
obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o
|
||||
obj-$(CONFIG_CHECK_SIGNATURE) += check_signature.o
|
||||
obj-$(CONFIG_DEBUG_LOCKING_API_SELFTESTS) += locking-selftest.o
|
||||
|
|
|
|||
208
lib/devres.c
208
lib/devres.c
|
|
@ -1,6 +1,6 @@
|
|||
// SPDX-License-Identifier: GPL-2.0
|
||||
#include <linux/device.h>
|
||||
#include <linux/err.h>
|
||||
#include <linux/pci.h>
|
||||
#include <linux/io.h>
|
||||
#include <linux/gfp.h>
|
||||
#include <linux/export.h>
|
||||
|
|
@ -311,212 +311,6 @@ void devm_ioport_unmap(struct device *dev, void __iomem *addr)
|
|||
EXPORT_SYMBOL(devm_ioport_unmap);
|
||||
#endif /* CONFIG_HAS_IOPORT_MAP */
|
||||
|
||||
#ifdef CONFIG_PCI
|
||||
/*
|
||||
* PCI iomap devres
|
||||
*/
|
||||
#define PCIM_IOMAP_MAX PCI_STD_NUM_BARS
|
||||
|
||||
struct pcim_iomap_devres {
|
||||
void __iomem *table[PCIM_IOMAP_MAX];
|
||||
};
|
||||
|
||||
static void pcim_iomap_release(struct device *gendev, void *res)
|
||||
{
|
||||
struct pci_dev *dev = to_pci_dev(gendev);
|
||||
struct pcim_iomap_devres *this = res;
|
||||
int i;
|
||||
|
||||
for (i = 0; i < PCIM_IOMAP_MAX; i++)
|
||||
if (this->table[i])
|
||||
pci_iounmap(dev, this->table[i]);
|
||||
}
|
||||
|
||||
/**
|
||||
* pcim_iomap_table - access iomap allocation table
|
||||
* @pdev: PCI device to access iomap table for
|
||||
*
|
||||
* Access iomap allocation table for @dev. If iomap table doesn't
|
||||
* exist and @pdev is managed, it will be allocated. All iomaps
|
||||
* recorded in the iomap table are automatically unmapped on driver
|
||||
* detach.
|
||||
*
|
||||
* This function might sleep when the table is first allocated but can
|
||||
* be safely called without context and guaranteed to succeed once
|
||||
* allocated.
|
||||
*/
|
||||
void __iomem * const *pcim_iomap_table(struct pci_dev *pdev)
|
||||
{
|
||||
struct pcim_iomap_devres *dr, *new_dr;
|
||||
|
||||
dr = devres_find(&pdev->dev, pcim_iomap_release, NULL, NULL);
|
||||
if (dr)
|
||||
return dr->table;
|
||||
|
||||
new_dr = devres_alloc_node(pcim_iomap_release, sizeof(*new_dr), GFP_KERNEL,
|
||||
dev_to_node(&pdev->dev));
|
||||
if (!new_dr)
|
||||
return NULL;
|
||||
dr = devres_get(&pdev->dev, new_dr, NULL, NULL);
|
||||
return dr->table;
|
||||
}
|
||||
EXPORT_SYMBOL(pcim_iomap_table);
|
||||
|
||||
/**
|
||||
* pcim_iomap - Managed pcim_iomap()
|
||||
* @pdev: PCI device to iomap for
|
||||
* @bar: BAR to iomap
|
||||
* @maxlen: Maximum length of iomap
|
||||
*
|
||||
* Managed pci_iomap(). Map is automatically unmapped on driver
|
||||
* detach.
|
||||
*/
|
||||
void __iomem *pcim_iomap(struct pci_dev *pdev, int bar, unsigned long maxlen)
|
||||
{
|
||||
void __iomem **tbl;
|
||||
|
||||
BUG_ON(bar >= PCIM_IOMAP_MAX);
|
||||
|
||||
tbl = (void __iomem **)pcim_iomap_table(pdev);
|
||||
if (!tbl || tbl[bar]) /* duplicate mappings not allowed */
|
||||
return NULL;
|
||||
|
||||
tbl[bar] = pci_iomap(pdev, bar, maxlen);
|
||||
return tbl[bar];
|
||||
}
|
||||
EXPORT_SYMBOL(pcim_iomap);
|
||||
|
||||
/**
|
||||
* pcim_iounmap - Managed pci_iounmap()
|
||||
* @pdev: PCI device to iounmap for
|
||||
* @addr: Address to unmap
|
||||
*
|
||||
* Managed pci_iounmap(). @addr must have been mapped using pcim_iomap().
|
||||
*/
|
||||
void pcim_iounmap(struct pci_dev *pdev, void __iomem *addr)
|
||||
{
|
||||
void __iomem **tbl;
|
||||
int i;
|
||||
|
||||
pci_iounmap(pdev, addr);
|
||||
|
||||
tbl = (void __iomem **)pcim_iomap_table(pdev);
|
||||
BUG_ON(!tbl);
|
||||
|
||||
for (i = 0; i < PCIM_IOMAP_MAX; i++)
|
||||
if (tbl[i] == addr) {
|
||||
tbl[i] = NULL;
|
||||
return;
|
||||
}
|
||||
WARN_ON(1);
|
||||
}
|
||||
EXPORT_SYMBOL(pcim_iounmap);
|
||||
|
||||
/**
|
||||
* pcim_iomap_regions - Request and iomap PCI BARs
|
||||
* @pdev: PCI device to map IO resources for
|
||||
* @mask: Mask of BARs to request and iomap
|
||||
* @name: Name used when requesting regions
|
||||
*
|
||||
* Request and iomap regions specified by @mask.
|
||||
*/
|
||||
int pcim_iomap_regions(struct pci_dev *pdev, int mask, const char *name)
|
||||
{
|
||||
void __iomem * const *iomap;
|
||||
int i, rc;
|
||||
|
||||
iomap = pcim_iomap_table(pdev);
|
||||
if (!iomap)
|
||||
return -ENOMEM;
|
||||
|
||||
for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
|
||||
unsigned long len;
|
||||
|
||||
if (!(mask & (1 << i)))
|
||||
continue;
|
||||
|
||||
rc = -EINVAL;
|
||||
len = pci_resource_len(pdev, i);
|
||||
if (!len)
|
||||
goto err_inval;
|
||||
|
||||
rc = pci_request_region(pdev, i, name);
|
||||
if (rc)
|
||||
goto err_inval;
|
||||
|
||||
rc = -ENOMEM;
|
||||
if (!pcim_iomap(pdev, i, 0))
|
||||
goto err_region;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
err_region:
|
||||
pci_release_region(pdev, i);
|
||||
err_inval:
|
||||
while (--i >= 0) {
|
||||
if (!(mask & (1 << i)))
|
||||
continue;
|
||||
pcim_iounmap(pdev, iomap[i]);
|
||||
pci_release_region(pdev, i);
|
||||
}
|
||||
|
||||
return rc;
|
||||
}
|
||||
EXPORT_SYMBOL(pcim_iomap_regions);
|
||||
|
||||
/**
|
||||
* pcim_iomap_regions_request_all - Request all BARs and iomap specified ones
|
||||
* @pdev: PCI device to map IO resources for
|
||||
* @mask: Mask of BARs to iomap
|
||||
* @name: Name used when requesting regions
|
||||
*
|
||||
* Request all PCI BARs and iomap regions specified by @mask.
|
||||
*/
|
||||
int pcim_iomap_regions_request_all(struct pci_dev *pdev, int mask,
|
||||
const char *name)
|
||||
{
|
||||
int request_mask = ((1 << 6) - 1) & ~mask;
|
||||
int rc;
|
||||
|
||||
rc = pci_request_selected_regions(pdev, request_mask, name);
|
||||
if (rc)
|
||||
return rc;
|
||||
|
||||
rc = pcim_iomap_regions(pdev, mask, name);
|
||||
if (rc)
|
||||
pci_release_selected_regions(pdev, request_mask);
|
||||
return rc;
|
||||
}
|
||||
EXPORT_SYMBOL(pcim_iomap_regions_request_all);
|
||||
|
||||
/**
|
||||
* pcim_iounmap_regions - Unmap and release PCI BARs
|
||||
* @pdev: PCI device to map IO resources for
|
||||
* @mask: Mask of BARs to unmap and release
|
||||
*
|
||||
* Unmap and release regions specified by @mask.
|
||||
*/
|
||||
void pcim_iounmap_regions(struct pci_dev *pdev, int mask)
|
||||
{
|
||||
void __iomem * const *iomap;
|
||||
int i;
|
||||
|
||||
iomap = pcim_iomap_table(pdev);
|
||||
if (!iomap)
|
||||
return;
|
||||
|
||||
for (i = 0; i < PCIM_IOMAP_MAX; i++) {
|
||||
if (!(mask & (1 << i)))
|
||||
continue;
|
||||
|
||||
pcim_iounmap(pdev, iomap[i]);
|
||||
pci_release_region(pdev, i);
|
||||
}
|
||||
}
|
||||
EXPORT_SYMBOL(pcim_iounmap_regions);
|
||||
#endif /* CONFIG_PCI */
|
||||
|
||||
static void devm_arch_phys_ac_add_release(struct device *dev, void *res)
|
||||
{
|
||||
arch_phys_wc_del(*((int *)res));
|
||||
|
|
|
|||
Loading…
Reference in a new issue