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

Merge branch 'thunderx-next' 



Sunil Goutham says:

====================
net: thunderx: Support for newer chips and miscellaneous patches

This patch series adds support for VNIC on 81xx and 83xx SOCs.
81xx/83xx is different from 88xx in terms of capabilities and new type
of interfaces supported (eg: QSGMII, RGMII) and have DLMs instead of
QLMs which allows single BGX to have interfaces of different LMAC types.

Also included some patches which are common for all 88xx/81xx/83xx
SOCs like using netdev's name while registering irqs, reset receive
queue stats and some changes to use standard API for split buffer Rx
packets, generating RSS key e.t.c

PS: Most of the patches were submitted earlier under different series but
for some reason were not picked up by patchwork. Since new patches have been
added in the meantime, resubmitting all as a new patchset.

Changes from v1:
- Incorporated Yuval Mintz's suggestion to use generic API to set minimum
  queue count i.e by using netif_get_num_default_rss_queues().
- Resolved a compilation issue reported by test robot while compiling
  patch 'Add support for 16 LMACs of 83xx'
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2ce66f9c 93db2cf8

drivers/net/ethernet/cavium/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -36,10 +36,20 @@ config THUNDER_NIC_BGX 
	depends on 64BIT

	select PHYLIB

	select MDIO_THUNDER

	select THUNDER_NIC_RGX

	---help---

	  This driver supports programming and controlling of MAC

	  interface from NIC physical function driver.



config	THUNDER_NIC_RGX

	tristate "Thunder MAC interface driver (RGX)"

	depends on 64BIT

	select PHYLIB

	select MDIO_THUNDER

	---help---

	  This driver supports configuring XCV block of RGX interface

	  present on CN81XX chip.



config LIQUIDIO

	tristate "Cavium LiquidIO support"

	depends on 64BIT

drivers/net/ethernet/cavium/thunder/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
# Makefile for Cavium's Thunder ethernet device

#



obj-$(CONFIG_THUNDER_NIC_RGX) += thunder_xcv.o

obj-$(CONFIG_THUNDER_NIC_BGX) += thunder_bgx.o

obj-$(CONFIG_THUNDER_NIC_PF) += nicpf.o

obj-$(CONFIG_THUNDER_NIC_VF) += nicvf.o

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

+49 −36
Original line number Diff line number Diff line
@@ -20,6 +20,17 @@ 
#define	PCI_DEVICE_ID_THUNDER_NIC_VF		0xA034

#define	PCI_DEVICE_ID_THUNDER_BGX		0xA026



/* Subsystem device IDs */

#define PCI_SUBSYS_DEVID_88XX_NIC_PF		0xA11E

#define PCI_SUBSYS_DEVID_81XX_NIC_PF		0xA21E

#define PCI_SUBSYS_DEVID_83XX_NIC_PF		0xA31E



#define PCI_SUBSYS_DEVID_88XX_PASS1_NIC_VF	0xA11E

#define PCI_SUBSYS_DEVID_88XX_NIC_VF		0xA134

#define PCI_SUBSYS_DEVID_81XX_NIC_VF		0xA234

#define PCI_SUBSYS_DEVID_83XX_NIC_VF		0xA334





/* PCI BAR nos */

#define	PCI_CFG_REG_BAR_NUM		0

#define	PCI_MSIX_REG_BAR_NUM		4
@@ -41,40 +52,8 @@ 
/* Max pkinds */

#define	NIC_MAX_PKIND			16



/* Rx Channels */

/* Receive channel configuration in TNS bypass mode

 * Below is configuration in TNS bypass mode

 * BGX0-LMAC0-CHAN0 - VNIC CHAN0

 * BGX0-LMAC1-CHAN0 - VNIC CHAN16

 * ...

 * BGX1-LMAC0-CHAN0 - VNIC CHAN128

 * ...

 * BGX1-LMAC3-CHAN0 - VNIC CHAN174

 */

#define	NIC_INTF_COUNT			2  /* Interfaces btw VNIC and TNS/BGX */

#define	NIC_CHANS_PER_INF		128

#define	NIC_MAX_CHANS			(NIC_INTF_COUNT * NIC_CHANS_PER_INF)

#define	NIC_CPI_COUNT			2048 /* No of channel parse indices */



/* TNS bypass mode: 1-1 mapping between VNIC and BGX:LMAC */

#define NIC_MAX_BGX			MAX_BGX_PER_CN88XX

#define	NIC_CPI_PER_BGX			(NIC_CPI_COUNT / NIC_MAX_BGX)

#define	NIC_MAX_CPI_PER_LMAC		64 /* Max when CPI_ALG is IP diffserv */

#define	NIC_RSSI_PER_BGX		(NIC_RSSI_COUNT / NIC_MAX_BGX)



/* Tx scheduling */

#define	NIC_MAX_TL4			1024

#define	NIC_MAX_TL4_SHAPERS		256 /* 1 shaper for 4 TL4s */

#define	NIC_MAX_TL3			256

#define	NIC_MAX_TL3_SHAPERS		64  /* 1 shaper for 4 TL3s */

