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

Merge branch 'ionic-updates' 



Shannon Nelson says:

====================
ionic updates

These are a few of the driver updates we've been working on internally.
These clean up a few mismatched struct comments, add checking for dead
firmware, fix an initialization bug, and change the Rx buffer management.

These are based on net-next v5.4-rc3-709-g985fd98ab5cc.

v2: clear napi->skb in the error case in ionic_rx_frags()
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e4b5c7a5 63ad1cd6

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -12,7 +12,7 @@ struct ionic_lif; 




#define IONIC_DRV_NAME		"ionic"

#define IONIC_DRV_NAME		"ionic"

#define IONIC_DRV_DESCRIPTION	"Pensando Ethernet NIC Driver"

#define IONIC_DRV_DESCRIPTION	"Pensando Ethernet NIC Driver"

#define IONIC_DRV_VERSION	"0.15.0-k"

#define IONIC_DRV_VERSION	"0.18.0-k"





#define PCI_VENDOR_ID_PENSANDO			0x1dd8

#define PCI_VENDOR_ID_PENSANDO			0x1dd8
@@ -46,6 +46,8 @@ struct ionic { 
	DECLARE_BITMAP(intrs, IONIC_INTR_CTRL_REGS_MAX);

	DECLARE_BITMAP(intrs, IONIC_INTR_CTRL_REGS_MAX);

	struct work_struct nb_work;

	struct work_struct nb_work;

	struct notifier_block nb;

	struct notifier_block nb;

	struct timer_list watchdog_timer;

	int watchdog_period;

};

};





struct ionic_admin_ctx {

struct ionic_admin_ctx {

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

+59 −1
Original line number Original line Diff line number Diff line
@@ -11,6 +11,16 @@ 
#include "ionic_dev.h"

#include "ionic_dev.h"

#include "ionic_lif.h"

#include "ionic_lif.h"





static void ionic_watchdog_cb(struct timer_list *t)

{

	struct ionic *ionic = from_timer(ionic, t, watchdog_timer);



	mod_timer(&ionic->watchdog_timer,

		  round_jiffies(jiffies + ionic->watchdog_period));



	ionic_heartbeat_check(ionic);

}



void ionic_init_devinfo(struct ionic *ionic)

void ionic_init_devinfo(struct ionic *ionic)

{

{

	struct ionic_dev *idev = &ionic->idev;

	struct ionic_dev *idev = &ionic->idev;
@@ -72,6 +82,11 @@ int ionic_dev_setup(struct ionic *ionic) 
		return -EFAULT;

		return -EFAULT;

	}

	}





	timer_setup(&ionic->watchdog_timer, ionic_watchdog_cb, 0);

	ionic->watchdog_period = IONIC_WATCHDOG_SECS * HZ;

	mod_timer(&ionic->watchdog_timer,

		  round_jiffies(jiffies + ionic->watchdog_period));



	idev->db_pages = bar->vaddr;

	idev->db_pages = bar->vaddr;

	idev->phy_db_pages = bar->bus_addr;

	idev->phy_db_pages = bar->bus_addr;
@@ -80,10 +95,53 @@ int ionic_dev_setup(struct ionic *ionic) 




void ionic_dev_teardown(struct ionic *ionic)

void ionic_dev_teardown(struct ionic *ionic)

{

{

	/* place holder */

	del_timer_sync(&ionic->watchdog_timer);

}

}





/* Devcmd Interface */

/* Devcmd Interface */

int ionic_heartbeat_check(struct ionic *ionic)

{

	struct ionic_dev *idev = &ionic->idev;

	unsigned long hb_time;

	u32 fw_status;

	u32 hb;



	/* wait a little more than one second before testing again */

	hb_time = jiffies;

	if (time_before(hb_time, (idev->last_hb_time + ionic->watchdog_period)))

		return 0;



	/* firmware is useful only if fw_status is non-zero */

	fw_status = ioread32(&idev->dev_info_regs->fw_status);

	if (!fw_status)

		return -ENXIO;



	/* early FW has no heartbeat, else FW will return non-zero */

	hb = ioread32(&idev->dev_info_regs->fw_heartbeat);

	if (!hb)

		return 0;



	/* are we stalled? */

	if (hb == idev->last_hb) {

		/* only complain once for each stall seen */

		if (idev->last_hb_time != 1) {

			dev_info(ionic->dev, "FW heartbeat stalled at %d\n",

				 idev->last_hb);

			idev->last_hb_time = 1;

		}



		return -ENXIO;

	}



	if (idev->last_hb_time == 1)

		dev_info(ionic->dev, "FW heartbeat restored at %d\n", hb);



	idev->last_hb = hb;

	idev->last_hb_time = hb_time;



	return 0;

}



u8 ionic_dev_cmd_status(struct ionic_dev *idev)

u8 ionic_dev_cmd_status(struct ionic_dev *idev)

{

{

	return ioread8(&idev->dev_cmd_regs->comp.comp.status);

	return ioread8(&idev->dev_cmd_regs->comp.comp.status);

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

+12 −0
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ 
#define IONIC_MIN_TXRX_DESC		16

#define IONIC_MIN_TXRX_DESC		16

#define IONIC_DEF_TXRX_DESC		4096

#define IONIC_DEF_TXRX_DESC		4096

#define IONIC_LIFS_MAX			1024

#define IONIC_LIFS_MAX			1024

#define IONIC_WATCHDOG_SECS		5

#define IONIC_ITR_COAL_USEC_DEFAULT	64

#define IONIC_ITR_COAL_USEC_DEFAULT	64





#define IONIC_DEV_CMD_REG_VERSION	1

#define IONIC_DEV_CMD_REG_VERSION	1
@@ -123,6 +124,9 @@ struct ionic_dev { 
	union ionic_dev_info_regs __iomem *dev_info_regs;

	union ionic_dev_info_regs __iomem *dev_info_regs;

	union ionic_dev_cmd_regs __iomem *dev_cmd_regs;

	union ionic_dev_cmd_regs __iomem *dev_cmd_regs;





	unsigned long last_hb_time;

	u32 last_hb;



	u64 __iomem *db_pages;

	u64 __iomem *db_pages;

	dma_addr_t phy_db_pages;

	dma_addr_t phy_db_pages;
@@ -151,12 +155,19 @@ typedef void (*ionic_desc_cb)(struct ionic_queue *q, 
			      struct ionic_desc_info *desc_info,

			      struct ionic_desc_info *desc_info,

			      struct ionic_cq_info *cq_info, void *cb_arg);

			      struct ionic_cq_info *cq_info, void *cb_arg);





struct ionic_page_info {

	struct page *page;

	dma_addr_t dma_addr;

};



struct ionic_desc_info {

struct ionic_desc_info {

	void *desc;

	void *desc;

	void *sg_desc;

	void *sg_desc;

	struct ionic_desc_info *next;

	struct ionic_desc_info *next;

	unsigned int index;

	unsigned int index;

	unsigned int left;

	unsigned int left;

	unsigned int npages;

	struct ionic_page_info pages[IONIC_RX_MAX_SG_ELEMS + 1];

	ionic_desc_cb cb;

	ionic_desc_cb cb;

	void *cb_arg;

	void *cb_arg;

};

};
@@ -295,5 +306,6 @@ void ionic_q_post(struct ionic_queue *q, bool ring_doorbell, ionic_desc_cb cb, 
void ionic_q_rewind(struct ionic_queue *q, struct ionic_desc_info *start);

void ionic_q_rewind(struct ionic_queue *q, struct ionic_desc_info *start);

void ionic_q_service(struct ionic_queue *q, struct ionic_cq_info *cq_info,

void ionic_q_service(struct ionic_queue *q, struct ionic_cq_info *cq_info,

		     unsigned int stop_index);

		     unsigned int stop_index);

int ionic_heartbeat_check(struct ionic *ionic);





#endif /* _IONIC_DEV_H_ */
 
#endif /* _IONIC_DEV_H_ */

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

+98 −98

File changed.

Preview size limit exceeded, changes collapsed.

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

+7 −4

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE