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>

diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c
index 88a9f97c0c4f3f86ab39d75d148a888149c6f256..8c4c273643dc3932c472e3f30df231f2236c6e2a 100644 (file)
--- a/drivers/net/ethernet/sfc/efx.c
+++ b/drivers/net/ethernet/sfc/efx.c
@@ -1420,9 +1420,12 @@ static int efx_probe_interrupts(struct efx_nic *efx)
                                           xentries, 1, n_channels);
                if (rc < 0) {
                        /* Fall back to single channel MSI */
-                       efx->interrupt_mode = EFX_INT_MODE_MSI;
                        netif_err(efx, drv, efx->net_dev,
                                  "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) {
                        netif_err(efx, drv, efx->net_dev,
                                  "WARNING: Insufficient MSI-X vectors"
@@ -1465,7 +1468,10 @@ static int efx_probe_interrupts(struct efx_nic *efx)
                } else {
                        netif_err(efx, drv, efx->net_dev,
                                  "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;
                }
        }