Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'amd-xgbe-next' 



Tom Lendacky says:

====================
amd-xgbe: AMD XGBE driver updates 2014-09-03

The following series of patches includes fixes/updates to the driver.

- Query the device for the actual speed mode (KR/KX) rather than trying
  to track it
- Update parallel detection logic to support KR mode
- Fix new warnings from checkpatch in the amd-xgbe and amd-xgbe-phy
  driver

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

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e4cf0b75 b73c798b

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

+0 −11
Original line number Diff line number Diff line
@@ -271,7 +271,6 @@ 
#define DMA_PBL_X8_DISABLE		0x00

#define DMA_PBL_X8_ENABLE		0x01





/* MAC register offsets */

#define MAC_TCR				0x0000

#define MAC_RCR				0x0004
@@ -792,7 +791,6 @@ 
#define MTL_Q_DISABLED			0x00

#define MTL_Q_ENABLED			0x02





/* MTL traffic class register offsets

 *   Multiple traffic classes can be active.  The first class has registers

 *   that begin at 0x1100.  Each subsequent queue has registers that
@@ -815,7 +813,6 @@ 
#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.
@@ -825,7 +822,6 @@ 
 */

#define PCS_MMD_SELECT			0xff





/* Descriptor/Packet entry bit positions and sizes */

#define RX_PACKET_ERRORS_CRC_INDEX		2

#define RX_PACKET_ERRORS_CRC_WIDTH		1
@@ -929,7 +925,6 @@ 
#define MDIO_AN_COMP_STAT		0x0030

#endif





/* Bit setting and getting macros

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

 *  the variable
@@ -957,7 +952,6 @@ do { \ 
			      ((0x1 << (_width)) - 1)) << (_index)));	\

} while (0)





/* Bit setting and getting macros based on register fields

 *  The get macro uses the bit field definitions formed using the input

 *  names to extract the current bit field value from within the
@@ -986,7 +980,6 @@ do { \ 
		 _prefix##_##_field##_INDEX,				\

		 _prefix##_##_field##_WIDTH, (_val))





/* Macros for reading or writing registers

 *  The ioread macros will get bit fields or full values using the

 *  register definitions formed using the input names
@@ -1014,7 +1007,6 @@ do { \ 
	XGMAC_IOWRITE((_pdata), _reg, reg_val);				\

} while (0)





/* Macros for reading or writing MTL queue or traffic class registers

 *  Similar to the standard read and write macros except that the

 *  base register value is calculated by the queue or traffic class number
@@ -1041,7 +1033,6 @@ do { \ 
	XGMAC_MTL_IOWRITE((_pdata), (_n), _reg, reg_val);		\

} while (0)





/* Macros for reading or writing DMA channel registers

 *  Similar to the standard read and write macros except that the

 *  base register value is obtained from the ring
@@ -1066,7 +1057,6 @@ do { \ 
	XGMAC_DMA_IOWRITE((_channel), _reg, reg_val);			\

} while (0)





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

 * within the register values of XPCS registers.

 */
@@ -1076,7 +1066,6 @@ do { \ 
#define XPCS_IOREAD(_pdata, _off)					\

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





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

 * using MDIO.  Different from above because of the use of standardized

 * Linux include values.  No shifting is performed with the bit

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

+0 −1
Original line number Diff line number Diff line
@@ -120,7 +120,6 @@ 
#include "xgbe.h"

#include "xgbe-common.h"





static int xgbe_dcb_ieee_getets(struct net_device *netdev,

				struct ieee_ets *ets)

{

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

+0 −1
Original line number Diff line number Diff line
@@ -121,7 +121,6 @@ 
#include "xgbe.h"

#include "xgbe-common.h"





static ssize_t xgbe_common_read(char __user *buffer, size_t count,

				loff_t *ppos, unsigned int value)

{

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

+1 −5
Original line number Diff line number Diff line
@@ -117,7 +117,6 @@ 
#include "xgbe.h"

#include "xgbe-common.h"





static void xgbe_unmap_skb(struct xgbe_prv_data *, struct xgbe_ring_data *);



static void xgbe_free_ring(struct xgbe_prv_data *pdata,
@@ -524,11 +523,8 @@ static void xgbe_realloc_skb(struct xgbe_channel *channel) 


		/* Allocate skb & assign to each rdesc */

		skb = dev_alloc_skb(pdata->rx_buf_size);

		if (skb == NULL) {

			netdev_alert(pdata->netdev,

				     "failed to allocate skb\n");

		if (skb == NULL)

			break;

		}

		skb_dma = dma_map_single(pdata->dev, skb->data,

					 pdata->rx_buf_size, DMA_FROM_DEVICE);

		if (dma_mapping_error(pdata->dev, skb_dma)) {

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

+0 −1
Original line number Diff line number Diff line
@@ -122,7 +122,6 @@ 
#include "xgbe.h"

#include "xgbe-common.h"





static unsigned int xgbe_usec_to_riwt(struct xgbe_prv_data *pdata,

				      unsigned int usec)

{