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

genirq/msi: Mop up old interfaces 



Get rid of the old iterators, alloc/free functions and adjust the core code
accordingly.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Tested-by: default avatarMichael Kelley <mikelley@microsoft.com>
Tested-by: default avatarNishanth Menon <nm@ti.com>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Link: https://lore.kernel.org/r/20211206210749.117395027@linutronix.de
parent 495c66ac

include/linux/msi.h

+0 −15
Original line number Diff line number Diff line
@@ -197,15 +197,7 @@ struct msi_desc *msi_next_desc(struct device *dev, enum msi_desc_filter filter); 
	for ((desc) = msi_first_desc((dev), (filter)); (desc);	\

	     (desc) = msi_next_desc((dev), (filter)))



/* Helpers to hide struct msi_desc implementation details */

#define msi_desc_to_dev(desc)		((desc)->dev)

#define dev_to_msi_list(dev)		(&(dev)->msi.data->list)

#define first_msi_entry(dev)		\

	list_first_entry(dev_to_msi_list((dev)), struct msi_desc, list)

#define for_each_msi_entry(desc, dev)	\

	list_for_each_entry((desc), dev_to_msi_list((dev)), list)

#define for_each_msi_entry_safe(desc, tmp, dev)	\

	list_for_each_entry_safe((desc), (tmp), dev_to_msi_list((dev)), list)



#ifdef CONFIG_IRQ_MSI_IOMMU

static inline const void *msi_desc_get_iommu_cookie(struct msi_desc *desc)
@@ -231,10 +223,6 @@ static inline void msi_desc_set_iommu_cookie(struct msi_desc *desc, 
#endif



#ifdef CONFIG_PCI_MSI

#define first_pci_msi_entry(pdev)	first_msi_entry(&(pdev)->dev)

#define for_each_pci_msi_entry(desc, pdev)	\

	for_each_msi_entry((desc), &(pdev)->dev)



struct pci_dev *msi_desc_to_pci_dev(struct msi_desc *desc);

void pci_write_msi_msg(unsigned int irq, struct msi_msg *msg);

#else /* CONFIG_PCI_MSI */
@@ -256,9 +244,6 @@ static inline void msi_free_msi_descs(struct device *dev) 
	msi_free_msi_descs_range(dev, MSI_DESC_ALL, 0, MSI_MAX_INDEX);

}



struct msi_desc *alloc_msi_entry(struct device *dev, int nvec,

				 const struct irq_affinity_desc *affinity);

void free_msi_entry(struct msi_desc *entry);

void __pci_read_msi_msg(struct msi_desc *entry, struct msi_msg *msg);

void __pci_write_msi_msg(struct msi_desc *entry, struct msi_msg *msg);

kernel/irq/msi.c

+15 −16
Original line number Diff line number Diff line
@@ -19,8 +19,10 @@ 


#include "internals.h"



#define dev_to_msi_list(dev)	(&(dev)->msi.data->list)



/**

 * alloc_msi_entry - Allocate an initialized msi_desc

 * msi_alloc_desc - Allocate an initialized msi_desc

 * @dev:	Pointer to the device for which this is allocated

 * @nvec:	The number of vectors used in this entry

 * @affinity:	Optional pointer to an affinity mask array size of @nvec
@@ -30,12 +32,11 @@ 
 *

 * Return: pointer to allocated &msi_desc on success or %NULL on failure

 */

struct msi_desc *alloc_msi_entry(struct device *dev, int nvec,

static struct msi_desc *msi_alloc_desc(struct device *dev, int nvec,

					const struct irq_affinity_desc *affinity)

{

	struct msi_desc *desc;

	struct msi_desc *desc = kzalloc(sizeof(*desc), GFP_KERNEL);



	desc = kzalloc(sizeof(*desc), GFP_KERNEL);

	if (!desc)

		return NULL;
@@ -43,21 +44,19 @@ struct msi_desc *alloc_msi_entry(struct device *dev, int nvec, 
	desc->dev = dev;

	desc->nvec_used = nvec;

	if (affinity) {

		desc->affinity = kmemdup(affinity,

			nvec * sizeof(*desc->affinity), GFP_KERNEL);

		desc->affinity = kmemdup(affinity, nvec * sizeof(*desc->affinity), GFP_KERNEL);

		if (!desc->affinity) {

			kfree(desc);

			return NULL;

		}

	}



	return desc;

}



void free_msi_entry(struct msi_desc *entry)

static void msi_free_desc(struct msi_desc *desc)

{

	kfree(entry->affinity);

	kfree(entry);

	kfree(desc->affinity);

	kfree(desc);

}



/**
@@ -73,7 +72,7 @@ int msi_add_msi_desc(struct device *dev, struct msi_desc *init_desc) 


	lockdep_assert_held(&dev->msi.data->mutex);



	desc = alloc_msi_entry(dev, init_desc->nvec_used, init_desc->affinity);

	desc = msi_alloc_desc(dev, init_desc->nvec_used, init_desc->affinity);

	if (!desc)

		return -ENOMEM;
@@ -102,7 +101,7 @@ static int msi_add_simple_msi_descs(struct device *dev, unsigned int index, unsi 
	lockdep_assert_held(&dev->msi.data->mutex);



	for (i = 0; i < ndesc; i++) {

		desc = alloc_msi_entry(dev, 1, NULL);

		desc = msi_alloc_desc(dev, 1, NULL);

		if (!desc)

			goto fail;

		desc->msi_index = index + i;
@@ -114,7 +113,7 @@ static int msi_add_simple_msi_descs(struct device *dev, unsigned int index, unsi 
fail:

	list_for_each_entry_safe(desc, tmp, &list, list) {

		list_del(&desc->list);

		free_msi_entry(desc);

		msi_free_desc(desc);

	}

	return -ENOMEM;

}
@@ -141,7 +140,7 @@ void msi_free_msi_descs_range(struct device *dev, enum msi_desc_filter filter, 
		if (desc->msi_index < first_index || desc->msi_index > last_index)

			continue;

		list_del(&desc->list);

		free_msi_entry(desc);

		msi_free_desc(desc);

	}

}
@@ -745,7 +744,7 @@ int msi_domain_populate_irqs(struct irq_domain *domain, struct device *dev, 


	msi_lock_descs(dev);

	for (virq = virq_base; virq < virq_base + nvec; virq++) {

		desc = alloc_msi_entry(dev, 1, NULL);

		desc = msi_alloc_desc(dev, 1, NULL);

		if (!desc) {

			ret = -ENOMEM;

			goto fail;