korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-01 16:14:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

genirq/msi: Mop up old interfaces

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

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Michael Kelley <mikelley@microsoft.com>
Tested-by: Nishanth Menon <nm@ti.com>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Link: https://lore.kernel.org/r/20211206210749.117395027@linutronix.de
This commit is contained in:
Thomas Gleixner 2021-12-06 23:51:47 +01:00
parent 495c66aca3
commit cc9a246dbf
2 changed files with 15 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/linux/msi.h
View File

@ -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); \ for ((desc) = msi_first_desc((dev), (filter)); (desc); \
(desc) = msi_next_desc((dev), (filter))) (desc) = msi_next_desc((dev), (filter)))
/* Helpers to hide struct msi_desc implementation details */
#define msi_desc_to_dev(desc) ((desc)->dev) #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 #ifdef CONFIG_IRQ_MSI_IOMMU
static inline const void *msi_desc_get_iommu_cookie(struct msi_desc *desc) 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 #endif
#ifdef CONFIG_PCI_MSI #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); struct pci_dev *msi_desc_to_pci_dev(struct msi_desc *desc);
void pci_write_msi_msg(unsigned int irq, struct msi_msg *msg); void pci_write_msi_msg(unsigned int irq, struct msi_msg *msg);
#else /* CONFIG_PCI_MSI */ #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); 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_read_msi_msg(struct msi_desc *entry, struct msi_msg *msg);
void __pci_write_msi_msg(struct msi_desc *entry, struct msi_msg *msg); void __pci_write_msi_msg(struct msi_desc *entry, struct msi_msg *msg);

31
kernel/irq/msi.c
View File

@ -19,8 +19,10 @@
#include "internals.h" #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 * @dev: Pointer to the device for which this is allocated
* @nvec: The number of vectors used in this entry * @nvec: The number of vectors used in this entry
* @affinity: Optional pointer to an affinity mask array size of @nvec * @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 * 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) 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) if (!desc)
return NULL; return NULL;
@ -43,21 +44,19 @@ struct msi_desc *alloc_msi_entry(struct device *dev, int nvec,
desc->dev = dev; desc->dev = dev;
desc->nvec_used = nvec; desc->nvec_used = nvec;
if (affinity) { if (affinity) {
desc->affinity = kmemdup(affinity, desc->affinity = kmemdup(affinity, nvec * sizeof(*desc->affinity), GFP_KERNEL);
nvec * sizeof(*desc->affinity), GFP_KERNEL);
if (!desc->affinity) { if (!desc->affinity) {
kfree(desc); kfree(desc);
return NULL; return NULL;
} }
} }
return desc; return desc;
} }
void free_msi_entry(struct msi_desc *entry) static void msi_free_desc(struct msi_desc *desc)
{ {
kfree(entry->affinity); kfree(desc->affinity);
kfree(entry); 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); 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) if (!desc)
return -ENOMEM; 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); lockdep_assert_held(&dev->msi.data->mutex);
for (i = 0; i < ndesc; i++) { for (i = 0; i < ndesc; i++) {
desc = alloc_msi_entry(dev, 1, NULL); desc = msi_alloc_desc(dev, 1, NULL);
if (!desc) if (!desc)
goto fail; goto fail;
desc->msi_index = index + i; desc->msi_index = index + i;
@ -114,7 +113,7 @@ static int msi_add_simple_msi_descs(struct device *dev, unsigned int index, unsi
fail: fail:
list_for_each_entry_safe(desc, tmp, &list, list) { list_for_each_entry_safe(desc, tmp, &list, list) {
list_del(&desc->list); list_del(&desc->list);
free_msi_entry(desc); msi_free_desc(desc);
} }
return -ENOMEM; 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) if (desc->msi_index < first_index || desc->msi_index > last_index)
continue; continue;
list_del(&desc->list); 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); msi_lock_descs(dev);
for (virq = virq_base; virq < virq_base + nvec; virq++) { 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) { if (!desc) {
ret = -ENOMEM; ret = -ENOMEM;
goto fail; goto fail;