Merge branch 'fix/asoc' into for-linus

4 files changed, 177 insertions, 10 deletions

diff --git a/include/rdma/ib_addr.h b/include/rdma/ib_addr.h
index fa0d52b8e622..b5fc9f39122b 100644
--- a/include/rdma/ib_addr.h
+++ b/include/rdma/ib_addr.h
@@ -39,7 +39,9 @@
 #include <linux/if_arp.h>
 #include <linux/netdevice.h>
 #include <linux/socket.h>
+#include <linux/if_vlan.h>
 #include <rdma/ib_verbs.h>
+#include <rdma/ib_pack.h>
 
 struct rdma_addr_client {
         atomic_t refcount;
@@ -63,6 +65,7 @@ struct rdma_dev_addr {
         unsigned char broadcast[MAX_ADDR_LEN];
         unsigned short dev_type;
         int bound_dev_if;
+        enum rdma_transport_type transport;
 };
 
 /**
@@ -127,9 +130,51 @@ static inline int rdma_addr_gid_offset(struct rdma_dev_addr *dev_addr)
         return dev_addr->dev_type == ARPHRD_INFINIBAND ? 4 : 0;
 }
 
+static inline void iboe_mac_vlan_to_ll(union ib_gid *gid, u8 *mac, u16 vid)
+{
+        memset(gid->raw, 0, 16);
+        *((__be32 *) gid->raw) = cpu_to_be32(0xfe800000);
+        if (vid < 0x1000) {
+                gid->raw[12] = vid & 0xff;
+                gid->raw[11] = vid >> 8;
+        } else {
+                gid->raw[12] = 0xfe;
+                gid->raw[11] = 0xff;
+        }
+        memcpy(gid->raw + 13, mac + 3, 3);
+        memcpy(gid->raw + 8, mac, 3);
+        gid->raw[8] ^= 2;
+}
+
+static inline u16 rdma_vlan_dev_vlan_id(const struct net_device *dev)
+{
+        return dev->priv_flags & IFF_802_1Q_VLAN ?
+                vlan_dev_vlan_id(dev) : 0xffff;
+}
+
+static inline void iboe_addr_get_sgid(struct rdma_dev_addr *dev_addr,
+                                      union ib_gid *gid)
+{
+        struct net_device *dev;
+        u16 vid = 0xffff;
+
+        dev = dev_get_by_index(&init_net, dev_addr->bound_dev_if);
+        if (dev) {
+                vid = rdma_vlan_dev_vlan_id(dev);
+                dev_put(dev);
+        }
+
+        iboe_mac_vlan_to_ll(gid, dev_addr->src_dev_addr, vid);
+}
+
 static inline void rdma_addr_get_sgid(struct rdma_dev_addr *dev_addr, union ib_gid *gid)
 {
-        memcpy(gid, dev_addr->src_dev_addr + rdma_addr_gid_offset(dev_addr), sizeof *gid);
+        if (dev_addr->transport == RDMA_TRANSPORT_IB &&
+            dev_addr->dev_type != ARPHRD_INFINIBAND)
+                iboe_addr_get_sgid(dev_addr, gid);
+        else
+                memcpy(gid, dev_addr->src_dev_addr +
+                       rdma_addr_gid_offset(dev_addr), sizeof *gid);
 }
 
 static inline void rdma_addr_set_sgid(struct rdma_dev_addr *dev_addr, union ib_gid *gid)
@@ -147,4 +192,91 @@ static inline void rdma_addr_set_dgid(struct rdma_dev_addr *dev_addr, union ib_g
         memcpy(dev_addr->dst_dev_addr + rdma_addr_gid_offset(dev_addr), gid, sizeof *gid);
 }
 
+static inline enum ib_mtu iboe_get_mtu(int mtu)
+{
+        /*
+         * reduce IB headers from effective IBoE MTU. 28 stands for
+         * atomic header which is the biggest possible header after BTH
+         */
+        mtu = mtu - IB_GRH_BYTES - IB_BTH_BYTES - 28;
+
+        if (mtu >= ib_mtu_enum_to_int(IB_MTU_4096))
+                return IB_MTU_4096;
+        else if (mtu >= ib_mtu_enum_to_int(IB_MTU_2048))
+                return IB_MTU_2048;
+        else if (mtu >= ib_mtu_enum_to_int(IB_MTU_1024))
+                return IB_MTU_1024;
+        else if (mtu >= ib_mtu_enum_to_int(IB_MTU_512))
+                return IB_MTU_512;
+        else if (mtu >= ib_mtu_enum_to_int(IB_MTU_256))
+                return IB_MTU_256;
+        else
+                return 0;
+}
+
+static inline int iboe_get_rate(struct net_device *dev)
+{
+        struct ethtool_cmd cmd;
+
+        if (!dev->ethtool_ops || !dev->ethtool_ops->get_settings ||
+            dev->ethtool_ops->get_settings(dev, &cmd))
+                return IB_RATE_PORT_CURRENT;
+
+        if (cmd.speed >= 40000)
+                return IB_RATE_40_GBPS;
+        else if (cmd.speed >= 30000)
+                return IB_RATE_30_GBPS;
+        else if (cmd.speed >= 20000)
+                return IB_RATE_20_GBPS;
+        else if (cmd.speed >= 10000)
+                return IB_RATE_10_GBPS;
+        else
+                return IB_RATE_PORT_CURRENT;
+}
+
+static inline int rdma_link_local_addr(struct in6_addr *addr)
+{
+        if (addr->s6_addr32[0] == htonl(0xfe800000) &&
+            addr->s6_addr32[1] == 0)
+                return 1;
+
+        return 0;
+}
+
+static inline void rdma_get_ll_mac(struct in6_addr *addr, u8 *mac)
+{
+        memcpy(mac, &addr->s6_addr[8], 3);
+        memcpy(mac + 3, &addr->s6_addr[13], 3);
+        mac[0] ^= 2;
+}
+
+static inline int rdma_is_multicast_addr(struct in6_addr *addr)
+{
+        return addr->s6_addr[0] == 0xff;
+}
+
+static inline void rdma_get_mcast_mac(struct in6_addr *addr, u8 *mac)
+{
+        int i;
+
+        mac[0] = 0x33;
+        mac[1] = 0x33;
+        for (i = 2; i < 6; ++i)
+                mac[i] = addr->s6_addr[i + 10];
+}
+
+static inline u16 rdma_get_vlan_id(union ib_gid *dgid)
+{
+        u16 vid;
+
+        vid = dgid->raw[11] << 8 | dgid->raw[12];
+        return vid < 0x1000 ? vid : 0xffff;
+}
+
+static inline struct net_device *rdma_vlan_dev_real_dev(const struct net_device *dev)
+{
+        return dev->priv_flags & IFF_802_1Q_VLAN ?
+                vlan_dev_real_dev(dev) : 0;
+}
+
 #endif /* IB_ADDR_H */
