Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'cxgb4-next' 



Hariprasad Shenai says:

====================
RDMA/cxgb4,cxgb4vf,csiostor: Cleanup macros

This series continues to cleanup all the macros/register defines related to
filter, port, VI, queue, RSS, LDST, firmware, etc that are defined in t4fw_api.h
and the affected files.

Will post few more 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 2f90ade6 b2e1a3f0

drivers/infiniband/hw/cxgb4/cm.c

+8 −8
Original line number Original line Diff line number Diff line
@@ -478,7 +478,7 @@ static void send_flowc(struct c4iw_ep *ep, struct sk_buff *skb) 
					  16)) | FW_WR_FLOWID_V(ep->hwtid));

					  16)) | FW_WR_FLOWID_V(ep->hwtid));





	flowc->mnemval[0].mnemonic = FW_FLOWC_MNEM_PFNVFN;

	flowc->mnemval[0].mnemonic = FW_FLOWC_MNEM_PFNVFN;

	flowc->mnemval[0].val = cpu_to_be32(FW_PFVF_CMD_PFN

	flowc->mnemval[0].val = cpu_to_be32(FW_PFVF_CMD_PFN_V

					    (ep->com.dev->rdev.lldi.pf));

					    (ep->com.dev->rdev.lldi.pf));

	flowc->mnemval[1].mnemonic = FW_FLOWC_MNEM_CH;

	flowc->mnemval[1].mnemonic = FW_FLOWC_MNEM_CH;

	flowc->mnemval[1].val = cpu_to_be32(ep->tx_chan);

	flowc->mnemval[1].val = cpu_to_be32(ep->tx_chan);
