nd: add SRQ support for 32-bit library

The SRQ receive code assumes that ND_SGE can map
to a WV_SGE.  This is only true for 64-bit platforms.
A 32-bit library must convert ND_SGE to WV_SGE.  The
ND_SGE size varies based on the build; WV_SGE is a fixed
size for all platforms.

Signed-off-by: Sean Hefty <sean.hefty@intel.com>

diff --git a/trunk/ulp/netdirect2/user/nd_srq.cpp b/trunk/ulp/netdirect2/user/nd_srq.cpp
index 749961769ce5b6594f2b53fc2379d3ca6d443688..0703aa9de162bdf630ff2295e14848ad3684fea1 100644 (file)
--- a/trunk/ulp/netdirect2/user/nd_srq.cpp
+++ b/trunk/ulp/netdirect2/user/nd_srq.cpp
@@ -123,6 +123,16 @@ Notify(OVERLAPPED* pOverlapped)
        return NDConvertWVStatus(hr);\r
 }\r
 \r
+#ifdef _WIN64\r
+\r
+C_ASSERT(sizeof(WV_SGE) == sizeof(ND_SGE));\r
+C_ASSERT(FIELD_OFFSET(WV_SGE, pAddress)   == FIELD_OFFSET(ND_SGE, Buffer));\r
+C_ASSERT(RTL_FIELD_SIZE(WV_SGE, pAddress) == RTL_FIELD_SIZE(ND_SGE, Buffer));\r
+C_ASSERT(FIELD_OFFSET(WV_SGE, Length)     == FIELD_OFFSET(ND_SGE, BufferLength));\r
+C_ASSERT(RTL_FIELD_SIZE(WV_SGE, Length)   == RTL_FIELD_SIZE(ND_SGE, BufferLength));\r
+C_ASSERT(FIELD_OFFSET(WV_SGE, Lkey)       == FIELD_OFFSET(ND_SGE, MemoryRegionToken));\r
+C_ASSERT(RTL_FIELD_SIZE(WV_SGE, Lkey)     == RTL_FIELD_SIZE(ND_SGE, MemoryRegionToken));\r
+\r
 STDMETHODIMP CNDSharedReceiveQueue::\r
 Receive(VOID* requestContext, const ND_SGE* pSge, DWORD nSge)\r
 {\r
@@ -131,3 +141,37 @@ Receive(VOID* requestContext, const ND_SGE* pSge, DWORD nSge)
        hr = m_pWvSrq->PostReceive((UINT64) (ULONG_PTR) requestContext, (WV_SGE *) pSge, nSge);\r
        return NDConvertWVStatus(hr);\r
 }\r
+\r
+#else\r
+\r
+STDMETHODIMP CNDSharedReceiveQueue::\r
+Receive(VOID* requestContext, const ND_SGE* pSge, DWORD nSge)\r
+{\r
+       WV_SGE sge_array[4];\r
+       WV_SGE *sge;\r
+       DWORD i;\r
+       HRESULT hr;\r
+\r
+       if (nSge > _countof(sge_array)) {\r
+               sge = new WV_SGE[nSge];\r
+               if (pShadowSge == NULL) {\r
+                       return ND_NO_MEMORY;\r
+               }\r
+       } else {\r
+               sge = sge_array;\r
+       }\r
+\r
+       for (i = 0; i < nSge; i++) {\r
+               sge->pAddress = pSge[i].Buffer;\r
+               sge->Length = pSge[i].BufferLength;\r
+               sge->Lkey = pSge[i].MemoryRegionToken;\r
+       }\r
+\r
+       hr = m_pWvSrq->PostReceive((UINT64) (ULONG_PTR) requestContext, sge, nSge);\r
+       if (nSge > _countof(sge_array)) {\r
+               delete[] sge;\r
+       }\r
+       return NDConvertWVStatus(hr);\r
+}\r
+\r
+#endif
\ No newline at end of file