Skip to content

Commit

Permalink
PCI: make msi_free_irqs() to use msix_mask_irq() instead of open code…
Browse files Browse the repository at this point in the history
…d write

Use msix_mask_irq() instead of direct use of writel, so as not to clear
preserved bits in the Vector Control register [31:1].

Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
  • Loading branch information
Hidetoshi Seto authored and Jesse Barnes committed Jun 19, 2009
1 parent f598282 commit 2af5066
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions drivers/pci/msi.c
Original file line number Diff line number Diff line change
Expand Up @@ -653,10 +653,7 @@ static int msi_free_irqs(struct pci_dev* dev)

list_for_each_entry_safe(entry, tmp, &dev->msi_list, list) {
if (entry->msi_attrib.is_msix) {
writel(1, entry->mask_base + entry->msi_attrib.entry_nr
* PCI_MSIX_ENTRY_SIZE
+ PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET);

msix_mask_irq(entry, 1);
if (list_is_last(&entry->list, &dev->msi_list))
iounmap(entry->mask_base);
}
Expand Down

0 comments on commit 2af5066

Please sign in to comment.