[HCA] Distinguish between Tavor and Arbel HCAs, report correct device ID

in CA attributes.

Signed-off-by: Yossi Leybovich (sleybo@mellanox.co.il)
git-svn-id: svn://openib.tc.cornell.edu/gen1@138 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/trunk/hw/mt23108/vapi/mlxsys/os_dep/win/tdriver/MdCard.h b/trunk/hw/mt23108/vapi/mlxsys/os_dep/win/tdriver/MdCard.h
index ce7f2e3c14c299a93406f5945bb1869074662801..f4bda55b02ce8158dfc4b9f66546b6445c8e7c7c 100644 (file)
--- a/trunk/hw/mt23108/vapi/mlxsys/os_dep/win/tdriver/MdCard.h
+++ b/trunk/hw/mt23108/vapi/mlxsys/os_dep/win/tdriver/MdCard.h
@@ -497,7 +497,7 @@ typedef struct MD_DEV_CONTEXT_S {
                /* for TAVOR_SD */\r
                { L"5A5A", "mt%d_pci%d", "mt%d_pci%d",  MD_DEV_ID_TAVOR_SD, MD_DEV_IX_TAVOR_SD, TRUE,   0x00100000, 0x01000000, 0x00000000, 167000000,  4, 0 },\r
                /* for TAVOR_SD */\r
-               { L"6278", "InfiniHost%d", "InfiniHosA%d",      MD_DEV_ID_ARBEL_TM, MD_DEV_IX_ARBEL_TM, TRUE,   0x00100000, 0x01000000, 0x00000000, 167000000,  4, 0 },\r
+               { L"6278", "InfiniHostEx%d", "InfiniHosEx%d",   MD_DEV_ID_ARBEL_TM, MD_DEV_IX_ARBEL_TM, TRUE,   0x00100000, 0x01000000, 0x00000000, 167000000,  4, 0 },\r
        };\r
 \r
 #else\r

diff --git a/trunk/hw/mt23108/vapi/mlxsys/os_dep/win/tdriver/MdConf.c b/trunk/hw/mt23108/vapi/mlxsys/os_dep/win/tdriver/MdConf.c
index d9cf0b6188cd15e4e2ac99988051b09d9c2521f4..12b8db2e32dea434a6650e3c8e4f23e51457a774 100644 (file)
--- a/trunk/hw/mt23108/vapi/mlxsys/os_dep/win/tdriver/MdConf.c
+++ b/trunk/hw/mt23108/vapi/mlxsys/os_dep/win/tdriver/MdConf.c
@@ -586,7 +586,8 @@ PciFixCmdReg(
 \r
        } /* fix HCA command register from SHRIMP */\r
 \r
