Commit e58f2259 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

genirq/msi, treewide: Use a named struct for PCI/MSI attributes 



The unnamed struct sucks and is in the way of further cleanups. Stick the
PCI related MSI data into a real data structure and cleanup all users.

No functional change.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Tested-by: default avatarJuergen Gross <jgross@suse.com>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20211206210224.374863119@linutronix.de
parent bec61847

arch/powerpc/platforms/cell/axon_msi.c

+1 −1
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ static int setup_msi_msg_address(struct pci_dev *dev, struct msi_msg *msg) 
	entry = first_pci_msi_entry(dev);



	for (; dn; dn = of_get_next_parent(dn)) {

		if (entry->msi_attrib.is_64) {

		if (entry->pci.msi_attrib.is_64) {

			prop = of_get_property(dn, "msi-address-64", &len);

			if (prop)

				break;

arch/powerpc/platforms/powernv/pci-ioda.c

+2 −2
Original line number Diff line number Diff line
@@ -2154,10 +2154,10 @@ static void pnv_msi_compose_msg(struct irq_data *d, struct msi_msg *msg) 
	int rc;



	rc = __pnv_pci_ioda_msi_setup(phb, pdev, d->hwirq,

				      entry->msi_attrib.is_64, msg);

				      entry->pci.msi_attrib.is_64, msg);

	if (rc)

		dev_err(&pdev->dev, "Failed to setup %s-bit MSI #%ld : %d\n",

			entry->msi_attrib.is_64 ? "64" : "32", d->hwirq, rc);

			entry->pci.msi_attrib.is_64 ? "64" : "32", d->hwirq, rc);

}



/*

arch/powerpc/platforms/pseries/msi.c

+3 −3
Original line number Diff line number Diff line
@@ -332,7 +332,7 @@ static int check_msix_entries(struct pci_dev *pdev) 


	expected = 0;

	for_each_pci_msi_entry(entry, pdev) {

		if (entry->msi_attrib.entry_nr != expected) {

		if (entry->pci.msi_attrib.entry_nr != expected) {

			pr_debug("rtas_msi: bad MSI-X entries.\n");

			return -EINVAL;

		}
@@ -449,7 +449,7 @@ static int pseries_msi_ops_prepare(struct irq_domain *domain, struct device *dev 
{

	struct pci_dev *pdev = to_pci_dev(dev);

	struct msi_desc *desc = first_pci_msi_entry(pdev);

	int type = desc->msi_attrib.is_msix ? PCI_CAP_ID_MSIX : PCI_CAP_ID_MSI;

	int type = desc->pci.msi_attrib.is_msix ? PCI_CAP_ID_MSIX : PCI_CAP_ID_MSI;



	return rtas_prepare_msi_irqs(pdev, nvec, type, arg);

}
@@ -580,7 +580,7 @@ static int pseries_irq_domain_alloc(struct irq_domain *domain, unsigned int virq 
	int hwirq;

	int i, ret;



	hwirq = rtas_query_irq_number(pci_get_pdn(pdev), desc->msi_attrib.entry_nr);

	hwirq = rtas_query_irq_number(pci_get_pdn(pdev), desc->pci.msi_attrib.entry_nr);

	if (hwirq < 0) {

		dev_err(&pdev->dev, "Failed to query HW IRQ: %d\n", hwirq);

		return hwirq;

arch/sparc/kernel/pci_msi.c

+2 −2
Original line number Diff line number Diff line
@@ -146,13 +146,13 @@ static int sparc64_setup_msi_irq(unsigned int *irq_p, 
	msiqid = pick_msiq(pbm);



	err = ops->msi_setup(pbm, msiqid, msi,

			     (entry->msi_attrib.is_64 ? 1 : 0));

			     (entry->pci.msi_attrib.is_64 ? 1 : 0));

	if (err)

		goto out_msi_free;



	pbm->msi_irq_table[msi - pbm->msi_first] = *irq_p;



	if (entry->msi_attrib.is_64) {

	if (entry->pci.msi_attrib.is_64) {

		msg.address_hi = pbm->msi64_start >> 32;

		msg.address_lo = pbm->msi64_start & 0xffffffff;

	} else {

arch/x86/kernel/apic/msi.c

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ 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);

	if (desc->msi_attrib.is_msix) {

	if (desc->pci.msi_attrib.is_msix) {

		arg->type = X86_IRQ_ALLOC_TYPE_PCI_MSIX;

	} else {

		arg->type = X86_IRQ_ALLOC_TYPE_PCI_MSI;