xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PCI/MSI: Rework pci_msi_domain_calc_hwirq()

Browse Source 
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
This commit is contained in:
Thomas Gleixner
2020-08-26 13:16:45 +02:00
parent 0f5cbdaf20
commit dfb9eb7cf6
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/kernel/apic/msi.c
View File

@@ -231,7 +231,7 @@ EXPORT_SYMBOL_GPL(pci_msi_prepare);
void pci_msi_set_desc(msi_alloc_info_t *arg, struct msi_desc *desc) void pci_msi_set_desc(msi_alloc_info_t *arg, struct msi_desc *desc)
{ {
arg->msi_hwirq = pci_msi_domain_calc_hwirq(arg->msi_dev, desc); arg->msi_hwirq = pci_msi_domain_calc_hwirq(desc);
} }
EXPORT_SYMBOL_GPL(pci_msi_set_desc); EXPORT_SYMBOL_GPL(pci_msi_set_desc);

9
drivers/pci/msi.c
View File

@@ -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 * 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 * @desc: Pointer to the MSI descriptor
* *
* The ID number is only used within the irqdomain. * The ID number is only used within the irqdomain.
*/ */
irq_hw_number_t pci_msi_domain_calc_hwirq(struct pci_dev *dev, irq_hw_number_t pci_msi_domain_calc_hwirq(struct msi_desc *desc)
struct msi_desc *desc)
{ {
struct pci_dev *dev = msi_desc_to_pci_dev(desc);
return (irq_hw_number_t)desc->msi_attrib.entry_nr | return (irq_hw_number_t)desc->msi_attrib.entry_nr |
pci_dev_id(dev) << 11 | pci_dev_id(dev) << 11 |
(pci_domain_nr(dev->bus) & 0xFFFFFFFF) << 27; (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) struct msi_desc *desc)
{ {
arg->desc = desc; arg->desc = desc;
arg->hwirq = pci_msi_domain_calc_hwirq(msi_desc_to_pci_dev(desc), arg->hwirq = pci_msi_domain_calc_hwirq(desc);
desc);
} }
#else #else
#define pci_msi_domain_set_desc NULL #define pci_msi_domain_set_desc NULL

3
include/linux/msi.h
View File

@@ -369,8 +369,7 @@ void pci_msi_domain_write_msg(struct irq_data *irq_data, struct msi_msg *msg);
struct irq_domain *pci_msi_create_irq_domain(struct fwnode_handle *fwnode, struct irq_domain *pci_msi_create_irq_domain(struct fwnode_handle *fwnode,
struct msi_domain_info *info, struct msi_domain_info *info,
struct irq_domain *parent); struct irq_domain *parent);
irq_hw_number_t pci_msi_domain_calc_hwirq(struct pci_dev *dev, irq_hw_number_t pci_msi_domain_calc_hwirq(struct msi_desc *desc);
struct msi_desc *desc);
int pci_msi_domain_check_cap(struct irq_domain *domain, int pci_msi_domain_check_cap(struct irq_domain *domain,
struct msi_domain_info *info, struct device *dev); struct msi_domain_info *info, struct device *dev);
u32 pci_msi_domain_get_msi_rid(struct irq_domain *domain, struct pci_dev *pdev); u32 pci_msi_domain_get_msi_rid(struct irq_domain *domain, struct pci_dev *pdev);