Commit 3b9c1d37 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86/msi: Consolidate MSI allocation 



Convert the interrupt remap drivers to retrieve the pci device from the msi
descriptor and use info::hwirq.

This is the first step to prepare x86 for using the generic MSI domain ops.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarWei Liu <wei.liu@kernel.org>
Acked-by: default avatarJoerg Roedel <jroedel@suse.de>
Link: https://lore.kernel.org/r/20200826112332.466405395@linutronix.de
parent dfb9eb7c

arch/x86/include/asm/hw_irq.h

+0 −8
Original line number Diff line number Diff line
@@ -86,14 +86,6 @@ struct irq_alloc_info { 
	union {

		struct ioapic_alloc_info	ioapic;

		struct uv_alloc_info		uv;



		int		unused;

#ifdef	CONFIG_PCI_MSI

		struct {

			struct pci_dev	*msi_dev;

			irq_hw_number_t	msi_hwirq;

		};

#endif

	};

};

arch/x86/kernel/apic/msi.c

+3 −4
Original line number Diff line number Diff line
@@ -188,7 +188,6 @@ int native_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) 


	init_irq_alloc_info(&info, NULL);

	info.type = X86_IRQ_ALLOC_TYPE_PCI_MSI;

	info.msi_dev = dev;



	domain = irq_remapping_get_irq_domain(&info);

	if (domain == NULL)
@@ -207,7 +206,7 @@ void native_teardown_msi_irq(unsigned int irq) 
static irq_hw_number_t pci_msi_get_hwirq(struct msi_domain_info *info,

					 msi_alloc_info_t *arg)

{

	return arg->msi_hwirq;

	return arg->hwirq;

}



int pci_msi_prepare(struct irq_domain *domain, struct device *dev, int nvec,
@@ -217,7 +216,6 @@ int pci_msi_prepare(struct irq_domain *domain, struct device *dev, int nvec, 
	struct msi_desc *desc = first_pci_msi_entry(pdev);



	init_irq_alloc_info(arg, NULL);

	arg->msi_dev = pdev;

	if (desc->msi_attrib.is_msix) {

		arg->type = X86_IRQ_ALLOC_TYPE_PCI_MSIX;

	} else {
@@ -231,7 +229,8 @@ 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(desc);

	arg->desc = desc;

	arg->hwirq = pci_msi_domain_calc_hwirq(desc);

}

EXPORT_SYMBOL_GPL(pci_msi_set_desc);

drivers/iommu/amd/iommu.c

+3 −2
Original line number Diff line number Diff line
@@ -3528,7 +3528,7 @@ static int get_devid(struct irq_alloc_info *info) 
		return get_hpet_devid(info->devid);

	case X86_IRQ_ALLOC_TYPE_PCI_MSI:

	case X86_IRQ_ALLOC_TYPE_PCI_MSIX:

		return get_device_id(&info->msi_dev->dev);

		return get_device_id(msi_desc_to_dev(info->desc));

	default:

		WARN_ON_ONCE(1);

		return -1;
@@ -3702,7 +3702,8 @@ static int irq_remapping_alloc(struct irq_domain *domain, unsigned int virq, 
		   info->type == X86_IRQ_ALLOC_TYPE_PCI_MSIX) {

		bool align = (info->type == X86_IRQ_ALLOC_TYPE_PCI_MSI);



		index = alloc_irq_index(devid, nr_irqs, align, info->msi_dev);

		index = alloc_irq_index(devid, nr_irqs, align,

					msi_desc_to_pci_dev(info->desc));

	} else {

		index = alloc_irq_index(devid, nr_irqs, false, NULL);

	}

drivers/iommu/intel/irq_remapping.c

+2 −2
Original line number Diff line number Diff line
@@ -1124,7 +1124,7 @@ static struct irq_domain *intel_get_irq_domain(struct irq_alloc_info *info) 
		return map_hpet_to_ir(info->devid);

	case X86_IRQ_ALLOC_TYPE_PCI_MSI:

	case X86_IRQ_ALLOC_TYPE_PCI_MSIX:

		return map_dev_to_ir(info->msi_dev);

		return map_dev_to_ir(msi_desc_to_pci_dev(info->desc));

	default:

		WARN_ON_ONCE(1);

		return NULL;
@@ -1293,7 +1293,7 @@ static void intel_irq_remapping_prepare_irte(struct intel_ir_data *data, 
		if (info->type == X86_IRQ_ALLOC_TYPE_HPET)

			set_hpet_sid(irte, info->devid);

		else

			set_msi_sid(irte, info->msi_dev);

			set_msi_sid(irte, msi_desc_to_pci_dev(info->desc));



		msg->address_hi = MSI_ADDR_BASE_HI;

		msg->data = sub_handle;

drivers/pci/controller/pci-hyperv.c

+1 −1
Original line number Diff line number Diff line
@@ -1534,7 +1534,7 @@ static struct irq_chip hv_msi_irq_chip = { 
static irq_hw_number_t hv_msi_domain_ops_get_hwirq(struct msi_domain_info *info,

						   msi_alloc_info_t *arg)

{

	return arg->msi_hwirq;

	return arg->hwirq;

}



static struct msi_domain_ops hv_msi_ops = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE