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

Merge branch 'ionic-cleanups' 



Shannon Nelson says:

====================
ionic: housekeeping updates

These are a few changes for code clean up and a couple
more lock management tweaks.

v2: rebased
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents cfb5d7b7 7dd22a86

drivers/net/ethernet/pensando/ionic/ionic.h

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ struct ionic_lif; 
#define PCI_DEVICE_ID_PENSANDO_IONIC_ETH_VF	0x1003



#define DEVCMD_TIMEOUT  10

#define IONIC_ADMINQ_TIME_SLICE		msecs_to_jiffies(100)



#define IONIC_PHC_UPDATE_NS	10000000000	    /* 10s in nanoseconds */

#define NORMAL_PPB		1000000000	    /* one billion parts per billion */

drivers/net/ethernet/pensando/ionic/ionic_debugfs.c

+0 −2
Original line number Diff line number Diff line
@@ -143,8 +143,6 @@ void ionic_debugfs_add_qcq(struct ionic_lif *lif, struct ionic_qcq *qcq) 
	debugfs_create_u32("qid", 0400, q_dentry, &q->hw_index);

	debugfs_create_u32("qtype", 0400, q_dentry, &q->hw_type);

	debugfs_create_u64("drop", 0400, q_dentry, &q->drop);

	debugfs_create_u64("stop", 0400, q_dentry, &q->stop);

	debugfs_create_u64("wake", 0400, q_dentry, &q->wake);



	debugfs_create_file("tail", 0400, q_dentry, q, &q_tail_fops);

	debugfs_create_file("head", 0400, q_dentry, q, &q_head_fops);

drivers/net/ethernet/pensando/ionic/ionic_dev.c

+0 −1
Original line number Diff line number Diff line
@@ -581,7 +581,6 @@ unsigned int ionic_cq_service(struct ionic_cq *cq, unsigned int work_to_do, 
			cq->done_color = !cq->done_color;

		cq->tail_idx = (cq->tail_idx + 1) & (cq->num_descs - 1);

		cq_info = &cq->info[cq->tail_idx];

		DEBUG_STATS_CQE_CNT(cq);



		if (++work_done >= work_to_do)

			break;

drivers/net/ethernet/pensando/ionic/ionic_dev.h

+0 −4
Original line number Diff line number Diff line
@@ -220,9 +220,6 @@ struct ionic_queue { 
	unsigned int num_descs;

	unsigned int max_sg_elems;

	u64 features;

	u64 dbell_count;

	u64 stop;

	u64 wake;

	u64 drop;

	struct ionic_dev *idev;

	unsigned int type;
@@ -269,7 +266,6 @@ struct ionic_cq { 
	bool done_color;

	unsigned int num_descs;

	unsigned int desc_size;

	u64 compl_count;

	void *base;

	dma_addr_t base_pa;

} ____cacheline_aligned_in_smp;

drivers/net/ethernet/pensando/ionic/ionic_ethtool.c

+0 −38
Original line number Diff line number Diff line
@@ -11,13 +11,6 @@ 
#include "ionic_ethtool.h"

#include "ionic_stats.h"



static const char ionic_priv_flags_strings[][ETH_GSTRING_LEN] = {

#define IONIC_PRIV_F_SW_DBG_STATS	BIT(0)

	"sw-dbg-stats",

};



#define IONIC_PRIV_FLAGS_COUNT ARRAY_SIZE(ionic_priv_flags_strings)



static void ionic_get_stats_strings(struct ionic_lif *lif, u8 *buf)

{

	u32 i;
@@ -59,9 +52,6 @@ static int ionic_get_sset_count(struct net_device *netdev, int sset) 
	case ETH_SS_STATS:

		count = ionic_get_stats_count(lif);

		break;

	case ETH_SS_PRIV_FLAGS:

		count = IONIC_PRIV_FLAGS_COUNT;

		break;

	}

	return count;

}
@@ -75,10 +65,6 @@ static void ionic_get_strings(struct net_device *netdev, 
	case ETH_SS_STATS:

		ionic_get_stats_strings(lif, buf);

		break;

	case ETH_SS_PRIV_FLAGS:

		memcpy(buf, ionic_priv_flags_strings,

		       IONIC_PRIV_FLAGS_COUNT * ETH_GSTRING_LEN);

		break;

	}

}
@@ -691,28 +677,6 @@ static int ionic_set_channels(struct net_device *netdev, 
	return err;

}



static u32 ionic_get_priv_flags(struct net_device *netdev)

{

	struct ionic_lif *lif = netdev_priv(netdev);

	u32 priv_flags = 0;



	if (test_bit(IONIC_LIF_F_SW_DEBUG_STATS, lif->state))

		priv_flags |= IONIC_PRIV_F_SW_DBG_STATS;



	return priv_flags;

}



static int ionic_set_priv_flags(struct net_device *netdev, u32 priv_flags)

{

	struct ionic_lif *lif = netdev_priv(netdev);



	clear_bit(IONIC_LIF_F_SW_DEBUG_STATS, lif->state);

	if (priv_flags & IONIC_PRIV_F_SW_DBG_STATS)

		set_bit(IONIC_LIF_F_SW_DEBUG_STATS, lif->state);



	return 0;

}



static int ionic_get_rxnfc(struct net_device *netdev,

			   struct ethtool_rxnfc *info, u32 *rules)

{
@@ -1013,8 +977,6 @@ static const struct ethtool_ops ionic_ethtool_ops = { 
	.get_strings		= ionic_get_strings,

	.get_ethtool_stats	= ionic_get_stats,

	.get_sset_count		= ionic_get_sset_count,

	.get_priv_flags		= ionic_get_priv_flags,

	.set_priv_flags		= ionic_set_priv_flags,

	.get_rxnfc		= ionic_get_rxnfc,

	.get_rxfh_indir_size	= ionic_get_rxfh_indir_size,

	.get_rxfh_key_size	= ionic_get_rxfh_key_size,