| Message ID | 20240819165148.58201-4-pstanner@redhat.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | PCI: Remove pcim_iounmap_regions() | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Guessing tree name failed - patch did not apply |
On 8/20/24 01:51, Philipp Stanner wrote: > The function pcim_iounmap_regions() is problematic because it uses a > bitmask mechanism to release / iounmap multiple BARs at once. It, thus, > prevents getting rid of the problematic iomap table mechanism which was > deprecated in commit e354bb84a4c1 ("PCI: Deprecate pcim_iomap_table(), > pcim_iomap_regions_request_all()"). > > Make pcim_iounmap_region() public as the successor of > pcim_iounmap_regions(). > > Signed-off-by: Philipp Stanner <pstanner@redhat.com> Looks fine, but as commented on patch 1, I think this would look better squashed with patch 1. Anyway: Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
diff --git a/drivers/pci/devres.c b/drivers/pci/devres.c index 608f13ef2a4b..30c813766e8b 100644 --- a/drivers/pci/devres.c +++ b/drivers/pci/devres.c @@ -771,7 +771,7 @@ EXPORT_SYMBOL(pcim_iomap_region); * Unmap a BAR and release its region manually. Only pass BARs that were * previously mapped by pcim_iomap_region(). */ -static void pcim_iounmap_region(struct pci_dev *pdev, int bar) +void pcim_iounmap_region(struct pci_dev *pdev, int bar) { struct pcim_addr_devres res_searched; @@ -782,6 +782,7 @@ static void pcim_iounmap_region(struct pci_dev *pdev, int bar) devres_release(&pdev->dev, pcim_addr_resource_release, pcim_addr_resources_match, &res_searched); } +EXPORT_SYMBOL(pcim_iounmap_region); /** * pcim_iomap_regions - Request and iomap PCI BARs (DEPRECATED) diff --git a/include/linux/pci.h b/include/linux/pci.h index dfa9af3a9c22..7de75900854a 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -2298,6 +2298,7 @@ int pcim_request_region(struct pci_dev *pdev, int bar, const char *name); void pcim_release_region(struct pci_dev *pdev, int bar); void __iomem *pcim_iomap_region(struct pci_dev *pdev, int bar, const char *name); +void pcim_iounmap_region(struct pci_dev *pdev, int bar); int pcim_iomap_regions(struct pci_dev *pdev, int mask, const char *name); int pcim_iomap_regions_request_all(struct pci_dev *pdev, int mask, const char *name);
The function pcim_iounmap_regions() is problematic because it uses a bitmask mechanism to release / iounmap multiple BARs at once. It, thus, prevents getting rid of the problematic iomap table mechanism which was deprecated in commit e354bb84a4c1 ("PCI: Deprecate pcim_iomap_table(), pcim_iomap_regions_request_all()"). Make pcim_iounmap_region() public as the successor of pcim_iounmap_regions(). Signed-off-by: Philipp Stanner <pstanner@redhat.com> --- drivers/pci/devres.c | 3 ++- include/linux/pci.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-)