Re: [PATCH 4/4] atl1: Ancillary C files for Attansic L1 driver

[Jay Cliburn <jacliburn@bellsouth.net>]

Luca Tettamanti wrote:
[snip]
> Anyway...
>
> Unconditionally enable MSI in atl1 driver. Also remove some useless
> #ifdef since pci_{en,dis}able_msi() are no-op when MSI support is not
> configured in.
>
> Signed-off-by: Luca Tettamanti <kronos.it@gmail.com>

Acked-by: Jay Cliburn <jacliburn@bellsouth.net>

I tested this patch today.  Works fine on my Asus M2V mainboard (Via 
K8T890).

Here are the eth0 entries in /proc/interrupts before and after the patch.

BEFORE:    36:   93   322091   IO-APIC-fasteoi   eth0
AFTER:   2298:   85     7289   PCI-MSI-edge      eth0

Jeff, shall I add this to the larger patch I'm working on for submittal 
later this weekend, or do you just add it directly to netdev?  (I prefer 
to do the former if it's okay with you.)

Jay

> ---
>  Patch against current netdev tree.
>
>  drivers/net/atl1/atl1.h       |    1 -
>  drivers/net/atl1/atl1_main.c  |   22 +++++++---------------
>  drivers/net/atl1/atl1_param.c |   13 -------------
>  3 files changed, 7 insertions(+), 29 deletions(-)
>
> diff --git a/drivers/net/atl1/atl1.h b/drivers/net/atl1/atl1.h
> index 1d13e8f..0b30e1c 100644
> --- a/drivers/net/atl1/atl1.h
> +++ b/drivers/net/atl1/atl1.h
> @@ -281,7 +281,6 @@ struct atl1_adapter {
>  	struct atl1_smb smb;
>  	struct atl1_cmb cmb;
>  
> -	int enable_msi;
>  	u32 pci_state[16];
>  };
>  
> diff --git a/drivers/net/atl1/atl1_main.c b/drivers/net/atl1/atl1_main.c
> index c0b1555..68e6cd1 100644
> --- a/drivers/net/atl1/atl1_main.c
> +++ b/drivers/net/atl1/atl1_main.c
> @@ -1793,18 +1793,12 @@ s32 atl1_up(struct atl1_adapter *adapter)
>  		goto err_up;
>  	}
>  
> -#ifdef CONFIG_PCI_MSI
> -	if (adapter->enable_msi) {
> -		err = pci_enable_msi(adapter->pdev);
> -		if (err) {
> -			dev_info(&adapter->pdev->dev, "Unable to enable MSI: %d\n", err);
> -			adapter->enable_msi = 0;
> -		}
> -	}
> -#endif
> -	if (!adapter->enable_msi)
> +	err = pci_enable_msi(adapter->pdev);
> +	if (err) {
> +		dev_info(&adapter->pdev->dev, "Unable to enable MSI: %d\n", err);
>  		irq_flags |= IRQF_SHARED;
> -
> +	}
> +	
>  	err = request_irq(adapter->pdev->irq, &atl1_intr, irq_flags,
>  			netdev->name, netdev);
>  	if (unlikely(err))
> @@ -1821,6 +1815,7 @@ s32 atl1_up(struct atl1_adapter *adapter)
>  	free_irq(adapter->pdev->irq, netdev);
>  
>  err_up:
> +	pci_disable_msi(adapter->pdev);
>  	/* free rx_buffers */
>  	atl1_clean_rx_ring(adapter);
>  	return err;
> @@ -1836,10 +1831,7 @@ void atl1_down(struct atl1_adapter *adapter)
>  
>  	atl1_irq_disable(adapter);
>  	free_irq(adapter->pdev->irq, netdev);
> -#ifdef CONFIG_PCI_MSI
> -	if (adapter->enable_msi)
> -		pci_disable_msi(adapter->pdev);
> -#endif
> +	pci_disable_msi(adapter->pdev);
>  	atl1_reset_hw(&adapter->hw);
>  	adapter->cmb.cmb->int_stats = 0;
>  
> diff --git a/drivers/net/atl1/atl1_param.c b/drivers/net/atl1/atl1_param.c
> index 4732f43..caa2d83 100644
> --- a/drivers/net/atl1/atl1_param.c
> +++ b/drivers/net/atl1/atl1_param.c
> @@ -68,10 +68,6 @@ static int num_flash_vendor = 0;
>  module_param_array_named(flash_vendor, flash_vendor, int, &num_flash_vendor, 0);
>  MODULE_PARM_DESC(flash_vendor, "SPI flash vendor");
>  
> -int enable_msi;
> -module_param(enable_msi, int, 0444);
> -MODULE_PARM_DESC(enable_msi, "Enable PCI MSI");
> -
>  #define DEFAULT_INT_MOD_CNT	100	/* 200us */
>  #define MAX_INT_MOD_CNT		65000
>  #define MIN_INT_MOD_CNT		50
> @@ -211,13 +207,4 @@ void __devinit atl1_check_options(struct atl1_adapter *adapter)
>  			adapter->hw.flash_vendor = (u8) (opt.def);
>  		}
>  	}
> -
> -	{			/* PCI MSI usage */
> -
> -#ifdef CONFIG_PCI_MSI
> -		adapter->enable_msi = enable_msi;
> -#else
> -		adapter->enable_msi = 0;
> -#endif
> -	}
>  }
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/