Commit 4139032b authored by Hal Rosenstock's avatar Hal Rosenstock Committed by Doug Ledford

IB: Add rdma_cap_ib_switch helper and use where appropriate

Persuant to Liran's comments on node_type on linux-rdma
mailing list:

In an effort to reform the RDMA core and ULPs to minimize use of
node_type in struct ib_device, an additional bit is added to
struct ib_device for is_switch (IB switch). This is needed
to be initialized by any IB switch device driver. This is a
NEW requirement on such device drivers which are all
"out of tree".

In addition, an ib_switch helper was added to ib_verbs.h
based on the is_switch device bit rather than node_type
(although those should be consistent).

The RDMA core (MAD, SMI, agent, sa_query, multicast, sysfs)
as well as (IPoIB and SRP) ULPs are updated where
appropriate to use this new helper. In some cases,
the helper is now used under the covers of using
rdma_[start end]_port rather than the open coding
previously used.
Reviewed-by: default avatarSean Hefty <sean.hefty@intel.com>
Reviewed-By: default avatarJason Gunthorpe <jgunthorpe@obsidianresearch.com>
Reviewed-by: default avatarIra Weiny <ira.weiny@intel.com>
Tested-by: default avatarIra Weiny <ira.weiny@intel.com>
Signed-off-by: default avatarHal Rosenstock <hal@mellanox.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent bc0195aa
...@@ -88,7 +88,7 @@ void agent_send_response(const struct ib_mad_hdr *mad_hdr, const struct ib_grh * ...@@ -88,7 +88,7 @@ void agent_send_response(const struct ib_mad_hdr *mad_hdr, const struct ib_grh *
struct ib_ah *ah; struct ib_ah *ah;
struct ib_mad_send_wr_private *mad_send_wr; struct ib_mad_send_wr_private *mad_send_wr;
if (device->node_type == RDMA_NODE_IB_SWITCH) if (rdma_cap_ib_switch(device))
port_priv = ib_get_agent_port(device, 0); port_priv = ib_get_agent_port(device, 0);
else else
port_priv = ib_get_agent_port(device, port_num); port_priv = ib_get_agent_port(device, port_num);
...@@ -122,7 +122,7 @@ void agent_send_response(const struct ib_mad_hdr *mad_hdr, const struct ib_grh * ...@@ -122,7 +122,7 @@ void agent_send_response(const struct ib_mad_hdr *mad_hdr, const struct ib_grh *
memcpy(send_buf->mad, mad_hdr, resp_mad_len); memcpy(send_buf->mad, mad_hdr, resp_mad_len);
send_buf->ah = ah; send_buf->ah = ah;
if (device->node_type == RDMA_NODE_IB_SWITCH) { if (rdma_cap_ib_switch(device)) {
mad_send_wr = container_of(send_buf, mad_send_wr = container_of(send_buf,
struct ib_mad_send_wr_private, struct ib_mad_send_wr_private,
send_buf); send_buf);
......
...@@ -769,7 +769,7 @@ static int handle_outgoing_dr_smp(struct ib_mad_agent_private *mad_agent_priv, ...@@ -769,7 +769,7 @@ static int handle_outgoing_dr_smp(struct ib_mad_agent_private *mad_agent_priv,
bool opa = rdma_cap_opa_mad(mad_agent_priv->qp_info->port_priv->device, bool opa = rdma_cap_opa_mad(mad_agent_priv->qp_info->port_priv->device,
mad_agent_priv->qp_info->port_priv->port_num); mad_agent_priv->qp_info->port_priv->port_num);
if (device->node_type == RDMA_NODE_IB_SWITCH && if (rdma_cap_ib_switch(device) &&
smp->mgmt_class == IB_MGMT_CLASS_SUBN_DIRECTED_ROUTE) smp->mgmt_class == IB_MGMT_CLASS_SUBN_DIRECTED_ROUTE)
port_num = send_wr->wr.ud.port_num; port_num = send_wr->wr.ud.port_num;
else else
...@@ -787,7 +787,8 @@ static int handle_outgoing_dr_smp(struct ib_mad_agent_private *mad_agent_priv, ...@@ -787,7 +787,8 @@ static int handle_outgoing_dr_smp(struct ib_mad_agent_private *mad_agent_priv,
if ((opa_get_smp_direction(opa_smp) if ((opa_get_smp_direction(opa_smp)
? opa_smp->route.dr.dr_dlid : opa_smp->route.dr.dr_slid) == ? opa_smp->route.dr.dr_dlid : opa_smp->route.dr.dr_slid) ==
OPA_LID_PERMISSIVE && OPA_LID_PERMISSIVE &&
opa_smi_handle_dr_smp_send(opa_smp, device->node_type, opa_smi_handle_dr_smp_send(opa_smp,
rdma_cap_ib_switch(device),
port_num) == IB_SMI_DISCARD) { port_num) == IB_SMI_DISCARD) {
ret = -EINVAL; ret = -EINVAL;
dev_err(&device->dev, "OPA Invalid directed route\n"); dev_err(&device->dev, "OPA Invalid directed route\n");
...@@ -810,7 +811,7 @@ static int handle_outgoing_dr_smp(struct ib_mad_agent_private *mad_agent_priv, ...@@ -810,7 +811,7 @@ static int handle_outgoing_dr_smp(struct ib_mad_agent_private *mad_agent_priv,
} else { } else {
if ((ib_get_smp_direction(smp) ? smp->dr_dlid : smp->dr_slid) == if ((ib_get_smp_direction(smp) ? smp->dr_dlid : smp->dr_slid) ==
IB_LID_PERMISSIVE && IB_LID_PERMISSIVE &&
smi_handle_dr_smp_send(smp, device->node_type, port_num) == smi_handle_dr_smp_send(smp, rdma_cap_ib_switch(device), port_num) ==
IB_SMI_DISCARD) { IB_SMI_DISCARD) {
ret = -EINVAL; ret = -EINVAL;
dev_err(&device->dev, "Invalid directed route\n"); dev_err(&device->dev, "Invalid directed route\n");
...@@ -2030,7 +2031,7 @@ static enum smi_action handle_ib_smi(const struct ib_mad_port_private *port_priv ...@@ -2030,7 +2031,7 @@ static enum smi_action handle_ib_smi(const struct ib_mad_port_private *port_priv
struct ib_smp *smp = (struct ib_smp *)recv->mad; struct ib_smp *smp = (struct ib_smp *)recv->mad;
if (smi_handle_dr_smp_recv(smp, if (smi_handle_dr_smp_recv(smp,
port_priv->device->node_type, rdma_cap_ib_switch(port_priv->device),
port_num, port_num,
port_priv->device->phys_port_cnt) == port_priv->device->phys_port_cnt) ==
IB_SMI_DISCARD) IB_SMI_DISCARD)
...@@ -2042,13 +2043,13 @@ static enum smi_action handle_ib_smi(const struct ib_mad_port_private *port_priv ...@@ -2042,13 +2043,13 @@ static enum smi_action handle_ib_smi(const struct ib_mad_port_private *port_priv
if (retsmi == IB_SMI_SEND) { /* don't forward */ if (retsmi == IB_SMI_SEND) { /* don't forward */
if (smi_handle_dr_smp_send(smp, if (smi_handle_dr_smp_send(smp,
port_priv->device->node_type, rdma_cap_ib_switch(port_priv->device),
port_num) == IB_SMI_DISCARD) port_num) == IB_SMI_DISCARD)
return IB_SMI_DISCARD; return IB_SMI_DISCARD;
if (smi_check_local_smp(smp, port_priv->device) == IB_SMI_DISCARD) if (smi_check_local_smp(smp, port_priv->device) == IB_SMI_DISCARD)
return IB_SMI_DISCARD; return IB_SMI_DISCARD;
} else if (port_priv->device->node_type == RDMA_NODE_IB_SWITCH) { } else if (rdma_cap_ib_switch(port_priv->device)) {
/* forward case for switches */ /* forward case for switches */
memcpy(response, recv, mad_priv_size(response)); memcpy(response, recv, mad_priv_size(response));
response->header.recv_wc.wc = &response->header.wc; response->header.recv_wc.wc = &response->header.wc;
...@@ -2115,7 +2116,7 @@ handle_opa_smi(struct ib_mad_port_private *port_priv, ...@@ -2115,7 +2116,7 @@ handle_opa_smi(struct ib_mad_port_private *port_priv,
struct opa_smp *smp = (struct opa_smp *)recv->mad; struct opa_smp *smp = (struct opa_smp *)recv->mad;
if (opa_smi_handle_dr_smp_recv(smp, if (opa_smi_handle_dr_smp_recv(smp,
port_priv->device->node_type, rdma_cap_ib_switch(port_priv->device),
port_num, port_num,
port_priv->device->phys_port_cnt) == port_priv->device->phys_port_cnt) ==
IB_SMI_DISCARD) IB_SMI_DISCARD)
...@@ -2127,7 +2128,7 @@ handle_opa_smi(struct ib_mad_port_private *port_priv, ...@@ -2127,7 +2128,7 @@ handle_opa_smi(struct ib_mad_port_private *port_priv,
if (retsmi == IB_SMI_SEND) { /* don't forward */ if (retsmi == IB_SMI_SEND) { /* don't forward */
if (opa_smi_handle_dr_smp_send(smp, if (opa_smi_handle_dr_smp_send(smp,
port_priv->device->node_type, rdma_cap_ib_switch(port_priv->device),
port_num) == IB_SMI_DISCARD) port_num) == IB_SMI_DISCARD)
return IB_SMI_DISCARD; return IB_SMI_DISCARD;
...@@ -2135,7 +2136,7 @@ handle_opa_smi(struct ib_mad_port_private *port_priv, ...@@ -2135,7 +2136,7 @@ handle_opa_smi(struct ib_mad_port_private *port_priv,
IB_SMI_DISCARD) IB_SMI_DISCARD)
return IB_SMI_DISCARD; return IB_SMI_DISCARD;
} else if (port_priv->device->node_type == RDMA_NODE_IB_SWITCH) { } else if (rdma_cap_ib_switch(port_priv->device)) {
/* forward case for switches */ /* forward case for switches */
memcpy(response, recv, mad_priv_size(response)); memcpy(response, recv, mad_priv_size(response));
response->header.recv_wc.wc = &response->header.wc; response->header.recv_wc.wc = &response->header.wc;
...@@ -2235,7 +2236,7 @@ static void ib_mad_recv_done_handler(struct ib_mad_port_private *port_priv, ...@@ -2235,7 +2236,7 @@ static void ib_mad_recv_done_handler(struct ib_mad_port_private *port_priv,
goto out; goto out;
} }
if (port_priv->device->node_type == RDMA_NODE_IB_SWITCH) if (rdma_cap_ib_switch(port_priv->device))
port_num = wc->port_num; port_num = wc->port_num;
else else
port_num = port_priv->port_num; port_num = port_priv->port_num;
...@@ -3297,17 +3298,11 @@ static int ib_mad_port_close(struct ib_device *device, int port_num) ...@@ -3297,17 +3298,11 @@ static int ib_mad_port_close(struct ib_device *device, int port_num)
static void ib_mad_init_device(struct ib_device *device) static void ib_mad_init_device(struct ib_device *device)
{ {
int start, end, i; int start, i;
if (device->node_type == RDMA_NODE_IB_SWITCH) { start = rdma_start_port(device);
start = 0;
end = 0;
} else {
start = 1;
end = device->phys_port_cnt;
}
for (i = start; i <= end; i++) { for (i = start; i <= rdma_end_port(device); i++) {
if (!rdma_cap_ib_mad(device, i)) if (!rdma_cap_ib_mad(device, i))
continue; continue;
...@@ -3342,17 +3337,9 @@ static void ib_mad_init_device(struct ib_device *device) ...@@ -3342,17 +3337,9 @@ static void ib_mad_init_device(struct ib_device *device)
static void ib_mad_remove_device(struct ib_device *device) static void ib_mad_remove_device(struct ib_device *device)
{ {
int start, end, i; int i;
if (device->node_type == RDMA_NODE_IB_SWITCH) {
start = 0;
end = 0;
} else {
start = 1;
end = device->phys_port_cnt;
}
for (i = start; i <= end; i++) { for (i = rdma_start_port(device); i <= rdma_end_port(device); i++) {
if (!rdma_cap_ib_mad(device, i)) if (!rdma_cap_ib_mad(device, i))
continue; continue;
......
...@@ -812,12 +812,8 @@ static void mcast_add_one(struct ib_device *device) ...@@ -812,12 +812,8 @@ static void mcast_add_one(struct ib_device *device)
if (!dev) if (!dev)
return; return;
if (device->node_type == RDMA_NODE_IB_SWITCH) dev->start_port = rdma_start_port(device);
dev->start_port = dev->end_port = 0; dev->end_port = rdma_end_port(device);
else {
dev->start_port = 1;
dev->end_port = device->phys_port_cnt;
}
for (i = 0; i <= dev->end_port - dev->start_port; i++) { for (i = 0; i <= dev->end_port - dev->start_port; i++) {
if (!rdma_cap_ib_mcast(device, dev->start_port + i)) if (!rdma_cap_ib_mcast(device, dev->start_port + i))
......
...@@ -39,12 +39,12 @@ ...@@ -39,12 +39,12 @@
#include "smi.h" #include "smi.h"
enum smi_action opa_smi_handle_dr_smp_recv(struct opa_smp *smp, u8 node_type, enum smi_action opa_smi_handle_dr_smp_recv(struct opa_smp *smp, bool is_switch,
int port_num, int phys_port_cnt); int port_num, int phys_port_cnt);
int opa_smi_get_fwd_port(struct opa_smp *smp); int opa_smi_get_fwd_port(struct opa_smp *smp);
extern enum smi_forward_action opa_smi_check_forward_dr_smp(struct opa_smp *smp); extern enum smi_forward_action opa_smi_check_forward_dr_smp(struct opa_smp *smp);
extern enum smi_action opa_smi_handle_dr_smp_send(struct opa_smp *smp, extern enum smi_action opa_smi_handle_dr_smp_send(struct opa_smp *smp,
u8 node_type, int port_num); bool is_switch, int port_num);
/* /*
* Return IB_SMI_HANDLE if the SMP should be handled by the local SMA/SM * Return IB_SMI_HANDLE if the SMP should be handled by the local SMA/SM
......
...@@ -1156,12 +1156,8 @@ static void ib_sa_add_one(struct ib_device *device) ...@@ -1156,12 +1156,8 @@ static void ib_sa_add_one(struct ib_device *device)
int s, e, i; int s, e, i;
int count = 0; int count = 0;
if (device->node_type == RDMA_NODE_IB_SWITCH) s = rdma_start_port(device);
s = e = 0; e = rdma_end_port(device);
else {
s = 1;
e = device->phys_port_cnt;
}
sa_dev = kzalloc(sizeof *sa_dev + sa_dev = kzalloc(sizeof *sa_dev +
(e - s + 1) * sizeof (struct ib_sa_port), (e - s + 1) * sizeof (struct ib_sa_port),
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
#include "smi.h" #include "smi.h"
#include "opa_smi.h" #include "opa_smi.h"
static enum smi_action __smi_handle_dr_smp_send(u8 node_type, int port_num, static enum smi_action __smi_handle_dr_smp_send(bool is_switch, int port_num,
u8 *hop_ptr, u8 hop_cnt, u8 *hop_ptr, u8 hop_cnt,
const u8 *initial_path, const u8 *initial_path,
const u8 *return_path, const u8 *return_path,
...@@ -64,7 +64,7 @@ static enum smi_action __smi_handle_dr_smp_send(u8 node_type, int port_num, ...@@ -64,7 +64,7 @@ static enum smi_action __smi_handle_dr_smp_send(u8 node_type, int port_num,
/* C14-9:2 */ /* C14-9:2 */
if (*hop_ptr && *hop_ptr < hop_cnt) { if (*hop_ptr && *hop_ptr < hop_cnt) {
if (node_type != RDMA_NODE_IB_SWITCH) if (!is_switch)
return IB_SMI_DISCARD; return IB_SMI_DISCARD;
/* return_path set when received */ /* return_path set when received */
...@@ -77,7 +77,7 @@ static enum smi_action __smi_handle_dr_smp_send(u8 node_type, int port_num, ...@@ -77,7 +77,7 @@ static enum smi_action __smi_handle_dr_smp_send(u8 node_type, int port_num,
if (*hop_ptr == hop_cnt) { if (*hop_ptr == hop_cnt) {
/* return_path set when received */ /* return_path set when received */
(*hop_ptr)++; (*hop_ptr)++;
return (node_type == RDMA_NODE_IB_SWITCH || return (is_switch ||
dr_dlid_is_permissive ? dr_dlid_is_permissive ?
IB_SMI_HANDLE : IB_SMI_DISCARD); IB_SMI_HANDLE : IB_SMI_DISCARD);
} }
...@@ -96,7 +96,7 @@ static enum smi_action __smi_handle_dr_smp_send(u8 node_type, int port_num, ...@@ -96,7 +96,7 @@ static enum smi_action __smi_handle_dr_smp_send(u8 node_type, int port_num,
/* C14-13:2 */ /* C14-13:2 */
if (2 <= *hop_ptr && *hop_ptr <= hop_cnt) { if (2 <= *hop_ptr && *hop_ptr <= hop_cnt) {
if (node_type != RDMA_NODE_IB_SWITCH) if (!is_switch)
return IB_SMI_DISCARD; return IB_SMI_DISCARD;
(*hop_ptr)--; (*hop_ptr)--;
...@@ -108,7 +108,7 @@ static enum smi_action __smi_handle_dr_smp_send(u8 node_type, int port_num, ...@@ -108,7 +108,7 @@ static enum smi_action __smi_handle_dr_smp_send(u8 node_type, int port_num,
if (*hop_ptr == 1) { if (*hop_ptr == 1) {
(*hop_ptr)--; (*hop_ptr)--;
/* C14-13:3 -- SMPs destined for SM shouldn't be here */ /* C14-13:3 -- SMPs destined for SM shouldn't be here */
return (node_type == RDMA_NODE_IB_SWITCH || return (is_switch ||
dr_slid_is_permissive ? dr_slid_is_permissive ?
IB_SMI_HANDLE : IB_SMI_DISCARD); IB_SMI_HANDLE : IB_SMI_DISCARD);
} }
...@@ -127,9 +127,9 @@ static enum smi_action __smi_handle_dr_smp_send(u8 node_type, int port_num, ...@@ -127,9 +127,9 @@ static enum smi_action __smi_handle_dr_smp_send(u8 node_type, int port_num,
* Return IB_SMI_DISCARD if the SMP should be discarded * Return IB_SMI_DISCARD if the SMP should be discarded
*/ */
enum smi_action smi_handle_dr_smp_send(struct ib_smp *smp, enum smi_action smi_handle_dr_smp_send(struct ib_smp *smp,
u8 node_type, int port_num) bool is_switch, int port_num)
{ {
return __smi_handle_dr_smp_send(node_type, port_num, return __smi_handle_dr_smp_send(is_switch, port_num,
&smp->hop_ptr, smp->hop_cnt, &smp->hop_ptr, smp->hop_cnt,
smp->initial_path, smp->initial_path,
smp->return_path, smp->return_path,
...@@ -139,9 +139,9 @@ enum smi_action smi_handle_dr_smp_send(struct ib_smp *smp, ...@@ -139,9 +139,9 @@ enum smi_action smi_handle_dr_smp_send(struct ib_smp *smp,
} }
enum smi_action opa_smi_handle_dr_smp_send(struct opa_smp *smp, enum smi_action opa_smi_handle_dr_smp_send(struct opa_smp *smp,
u8 node_type, int port_num) bool is_switch, int port_num)
{ {
return __smi_handle_dr_smp_send(node_type, port_num, return __smi_handle_dr_smp_send(is_switch, port_num,
&smp->hop_ptr, smp->hop_cnt, &smp->hop_ptr, smp->hop_cnt,
smp->route.dr.initial_path, smp->route.dr.initial_path,
smp->route.dr.return_path, smp->route.dr.return_path,
...@@ -152,7 +152,7 @@ enum smi_action opa_smi_handle_dr_smp_send(struct opa_smp *smp, ...@@ -152,7 +152,7 @@ enum smi_action opa_smi_handle_dr_smp_send(struct opa_smp *smp,
OPA_LID_PERMISSIVE); OPA_LID_PERMISSIVE);
} }
static enum smi_action __smi_handle_dr_smp_recv(u8 node_type, int port_num, static enum smi_action __smi_handle_dr_smp_recv(bool is_switch, int port_num,
int phys_port_cnt, int phys_port_cnt,
u8 *hop_ptr, u8 hop_cnt, u8 *hop_ptr, u8 hop_cnt,
const u8 *initial_path, const u8 *initial_path,
...@@ -173,7 +173,7 @@ static enum smi_action __smi_handle_dr_smp_recv(u8 node_type, int port_num, ...@@ -173,7 +173,7 @@ static enum smi_action __smi_handle_dr_smp_recv(u8 node_type, int port_num,
/* C14-9:2 -- intermediate hop */ /* C14-9:2 -- intermediate hop */
if (*hop_ptr && *hop_ptr < hop_cnt) { if (*hop_ptr && *hop_ptr < hop_cnt) {
if (node_type != RDMA_NODE_IB_SWITCH) if (!is_switch)
return IB_SMI_DISCARD; return IB_SMI_DISCARD;
return_path[*hop_ptr] = port_num; return_path[*hop_ptr] = port_num;
...@@ -188,7 +188,7 @@ static enum smi_action __smi_handle_dr_smp_recv(u8 node_type, int port_num, ...@@ -188,7 +188,7 @@ static enum smi_action __smi_handle_dr_smp_recv(u8 node_type, int port_num,
return_path[*hop_ptr] = port_num; return_path[*hop_ptr] = port_num;
/* hop_ptr updated when sending */ /* hop_ptr updated when sending */
return (node_type == RDMA_NODE_IB_SWITCH || return (is_switch ||
dr_dlid_is_permissive ? dr_dlid_is_permissive ?
IB_SMI_HANDLE : IB_SMI_DISCARD); IB_SMI_HANDLE : IB_SMI_DISCARD);
} }
...@@ -208,7 +208,7 @@ static enum smi_action __smi_handle_dr_smp_recv(u8 node_type, int port_num, ...@@ -208,7 +208,7 @@ static enum smi_action __smi_handle_dr_smp_recv(u8 node_type, int port_num,
/* C14-13:2 */ /* C14-13:2 */
if (2 <= *hop_ptr && *hop_ptr <= hop_cnt) { if (2 <= *hop_ptr && *hop_ptr <= hop_cnt) {
if (node_type != RDMA_NODE_IB_SWITCH) if (!is_switch)
return IB_SMI_DISCARD; return IB_SMI_DISCARD;
/* hop_ptr updated when sending */ /* hop_ptr updated when sending */
...@@ -224,8 +224,7 @@ static enum smi_action __smi_handle_dr_smp_recv(u8 node_type, int port_num, ...@@ -224,8 +224,7 @@ static enum smi_action __smi_handle_dr_smp_recv(u8 node_type, int port_num,
return IB_SMI_HANDLE; return IB_SMI_HANDLE;
} }
/* hop_ptr updated when sending */ /* hop_ptr updated when sending */
return (node_type == RDMA_NODE_IB_SWITCH ? return (is_switch ? IB_SMI_HANDLE : IB_SMI_DISCARD);
IB_SMI_HANDLE : IB_SMI_DISCARD);
} }
/* C14-13:4 -- hop_ptr = 0 -> give to SM */ /* C14-13:4 -- hop_ptr = 0 -> give to SM */
...@@ -238,10 +237,10 @@ static enum smi_action __smi_handle_dr_smp_recv(u8 node_type, int port_num, ...@@ -238,10 +237,10 @@ static enum smi_action __smi_handle_dr_smp_recv(u8 node_type, int port_num,
* Adjust information for a received SMP * Adjust information for a received SMP
* Return IB_SMI_DISCARD if the SMP should be dropped * Return IB_SMI_DISCARD if the SMP should be dropped
*/ */
enum smi_action smi_handle_dr_smp_recv(struct ib_smp *smp, u8 node_type, enum smi_action smi_handle_dr_smp_recv(struct ib_smp *smp, bool is_switch,
int port_num, int phys_port_cnt) int port_num, int phys_port_cnt)
{ {
return __smi_handle_dr_smp_recv(node_type, port_num, phys_port_cnt, return __smi_handle_dr_smp_recv(is_switch, port_num, phys_port_cnt,
&smp->hop_ptr, smp->hop_cnt, &smp->hop_ptr, smp->hop_cnt,
smp->initial_path, smp->initial_path,
smp->return_path, smp->return_path,
...@@ -254,10 +253,10 @@ enum smi_action smi_handle_dr_smp_recv(struct ib_smp *smp, u8 node_type, ...@@ -254,10 +253,10 @@ enum smi_action smi_handle_dr_smp_recv(struct ib_smp *smp, u8 node_type,
* Adjust information for a received SMP * Adjust information for a received SMP
* Return IB_SMI_DISCARD if the SMP should be dropped * Return IB_SMI_DISCARD if the SMP should be dropped
*/ */
enum smi_action opa_smi_handle_dr_smp_recv(struct opa_smp *smp, u8 node_type, enum smi_action opa_smi_handle_dr_smp_recv(struct opa_smp *smp, bool is_switch,
int port_num, int phys_port_cnt) int port_num, int phys_port_cnt)
{ {
return __smi_handle_dr_smp_recv(node_type, port_num, phys_port_cnt, return __smi_handle_dr_smp_recv(is_switch, port_num, phys_port_cnt,
&smp->hop_ptr, smp->hop_cnt, &smp->hop_ptr, smp->hop_cnt,
smp->route.dr.initial_path, smp->route.dr.initial_path,
smp->route.dr.return_path, smp->route.dr.return_path,
......
...@@ -51,12 +51,12 @@ enum smi_forward_action { ...@@ -51,12 +51,12 @@ enum smi_forward_action {
IB_SMI_FORWARD /* SMP should be forwarded (for switches only) */ IB_SMI_FORWARD /* SMP should be forwarded (for switches only) */
}; };
enum smi_action smi_handle_dr_smp_recv(struct ib_smp *smp, u8 node_type, enum smi_action smi_handle_dr_smp_recv(struct ib_smp *smp, bool is_switch,
int port_num, int phys_port_cnt); int port_num, int phys_port_cnt);
int smi_get_fwd_port(struct ib_smp *smp); int smi_get_fwd_port(struct ib_smp *smp);
extern enum smi_forward_action smi_check_forward_dr_smp(struct ib_smp *smp); extern enum smi_forward_action smi_check_forward_dr_smp(struct ib_smp *smp);
extern enum smi_action smi_handle_dr_smp_send(struct ib_smp *smp, extern enum smi_action smi_handle_dr_smp_send(struct ib_smp *smp,
u8 node_type, int port_num); bool is_switch, int port_num);
/* /*
* Return IB_SMI_HANDLE if the SMP should be handled by the local SMA/SM * Return IB_SMI_HANDLE if the SMP should be handled by the local SMA/SM
......
...@@ -870,7 +870,7 @@ int ib_device_register_sysfs(struct ib_device *device, ...@@ -870,7 +870,7 @@ int ib_device_register_sysfs(struct ib_device *device,
goto err_put; goto err_put;
} }
if (device->node_type == RDMA_NODE_IB_SWITCH) { if (rdma_cap_ib_switch(device)) {
ret = add_port(device, 0, port_callback); ret = add_port(device, 0, port_callback);
if (ret) if (ret)
goto err_put; goto err_put;
......
...@@ -1684,7 +1684,7 @@ static void ipoib_add_one(struct ib_device *device) ...@@ -1684,7 +1684,7 @@ static void ipoib_add_one(struct ib_device *device)
struct list_head *dev_list; struct list_head *dev_list;
struct net_device *dev; struct net_device *dev;
struct ipoib_dev_priv *priv; struct ipoib_dev_priv *priv;
int s, e, p; int p;
int count = 0; int count = 0;
dev_list = kmalloc(sizeof *dev_list, GFP_KERNEL); dev_list = kmalloc(sizeof *dev_list, GFP_KERNEL);
...@@ -1693,15 +1693,7 @@ static void ipoib_add_one(struct ib_device *device) ...@@ -1693,15 +1693,7 @@ static void ipoib_add_one(struct ib_device *device)
INIT_LIST_HEAD(dev_list); INIT_LIST_HEAD(dev_list);
if (device->node_type == RDMA_NODE_IB_SWITCH) { for (p = rdma_start_port(device); p <= rdma_end_port(device); ++p) {
s = 0;
e = 0;
} else {
s = 1;
e = device->phys_port_cnt;
}
for (p = s; p <= e; ++p) {
if (!rdma_protocol_ib(device, p)) if (!rdma_protocol_ib(device, p))
continue; continue;
dev = ipoib_add_port("ib%d", device, p); dev = ipoib_add_port("ib%d", device, p);
......
...@@ -3379,7 +3379,7 @@ static void srp_add_one(struct ib_device *device) ...@@ -3379,7 +3379,7 @@ static void srp_add_one(struct ib_device *device)
struct srp_device *srp_dev; struct srp_device *srp_dev;
struct ib_device_attr *dev_attr; struct ib_device_attr *dev_attr;
struct srp_host *host; struct srp_host *host;
int mr_page_shift, s, e, p; int mr_page_shift, p;
u64 max_pages_per_mr; u64 max_pages_per_mr;
dev_attr = kmalloc(sizeof *dev_attr, GFP_KERNEL); dev_attr = kmalloc(sizeof *dev_attr, GFP_KERNEL);
...@@ -3443,15 +3443,7 @@ static void srp_add_one(struct ib_device *device) ...@@ -3443,15 +3443,7 @@ static void srp_add_one(struct ib_device *device)
if (IS_ERR(srp_dev->mr)) if (IS_ERR(srp_dev->mr))
goto err_pd; goto err_pd;
if (device->node_type == RDMA_NODE_IB_SWITCH) { for (p = rdma_start_port(device); p <= rdma_end_port(device); ++p) {
s = 0;
e = 0;
} else {
s = 1;
e = device->phys_port_cnt;
}
for (p = s; p <= e; ++p) {
host = srp_add_port(srp_dev, p); host = srp_add_port(srp_dev, p);
if (host) if (host)
list_add_tail(&host->list, &srp_dev->dev_list); list_add_tail(&host->list, &srp_dev->dev_list);
......
...@@ -1745,6 +1745,7 @@ struct ib_device { ...@@ -1745,6 +1745,7 @@ struct ib_device {
char node_desc[64]; char node_desc[64];
__be64 node_guid; __be64 node_guid;
u32 local_dma_lkey; u32 local_dma_lkey;
u16 is_switch:1;
u8 node_type; u8 node_type;
u8 phys_port_cnt; u8 phys_port_cnt;
...@@ -1823,6 +1824,20 @@ int ib_query_port(struct ib_device *device, ...@@ -1823,6 +1824,20 @@ int ib_query_port(struct ib_device *device,
enum rdma_link_layer rdma_port_get_link_layer(struct ib_device *device, enum rdma_link_layer rdma_port_get_link_layer(struct ib_device *device,
u8 port_num); u8 port_num);
/**
* rdma_cap_ib_switch - Check if the device is IB switch
* @device: Device to check
*
* Device driver is responsible for setting is_switch bit on
* in ib_device structure at init time.
*
* Return: true if the device is IB switch.
*/
static inline bool rdma_cap_ib_switch(const struct ib_device *device)
{
return device->is_switch;
}
/** /**
* rdma_start_port - Return the first valid port number for the device * rdma_start_port - Return the first valid port number for the device
* specified * specified
...@@ -1833,7 +1848,7 @@ enum rdma_link_layer rdma_port_get_link_layer(struct ib_device *device, ...@@ -1833,7 +1848,7 @@ enum rdma_link_layer rdma_port_get_link_layer(struct ib_device *device,
*/ */
static inline u8 rdma_start_port(const struct ib_device *device) static inline u8 rdma_start_port(const struct ib_device *device)
{ {
return (device->node_type == RDMA_NODE_IB_SWITCH) ? 0 : 1; return rdma_cap_ib_switch(device) ? 0 : 1;
} }
/** /**
...@@ -1846,8 +1861,7 @@ static inline u8 rdma_start_port(const struct ib_device *device) ...@@ -1846,8 +1861,7 @@ static inline u8 rdma_start_port(const struct ib_device *device)
*/ */
static inline u8 rdma_end_port(const struct ib_device *device) static inline u8 rdma_end_port(const struct ib_device *device)
{ {
return (device->node_type == RDMA_NODE_IB_SWITCH) ? return rdma_cap_ib_switch(device) ? 0 : device->phys_port_cnt;
0 : device->phys_port_cnt;
} }
static inline bool rdma_protocol_ib(const struct ib_device *device, u8 port_num) static inline bool rdma_protocol_ib(const struct ib_device *device, u8 port_num)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment