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

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

Merge branch 'cxgb4' 



Hariprasad Shenai says:

====================
cxgb4/cxgb4vf: Misc fixes and 40G support for cxgb4vf

This patch series adds 40G support for cxgb4vf driver. Update the LSO length for
cxgb4vf, fix macro. Wait for device to get ready before reading PL_WHOAMI
register.

The patches series is created against 'net-next' tree.
And includes patches on cxgb4 and cxgb4vf 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 ea97caee 8203b509

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

+1 −1
Original line number Diff line number Diff line
@@ -968,7 +968,7 @@ void t4_intr_enable(struct adapter *adapter); 
void t4_intr_disable(struct adapter *adapter);

int t4_slow_intr_handler(struct adapter *adapter);



int t4_wait_dev_ready(struct adapter *adap);

int t4_wait_dev_ready(void __iomem *regs);

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

		  struct link_config *lc);

int t4_restart_aneg(struct adapter *adap, unsigned int mbox, unsigned int port);

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

+5 −1
Original line number Diff line number Diff line
@@ -6137,7 +6137,7 @@ static pci_ers_result_t eeh_slot_reset(struct pci_dev *pdev) 
	pci_save_state(pdev);

	pci_cleanup_aer_uncorrect_error_status(pdev);



	if (t4_wait_dev_ready(adap) < 0)

	if (t4_wait_dev_ready(adap->regs) < 0)

		return PCI_ERS_RESULT_DISCONNECT;

	if (t4_fw_hello(adap, adap->fn, adap->fn, MASTER_MUST, NULL) < 0)

		return PCI_ERS_RESULT_DISCONNECT;
@@ -6530,6 +6530,10 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
		goto out_disable_device;

	}



	err = t4_wait_dev_ready(regs);

	if (err < 0)

		goto out_unmap_bar0;



	/* We control everything through one PF */

	func = SOURCEPF_GET(readl(regs + PL_WHOAMI));

	if (func != ent->driver_data) {

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

+4 −1
Original line number Diff line number Diff line
@@ -1123,7 +1123,10 @@ out_free: dev_kfree_skb_any(skb); 
		lso->c.ipid_ofst = htons(0);

		lso->c.mss = htons(ssi->gso_size);

		lso->c.seqno_offset = htonl(0);

		if (is_t4(adap->params.chip))

			lso->c.len = htonl(skb->len);

		else

			lso->c.len = htonl(LSO_T5_XFER_SIZE(skb->len));

		cpl = (void *)(lso + 1);

		cntrl = TXPKT_CSUM_TYPE(v6 ? TX_CSUM_TCPIP6 : TX_CSUM_TCPIP) |

			TXPKT_IPHDR_LEN(l3hdr_len) |

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

+10 −7
Original line number Diff line number Diff line
@@ -3845,12 +3845,19 @@ static void init_link_config(struct link_config *lc, unsigned int caps) 
	}

}



int t4_wait_dev_ready(struct adapter *adap)

#define CIM_PF_NOACCESS 0xeeeeeeee



int t4_wait_dev_ready(void __iomem *regs)

{

	if (t4_read_reg(adap, PL_WHOAMI) != 0xffffffff)

	u32 whoami;



	whoami = readl(regs + PL_WHOAMI);

	if (whoami != 0xffffffff && whoami != CIM_PF_NOACCESS)

		return 0;



	msleep(500);

	return t4_read_reg(adap, PL_WHOAMI) != 0xffffffff ? 0 : -EIO;

	whoami = readl(regs + PL_WHOAMI);

	return (whoami != 0xffffffff && whoami != CIM_PF_NOACCESS ? 0 : -EIO);

}



struct flash_desc {
@@ -3919,10 +3926,6 @@ int t4_prep_adapter(struct adapter *adapter) 
	uint16_t device_id;

	u32 pl_rev;



	ret = t4_wait_dev_ready(adapter);

	if (ret < 0)

		return ret;



	get_pci_mode(adapter, &adapter->params.pci);

	pl_rev = G_REV(t4_read_reg(adapter, PL_REV));

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

+1 −0
Original line number Diff line number Diff line
@@ -527,6 +527,7 @@ struct cpl_tx_pkt_lso_core { 
#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 mss;

	__be32 seqno_offset;