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

Merge branch 'amd-xgbe-updates' 



Tom Lendacky says:

====================
amd-xgbe: AMD XGBE driver updates 2016-11-03

This patch series is targeted at preparing the driver for a new PCI version
of the hardware.  After this series is applied, a follow-on series will
introduce the support for the PCI version of the hardware.

The following updates and fixes are included in this driver update series:

- Fix formatting of PCS debug register dump
- Prepare for priority-based FIFO allocation
- Implement priority-based FIFO allocation
- Prepare for working with more than one type of PCS/PHY
- Prepare for the introduction of clause 37 auto-negotiation
- Add support for clause 37 auto-negotiation
- Prepare for supporting a new PCS register access method
- Add support for 64-bit management counter registers
- Update DMA channel status determination
- Prepare for supporting PCI devices in addition to platform devices

This patch series is based on net-next.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 4fb74506 bd8255d8

drivers/net/ethernet/amd/xgbe/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -2,7 +2,9 @@ obj-$(CONFIG_AMD_XGBE) += amd-xgbe.o 


amd-xgbe-objs := xgbe-main.o xgbe-drv.o xgbe-dev.o \

		 xgbe-desc.o xgbe-ethtool.o xgbe-mdio.o \

		 xgbe-ptp.o

		 xgbe-ptp.o \

		 xgbe-phy-v1.o \

		 xgbe-platform.o



amd-xgbe-$(CONFIG_AMD_XGBE_DCB) += xgbe-dcb.o

amd-xgbe-$(CONFIG_DEBUG_FS) += xgbe-debugfs.o

drivers/net/ethernet/amd/xgbe/xgbe-common.h

+61 −10
Original line number Diff line number Diff line
@@ -790,6 +790,10 @@ 
#define MTL_Q_RQOMR_RSF_WIDTH		1

#define MTL_Q_RQOMR_RTC_INDEX		0

#define MTL_Q_RQOMR_RTC_WIDTH		2

#define MTL_Q_TQDR_TRCSTS_INDEX		1

#define MTL_Q_TQDR_TRCSTS_WIDTH		2

#define MTL_Q_TQDR_TXQSTS_INDEX		4

#define MTL_Q_TQDR_TXQSTS_WIDTH		1

#define MTL_Q_TQOMR_FTQ_INDEX		0

#define MTL_Q_TQOMR_FTQ_WIDTH		1

#define MTL_Q_TQOMR_Q2TCMAP_INDEX	8
@@ -852,14 +856,9 @@ 
#define MTL_TSA_SP			0x00

#define MTL_TSA_ETS			0x02



/* PCS MMD select register offset

 *  The MMD select register is used for accessing PCS registers

 *  when the underlying APB3 interface is using indirect addressing.

 *  Indirect addressing requires accessing registers in two phases,

 *  an address phase and a data phase.  The address phases requires

 *  writing an address selection value to the MMD select regiesters.

 */

#define PCS_MMD_SELECT			0xff

/* PCS register offsets */

#define PCS_V1_WINDOW_SELECT		0x03fc

#define PCS_V2_WINDOW_SELECT		0x9064



/* SerDes integration register offsets */

#define SIR0_KR_RT_1			0x002c
@@ -1027,6 +1026,10 @@ 
#define MDIO_PMA_10GBR_FECCTRL		0x00ab

#endif



#ifndef MDIO_PCS_DIG_CTRL

#define MDIO_PCS_DIG_CTRL		0x8000

#endif



#ifndef MDIO_AN_XNP

#define MDIO_AN_XNP			0x0016

#endif
@@ -1047,11 +1050,40 @@ 
#define MDIO_AN_INT			0x8002

#endif



#ifndef MDIO_VEND2_AN_ADVERTISE

#define MDIO_VEND2_AN_ADVERTISE		0x0004

#endif



#ifndef MDIO_VEND2_AN_LP_ABILITY

#define MDIO_VEND2_AN_LP_ABILITY	0x0005

#endif



#ifndef MDIO_VEND2_AN_CTRL

#define MDIO_VEND2_AN_CTRL		0x8001

#endif



#ifndef MDIO_VEND2_AN_STAT

#define MDIO_VEND2_AN_STAT		0x8002

#endif



#ifndef MDIO_CTRL1_SPEED1G

#define MDIO_CTRL1_SPEED1G		(MDIO_CTRL1_SPEED10G & ~BMCR_SPEED100)

#endif



#ifndef MDIO_VEND2_CTRL1_AN_ENABLE

#define MDIO_VEND2_CTRL1_AN_ENABLE	BIT(12)

#endif



#ifndef MDIO_VEND2_CTRL1_AN_RESTART

#define MDIO_VEND2_CTRL1_AN_RESTART	BIT(9)

#endif



/* MDIO mask values */

#define XGBE_AN_CL73_INT_CMPLT		BIT(0)

#define XGBE_AN_CL73_INC_LINK		BIT(1)

#define XGBE_AN_CL73_PG_RCV		BIT(2)

#define XGBE_AN_CL73_INT_MASK		0x07



#define XGBE_XNP_MCF_NULL_MESSAGE	0x001

#define XGBE_XNP_ACK_PROCESSED		BIT(12)

#define XGBE_XNP_MP_FORMATTED		BIT(13)
@@ -1060,6 +1092,19 @@ 
#define XGBE_KR_TRAINING_START		BIT(0)

#define XGBE_KR_TRAINING_ENABLE		BIT(1)



