Skip to content

Commit

Permalink
amd-iommu: remove support for msi-x
Browse files Browse the repository at this point in the history
Current hardware uses msi instead of msi-x so this code it not necessary
and can not be tested. The best thing is to drop this code.

Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
  • Loading branch information
Joerg Roedel committed May 28, 2009
1 parent fab6afa commit d91cecd
Showing 1 changed file with 1 addition and 43 deletions.
44 changes: 1 addition & 43 deletions arch/x86/kernel/amd_iommu_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -783,46 +783,6 @@ static int __init init_iommu_all(struct acpi_table_header *table)
*
****************************************************************************/

static int __init iommu_setup_msix(struct amd_iommu *iommu)
{
struct amd_iommu *curr;
struct msix_entry entries[32]; /* only 32 supported by AMD IOMMU */
int nvec = 0, i;

for_each_iommu(curr) {
if (curr->dev == iommu->dev) {
entries[nvec].entry = curr->evt_msi_num;
entries[nvec].vector = 0;
curr->int_enabled = true;
nvec++;
}
}

if (pci_enable_msix(iommu->dev, entries, nvec)) {
pci_disable_msix(iommu->dev);
return 1;
}

for (i = 0; i < nvec; ++i) {
int r = request_irq(entries->vector, amd_iommu_int_handler,
IRQF_SAMPLE_RANDOM,
"AMD IOMMU",
NULL);
if (r)
goto out_free;
}

return 0;

out_free:
for (i -= 1; i >= 0; --i)
free_irq(entries->vector, NULL);

pci_disable_msix(iommu->dev);

return 1;
}

static int __init iommu_setup_msi(struct amd_iommu *iommu)
{
int r;
Expand Down Expand Up @@ -851,9 +811,7 @@ static int __init iommu_init_msi(struct amd_iommu *iommu)
if (iommu->int_enabled)
return 0;

if (pci_find_capability(iommu->dev, PCI_CAP_ID_MSIX))
return iommu_setup_msix(iommu);
else if (pci_find_capability(iommu->dev, PCI_CAP_ID_MSI))
if (pci_find_capability(iommu->dev, PCI_CAP_ID_MSI))
return iommu_setup_msi(iommu);

return 1;
Expand Down

0 comments on commit d91cecd

Please sign in to comment.