[IPoIB] Add support for generating unique MACs from Voltaire port GUIDS.

Submitted by Guy Corem (guyc@voltaire.com)

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

diff --git a/trunk/ulp/ipoib/kernel/ipoib_xfr_mgr.h b/trunk/ulp/ipoib/kernel/ipoib_xfr_mgr.h
index b29fa413eaf0973dfb909b917523e524272f0207..2796194b47da3e2af9890c421be72c268c4777ee 100644 (file)
--- a/trunk/ulp/ipoib/kernel/ipoib_xfr_mgr.h
+++ b/trunk/ulp/ipoib/kernel/ipoib_xfr_mgr.h
@@ -244,9 +244,51 @@ ipoib_mac_from_mlx_guid(
 *      IB_INVALID_GUID\r
 *              The port GUID provided was not a known GUID format.\r
 *\r
-* NOTES\r
-*      The algorithm to convert portGuid to MAC address is as per DN0074, and\r
-*      assumes a 2 port HCA.\r
+* SEE ALSO\r
+*      IPOIB\r
+*********/\r
+\r
+\r
+/****f* IPOIB/ipoib_mac_from_voltaire_guid\r
+* NAME\r
+*      ipoib_mac_from_voltaire_guid\r
+*\r
+* DESCRIPTION\r
+*      Generates an ethernet MAC address given a Voltaire port GUID.\r
+*\r
+* SYNOPSIS\r
+*/\r
+static inline ib_api_status_t\r
+ipoib_mac_from_voltaire_guid(\r
+       IN              const   net64_t                                         port_guid,\r
+               OUT                     mac_addr_t* const                       p_mac_addr )\r
+{\r
+       const uint8_t   *p_guid = (const uint8_t*)&port_guid;\r
+\r
+       /* Port guid is in network byte order.  OUI is in lower 3 bytes. */\r
+       ASSERT( p_guid[0] == 0x00 && p_guid[1] == 0x08 && p_guid[2] == 0xf1 );\r
+\r
+       p_mac_addr->addr[0] = p_guid[0];\r
+       p_mac_addr->addr[1] = p_guid[1];\r
+       p_mac_addr->addr[2] = p_guid[2];\r
+       p_mac_addr->addr[3] = p_guid[4] ^ p_guid[6];\r
+       p_mac_addr->addr[4] = p_guid[5] ^ p_guid[7];\r
+       p_mac_addr->addr[5] = p_guid[5] + p_guid[6] + p_guid[7];\r
+\r
+       return IB_SUCCESS;\r
+}\r
+/*\r
+* PARAMETERS\r
+*      port_guid\r
+*              The port GUID, in network byte order, for which to generate a\r
+*              MAC address.\r
+*\r
+*      p_mac_addr\r
+*              Pointer to a mac address in which to store the results.\r
+*\r
+* RETURN VALUES\r
+*      IB_SUCCESS\r
+*              The MAC address was successfully converted.\r
 *\r
 * SEE ALSO\r
 *      IPOIB\r
@@ -278,12 +320,18 @@ ipoib_mac_from_guid(
                if( status == IB_SUCCESS )\r
                        return IB_SUCCESS;\r
        }\r
-       if( p_guid[0] == 0x00 && p_guid[1] == 0x02 && p_guid[2] == 0xc9 )\r
+       else if( p_guid[0] == 0x00 && p_guid[1] == 0x02 && p_guid[2] == 0xc9 )\r
        {\r
                status = ipoib_mac_from_mlx_guid( port_guid, p_mac_addr );\r
                if( status == IB_SUCCESS )\r
                        return IB_SUCCESS;\r
        }\r
+       else if( p_guid[0] == 0x00 && p_guid[1] == 0x08 && p_guid[2] == 0xf1 )\r
+       {\r
+               status = ipoib_mac_from_voltaire_guid( port_guid, p_mac_addr );\r
+               if( status == IB_SUCCESS )\r
+                       return IB_SUCCESS;\r
+       }\r
        \r
        /* Value of zero is reserved. */\r
        laa = cl_atomic_inc( &g_ipoib.laa_idx );\r