| Message ID | e965573211f8c81c8ba978cfbc21925810a662b1.1641500561.git.christophe.jaillet@wanadoo.fr |
|---|---|
| State | New |
| Headers | show |
| Series | Remove usage of the deprecated "pci-dma-compat.h" API | expand |
On Thu, Jan 06, 2022 at 10:55:33PM +0100, Christophe JAILLET wrote: > Final step, remove pci-dma-compat.h > > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Acked-by: Bjorn Helgaas <bhelgaas@google.com> Obviously this has to be applied after all the others, so I assume somebody else will take this. > --- > include/linux/pci-dma-compat.h | 129 --------------------------------- > include/linux/pci.h | 3 - > 2 files changed, 132 deletions(-) > delete mode 100644 include/linux/pci-dma-compat.h > > diff --git a/include/linux/pci-dma-compat.h b/include/linux/pci-dma-compat.h > deleted file mode 100644 > index 249d4d7fbf18..000000000000 > --- a/include/linux/pci-dma-compat.h > +++ /dev/null > @@ -1,129 +0,0 @@ > -/* SPDX-License-Identifier: GPL-2.0 */ > -/* include this file if the platform implements the dma_ DMA Mapping API > - * and wants to provide the pci_ DMA Mapping API in terms of it */ > - > -#ifndef _ASM_GENERIC_PCI_DMA_COMPAT_H > -#define _ASM_GENERIC_PCI_DMA_COMPAT_H > - > -#include <linux/dma-mapping.h> > - > -/* This defines the direction arg to the DMA mapping routines. */ > -#define PCI_DMA_BIDIRECTIONAL DMA_BIDIRECTIONAL > -#define PCI_DMA_TODEVICE DMA_TO_DEVICE > -#define PCI_DMA_FROMDEVICE DMA_FROM_DEVICE > -#define PCI_DMA_NONE DMA_NONE > - > -static inline void * > -pci_alloc_consistent(struct pci_dev *hwdev, size_t size, > - dma_addr_t *dma_handle) > -{ > - return dma_alloc_coherent(&hwdev->dev, size, dma_handle, GFP_ATOMIC); > -} > - > -static inline void * > -pci_zalloc_consistent(struct pci_dev *hwdev, size_t size, > - dma_addr_t *dma_handle) > -{ > - return dma_alloc_coherent(&hwdev->dev, size, dma_handle, GFP_ATOMIC); > -} > - > -static inline void > -pci_free_consistent(struct pci_dev *hwdev, size_t size, > - void *vaddr, dma_addr_t dma_handle) > -{ > - dma_free_coherent(&hwdev->dev, size, vaddr, dma_handle); > -} > - > -static inline dma_addr_t > -pci_map_single(struct pci_dev *hwdev, void *ptr, size_t size, int direction) > -{ > - return dma_map_single(&hwdev->dev, ptr, size, (enum dma_data_direction)direction); > -} > - > -static inline void > -pci_unmap_single(struct pci_dev *hwdev, dma_addr_t dma_addr, > - size_t size, int direction) > -{ > - dma_unmap_single(&hwdev->dev, dma_addr, size, (enum dma_data_direction)direction); > -} > - > -static inline dma_addr_t > -pci_map_page(struct pci_dev *hwdev, struct page *page, > - unsigned long offset, size_t size, int direction) > -{ > - return dma_map_page(&hwdev->dev, page, offset, size, (enum dma_data_direction)direction); > -} > - > -static inline void > -pci_unmap_page(struct pci_dev *hwdev, dma_addr_t dma_address, > - size_t size, int direction) > -{ > - dma_unmap_page(&hwdev->dev, dma_address, size, (enum dma_data_direction)direction); > -} > - > -static inline int > -pci_map_sg(struct pci_dev *hwdev, struct scatterlist *sg, > - int nents, int direction) > -{ > - return dma_map_sg(&hwdev->dev, sg, nents, (enum dma_data_direction)direction); > -} > - > -static inline void > -pci_unmap_sg(struct pci_dev *hwdev, struct scatterlist *sg, > - int nents, int direction) > -{ > - dma_unmap_sg(&hwdev->dev, sg, nents, (enum dma_data_direction)direction); > -} > - > -static inline void > -pci_dma_sync_single_for_cpu(struct pci_dev *hwdev, dma_addr_t dma_handle, > - size_t size, int direction) > -{ > - dma_sync_single_for_cpu(&hwdev->dev, dma_handle, size, (enum dma_data_direction)direction); > -} > - > -static inline void > -pci_dma_sync_single_for_device(struct pci_dev *hwdev, dma_addr_t dma_handle, > - size_t size, int direction) > -{ > - dma_sync_single_for_device(&hwdev->dev, dma_handle, size, (enum dma_data_direction)direction); > -} > - > -static inline void > -pci_dma_sync_sg_for_cpu(struct pci_dev *hwdev, struct scatterlist *sg, > - int nelems, int direction) > -{ > - dma_sync_sg_for_cpu(&hwdev->dev, sg, nelems, (enum dma_data_direction)direction); > -} > - > -static inline void > -pci_dma_sync_sg_for_device(struct pci_dev *hwdev, struct scatterlist *sg, > - int nelems, int direction) > -{ > - dma_sync_sg_for_device(&hwdev->dev, sg, nelems, (enum dma_data_direction)direction); > -} > - > -static inline int > -pci_dma_mapping_error(struct pci_dev *pdev, dma_addr_t dma_addr) > -{ > - return dma_mapping_error(&pdev->dev, dma_addr); > -} > - > -#ifdef CONFIG_PCI > -static inline int pci_set_dma_mask(struct pci_dev *dev, u64 mask) > -{ > - return dma_set_mask(&dev->dev, mask); > -} > - > -static inline int pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask) > -{ > - return dma_set_coherent_mask(&dev->dev, mask); > -} > -#else > -static inline int pci_set_dma_mask(struct pci_dev *dev, u64 mask) > -{ return -EIO; } > -static inline int pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask) > -{ return -EIO; } > -#endif > - > -#endif > diff --git a/include/linux/pci.h b/include/linux/pci.h > index d4308f847e58..ba8771eaf380 100644 > --- a/include/linux/pci.h > +++ b/include/linux/pci.h > @@ -2455,9 +2455,6 @@ static inline bool pci_is_thunderbolt_attached(struct pci_dev *pdev) > void pci_uevent_ers(struct pci_dev *pdev, enum pci_ers_result err_type); > #endif > > -/* Provide the legacy pci_dma_* API */ > -#include <linux/pci-dma-compat.h> > - > #define pci_printk(level, pdev, fmt, arg...) \ > dev_printk(level, &(pdev)->dev, fmt, ##arg) > > -- > 2.32.0 >
Le 06/01/2022 à 23:28, Bjorn Helgaas a écrit : > On Thu, Jan 06, 2022 at 10:55:33PM +0100, Christophe JAILLET wrote: >> Final step, remove pci-dma-compat.h >> >> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > > Acked-by: Bjorn Helgaas <bhelgaas@google.com> > > Obviously this has to be applied after all the others, so I assume > somebody else will take this. > >> --- >> include/linux/pci-dma-compat.h | 129 --------------------------------- >> include/linux/pci.h | 3 - >> 2 files changed, 132 deletions(-) >> delete mode 100644 include/linux/pci-dma-compat.h >> >> diff --git a/include/linux/pci-dma-compat.h b/include/linux/pci-dma-compat.h >> deleted file mode 100644 >> index 249d4d7fbf18..000000000000 >> --- a/include/linux/pci-dma-compat.h >> +++ /dev/null >> @@ -1,129 +0,0 @@ >> -/* SPDX-License-Identifier: GPL-2.0 */ >> -/* include this file if the platform implements the dma_ DMA Mapping API >> - * and wants to provide the pci_ DMA Mapping API in terms of it */ >> - >> -#ifndef _ASM_GENERIC_PCI_DMA_COMPAT_H >> -#define _ASM_GENERIC_PCI_DMA_COMPAT_H >> - >> -#include <linux/dma-mapping.h> >> - >> -/* This defines the direction arg to the DMA mapping routines. */ >> -#define PCI_DMA_BIDIRECTIONAL DMA_BIDIRECTIONAL >> -#define PCI_DMA_TODEVICE DMA_TO_DEVICE >> -#define PCI_DMA_FROMDEVICE DMA_FROM_DEVICE >> -#define PCI_DMA_NONE DMA_NONE >> - >> -static inline void * >> -pci_alloc_consistent(struct pci_dev *hwdev, size_t size, >> - dma_addr_t *dma_handle) >> -{ >> - return dma_alloc_coherent(&hwdev->dev, size, dma_handle, GFP_ATOMIC); >> -} >> - >> -static inline void * >> -pci_zalloc_consistent(struct pci_dev *hwdev, size_t size, >> - dma_addr_t *dma_handle) >> -{ >> - return dma_alloc_coherent(&hwdev->dev, size, dma_handle, GFP_ATOMIC); >> -} >> - >> -static inline void >> -pci_free_consistent(struct pci_dev *hwdev, size_t size, >> - void *vaddr, dma_addr_t dma_handle) >> -{ >> - dma_free_coherent(&hwdev->dev, size, vaddr, dma_handle); >> -} >> - >> -static inline dma_addr_t >> -pci_map_single(struct pci_dev *hwdev, void *ptr, size_t size, int direction) >> -{ >> - return dma_map_single(&hwdev->dev, ptr, size, (enum dma_data_direction)direction); >> -} >> - >> -static inline void >> -pci_unmap_single(struct pci_dev *hwdev, dma_addr_t dma_addr, >> - size_t size, int direction) >> -{ >> - dma_unmap_single(&hwdev->dev, dma_addr, size, (enum dma_data_direction)direction); >> -} >> - >> -static inline dma_addr_t >> -pci_map_page(struct pci_dev *hwdev, struct page *page, >> - unsigned long offset, size_t size, int direction) >> -{ >> - return dma_map_page(&hwdev->dev, page, offset, size, (enum dma_data_direction)direction); >> -} >> - >> -static inline void >> -pci_unmap_page(struct pci_dev *hwdev, dma_addr_t dma_address, >> - size_t size, int direction) >> -{ >> - dma_unmap_page(&hwdev->dev, dma_address, size, (enum dma_data_direction)direction); >> -} >> - >> -static inline int >> -pci_map_sg(struct pci_dev *hwdev, struct scatterlist *sg, >> - int nents, int direction) >> -{ >> - return dma_map_sg(&hwdev->dev, sg, nents, (enum dma_data_direction)direction); >> -} >> - >> -static inline void >> -pci_unmap_sg(struct pci_dev *hwdev, struct scatterlist *sg, >> - int nents, int direction) >> -{ >> - dma_unmap_sg(&hwdev->dev, sg, nents, (enum dma_data_direction)direction); >> -} >> - >> -static inline void >> -pci_dma_sync_single_for_cpu(struct pci_dev *hwdev, dma_addr_t dma_handle, >> - size_t size, int direction) >> -{ >> - dma_sync_single_for_cpu(&hwdev->dev, dma_handle, size, (enum dma_data_direction)direction); >> -} >> - >> -static inline void >> -pci_dma_sync_single_for_device(struct pci_dev *hwdev, dma_addr_t dma_handle, >> - size_t size, int direction) >> -{ >> - dma_sync_single_for_device(&hwdev->dev, dma_handle, size, (enum dma_data_direction)direction); >> -} >> - >> -static inline void >> -pci_dma_sync_sg_for_cpu(struct pci_dev *hwdev, struct scatterlist *sg, >> - int nelems, int direction) >> -{ >> - dma_sync_sg_for_cpu(&hwdev->dev, sg, nelems, (enum dma_data_direction)direction); >> -} >> - >> -static inline void >> -pci_dma_sync_sg_for_device(struct pci_dev *hwdev, struct scatterlist *sg, >> - int nelems, int direction) >> -{ >> - dma_sync_sg_for_device(&hwdev->dev, sg, nelems, (enum dma_data_direction)direction); >> -} >> - >> -static inline int >> -pci_dma_mapping_error(struct pci_dev *pdev, dma_addr_t dma_addr) >> -{ >> - return dma_mapping_error(&pdev->dev, dma_addr); >> -} >> - >> -#ifdef CONFIG_PCI >> -static inline int pci_set_dma_mask(struct pci_dev *dev, u64 mask) >> -{ >> - return dma_set_mask(&dev->dev, mask); >> -} >> - >> -static inline int pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask) >> -{ >> - return dma_set_coherent_mask(&dev->dev, mask); >> -} >> -#else >> -static inline int pci_set_dma_mask(struct pci_dev *dev, u64 mask) >> -{ return -EIO; } >> -static inline int pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask) >> -{ return -EIO; } >> -#endif >> - >> -#endif >> diff --git a/include/linux/pci.h b/include/linux/pci.h >> index d4308f847e58..ba8771eaf380 100644 >> --- a/include/linux/pci.h >> +++ b/include/linux/pci.h >> @@ -2455,9 +2455,6 @@ static inline bool pci_is_thunderbolt_attached(struct pci_dev *pdev) >> void pci_uevent_ers(struct pci_dev *pdev, enum pci_ers_result err_type); >> #endif >> >> -/* Provide the legacy pci_dma_* API */ >> -#include <linux/pci-dma-compat.h> >> - After one more night, I should have mentionned that the way have removed "pci-dma-compat.h" may break OTHER drives because of indirect include. The line above should maybe be replaced by: #include <linux/dma-mapping.h> which is hidden in "pci-dma-compat.h". Will see if built-bots complain. CJ >> #define pci_printk(level, pdev, fmt, arg...) \ >> dev_printk(level, &(pdev)->dev, fmt, ##arg) >> >> -- >> 2.32.0 >> >
Le 07/01/2022 à 07:34, Christophe JAILLET a écrit : > Le 06/01/2022 à 23:28, Bjorn Helgaas a écrit : >> On Thu, Jan 06, 2022 at 10:55:33PM +0100, Christophe JAILLET wrote: >>> Final step, remove pci-dma-compat.h >>> >>> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> >> >> Acked-by: Bjorn Helgaas <bhelgaas@google.com> >> >> Obviously this has to be applied after all the others, so I assume >> somebody else will take this. >> >>> --- >>> include/linux/pci-dma-compat.h | 129 --------------------------------- >>> include/linux/pci.h | 3 - >>> 2 files changed, 132 deletions(-) >>> delete mode 100644 include/linux/pci-dma-compat.h >>> >>> diff --git a/include/linux/pci-dma-compat.h >>> b/include/linux/pci-dma-compat.h >>> deleted file mode 100644 >>> index 249d4d7fbf18..000000000000 >>> --- a/include/linux/pci-dma-compat.h >>> +++ /dev/null >>> @@ -1,129 +0,0 @@ >>> -/* SPDX-License-Identifier: GPL-2.0 */ >>> -/* include this file if the platform implements the dma_ DMA Mapping >>> API >>> - * and wants to provide the pci_ DMA Mapping API in terms of it */ >>> - >>> -#ifndef _ASM_GENERIC_PCI_DMA_COMPAT_H >>> -#define _ASM_GENERIC_PCI_DMA_COMPAT_H >>> - >>> -#include <linux/dma-mapping.h> >>> - >>> [...] >>> >>> diff --git a/include/linux/pci.h b/include/linux/pci.h >>> index d4308f847e58..ba8771eaf380 100644 >>> --- a/include/linux/pci.h >>> +++ b/include/linux/pci.h >>> @@ -2455,9 +2455,6 @@ static inline bool >>> pci_is_thunderbolt_attached(struct pci_dev *pdev) >>> void pci_uevent_ers(struct pci_dev *pdev, enum pci_ers_result >>> err_type); >>> #endif >>> -/* Provide the legacy pci_dma_* API */ >>> -#include <linux/pci-dma-compat.h> >>> - > > After one more night, I should have mentionned that the way have removed > "pci-dma-compat.h" may break OTHER drives because of indirect include. > > The line above should maybe be replaced by: > #include <linux/dma-mapping.h> > which is hidden in "pci-dma-compat.h". > > Will see if built-bots complain. And so they did. What is the best option? 1. Add #include <linux/dma-mapping.h>? or 2. Add this "missing" include in needed place? I would say 2, but I would need help, because I don't have a built farm at home! :) This breaks: drivers/s390/net/ism_drv.c: In function 'register_sba': drivers/s390/net/ism_drv.c:93:15: error: implicit declaration of function 'dma_alloc_coherent' [-Werror=implicit-function-declaration] 93 | sba = dma_alloc_coherent(&ism->pdev->dev, PAGE_SIZE, &dma_handle, | ^~~~~~~~~~~~~~~~~~ [...] I got another built failure that I don't understand: In file included from drivers/scsi/fdomain.c:87: >> include/scsi/scsicam.h:16:31: warning: 'struct block_device' declared inside parameter list will not be visible outside of this definition or declaration 16 | int scsicam_bios_param(struct block_device *bdev, sector_t capacity, int *ip); | ^~~~~~~~~~~~ include/scsi/scsicam.h:17:27: warning: 'struct block_device' declared inside parameter list will not be visible outside of this definition or declaration 17 | bool scsi_partsize(struct block_device *bdev, sector_t capacity, int geom[3]); | ^~~~~~~~~~~~ include/scsi/scsicam.h:18:40: warning: 'struct block_device' declared inside parameter list will not be visible outside of this definition or declaration 18 | unsigned char *scsi_bios_ptable(struct block_device *bdev); | ^~~~~~~~~~~~ drivers/scsi/fdomain.c: In function 'fdomain_biosparam': >> drivers/scsi/fdomain.c:468:45: error: passing argument 1 of 'scsi_bios_ptable' from incompatible pointer type [-Werror=incompatible-pointer-types] 468 | unsigned char *p = scsi_bios_ptable(bdev); | ^~~~ | | | struct block_device * In file included from drivers/scsi/fdomain.c:87: include/scsi/scsicam.h:18:54: note: expected 'struct block_device *' but argument is of type 'struct block_device *' 18 | unsigned char *scsi_bios_ptable(struct block_device *bdev); | ~~~~~~~~~~~~~~~~~~~~~^~~~ CJ
On Fri, Jan 07, 2022 at 06:23:25PM +0100, Marion & Christophe JAILLET wrote: > What is the best option? > 1. Add #include <linux/dma-mapping.h>? or > 2. Add this "missing" include in needed place? > > I would say 2, but I would need help, because I don't have a built farm at > home! :) In the long run 2 is where we want to end up. But I'd do 1 first to get the legacy API removal finished, and then do 2 later after a lot of test coverage from the build bot.
diff --git a/include/linux/pci-dma-compat.h b/include/linux/pci-dma-compat.h deleted file mode 100644 index 249d4d7fbf18..000000000000 --- a/include/linux/pci-dma-compat.h +++ /dev/null @@ -1,129 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* include this file if the platform implements the dma_ DMA Mapping API - * and wants to provide the pci_ DMA Mapping API in terms of it */ - -#ifndef _ASM_GENERIC_PCI_DMA_COMPAT_H -#define _ASM_GENERIC_PCI_DMA_COMPAT_H - -#include <linux/dma-mapping.h> - -/* This defines the direction arg to the DMA mapping routines. */ -#define PCI_DMA_BIDIRECTIONAL DMA_BIDIRECTIONAL -#define PCI_DMA_TODEVICE DMA_TO_DEVICE -#define PCI_DMA_FROMDEVICE DMA_FROM_DEVICE -#define PCI_DMA_NONE DMA_NONE - -static inline void * -pci_alloc_consistent(struct pci_dev *hwdev, size_t size, - dma_addr_t *dma_handle) -{ - return dma_alloc_coherent(&hwdev->dev, size, dma_handle, GFP_ATOMIC); -} - -static inline void * -pci_zalloc_consistent(struct pci_dev *hwdev, size_t size, - dma_addr_t *dma_handle) -{ - return dma_alloc_coherent(&hwdev->dev, size, dma_handle, GFP_ATOMIC); -} - -static inline void -pci_free_consistent(struct pci_dev *hwdev, size_t size, - void *vaddr, dma_addr_t dma_handle) -{ - dma_free_coherent(&hwdev->dev, size, vaddr, dma_handle); -} - -static inline dma_addr_t -pci_map_single(struct pci_dev *hwdev, void *ptr, size_t size, int direction) -{ - return dma_map_single(&hwdev->dev, ptr, size, (enum dma_data_direction)direction); -} - -static inline void -pci_unmap_single(struct pci_dev *hwdev, dma_addr_t dma_addr, - size_t size, int direction) -{ - dma_unmap_single(&hwdev->dev, dma_addr, size, (enum dma_data_direction)direction); -} - -static inline dma_addr_t -pci_map_page(struct pci_dev *hwdev, struct page *page, - unsigned long offset, size_t size, int direction) -{ - return dma_map_page(&hwdev->dev, page, offset, size, (enum dma_data_direction)direction); -} - -static inline void -pci_unmap_page(struct pci_dev *hwdev, dma_addr_t dma_address, - size_t size, int direction) -{ - dma_unmap_page(&hwdev->dev, dma_address, size, (enum dma_data_direction)direction); -} - -static inline int -pci_map_sg(struct pci_dev *hwdev, struct scatterlist *sg, - int nents, int direction) -{ - return dma_map_sg(&hwdev->dev, sg, nents, (enum dma_data_direction)direction); -} - -static inline void -pci_unmap_sg(struct pci_dev *hwdev, struct scatterlist *sg, - int nents, int direction) -{ - dma_unmap_sg(&hwdev->dev, sg, nents, (enum dma_data_direction)direction); -} - -static inline void -pci_dma_sync_single_for_cpu(struct pci_dev *hwdev, dma_addr_t dma_handle, - size_t size, int direction) -{ - dma_sync_single_for_cpu(&hwdev->dev, dma_handle, size, (enum dma_data_direction)direction); -} - -static inline void -pci_dma_sync_single_for_device(struct pci_dev *hwdev, dma_addr_t dma_handle, - size_t size, int direction) -{ - dma_sync_single_for_device(&hwdev->dev, dma_handle, size, (enum dma_data_direction)direction); -} - -static inline void -pci_dma_sync_sg_for_cpu(struct pci_dev *hwdev, struct scatterlist *sg, - int nelems, int direction) -{ - dma_sync_sg_for_cpu(&hwdev->dev, sg, nelems, (enum dma_data_direction)direction); -} - -static inline void -pci_dma_sync_sg_for_device(struct pci_dev *hwdev, struct scatterlist *sg, - int nelems, int direction) -{ - dma_sync_sg_for_device(&hwdev->dev, sg, nelems, (enum dma_data_direction)direction); -} - -static inline int -pci_dma_mapping_error(struct pci_dev *pdev, dma_addr_t dma_addr) -{ - return dma_mapping_error(&pdev->dev, dma_addr); -} - -#ifdef CONFIG_PCI -static inline int pci_set_dma_mask(struct pci_dev *dev, u64 mask) -{ - return dma_set_mask(&dev->dev, mask); -} - -static inline int pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask) -{ - return dma_set_coherent_mask(&dev->dev, mask); -} -#else -static inline int pci_set_dma_mask(struct pci_dev *dev, u64 mask) -{ return -EIO; } -static inline int pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask) -{ return -EIO; } -#endif - -#endif diff --git a/include/linux/pci.h b/include/linux/pci.h index d4308f847e58..ba8771eaf380 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -2455,9 +2455,6 @@ static inline bool pci_is_thunderbolt_attached(struct pci_dev *pdev) void pci_uevent_ers(struct pci_dev *pdev, enum pci_ers_result err_type); #endif -/* Provide the legacy pci_dma_* API */ -#include <linux/pci-dma-compat.h> - #define pci_printk(level, pdev, fmt, arg...) \ dev_printk(level, &(pdev)->dev, fmt, ##arg)
Final step, remove pci-dma-compat.h Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- include/linux/pci-dma-compat.h | 129 --------------------------------- include/linux/pci.h | 3 - 2 files changed, 132 deletions(-) delete mode 100644 include/linux/pci-dma-compat.h