[IPoIB] Track adapters instances in a list.

git-svn-id: svn://openib.tc.cornell.edu/gen1@70 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/trunk/ulp/ipoib/kernel/ipoib_adapter.c b/trunk/ulp/ipoib/kernel/ipoib_adapter.c
index 56e048febe7406a9127f612a9498e771f8806b53..f999084a422cd7a458849871db3456c3fe7f23d2 100644 (file)
--- a/trunk/ulp/ipoib/kernel/ipoib_adapter.c
+++ b/trunk/ulp/ipoib/kernel/ipoib_adapter.c
@@ -123,10 +123,11 @@ ipoib_create_adapter(
        IN                              void* const                                     h_adapter,\r
                OUT                     ipoib_adapter_t** const         pp_adapter )\r
 {\r
-       ipoib_adapter_t *p_adapter;\r
-       ib_api_status_t status;\r
-       cl_status_t             cl_status;\r
-       uint8_t                 port_num;\r
+       ipoib_adapter_t         *p_adapter;\r
+       ib_api_status_t         status;\r
+       cl_status_t                     cl_status;\r
+       uint8_t                         port_num;\r
+       KLOCK_QUEUE_HANDLE      hdl;\r
 \r
        IPOIB_ENTER( IPOIB_DBG_INIT );\r
 \r
@@ -197,6 +198,10 @@ ipoib_create_adapter(
                return IB_ERROR;\r
        }\r
 \r
+       KeAcquireInStackQueuedSpinLock( &g_ipoib.lock, &hdl );\r
+       InsertHeadList( &g_ipoib.adapter_list, &p_adapter->entry );\r
+       KeReleaseInStackQueuedSpinLock( &hdl );\r
+\r
        status = adapter_init( p_adapter );\r
        if( status != IB_SUCCESS )\r
        {\r
@@ -414,7 +419,8 @@ static void
 __adapter_destroying(\r
        IN                              cl_obj_t* const                         p_obj )\r
 {\r
-       ipoib_adapter_t *p_adapter;\r
+       ipoib_adapter_t         *p_adapter;\r
+       KLOCK_QUEUE_HANDLE      hdl;\r
 \r
        IPOIB_ENTER( IPOIB_DBG_INIT );\r
 \r
@@ -431,6 +437,11 @@ __adapter_destroying(
                p_adapter->h_pnp = NULL;\r
        }\r
 \r
+       KeAcquireInStackQueuedSpinLock( &g_ipoib.lock, &hdl );\r
+       ASSERT( !IsListEmpty( &g_ipoib.adapter_list ) );\r
+       RemoveEntryList( &p_adapter->entry );\r
+       KeReleaseInStackQueuedSpinLock( &hdl );\r
+\r
        IPOIB_EXIT( IPOIB_DBG_INIT );\r
 }\r
 \r

diff --git a/trunk/ulp/ipoib/kernel/ipoib_adapter.h b/trunk/ulp/ipoib/kernel/ipoib_adapter.h
index fd78643430377bc4a4a3c209fb2bd5e529f04fb4..ba67e24054c8495b274a2131604ff9e709763754 100644 (file)
--- a/trunk/ulp/ipoib/kernel/ipoib_adapter.h
+++ b/trunk/ulp/ipoib/kernel/ipoib_adapter.h
@@ -130,6 +130,8 @@ typedef struct _ipoib_adapter
        NDIS_HANDLE                             h_adapter;\r
        ipoib_ifc_data_t                guids;\r
 \r
+       LIST_ENTRY                              entry;\r
+\r
        ib_al_handle_t                  h_al;\r
        ib_pnp_handle_t                 h_pnp;\r
 \r

diff --git a/trunk/ulp/ipoib/kernel/ipoib_driver.c b/trunk/ulp/ipoib/kernel/ipoib_driver.c
index af855db662389abf1a0a34350f0e80e15adc5e20..f81da084d8d0fb8d655e7e787f806ff3e01dc8ec 100644 (file)
--- a/trunk/ulp/ipoib/kernel/ipoib_driver.c
+++ b/trunk/ulp/ipoib/kernel/ipoib_driver.c
@@ -119,8 +119,8 @@ static const unsigned char VENDOR_ID[] = {0x00, 0x06, 0x6A, 0x00};
 \r
 \r
 /* Global driver debug level */\r
-uint32_t       g_ipoib_dbg_lvl = IPOIB_DBG_ERROR;\r
-atomic32_t     g_laa_idx = 0;\r
+uint32_t               g_ipoib_dbg_lvl = IPOIB_DBG_ERROR;\r
+ipoib_globals_t        g_ipoib = {0};\r
 \r
 \r
 NTSTATUS\r
@@ -249,6 +249,9 @@ DriverEntry(
        status          = NDIS_STATUS_SUCCESS;\r
        ndis_handle     = NULL;\r
 \r
+       KeInitializeSpinLock( &g_ipoib.lock );\r
+       InitializeListHead( &g_ipoib.adapter_list );\r
+\r
        NdisMInitializeWrapper( &ndis_handle, p_drv_obj, p_registry_path, NULL );\r
 \r
        memset(&characteristics, 0, sizeof(characteristics));\r

diff --git a/trunk/ulp/ipoib/kernel/ipoib_driver.h b/trunk/ulp/ipoib/kernel/ipoib_driver.h
index 34b7a14662c31ed5bfa3fcd6a6c110f387958740..94bea711db104ff803024365a4b211b51885c408 100644 (file)
--- a/trunk/ulp/ipoib/kernel/ipoib_driver.h
+++ b/trunk/ulp/ipoib/kernel/ipoib_driver.h
@@ -63,19 +63,30 @@
 \r
 typedef struct _ipoib_globals\r
 {\r
-       cl_spinlock_t   lock;\r
+       KSPIN_LOCK              lock;\r
+       LIST_ENTRY              adapter_list;\r
        cl_qlist_t              bundle_list;\r
 \r
+       atomic32_t              laa_idx;\r
+\r
 }      ipoib_globals_t;\r
 /*\r
 * FIELDS\r
 *      lock\r
 *              Spinlock to protect list access.\r
 *\r
+*      adapter_list\r
+*              List of all adapter instances.  Used for address translation support.\r
+*\r
 *      bundle_list\r
 *              List of all adapter bundles.\r
+*\r
+*      laa_idx\r
+*              Global counter for generating LAA MACs\r
 *********/\r
 \r
+extern ipoib_globals_t g_ipoib;\r
+\r
 \r
 typedef struct _ipoib_bundle\r
 {\r

diff --git a/trunk/ulp/ipoib/kernel/ipoib_xfr_mgr.h b/trunk/ulp/ipoib/kernel/ipoib_xfr_mgr.h
index b7e0fd87a82ac743694a3005788f1839c49b8f70..2b5a3b88a5b514f9cf527173e0175b8f547dfc90 100644 (file)
--- a/trunk/ulp/ipoib/kernel/ipoib_xfr_mgr.h
+++ b/trunk/ulp/ipoib/kernel/ipoib_xfr_mgr.h
@@ -88,9 +88,6 @@ extern "C"
 {\r
 #endif\r
 \r
-/* Global counter for generating LAA MACs */\r
-extern atomic32_t              g_laa_idx;\r
-\r
 \r
 /*\r
  * Address accessors\r
@@ -221,7 +218,7 @@ ipoib_mac_from_guid(
        }\r
 \r
        /* Value of zero is reserved. */\r
-       laa = cl_atomic_inc( &g_laa_idx );\r
+       laa = cl_atomic_inc( &g_ipoib.laa_idx );\r
 \r
        if( !laa )\r
                return IB_INVALID_GUID;\r