Commit a515abd7 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'cxgb4-next' 



Hariprasad Shenai says:

====================
RDMA/cxgb4/cxgb4vf/csiostor: Cleanup register defines

This series continues to cleanup all the macros/register defines related to
SGE, PCIE, MC, MA, TCAM, MAC, etc that are defined in t4_regs.h and the
affected files.

Will post another 1 or 2 series so that we can cover all the macros so that
they all follow the same style to be consistent.

The patches series is created against 'net-next' tree.
And includes patches on cxgb4, cxgb4vf, iw_cxgb4 and csiostor driver.

We have included all the maintainers of respective drivers. Kindly review the
change and let us know in case of any review comments.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5f07b3c5 0d804338

drivers/infiniband/hw/cxgb4/t4.h

+13 −13
Original line number Diff line number Diff line
@@ -465,14 +465,14 @@ static inline void t4_ring_sq_db(struct t4_wq *wq, u16 inc, u8 t5, 
		} else {

			PDBG("%s: DB wq->sq.pidx = %d\n",

			     __func__, wq->sq.pidx);

			writel(PIDX_T5(inc), wq->sq.udb);

			writel(PIDX_T5_V(inc), wq->sq.udb);

		}



		/* Flush user doorbell area writes. */

		wmb();

		return;

	}

	writel(QID(wq->sq.qid) | PIDX(inc), wq->db);

	writel(QID_V(wq->sq.qid) | PIDX_V(inc), wq->db);

}



static inline void t4_ring_rq_db(struct t4_wq *wq, u16 inc, u8 t5,
@@ -489,14 +489,14 @@ static inline void t4_ring_rq_db(struct t4_wq *wq, u16 inc, u8 t5, 
		} else {

			PDBG("%s: DB wq->rq.pidx = %d\n",

			     __func__, wq->rq.pidx);

			writel(PIDX_T5(inc), wq->rq.udb);

			writel(PIDX_T5_V(inc), wq->rq.udb);

		}



		/* Flush user doorbell area writes. */

		wmb();

		return;

	}

	writel(QID(wq->rq.qid) | PIDX(inc), wq->db);

	writel(QID_V(wq->rq.qid) | PIDX_V(inc), wq->db);

}



static inline int t4_wq_in_error(struct t4_wq *wq)
@@ -561,14 +561,14 @@ static inline int t4_arm_cq(struct t4_cq *cq, int se) 
	u32 val;



	set_bit(CQ_ARMED, &cq->flags);

	while (cq->cidx_inc > CIDXINC_MASK) {

		val = SEINTARM(0) | CIDXINC(CIDXINC_MASK) | TIMERREG(7) |

		      INGRESSQID(cq->cqid);

	while (cq->cidx_inc > CIDXINC_M) {

		val = SEINTARM_V(0) | CIDXINC_V(CIDXINC_M) | TIMERREG_V(7) |

		      INGRESSQID_V(cq->cqid);

		writel(val, cq->gts);

		cq->cidx_inc -= CIDXINC_MASK;

		cq->cidx_inc -= CIDXINC_M;

	}

	val = SEINTARM(se) | CIDXINC(cq->cidx_inc) | TIMERREG(6) |

	      INGRESSQID(cq->cqid);

	val = SEINTARM_V(se) | CIDXINC_V(cq->cidx_inc) | TIMERREG_V(6) |

	      INGRESSQID_V(cq->cqid);

	writel(val, cq->gts);

	cq->cidx_inc = 0;

	return 0;
@@ -597,11 +597,11 @@ static inline void t4_swcq_consume(struct t4_cq *cq) 
static inline void t4_hwcq_consume(struct t4_cq *cq)

{

	cq->bits_type_ts = cq->queue[cq->cidx].bits_type_ts;

	if (++cq->cidx_inc == (cq->size >> 4) || cq->cidx_inc == CIDXINC_MASK) {

	if (++cq->cidx_inc == (cq->size >> 4) || cq->cidx_inc == CIDXINC_M) {

		u32 val;



		val = SEINTARM(0) | CIDXINC(cq->cidx_inc) | TIMERREG(7) |

		      INGRESSQID(cq->cqid);

		val = SEINTARM_V(0) | CIDXINC_V(cq->cidx_inc) | TIMERREG_V(7) |

		      INGRESSQID_V(cq->cqid);

		writel(val, cq->gts);

		cq->cidx_inc = 0;

	}

drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c

+140 −126

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/ethernet/chelsio/cxgb4/l2t.c

+5 −4
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
#include "t4_msg.h"

#include "t4fw_api.h"

#include "t4_regs.h"

#include "t4_values.h"



#define VLAN_NONE 0xfff
@@ -425,7 +426,7 @@ u64 cxgb4_select_ntuple(struct net_device *dev, 
	 * in the Compressed Filter Tuple.

	 */

	if (tp->vlan_shift >= 0 && l2t->vlan != VLAN_NONE)

		ntuple |= (u64)(F_FT_VLAN_VLD | l2t->vlan) << tp->vlan_shift;

		ntuple |= (u64)(FT_VLAN_VLD_F | l2t->vlan) << tp->vlan_shift;



	if (tp->port_shift >= 0)

		ntuple |= (u64)l2t->lport << tp->port_shift;
@@ -439,9 +440,9 @@ u64 cxgb4_select_ntuple(struct net_device *dev, 
		u32 pf = FW_VIID_PFN_G(viid);

		u32 vld = FW_VIID_VIVLD_G(viid);



		ntuple |= (u64)(V_FT_VNID_ID_VF(vf) |

				V_FT_VNID_ID_PF(pf) |

				V_FT_VNID_ID_VLD(vld)) << tp->vnic_shift;

		ntuple |= (u64)(FT_VNID_ID_VF_V(vf) |

				FT_VNID_ID_PF_V(pf) |

				FT_VNID_ID_VLD_V(vld)) << tp->vnic_shift;

	}



	return ntuple;

drivers/net/ethernet/chelsio/cxgb4/sge.c

+88 −86

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/ethernet/chelsio/cxgb4/t4_hw.c

+486 −474

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE