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

Merge branch 'ionic-driver-updates' 



Shannon Nelson says:

====================
ionic: driver updates

These are a few little updates for the ionic network driver.

v2: dropped IBM msi patch
    added fix for a compiler warning
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5528e0d7 6be1a5ce

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

+0 −4
Original line number Diff line number Diff line
@@ -19,10 +19,6 @@ struct ionic_lif; 
#define PCI_DEVICE_ID_PENSANDO_IONIC_ETH_PF	0x1002

#define PCI_DEVICE_ID_PENSANDO_IONIC_ETH_VF	0x1003



#define IONIC_SUBDEV_ID_NAPLES_25	0x4000

#define IONIC_SUBDEV_ID_NAPLES_100_4	0x4001

#define IONIC_SUBDEV_ID_NAPLES_100_8	0x4002



#define DEVCMD_TIMEOUT  10



struct ionic_vf {

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

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ struct ionic_rx_stats { 
	u64 csum_complete;

	u64 csum_error;

	u64 buffers_posted;

	u64 dropped;

};



#define IONIC_QCQ_F_INITED		BIT(0)

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

+1 −1
Original line number Diff line number Diff line
@@ -330,9 +330,9 @@ int ionic_dev_cmd_wait(struct ionic *ionic, unsigned long max_seconds) 
	unsigned long max_wait;

	unsigned long duration;

	int opcode;

	int hb = 0;

	int done;

	int err;

	int hb;



	WARN_ON(in_interrupt());

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

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ static const struct ionic_stat_desc ionic_rx_stats_desc[] = { 
	IONIC_RX_STAT_DESC(csum_none),

	IONIC_RX_STAT_DESC(csum_complete),

	IONIC_RX_STAT_DESC(csum_error),

	IONIC_RX_STAT_DESC(dropped),

};



static const struct ionic_stat_desc ionic_txq_stats_desc[] = {

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

+18 −5
Original line number Diff line number Diff line
@@ -152,12 +152,16 @@ static void ionic_rx_clean(struct ionic_queue *q, struct ionic_desc_info *desc_i 
	stats = q_to_rx_stats(q);

	netdev = q->lif->netdev;



	if (comp->status)

	if (comp->status) {

		stats->dropped++;

		return;

	}



	/* no packet processing while resetting */

	if (unlikely(test_bit(IONIC_LIF_QUEUE_RESET, q->lif->state)))

	if (unlikely(test_bit(IONIC_LIF_QUEUE_RESET, q->lif->state))) {

		stats->dropped++;

		return;

	}



	stats->pkts++;

	stats->bytes += le16_to_cpu(comp->len);
@@ -167,8 +171,10 @@ static void ionic_rx_clean(struct ionic_queue *q, struct ionic_desc_info *desc_i 
	else

		skb = ionic_rx_frags(q, desc_info, cq_info);



	if (unlikely(!skb))

	if (unlikely(!skb)) {

		stats->dropped++;

		return;

	}



	skb_record_rx_queue(skb, q->index);
@@ -337,6 +343,8 @@ void ionic_rx_fill(struct ionic_queue *q) 
	struct ionic_rxq_sg_desc *sg_desc;

	struct ionic_rxq_sg_elem *sg_elem;

	struct ionic_rxq_desc *desc;

	unsigned int remain_len;

	unsigned int seg_len;

	unsigned int nfrags;

	bool ring_doorbell;

	unsigned int i, j;
@@ -346,6 +354,7 @@ void ionic_rx_fill(struct ionic_queue *q) 
	nfrags = round_up(len, PAGE_SIZE) / PAGE_SIZE;



	for (i = ionic_q_space_avail(q); i; i--) {

		remain_len = len;

		desc_info = q->head;

		desc = desc_info->desc;

		sg_desc = desc_info->sg_desc;
@@ -369,7 +378,9 @@ void ionic_rx_fill(struct ionic_queue *q) 
			return;

		}

		desc->addr = cpu_to_le64(page_info->dma_addr);

		desc->len = cpu_to_le16(PAGE_SIZE);

		seg_len = min_t(unsigned int, PAGE_SIZE, len);

		desc->len = cpu_to_le16(seg_len);

		remain_len -= seg_len;

		page_info++;



		/* fill sg descriptors - pages[1..n] */
@@ -385,7 +396,9 @@ void ionic_rx_fill(struct ionic_queue *q) 
				return;

			}

			sg_elem->addr = cpu_to_le64(page_info->dma_addr);

			sg_elem->len = cpu_to_le16(PAGE_SIZE);

			seg_len = min_t(unsigned int, PAGE_SIZE, remain_len);

			sg_elem->len = cpu_to_le16(seg_len);

			remain_len -= seg_len;

			page_info++;

		}