Commit 61db421d authored by Shannon Nelson's avatar Shannon Nelson Committed by David S. Miller
Browse files

ionic: link in the new hw timestamp code 



These are changes to compile and link the new code, but no
new feature support is available or advertised yet.

Signed-off-by: default avatarAllen Hubbe <allenbh@pensando.io>
Signed-off-by: default avatarShannon Nelson <snelson@pensando.io>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fee6efce

drivers/net/ethernet/pensando/ionic/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -6,3 +6,4 @@ obj-$(CONFIG_IONIC) := ionic.o 
ionic-y := ionic_main.o ionic_bus_pci.o ionic_devlink.o ionic_dev.o \

	   ionic_debugfs.o ionic_lif.o ionic_rx_filter.o ionic_ethtool.o \

	   ionic_txrx.o ionic_stats.o ionic_fw.o

ionic-$(CONFIG_PTP_1588_CLOCK) += ionic_phc.o

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

+4 −0
Original line number Diff line number Diff line
@@ -20,6 +20,10 @@ struct ionic_lif; 


#define DEVCMD_TIMEOUT  10



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

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

#define SCALED_PPM		(1000000ull << 16)  /* 2^16 million parts per 2^16 million */



struct ionic_vf {

	u16	 index;

	u8	 macaddr[6];

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

+2 −0
Original line number Diff line number Diff line
@@ -79,6 +79,8 @@ int ionic_dev_setup(struct ionic *ionic) 
	idev->intr_status = bar->vaddr + IONIC_BAR0_INTR_STATUS_OFFSET;

	idev->intr_ctrl = bar->vaddr + IONIC_BAR0_INTR_CTRL_OFFSET;



	idev->hwstamp_regs = &idev->dev_info_regs->hwstamp;



	sig = ioread32(&idev->dev_info_regs->signature);

	if (sig != IONIC_DEV_INFO_SIGNATURE) {

		dev_err(dev, "Incompatible firmware signature %x", sig);

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

+1 −0
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ struct ionic_devinfo { 
struct ionic_dev {

	union ionic_dev_info_regs __iomem *dev_info_regs;

	union ionic_dev_cmd_regs __iomem *dev_cmd_regs;

	struct ionic_hwstamp_regs __iomem *hwstamp_regs;



	atomic_long_t last_check_time;

	unsigned long last_hb_time;

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

+25 −0
Original line number Diff line number Diff line
@@ -830,6 +830,31 @@ static int ionic_lif_rxq_init(struct ionic_lif *lif, struct ionic_qcq *qcq) 
	return 0;

}



int ionic_lif_create_hwstamp_txq(struct ionic_lif *lif)

{

	return 0;

}



int ionic_lif_create_hwstamp_rxq(struct ionic_lif *lif)

{

	return 0;

}



int ionic_lif_config_hwstamp_rxq_all(struct ionic_lif *lif, bool rx_all)

{

	return 0;

}



int ionic_lif_set_hwstamp_txmode(struct ionic_lif *lif, u16 txstamp_mode)

{

	return 0;

}



int ionic_lif_set_hwstamp_rxfilt(struct ionic_lif *lif, u64 pkt_class)

{

	return 0;

}



static bool ionic_notifyq_service(struct ionic_cq *cq,

				  struct ionic_cq_info *cq_info)

{