|
@@ -338,7 +338,7 @@ static int aac_comm_init(struct aac_dev * dev)
|
|
|
|
|
|
void aac_define_int_mode(struct aac_dev *dev)
|
|
|
{
|
|
|
- int i, msi_count;
|
|
|
+ int i, msi_count, min_msix;
|
|
|
|
|
|
msi_count = i = 0;
|
|
|
/* max. vectors from GET_COMM_PREFERRED_SETTINGS */
|
|
@@ -366,22 +366,14 @@ void aac_define_int_mode(struct aac_dev *dev)
|
|
|
|
|
|
if (msi_count > 1 &&
|
|
|
pci_find_capability(dev->pdev, PCI_CAP_ID_MSIX)) {
|
|
|
- i = pci_enable_msix(dev->pdev,
|
|
|
+ min_msix = 2;
|
|
|
+ i = pci_enable_msix_range(dev->pdev,
|
|
|
dev->msixentry,
|
|
|
+ min_msix,
|
|
|
msi_count);
|
|
|
- /* Check how many MSIX vectors are allocated */
|
|
|
- if (i >= 0) {
|
|
|
+ if (i > 0) {
|
|
|
dev->msi_enabled = 1;
|
|
|
- if (i) {
|
|
|
- msi_count = i;
|
|
|
- if (pci_enable_msix(dev->pdev,
|
|
|
- dev->msixentry,
|
|
|
- msi_count)) {
|
|
|
- dev->msi_enabled = 0;
|
|
|
- printk(KERN_ERR "%s%d: MSIX not supported!! Will try MSI 0x%x.\n",
|
|
|
- dev->name, dev->id, i);
|
|
|
- }
|
|
|
- }
|
|
|
+ msi_count = i;
|
|
|
} else {
|
|
|
dev->msi_enabled = 0;
|
|
|
printk(KERN_ERR "%s%d: MSIX not supported!! Will try MSI 0x%x.\n",
|