From: Hauke Mehrtens <hauke@hauke-m.de>
To: Omer Dagan <omer.dagan@tandemg.com>,
"mcgrof@kernel.org" <mcgrof@kernel.org>
Cc: "backports@vger.kernel.org" <backports@vger.kernel.org>
Subject: Re: Subject: [PATCH] add support for pci_alloc_irq_vectors
Date: Tue, 25 Sep 2018 21:13:06 +0200 [thread overview]
Message-ID: <c2cb21f7-ff19-db8a-faa6-61ef0804ffd8@hauke-m.de> (raw)
In-Reply-To: <AM0PR02MB36506A5694D9DEFB288445F093160@AM0PR02MB3650.eurprd02.prod.outlook.com>
[-- Attachment #1.1: Type: text/plain, Size: 4131 bytes --]
On 09/25/2018 09:59 AM, Omer Dagan wrote:
> The following patch adds support for the 'pci_alloc_irq_vectors' function,
> it does not implement the functionality as implemented in later kernels
> but just provides a wrapper around the deprecate dfunctions implemented
> previouslly
Thank you for this patch, I was too lazy to backport this and made
WIL6210 depend on kernel >= 4.8, so this can be removed with your patch.
> 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
> since it is a wrapper around these functions and they
> are defined in 3.14 there was a need to add dependency in the
> Makefile
> 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@tandemg.com>
>
> 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/Makefile b/backport/compat/Makefile
> index ac70aaf8..52ad69ea 100644
> --- a/backport/compat/Makefile
> +++ b/backport/compat/Makefile
> @@ -34,7 +34,7 @@ compat-$(CPTCFG_KERNEL_4_4) += backport-4.4.o
> compat-$(CPTCFG_KERNEL_4_5) += backport-4.5.o
> compat-$(CPTCFG_KERNEL_4_6) += backport-4.6.o
> compat-$(CPTCFG_KERNEL_4_7) += backport-4.7.o
> -compat-$(CPTCFG_KERNEL_4_8) += backport-4.8.o
> +compat-$(CPTCFG_KERNEL_4_8) += backport-4.8.o backport-3.14.o
I think this change is wrong.
> compat-$(CPTCFG_KERNEL_4_10) += backport-4.10.o
> compat-$(CPTCFG_KERNEL_4_12) += backport-4.12.o
>
> diff --git a/backport/compat/backport-4.8.c b/backport/compat/backport-4.8.c
> index 7d056444..53ebe1d4 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)*/
> --
> 2.17.1
>
It looks like most trailing withe spaces are gone, was this intended?
Hauke
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next parent reply other threads:[~2018-09-26 1:22 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <AM0PR02MB36506A5694D9DEFB288445F093160@AM0PR02MB3650.eurprd02.prod.outlook.com>
2018-09-25 19:13 ` Hauke Mehrtens [this message]
[not found] ` <AM0PR02MB365025326A06C3B60C28036093150@AM0PR02MB3650.eurprd02.prod.outlook.com>
2018-09-30 22:04 ` [PATCH] add support for pci_alloc_irq_vectors Hauke Mehrtens
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c2cb21f7-ff19-db8a-faa6-61ef0804ffd8@hauke-m.de \
--to=hauke@hauke-m.de \
--cc=backports@vger.kernel.org \
--cc=mcgrof@kernel.org \
--cc=omer.dagan@tandemg.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).