History

genirq/msi: Mop up old interfaces

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

Thomas Gleixner committed 4 years ago

Commit cc9a2461 parent 495c66a2 files · +15 −31Browse files

Unified · Split

2 files
  1. include/linux/msi.h +0 −15
  2. kernel/irq/msi.c +15 −16
include/linux/msi.h+0−15
@@ -197,15 +197,7 @@ struct msi_desc *msi_next_desc(struct device *dev, enum msi_desc_filter filter); · 196 unmodified lines
197197 for ((desc) = msi_first_desc((dev), (filter)); (desc); \
198198 (desc) = msi_next_desc((dev), (filter)))
199199
200−/* Helpers to hide struct msi_desc implementation details */
201200 #define msi_desc_to_dev(desc) ((desc)->dev)
202−#define dev_to_msi_list(dev) (&(dev)->msi.data->list)
203−#define first_msi_entry(dev) \
204− list_first_entry(dev_to_msi_list((dev)), struct msi_desc, list)
205−#define for_each_msi_entry(desc, dev) \
206− list_for_each_entry((desc), dev_to_msi_list((dev)), list)
207−#define for_each_msi_entry_safe(desc, tmp, dev) \
208− list_for_each_entry_safe((desc), (tmp), dev_to_msi_list((dev)), list)
209201
210202 #ifdef CONFIG_IRQ_MSI_IOMMU
211203 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, · 19 unmodified lines
231223 #endif
232224
233225 #ifdef CONFIG_PCI_MSI
234−#define first_pci_msi_entry(pdev) first_msi_entry(&(pdev)->dev)
235−#define for_each_pci_msi_entry(desc, pdev) \
236− for_each_msi_entry((desc), &(pdev)->dev)
237−
238226 struct pci_dev *msi_desc_to_pci_dev(struct msi_desc *desc);
239227 void pci_write_msi_msg(unsigned int irq, struct msi_msg *msg);
240228 #else /* CONFIG_PCI_MSI */
@@ -256,9 +244,6 @@ static inline void msi_free_msi_descs(struct device *dev) · 15 unmodified lines
256244 msi_free_msi_descs_range(dev, MSI_DESC_ALL, 0, MSI_MAX_INDEX);
257245 }
258246
259−struct msi_desc *alloc_msi_entry(struct device *dev, int nvec,
260− const struct irq_affinity_desc *affinity);
261−void free_msi_entry(struct msi_desc *entry);
262247 void __pci_read_msi_msg(struct msi_desc *entry, struct msi_msg *msg);
263248 void __pci_write_msi_msg(struct msi_desc *entry, struct msi_msg *msg);
264249
kernel/irq/msi.c+15−16
@@ -19,8 +19,10 @@ · 18 unmodified lines
1919
2020 #include "internals.h"
2121
22+#define dev_to_msi_list(dev) (&(dev)->msi.data->list)
23+
2224 /**
23− * alloc_msi_entry - Allocate an initialized msi_desc
25+ * msi_alloc_desc - Allocate an initialized msi_desc
2426 * @dev: Pointer to the device for which this is allocated
2527 * @nvec: The number of vectors used in this entry
2628 * @affinity: Optional pointer to an affinity mask array size of @nvec
@@ -30,12 +32,11 @@ · 3 unmodified lines
3032 *
3133 * Return: pointer to allocated &msi_desc on success or %NULL on failure
3234 */
33−struct msi_desc *alloc_msi_entry(struct device *dev, int nvec,
34− const struct irq_affinity_desc *affinity)
35+static struct msi_desc *msi_alloc_desc(struct device *dev, int nvec,
36+ const struct irq_affinity_desc *affinity)
3537 {
36− struct msi_desc *desc;
38+ struct msi_desc *desc = kzalloc(sizeof(*desc), GFP_KERNEL);
3739
38− desc = kzalloc(sizeof(*desc), GFP_KERNEL);
3940 if (!desc)
4041 return NULL;
4142
@@ -43,21 +44,19 @@ struct msi_desc *alloc_msi_entry(struct device *dev, int nvec, · 1 unmodified line
4344 desc->dev = dev;
4445 desc->nvec_used = nvec;
4546 if (affinity) {
46− desc->affinity = kmemdup(affinity,
47− nvec * sizeof(*desc->affinity), GFP_KERNEL);
47+ desc->affinity = kmemdup(affinity, nvec * sizeof(*desc->affinity), GFP_KERNEL);
4848 if (!desc->affinity) {
4949 kfree(desc);
5050 return NULL;
5151 }
5252 }
53−
5453 return desc;
5554 }
5655
57−void free_msi_entry(struct msi_desc *entry)
56+static void msi_free_desc(struct msi_desc *desc)
5857 {
59− kfree(entry->affinity);
60− kfree(entry);
58+ kfree(desc->affinity);
59+ kfree(desc);
6160 }
6261
6362 /**
@@ -73,7 +72,7 @@ int msi_add_msi_desc(struct device *dev, struct msi_desc *init_desc) · 9 unmodified lines
7372
7473 lockdep_assert_held(&dev->msi.data->mutex);
7574
76− desc = alloc_msi_entry(dev, init_desc->nvec_used, init_desc->affinity);
75+ desc = msi_alloc_desc(dev, init_desc->nvec_used, init_desc->affinity);
7776 if (!desc)
7877 return -ENOMEM;
7978
@@ -102,7 +101,7 @@ static int msi_add_simple_msi_descs(struct device *dev, unsigned int index, unsi · 22 unmodified lines
102101 lockdep_assert_held(&dev->msi.data->mutex);
103102
104103 for (i = 0; i < ndesc; i++) {
105− desc = alloc_msi_entry(dev, 1, NULL);
104+ desc = msi_alloc_desc(dev, 1, NULL);
106105 if (!desc)
107106 goto fail;
108107 desc->msi_index = index + i;
@@ -114,7 +113,7 @@ static int msi_add_simple_msi_descs(struct device *dev, unsigned int index, unsi · 5 unmodified lines
114113 fail:
115114 list_for_each_entry_safe(desc, tmp, &list, list) {
116115 list_del(&desc->list);
117− free_msi_entry(desc);
116+ msi_free_desc(desc);
118117 }
119118 return -ENOMEM;
120119 }
@@ -141,7 +140,7 @@ void msi_free_msi_descs_range(struct device *dev, enum msi_desc_filter filter, · 20 unmodified lines
141140 if (desc->msi_index < first_index || desc->msi_index > last_index)
142141 continue;
143142 list_del(&desc->list);
144− free_msi_entry(desc);
143+ msi_free_desc(desc);
145144 }
146145 }
147146
@@ -745,7 +744,7 @@ int msi_domain_populate_irqs(struct irq_domain *domain, struct device *dev, · 597 unmodified lines
745744
746745 msi_lock_descs(dev);
747746 for (virq = virq_base; virq < virq_base + nvec; virq++) {
748− desc = alloc_msi_entry(dev, 1, NULL);
747+ desc = msi_alloc_desc(dev, 1, NULL);
749748 if (!desc) {
750749 ret = -ENOMEM;
751750 goto fail;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t