lkml.org 
[lkml]   [2014]   [Feb]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH net-next 22/35] vxge: Use pci_enable_msix_range() instead of pci_enable_msix()
    Date
    As result of deprecation of MSI-X/MSI enablement functions
    pci_enable_msix() and pci_enable_msi_block() all drivers
    using these two interfaces need to be updated to use the
    new pci_enable_msi_range() and pci_enable_msix_range()
    interfaces.

    Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
    Cc: Jon Mason <jdmason@kudzu.us>
    Cc: netdev@vger.kernel.org
    Cc: linux-pci@vger.kernel.org
    ---
    drivers/net/ethernet/neterion/vxge/vxge-main.c | 15 +++++++++------
    1 files changed, 9 insertions(+), 6 deletions(-)

    diff --git a/drivers/net/ethernet/neterion/vxge/vxge-main.c b/drivers/net/ethernet/neterion/vxge/vxge-main.c
    index e46e869..c83cedd 100644
    --- a/drivers/net/ethernet/neterion/vxge/vxge-main.c
    +++ b/drivers/net/ethernet/neterion/vxge/vxge-main.c
    @@ -2349,12 +2349,18 @@ start:
    vdev->vxge_entries[j].entry = VXGE_ALARM_MSIX_ID;
    vdev->vxge_entries[j].in_use = 0;

    - ret = pci_enable_msix(vdev->pdev, vdev->entries, vdev->intr_cnt);
    - if (ret > 0) {
    + ret = pci_enable_msix_range(vdev->pdev,
    + vdev->entries, 3, vdev->intr_cnt);
    + if (ret < 0) {
    + ret = -ENODEV;
    + goto enable_msix_failed;
    + } else if (ret < vdev->intr_cnt) {
    + pci_disable_msix(vdev->pdev);
    +
    vxge_debug_init(VXGE_ERR,
    "%s: MSI-X enable failed for %d vectors, ret: %d",
    VXGE_DRIVER_NAME, vdev->intr_cnt, ret);
    - if ((max_config_vpath != VXGE_USE_DEFAULT) || (ret < 3)) {
    + if (max_config_vpath != VXGE_USE_DEFAULT) {
    ret = -ENODEV;
    goto enable_msix_failed;
    }
    @@ -2368,9 +2374,6 @@ start:
    vxge_close_vpaths(vdev, temp);
    vdev->no_of_vpath = temp;
    goto start;
    - } else if (ret < 0) {
    - ret = -ENODEV;
    - goto enable_msix_failed;
    }
    return 0;

    --
    1.7.7.6


    \
     
     \ /
      Last update: 2014-02-18 12:01    [W:4.161 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site