PCI/MSI: Rework pci_msi_domain_calc_hwirq() (dfb9eb7c) · Commits · 戴 / test

arch/x86/kernel/apic/msi.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -231,7 +231,7 @@ EXPORT_SYMBOL_GPL(pci_msi_prepare);

		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);

+4 −5

Original line number	Diff line number	Diff line
		@@ -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

+1 −2

Original line number	Diff line number	Diff line
		@@ -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 msi_domain_info *info,
		struct irq_domain *parent);
		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);
		int pci_msi_domain_check_cap(struct irq_domain *domain,
		struct msi_domain_info info, struct device dev);
		u32 pci_msi_domain_get_msi_rid(struct irq_domain domain, struct pci_dev pdev);