Commit f076f453 authored by Lendacky, Thomas's avatar Lendacky, Thomas Committed by David S. Miller
Browse files

amd-xgbe: Reported fifo size from hardware is not correct 



The fifo size reported by the hardware is not correct. Add support
to limit the reported size to what is actually present.  Also, fix
the argument types used in the fifo size calculation function.

Signed-off-by: default avatarTom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a9a4a2d9

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

+6 −2
Original line number Original line Diff line number Diff line
@@ -1706,8 +1706,8 @@ static void xgbe_config_mtl_mode(struct xgbe_prv_data *pdata) 
	XGMAC_IOWRITE_BITS(pdata, MTL_OMR, RAA, MTL_RAA_SP);

	XGMAC_IOWRITE_BITS(pdata, MTL_OMR, RAA, MTL_RAA_SP);

}

}





static unsigned int xgbe_calculate_per_queue_fifo(unsigned long fifo_size,

static unsigned int xgbe_calculate_per_queue_fifo(unsigned int fifo_size,

						  unsigned char queue_count)

						  unsigned int queue_count)

{

{

	unsigned int q_fifo_size = 0;

	unsigned int q_fifo_size = 0;

	enum xgbe_mtl_fifo_size p_fifo = XGMAC_MTL_FIFO_SIZE_256;

	enum xgbe_mtl_fifo_size p_fifo = XGMAC_MTL_FIFO_SIZE_256;
@@ -1751,6 +1751,10 @@ static unsigned int xgbe_calculate_per_queue_fifo(unsigned long fifo_size, 
		q_fifo_size = XGBE_FIFO_SIZE_KB(256);

		q_fifo_size = XGBE_FIFO_SIZE_KB(256);

		break;

		break;

	}

	}



	/* The configured value is not the actual amount of fifo RAM */

	q_fifo_size = min_t(unsigned int, XGBE_FIFO_MAX, q_fifo_size);



	q_fifo_size = q_fifo_size / queue_count;

	q_fifo_size = q_fifo_size / queue_count;





	/* Set the queue fifo size programmable value */

	/* Set the queue fifo size programmable value */

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -183,6 +183,7 @@ 
#define XGMAC_DRIVER_CONTEXT	1

#define XGMAC_DRIVER_CONTEXT	1

#define XGMAC_IOCTL_CONTEXT	2

#define XGMAC_IOCTL_CONTEXT	2





#define XGBE_FIFO_MAX		81920

#define XGBE_FIFO_SIZE_B(x)	(x)

#define XGBE_FIFO_SIZE_B(x)	(x)

#define XGBE_FIFO_SIZE_KB(x)	(x * 1024)

#define XGBE_FIFO_SIZE_KB(x)	(x * 1024)

CRA Git | Maintained and supported by SUSTech CRA and CCSE