lkml.org 
[lkml]   [2013]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH RFC v2 29/29] vmxnet3: Make use of pcim_enable_msix_range() interface
    Date
    Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
    ---
    drivers/net/vmxnet3/vmxnet3_drv.c | 40 +++++++++---------------------------
    1 files changed, 10 insertions(+), 30 deletions(-)

    diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
    index d33802c..e552d2b 100644
    --- a/drivers/net/vmxnet3/vmxnet3_drv.c
    +++ b/drivers/net/vmxnet3/vmxnet3_drv.c
    @@ -2735,39 +2735,19 @@ vmxnet3_read_mac_addr(struct vmxnet3_adapter *adapter, u8 *mac)
    */

    static int
    -vmxnet3_acquire_msix_vectors(struct vmxnet3_adapter *adapter,
    - int vectors)
    +vmxnet3_acquire_msix_vectors(struct vmxnet3_adapter *adapter, int vectors)
    {
    - int err = -EINVAL, vector_threshold;
    - vector_threshold = VMXNET3_LINUX_MIN_MSIX_VECT;
    -
    - while (vectors >= vector_threshold) {
    - err = pci_enable_msix(adapter->pdev, adapter->intr.msix_entries,
    - vectors);
    - if (!err) {
    - adapter->intr.num_intrs = vectors;
    - return 0;
    - } else if (err < 0) {
    - dev_err(&adapter->netdev->dev,
    - "Failed to enable MSI-X, error: %d\n", err);
    - return err;
    - } else if (err < vector_threshold) {
    - dev_info(&adapter->pdev->dev,
    - "Number of MSI-Xs which can be allocated "
    - "is lower than min threshold required.\n");
    - return -ENOSPC;
    - } else {
    - /* If fails to enable required number of MSI-x vectors
    - * try enabling minimum number of vectors required.
    - */
    - dev_err(&adapter->netdev->dev,
    - "Failed to enable %d MSI-X, trying %d instead\n",
    - vectors, vector_threshold);
    - vectors = vector_threshold;
    - }
    + vectors = pcim_enable_msix_range(adapter->pdev,
    + adapter->intr.msix_entries, vectors,
    + VMXNET3_LINUX_MIN_MSIX_VECT);
    + if (vectors < 0) {
    + dev_err(&adapter->netdev->dev,
    + "Failed to enable MSI-X, error: %d\n", vectors);
    + return vectors;
    }

    - return err;
    + adapter->intr.num_intrs = vectors;
    + return 0;
    }


    --
    1.7.7.6


    \
     
     \ /
      Last update: 2013-10-19 09:21    [W:4.581 / U:0.324 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site