diff --git a/include/rdma/ib_pack.h b/include/rdma/ib_pack.h
index cbb50f4da3dd..b37fe3b10a9d 100644
--- a/include/rdma/ib_pack.h
+++ b/include/rdma/ib_pack.h
@@ -37,6 +37,8 @@
 
 enum {
         IB_LRH_BYTES  = 8,
+        IB_ETH_BYTES  = 14,
+        IB_VLAN_BYTES = 4,
         IB_GRH_BYTES  = 40,
         IB_BTH_BYTES  = 12,
         IB_DETH_BYTES = 8
@@ -210,14 +212,32 @@ struct ib_unpacked_deth {
         __be32       source_qpn;
 };
 
+struct ib_unpacked_eth {
+        u8      dmac_h[4];
+        u8      dmac_l[2];
+        u8      smac_h[2];
+        u8      smac_l[4];
+        __be16  type;
+};
+
+struct ib_unpacked_vlan {
+        __be16  tag;
+        __be16  type;
+};
+
 struct ib_ud_header {
+        int                     lrh_present;
         struct ib_unpacked_lrh  lrh;
-        int                     grh_present;
-        struct ib_unpacked_grh  grh;
-        struct ib_unpacked_bth  bth;
+        int                     eth_present;
+        struct ib_unpacked_eth  eth;
+        int                     vlan_present;
+        struct ib_unpacked_vlan vlan;
+        int                     grh_present;
+        struct ib_unpacked_grh  grh;
+        struct ib_unpacked_bth  bth;
         struct ib_unpacked_deth deth;
-        int                     immediate_present;
-        __be32                  immediate_data;
+        int                     immediate_present;
+        __be32                  immediate_data;
 };
 
 void ib_pack(const struct ib_field        *desc,
@@ -230,9 +250,12 @@ void ib_unpack(const struct ib_field        *desc,
                void                         *buf,
                void                         *structure);
 
-void ib_ud_header_init(int                 payload_bytes,
-                       int                 grh_present,
-                       int                 immediate_present,
+void ib_ud_header_init(int                  payload_bytes,
+                       int                  lrh_present,
+                       int                  eth_present,
+                       int                  vlan_present,
+                       int                  grh_present,
+                       int                  immediate_present,
                        struct ib_ud_header *header);
 
 int ib_ud_header_pack(struct ib_ud_header *header,
diff --git a/include/rdma/ib_user_verbs.h b/include/rdma/ib_user_verbs.h
index a17f77106149..fe5b05177a2c 100644
--- a/include/rdma/ib_user_verbs.h
+++ b/include/rdma/ib_user_verbs.h
@@ -205,7 +205,8 @@ struct ib_uverbs_query_port_resp {
         __u8  active_width;
         __u8  active_speed;
         __u8  phys_state;
-        __u8  reserved[3];
+        __u8  link_layer;
+        __u8  reserved[2];
 };
 
 struct ib_uverbs_alloc_pd {
diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index 857b3b9cf120..e04c4888d1fd 100644
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -75,6 +75,12 @@ enum rdma_transport_type {
 enum rdma_transport_type
 rdma_node_get_transport(enum rdma_node_type node_type) __attribute_const__;
 
+enum rdma_link_layer {
+        IB_LINK_LAYER_UNSPECIFIED,
+        IB_LINK_LAYER_INFINIBAND,
+        IB_LINK_LAYER_ETHERNET,
+};
+
 enum ib_device_cap_flags {
         IB_DEVICE_RESIZE_MAX_WR         = 1,
         IB_DEVICE_BAD_PKEY_CNTR         = (1<<1),
@@ -1010,6 +1016,8 @@ struct ib_device {
         int                        (*query_port)(struct ib_device *device,
                                                  u8 port_num,
                                                  struct ib_port_attr *port_attr);
+        enum rdma_link_layer       (*get_link_layer)(struct ib_device *device,
+                                                     u8 port_num);
         int                        (*query_gid)(struct ib_device *device,
                                                 u8 port_num, int index,
                                                 union ib_gid *gid);
@@ -1222,6 +1230,9 @@ int ib_query_device(struct ib_device *device,
 int ib_query_port(struct ib_device *device,
                   u8 port_num, struct ib_port_attr *port_attr);
 
+enum rdma_link_layer rdma_port_get_link_layer(struct ib_device *device,
+                                               u8 port_num);
+
 int ib_query_gid(struct ib_device *device,
                  u8 port_num, int index, union ib_gid *gid);