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

Commit 572c526f authored by Ron Mercer's avatar Ron Mercer Committed by David S. Miller
Browse files

qlge: Turn on RX header split based on platform. 



Using 4-byte aligned headers is problematic for some architectures.
Since qlge uses 4-byte aligned rx buffers we split headers for these
architectures into a separate buffer and then recopy to align on 2-byte boundary.

Signed-off-by: default avatarRon Mercer <ron.mercer@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c36531b9

drivers/net/qlge/qlge.h

+15 −4
Original line number Diff line number Diff line
@@ -54,12 +54,8 @@ 
#define RX_RING_SHADOW_SPACE	(sizeof(u64) + \

		MAX_DB_PAGES_PER_BQ(NUM_SMALL_BUFFERS) * sizeof(u64) + \

		MAX_DB_PAGES_PER_BQ(NUM_LARGE_BUFFERS) * sizeof(u64))

#define SMALL_BUFFER_SIZE 512

#define SMALL_BUF_MAP_SIZE (SMALL_BUFFER_SIZE / 2)

#define LARGE_BUFFER_MAX_SIZE 8192

#define LARGE_BUFFER_MIN_SIZE 2048

#define MAX_SPLIT_SIZE 1023

#define QLGE_SB_PAD 32



#define MAX_CQ 128

#define DFLT_COALESCE_WAIT 100	/* 100 usec wait for coalescing */
@@ -737,6 +733,21 @@ enum { 
	PRB_MX_DATA = 0xfc,	/* Use semaphore */

};



#ifdef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS

#define SMALL_BUFFER_SIZE 256

#define SMALL_BUF_MAP_SIZE SMALL_BUFFER_SIZE

#define SPLT_SETTING  FSC_DBRST_1024

#define SPLT_LEN 0

#define QLGE_SB_PAD 0

#else

#define SMALL_BUFFER_SIZE 512

#define SMALL_BUF_MAP_SIZE (SMALL_BUFFER_SIZE / 2)

#define SPLT_SETTING  FSC_SH

#define SPLT_LEN (SPLT_HDR_EP | \

	min(SMALL_BUF_MAP_SIZE, 1023))

#define QLGE_SB_PAD 32

#endif



/*

 * CAM output format.

 */

drivers/net/qlge/qlge_main.c

+3 −3
Original line number Diff line number Diff line
@@ -3332,15 +3332,15 @@ static int ql_adapter_initialize(struct ql_adapter *qdev) 


	/* Enable the function, set pagesize, enable error checking. */

	value = FSC_FE | FSC_EPC_INBOUND | FSC_EPC_OUTBOUND |

	    FSC_EC | FSC_VM_PAGE_4K | FSC_SH;

	    FSC_EC | FSC_VM_PAGE_4K;

	value |= SPLT_SETTING;



	/* Set/clear header splitting. */

	mask = FSC_VM_PAGESIZE_MASK |

	    FSC_DBL_MASK | FSC_DBRST_MASK | (value << 16);

	ql_write32(qdev, FSC, mask | value);



	ql_write32(qdev, SPLT_HDR, SPLT_HDR_EP |

		min(SMALL_BUF_MAP_SIZE, MAX_SPLIT_SIZE));

	ql_write32(qdev, SPLT_HDR, SPLT_LEN);



	/* Set RX packet routing to use port/pci function on which the

	 * packet arrived on in addition to usual frame routing.