浏览代码

sfc: only fall back to a lower interrupt mode if it is supported

If we fail to probe interrupts with our minimum mode, return that error.

Signed-off-by: Edward Cree <ecree@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Andrew Rybchenko 8 年之前
父节点
当前提交
62980cb6dd
共有 1 个文件被更改,包括 8 次插入2 次删除
  1. 8 2
      drivers/net/ethernet/sfc/efx.c

+ 8 - 2
drivers/net/ethernet/sfc/efx.c

@@ -1420,9 +1420,12 @@ static int efx_probe_interrupts(struct efx_nic *efx)
 					   xentries, 1, n_channels);
 					   xentries, 1, n_channels);
 		if (rc < 0) {
 		if (rc < 0) {
 			/* Fall back to single channel MSI */
 			/* Fall back to single channel MSI */
-			efx->interrupt_mode = EFX_INT_MODE_MSI;
 			netif_err(efx, drv, efx->net_dev,
 			netif_err(efx, drv, efx->net_dev,
 				  "could not enable MSI-X\n");
 				  "could not enable MSI-X\n");
+			if (efx->type->min_interrupt_mode >= EFX_INT_MODE_MSI)
+				efx->interrupt_mode = EFX_INT_MODE_MSI;
+			else
+				return rc;
 		} else if (rc < n_channels) {
 		} else if (rc < n_channels) {
 			netif_err(efx, drv, efx->net_dev,
 			netif_err(efx, drv, efx->net_dev,
 				  "WARNING: Insufficient MSI-X vectors"
 				  "WARNING: Insufficient MSI-X vectors"
@@ -1465,7 +1468,10 @@ static int efx_probe_interrupts(struct efx_nic *efx)
 		} else {
 		} else {
 			netif_err(efx, drv, efx->net_dev,
 			netif_err(efx, drv, efx->net_dev,
 				  "could not enable MSI\n");
 				  "could not enable MSI\n");
-			efx->interrupt_mode = EFX_INT_MODE_LEGACY;
+			if (efx->type->min_interrupt_mode >= EFX_INT_MODE_LEGACY)
+				efx->interrupt_mode = EFX_INT_MODE_LEGACY;
+			else
+				return rc;
 		}
 		}
 	}
 	}