Get rid of the old iterators, alloc/free functions and adjust the core code accordingly.
Unified · Split
| @@ -197,15 +197,7 @@ struct msi_desc *msi_next_desc(struct device *dev, enum msi_desc_filter filter); · 196 unmodified lines | |||
| 197 | for ((desc) = msi_first_desc((dev), (filter)); (desc); \ | 197 | for ((desc) = msi_first_desc((dev), (filter)); (desc); \ |
| 198 | (desc) = msi_next_desc((dev), (filter))) | 198 | (desc) = msi_next_desc((dev), (filter))) |
| 199 | 199 | ||
| 200 | /* Helpers to hide struct msi_desc implementation details */ | ||
| 201 | #define msi_desc_to_dev(desc) ((desc)->dev) | 200 | #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) | ||
| 209 | 201 | ||
| 210 | #ifdef CONFIG_IRQ_MSI_IOMMU | 202 | #ifdef CONFIG_IRQ_MSI_IOMMU |
| 211 | static inline const void *msi_desc_get_iommu_cookie(struct msi_desc *desc) | 203 | 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 | |||
| 231 | #endif | 223 | #endif |
| 232 | 224 | ||
| 233 | #ifdef CONFIG_PCI_MSI | 225 | #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 | |||
| 238 | struct pci_dev *msi_desc_to_pci_dev(struct msi_desc *desc); | 226 | struct pci_dev *msi_desc_to_pci_dev(struct msi_desc *desc); |
| 239 | void pci_write_msi_msg(unsigned int irq, struct msi_msg *msg); | 227 | void pci_write_msi_msg(unsigned int irq, struct msi_msg *msg); |
| 240 | #else /* CONFIG_PCI_MSI */ | 228 | #else /* CONFIG_PCI_MSI */ |
| @@ -256,9 +244,6 @@ static inline void msi_free_msi_descs(struct device *dev) · 15 unmodified lines | |||
| 256 | msi_free_msi_descs_range(dev, MSI_DESC_ALL, 0, MSI_MAX_INDEX); | 244 | msi_free_msi_descs_range(dev, MSI_DESC_ALL, 0, MSI_MAX_INDEX); |
| 257 | } | 245 | } |
| 258 | 246 | ||
| 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); | ||
| 262 | void __pci_read_msi_msg(struct msi_desc *entry, struct msi_msg *msg); | 247 | void __pci_read_msi_msg(struct msi_desc *entry, struct msi_msg *msg); |
| 263 | void __pci_write_msi_msg(struct msi_desc *entry, struct msi_msg *msg); | 248 | void __pci_write_msi_msg(struct msi_desc *entry, struct msi_msg *msg); |
| 264 | 249 | ||
| @@ -19,8 +19,10 @@ · 18 unmodified lines | |||
| 19 | 19 | ||
| 20 | #include "internals.h" | 20 | #include "internals.h" |
| 21 | 21 | ||
| 22 | #define dev_to_msi_list(dev) (&(dev)->msi.data->list) | ||
| 23 | |||
| 22 | /** | 24 | /** |
| 23 | * alloc_msi_entry - Allocate an initialized msi_desc | 25 | * msi_alloc_desc - Allocate an initialized msi_desc |
| 24 | * @dev: Pointer to the device for which this is allocated | 26 | * @dev: Pointer to the device for which this is allocated |
| 25 | * @nvec: The number of vectors used in this entry | 27 | * @nvec: The number of vectors used in this entry |
| 26 | * @affinity: Optional pointer to an affinity mask array size of @nvec | 28 | * @affinity: Optional pointer to an affinity mask array size of @nvec |
| @@ -30,12 +32,11 @@ · 3 unmodified lines | |||
| 30 | * | 32 | * |
| 31 | * Return: pointer to allocated &msi_desc on success or %NULL on failure | 33 | * Return: pointer to allocated &msi_desc on success or %NULL on failure |
| 32 | */ | 34 | */ |
| 33 | struct msi_desc *alloc_msi_entry(struct device *dev, int nvec, | 35 | static struct msi_desc *msi_alloc_desc(struct device *dev, int nvec, |
| 34 | const struct irq_affinity_desc *affinity) | 36 | const struct irq_affinity_desc *affinity) |
| 35 | { | 37 | { |
| 36 | struct msi_desc *desc; | 38 | struct msi_desc *desc = kzalloc(sizeof(*desc), GFP_KERNEL); |
| 37 | 39 | ||
| 38 | desc = kzalloc(sizeof(*desc), GFP_KERNEL); | ||
| 39 | if (!desc) | 40 | if (!desc) |
| 40 | return NULL; | 41 | return NULL; |
| 41 | 42 | ||
| @@ -43,21 +44,19 @@ struct msi_desc *alloc_msi_entry(struct device *dev, int nvec, · 1 unmodified line | |||
| 43 | desc->dev = dev; | 44 | desc->dev = dev; |
| 44 | desc->nvec_used = nvec; | 45 | desc->nvec_used = nvec; |
| 45 | if (affinity) { | 46 | if (affinity) { |
| 46 | desc->affinity = kmemdup(affinity, | 47 | desc->affinity = kmemdup(affinity, nvec * sizeof(*desc->affinity), GFP_KERNEL); |
| 47 | nvec * sizeof(*desc->affinity), GFP_KERNEL); | ||
| 48 | if (!desc->affinity) { | 48 | if (!desc->affinity) { |
| 49 | kfree(desc); | 49 | kfree(desc); |
| 50 | return NULL; | 50 | return NULL; |
| 51 | } | 51 | } |
| 52 | } | 52 | } |
| 53 | |||
| 54 | return desc; | 53 | return desc; |
| 55 | } | 54 | } |
| 56 | 55 | ||
| 57 | void free_msi_entry(struct msi_desc *entry) | 56 | static void msi_free_desc(struct msi_desc *desc) |
| 58 | { | 57 | { |
| 59 | kfree(entry->affinity); | 58 | kfree(desc->affinity); |
| 60 | kfree(entry); | 59 | kfree(desc); |
| 61 | } | 60 | } |
| 62 | 61 | ||
| 63 | /** | 62 | /** |
| @@ -73,7 +72,7 @@ int msi_add_msi_desc(struct device *dev, struct msi_desc *init_desc) · 9 unmodified lines | |||
| 73 | 72 | ||
| 74 | lockdep_assert_held(&dev->msi.data->mutex); | 73 | lockdep_assert_held(&dev->msi.data->mutex); |
| 75 | 74 | ||
| 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); |
| 77 | if (!desc) | 76 | if (!desc) |
| 78 | return -ENOMEM; | 77 | return -ENOMEM; |
| 79 | 78 | ||
| @@ -102,7 +101,7 @@ static int msi_add_simple_msi_descs(struct device *dev, unsigned int index, unsi · 22 unmodified lines | |||
| 102 | lockdep_assert_held(&dev->msi.data->mutex); | 101 | lockdep_assert_held(&dev->msi.data->mutex); |
| 103 | 102 | ||
| 104 | for (i = 0; i < ndesc; i++) { | 103 | for (i = 0; i < ndesc; i++) { |
| 105 | desc = alloc_msi_entry(dev, 1, NULL); | 104 | desc = msi_alloc_desc(dev, 1, NULL); |
| 106 | if (!desc) | 105 | if (!desc) |
| 107 | goto fail; | 106 | goto fail; |
| 108 | desc->msi_index = index + i; | 107 | 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 | |||
| 114 | fail: | 113 | fail: |
| 115 | list_for_each_entry_safe(desc, tmp, &list, list) { | 114 | list_for_each_entry_safe(desc, tmp, &list, list) { |
| 116 | list_del(&desc->list); | 115 | list_del(&desc->list); |
| 117 | free_msi_entry(desc); | 116 | msi_free_desc(desc); |
| 118 | } | 117 | } |
| 119 | return -ENOMEM; | 118 | return -ENOMEM; |
| 120 | } | 119 | } |
| @@ -141,7 +140,7 @@ void msi_free_msi_descs_range(struct device *dev, enum msi_desc_filter filter, · 20 unmodified lines | |||
| 141 | if (desc->msi_index < first_index || desc->msi_index > last_index) | 140 | if (desc->msi_index < first_index || desc->msi_index > last_index) |
| 142 | continue; | 141 | continue; |
| 143 | list_del(&desc->list); | 142 | list_del(&desc->list); |
| 144 | free_msi_entry(desc); | 143 | msi_free_desc(desc); |
| 145 | } | 144 | } |
| 146 | } | 145 | } |
| 147 | 146 | ||
| @@ -745,7 +744,7 @@ int msi_domain_populate_irqs(struct irq_domain *domain, struct device *dev, · 597 unmodified lines | |||
| 745 | 744 | ||
| 746 | msi_lock_descs(dev); | 745 | msi_lock_descs(dev); |
| 747 | for (virq = virq_base; virq < virq_base + nvec; virq++) { | 746 | 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); |
| 749 | if (!desc) { | 748 | if (!desc) { |
| 750 | ret = -ENOMEM; | 749 | ret = -ENOMEM; |
| 751 | goto fail; | 750 | goto fail; |