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

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

Merge branch 'thunderx-fixes' 



Sunil Goutham says:

====================
thunderx: miscellaneous fixes

This patch series contains fixes for various issues observed
with BGX and NIC drivers.

Changes from v1:
- Fixed comment syle in the first patch of the series
- Removed 'Increase transmit queue length' patch from the series,
  will recheck if it's a driver or system issue and resubmit.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 83e4bf7a bc69fdfc

drivers/net/ethernet/cavium/thunder/nic.h

+2 −3
Original line number Diff line number Diff line
@@ -120,10 +120,9 @@ 
 * Calculated for SCLK of 700Mhz

 * value written should be a 1/16th of what is expected

 *

 * 1 tick per 0.05usec = value of 2.2

 * This 10% would be covered in CQ timer thresh value

 * 1 tick per 0.025usec

 */

#define NICPF_CLK_PER_INT_TICK		2

#define NICPF_CLK_PER_INT_TICK		1



/* Time to wait before we decide that a SQ is stuck.

 *

drivers/net/ethernet/cavium/thunder/nic_main.c

+20 −3
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ struct nicpf { 
#define	NIC_GET_BGX_FROM_VF_LMAC_MAP(map)	((map >> 4) & 0xF)

#define	NIC_GET_LMAC_FROM_VF_LMAC_MAP(map)	(map & 0xF)

	u8			vf_lmac_map[MAX_LMAC];

	u8			lmac_cnt;

	struct delayed_work     dwork;

	struct workqueue_struct *check_link;

	u8			link[MAX_LMAC];
@@ -279,6 +280,7 @@ static void nic_set_lmac_vf_mapping(struct nicpf *nic) 
	u64 lmac_credit;



	nic->num_vf_en = 0;

	nic->lmac_cnt = 0;



	for (bgx = 0; bgx < NIC_MAX_BGX; bgx++) {

		if (!(bgx_map & (1 << bgx)))
@@ -288,6 +290,7 @@ static void nic_set_lmac_vf_mapping(struct nicpf *nic) 
			nic->vf_lmac_map[next_bgx_lmac++] =

						NIC_SET_VF_LMAC_MAP(bgx, lmac);

		nic->num_vf_en += lmac_cnt;

		nic->lmac_cnt += lmac_cnt;



		/* Program LMAC credits */

		lmac_credit = (1ull << 1); /* channel credit enable */
@@ -715,6 +718,13 @@ static void nic_handle_mbx_intr(struct nicpf *nic, int vf) 
	case NIC_MBOX_MSG_CFG_DONE:

		/* Last message of VF config msg sequence */

		nic->vf_enabled[vf] = true;

		if (vf >= nic->lmac_cnt)

			goto unlock;



		bgx = NIC_GET_BGX_FROM_VF_LMAC_MAP(nic->vf_lmac_map[vf]);

		lmac = NIC_GET_LMAC_FROM_VF_LMAC_MAP(nic->vf_lmac_map[vf]);



		bgx_lmac_rx_tx_enable(nic->node, bgx, lmac, true);

		goto unlock;

	case NIC_MBOX_MSG_SHUTDOWN:

		/* First msg in VF teardown sequence */
@@ -722,6 +732,14 @@ static void nic_handle_mbx_intr(struct nicpf *nic, int vf) 
		if (vf >= nic->num_vf_en)

			nic->sqs_used[vf - nic->num_vf_en] = false;

		nic->pqs_vf[vf] = 0;



		if (vf >= nic->lmac_cnt)

			break;



		bgx = NIC_GET_BGX_FROM_VF_LMAC_MAP(nic->vf_lmac_map[vf]);

		lmac = NIC_GET_LMAC_FROM_VF_LMAC_MAP(nic->vf_lmac_map[vf]);



		bgx_lmac_rx_tx_enable(nic->node, bgx, lmac, false);

		break;

	case NIC_MBOX_MSG_ALLOC_SQS:

		nic_alloc_sqs(nic, &mbx.sqs_alloc);
@@ -940,7 +958,7 @@ static void nic_poll_for_link(struct work_struct *work) 


	mbx.link_status.msg = NIC_MBOX_MSG_BGX_LINK_CHANGE;



	for (vf = 0; vf < nic->num_vf_en; vf++) {

	for (vf = 0; vf < nic->lmac_cnt; vf++) {

		/* Poll only if VF is UP */

		if (!nic->vf_enabled[vf])

			continue;
@@ -1074,8 +1092,7 @@ static void nic_remove(struct pci_dev *pdev) 


	if (nic->check_link) {

		/* Destroy work Queue */

		cancel_delayed_work(&nic->dwork);

		flush_workqueue(nic->check_link);

		cancel_delayed_work_sync(&nic->dwork);

		destroy_workqueue(nic->check_link);

	}

drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c

+15 −1
Original line number Diff line number Diff line
@@ -112,6 +112,13 @@ static int nicvf_get_settings(struct net_device *netdev, 


	cmd->supported = 0;

	cmd->transceiver = XCVR_EXTERNAL;



	if (!nic->link_up) {

		cmd->duplex = DUPLEX_UNKNOWN;

		ethtool_cmd_speed_set(cmd, SPEED_UNKNOWN);

		return 0;

	}



	if (nic->speed <= 1000) {

		cmd->port = PORT_MII;

		cmd->autoneg = AUTONEG_ENABLE;
@@ -125,6 +132,13 @@ static int nicvf_get_settings(struct net_device *netdev, 
	return 0;

}



static u32 nicvf_get_link(struct net_device *netdev)

{

	struct nicvf *nic = netdev_priv(netdev);



	return nic->link_up;

}



static void nicvf_get_drvinfo(struct net_device *netdev,

			      struct ethtool_drvinfo *info)

{
@@ -660,7 +674,7 @@ static int nicvf_set_channels(struct net_device *dev, 


static const struct ethtool_ops nicvf_ethtool_ops = {

	.get_settings		= nicvf_get_settings,

	.get_link		= ethtool_op_get_link,

	.get_link		= nicvf_get_link,

	.get_drvinfo		= nicvf_get_drvinfo,

	.get_msglevel		= nicvf_get_msglevel,

	.set_msglevel		= nicvf_set_msglevel,

drivers/net/ethernet/cavium/thunder/nicvf_main.c

+1 −3
Original line number Diff line number Diff line
@@ -1057,6 +1057,7 @@ int nicvf_stop(struct net_device *netdev) 


	netif_carrier_off(netdev);

	netif_tx_stop_all_queues(nic->netdev);

	nic->link_up = false;



	/* Teardown secondary qsets first */

	if (!nic->sqs_mode) {
@@ -1211,9 +1212,6 @@ int nicvf_open(struct net_device *netdev) 
	nic->drv_stats.txq_stop = 0;

	nic->drv_stats.txq_wake = 0;



	netif_carrier_on(netdev);

	netif_tx_start_all_queues(netdev);



	return 0;

cleanup:

	nicvf_disable_intr(nic, NICVF_INTR_MBOX, 0);

drivers/net/ethernet/cavium/thunder/nicvf_queues.c

+1 −1
Original line number Diff line number Diff line
@@ -592,7 +592,7 @@ void nicvf_cmp_queue_config(struct nicvf *nic, struct queue_set *qs, 
	/* Set threshold value for interrupt generation */

	nicvf_queue_reg_write(nic, NIC_QSET_CQ_0_7_THRESH, qidx, cq->thresh);

	nicvf_queue_reg_write(nic, NIC_QSET_CQ_0_7_CFG2,

			      qidx, nic->cq_coalesce_usecs);

			      qidx, CMP_QUEUE_TIMER_THRESH);

}



/* Configures transmit queue */