Commit e4ff3232 authored by Edward Cree's avatar Edward Cree Committed by David S. Miller

sfc: move modparam 'interrupt_mode' out of common channel code

EF100 only supports MSI-X, so there's no need for the new driver to
 expose this old module parameter.
Since it's now visible to the linker, we have to rename it internally
 to efx_interrupt_mode to avoid symbol collisions in non-modular
 builds.
Signed-off-by: default avatarEdward Cree <ecree@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bc324421
...@@ -64,6 +64,10 @@ void efx_get_udp_tunnel_type_name(u16 type, char *buf, size_t buflen) ...@@ -64,6 +64,10 @@ void efx_get_udp_tunnel_type_name(u16 type, char *buf, size_t buflen)
* *
*************************************************************************/ *************************************************************************/
module_param_named(interrupt_mode, efx_interrupt_mode, uint, 0444);
MODULE_PARM_DESC(interrupt_mode,
"Interrupt mode (0=>MSIX 1=>MSI 2=>legacy)");
/* /*
* Use separate channels for TX and RX events * Use separate channels for TX and RX events
* *
......
...@@ -23,10 +23,7 @@ ...@@ -23,10 +23,7 @@
* 1 => MSI * 1 => MSI
* 2 => legacy * 2 => legacy
*/ */
static unsigned int interrupt_mode; unsigned int efx_interrupt_mode = EFX_INT_MODE_MSIX;
module_param(interrupt_mode, uint, 0444);
MODULE_PARM_DESC(interrupt_mode,
"Interrupt mode (0=>MSIX 1=>MSI 2=>legacy)");
/* This is the requested number of CPUs to use for Receive-Side Scaling (RSS), /* This is the requested number of CPUs to use for Receive-Side Scaling (RSS),
* i.e. the number of CPUs among which we may distribute simultaneous * i.e. the number of CPUs among which we may distribute simultaneous
...@@ -558,7 +555,7 @@ int efx_init_channels(struct efx_nic *efx) ...@@ -558,7 +555,7 @@ int efx_init_channels(struct efx_nic *efx)
/* Higher numbered interrupt modes are less capable! */ /* Higher numbered interrupt modes are less capable! */
efx->interrupt_mode = min(efx->type->min_interrupt_mode, efx->interrupt_mode = min(efx->type->min_interrupt_mode,
interrupt_mode); efx_interrupt_mode);
efx->max_channels = EFX_MAX_CHANNELS; efx->max_channels = EFX_MAX_CHANNELS;
efx->max_tx_channels = EFX_MAX_CHANNELS; efx->max_tx_channels = EFX_MAX_CHANNELS;
......
...@@ -11,6 +11,8 @@ ...@@ -11,6 +11,8 @@
#ifndef EFX_CHANNELS_H #ifndef EFX_CHANNELS_H
#define EFX_CHANNELS_H #define EFX_CHANNELS_H
extern unsigned int efx_interrupt_mode;
int efx_probe_interrupts(struct efx_nic *efx); int efx_probe_interrupts(struct efx_nic *efx);
void efx_remove_interrupts(struct efx_nic *efx); void efx_remove_interrupts(struct efx_nic *efx);
int efx_soft_enable_interrupts(struct efx_nic *efx); int efx_soft_enable_interrupts(struct efx_nic *efx);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment