diff options
author | Hariprasad Shenai <hariprasad@chelsio.com> | 2014-11-21 02:22:04 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-11-22 16:57:47 -0500 |
commit | 2b5fb1f25e7b22cb96fa8662f9c8f8cf34abc109 (patch) | |
tree | 51fc7dd19bd685ecb3bff49e8c39b7b96e183459 /drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | |
parent | 6e4b51a604f9722f6cf99b7b3d7b79b7b4336ece (diff) |
cxgb4/cxgb4vf/csiostor: Cleanup macros/register defines related to port and VI
This patch cleanups all port and VI related macros/register defines that are
defined in t4fw_api.h and the affected files.
Signed-off-by: Hariprasad Shenai <hariprasad@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/chelsio/cxgb4/t4_hw.c')
-rw-r--r-- | drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 106 |
1 files changed, 53 insertions, 53 deletions
diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c index da72814dff3d..20432e2bb17f 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c +++ b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | |||
@@ -1237,7 +1237,7 @@ int t4_link_start(struct adapter *adap, unsigned int mbox, unsigned int port, | |||
1237 | struct link_config *lc) | 1237 | struct link_config *lc) |
1238 | { | 1238 | { |
1239 | struct fw_port_cmd c; | 1239 | struct fw_port_cmd c; |
1240 | unsigned int fc = 0, mdi = FW_PORT_MDI(FW_PORT_MDI_AUTO); | 1240 | unsigned int fc = 0, mdi = FW_PORT_CAP_MDI_V(FW_PORT_CAP_MDI_AUTO); |
1241 | 1241 | ||
1242 | lc->link_ok = 0; | 1242 | lc->link_ok = 0; |
1243 | if (lc->requested_fc & PAUSE_RX) | 1243 | if (lc->requested_fc & PAUSE_RX) |
@@ -1247,8 +1247,8 @@ int t4_link_start(struct adapter *adap, unsigned int mbox, unsigned int port, | |||
1247 | 1247 | ||
1248 | memset(&c, 0, sizeof(c)); | 1248 | memset(&c, 0, sizeof(c)); |
1249 | c.op_to_portid = htonl(FW_CMD_OP_V(FW_PORT_CMD) | FW_CMD_REQUEST_F | | 1249 | c.op_to_portid = htonl(FW_CMD_OP_V(FW_PORT_CMD) | FW_CMD_REQUEST_F | |
1250 | FW_CMD_EXEC_F | FW_PORT_CMD_PORTID(port)); | 1250 | FW_CMD_EXEC_F | FW_PORT_CMD_PORTID_V(port)); |
1251 | c.action_to_len16 = htonl(FW_PORT_CMD_ACTION(FW_PORT_ACTION_L1_CFG) | | 1251 | c.action_to_len16 = htonl(FW_PORT_CMD_ACTION_V(FW_PORT_ACTION_L1_CFG) | |
1252 | FW_LEN16(c)); | 1252 | FW_LEN16(c)); |
1253 | 1253 | ||
1254 | if (!(lc->supported & FW_PORT_CAP_ANEG)) { | 1254 | if (!(lc->supported & FW_PORT_CAP_ANEG)) { |
@@ -1277,8 +1277,8 @@ int t4_restart_aneg(struct adapter *adap, unsigned int mbox, unsigned int port) | |||
1277 | 1277 | ||
1278 | memset(&c, 0, sizeof(c)); | 1278 | memset(&c, 0, sizeof(c)); |
1279 | c.op_to_portid = htonl(FW_CMD_OP_V(FW_PORT_CMD) | FW_CMD_REQUEST_F | | 1279 | c.op_to_portid = htonl(FW_CMD_OP_V(FW_PORT_CMD) | FW_CMD_REQUEST_F | |
1280 | FW_CMD_EXEC_F | FW_PORT_CMD_PORTID(port)); | 1280 | FW_CMD_EXEC_F | FW_PORT_CMD_PORTID_V(port)); |
1281 | c.action_to_len16 = htonl(FW_PORT_CMD_ACTION(FW_PORT_ACTION_L1_CFG) | | 1281 | c.action_to_len16 = htonl(FW_PORT_CMD_ACTION_V(FW_PORT_ACTION_L1_CFG) | |
1282 | FW_LEN16(c)); | 1282 | FW_LEN16(c)); |
1283 | c.u.l1cfg.rcap = htonl(FW_PORT_CAP_ANEG); | 1283 | c.u.l1cfg.rcap = htonl(FW_PORT_CAP_ANEG); |
1284 | return t4_wr_mbox(adap, mbox, &c, sizeof(c), NULL); | 1284 | return t4_wr_mbox(adap, mbox, &c, sizeof(c), NULL); |
@@ -3415,9 +3415,9 @@ int t4_alloc_vi(struct adapter *adap, unsigned int mbox, unsigned int port, | |||
3415 | memset(&c, 0, sizeof(c)); | 3415 | memset(&c, 0, sizeof(c)); |
3416 | c.op_to_vfn = htonl(FW_CMD_OP_V(FW_VI_CMD) | FW_CMD_REQUEST_F | | 3416 | c.op_to_vfn = htonl(FW_CMD_OP_V(FW_VI_CMD) | FW_CMD_REQUEST_F | |
3417 | FW_CMD_WRITE_F | FW_CMD_EXEC_F | | 3417 | FW_CMD_WRITE_F | FW_CMD_EXEC_F | |
3418 | FW_VI_CMD_PFN(pf) | FW_VI_CMD_VFN(vf)); | 3418 | FW_VI_CMD_PFN_V(pf) | FW_VI_CMD_VFN_V(vf)); |
3419 | c.alloc_to_len16 = htonl(FW_VI_CMD_ALLOC | FW_LEN16(c)); | 3419 | c.alloc_to_len16 = htonl(FW_VI_CMD_ALLOC_F | FW_LEN16(c)); |
3420 | c.portid_pkd = FW_VI_CMD_PORTID(port); | 3420 | c.portid_pkd = FW_VI_CMD_PORTID_V(port); |
3421 | c.nmac = nmac - 1; | 3421 | c.nmac = nmac - 1; |
3422 | 3422 | ||
3423 | ret = t4_wr_mbox(adap, mbox, &c, sizeof(c), &c); | 3423 | ret = t4_wr_mbox(adap, mbox, &c, sizeof(c), &c); |
@@ -3438,8 +3438,8 @@ int t4_alloc_vi(struct adapter *adap, unsigned int mbox, unsigned int port, | |||
3438 | } | 3438 | } |
3439 | } | 3439 | } |
3440 | if (rss_size) | 3440 | if (rss_size) |
3441 | *rss_size = FW_VI_CMD_RSSSIZE_GET(ntohs(c.rsssize_pkd)); | 3441 | *rss_size = FW_VI_CMD_RSSSIZE_G(ntohs(c.rsssize_pkd)); |
3442 | return FW_VI_CMD_VIID_GET(ntohs(c.type_viid)); | 3442 | return FW_VI_CMD_VIID_G(ntohs(c.type_viid)); |
3443 | } | 3443 | } |
3444 | 3444 | ||
3445 | /** | 3445 | /** |
@@ -3466,23 +3466,23 @@ int t4_set_rxmode(struct adapter *adap, unsigned int mbox, unsigned int viid, | |||
3466 | if (mtu < 0) | 3466 | if (mtu < 0) |
3467 | mtu = FW_RXMODE_MTU_NO_CHG; | 3467 | mtu = FW_RXMODE_MTU_NO_CHG; |
3468 | if (promisc < 0) | 3468 | if (promisc < 0) |
3469 | promisc = FW_VI_RXMODE_CMD_PROMISCEN_MASK; | 3469 | promisc = FW_VI_RXMODE_CMD_PROMISCEN_M; |
3470 | if (all_multi < 0) | 3470 | if (all_multi < 0) |
3471 | all_multi = FW_VI_RXMODE_CMD_ALLMULTIEN_MASK; | 3471 | all_multi = FW_VI_RXMODE_CMD_ALLMULTIEN_M; |
3472 | if (bcast < 0) | 3472 | if (bcast < 0) |
3473 | bcast = FW_VI_RXMODE_CMD_BROADCASTEN_MASK; | 3473 | bcast = FW_VI_RXMODE_CMD_BROADCASTEN_M; |
3474 | if (vlanex < 0) | 3474 | if (vlanex < 0) |
3475 | vlanex = FW_VI_RXMODE_CMD_VLANEXEN_MASK; | 3475 | vlanex = FW_VI_RXMODE_CMD_VLANEXEN_M; |
3476 | 3476 | ||
3477 | memset(&c, 0, sizeof(c)); | 3477 | memset(&c, 0, sizeof(c)); |
3478 | c.op_to_viid = htonl(FW_CMD_OP_V(FW_VI_RXMODE_CMD) | FW_CMD_REQUEST_F | | 3478 | c.op_to_viid = htonl(FW_CMD_OP_V(FW_VI_RXMODE_CMD) | FW_CMD_REQUEST_F | |
3479 | FW_CMD_WRITE_F | FW_VI_RXMODE_CMD_VIID(viid)); | 3479 | FW_CMD_WRITE_F | FW_VI_RXMODE_CMD_VIID_V(viid)); |
3480 | c.retval_len16 = htonl(FW_LEN16(c)); | 3480 | c.retval_len16 = htonl(FW_LEN16(c)); |
3481 | c.mtu_to_vlanexen = htonl(FW_VI_RXMODE_CMD_MTU(mtu) | | 3481 | c.mtu_to_vlanexen = htonl(FW_VI_RXMODE_CMD_MTU_V(mtu) | |
3482 | FW_VI_RXMODE_CMD_PROMISCEN(promisc) | | 3482 | FW_VI_RXMODE_CMD_PROMISCEN_V(promisc) | |
3483 | FW_VI_RXMODE_CMD_ALLMULTIEN(all_multi) | | 3483 | FW_VI_RXMODE_CMD_ALLMULTIEN_V(all_multi) | |
3484 | FW_VI_RXMODE_CMD_BROADCASTEN(bcast) | | 3484 | FW_VI_RXMODE_CMD_BROADCASTEN_V(bcast) | |
3485 | FW_VI_RXMODE_CMD_VLANEXEN(vlanex)); | 3485 | FW_VI_RXMODE_CMD_VLANEXEN_V(vlanex)); |
3486 | return t4_wr_mbox_meat(adap, mbox, &c, sizeof(c), NULL, sleep_ok); | 3486 | return t4_wr_mbox_meat(adap, mbox, &c, sizeof(c), NULL, sleep_ok); |
3487 | } | 3487 | } |
3488 | 3488 | ||
@@ -3525,13 +3525,13 @@ int t4_alloc_mac_filt(struct adapter *adap, unsigned int mbox, | |||
3525 | memset(&c, 0, sizeof(c)); | 3525 | memset(&c, 0, sizeof(c)); |
3526 | c.op_to_viid = htonl(FW_CMD_OP_V(FW_VI_MAC_CMD) | FW_CMD_REQUEST_F | | 3526 | c.op_to_viid = htonl(FW_CMD_OP_V(FW_VI_MAC_CMD) | FW_CMD_REQUEST_F | |
3527 | FW_CMD_WRITE_F | (free ? FW_CMD_EXEC_F : 0) | | 3527 | FW_CMD_WRITE_F | (free ? FW_CMD_EXEC_F : 0) | |
3528 | FW_VI_MAC_CMD_VIID(viid)); | 3528 | FW_VI_MAC_CMD_VIID_V(viid)); |
3529 | c.freemacs_to_len16 = htonl(FW_VI_MAC_CMD_FREEMACS(free) | | 3529 | c.freemacs_to_len16 = htonl(FW_VI_MAC_CMD_FREEMACS_V(free) | |
3530 | FW_CMD_LEN16_V((naddr + 2) / 2)); | 3530 | FW_CMD_LEN16_V((naddr + 2) / 2)); |
3531 | 3531 | ||
3532 | for (i = 0, p = c.u.exact; i < naddr; i++, p++) { | 3532 | for (i = 0, p = c.u.exact; i < naddr; i++, p++) { |
3533 | p->valid_to_idx = htons(FW_VI_MAC_CMD_VALID | | 3533 | p->valid_to_idx = htons(FW_VI_MAC_CMD_VALID_F | |
3534 | FW_VI_MAC_CMD_IDX(FW_VI_MAC_ADD_MAC)); | 3534 | FW_VI_MAC_CMD_IDX_V(FW_VI_MAC_ADD_MAC)); |
3535 | memcpy(p->macaddr, addr[i], sizeof(p->macaddr)); | 3535 | memcpy(p->macaddr, addr[i], sizeof(p->macaddr)); |
3536 | } | 3536 | } |
3537 | 3537 | ||
@@ -3540,7 +3540,7 @@ int t4_alloc_mac_filt(struct adapter *adap, unsigned int mbox, | |||
3540 | return ret; | 3540 | return ret; |
3541 | 3541 | ||
3542 | for (i = 0, p = c.u.exact; i < naddr; i++, p++) { | 3542 | for (i = 0, p = c.u.exact; i < naddr; i++, p++) { |
3543 | u16 index = FW_VI_MAC_CMD_IDX_GET(ntohs(p->valid_to_idx)); | 3543 | u16 index = FW_VI_MAC_CMD_IDX_G(ntohs(p->valid_to_idx)); |
3544 | 3544 | ||
3545 | if (idx) | 3545 | if (idx) |
3546 | idx[i] = index >= max_naddr ? 0xffff : index; | 3546 | idx[i] = index >= max_naddr ? 0xffff : index; |
@@ -3587,16 +3587,16 @@ int t4_change_mac(struct adapter *adap, unsigned int mbox, unsigned int viid, | |||
3587 | 3587 | ||
3588 | memset(&c, 0, sizeof(c)); | 3588 | memset(&c, 0, sizeof(c)); |
3589 | c.op_to_viid = htonl(FW_CMD_OP_V(FW_VI_MAC_CMD) | FW_CMD_REQUEST_F | | 3589 | c.op_to_viid = htonl(FW_CMD_OP_V(FW_VI_MAC_CMD) | FW_CMD_REQUEST_F | |
3590 | FW_CMD_WRITE_F | FW_VI_MAC_CMD_VIID(viid)); | 3590 | FW_CMD_WRITE_F | FW_VI_MAC_CMD_VIID_V(viid)); |
3591 | c.freemacs_to_len16 = htonl(FW_CMD_LEN16_V(1)); | 3591 | c.freemacs_to_len16 = htonl(FW_CMD_LEN16_V(1)); |
3592 | p->valid_to_idx = htons(FW_VI_MAC_CMD_VALID | | 3592 | p->valid_to_idx = htons(FW_VI_MAC_CMD_VALID_F | |
3593 | FW_VI_MAC_CMD_SMAC_RESULT(mode) | | 3593 | FW_VI_MAC_CMD_SMAC_RESULT_V(mode) | |
3594 | FW_VI_MAC_CMD_IDX(idx)); | 3594 | FW_VI_MAC_CMD_IDX_V(idx)); |
3595 | memcpy(p->macaddr, addr, sizeof(p->macaddr)); | 3595 | memcpy(p->macaddr, addr, sizeof(p->macaddr)); |
3596 | 3596 | ||
3597 | ret = t4_wr_mbox(adap, mbox, &c, sizeof(c), &c); | 3597 | ret = t4_wr_mbox(adap, mbox, &c, sizeof(c), &c); |
3598 | if (ret == 0) { | 3598 | if (ret == 0) { |
3599 | ret = FW_VI_MAC_CMD_IDX_GET(ntohs(p->valid_to_idx)); | 3599 | ret = FW_VI_MAC_CMD_IDX_G(ntohs(p->valid_to_idx)); |
3600 | if (ret >= max_mac_addr) | 3600 | if (ret >= max_mac_addr) |
3601 | ret = -ENOMEM; | 3601 | ret = -ENOMEM; |
3602 | } | 3602 | } |
@@ -3621,9 +3621,9 @@ int t4_set_addr_hash(struct adapter *adap, unsigned int mbox, unsigned int viid, | |||
3621 | 3621 | ||
3622 | memset(&c, 0, sizeof(c)); | 3622 | memset(&c, 0, sizeof(c)); |
3623 | c.op_to_viid = htonl(FW_CMD_OP_V(FW_VI_MAC_CMD) | FW_CMD_REQUEST_F | | 3623 | c.op_to_viid = htonl(FW_CMD_OP_V(FW_VI_MAC_CMD) | FW_CMD_REQUEST_F | |
3624 | FW_CMD_WRITE_F | FW_VI_ENABLE_CMD_VIID(viid)); | 3624 | FW_CMD_WRITE_F | FW_VI_ENABLE_CMD_VIID_V(viid)); |
3625 | c.freemacs_to_len16 = htonl(FW_VI_MAC_CMD_HASHVECEN | | 3625 | c.freemacs_to_len16 = htonl(FW_VI_MAC_CMD_HASHVECEN_F | |
3626 | FW_VI_MAC_CMD_HASHUNIEN(ucast) | | 3626 | FW_VI_MAC_CMD_HASHUNIEN_V(ucast) | |
3627 | FW_CMD_LEN16_V(1)); | 3627 | FW_CMD_LEN16_V(1)); |
3628 | c.u.hash.hashvec = cpu_to_be64(vec); | 3628 | c.u.hash.hashvec = cpu_to_be64(vec); |
3629 | return t4_wr_mbox_meat(adap, mbox, &c, sizeof(c), NULL, sleep_ok); | 3629 | return t4_wr_mbox_meat(adap, mbox, &c, sizeof(c), NULL, sleep_ok); |
@@ -3648,11 +3648,11 @@ int t4_enable_vi_params(struct adapter *adap, unsigned int mbox, | |||
3648 | 3648 | ||
3649 | memset(&c, 0, sizeof(c)); | 3649 | memset(&c, 0, sizeof(c)); |
3650 | c.op_to_viid = htonl(FW_CMD_OP_V(FW_VI_ENABLE_CMD) | FW_CMD_REQUEST_F | | 3650 | c.op_to_viid = htonl(FW_CMD_OP_V(FW_VI_ENABLE_CMD) | FW_CMD_REQUEST_F | |
3651 | FW_CMD_EXEC_F | FW_VI_ENABLE_CMD_VIID(viid)); | 3651 | FW_CMD_EXEC_F | FW_VI_ENABLE_CMD_VIID_V(viid)); |
3652 | 3652 | ||
3653 | c.ien_to_len16 = htonl(FW_VI_ENABLE_CMD_IEN(rx_en) | | 3653 | c.ien_to_len16 = htonl(FW_VI_ENABLE_CMD_IEN_V(rx_en) | |
3654 | FW_VI_ENABLE_CMD_EEN(tx_en) | FW_LEN16(c) | | 3654 | FW_VI_ENABLE_CMD_EEN_V(tx_en) | FW_LEN16(c) | |
3655 | FW_VI_ENABLE_CMD_DCB_INFO(dcb_en)); | 3655 | FW_VI_ENABLE_CMD_DCB_INFO_V(dcb_en)); |
3656 | return t4_wr_mbox_ns(adap, mbox, &c, sizeof(c), NULL); | 3656 | return t4_wr_mbox_ns(adap, mbox, &c, sizeof(c), NULL); |
3657 | } | 3657 | } |
3658 | 3658 | ||
@@ -3688,8 +3688,8 @@ int t4_identify_port(struct adapter *adap, unsigned int mbox, unsigned int viid, | |||
3688 | 3688 | ||
3689 | memset(&c, 0, sizeof(c)); | 3689 | memset(&c, 0, sizeof(c)); |
3690 | c.op_to_viid = htonl(FW_CMD_OP_V(FW_VI_ENABLE_CMD) | FW_CMD_REQUEST_F | | 3690 | c.op_to_viid = htonl(FW_CMD_OP_V(FW_VI_ENABLE_CMD) | FW_CMD_REQUEST_F | |
3691 | FW_CMD_EXEC_F | FW_VI_ENABLE_CMD_VIID(viid)); | 3691 | FW_CMD_EXEC_F | FW_VI_ENABLE_CMD_VIID_V(viid)); |
3692 | c.ien_to_len16 = htonl(FW_VI_ENABLE_CMD_LED | FW_LEN16(c)); | 3692 | c.ien_to_len16 = htonl(FW_VI_ENABLE_CMD_LED_F | FW_LEN16(c)); |
3693 | c.blinkdur = htons(nblinks); | 3693 | c.blinkdur = htons(nblinks); |
3694 | return t4_wr_mbox(adap, mbox, &c, sizeof(c), NULL); | 3694 | return t4_wr_mbox(adap, mbox, &c, sizeof(c), NULL); |
3695 | } | 3695 | } |
@@ -3811,25 +3811,25 @@ int t4_handle_fw_rpl(struct adapter *adap, const __be64 *rpl) | |||
3811 | if (opcode == FW_PORT_CMD) { /* link/module state change message */ | 3811 | if (opcode == FW_PORT_CMD) { /* link/module state change message */ |
3812 | int speed = 0, fc = 0; | 3812 | int speed = 0, fc = 0; |
3813 | const struct fw_port_cmd *p = (void *)rpl; | 3813 | const struct fw_port_cmd *p = (void *)rpl; |
3814 | int chan = FW_PORT_CMD_PORTID_GET(ntohl(p->op_to_portid)); | 3814 | int chan = FW_PORT_CMD_PORTID_G(ntohl(p->op_to_portid)); |
3815 | int port = adap->chan_map[chan]; | 3815 | int port = adap->chan_map[chan]; |
3816 | struct port_info *pi = adap2pinfo(adap, port); | 3816 | struct port_info *pi = adap2pinfo(adap, port); |
3817 | struct link_config *lc = &pi->link_cfg; | 3817 | struct link_config *lc = &pi->link_cfg; |
3818 | u32 stat = ntohl(p->u.info.lstatus_to_modtype); | 3818 | u32 stat = ntohl(p->u.info.lstatus_to_modtype); |
3819 | int link_ok = (stat & FW_PORT_CMD_LSTATUS) != 0; | 3819 | int link_ok = (stat & FW_PORT_CMD_LSTATUS_F) != 0; |
3820 | u32 mod = FW_PORT_CMD_MODTYPE_GET(stat); | 3820 | u32 mod = FW_PORT_CMD_MODTYPE_G(stat); |
3821 | 3821 | ||
3822 | if (stat & FW_PORT_CMD_RXPAUSE) | 3822 | if (stat & FW_PORT_CMD_RXPAUSE_F) |
3823 | fc |= PAUSE_RX; | 3823 | fc |= PAUSE_RX; |
3824 | if (stat & FW_PORT_CMD_TXPAUSE) | 3824 | if (stat & FW_PORT_CMD_TXPAUSE_F) |
3825 | fc |= PAUSE_TX; | 3825 | fc |= PAUSE_TX; |
3826 | if (stat & FW_PORT_CMD_LSPEED(FW_PORT_CAP_SPEED_100M)) | 3826 | if (stat & FW_PORT_CMD_LSPEED_V(FW_PORT_CAP_SPEED_100M)) |
3827 | speed = 100; | 3827 | speed = 100; |
3828 | else if (stat & FW_PORT_CMD_LSPEED(FW_PORT_CAP_SPEED_1G)) | 3828 | else if (stat & FW_PORT_CMD_LSPEED_V(FW_PORT_CAP_SPEED_1G)) |
3829 | speed = 1000; | 3829 | speed = 1000; |
3830 | else if (stat & FW_PORT_CMD_LSPEED(FW_PORT_CAP_SPEED_10G)) | 3830 | else if (stat & FW_PORT_CMD_LSPEED_V(FW_PORT_CAP_SPEED_10G)) |
3831 | speed = 10000; | 3831 | speed = 10000; |
3832 | else if (stat & FW_PORT_CMD_LSPEED(FW_PORT_CAP_SPEED_40G)) | 3832 | else if (stat & FW_PORT_CMD_LSPEED_V(FW_PORT_CAP_SPEED_40G)) |
3833 | speed = 40000; | 3833 | speed = 40000; |
3834 | 3834 | ||
3835 | if (link_ok != lc->link_ok || speed != lc->speed || | 3835 | if (link_ok != lc->link_ok || speed != lc->speed || |
@@ -4124,9 +4124,9 @@ int t4_port_init(struct adapter *adap, int mbox, int pf, int vf) | |||
4124 | 4124 | ||
4125 | c.op_to_portid = htonl(FW_CMD_OP_V(FW_PORT_CMD) | | 4125 | c.op_to_portid = htonl(FW_CMD_OP_V(FW_PORT_CMD) | |
4126 | FW_CMD_REQUEST_F | FW_CMD_READ_F | | 4126 | FW_CMD_REQUEST_F | FW_CMD_READ_F | |
4127 | FW_PORT_CMD_PORTID(j)); | 4127 | FW_PORT_CMD_PORTID_V(j)); |
4128 | c.action_to_len16 = htonl( | 4128 | c.action_to_len16 = htonl( |
4129 | FW_PORT_CMD_ACTION(FW_PORT_ACTION_GET_PORT_INFO) | | 4129 | FW_PORT_CMD_ACTION_V(FW_PORT_ACTION_GET_PORT_INFO) | |
4130 | FW_LEN16(c)); | 4130 | FW_LEN16(c)); |
4131 | ret = t4_wr_mbox(adap, mbox, &c, sizeof(c), &c); | 4131 | ret = t4_wr_mbox(adap, mbox, &c, sizeof(c), &c); |
4132 | if (ret) | 4132 | if (ret) |
@@ -4144,9 +4144,9 @@ int t4_port_init(struct adapter *adap, int mbox, int pf, int vf) | |||
4144 | adap->port[i]->dev_port = j; | 4144 | adap->port[i]->dev_port = j; |
4145 | 4145 | ||
4146 | ret = ntohl(c.u.info.lstatus_to_modtype); | 4146 | ret = ntohl(c.u.info.lstatus_to_modtype); |
4147 | p->mdio_addr = (ret & FW_PORT_CMD_MDIOCAP) ? | 4147 | p->mdio_addr = (ret & FW_PORT_CMD_MDIOCAP_F) ? |
4148 | FW_PORT_CMD_MDIOADDR_GET(ret) : -1; | 4148 | FW_PORT_CMD_MDIOADDR_G(ret) : -1; |
4149 | p->port_type = FW_PORT_CMD_PTYPE_GET(ret); | 4149 | p->port_type = FW_PORT_CMD_PTYPE_G(ret); |
4150 | p->mod_type = FW_PORT_MOD_TYPE_NA; | 4150 | p->mod_type = FW_PORT_MOD_TYPE_NA; |
4151 | 4151 | ||
4152 | rvc.op_to_viid = htonl(FW_CMD_OP_V(FW_RSS_VI_CONFIG_CMD) | | 4152 | rvc.op_to_viid = htonl(FW_CMD_OP_V(FW_RSS_VI_CONFIG_CMD) | |