#define	NIC_MAX_TL2			64

#define	NIC_MAX_TL2_SHAPERS		2  /* 1 shaper for 32 TL2s */

#define	NIC_MAX_TL1			2



/* TNS bypass mode */

#define	NIC_TL2_PER_BGX			32

#define	NIC_TL4_PER_BGX			(NIC_MAX_TL4 / NIC_MAX_BGX)

#define	NIC_TL4_PER_LMAC		(NIC_MAX_TL4 / NIC_CHANS_PER_INF)

/* Max when CPI_ALG is IP diffserv */

#define	NIC_MAX_CPI_PER_LMAC		64



/* NIC VF Interrupts */

#define	NICVF_INTR_CQ			0
@@ -148,7 +127,6 @@ struct nicvf_cq_poll { 
	struct	napi_struct napi;

};



#define	NIC_RSSI_COUNT			4096 /* Total no of RSS indices */

#define NIC_MAX_RSS_HASH_BITS		8

#define NIC_MAX_RSS_IDR_TBL_SIZE	(1 << NIC_MAX_RSS_HASH_BITS)

#define RSS_HASH_KEY_SIZE		5 /* 320 bit key */
@@ -273,6 +251,7 @@ struct nicvf { 
	struct net_device	*netdev;

	struct pci_dev		*pdev;

	void __iomem		*reg_base;

#define	MAX_QUEUES_PER_QSET			8

	struct queue_set	*qs;

	struct nicvf_cq_poll	*napi[8];

	u8			vf_id;
@@ -368,6 +347,7 @@ struct nicvf { 
#define	NIC_MBOX_MSG_PNICVF_PTR		0x14	/* Get primary qset nicvf ptr */

#define	NIC_MBOX_MSG_SNICVF_PTR		0x15	/* Send sqet nicvf ptr to PVF */

#define	NIC_MBOX_MSG_LOOPBACK		0x16	/* Set interface in loopback */

#define	NIC_MBOX_MSG_RESET_STAT_COUNTER 0x17	/* Reset statistics counters */

#define	NIC_MBOX_MSG_CFG_DONE		0xF0	/* VF configuration done */

#define	NIC_MBOX_MSG_SHUTDOWN		0xF1	/* VF is being shutdown */
@@ -484,6 +464,31 @@ struct set_loopback { 
	bool  enable;

};



/* Reset statistics counters */

struct reset_stat_cfg {

	u8    msg;

	/* Bitmap to select NIC_PF_VNIC(vf_id)_RX_STAT(0..13) */

	u16   rx_stat_mask;

	/* Bitmap to select NIC_PF_VNIC(vf_id)_TX_STAT(0..4) */

	u8    tx_stat_mask;

	/* Bitmap to select NIC_PF_QS(0..127)_RQ(0..7)_STAT(0..1)

	 * bit14, bit15 NIC_PF_QS(vf_id)_RQ7_STAT(0..1)

	 * bit12, bit13 NIC_PF_QS(vf_id)_RQ6_STAT(0..1)

	 * ..

	 * bit2, bit3 NIC_PF_QS(vf_id)_RQ1_STAT(0..1)

	 * bit0, bit1 NIC_PF_QS(vf_id)_RQ0_STAT(0..1)

	 */

	u16   rq_stat_mask;

	/* Bitmap to select NIC_PF_QS(0..127)_SQ(0..7)_STAT(0..1)

	 * bit14, bit15 NIC_PF_QS(vf_id)_SQ7_STAT(0..1)

	 * bit12, bit13 NIC_PF_QS(vf_id)_SQ6_STAT(0..1)

	 * ..

	 * bit2, bit3 NIC_PF_QS(vf_id)_SQ1_STAT(0..1)

	 * bit0, bit1 NIC_PF_QS(vf_id)_SQ0_STAT(0..1)

	 */

	u16   sq_stat_mask;

};



/* 128 bit shared memory between PF and each VF */

union nic_mbx {

	struct { u8 msg; }	msg;
@@ -501,6 +506,7 @@ union nic_mbx { 
	struct sqs_alloc        sqs_alloc;

	struct nicvf_ptr	nicvf;

	struct set_loopback	lbk;

	struct reset_stat_cfg	reset_stat;

};



#define NIC_NODE_ID_MASK	0x03
@@ -514,7 +520,14 @@ static inline int nic_get_node_id(struct pci_dev *pdev) 


static inline bool pass1_silicon(struct pci_dev *pdev)

{

	return pdev->revision < 8;

	return (pdev->revision < 8) &&

		(pdev->subsystem_device == PCI_SUBSYS_DEVID_88XX_NIC_PF);

}



static inline bool pass2_silicon(struct pci_dev *pdev)

{

	return (pdev->revision >= 8) &&

		(pdev->subsystem_device == PCI_SUBSYS_DEVID_88XX_NIC_PF);

}



int nicvf_set_real_num_queues(struct net_device *netdev,

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

+347 −86

File changed.

Preview size limit exceeded, changes collapsed.

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

+15 −0

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE