Commit 02d805dc authored by Santosh Rastapur's avatar Santosh Rastapur Committed by David S. Miller
Browse files

cxgb4: use new fw interface to get the VIN and smt index 



If the fw supports returning VIN/VIVLD in FW_VI_CMD save it
in port_info structure else retrieve these from viid and save
them  in port_info structure. Do the same for smt_idx from
FW_VI_MAC_CMD

Signed-off-by: default avatarSantosh Rastapur <santosh@chelsio.com>
Signed-off-by: default avatarGanesh Goudar <ganeshgr@chelsio.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 24d476db

drivers/crypto/chelsio/chtls/chtls_cm.c

+1 −2
Original line number Diff line number Diff line
@@ -1074,8 +1074,7 @@ static struct sock *chtls_recv_sock(struct sock *lsk, 
	csk->txq_idx = (rxq_idx < cdev->lldi->ntxq) ? rxq_idx :

			port_id * step;

	csk->sndbuf = newsk->sk_sndbuf;

	csk->smac_idx = cxgb4_tp_smt_idx(cdev->lldi->adapter_type,

					 cxgb4_port_viid(ndev));

	csk->smac_idx = ((struct port_info *)netdev_priv(ndev))->smt_idx;

	tp->rcv_wnd = select_rcv_wnd(csk);

	RCV_WSCALE(tp) = select_rcv_wscale(tcp_full_space(newsk),

					   WSCALE_OK(tp),

drivers/infiniband/hw/cxgb4/cm.c

+2 −4
Original line number Diff line number Diff line
@@ -2058,8 +2058,7 @@ static int import_ep(struct c4iw_ep *ep, int iptype, __u8 *peer_ip, 
		}

		ep->mtu = pdev->mtu;

		ep->tx_chan = cxgb4_port_chan(pdev);

		ep->smac_idx = cxgb4_tp_smt_idx(adapter_type,

						cxgb4_port_viid(pdev));

		ep->smac_idx = ((struct port_info *)netdev_priv(pdev))->smt_idx;

		step = cdev->rdev.lldi.ntxq /

			cdev->rdev.lldi.nchan;

		ep->txq_idx = cxgb4_port_idx(pdev) * step;
@@ -2078,8 +2077,7 @@ static int import_ep(struct c4iw_ep *ep, int iptype, __u8 *peer_ip, 
			goto out;

		ep->mtu = dst_mtu(dst);

		ep->tx_chan = cxgb4_port_chan(pdev);

		ep->smac_idx = cxgb4_tp_smt_idx(adapter_type,

						cxgb4_port_viid(pdev));

		ep->smac_idx = ((struct port_info *)netdev_priv(pdev))->smt_idx;

		step = cdev->rdev.lldi.ntxq /

			cdev->rdev.lldi.nchan;

		ep->txq_idx = cxgb4_port_idx(pdev) * step;

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

+10 −2
Original line number Diff line number Diff line
@@ -404,6 +404,7 @@ struct adapter_params { 
	bool fr_nsmr_tpte_wr_support;	  /* FW support for FR_NSMR_TPTE_WR */

	u8 fw_caps_support;		/* 32-bit Port Capabilities */

	bool filter2_wr_support;	/* FW support for FILTER2_WR */

	unsigned int viid_smt_extn_support:1; /* FW returns vin and smt index */



	/* MPS Buffer Group Map[per Port].  Bit i is set if buffer group i is

	 * used by the Port
@@ -592,6 +593,13 @@ struct port_info { 
	bool ptp_enable;

	struct sched_table *sched_tbl;

	u32 eth_flags;



	/* viid and smt fields either returned by fw

	 * or decoded by parsing viid by driver.

	 */

	u8 vin;

	u8 vivld;

	u8 smt_idx;

};



struct dentry;
@@ -1757,7 +1765,7 @@ int t4_cfg_pfvf(struct adapter *adap, unsigned int mbox, unsigned int pf, 
		unsigned int nexact, unsigned int rcaps, unsigned int wxcaps);

int t4_alloc_vi(struct adapter *adap, unsigned int mbox, unsigned int port,

		unsigned int pf, unsigned int vf, unsigned int nmac, u8 *mac,

		unsigned int *rss_size);

		unsigned int *rss_size, u8 *vivld, u8 *vin);

int t4_free_vi(struct adapter *adap, unsigned int mbox,

	       unsigned int pf, unsigned int vf,

	       unsigned int viid);
@@ -1783,7 +1791,7 @@ int t4_free_mac_filt(struct adapter *adap, unsigned int mbox, 
		     unsigned int viid, unsigned int naddr,

		     const u8 **addr, bool sleep_ok);

int t4_change_mac(struct adapter *adap, unsigned int mbox, unsigned int viid,

		  int idx, const u8 *addr, bool persist, bool add_smt);

		  int idx, const u8 *addr, bool persist, u8 *smt_idx);

int t4_set_addr_hash(struct adapter *adap, unsigned int mbox, unsigned int viid,

		     bool ucast, u64 vec, bool sleep_ok);

int t4_enable_vi_params(struct adapter *adap, unsigned int mbox,

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

+29 −29
Original line number Diff line number Diff line
@@ -453,7 +453,7 @@ static int link_start(struct net_device *dev) 
	if (ret == 0) {

		ret = t4_change_mac(pi->adapter, mb, pi->viid,

				    pi->xact_addr_filt, dev->dev_addr, true,

				    true);

				    &pi->smt_idx);

		if (ret >= 0) {

			pi->xact_addr_filt = ret;

			ret = 0;
@@ -1584,28 +1584,6 @@ unsigned int cxgb4_best_aligned_mtu(const unsigned short *mtus, 
}

EXPORT_SYMBOL(cxgb4_best_aligned_mtu);



/**

 *	cxgb4_tp_smt_idx - Get the Source Mac Table index for this VI

 *	@chip: chip type

 *	@viid: VI id of the given port

 *

 *	Return the SMT index for this VI.

 */

unsigned int cxgb4_tp_smt_idx(enum chip_type chip, unsigned int viid)

{

	/* In T4/T5, SMT contains 256 SMAC entries organized in

	 * 128 rows of 2 entries each.

	 * In T6, SMT contains 256 SMAC entries in 256 rows.

	 * TODO: The below code needs to be updated when we add support

	 * for 256 VFs.

	 */

	if (CHELSIO_CHIP_VERSION(chip) <= CHELSIO_T5)

		return ((viid & 0x7f) << 1);

	else

		return (viid & 0x7f);

}

EXPORT_SYMBOL(cxgb4_tp_smt_idx);



/**

 *	cxgb4_port_chan - get the HW channel of a port

 *	@dev: the net device for the port
@@ -2862,7 +2840,8 @@ static int cxgb_set_mac_addr(struct net_device *dev, void *p) 
		return -EADDRNOTAVAIL;



	ret = t4_change_mac(pi->adapter, pi->adapter->pf, pi->viid,

			    pi->xact_addr_filt, addr->sa_data, true, true);

			    pi->xact_addr_filt, addr->sa_data, true,

			    &pi->smt_idx);

	if (ret < 0)

		return ret;
@@ -4466,6 +4445,15 @@ static int adap_init0(struct adapter *adap) 
		adap->params.filter2_wr_support = (ret == 0 && val[0] != 0);

	}



	/* Check if FW supports returning vin and smt index.

	 * If this is not supported, driver will interpret

	 * these values from viid.

	 */

	params[0] = FW_PARAM_DEV(OPAQUE_VIID_SMT_EXTN);

	ret = t4_query_params(adap, adap->mbox, adap->pf, 0,

			      1, params, val);

	adap->params.viid_smt_extn_support = (ret == 0 && val[0] != 0);



	/*

	 * Get device capabilities so we can determine what resources we need

	 * to manage.
@@ -4776,14 +4764,26 @@ static pci_ers_result_t eeh_slot_reset(struct pci_dev *pdev) 
		return PCI_ERS_RESULT_DISCONNECT;



	for_each_port(adap, i) {

		struct port_info *p = adap2pinfo(adap, i);

		struct port_info *pi = adap2pinfo(adap, i);

		u8 vivld = 0, vin = 0;



		ret = t4_alloc_vi(adap, adap->mbox, p->tx_chan, adap->pf, 0, 1,

				  NULL, NULL);

		ret = t4_alloc_vi(adap, adap->mbox, pi->tx_chan, adap->pf, 0, 1,

				  NULL, NULL, &vivld, &vin);

		if (ret < 0)

			return PCI_ERS_RESULT_DISCONNECT;

		p->viid = ret;

		p->xact_addr_filt = -1;

		pi->viid = ret;

		pi->xact_addr_filt = -1;

		/* If fw supports returning the VIN as part of FW_VI_CMD,

		 * save the returned values.

		 */

		if (adap->params.viid_smt_extn_support) {

			pi->vivld = vivld;

			pi->vin = vin;

		} else {

			/* Retrieve the values from VIID */

			pi->vivld = FW_VIID_VIVLD_G(pi->viid);

			pi->vin = FW_VIID_VIN_G(pi->viid);

		}

	}



	t4_load_mtus(adap, adap->params.mtus, adap->params.a_wnd,

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

+5 −8
Original line number Diff line number Diff line
@@ -495,14 +495,11 @@ u64 cxgb4_select_ntuple(struct net_device *dev, 
		ntuple |= (u64)IPPROTO_TCP << tp->protocol_shift;



	if (tp->vnic_shift >= 0 && (tp->ingress_config & VNIC_F)) {

		u32 viid = cxgb4_port_viid(dev);

		u32 vf = FW_VIID_VIN_G(viid);

		u32 pf = FW_VIID_PFN_G(viid);

		u32 vld = FW_VIID_VIVLD_G(viid);



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

				FT_VNID_ID_PF_V(pf) |

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

		struct port_info *pi = (struct port_info *)netdev_priv(dev);



		ntuple |= (u64)(FT_VNID_ID_VF_V(pi->vin) |

				FT_VNID_ID_PF_V(adap->pf) |

				FT_VNID_ID_VLD_V(pi->vivld)) << tp->vnic_shift;

	}



	return ntuple;

CRA Git | Maintained and supported by SUSTech CRA and CCSE