Re: [PATCH 16/16] PCI: Remove usage of the deprecated "pci-dma-compat.h" API

[Marion & Christophe JAILLET]

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@xxxxxxxxxx>
> >
> > Acked-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
> >
> > 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