From: Arnd Bergmann <arnd@arndb.de>
To: linux-pci@vger.kernel.org, Bjorn Helgaas <bhelgaas@google.com>
Cc: linux-kernel@vger.kernel.org,
Christoph Hellwig <hch@infradead.org>,
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
linuxppc-dev@lists.ozlabs.org, linux-acpi@vger.kernel.org,
Arnd Bergmann <arnd@arndb.de>
Subject: [RFC 13/15] PCI: turn pcibios_alloc_irq into a callback
Date: Fri, 17 Aug 2018 12:26:43 +0200 [thread overview]
Message-ID: <20180817102645.3839621-14-arnd@arndb.de> (raw)
In-Reply-To: <20180817102645.3839621-1-arnd@arndb.de>
Weak functions are a bit confusing, and we can better deal with
this using a callback function. pcibios_free_irq() is actually
completely unused, but it seems better to treat it the same way
as the allocation, unless we want to remove it completely.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/arm64/kernel/pci.c | 16 +++-------------
drivers/pci/pci-driver.c | 13 +++++++++++--
include/linux/pci.h | 2 ++
3 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/arch/arm64/kernel/pci.c b/arch/arm64/kernel/pci.c
index 0e2ea1c78542..3d196c68e362 100644
--- a/arch/arm64/kernel/pci.c
+++ b/arch/arm64/kernel/pci.c
@@ -22,19 +22,6 @@
#include <linux/pci-ecam.h>
#include <linux/slab.h>
-#ifdef CONFIG_ACPI
-/*
- * Try to assign the IRQ number when probing a new device
- */
-int pcibios_alloc_irq(struct pci_dev *dev)
-{
- if (!acpi_disabled)
- acpi_pci_irq_enable(dev);
-
- return 0;
-}
-#endif
-
/*
* raw_pci_read/write - Platform-specific PCI config space access.
*/
@@ -93,6 +80,9 @@ int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge)
ACPI_COMPANION_SET(&bridge->dev, adev);
set_dev_node(bus_dev, acpi_get_node(acpi_device_handle(adev)));
+
+ /* Try to assign the IRQ number when probing a new device */
+ bridge->alloc_irq = acpi_pci_irq_enable;
}
return 0;
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index bef17c3fca67..c96bc7bd56da 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -387,13 +387,22 @@ static int __pci_device_probe(struct pci_driver *drv, struct pci_dev *pci_dev)
return error;
}
-int __weak pcibios_alloc_irq(struct pci_dev *dev)
+int pcibios_alloc_irq(struct pci_dev *dev)
{
+ struct pci_host_bridge *bridge = pci_find_host_bridge(dev->bus);
+
+ if (bridge->alloc_irq)
+ return bridge->alloc_irq(dev);
+
return 0;
}
-void __weak pcibios_free_irq(struct pci_dev *dev)
+void pcibios_free_irq(struct pci_dev *dev)
{
+ struct pci_host_bridge *bridge = pci_find_host_bridge(dev->bus);
+
+ if (bridge->free_irq)
+ bridge->free_irq(dev);
}
#ifdef CONFIG_PCI_IOV
diff --git a/include/linux/pci.h b/include/linux/pci.h
index d1072690cb4f..1296d9fcc5da 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -476,6 +476,8 @@ struct pci_host_bridge {
int (*map_irq)(const struct pci_dev *, u8, u8);
void (*release_fn)(struct pci_host_bridge *);
void (*bus_add_device)(struct pci_dev *pdev);
+ int (*alloc_irq)(struct pci_dev *);
+ int (*free_irq)(struct pci_dev *);
void *release_data;
struct msi_controller *msi;
unsigned int ignore_reset_delay:1; /* For entire hierarchy */
--
2.18.0
next prev parent reply other threads:[~2018-08-17 10:33 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-17 10:26 [RFC 00/15] PCI: turn some __weak functions into callbacks Arnd Bergmann
2018-08-17 10:26 ` [RFC 01/15] PCI: clean up legacy host bridge scan functions Arnd Bergmann
2018-08-17 10:26 ` [RFC 02/15] PCI: move pci_scan_bus into callers Arnd Bergmann
2018-08-17 10:26 ` [RFC 03/15] PCI: move pci_scan_root_bus " Arnd Bergmann
2018-08-17 10:26 ` [RFC 04/15] PCI: export pci_register_host_bridge Arnd Bergmann
2018-08-17 10:26 ` [RFC 05/15] PCI: move pci_create_root_bus into callers Arnd Bergmann
2018-08-17 10:26 ` [RFC 06/15] powerpc/pci: fold pci_create_root_bus into pcibios_scan_phb Arnd Bergmann
2018-08-17 10:26 ` [RFC 07/15] PCI/ACPI: clean up acpi_pci_root_create() Arnd Bergmann
2018-08-20 8:23 ` Rafael J. Wysocki
2018-08-20 11:19 ` Arnd Bergmann
2018-08-20 11:24 ` Rafael J. Wysocki
2018-08-20 11:36 ` Arnd Bergmann
2018-08-17 10:26 ` [RFC 08/15] x86: PCI: clean up pcibios_scan_root() Arnd Bergmann
2018-08-20 8:31 ` Rafael J. Wysocki
2018-08-20 11:16 ` Arnd Bergmann
2018-08-20 11:26 ` Rafael J. Wysocki
2018-08-17 10:26 ` [RFC 09/15] PCI: xenfront: clean up pcifront_scan_root() Arnd Bergmann
2018-08-17 10:26 ` [RFC 10/15] sparc/PCI: simplify pci_scan_one_pbm Arnd Bergmann
2018-08-17 10:26 ` [RFC 11/15] PCI: hyperv: convert to pci_scan_root_bus_bridge Arnd Bergmann
2018-08-17 10:26 ` [RFC 12/15] PCI: make pcibios_bus_add_device() a callback function Arnd Bergmann
2018-08-17 10:26 ` Arnd Bergmann [this message]
2018-08-17 10:26 ` [RFC 14/15] PCI: make pcibios_root_bridge_prepare a callback Arnd Bergmann
2018-08-17 10:26 ` [RFC 15/15] PCI: make pcibios_add_bus/remove_bus callbacks Arnd Bergmann
2018-08-21 6:14 ` [RFC 00/15] PCI: turn some __weak functions into callbacks Christoph Hellwig
2018-08-21 10:07 ` Arnd Bergmann
2018-08-21 11:30 ` David Woodhouse
2018-08-21 13:14 ` Christoph Hellwig
2018-10-02 20:59 ` Bjorn Helgaas
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=20180817102645.3839621-14-arnd@arndb.de \
--to=arnd@arndb.de \
--cc=benh@kernel.crashing.org \
--cc=bhelgaas@google.com \
--cc=hch@infradead.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=lorenzo.pieralisi@arm.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).