Skip to content

Commit e354bb8

Browse files
Philipp Stannerkwilczynski
authored andcommitted
PCI: Deprecate pcim_iomap_table(), pcim_iomap_regions_request_all()
Deprecate pcim_iomap_table(). It returns a pointer to a table of ioremapped BARs, or NULL if it fails. This makes uses like this: addr = pcim_iomap_table(pdev)[0]; problematic because it causes a NULL pointer dereference on failure. Callers should use pcim_iomap() instead. Deprecate pcim_iomap_regions_request_all() because it is built on __pci_request_region() and is managed if pcim_enable_device() has been called, but unmanaged otherwise, which is prone to errors. Callers should either use pcim_iomap_regions() to request and map BARs, or use pcim_request_region() followed by pcim_iomap(). Link: https://lore.kernel.org/r/20240613115032.29098-5-pstanner@redhat.com Signed-off-by: Philipp Stanner <pstanner@redhat.com> Signed-off-by: Krzysztof Wilczyński <kwilczynski@kernel.org> [bhelgaas: commit log, sphinx markup] Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
1 parent bbaff68 commit e354bb8

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

drivers/pci/devres.c

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ static void pcim_iomap_release(struct device *gendev, void *res)
510510
}
511511

512512
/**
513-
* pcim_iomap_table - access iomap allocation table
513+
* pcim_iomap_table - access iomap allocation table (DEPRECATED)
514514
* @pdev: PCI device to access iomap table for
515515
*
516516
* Returns:
@@ -524,6 +524,11 @@ static void pcim_iomap_release(struct device *gendev, void *res)
524524
* This function might sleep when the table is first allocated but can
525525
* be safely called without context and guaranteed to succeed once
526526
* allocated.
527+
*
528+
* This function is DEPRECATED. Do not use it in new code. Instead, obtain a
529+
* mapping's address directly from one of the pcim_* mapping functions. For
530+
* example:
531+
* void __iomem \*mappy = pcim_iomap(pdev, bar, length);
527532
*/
528533
void __iomem * const *pcim_iomap_table(struct pci_dev *pdev)
529534
{
@@ -897,6 +902,7 @@ static int pcim_request_all_regions(struct pci_dev *pdev, const char *name)
897902

898903
/**
899904
* pcim_iomap_regions_request_all - Request all BARs and iomap specified ones
905+
* (DEPRECATED)
900906
* @pdev: PCI device to map IO resources for
901907
* @mask: Mask of BARs to iomap
902908
* @name: Name associated with the requests
@@ -907,6 +913,10 @@ static int pcim_request_all_regions(struct pci_dev *pdev, const char *name)
907913
*
908914
* To release these resources manually, call pcim_release_region() for the
909915
* regions and pcim_iounmap() for the mappings.
916+
*
917+
* This function is DEPRECATED. Don't use it in new code. Instead, use one
918+
* of the pcim_* region request functions in combination with a pcim_*
919+
* mapping function.
910920
*/
911921
int pcim_iomap_regions_request_all(struct pci_dev *pdev, int mask,
912922
const char *name)

0 commit comments

Comments
 (0)