| Message ID | 158751203902.36773.2662739280103265908.stgit@djiang5-desk3.ch.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add VFIO mediated device support and IMS support for the idxd driver. | expand |
Dave Jiang <dave.jiang@intel.com> writes: > From: Megha Dey <megha.dey@linux.intel.com> > > This is a preparatory patch to introduce Interrupt Message Store (IMS). > > The struct device has a linked list ('msi_list') of the MSI (msi/msi-x, > platform-msi) descriptors of that device. This list holds only 1 type > of descriptor since it is not possible for a device to support more > than one of these descriptors concurrently. > > However, with the introduction of IMS, a device can support IMS as well > as MSI-X at the same time. Instead of sharing this list between IMS (a > type of platform-msi) and MSI-X descriptors, introduce a new linked list, > platform_msi_list, which will hold all the platform-msi descriptors. > > Thus, msi_list will point to the MSI/MSIX descriptors of a device, while > platform_msi_list will point to the platform-msi descriptors of a > device. Will point? You're failing to explain that this actually converts the existing platform code over to this new list. This also lacks an explanation why this is not a functional change. > Signed-off-by: Megha Dey <megha.dey@linux.intel.com> Lacks an SOB from you.... > diff --git a/drivers/base/core.c b/drivers/base/core.c > index 139cdf7e7327..5a0116d1a8d0 100644 > --- a/drivers/base/core.c > +++ b/drivers/base/core.c > @@ -1984,6 +1984,7 @@ void device_initialize(struct device *dev) > set_dev_node(dev, -1); > #ifdef CONFIG_GENERIC_MSI_IRQ > INIT_LIST_HEAD(&dev->msi_list); > + INIT_LIST_HEAD(&dev->platform_msi_list); > --- a/drivers/base/platform-msi.c > +++ b/drivers/base/platform-msi.c > @@ -110,7 +110,8 @@ static void platform_msi_free_descs(struct device *dev, int base, int nvec) > { > struct msi_desc *desc, *tmp; > > - list_for_each_entry_safe(desc, tmp, dev_to_msi_list(dev), list) { > + list_for_each_entry_safe(desc, tmp, dev_to_platform_msi_list(dev), > + list) { > if (desc->platform.msi_index >= base && > desc->platform.msi_index < (base + nvec)) { > list_del(&desc->list); > datap = kzalloc(sizeof(*datap), GFP_KERNEL); > @@ -255,6 +256,8 @@ int platform_msi_domain_alloc_irqs(struct device *dev, unsigned int nvec, > struct platform_msi_priv_data *priv_data; > int err; > > + dev->platform_msi_type = GEN_PLAT_MSI; What the heck is GEN_PLAT_MSI? Can you please use 1) A proper name space starting with PLATFORM_MSI_ or such 2) A proper suffix which is self explaining. instead of coming up with nonsensical garbage which even lacks any explanation at the place where it is defined. > diff --git a/include/linux/device.h b/include/linux/device.h > index ac8e37cd716a..cbcecb14584e 100644 > --- a/include/linux/device.h > +++ b/include/linux/device.h > @@ -567,6 +567,8 @@ struct device { > #endif > #ifdef CONFIG_GENERIC_MSI_IRQ > struct list_head msi_list; > + struct list_head platform_msi_list; > + unsigned int platform_msi_type; You use an enum for the types so why are you not using an enum for the struct member which stores it? > > +/** > + * list_entry_select - get the correct struct for this entry based on condition > + * @condition: the condition to choose a particular &struct list head pointer > + * @ptr_a: the &struct list_head pointer if @condition is not met. > + * @ptr_b: the &struct list_head pointer if @condition is met. > + * @type: the type of the struct this is embedded in. > + * @member: the name of the list_head within the struct. > + */ > +#define list_entry_select(condition, ptr_a, ptr_b, type, member)\ > + (condition) ? list_entry(ptr_a, type, member) : \ > + list_entry(ptr_b, type, member) This is related to $Subject in which way? It's not a entirely new process rule that infrastructure changes which touch a completely different subsystem have to be separate and explained and justified on their own. > > +enum platform_msi_type { > + NOT_PLAT_MSI = 0, NOT_PLAT_MSI? Not used anywhere and of course equally self explaining as the other one. > + GEN_PLAT_MSI = 1, > +}; > + > /* Helpers to hide struct msi_desc implementation details */ > #define msi_desc_to_dev(desc) ((desc)->dev) > #define dev_to_msi_list(dev) (&(dev)->msi_list) > @@ -140,6 +145,22 @@ struct msi_desc { > #define for_each_msi_entry_safe(desc, tmp, dev) \ > list_for_each_entry_safe((desc), (tmp), dev_to_msi_list((dev)), list) > > +#define dev_to_platform_msi_list(dev) (&(dev)->platform_msi_list) > +#define first_platform_msi_entry(dev) \ > + list_first_entry(dev_to_platform_msi_list((dev)), struct msi_desc, list) > +#define for_each_platform_msi_entry(desc, dev) \ > + list_for_each_entry((desc), dev_to_platform_msi_list((dev)), list) > +#define for_each_platform_msi_entry_safe(desc, tmp, dev) \ > + list_for_each_entry_safe((desc), (tmp), dev_to_platform_msi_list((dev)), list) New lines to seperate macros are bad for readability, right? > +#define first_msi_entry_common(dev) \ > + list_first_entry_select((dev)->platform_msi_type, dev_to_platform_msi_list((dev)), \ > + dev_to_msi_list((dev)), struct msi_desc, list) > + > +#define for_each_msi_entry_common(desc, dev) \ > + list_for_each_entry_select((dev)->platform_msi_type, desc, dev_to_platform_msi_list((dev)), \ > + dev_to_msi_list((dev)), list) \ > + > #ifdef CONFIG_IRQ_MSI_IOMMU > static inline const void *msi_desc_get_iommu_cookie(struct msi_desc *desc) > { > diff --git a/kernel/irq/msi.c b/kernel/irq/msi.c > index eb95f6106a1e..bc5f9e32387f 100644 > --- a/kernel/irq/msi.c > +++ b/kernel/irq/msi.c > @@ -320,7 +320,7 @@ int msi_domain_populate_irqs(struct irq_domain *domain, struct device *dev, > struct msi_desc *desc; > int ret = 0; > > - for_each_msi_entry(desc, dev) { > + for_each_msi_entry_common(desc, dev) { This is absolutely unreadable. What's common here? You hide the decision which list to iterate behind a misnomed macro. And looking at the implementation: > +#define for_each_msi_entry_common(desc, dev) \ > + list_for_each_entry_select((dev)->platform_msi_type, desc, dev_to_platform_msi_list((dev)), \ > + dev_to_msi_list((dev)), list) \ So you implicitely make the decision based on: (dev)->platform_msi_type != 0 What? How is that ever supposed to work? The changelog says: > However, with the introduction of IMS, a device can support IMS as well > as MSI-X at the same time. Instead of sharing this list between IMS (a > type of platform-msi) and MSI-X descriptors, introduce a new linked list, > platform_msi_list, which will hold all the platform-msi descriptors. So you are not serious about storing the decision in the device struct and then calling into common code? That's insane at best. There is absolutely ZERO explanation how this is supposed to work and why this could even be remotely correct and safe. Ever heard of the existance of function arguments? Sorry, this is just voodoo programming and not going anywhere. Thanks, tglx
Hi Thomas, On 4/25/2020 2:13 PM, Thomas Gleixner wrote: > Dave Jiang <dave.jiang@intel.com> writes: > >> From: Megha Dey <megha.dey@linux.intel.com> >> >> This is a preparatory patch to introduce Interrupt Message Store (IMS). >> >> The struct device has a linked list ('msi_list') of the MSI (msi/msi-x, >> platform-msi) descriptors of that device. This list holds only 1 type >> of descriptor since it is not possible for a device to support more >> than one of these descriptors concurrently. >> >> However, with the introduction of IMS, a device can support IMS as well >> as MSI-X at the same time. Instead of sharing this list between IMS (a >> type of platform-msi) and MSI-X descriptors, introduce a new linked list, >> platform_msi_list, which will hold all the platform-msi descriptors. >> >> Thus, msi_list will point to the MSI/MSIX descriptors of a device, while >> platform_msi_list will point to the platform-msi descriptors of a >> device. > > Will point? > I meant to say msi_list will be the list head for the MSI/MSI-X descriptors whereas platform_msi_list will be the list head for all the platform-msi descriptors. > You're failing to explain that this actually converts the existing > platform code over to this new list. This also lacks an explanation why > this is not a functional change. Hmm yeah makes sense. I will add these details in the next version. > >> Signed-off-by: Megha Dey <megha.dey@linux.intel.com> > > Lacks an SOB from you.... Yeah, will be added in the next version. > >> diff --git a/drivers/base/core.c b/drivers/base/core.c >> index 139cdf7e7327..5a0116d1a8d0 100644 >> --- a/drivers/base/core.c >> +++ b/drivers/base/core.c >> @@ -1984,6 +1984,7 @@ void device_initialize(struct device *dev) >> set_dev_node(dev, -1); >> #ifdef CONFIG_GENERIC_MSI_IRQ >> INIT_LIST_HEAD(&dev->msi_list); >> + INIT_LIST_HEAD(&dev->platform_msi_list); > >> --- a/drivers/base/platform-msi.c >> +++ b/drivers/base/platform-msi.c >> @@ -110,7 +110,8 @@ static void platform_msi_free_descs(struct device *dev, int base, int nvec) >> { >> struct msi_desc *desc, *tmp; >> >> - list_for_each_entry_safe(desc, tmp, dev_to_msi_list(dev), list) { >> + list_for_each_entry_safe(desc, tmp, dev_to_platform_msi_list(dev), >> + list) { >> if (desc->platform.msi_index >= base && >> desc->platform.msi_index < (base + nvec)) { >> list_del(&desc->list); >> datap = kzalloc(sizeof(*datap), GFP_KERNEL); >> @@ -255,6 +256,8 @@ int platform_msi_domain_alloc_irqs(struct device *dev, unsigned int nvec, >> struct platform_msi_priv_data *priv_data; >> int err; >> >> + dev->platform_msi_type = GEN_PLAT_MSI; > > What the heck is GEN_PLAT_MSI? Can you please use > > 1) A proper name space starting with PLATFORM_MSI_ or such > > 2) A proper suffix which is self explaining. > > instead of coming up with nonsensical garbage which even lacks any > explanation at the place where it is defined. So basically, I wanted to differentiate between the existing platform-msi interrupts(GEN_PLAT_MSI) and the IMS interrupts. But sure, I will try to come up with a more sensible name , PLATFORM_MSI_STATIC/DYNAMIC perhaps? > >> diff --git a/include/linux/device.h b/include/linux/device.h >> index ac8e37cd716a..cbcecb14584e 100644 >> --- a/include/linux/device.h >> +++ b/include/linux/device.h >> @@ -567,6 +567,8 @@ struct device { >> #endif >> #ifdef CONFIG_GENERIC_MSI_IRQ >> struct list_head msi_list; >> + struct list_head platform_msi_list; >> + unsigned int platform_msi_type; > > You use an enum for the types so why are you not using an enum for the > struct member which stores it? Ok, will change this in the next version. > >> >> +/** >> + * list_entry_select - get the correct struct for this entry based on condition >> + * @condition: the condition to choose a particular &struct list head pointer >> + * @ptr_a: the &struct list_head pointer if @condition is not met. >> + * @ptr_b: the &struct list_head pointer if @condition is met. >> + * @type: the type of the struct this is embedded in. >> + * @member: the name of the list_head within the struct. >> + */ >> +#define list_entry_select(condition, ptr_a, ptr_b, type, member)\ >> + (condition) ? list_entry(ptr_a, type, member) : \ >> + list_entry(ptr_b, type, member) > > This is related to $Subject in which way? It's not a entirely new > process rule that infrastructure changes which touch a completely > different subsystem have to be separate and explained and justified on > their own. True, this should be an independent change, I will add it as a separate patch next time. > >> >> +enum platform_msi_type { >> + NOT_PLAT_MSI = 0, > > NOT_PLAT_MSI? Not used anywhere and of course equally self explaining as > the other one. Ya, this seems unnecessary, will remove it. > >> + GEN_PLAT_MSI = 1, >> +}; >> + >> /* Helpers to hide struct msi_desc implementation details */ >> #define msi_desc_to_dev(desc) ((desc)->dev) >> #define dev_to_msi_list(dev) (&(dev)->msi_list) >> @@ -140,6 +145,22 @@ struct msi_desc { >> #define for_each_msi_entry_safe(desc, tmp, dev) \ >> list_for_each_entry_safe((desc), (tmp), dev_to_msi_list((dev)), list) >> >> +#define dev_to_platform_msi_list(dev) (&(dev)->platform_msi_list) >> +#define first_platform_msi_entry(dev) \ >> + list_first_entry(dev_to_platform_msi_list((dev)), struct msi_desc, list) >> +#define for_each_platform_msi_entry(desc, dev) \ >> + list_for_each_entry((desc), dev_to_platform_msi_list((dev)), list) >> +#define for_each_platform_msi_entry_safe(desc, tmp, dev) \ >> + list_for_each_entry_safe((desc), (tmp), dev_to_platform_msi_list((dev)), list) > > New lines to seperate macros are bad for readability, right? Sigh, I was trying to follow the same spacing scheme as is for the msi list above. Will make it readable next time around. > >> +#define first_msi_entry_common(dev) \ >> + list_first_entry_select((dev)->platform_msi_type, dev_to_platform_msi_list((dev)), \ >> + dev_to_msi_list((dev)), struct msi_desc, list) >> + >> +#define for_each_msi_entry_common(desc, dev) \ >> + list_for_each_entry_select((dev)->platform_msi_type, desc, dev_to_platform_msi_list((dev)), \ >> + dev_to_msi_list((dev)), list) \ >> + >> #ifdef CONFIG_IRQ_MSI_IOMMU >> static inline const void *msi_desc_get_iommu_cookie(struct msi_desc *desc) >> { >> diff --git a/kernel/irq/msi.c b/kernel/irq/msi.c >> index eb95f6106a1e..bc5f9e32387f 100644 >> --- a/kernel/irq/msi.c >> +++ b/kernel/irq/msi.c >> @@ -320,7 +320,7 @@ int msi_domain_populate_irqs(struct irq_domain *domain, struct device *dev, >> struct msi_desc *desc; >> int ret = 0; >> >> - for_each_msi_entry(desc, dev) { >> + for_each_msi_entry_common(desc, dev) { > > This is absolutely unreadable. What's common here? You hide the decision > which list to iterate behind a misnomed macro. Hmm, so this macro is basically to be be used by the common code(kernel IRQ subsystem for instance) to know which list needs to be traversed, msi_list or platform_msi_list of a device. Finding suitable names for macros is clearly my Achilles heel. > > And looking at the implementation: > >> +#define for_each_msi_entry_common(desc, dev) \ >> + list_for_each_entry_select((dev)->platform_msi_type, desc, dev_to_platform_msi_list((dev)), \ >> + dev_to_msi_list((dev)), list) \ > > So you implicitely make the decision based on: > > (dev)->platform_msi_type != 0 > > What? How is that ever supposed to work? The changelog says: > >> However, with the introduction of IMS, a device can support IMS as well >> as MSI-X at the same time. Instead of sharing this list between IMS (a >> type of platform-msi) and MSI-X descriptors, introduce a new linked list, >> platform_msi_list, which will hold all the platform-msi descriptors. > > So you are not serious about storing the decision in the device struct > and then calling into common code? > > That's insane at best. There is absolutely ZERO explanation how this is > supposed to work and why this could even be remotely correct and safe. > You are right. I think this code would have problems if there is concurrent access of the struct device. I probably need to impose some kind of locking mechanism here if a device supports both MSI-X and platform msi. > Ever heard of the existance of function arguments? > > Sorry, this is just voodoo programming and not going anywhere. hmm, will try to ensure sane programming in the next attempt. > > Thanks, > > tglx >
diff --git a/drivers/base/core.c b/drivers/base/core.c index 139cdf7e7327..5a0116d1a8d0 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -1984,6 +1984,7 @@ void device_initialize(struct device *dev) set_dev_node(dev, -1); #ifdef CONFIG_GENERIC_MSI_IRQ INIT_LIST_HEAD(&dev->msi_list); + INIT_LIST_HEAD(&dev->platform_msi_list); #endif INIT_LIST_HEAD(&dev->links.consumers); INIT_LIST_HEAD(&dev->links.suppliers); diff --git a/drivers/base/platform-msi.c b/drivers/base/platform-msi.c index 1a3af5f33802..b25c52f734dc 100644 --- a/drivers/base/platform-msi.c +++ b/drivers/base/platform-msi.c @@ -110,7 +110,8 @@ static void platform_msi_free_descs(struct device *dev, int base, int nvec) { struct msi_desc *desc, *tmp; - list_for_each_entry_safe(desc, tmp, dev_to_msi_list(dev), list) { + list_for_each_entry_safe(desc, tmp, dev_to_platform_msi_list(dev), + list) { if (desc->platform.msi_index >= base && desc->platform.msi_index < (base + nvec)) { list_del(&desc->list); @@ -127,8 +128,8 @@ static int platform_msi_alloc_descs_with_irq(struct device *dev, int virq, struct msi_desc *desc; int i, base = 0; - if (!list_empty(dev_to_msi_list(dev))) { - desc = list_last_entry(dev_to_msi_list(dev), + if (!list_empty(dev_to_platform_msi_list(dev))) { + desc = list_last_entry(dev_to_platform_msi_list(dev), struct msi_desc, list); base = desc->platform.msi_index + 1; } @@ -142,7 +143,7 @@ static int platform_msi_alloc_descs_with_irq(struct device *dev, int virq, desc->platform.msi_index = base + i; desc->irq = virq ? virq + i : 0; - list_add_tail(&desc->list, dev_to_msi_list(dev)); + list_add_tail(&desc->list, dev_to_platform_msi_list(dev)); } if (i != nvec) { @@ -213,7 +214,7 @@ platform_msi_alloc_priv_data(struct device *dev, unsigned int nvec, } /* Already had a helping of MSI? Greed... */ - if (!list_empty(dev_to_msi_list(dev))) + if (!list_empty(dev_to_platform_msi_list(dev))) return ERR_PTR(-EBUSY); datap = kzalloc(sizeof(*datap), GFP_KERNEL); @@ -255,6 +256,8 @@ int platform_msi_domain_alloc_irqs(struct device *dev, unsigned int nvec, struct platform_msi_priv_data *priv_data; int err; + dev->platform_msi_type = GEN_PLAT_MSI; + priv_data = platform_msi_alloc_priv_data(dev, nvec, platform_ops); if (IS_ERR(priv_data)) return PTR_ERR(priv_data); @@ -284,10 +287,10 @@ EXPORT_SYMBOL_GPL(platform_msi_domain_alloc_irqs); */ void platform_msi_domain_free_irqs(struct device *dev) { - if (!list_empty(dev_to_msi_list(dev))) { + if (!list_empty(dev_to_platform_msi_list(dev))) { struct msi_desc *desc; - desc = first_msi_entry(dev); + desc = first_platform_msi_entry(dev); platform_msi_free_priv_data(desc->platform.msi_priv_data); } @@ -370,7 +373,7 @@ void platform_msi_domain_free(struct irq_domain *domain, unsigned int virq, { struct platform_msi_priv_data *data = domain->host_data; struct msi_desc *desc, *tmp; - for_each_msi_entry_safe(desc, tmp, data->dev) { + for_each_platform_msi_entry_safe(desc, tmp, data->dev) { if (WARN_ON(!desc->irq || desc->nvec_used != 1)) return; if (!(desc->irq >= virq && desc->irq < (virq + nvec))) diff --git a/include/linux/device.h b/include/linux/device.h index ac8e37cd716a..cbcecb14584e 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -567,6 +567,8 @@ struct device { #endif #ifdef CONFIG_GENERIC_MSI_IRQ struct list_head msi_list; + struct list_head platform_msi_list; + unsigned int platform_msi_type; #endif const struct dma_map_ops *dma_ops; diff --git a/include/linux/list.h b/include/linux/list.h index aff44d34f4e4..7a5ea40cb945 100644 --- a/include/linux/list.h +++ b/include/linux/list.h @@ -492,6 +492,18 @@ static inline void list_splice_tail_init(struct list_head *list, #define list_entry(ptr, type, member) \ container_of(ptr, type, member) +/** + * list_entry_select - get the correct struct for this entry based on condition + * @condition: the condition to choose a particular &struct list head pointer + * @ptr_a: the &struct list_head pointer if @condition is not met. + * @ptr_b: the &struct list_head pointer if @condition is met. + * @type: the type of the struct this is embedded in. + * @member: the name of the list_head within the struct. + */ +#define list_entry_select(condition, ptr_a, ptr_b, type, member)\ + (condition) ? list_entry(ptr_a, type, member) : \ + list_entry(ptr_b, type, member) + /** * list_first_entry - get the first element from a list * @ptr: the list head to take the element from. @@ -503,6 +515,17 @@ static inline void list_splice_tail_init(struct list_head *list, #define list_first_entry(ptr, type, member) \ list_entry((ptr)->next, type, member) +/** + * list_first_entry_select - get the first element from list based on condition + * @condition: the condition to choose a particular &struct list head pointer + * @ptr_a: the &struct list_head pointer if @condition is not met. + * @ptr_b: the &struct list_head pointer if @condition is met. + * @type: the type of the struct this is embedded in. + * @member: the name of the list_head within the struct. + */ +#define list_first_entry_select(condition, ptr_a, ptr_b, type, member) \ + list_entry_select((condition), (ptr_a)->next, (ptr_b)->next, type, member) + /** * list_last_entry - get the last element from a list * @ptr: the list head to take the element from. @@ -602,6 +625,19 @@ static inline void list_splice_tail_init(struct list_head *list, &pos->member != (head); \ pos = list_next_entry(pos, member)) +/** + * list_for_each_entry_select - iterate over list of given type based on condition + * @condition: the condition to choose a particular &struct list head pointer + * @pos: the type * to use as a loop cursor. + * @head_a: the head for your list if condition is met. + * @head_b: the head for your list if condition is not met. + * @member: the name of the list_head within the struct. + */ +#define list_for_each_entry_select(condition, pos, head_a, head_b, member)\ + for (pos = list_first_entry_select((condition), head_a, head_b, typeof(*pos), member);\ + (condition) ? &pos->member != (head_a) : &pos->member != (head_b);\ + pos = list_next_entry(pos, member)) + /** * list_for_each_entry_reverse - iterate backwards over list of given type. * @pos: the type * to use as a loop cursor. diff --git a/include/linux/msi.h b/include/linux/msi.h index 8e08907d70cb..9c15b7403694 100644 --- a/include/linux/msi.h +++ b/include/linux/msi.h @@ -130,6 +130,11 @@ struct msi_desc { }; }; +enum platform_msi_type { + NOT_PLAT_MSI = 0, + GEN_PLAT_MSI = 1, +}; + /* Helpers to hide struct msi_desc implementation details */ #define msi_desc_to_dev(desc) ((desc)->dev) #define dev_to_msi_list(dev) (&(dev)->msi_list) @@ -140,6 +145,22 @@ struct msi_desc { #define for_each_msi_entry_safe(desc, tmp, dev) \ list_for_each_entry_safe((desc), (tmp), dev_to_msi_list((dev)), list) +#define dev_to_platform_msi_list(dev) (&(dev)->platform_msi_list) +#define first_platform_msi_entry(dev) \ + list_first_entry(dev_to_platform_msi_list((dev)), struct msi_desc, list) +#define for_each_platform_msi_entry(desc, dev) \ + list_for_each_entry((desc), dev_to_platform_msi_list((dev)), list) +#define for_each_platform_msi_entry_safe(desc, tmp, dev) \ + list_for_each_entry_safe((desc), (tmp), dev_to_platform_msi_list((dev)), list) + +#define first_msi_entry_common(dev) \ + list_first_entry_select((dev)->platform_msi_type, dev_to_platform_msi_list((dev)), \ + dev_to_msi_list((dev)), struct msi_desc, list) + +#define for_each_msi_entry_common(desc, dev) \ + list_for_each_entry_select((dev)->platform_msi_type, desc, dev_to_platform_msi_list((dev)), \ + dev_to_msi_list((dev)), list) \ + #ifdef CONFIG_IRQ_MSI_IOMMU static inline const void *msi_desc_get_iommu_cookie(struct msi_desc *desc) { diff --git a/kernel/irq/msi.c b/kernel/irq/msi.c index eb95f6106a1e..bc5f9e32387f 100644 --- a/kernel/irq/msi.c +++ b/kernel/irq/msi.c @@ -320,7 +320,7 @@ int msi_domain_populate_irqs(struct irq_domain *domain, struct device *dev, struct msi_desc *desc; int ret = 0; - for_each_msi_entry(desc, dev) { + for_each_msi_entry_common(desc, dev) { /* Don't even try the multi-MSI brain damage. */ if (WARN_ON(!desc->irq || desc->nvec_used != 1)) { ret = -EINVAL; @@ -342,7 +342,7 @@ int msi_domain_populate_irqs(struct irq_domain *domain, struct device *dev, if (ret) { /* Mop up the damage */ - for_each_msi_entry(desc, dev) { + for_each_msi_entry_common(desc, dev) { if (!(desc->irq >= virq && desc->irq < (virq + nvec))) continue; @@ -383,7 +383,7 @@ static bool msi_check_reservation_mode(struct irq_domain *domain, * Checking the first MSI descriptor is sufficient. MSIX supports * masking and MSI does so when the maskbit is set. */ - desc = first_msi_entry(dev); + desc = first_msi_entry_common(dev); return desc->msi_attrib.is_msix || desc->msi_attrib.maskbit; } @@ -411,7 +411,7 @@ int msi_domain_alloc_irqs(struct irq_domain *domain, struct device *dev, if (ret) return ret; - for_each_msi_entry(desc, dev) { + for_each_msi_entry_common(desc, dev) { ops->set_desc(&arg, desc); virq = __irq_domain_alloc_irqs(domain, -1, desc->nvec_used, @@ -437,7 +437,7 @@ int msi_domain_alloc_irqs(struct irq_domain *domain, struct device *dev, can_reserve = msi_check_reservation_mode(domain, info, dev); - for_each_msi_entry(desc, dev) { + for_each_msi_entry_common(desc, dev) { virq = desc->irq; if (desc->nvec_used == 1) dev_dbg(dev, "irq %d for MSI\n", virq); @@ -468,7 +468,7 @@ int msi_domain_alloc_irqs(struct irq_domain *domain, struct device *dev, * so request_irq() will assign the final vector. */ if (can_reserve) { - for_each_msi_entry(desc, dev) { + for_each_msi_entry_common(desc, dev) { irq_data = irq_domain_get_irq_data(domain, desc->irq); irqd_clr_activated(irq_data); } @@ -476,7 +476,7 @@ int msi_domain_alloc_irqs(struct irq_domain *domain, struct device *dev, return 0; cleanup: - for_each_msi_entry(desc, dev) { + for_each_msi_entry_common(desc, dev) { struct irq_data *irqd; if (desc->irq == virq) @@ -500,7 +500,7 @@ void msi_domain_free_irqs(struct irq_domain *domain, struct device *dev) { struct msi_desc *desc; - for_each_msi_entry(desc, dev) { + for_each_msi_entry_common(desc, dev) { /* * We might have failed to allocate an MSI early * enough that there is no IRQ associated to this