From: Bjorn Helgaas <helgaas@kernel.org>
To: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>,
linux-pci@vger.kernel.org,
Pascal Van Leeuwen <pvanleeuwen@verimatrix.com>,
YueHaibing <yuehaibing@huawei.com>,
"antoine.tenart@bootlin.com" <antoine.tenart@bootlin.com>,
"davem@davemloft.net" <davem@davemloft.net>,
"pvanleeuwen@insidesecure.com" <pvanleeuwen@insidesecure.com>,
"linux-crypto@vger.kernel.org" <linux-crypto@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: PCI: Add stub pci_irq_vector and others
Date: Thu, 5 Sep 2019 16:07:22 -0500 [thread overview]
Message-ID: <20190905210722.GH103977@google.com> (raw)
In-Reply-To: <20190904122600.GA28660@gondor.apana.org.au>
On Wed, Sep 04, 2019 at 10:26:00PM +1000, Herbert Xu wrote:
> On Wed, Sep 04, 2019 at 05:10:34AM -0700, Ard Biesheuvel wrote:
> >
> > This is the reason we have so many empty static inline functions in
> > header files - it ensures that the symbols are declared even if the
> > only invocations are from dead code.
>
> Does this patch work?
>
> ---8<---
> This patch adds stub functions pci_alloc_irq_vectors_affinity and
> pci_irq_vector when CONFIG_PCI is off so that drivers can use them
> without resorting to ifdefs.
>
> It also moves the PCI_IRQ_* macros outside of the ifdefs so that
> they are always available.
>
> Fixes: 625f269a5a7a ("crypto: inside-secure - add support for...")
I don't see this commit in Linus' tree yet.
I'd like to include the actual reason for this patch in the commit
log. I assume it's fixing a build issue, but I'd like to be a little
more specific about it.
> Reported-by: kbuild test robot <lkp@intel.com>
> Reported-by: YueHaibing <yuehaibing@huawei.com>
> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
>
> diff --git a/include/linux/pci.h b/include/linux/pci.h
> index 9e700d9f9f28..74415ee62211 100644
> --- a/include/linux/pci.h
> +++ b/include/linux/pci.h
> @@ -925,6 +925,11 @@ enum {
> PCI_SCAN_ALL_PCIE_DEVS = 0x00000040, /* Scan all, not just dev 0 */
> };
>
> +#define PCI_IRQ_LEGACY (1 << 0) /* Allow legacy interrupts */
> +#define PCI_IRQ_MSI (1 << 1) /* Allow MSI interrupts */
> +#define PCI_IRQ_MSIX (1 << 2) /* Allow MSI-X interrupts */
> +#define PCI_IRQ_AFFINITY (1 << 3) /* Auto-assign affinity */
> +
> /* These external functions are only available when PCI support is enabled */
> #ifdef CONFIG_PCI
>
> @@ -1408,11 +1413,6 @@ resource_size_t pcibios_window_alignment(struct pci_bus *bus,
> int pci_set_vga_state(struct pci_dev *pdev, bool decode,
> unsigned int command_bits, u32 flags);
>
> -#define PCI_IRQ_LEGACY (1 << 0) /* Allow legacy interrupts */
> -#define PCI_IRQ_MSI (1 << 1) /* Allow MSI interrupts */
> -#define PCI_IRQ_MSIX (1 << 2) /* Allow MSI-X interrupts */
> -#define PCI_IRQ_AFFINITY (1 << 3) /* Auto-assign affinity */
> -
> /*
> * Virtual interrupts allow for more interrupts to be allocated
> * than the device has interrupts for. These are not programmed
> @@ -1517,14 +1517,6 @@ static inline int pci_irq_get_node(struct pci_dev *pdev, int vec)
> }
> #endif
>
> -static inline int
> -pci_alloc_irq_vectors(struct pci_dev *dev, unsigned int min_vecs,
> - unsigned int max_vecs, unsigned int flags)
> -{
> - return pci_alloc_irq_vectors_affinity(dev, min_vecs, max_vecs, flags,
> - NULL);
> -}
> -
> /**
> * pci_irqd_intx_xlate() - Translate PCI INTx value to an IRQ domain hwirq
> * @d: the INTx IRQ domain
> @@ -1780,8 +1772,29 @@ static inline const struct pci_device_id *pci_match_id(const struct pci_device_i
> struct pci_dev *dev)
> { return NULL; }
> static inline bool pci_ats_disabled(void) { return true; }
> +
> +static inline int pci_irq_vector(struct pci_dev *dev, unsigned int nr)
> +{
> + return -EINVAL;
> +}
> +
> +static inline int
> +pci_alloc_irq_vectors_affinity(struct pci_dev *dev, unsigned int min_vecs,
> + unsigned int max_vecs, unsigned int flags,
> + struct irq_affinity *aff_desc)
> +{
> + return -ENOSPC;
> +}
> #endif /* CONFIG_PCI */
>
> +static inline int
> +pci_alloc_irq_vectors(struct pci_dev *dev, unsigned int min_vecs,
> + unsigned int max_vecs, unsigned int flags)
> +{
> + return pci_alloc_irq_vectors_affinity(dev, min_vecs, max_vecs, flags,
> + NULL);
> +}
> +
> #ifdef CONFIG_PCI_ATS
> /* Address Translation Service */
> void pci_ats_init(struct pci_dev *dev);
> --
> Email: Herbert Xu <herbert@gondor.apana.org.au>
> Home Page: http://gondor.apana.org.au/~herbert/
> PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
next prev parent reply other threads:[~2019-09-05 21:07 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20190902141910.1080-1-yuehaibing@huawei.com>
[not found] ` <20190903014518.20880-1-yuehaibing@huawei.com>
[not found] ` <MN2PR20MB29732EEECB217DDDF822EDA5CAB80@MN2PR20MB2973.namprd20.prod.outlook.com>
[not found] ` <CAKv+Gu8PVYyA-mzjrhR6r6upMc=xzpAhsbkuKRtb8T2noo_2XQ@mail.gmail.com>
2019-09-04 12:26 ` PCI: Add stub pci_irq_vector and others Herbert Xu
2019-09-04 14:33 ` Yuehaibing
2019-09-05 21:07 ` Bjorn Helgaas [this message]
2019-09-05 22:53 ` Herbert Xu
2019-09-20 19:42 ` Bjorn Helgaas
2019-09-20 23:16 ` Herbert Xu
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=20190905210722.GH103977@google.com \
--to=helgaas@kernel.org \
--cc=antoine.tenart@bootlin.com \
--cc=ard.biesheuvel@linaro.org \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=pvanleeuwen@insidesecure.com \
--cc=pvanleeuwen@verimatrix.com \
--cc=yuehaibing@huawei.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 NNTP newsgroup(s).