Commit a85c2eb3 authored by Anish Bhatt's avatar Anish Bhatt Committed by David S. Miller

cxgb4 : Allow firmware DCB info to be queried in host state

Since finally DCB traffic management is still handled by firmware,
allow firmware to be fully programmed and queried even in host
managed state for the cases where this was previously rejected.
Signed-off-by: default avatarAnish Bhatt <anish@chelsio.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a44e7b73
...@@ -31,6 +31,15 @@ static const char * const dcb_ver_array[] = { ...@@ -31,6 +31,15 @@ static const char * const dcb_ver_array[] = {
"Auto Negotiated" "Auto Negotiated"
}; };
static inline bool cxgb4_dcb_state_synced(enum cxgb4_dcb_state state)
{
if (state == CXGB4_DCB_STATE_FW_ALLSYNCED ||
state == CXGB4_DCB_STATE_HOST)
return true;
else
return false;
}
/* Initialize a port's Data Center Bridging state. Typically used after a /* Initialize a port's Data Center Bridging state. Typically used after a
* Link Down event. * Link Down event.
*/ */
...@@ -603,7 +612,7 @@ static void cxgb4_getpfccfg(struct net_device *dev, int priority, u8 *pfccfg) ...@@ -603,7 +612,7 @@ static void cxgb4_getpfccfg(struct net_device *dev, int priority, u8 *pfccfg)
struct port_info *pi = netdev2pinfo(dev); struct port_info *pi = netdev2pinfo(dev);
struct port_dcb_info *dcb = &pi->dcb; struct port_dcb_info *dcb = &pi->dcb;
if (dcb->state != CXGB4_DCB_STATE_FW_ALLSYNCED || if (!cxgb4_dcb_state_synced(dcb->state) ||
priority >= CXGB4_MAX_PRIORITY) priority >= CXGB4_MAX_PRIORITY)
*pfccfg = 0; *pfccfg = 0;
else else
...@@ -620,7 +629,7 @@ static void cxgb4_setpfccfg(struct net_device *dev, int priority, u8 pfccfg) ...@@ -620,7 +629,7 @@ static void cxgb4_setpfccfg(struct net_device *dev, int priority, u8 pfccfg)
struct adapter *adap = pi->adapter; struct adapter *adap = pi->adapter;
int err; int err;
if (pi->dcb.state != CXGB4_DCB_STATE_FW_ALLSYNCED || if (!cxgb4_dcb_state_synced(pi->dcb.state) ||
priority >= CXGB4_MAX_PRIORITY) priority >= CXGB4_MAX_PRIORITY)
return; return;
...@@ -732,7 +741,7 @@ static u8 cxgb4_getpfcstate(struct net_device *dev) ...@@ -732,7 +741,7 @@ static u8 cxgb4_getpfcstate(struct net_device *dev)
{ {
struct port_info *pi = netdev2pinfo(dev); struct port_info *pi = netdev2pinfo(dev);
if (pi->dcb.state != CXGB4_DCB_STATE_FW_ALLSYNCED) if (!cxgb4_dcb_state_synced(pi->dcb.state))
return false; return false;
return pi->dcb.pfcen != 0; return pi->dcb.pfcen != 0;
...@@ -756,7 +765,7 @@ static int __cxgb4_getapp(struct net_device *dev, u8 app_idtype, u16 app_id, ...@@ -756,7 +765,7 @@ static int __cxgb4_getapp(struct net_device *dev, u8 app_idtype, u16 app_id,
struct adapter *adap = pi->adapter; struct adapter *adap = pi->adapter;
int i; int i;
if (pi->dcb.state != CXGB4_DCB_STATE_FW_ALLSYNCED) if (!cxgb4_dcb_state_synced(pi->dcb.state))
return 0; return 0;
for (i = 0; i < CXGB4_MAX_DCBX_APP_SUPPORTED; i++) { for (i = 0; i < CXGB4_MAX_DCBX_APP_SUPPORTED; i++) {
...@@ -810,7 +819,7 @@ static int __cxgb4_setapp(struct net_device *dev, u8 app_idtype, u16 app_id, ...@@ -810,7 +819,7 @@ static int __cxgb4_setapp(struct net_device *dev, u8 app_idtype, u16 app_id,
int i, err; int i, err;
if (pi->dcb.state != CXGB4_DCB_STATE_FW_ALLSYNCED) if (!cxgb4_dcb_state_synced(pi->dcb.state))
return -EINVAL; return -EINVAL;
/* DCB info gets thrown away on link up */ /* DCB info gets thrown away on link up */
...@@ -898,10 +907,11 @@ cxgb4_ieee_negotiation_complete(struct net_device *dev, ...@@ -898,10 +907,11 @@ cxgb4_ieee_negotiation_complete(struct net_device *dev,
struct port_info *pi = netdev2pinfo(dev); struct port_info *pi = netdev2pinfo(dev);
struct port_dcb_info *dcb = &pi->dcb; struct port_dcb_info *dcb = &pi->dcb;
if (dcb->state == CXGB4_DCB_STATE_FW_ALLSYNCED)
if (dcb_subtype && !(dcb->msgs & dcb_subtype)) if (dcb_subtype && !(dcb->msgs & dcb_subtype))
return 0; return 0;
return (dcb->state == CXGB4_DCB_STATE_FW_ALLSYNCED && return (cxgb4_dcb_state_synced(dcb->state) &&
(dcb->supported & DCB_CAP_DCBX_VER_IEEE)); (dcb->supported & DCB_CAP_DCBX_VER_IEEE));
} }
...@@ -1059,7 +1069,7 @@ static u8 cxgb4_setdcbx(struct net_device *dev, u8 dcb_request) ...@@ -1059,7 +1069,7 @@ static u8 cxgb4_setdcbx(struct net_device *dev, u8 dcb_request)
/* Can't enable DCB if we haven't successfully negotiated it. /* Can't enable DCB if we haven't successfully negotiated it.
*/ */
if (pi->dcb.state != CXGB4_DCB_STATE_FW_ALLSYNCED) if (!cxgb4_dcb_state_synced(pi->dcb.state))
return 1; return 1;
/* There's currently no mechanism to allow for the firmware DCBX /* There's currently no mechanism to allow for the firmware DCBX
...@@ -1082,7 +1092,7 @@ static int cxgb4_getpeer_app(struct net_device *dev, ...@@ -1082,7 +1092,7 @@ static int cxgb4_getpeer_app(struct net_device *dev,
struct adapter *adap = pi->adapter; struct adapter *adap = pi->adapter;
int i, err = 0; int i, err = 0;
if (pi->dcb.state != CXGB4_DCB_STATE_FW_ALLSYNCED) if (!cxgb4_dcb_state_synced(pi->dcb.state))
return 1; return 1;
info->willing = 0; info->willing = 0;
...@@ -1116,7 +1126,7 @@ static int cxgb4_getpeerapp_tbl(struct net_device *dev, struct dcb_app *table) ...@@ -1116,7 +1126,7 @@ static int cxgb4_getpeerapp_tbl(struct net_device *dev, struct dcb_app *table)
struct adapter *adap = pi->adapter; struct adapter *adap = pi->adapter;
int i, err = 0; int i, err = 0;
if (pi->dcb.state != CXGB4_DCB_STATE_FW_ALLSYNCED) if (!cxgb4_dcb_state_synced(pi->dcb.state))
return 1; return 1;
for (i = 0; i < CXGB4_MAX_DCBX_APP_SUPPORTED; i++) { for (i = 0; i < CXGB4_MAX_DCBX_APP_SUPPORTED; i++) {
......
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