X-Git-Url: http://git.etherboot.org/mirror/winof/.git/blobdiff_plain/f6f8dd2c34374692e016dda03c04ae69f8f82465..01ff6c7140c27625d266ba5146e32adeba686745:/hw/mthca/kernel/mthca_main.c?ds=sidebyside diff --git a/hw/mthca/kernel/mthca_main.c b/hw/mthca/kernel/mthca_main.c index 70a72e16..6b41f25f 100644 --- a/hw/mthca/kernel/mthca_main.c +++ b/hw/mthca/kernel/mthca_main.c @@ -82,10 +82,10 @@ static struct { int is_memfree; int is_pcie; } mthca_hca_table[] = { - { MTHCA_FW_VER(3, 3, 2), MTHCA_FW_VER(3, 4, 0), 0, 0 }, /* TAVOR */ - { MTHCA_FW_VER(4, 7, 0), MTHCA_FW_VER(4, 7, 400), 0, 1 }, /* ARBEL_COMPAT */ - { MTHCA_FW_VER(5, 1, 0), MTHCA_FW_VER(5, 1, 400), 1, 1 }, /* ARBEL_NATIVE */ - { MTHCA_FW_VER(1, 0, 800), MTHCA_FW_VER(1, 1, 0), 1, 1 }, /* SINAI */ + { MTHCA_FW_VER(3, 3, 2), MTHCA_FW_VER(3, 5, 0), 0, 0 }, /* TAVOR */ + { MTHCA_FW_VER(4, 7, 0), MTHCA_FW_VER(4, 8, 200), 0, 1 }, /* ARBEL_COMPAT */ + { MTHCA_FW_VER(5, 1, 0), MTHCA_FW_VER(5, 3, 0), 1, 1 }, /* ARBEL_NATIVE */ + { MTHCA_FW_VER(1, 0, 800), MTHCA_FW_VER(1, 2, 0), 1, 1 }, /* SINAI */ { MTHCA_FW_VER(0, 0, 0), MTHCA_FW_VER(0, 0, 0), 0, 0 } /* LIVEFISH */ }; @@ -916,10 +916,10 @@ static int mthca_check_fw(struct mthca_dev *mdev, struct pci_device_id *p_id) HCA_PRINT_EV(TRACE_LEVEL_ERROR ,HCA_DBG_LOW ,("HCA FW version %d.%d.%d is not supported. Use %d.%d.%d or higher.\n", (int) (mdev->fw_ver >> 32), (int) (mdev->fw_ver >> 16) & 0xffff, (int) (mdev->fw_ver & 0xffff), - (int) (mthca_hca_table[p_id->driver_data].min_supported_fw >> 32), - (int) (mthca_hca_table[p_id->driver_data].min_supported_fw >> 16) & 0xffff, - (int) (mthca_hca_table[p_id->driver_data].min_supported_fw & 0xffff))); - err = -EINVAL; + (int) (mthca_hca_table[p_id->driver_data].max_unsupported_fw >> 32), + (int) (mthca_hca_table[p_id->driver_data].max_unsupported_fw >> 16) & 0xffff, + (int) (mthca_hca_table[p_id->driver_data].max_unsupported_fw & 0xffff))); + err = -ENODEV; } else if (mdev->fw_ver < mthca_hca_table[p_id->driver_data].min_supported_fw) {