@@ -1762,10 +1762,10 @@ static void send_fw_act_open_req(struct c4iw_ep *ep, unsigned int atid) 
	req->le.pport = sin->sin_port;

	req->le.pport = sin->sin_port;

	req->le.u.ipv4.pip = sin->sin_addr.s_addr;

	req->le.u.ipv4.pip = sin->sin_addr.s_addr;

	req->tcb.t_state_to_astid =

	req->tcb.t_state_to_astid =

			htonl(V_FW_OFLD_CONNECTION_WR_T_STATE(TCP_SYN_SENT) |

			htonl(FW_OFLD_CONNECTION_WR_T_STATE_V(TCP_SYN_SENT) |

			V_FW_OFLD_CONNECTION_WR_ASTID(atid));

			FW_OFLD_CONNECTION_WR_ASTID_V(atid));

	req->tcb.cplrxdataack_cplpassacceptrpl =

	req->tcb.cplrxdataack_cplpassacceptrpl =

			htons(F_FW_OFLD_CONNECTION_WR_CPLRXDATAACK);

			htons(FW_OFLD_CONNECTION_WR_CPLRXDATAACK_F);

	req->tcb.tx_max = (__force __be32) jiffies;

	req->tcb.tx_max = (__force __be32) jiffies;

	req->tcb.rcv_adv = htons(1);

	req->tcb.rcv_adv = htons(1);

	best_mtu(ep->com.dev->rdev.lldi.mtus, ep->mtu, &mtu_idx,

	best_mtu(ep->com.dev->rdev.lldi.mtus, ep->mtu, &mtu_idx,
@@ -3539,7 +3539,7 @@ static void send_fw_pass_open_req(struct c4iw_dev *dev, struct sk_buff *skb, 
	memset(req, 0, sizeof(*req));

	memset(req, 0, sizeof(*req));

	req->op_compl = htonl(V_WR_OP(FW_OFLD_CONNECTION_WR) | FW_WR_COMPL_F);

	req->op_compl = htonl(V_WR_OP(FW_OFLD_CONNECTION_WR) | FW_WR_COMPL_F);

	req->len16_pkd = htonl(FW_WR_LEN16_V(DIV_ROUND_UP(sizeof(*req), 16)));

	req->len16_pkd = htonl(FW_WR_LEN16_V(DIV_ROUND_UP(sizeof(*req), 16)));

	req->le.version_cpl = htonl(F_FW_OFLD_CONNECTION_WR_CPL);

	req->le.version_cpl = htonl(FW_OFLD_CONNECTION_WR_CPL_F);

	req->le.filter = (__force __be32) filter;

	req->le.filter = (__force __be32) filter;

	req->le.lport = lport;

	req->le.lport = lport;

	req->le.pport = rport;

	req->le.pport = rport;
@@ -3548,9 +3548,9 @@ static void send_fw_pass_open_req(struct c4iw_dev *dev, struct sk_buff *skb, 
	req->tcb.rcv_nxt = htonl(rcv_isn + 1);

	req->tcb.rcv_nxt = htonl(rcv_isn + 1);

	req->tcb.rcv_adv = htons(window);

	req->tcb.rcv_adv = htons(window);

	req->tcb.t_state_to_astid =

	req->tcb.t_state_to_astid =

		 htonl(V_FW_OFLD_CONNECTION_WR_T_STATE(TCP_SYN_RECV) |

		 htonl(FW_OFLD_CONNECTION_WR_T_STATE_V(TCP_SYN_RECV) |

			V_FW_OFLD_CONNECTION_WR_RCV_SCALE(cpl->tcpopt.wsf) |

			FW_OFLD_CONNECTION_WR_RCV_SCALE_V(cpl->tcpopt.wsf) |

			V_FW_OFLD_CONNECTION_WR_ASTID(

			FW_OFLD_CONNECTION_WR_ASTID_V(

			GET_PASS_OPEN_TID(ntohl(cpl->tos_stid))));

			GET_PASS_OPEN_TID(ntohl(cpl->tos_stid))));





	/*

	/*

drivers/infiniband/hw/cxgb4/provider.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -408,10 +408,10 @@ static ssize_t show_fw_ver(struct device *dev, struct device_attribute *attr, 
	PDBG("%s dev 0x%p\n", __func__, dev);

	PDBG("%s dev 0x%p\n", __func__, dev);





	return sprintf(buf, "%u.%u.%u.%u\n",

	return sprintf(buf, "%u.%u.%u.%u\n",

			FW_HDR_FW_VER_MAJOR_GET(c4iw_dev->rdev.lldi.fw_vers),

			FW_HDR_FW_VER_MAJOR_G(c4iw_dev->rdev.lldi.fw_vers),

			FW_HDR_FW_VER_MINOR_GET(c4iw_dev->rdev.lldi.fw_vers),

			FW_HDR_FW_VER_MINOR_G(c4iw_dev->rdev.lldi.fw_vers),

			FW_HDR_FW_VER_MICRO_GET(c4iw_dev->rdev.lldi.fw_vers),

			FW_HDR_FW_VER_MICRO_G(c4iw_dev->rdev.lldi.fw_vers),

			FW_HDR_FW_VER_BUILD_GET(c4iw_dev->rdev.lldi.fw_vers));

			FW_HDR_FW_VER_BUILD_G(c4iw_dev->rdev.lldi.fw_vers));

}

}





static ssize_t show_hca(struct device *dev, struct device_attribute *attr,

static ssize_t show_hca(struct device *dev, struct device_attribute *attr,

drivers/net/ethernet/chelsio/cxgb4/cxgb4.h

+4 −4
Original line number Original line Diff line number Diff line
@@ -318,10 +318,10 @@ struct adapter_params { 
#include "t4fw_api.h"

#include "t4fw_api.h"





#define FW_VERSION(chip) ( \

#define FW_VERSION(chip) ( \

		FW_HDR_FW_VER_MAJOR_GET(chip##FW_VERSION_MAJOR) | \

		FW_HDR_FW_VER_MAJOR_G(chip##FW_VERSION_MAJOR) | \

		FW_HDR_FW_VER_MINOR_GET(chip##FW_VERSION_MINOR) | \

		FW_HDR_FW_VER_MINOR_G(chip##FW_VERSION_MINOR) | \

		FW_HDR_FW_VER_MICRO_GET(chip##FW_VERSION_MICRO) | \

		FW_HDR_FW_VER_MICRO_G(chip##FW_VERSION_MICRO) | \

		FW_HDR_FW_VER_BUILD_GET(chip##FW_VERSION_BUILD))

		FW_HDR_FW_VER_BUILD_G(chip##FW_VERSION_BUILD))

#define FW_INTFVER(chip, intf) (FW_HDR_INTFVER_##intf)

#define FW_INTFVER(chip, intf) (FW_HDR_INTFVER_##intf)





struct fw_info {

struct fw_info {

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

+7 −7
Original line number Original line Diff line number Diff line
@@ -243,7 +243,7 @@ void cxgb4_dcb_handle_fw_update(struct adapter *adap, 
				const struct fw_port_cmd *pcmd)

				const struct fw_port_cmd *pcmd)

{

{

	const union fw_port_dcb *fwdcb = &pcmd->u.dcb;

	const union fw_port_dcb *fwdcb = &pcmd->u.dcb;

	int port = FW_PORT_CMD_PORTID_GET(be32_to_cpu(pcmd->op_to_portid));

	int port = FW_PORT_CMD_PORTID_G(be32_to_cpu(pcmd->op_to_portid));

	struct net_device *dev = adap->port[port];

	struct net_device *dev = adap->port[port];

	struct port_info *pi = netdev_priv(dev);

	struct port_info *pi = netdev_priv(dev);

	struct port_dcb_info *dcb = &pi->dcb;

	struct port_dcb_info *dcb = &pi->dcb;
@@ -256,12 +256,12 @@ void cxgb4_dcb_handle_fw_update(struct adapter *adap, 
	if (dcb_type == FW_PORT_DCB_TYPE_CONTROL) {

	if (dcb_type == FW_PORT_DCB_TYPE_CONTROL) {

		enum cxgb4_dcb_state_input input =

		enum cxgb4_dcb_state_input input =

			((pcmd->u.dcb.control.all_syncd_pkd &

			((pcmd->u.dcb.control.all_syncd_pkd &

			  FW_PORT_CMD_ALL_SYNCD)

			  FW_PORT_CMD_ALL_SYNCD_F)

			 ? CXGB4_DCB_STATE_FW_ALLSYNCED

			 ? CXGB4_DCB_STATE_FW_ALLSYNCED

			 : CXGB4_DCB_STATE_FW_INCOMPLETE);

			 : CXGB4_DCB_STATE_FW_INCOMPLETE);





		if (dcb->dcb_version != FW_PORT_DCB_VER_UNKNOWN) {

		if (dcb->dcb_version != FW_PORT_DCB_VER_UNKNOWN) {

			dcb_running_version = FW_PORT_CMD_DCB_VERSION_GET(

			dcb_running_version = FW_PORT_CMD_DCB_VERSION_G(

				be16_to_cpu(

				be16_to_cpu(

				pcmd->u.dcb.control.dcb_version_to_app_state));

				pcmd->u.dcb.control.dcb_version_to_app_state));

			if (dcb_running_version == FW_PORT_DCB_VER_CEE1D01 ||

			if (dcb_running_version == FW_PORT_DCB_VER_CEE1D01 ||
@@ -519,7 +519,7 @@ static void cxgb4_setpgtccfg_tx(struct net_device *dev, int tc, 




	INIT_PORT_DCB_WRITE_CMD(pcmd, pi->port_id);

	INIT_PORT_DCB_WRITE_CMD(pcmd, pi->port_id);

	if (pi->dcb.state == CXGB4_DCB_STATE_HOST)

	if (pi->dcb.state == CXGB4_DCB_STATE_HOST)

		pcmd.op_to_portid |= cpu_to_be32(FW_PORT_CMD_APPLY);

		pcmd.op_to_portid |= cpu_to_be32(FW_PORT_CMD_APPLY_F);





	err = t4_wr_mbox(adap, adap->mbox, &pcmd, sizeof(pcmd), &pcmd);

	err = t4_wr_mbox(adap, adap->mbox, &pcmd, sizeof(pcmd), &pcmd);

	if (err != FW_PORT_DCB_CFG_SUCCESS)

	if (err != FW_PORT_DCB_CFG_SUCCESS)
@@ -583,7 +583,7 @@ static void cxgb4_setpgbwgcfg_tx(struct net_device *dev, int pgid, 




	INIT_PORT_DCB_WRITE_CMD(pcmd, pi->port_id);

	INIT_PORT_DCB_WRITE_CMD(pcmd, pi->port_id);

	if (pi->dcb.state == CXGB4_DCB_STATE_HOST)

	if (pi->dcb.state == CXGB4_DCB_STATE_HOST)

		pcmd.op_to_portid |= cpu_to_be32(FW_PORT_CMD_APPLY);

		pcmd.op_to_portid |= cpu_to_be32(FW_PORT_CMD_APPLY_F);





	err = t4_wr_mbox(adap, adap->mbox, &pcmd, sizeof(pcmd), &pcmd);

	err = t4_wr_mbox(adap, adap->mbox, &pcmd, sizeof(pcmd), &pcmd);
@@ -623,7 +623,7 @@ static void cxgb4_setpfccfg(struct net_device *dev, int priority, u8 pfccfg) 




	INIT_PORT_DCB_WRITE_CMD(pcmd, pi->port_id);

	INIT_PORT_DCB_WRITE_CMD(pcmd, pi->port_id);

	if (pi->dcb.state == CXGB4_DCB_STATE_HOST)

	if (pi->dcb.state == CXGB4_DCB_STATE_HOST)

		pcmd.op_to_portid |= cpu_to_be32(FW_PORT_CMD_APPLY);

		pcmd.op_to_portid |= cpu_to_be32(FW_PORT_CMD_APPLY_F);





	pcmd.u.dcb.pfc.type = FW_PORT_DCB_TYPE_PFC;

	pcmd.u.dcb.pfc.type = FW_PORT_DCB_TYPE_PFC;

	pcmd.u.dcb.pfc.pfcen = pi->dcb.pfcen;

	pcmd.u.dcb.pfc.pfcen = pi->dcb.pfcen;
@@ -842,7 +842,7 @@ static int __cxgb4_setapp(struct net_device *dev, u8 app_idtype, u16 app_id, 
	/* write out new app table entry */

	/* write out new app table entry */

	INIT_PORT_DCB_WRITE_CMD(pcmd, pi->port_id);

	INIT_PORT_DCB_WRITE_CMD(pcmd, pi->port_id);

	if (pi->dcb.state == CXGB4_DCB_STATE_HOST)

	if (pi->dcb.state == CXGB4_DCB_STATE_HOST)

		pcmd.op_to_portid |= cpu_to_be32(FW_PORT_CMD_APPLY);

		pcmd.op_to_portid |= cpu_to_be32(FW_PORT_CMD_APPLY_F);





	pcmd.u.dcb.app_priority.type = FW_PORT_DCB_TYPE_APP_ID;

	pcmd.u.dcb.app_priority.type = FW_PORT_DCB_TYPE_APP_ID;

	pcmd.u.dcb.app_priority.protocolid = cpu_to_be16(app_id);

	pcmd.u.dcb.app_priority.protocolid = cpu_to_be16(app_id);

drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -45,9 +45,9 @@ 
			cpu_to_be32(FW_CMD_OP_V(FW_PORT_CMD) | \

			cpu_to_be32(FW_CMD_OP_V(FW_PORT_CMD) | \

				    FW_CMD_REQUEST_F | \

				    FW_CMD_REQUEST_F | \

				    FW_CMD_##__op##_F | \

				    FW_CMD_##__op##_F | \

				    FW_PORT_CMD_PORTID(__port)); \

				    FW_PORT_CMD_PORTID_V(__port)); \

		(__pcmd).action_to_len16 = \

		(__pcmd).action_to_len16 = \

			cpu_to_be32(FW_PORT_CMD_ACTION(__action) | \

			cpu_to_be32(FW_PORT_CMD_ACTION_V(__action) | \

				    FW_LEN16(pcmd)); \

				    FW_LEN16(pcmd)); \

	} while (0)

	} while (0)