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

Commit 2d7edb92 authored by Malli Chilakala's avatar Malli Chilakala Committed by Jeff Garzik
Browse files

[PATCH] e1000:82573 specific code & packet split code 



82573 specific code & packet split code

Signed-off-by: default avatarMallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
Signed-off-by: default avatarGanesh Venkatesan <ganesh.venkatesan@intel.com>
Signed-off-by: default avatarJohn Ronciak <john.ronciak@intel.com>
diff -up net-drivers-2.6/drivers/net/e1000/e1000.h net-drivers-2.6/drivers/net/e1000.new/e1000.h
parent f0d11ed0

drivers/net/e1000/e1000.h

+26 −0
Original line number Diff line number Diff line
@@ -112,6 +112,8 @@ struct e1000_adapter; 
#define E1000_MAX_82544_RXD               4096



/* Supported Rx Buffer Sizes */

#define E1000_RXBUFFER_128   128    /* Used for packet split */

#define E1000_RXBUFFER_256   256    /* Used for packet split */

#define E1000_RXBUFFER_2048  2048

#define E1000_RXBUFFER_4096  4096

#define E1000_RXBUFFER_8192  8192
@@ -146,6 +148,10 @@ struct e1000_adapter; 
#define E1000_MASTER_SLAVE	e1000_ms_hw_default

#endif



#define E1000_MNG_VLAN_NONE -1

/* Number of packet split data buffers (not including the header buffer) */

#define PS_PAGE_BUFFERS MAX_PS_BUFFERS-1



/* only works for sizes that are powers of 2 */

#define E1000_ROUNDUP(i, size) ((i) = (((i) + (size) - 1) & ~((size) - 1)))
@@ -159,6 +165,9 @@ struct e1000_buffer { 
	uint16_t next_to_watch;

};



struct e1000_ps_page { struct page *ps_page[MAX_PS_BUFFERS]; };

struct e1000_ps_page_dma { uint64_t ps_page_dma[MAX_PS_BUFFERS]; };



struct e1000_desc_ring {

	/* pointer to the descriptor ring memory */

	void *desc;
@@ -174,12 +183,19 @@ struct e1000_desc_ring { 
	unsigned int next_to_clean;

	/* array of buffer information structs */

	struct e1000_buffer *buffer_info;

	/* arrays of page information for packet split */

	struct e1000_ps_page *ps_page;

	struct e1000_ps_page_dma *ps_page_dma;

};



#define E1000_DESC_UNUSED(R) \

	((((R)->next_to_clean > (R)->next_to_use) ? 0 : (R)->count) + \

	(R)->next_to_clean - (R)->next_to_use - 1)



#define E1000_RX_DESC_PS(R, i)	    \

	(&(((union e1000_rx_desc_packet_split *)((R).desc))[i]))

#define E1000_RX_DESC_EXT(R, i)	    \

	(&(((union e1000_rx_desc_extended *)((R).desc))[i]))

#define E1000_GET_DESC(R, i, type)	(&(((struct type *)((R).desc))[i]))

#define E1000_RX_DESC(R, i)		E1000_GET_DESC(R, i, e1000_rx_desc)

#define E1000_TX_DESC(R, i)		E1000_GET_DESC(R, i, e1000_tx_desc)
@@ -192,6 +208,7 @@ struct e1000_adapter { 
	struct timer_list watchdog_timer;

	struct timer_list phy_info_timer;

	struct vlan_group *vlgrp;

    	uint16_t mng_vlan_id;

	uint32_t bd_number;

	uint32_t rx_buffer_len;

	uint32_t part_num;
@@ -228,14 +245,23 @@ struct e1000_adapter { 
	boolean_t detect_tx_hung;



	/* RX */

#ifdef CONFIG_E1000_NAPI

	boolean_t (*clean_rx) (struct e1000_adapter *adapter, int *work_done,

			  int work_to_do);

#else

	boolean_t (*clean_rx) (struct e1000_adapter *adapter);

#endif

	void (*alloc_rx_buf) (struct e1000_adapter *adapter);

	struct e1000_desc_ring rx_ring;

	uint64_t hw_csum_err;

	uint64_t hw_csum_good;

	uint32_t rx_int_delay;

	uint32_t rx_abs_int_delay;

	boolean_t rx_csum;

	boolean_t rx_ps;

	uint32_t gorcl;

	uint64_t gorcl_old;

	uint16_t rx_ps_bsize0;



	/* Interrupt Throttle Rate */

	uint32_t itr;

drivers/net/e1000/e1000_hw.c

+1670 −462

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/e1000/e1000_hw.h

+546 −22

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/e1000/e1000_main.c

+691 −113

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/e1000/e1000_osdep.h

+23 −0
Original line number Diff line number Diff line
@@ -101,6 +101,29 @@ typedef enum { 
        (((a)->mac_type >= e1000_82543) ? E1000_##reg : E1000_82542_##reg) + \

        ((offset) << 2)))



#define E1000_READ_REG_ARRAY_DWORD E1000_READ_REG_ARRAY

#define E1000_WRITE_REG_ARRAY_DWORD E1000_WRITE_REG_ARRAY



#define E1000_WRITE_REG_ARRAY_WORD(a, reg, offset, value) ( \

    writew((value), ((a)->hw_addr + \

        (((a)->mac_type >= e1000_82543) ? E1000_##reg : E1000_82542_##reg) + \

        ((offset) << 1))))



#define E1000_READ_REG_ARRAY_WORD(a, reg, offset) ( \

    readw((a)->hw_addr + \

        (((a)->mac_type >= e1000_82543) ? E1000_##reg : E1000_82542_##reg) + \

        ((offset) << 1)))



#define E1000_WRITE_REG_ARRAY_BYTE(a, reg, offset, value) ( \

    writeb((value), ((a)->hw_addr + \

        (((a)->mac_type >= e1000_82543) ? E1000_##reg : E1000_82542_##reg) + \

        (offset))))



#define E1000_READ_REG_ARRAY_BYTE(a, reg, offset) ( \

    readb((a)->hw_addr + \

        (((a)->mac_type >= e1000_82543) ? E1000_##reg : E1000_82542_##reg) + \

        (offset)))



#define E1000_WRITE_FLUSH(a) E1000_READ_REG(a, STATUS)



#endif /* _E1000_OSDEP_H_ */