#define XGBE_PCS_CL37_BP		BIT(12)



#define XGBE_AN_CL37_INT_CMPLT		BIT(0)

#define XGBE_AN_CL37_INT_MASK		0x01



#define XGBE_AN_CL37_HD_MASK		0x40

#define XGBE_AN_CL37_FD_MASK		0x20



#define XGBE_AN_CL37_PCS_MODE_MASK	0x06

#define XGBE_AN_CL37_PCS_MODE_BASEX	0x00

#define XGBE_AN_CL37_PCS_MODE_SGMII	0x04

#define XGBE_AN_CL37_TX_CONFIG_MASK	0x08



/* Bit setting and getting macros

 *  The get macro will extract the current bit field value from within

 *  the variable
@@ -1195,12 +1240,18 @@ do { \ 
/* Macros for building, reading or writing register values or bits

 * within the register values of XPCS registers.

 */

#define XPCS_IOWRITE(_pdata, _off, _val)				\

#define XPCS32_IOWRITE(_pdata, _off, _val)				\

	iowrite32(_val, (_pdata)->xpcs_regs + (_off))



#define XPCS_IOREAD(_pdata, _off)					\

#define XPCS32_IOREAD(_pdata, _off)					\

	ioread32((_pdata)->xpcs_regs + (_off))



#define XPCS16_IOWRITE(_pdata, _off, _val)				\

	iowrite16(_val, (_pdata)->xpcs_regs + (_off))



#define XPCS16_IOREAD(_pdata, _off)					\

	ioread16((_pdata)->xpcs_regs + (_off))



/* Macros for building, reading or writing register values or bits

 * within the register values of SerDes integration registers.

 */

drivers/net/ethernet/amd/xgbe/xgbe-dev.c

+617 −230

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/ethernet/amd/xgbe/xgbe-drv.c

+9 −19
Original line number Diff line number Diff line
@@ -114,7 +114,6 @@ 
 *     THE POSSIBILITY OF SUCH DAMAGE.

 */



#include <linux/platform_device.h>

#include <linux/spinlock.h>

#include <linux/tcp.h>

#include <linux/if_vlan.h>
@@ -160,18 +159,8 @@ static int xgbe_alloc_channels(struct xgbe_prv_data *pdata) 
		channel->dma_regs = pdata->xgmac_regs + DMA_CH_BASE +

				    (DMA_CH_INC * i);



		if (pdata->per_channel_irq) {

			/* Get the DMA interrupt (offset 1) */

			ret = platform_get_irq(pdata->pdev, i + 1);

			if (ret < 0) {

				netdev_err(pdata->netdev,

					   "platform_get_irq %u failed\n",

					   i + 1);

				goto err_irq;

			}



			channel->dma_irq = ret;

		}

		if (pdata->per_channel_irq)

			channel->dma_irq = pdata->channel_irq[i];



		if (i < pdata->tx_ring_count) {

			spin_lock_init(&tx_ring->lock);
@@ -194,9 +183,6 @@ static int xgbe_alloc_channels(struct xgbe_prv_data *pdata) 


	return 0;



err_irq:

	kfree(rx_ring);



err_rx_ring:

	kfree(tx_ring);
@@ -590,6 +576,10 @@ void xgbe_get_all_hw_features(struct xgbe_prv_data *pdata) 
	hw_feat->tx_ch_cnt++;

	hw_feat->tc_cnt++;



	/* Translate the fifo sizes into actual numbers */

	hw_feat->rx_fifo_size = 1 << (hw_feat->rx_fifo_size + 7);

	hw_feat->tx_fifo_size = 1 << (hw_feat->tx_fifo_size + 7);



	DBGPR("<--xgbe_get_all_hw_features\n");

}
@@ -778,7 +768,7 @@ static void xgbe_free_rx_data(struct xgbe_prv_data *pdata) 
	DBGPR("<--xgbe_free_rx_data\n");

}



static int xgbe_phy_init(struct xgbe_prv_data *pdata)

static int xgbe_phy_reset(struct xgbe_prv_data *pdata)

{

	pdata->phy_link = -1;

	pdata->phy_speed = SPEED_UNKNOWN;
@@ -1292,8 +1282,8 @@ static int xgbe_open(struct net_device *netdev) 


	DBGPR("-->xgbe_open\n");



	/* Initialize the phy */

	ret = xgbe_phy_init(pdata);

	/* Reset the phy settings */

	ret = xgbe_phy_reset(pdata);

	if (ret)

		return ret;

drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c

+1 −18
Original line number Diff line number Diff line
@@ -316,24 +316,7 @@ static int xgbe_set_settings(struct net_device *netdev, 
	}



	if (cmd->autoneg == AUTONEG_DISABLE) {

		switch (speed) {

		case SPEED_10000:

			break;

		case SPEED_2500:

			if (pdata->speed_set != XGBE_SPEEDSET_2500_10000) {

				netdev_err(netdev, "unsupported speed %u\n",

					   speed);

				return -EINVAL;

			}

			break;

		case SPEED_1000:

			if (pdata->speed_set != XGBE_SPEEDSET_1000_10000) {

				netdev_err(netdev, "unsupported speed %u\n",

					   speed);

				return -EINVAL;

			}

			break;

		default:

		if (!pdata->phy_if.phy_valid_speed(pdata, speed)) {

			netdev_err(netdev, "unsupported speed %u\n", speed);

			return -EINVAL;

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE