Hi Omer, On 09/26/2018 09:29 AM, Omer Dagan wrote: > Hi Hauke > I removed the Makefile dependency - you are correct there was no need > for that > the whitespace issue was not intentional - corrected in this patch You should use whitespace to do some indention. I do not know if you missed then or if your mail program removed them. I would suggest to send the patches with "git send-email". It also looks like your mail is blocked by the mailling list, probably because it uses html mail. Hauke > > from: Omer Dagan <omer.dagan@xxxxxxxxxxx> > Date: Sun, 16 Sep 2018 17:25:11 +0300 > Subject: [PATCH] add support for pci_alloc_irq_vectors > > add support for function in kernels under 4.8 > function is a wrapper around 'pci_enable_msi_block' or > 'pci_enable_msi_range' depending on the kernel version > the min\max number of interrupts was overridden to always use the > max number of interrupts which seems correct since it was not > supported in the old APIs > > Signed-off-by: Omer Dagan <omer.dagan@xxxxxxxxxxx> > --- > backport/backport-include/linux/pci.h | 19 +++++++++++++++++++ > backport/compat/backport-4.8.c | 25 +++++++++++++++++++++++++ > 2 files changed, 44 insertions(+) > > diff --git a/backport/backport-include/linux/pci.h > b/backport/backport-include/linux/pci.h > index 67ac40fc..531f5a47 100644 > --- a/backport/backport-include/linux/pci.h > +++ b/backport/backport-include/linux/pci.h > @@ -134,6 +134,25 @@ static inline int pci_vfs_assigned(struct pci_dev *dev) > > #endif /* LINUX_VERSION_IS_LESS(3,10,0) */ > > +#if LINUX_VERSION_IS_LESS(4,8,0) > +#define pci_alloc_irq_vectors LINUX_BACKPORT(pci_alloc_irq_vectors) > +#ifdef CONFIG_PCI_MSI > +int pci_alloc_irq_vectors(struct pci_dev *dev, unsigned int min_vecs, > +unsigned int max_vecs, unsigned int flags); > +#else > +static inline int pci_alloc_irq_vectors(struct pci_dev *dev, unsigned > int min_vecs, > +unsigned int max_vecs, unsigned int flags) > +{ return -ENOSYS; } > +#endif > +#endif > + > +#if LINUX_VERSION_IS_LESS(4,8,0) > +#define pci_free_irq_vectors LINUX_BACKPORT(pci_free_irq_vectors) > +static inline void pci_free_irq_vectors(struct pci_dev *dev) > +{ > +} > +#endif > + > #if LINUX_VERSION_IS_LESS(3,14,0) > #define pci_enable_msi_range LINUX_BACKPORT(pci_enable_msi_range) > #ifdef CONFIG_PCI_MSI > diff --git a/backport/compat/backport-4.8.c b/backport/compat/backport-4.8.c > index 7d056444..706bd067 100644 > --- a/backport/compat/backport-4.8.c > +++ b/backport/compat/backport-4.8.c > @@ -9,6 +9,7 @@ > */ > #include <linux/usb.h> > #include <linux/usb/cdc.h> > +#include <linux/pci.h> > > int cdc_parse_cdc_header(struct usb_cdc_parsed_header *hdr, > struct usb_interface *intf, > @@ -144,3 +145,27 @@ next_desc: > return cnt; > } > EXPORT_SYMBOL_GPL(cdc_parse_cdc_header); > + > +#if LINUX_VERSION_IS_LESS(4,8,0) > +int pci_alloc_irq_vectors(struct pci_dev *dev, unsigned int min_vecs, > +unsigned int max_vecs, unsigned int flags) > +{ > +int res; > +int msi_nvect = max_vecs; > + > +if (max_vecs < min_vecs) > +return -ERANGE; > + > +#if LINUX_VERSION_IS_LESS(3,15,0) > +res = pci_enable_msi_block(dev, msi_nvect); > +if (res == 0) { > +return msi_nvect; > +} > +#else > +res = pci_enable_msi_range(dev, msi_nvect, msi_nvect); > +return msi_nvect; > +#endif /*LINUX_VERSION_IS_LESS(3,15,0)*/ > +return -ENOSPC; > +} > +EXPORT_SYMBOL(pci_alloc_irq_vectors); > +#endif /*LINUX_VERSION_IS_LESS(4,8,0)*/ > --
Attachment:
signature.asc
Description: OpenPGP digital signature