-       if (pi_pMdDevContext->m_eDevType == MD_DEV_IX_TAVOR     ) \r
+       if (pi_pMdDevContext->m_eDevType == MD_DEV_IX_TAVOR \r
+               || pi_pMdDevContext->m_eDevType ==MD_DEV_IX_ARBEL_TM) \r
        { /* fix command register for TAVOR */\r
 \r
                l_pInterface = &pi_pMdDevContext->m_Interface;\r
@@ -680,7 +681,8 @@ PciHdrWrite(
                        return l_Status;\r
                }       \r
                else\r
-               if (pi_pMdDevContext->m_eDevType == MD_DEV_IX_TAVOR) {\r
+               if (pi_pMdDevContext->m_eDevType == MD_DEV_IX_TAVOR || \r
+                       pi_pMdDevContext->m_eDevType == MD_DEV_IX_ARBEL_TM) {\r
 \r
                        /* protect */\r
                        KSEM_ACQ(&pi_pMdDevContext->m_Sem);\r
@@ -849,7 +851,8 @@ PciHdrSave(
 \r
        }\r
        else\r
-       if (pi_pMdDevContext->m_eDevType == MD_DEV_IX_TAVOR     ) {\r
+       if (pi_pMdDevContext->m_eDevType == MD_DEV_IX_TAVOR ||\r
+               pi_pMdDevContext->m_eDevType == MD_DEV_IX_ARBEL_TM) {\r
        \r
                /* \r
                 * HCA device\r
@@ -936,7 +939,8 @@ PciHdrRestore(
                }\r
        }\r
        else\r
-       if (pi_pMdDevContext->m_eDevType == MD_DEV_IX_TAVOR     ) {\r
+       if (pi_pMdDevContext->m_eDevType == MD_DEV_IX_TAVOR ||\r
+               pi_pMdDevContext->m_eDevType == MD_DEV_IX_ARBEL_TM) {\r
        \r
                /* \r
                 * Bridge device\r
@@ -987,7 +991,8 @@ PciReset(
                        l_Status );\r
        }\r
        else \r
-       if (pi_pMdDevContext->m_eDevType == MD_DEV_IX_TAVOR) { /* we are Tavor device */\r
+       if (pi_pMdDevContext->m_eDevType == MD_DEV_IX_TAVOR ||\r
+               pi_pMdDevContext->m_eDevType == MD_DEV_IX_ARBEL_TM) { /* we are Tavor device */\r
                l_Status = PciDevReset(pi_pMdDevContext, l_ResetOffset, l_ResetValue );\r
        }\r
        else\r

diff --git a/trunk/hw/mt23108/vapi/mlxsys/os_dep/win/tdriver/MdIoctl.c b/trunk/hw/mt23108/vapi/mlxsys/os_dep/win/tdriver/MdIoctl.c
index e3b022e0e3571e168725dac89e05881014897503..ea967bd3ac2d2d8d8eec32ed0fbca9ed842629a4 100644 (file)
--- a/trunk/hw/mt23108/vapi/mlxsys/os_dep/win/tdriver/MdIoctl.c
+++ b/trunk/hw/mt23108/vapi/mlxsys/os_dep/win/tdriver/MdIoctl.c
@@ -140,6 +140,7 @@ Return Value:
                                \r
                case MD_DEV_IX_TAVOR_SD:\r
                case MD_DEV_IX_TAVOR:\r
+               case MD_DEV_IX_ARBEL_TM:\r
                        l_Status = PciIoctl( l_pMdDevContext, l_pPcs, l_nIoControlCode, l_pInBuffer, \r
                                l_nInBufLength, l_pOutBuffer, l_nOutBufLength, (PULONG)&pi_pIrp->IoStatus.Information );\r
                        break;\r

diff --git a/trunk/hw/mt23108/vapi/mlxsys/os_dep/win/tdriver/MdPnp.c b/trunk/hw/mt23108/vapi/mlxsys/os_dep/win/tdriver/MdPnp.c
index 1e04bd198de8f8814688836ef4d8cf750ac93e91..1c73e03696b3f4dccaf5e7a85763704dfc2c8a63 100644 (file)
--- a/trunk/hw/mt23108/vapi/mlxsys/os_dep/win/tdriver/MdPnp.c
+++ b/trunk/hw/mt23108/vapi/mlxsys/os_dep/win/tdriver/MdPnp.c
@@ -932,7 +932,9 @@ Return Value:
         * add device to TAVOR\r
         */ \r
 \r
-       if (l_pMdDevContext->m_eDevType == MD_DEV_IX_TAVOR      && g_pDrvContext->m_fSupportTavor)\r
+       if ((l_pMdDevContext->m_eDevType == MD_DEV_IX_TAVOR     || \r
+               l_pMdDevContext->m_eDevType == MD_DEV_IX_ARBEL_TM)\r
+               && g_pDrvContext->m_fSupportTavor)\r
        { /* add HCA to Tavor functional DLLs */\r
        \r
                unsigned char                           l_RevId = 0;\r
@@ -1128,7 +1130,8 @@ Return Value:
        // stop the card by sending some commands to it or suspend all new requests and wait for the end of in-progress ones\r
        //\r
 \r
-       if (l_pMdDevContext->m_eDevType == MD_DEV_IX_TAVOR      && g_pDrvContext->m_fSupportTavor)\r
+       if ((l_pMdDevContext->m_eDevType == MD_DEV_IX_TAVOR     ||\r
+               l_pMdDevContext->m_eDevType == MD_DEV_IX_ARBEL_TM)&& g_pDrvContext->m_fSupportTavor)\r
        { /* remove HCA from Tavor functional DLLs */\r
        \r
                HH_ret_t                                        l_HhRet;\r

diff --git a/trunk/hw/mt23108/vapi/mlxsys/os_dep/win/tdriver/MdRdWr.c b/trunk/hw/mt23108/vapi/mlxsys/os_dep/win/tdriver/MdRdWr.c
index 8398471a60de0a8f9ed120915409645c85f5aca0..ea85c7b7fda9ac40e5d99db62122fa69958824ba 100644 (file)
--- a/trunk/hw/mt23108/vapi/mlxsys/os_dep/win/tdriver/MdRdWr.c
+++ b/trunk/hw/mt23108/vapi/mlxsys/os_dep/win/tdriver/MdRdWr.c
@@ -103,8 +103,9 @@ Return Value:
                                break;\r
                                \r
                        case MD_DEV_IX_TAVOR:\r
+                       case MD_DEV_IX_ARBEL_TM:\r
                          // MDCTL\r
-            PciRelease( l_pMdDevContext, l_pPcs );\r
+                               PciRelease( l_pMdDevContext, l_pPcs );\r
                                break;\r
                                \r
                        case MD_DEV_IX_TAVOR_BD:\r

diff --git a/trunk/hw/mt23108/vapi/mlxsys/os_dep/win/tdriver/MdUtil.c b/trunk/hw/mt23108/vapi/mlxsys/os_dep/win/tdriver/MdUtil.c
index 927d0b595258f71377b04de03c70611ef0747528..ec7839f3d31f0ecc743b94b923dc5ec36fa0543b 100644 (file)
--- a/trunk/hw/mt23108/vapi/mlxsys/os_dep/win/tdriver/MdUtil.c
+++ b/trunk/hw/mt23108/vapi/mlxsys/os_dep/win/tdriver/MdUtil.c
@@ -447,6 +447,7 @@ Return Value:
                        break;\r
 \r
                case MD_DEV_IX_TAVOR:\r
+               case MD_DEV_IX_ARBEL_TM:\r
                        GetRegistryDword( L"DdrMapOffset",      MD_DFLT_CONF_DATA, &l_pMdDevContext->m_ulDdrMapOffset );\r
                        GetRegistryDword( L"DdrMapSize",        MD_DFLT_CONF_DATA, &l_pMdDevContext->m_ulDdrMapSize );\r
                        GetRegistryDword( L"ResetCard",         MD_DFLT_CONF_DATA, &l_pMdDevContext->m_PerformReset );\r
@@ -1415,8 +1416,9 @@ NTSTATUS CreateOneDevice(
 \r
        /* create Control Device names */\r
        /* !!! from now on work with ARBEL_TM as with TAVOR */\r
-       l_pDevInfo = (pi_DevIx == (int)MD_DEV_IX_ARBEL_TM) ? &g_DevParams[MD_DEV_IX_TAVOR] : &g_DevParams[pi_DevIx];\r
-       if (l_pDevInfo->m_DevId == MD_DEV_ID_TAVOR)\r
+       //l_pDevInfo = (pi_DevIx == (int)MD_DEV_IX_ARBEL_TM) ? &g_DevParams[MD_DEV_IX_TAVOR] : &g_DevParams[pi_DevIx];\r
+       l_pDevInfo =   &g_DevParams[pi_DevIx];\r
+       if (l_pDevInfo->m_DevId == MD_DEV_ID_TAVOR || l_pDevInfo->m_DevId == MD_DEV_ID_ARBEL_TM)\r
                sprintf( l_DevName, l_pDevInfo->m_Format, g_pDrvContext->m_uCardNo );\r
        else\r
                sprintf( l_DevName, l_pDevInfo->m_Format, l_pDevInfo->m_DevId, g_pDrvContext->m_uCardNo );\r