Commit 1ecc7b7a authored by Hariprasad Shenai's avatar Hariprasad Shenai Committed by David S. Miller

cxgb4/cxgb4vf: Cleanup macros, add comments and add new MACROS

Cleanup few MACROS left out in t4_hw.h to be consistent with the
existing ones. Also replace few hardcoded values with MACROS. Also
update comments for some code
Signed-off-by: default avatarHariprasad Shenai <hariprasad@chelsio.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 82fa3c77
...@@ -578,7 +578,7 @@ static int get_coalesce(struct net_device *dev, struct ethtool_coalesce *c) ...@@ -578,7 +578,7 @@ static int get_coalesce(struct net_device *dev, struct ethtool_coalesce *c)
const struct sge_rspq *rq = &adap->sge.ethrxq[pi->first_qset].rspq; const struct sge_rspq *rq = &adap->sge.ethrxq[pi->first_qset].rspq;
c->rx_coalesce_usecs = qtimer_val(adap, rq); c->rx_coalesce_usecs = qtimer_val(adap, rq);
c->rx_max_coalesced_frames = (rq->intr_params & QINTR_CNT_EN) ? c->rx_max_coalesced_frames = (rq->intr_params & QINTR_CNT_EN_F) ?
adap->sge.counter_val[rq->pktcnt_idx] : 0; adap->sge.counter_val[rq->pktcnt_idx] : 0;
c->use_adaptive_rx_coalesce = get_adaptive_rx_setting(dev); c->use_adaptive_rx_coalesce = get_adaptive_rx_setting(dev);
return 0; return 0;
......
...@@ -1420,7 +1420,7 @@ int cxgb4_set_rspq_intr_params(struct sge_rspq *q, ...@@ -1420,7 +1420,7 @@ int cxgb4_set_rspq_intr_params(struct sge_rspq *q,
} }
us = us == 0 ? 6 : closest_timer(&adap->sge, us); us = us == 0 ? 6 : closest_timer(&adap->sge, us);
q->intr_params = QINTR_TIMER_IDX(us) | (cnt > 0 ? QINTR_CNT_EN : 0); q->intr_params = QINTR_TIMER_IDX_V(us) | QINTR_CNT_EN_V(cnt > 0);
return 0; return 0;
} }
......
This diff is collapsed.
...@@ -152,17 +152,33 @@ struct rsp_ctrl { ...@@ -152,17 +152,33 @@ struct rsp_ctrl {
}; };
}; };
#define RSPD_NEWBUF 0x80000000U #define RSPD_NEWBUF_S 31
#define RSPD_LEN(x) (((x) >> 0) & 0x7fffffffU) #define RSPD_NEWBUF_V(x) ((x) << RSPD_NEWBUF_S)
#define RSPD_QID(x) RSPD_LEN(x) #define RSPD_NEWBUF_F RSPD_NEWBUF_V(1U)
#define RSPD_GEN(x) ((x) >> 7) #define RSPD_LEN_S 0
#define RSPD_TYPE(x) (((x) >> 4) & 3) #define RSPD_LEN_M 0x7fffffff
#define RSPD_LEN_G(x) (((x) >> RSPD_LEN_S) & RSPD_LEN_M)
#define V_QINTR_CNT_EN 0x0 #define RSPD_QID_S RSPD_LEN_S
#define QINTR_CNT_EN 0x1 #define RSPD_QID_M RSPD_LEN_M
#define QINTR_TIMER_IDX(x) ((x) << 1) #define RSPD_QID_G(x) RSPD_LEN_G(x)
#define QINTR_TIMER_IDX_GET(x) (((x) >> 1) & 0x7)
#define RSPD_GEN_S 7
#define RSPD_TYPE_S 4
#define RSPD_TYPE_M 0x3
#define RSPD_TYPE_G(x) (((x) >> RSPD_TYPE_S) & RSPD_TYPE_M)
/* Rx queue interrupt deferral fields: counter enable and timer index */
#define QINTR_CNT_EN_S 0
#define QINTR_CNT_EN_V(x) ((x) << QINTR_CNT_EN_S)
#define QINTR_CNT_EN_F QINTR_CNT_EN_V(1U)
#define QINTR_TIMER_IDX_S 1
#define QINTR_TIMER_IDX_M 0x7
#define QINTR_TIMER_IDX_V(x) ((x) << QINTR_TIMER_IDX_S)
#define QINTR_TIMER_IDX_G(x) (((x) >> QINTR_TIMER_IDX_S) & QINTR_TIMER_IDX_M)
/* /*
* Flash layout. * Flash layout.
......
...@@ -634,26 +634,9 @@ struct cpl_tid_release { ...@@ -634,26 +634,9 @@ struct cpl_tid_release {
struct cpl_tx_pkt_core { struct cpl_tx_pkt_core {
__be32 ctrl0; __be32 ctrl0;
#define TXPKT_VF(x) ((x) << 0)
#define TXPKT_PF(x) ((x) << 8)
#define TXPKT_VF_VLD (1 << 11)
#define TXPKT_OVLAN_IDX(x) ((x) << 12)
#define TXPKT_INTF(x) ((x) << 16)
#define TXPKT_INS_OVLAN (1 << 21)
#define TXPKT_OPCODE(x) ((x) << 24)
__be16 pack; __be16 pack;
__be16 len; __be16 len;
__be64 ctrl1; __be64 ctrl1;
#define TXPKT_CSUM_END(x) ((x) << 12)
#define TXPKT_CSUM_START(x) ((x) << 20)
#define TXPKT_IPHDR_LEN(x) ((u64)(x) << 20)
#define TXPKT_CSUM_LOC(x) ((u64)(x) << 30)
#define TXPKT_ETHHDR_LEN(x) ((u64)(x) << 34)
#define TXPKT_CSUM_TYPE(x) ((u64)(x) << 40)
#define TXPKT_VLAN(x) ((u64)(x) << 44)
#define TXPKT_VLAN_VLD (1ULL << 60)
#define TXPKT_IPCSUM_DIS (1ULL << 62)
#define TXPKT_L4CSUM_DIS (1ULL << 63)
}; };
struct cpl_tx_pkt { struct cpl_tx_pkt {
...@@ -663,16 +646,66 @@ struct cpl_tx_pkt { ...@@ -663,16 +646,66 @@ struct cpl_tx_pkt {
#define cpl_tx_pkt_xt cpl_tx_pkt #define cpl_tx_pkt_xt cpl_tx_pkt
/* cpl_tx_pkt_core.ctrl0 fields */
#define TXPKT_VF_S 0
#define TXPKT_VF_V(x) ((x) << TXPKT_VF_S)
#define TXPKT_PF_S 8
#define TXPKT_PF_V(x) ((x) << TXPKT_PF_S)
#define TXPKT_VF_VLD_S 11
#define TXPKT_VF_VLD_V(x) ((x) << TXPKT_VF_VLD_S)
#define TXPKT_VF_VLD_F TXPKT_VF_VLD_V(1U)
#define TXPKT_OVLAN_IDX_S 12
#define TXPKT_OVLAN_IDX_V(x) ((x) << TXPKT_OVLAN_IDX_S)
#define TXPKT_INTF_S 16
#define TXPKT_INTF_V(x) ((x) << TXPKT_INTF_S)
#define TXPKT_INS_OVLAN_S 21
#define TXPKT_INS_OVLAN_V(x) ((x) << TXPKT_INS_OVLAN_S)
#define TXPKT_INS_OVLAN_F TXPKT_INS_OVLAN_V(1U)
#define TXPKT_OPCODE_S 24
#define TXPKT_OPCODE_V(x) ((x) << TXPKT_OPCODE_S)
/* cpl_tx_pkt_core.ctrl1 fields */
#define TXPKT_CSUM_END_S 12
#define TXPKT_CSUM_END_V(x) ((x) << TXPKT_CSUM_END_S)
#define TXPKT_CSUM_START_S 20
#define TXPKT_CSUM_START_V(x) ((x) << TXPKT_CSUM_START_S)
#define TXPKT_IPHDR_LEN_S 20
#define TXPKT_IPHDR_LEN_V(x) ((__u64)(x) << TXPKT_IPHDR_LEN_S)
#define TXPKT_CSUM_LOC_S 30
#define TXPKT_CSUM_LOC_V(x) ((__u64)(x) << TXPKT_CSUM_LOC_S)
#define TXPKT_ETHHDR_LEN_S 34
#define TXPKT_ETHHDR_LEN_V(x) ((__u64)(x) << TXPKT_ETHHDR_LEN_S)
#define TXPKT_CSUM_TYPE_S 40
#define TXPKT_CSUM_TYPE_V(x) ((__u64)(x) << TXPKT_CSUM_TYPE_S)
#define TXPKT_VLAN_S 44
#define TXPKT_VLAN_V(x) ((__u64)(x) << TXPKT_VLAN_S)
#define TXPKT_VLAN_VLD_S 60
#define TXPKT_VLAN_VLD_V(x) ((__u64)(x) << TXPKT_VLAN_VLD_S)
#define TXPKT_VLAN_VLD_F TXPKT_VLAN_VLD_V(1ULL)
#define TXPKT_IPCSUM_DIS_S 62
#define TXPKT_IPCSUM_DIS_V(x) ((__u64)(x) << TXPKT_IPCSUM_DIS_S)
#define TXPKT_IPCSUM_DIS_F TXPKT_IPCSUM_DIS_V(1ULL)
#define TXPKT_L4CSUM_DIS_S 63
#define TXPKT_L4CSUM_DIS_V(x) ((__u64)(x) << TXPKT_L4CSUM_DIS_S)
#define TXPKT_L4CSUM_DIS_F TXPKT_L4CSUM_DIS_V(1ULL)
struct cpl_tx_pkt_lso_core { struct cpl_tx_pkt_lso_core {
__be32 lso_ctrl; __be32 lso_ctrl;
#define LSO_TCPHDR_LEN(x) ((x) << 0)
#define LSO_IPHDR_LEN(x) ((x) << 4)
#define LSO_ETHHDR_LEN(x) ((x) << 16)
#define LSO_IPV6(x) ((x) << 20)
#define LSO_LAST_SLICE (1 << 22)
#define LSO_FIRST_SLICE (1 << 23)
#define LSO_OPCODE(x) ((x) << 24)
#define LSO_T5_XFER_SIZE(x) ((x) << 0)
__be16 ipid_ofst; __be16 ipid_ofst;
__be16 mss; __be16 mss;
__be32 seqno_offset; __be32 seqno_offset;
......
...@@ -61,6 +61,20 @@ ...@@ -61,6 +61,20 @@
#define SGE_TIMERREGS 6 #define SGE_TIMERREGS 6
#define TIMERREG_COUNTER0_X 0 #define TIMERREG_COUNTER0_X 0
#define FETCHBURSTMIN_64B_X 2
#define FETCHBURSTMAX_512B_X 3
#define HOSTFCMODE_STATUS_PAGE_X 2
#define CIDXFLUSHTHRESH_32_X 5
#define UPDATEDELIVERY_INTERRUPT_X 1
#define RSPD_TYPE_FLBUF_X 0
#define RSPD_TYPE_CPL_X 1
#define RSPD_TYPE_INTR_X 2
/* Congestion Manager Definitions. /* Congestion Manager Definitions.
*/ */
#define CONMCTXT_CNGTPMODE_S 19 #define CONMCTXT_CNGTPMODE_S 19
......
...@@ -1592,6 +1592,7 @@ struct fw_eq_eth_cmd { ...@@ -1592,6 +1592,7 @@ struct fw_eq_eth_cmd {
#define FW_EQ_ETH_CMD_FETCHRO_S 22 #define FW_EQ_ETH_CMD_FETCHRO_S 22
#define FW_EQ_ETH_CMD_FETCHRO_V(x) ((x) << FW_EQ_ETH_CMD_FETCHRO_S) #define FW_EQ_ETH_CMD_FETCHRO_V(x) ((x) << FW_EQ_ETH_CMD_FETCHRO_S)
#define FW_EQ_ETH_CMD_FETCHRO_F FW_EQ_ETH_CMD_FETCHRO_V(1U)
#define FW_EQ_ETH_CMD_HOSTFCMODE_S 20 #define FW_EQ_ETH_CMD_HOSTFCMODE_S 20
#define FW_EQ_ETH_CMD_HOSTFCMODE_V(x) ((x) << FW_EQ_ETH_CMD_HOSTFCMODE_S) #define FW_EQ_ETH_CMD_HOSTFCMODE_V(x) ((x) << FW_EQ_ETH_CMD_HOSTFCMODE_S)
......
...@@ -1021,7 +1021,7 @@ static int closest_thres(const struct sge *s, int thres) ...@@ -1021,7 +1021,7 @@ static int closest_thres(const struct sge *s, int thres)
static unsigned int qtimer_val(const struct adapter *adapter, static unsigned int qtimer_val(const struct adapter *adapter,
const struct sge_rspq *rspq) const struct sge_rspq *rspq)
{ {
unsigned int timer_idx = QINTR_TIMER_IDX_GET(rspq->intr_params); unsigned int timer_idx = QINTR_TIMER_IDX_G(rspq->intr_params);
return timer_idx < SGE_NTIMERS return timer_idx < SGE_NTIMERS
? adapter->sge.timer_val[timer_idx] ? adapter->sge.timer_val[timer_idx]
...@@ -1086,8 +1086,8 @@ static int set_rxq_intr_params(struct adapter *adapter, struct sge_rspq *rspq, ...@@ -1086,8 +1086,8 @@ static int set_rxq_intr_params(struct adapter *adapter, struct sge_rspq *rspq,
* Update the response queue's interrupt coalescing parameters and * Update the response queue's interrupt coalescing parameters and
* return success. * return success.
*/ */
rspq->intr_params = (QINTR_TIMER_IDX(timer_idx) | rspq->intr_params = (QINTR_TIMER_IDX_V(timer_idx) |
(cnt > 0 ? QINTR_CNT_EN : 0)); QINTR_CNT_EN_V(cnt > 0));
return 0; return 0;
} }
...@@ -1439,7 +1439,7 @@ static int cxgb4vf_get_coalesce(struct net_device *dev, ...@@ -1439,7 +1439,7 @@ static int cxgb4vf_get_coalesce(struct net_device *dev,
coalesce->rx_coalesce_usecs = qtimer_val(adapter, rspq); coalesce->rx_coalesce_usecs = qtimer_val(adapter, rspq);
coalesce->rx_max_coalesced_frames = coalesce->rx_max_coalesced_frames =
((rspq->intr_params & QINTR_CNT_EN) ((rspq->intr_params & QINTR_CNT_EN_F)
? adapter->sge.counter_val[rspq->pktcnt_idx] ? adapter->sge.counter_val[rspq->pktcnt_idx]
: 0); : 0);
return 0; return 0;
...@@ -2393,8 +2393,9 @@ static inline void init_rspq(struct sge_rspq *rspq, u8 timer_idx, ...@@ -2393,8 +2393,9 @@ static inline void init_rspq(struct sge_rspq *rspq, u8 timer_idx,
u8 pkt_cnt_idx, unsigned int size, u8 pkt_cnt_idx, unsigned int size,
unsigned int iqe_size) unsigned int iqe_size)
{ {
rspq->intr_params = (QINTR_TIMER_IDX(timer_idx) | rspq->intr_params = (QINTR_TIMER_IDX_V(timer_idx) |
(pkt_cnt_idx < SGE_NCOUNTERS ? QINTR_CNT_EN : 0)); (pkt_cnt_idx < SGE_NCOUNTERS ?
QINTR_CNT_EN_F : 0));
rspq->pktcnt_idx = (pkt_cnt_idx < SGE_NCOUNTERS rspq->pktcnt_idx = (pkt_cnt_idx < SGE_NCOUNTERS
? pkt_cnt_idx ? pkt_cnt_idx
: 0); : 0);
......
...@@ -1100,7 +1100,7 @@ static u64 hwcsum(const struct sk_buff *skb) ...@@ -1100,7 +1100,7 @@ static u64 hwcsum(const struct sk_buff *skb)
* unknown protocol, disable HW csum * unknown protocol, disable HW csum
* and hope a bad packet is detected * and hope a bad packet is detected
*/ */
return TXPKT_L4CSUM_DIS; return TXPKT_L4CSUM_DIS_F;
} }
} else { } else {
/* /*
...@@ -1117,15 +1117,15 @@ static u64 hwcsum(const struct sk_buff *skb) ...@@ -1117,15 +1117,15 @@ static u64 hwcsum(const struct sk_buff *skb)
} }
if (likely(csum_type >= TX_CSUM_TCPIP)) if (likely(csum_type >= TX_CSUM_TCPIP))
return TXPKT_CSUM_TYPE(csum_type) | return TXPKT_CSUM_TYPE_V(csum_type) |
TXPKT_IPHDR_LEN(skb_network_header_len(skb)) | TXPKT_IPHDR_LEN_V(skb_network_header_len(skb)) |
TXPKT_ETHHDR_LEN(skb_network_offset(skb) - ETH_HLEN); TXPKT_ETHHDR_LEN_V(skb_network_offset(skb) - ETH_HLEN);
else { else {
int start = skb_transport_offset(skb); int start = skb_transport_offset(skb);
return TXPKT_CSUM_TYPE(csum_type) | return TXPKT_CSUM_TYPE_V(csum_type) |
TXPKT_CSUM_START(start) | TXPKT_CSUM_START_V(start) |
TXPKT_CSUM_LOC(start + skb->csum_offset); TXPKT_CSUM_LOC_V(start + skb->csum_offset);
} }
} }
...@@ -1288,29 +1288,30 @@ int t4vf_eth_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -1288,29 +1288,30 @@ int t4vf_eth_xmit(struct sk_buff *skb, struct net_device *dev)
* Fill in the LSO CPL message. * Fill in the LSO CPL message.
*/ */
lso->lso_ctrl = lso->lso_ctrl =
cpu_to_be32(LSO_OPCODE(CPL_TX_PKT_LSO) | cpu_to_be32(LSO_OPCODE_V(CPL_TX_PKT_LSO) |
LSO_FIRST_SLICE | LSO_FIRST_SLICE_F |
LSO_LAST_SLICE | LSO_LAST_SLICE_F |
LSO_IPV6(v6) | LSO_IPV6_V(v6) |
LSO_ETHHDR_LEN(eth_xtra_len/4) | LSO_ETHHDR_LEN_V(eth_xtra_len / 4) |
LSO_IPHDR_LEN(l3hdr_len/4) | LSO_IPHDR_LEN_V(l3hdr_len / 4) |
LSO_TCPHDR_LEN(tcp_hdr(skb)->doff)); LSO_TCPHDR_LEN_V(tcp_hdr(skb)->doff));
lso->ipid_ofst = cpu_to_be16(0); lso->ipid_ofst = cpu_to_be16(0);
lso->mss = cpu_to_be16(ssi->gso_size); lso->mss = cpu_to_be16(ssi->gso_size);
lso->seqno_offset = cpu_to_be32(0); lso->seqno_offset = cpu_to_be32(0);
if (is_t4(adapter->params.chip)) if (is_t4(adapter->params.chip))
lso->len = cpu_to_be32(skb->len); lso->len = cpu_to_be32(skb->len);
else else
lso->len = cpu_to_be32(LSO_T5_XFER_SIZE(skb->len)); lso->len = cpu_to_be32(LSO_T5_XFER_SIZE_V(skb->len));
/* /*
* Set up TX Packet CPL pointer, control word and perform * Set up TX Packet CPL pointer, control word and perform
* accounting. * accounting.
*/ */
cpl = (void *)(lso + 1); cpl = (void *)(lso + 1);
cntrl = (TXPKT_CSUM_TYPE(v6 ? TX_CSUM_TCPIP6 : TX_CSUM_TCPIP) | cntrl = (TXPKT_CSUM_TYPE_V(v6 ?
TXPKT_IPHDR_LEN(l3hdr_len) | TX_CSUM_TCPIP6 : TX_CSUM_TCPIP) |
TXPKT_ETHHDR_LEN(eth_xtra_len)); TXPKT_IPHDR_LEN_V(l3hdr_len) |
TXPKT_ETHHDR_LEN_V(eth_xtra_len));
txq->tso++; txq->tso++;
txq->tx_cso += ssi->gso_segs; txq->tx_cso += ssi->gso_segs;
} else { } else {
...@@ -1327,10 +1328,10 @@ int t4vf_eth_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -1327,10 +1328,10 @@ int t4vf_eth_xmit(struct sk_buff *skb, struct net_device *dev)
*/ */
cpl = (void *)(wr + 1); cpl = (void *)(wr + 1);
if (skb->ip_summed == CHECKSUM_PARTIAL) { if (skb->ip_summed == CHECKSUM_PARTIAL) {
cntrl = hwcsum(skb) | TXPKT_IPCSUM_DIS; cntrl = hwcsum(skb) | TXPKT_IPCSUM_DIS_F;
txq->tx_cso++; txq->tx_cso++;
} else } else
cntrl = TXPKT_L4CSUM_DIS | TXPKT_IPCSUM_DIS; cntrl = TXPKT_L4CSUM_DIS_F | TXPKT_IPCSUM_DIS_F;
} }
/* /*
...@@ -1339,15 +1340,15 @@ int t4vf_eth_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -1339,15 +1340,15 @@ int t4vf_eth_xmit(struct sk_buff *skb, struct net_device *dev)
*/ */
if (skb_vlan_tag_present(skb)) { if (skb_vlan_tag_present(skb)) {
txq->vlan_ins++; txq->vlan_ins++;
cntrl |= TXPKT_VLAN_VLD | TXPKT_VLAN(skb_vlan_tag_get(skb)); cntrl |= TXPKT_VLAN_VLD_F | TXPKT_VLAN_V(skb_vlan_tag_get(skb));
} }
/* /*
* Fill in the TX Packet CPL message header. * Fill in the TX Packet CPL message header.
*/ */
cpl->ctrl0 = cpu_to_be32(TXPKT_OPCODE(CPL_TX_PKT_XT) | cpl->ctrl0 = cpu_to_be32(TXPKT_OPCODE_V(CPL_TX_PKT_XT) |
TXPKT_INTF(pi->port_id) | TXPKT_INTF_V(pi->port_id) |
TXPKT_PF(0)); TXPKT_PF_V(0));
cpl->pack = cpu_to_be16(0); cpl->pack = cpu_to_be16(0);
cpl->len = cpu_to_be16(skb->len); cpl->len = cpu_to_be16(skb->len);
cpl->ctrl1 = cpu_to_be64(cntrl); cpl->ctrl1 = cpu_to_be64(cntrl);
...@@ -1670,7 +1671,7 @@ int t4vf_ethrx_handler(struct sge_rspq *rspq, const __be64 *rsp, ...@@ -1670,7 +1671,7 @@ int t4vf_ethrx_handler(struct sge_rspq *rspq, const __be64 *rsp,
static inline bool is_new_response(const struct rsp_ctrl *rc, static inline bool is_new_response(const struct rsp_ctrl *rc,
const struct sge_rspq *rspq) const struct sge_rspq *rspq)
{ {
return RSPD_GEN(rc->type_gen) == rspq->gen; return ((rc->type_gen >> RSPD_GEN_S) & 0x1) == rspq->gen;
} }
/** /**
...@@ -1759,8 +1760,8 @@ static int process_responses(struct sge_rspq *rspq, int budget) ...@@ -1759,8 +1760,8 @@ static int process_responses(struct sge_rspq *rspq, int budget)
* SGE. * SGE.
*/ */
dma_rmb(); dma_rmb();
rsp_type = RSPD_TYPE(rc->type_gen); rsp_type = RSPD_TYPE_G(rc->type_gen);
if (likely(rsp_type == RSP_TYPE_FLBUF)) { if (likely(rsp_type == RSPD_TYPE_FLBUF_X)) {
struct page_frag *fp; struct page_frag *fp;
struct pkt_gl gl; struct pkt_gl gl;
const struct rx_sw_desc *sdesc; const struct rx_sw_desc *sdesc;
...@@ -1771,7 +1772,7 @@ static int process_responses(struct sge_rspq *rspq, int budget) ...@@ -1771,7 +1772,7 @@ static int process_responses(struct sge_rspq *rspq, int budget)
* If we get a "new buffer" message from the SGE we * If we get a "new buffer" message from the SGE we
* need to move on to the next Free List buffer. * need to move on to the next Free List buffer.
*/ */
if (len & RSPD_NEWBUF) { if (len & RSPD_NEWBUF_F) {
/* /*
* We get one "new buffer" message when we * We get one "new buffer" message when we
* first start up a queue so we need to ignore * first start up a queue so we need to ignore
...@@ -1782,7 +1783,7 @@ static int process_responses(struct sge_rspq *rspq, int budget) ...@@ -1782,7 +1783,7 @@ static int process_responses(struct sge_rspq *rspq, int budget)
1); 1);
rspq->offset = 0; rspq->offset = 0;
} }
len = RSPD_LEN(len); len = RSPD_LEN_G(len);
} }
gl.tot_len = len; gl.tot_len = len;
...@@ -1825,10 +1826,10 @@ static int process_responses(struct sge_rspq *rspq, int budget) ...@@ -1825,10 +1826,10 @@ static int process_responses(struct sge_rspq *rspq, int budget)
rspq->offset += ALIGN(fp->size, s->fl_align); rspq->offset += ALIGN(fp->size, s->fl_align);
else else
restore_rx_bufs(&gl, &rxq->fl, frag); restore_rx_bufs(&gl, &rxq->fl, frag);
} else if (likely(rsp_type == RSP_TYPE_CPL)) { } else if (likely(rsp_type == RSPD_TYPE_CPL_X)) {
ret = rspq->handler(rspq, rspq->cur_desc, NULL); ret = rspq->handler(rspq, rspq->cur_desc, NULL);
} else { } else {
WARN_ON(rsp_type > RSP_TYPE_CPL); WARN_ON(rsp_type > RSPD_TYPE_CPL_X);
ret = 0; ret = 0;
} }
...@@ -1840,7 +1841,7 @@ static int process_responses(struct sge_rspq *rspq, int budget) ...@@ -1840,7 +1841,7 @@ static int process_responses(struct sge_rspq *rspq, int budget)
*/ */
const int NOMEM_TIMER_IDX = SGE_NTIMERS-1; const int NOMEM_TIMER_IDX = SGE_NTIMERS-1;
rspq->next_intr_params = rspq->next_intr_params =
QINTR_TIMER_IDX(NOMEM_TIMER_IDX); QINTR_TIMER_IDX_V(NOMEM_TIMER_IDX);
break; break;
} }
...@@ -1882,7 +1883,7 @@ static int napi_rx_handler(struct napi_struct *napi, int budget) ...@@ -1882,7 +1883,7 @@ static int napi_rx_handler(struct napi_struct *napi, int budget)
intr_params = rspq->next_intr_params; intr_params = rspq->next_intr_params;
rspq->next_intr_params = rspq->intr_params; rspq->next_intr_params = rspq->intr_params;
} else } else
intr_params = QINTR_TIMER_IDX(SGE_TIMER_UPD_CIDX); intr_params = QINTR_TIMER_IDX_V(SGE_TIMER_UPD_CIDX);
if (unlikely(work_done == 0)) if (unlikely(work_done == 0))
rspq->unhandled_irqs++; rspq->unhandled_irqs++;
...@@ -1943,10 +1944,10 @@ static unsigned int process_intrq(struct adapter *adapter) ...@@ -1943,10 +1944,10 @@ static unsigned int process_intrq(struct adapter *adapter)
* never happen ... * never happen ...
*/ */
dma_rmb(); dma_rmb();
if (unlikely(RSPD_TYPE(rc->type_gen) != RSP_TYPE_INTR)) { if (unlikely(RSPD_TYPE_G(rc->type_gen) != RSPD_TYPE_INTR_X)) {
dev_err(adapter->pdev_dev, dev_err(adapter->pdev_dev,
"Unexpected INTRQ response type %d\n", "Unexpected INTRQ response type %d\n",
RSPD_TYPE(rc->type_gen)); RSPD_TYPE_G(rc->type_gen));
continue; continue;
} }
...@@ -1958,7 +1959,7 @@ static unsigned int process_intrq(struct adapter *adapter) ...@@ -1958,7 +1959,7 @@ static unsigned int process_intrq(struct adapter *adapter)
* want to either make them fatal and/or conditionalized under * want to either make them fatal and/or conditionalized under
* DEBUG. * DEBUG.
*/ */
qid = RSPD_QID(be32_to_cpu(rc->pldbuflen_qid)); qid = RSPD_QID_G(be32_to_cpu(rc->pldbuflen_qid));
iq_idx = IQ_IDX(s, qid); iq_idx = IQ_IDX(s, qid);
if (unlikely(iq_idx >= MAX_INGQ)) { if (unlikely(iq_idx >= MAX_INGQ)) {
dev_err(adapter->pdev_dev, dev_err(adapter->pdev_dev,
......
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