diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2020-08-26 13:16:45 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2020-09-16 16:52:34 +0200 |
| commit | dfb9eb7cf6cd0c0b0f2a1111fcc47b0a297b097d (patch) | |
| tree | 05ce8a7fa947d7bfd943c09a9f77b1ec36e4e383 /drivers/pci | |
| parent | x86/irq: Consolidate UV domain allocation (diff) | |
| download | linux-dev-dfb9eb7cf6cd0c0b0f2a1111fcc47b0a297b097d.tar.xz linux-dev-dfb9eb7cf6cd0c0b0f2a1111fcc47b0a297b097d.zip | |
PCI/MSI: Rework pci_msi_domain_calc_hwirq()
Retrieve the PCI device from the msi descriptor instead of doing so at the
call sites.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20200826112332.352583299@linutronix.de
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/msi.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index 30ae4ffda5c1..9af58a2ab277 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -1346,14 +1346,14 @@ void pci_msi_domain_write_msg(struct irq_data *irq_data, struct msi_msg *msg) /** * pci_msi_domain_calc_hwirq - Generate a unique ID for an MSI source - * @dev: Pointer to the PCI device * @desc: Pointer to the MSI descriptor * * The ID number is only used within the irqdomain. */ -irq_hw_number_t pci_msi_domain_calc_hwirq(struct pci_dev *dev, - struct msi_desc *desc) +irq_hw_number_t pci_msi_domain_calc_hwirq(struct msi_desc *desc) { + struct pci_dev *dev = msi_desc_to_pci_dev(desc); + return (irq_hw_number_t)desc->msi_attrib.entry_nr | pci_dev_id(dev) << 11 | (pci_domain_nr(dev->bus) & 0xFFFFFFFF) << 27; @@ -1406,8 +1406,7 @@ static void pci_msi_domain_set_desc(msi_alloc_info_t *arg, struct msi_desc *desc) { arg->desc = desc; - arg->hwirq = pci_msi_domain_calc_hwirq(msi_desc_to_pci_dev(desc), - desc); + arg->hwirq = pci_msi_domain_calc_hwirq(desc); } #else #define pci_msi_domain_set_desc NULL |