@@ -354,6 +354,7 @@ struct msi_desc *msi_next_desc(struct de
int __msi_get_virq(struct device *dev, unsigned int index)
{
struct msi_desc *desc;
+ int ret = -ENOENT;
bool pcimsi;
if (!dev->msi.data)
@@ -361,11 +362,12 @@ int __msi_get_virq(struct device *dev, u
pcimsi = msi_device_has_property(dev, MSI_PROP_PCI_MSI);
- for_each_msi_entry(desc, dev) {
+ msi_lock_descs(dev);
+ msi_for_each_desc_from(desc, dev, MSI_DESC_ASSOCIATED, index) {
/* PCI-MSI has only one descriptor for multiple interrupts. */
if (pcimsi) {
- if (desc->irq && index < desc->nvec_used)
- return desc->irq + index;
+ if (index < desc->nvec_used)
+ ret = desc->irq + index;
break;
}
@@ -373,10 +375,13 @@ int __msi_get_virq(struct device *dev, u
* PCI-MSIX and platform MSI use a descriptor per
* interrupt.
*/
- if (desc->msi_index == index)
- return desc->irq;
+ if (desc->msi_index == index) {
+ ret = desc->irq;
+ break;
+ }
}
- return -ENOENT;
+ msi_unlock_descs(dev);
+ return ret;
}
EXPORT_SYMBOL_GPL(__msi_get_virq);
@@ -407,7 +412,7 @@ static const struct attribute_group **ms
int i;
/* Determine how many msi entries we have */
- for_each_msi_entry(entry, dev)
+ msi_for_each_desc(entry, dev, MSI_DESC_ALL)
num_msi += entry->nvec_used;
if (!num_msi)
return NULL;
@@ -417,7 +422,7 @@ static const struct attribute_group **ms
if (!msi_attrs)
return ERR_PTR(-ENOMEM);
- for_each_msi_entry(entry, dev) {
+ msi_for_each_desc(entry, dev, MSI_DESC_ALL) {
for (i = 0; i < entry->nvec_used; i++) {
msi_dev_attr = kzalloc(sizeof(*msi_dev_attr), GFP_KERNEL);
if (!msi_dev_attr)
@@ -838,7 +843,7 @@ static bool msi_check_reservation_mode(s
* Checking the first MSI descriptor is sufficient. MSIX supports
* masking and MSI does so when the can_mask attribute is set.
*/
- desc = first_msi_entry(dev);
+ desc = msi_first_desc(dev);
return desc->pci.msi_attrib.is_msix || desc->pci.msi_attrib.can_mask;
}
Use the new iterator functions and add locking where required. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- kernel/irq/msi.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-)