Skip to content

Commit 124d770

Browse files
Toshiharu Okadadavem330
authored andcommitted
pch_gbe: added the process of FIFO over run error
This patch added the processing which should be done to hardware, when a FIFO over run error occurred. Signed-off-by: Toshiharu Okada <toshiharu-linux@dsn.okisemi.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 5229d87 commit 124d770

File tree

2 files changed

+179
-104
lines changed

2 files changed

+179
-104
lines changed

drivers/net/pch_gbe/pch_gbe.h

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@ struct pch_gbe_regs {
127127

128128
/* Reset */
129129
#define PCH_GBE_ALL_RST 0x80000000 /* All reset */
130-
#define PCH_GBE_TX_RST 0x40000000 /* TX MAC, TX FIFO, TX DMA reset */
131-
#define PCH_GBE_RX_RST 0x04000000 /* RX MAC, RX FIFO, RX DMA reset */
130+
#define PCH_GBE_TX_RST 0x00008000 /* TX MAC, TX FIFO, TX DMA reset */
131+
#define PCH_GBE_RX_RST 0x00004000 /* RX MAC, RX FIFO, RX DMA reset */
132132

133133
/* TCP/IP Accelerator Control */
134134
#define PCH_GBE_EX_LIST_EN 0x00000008 /* External List Enable */
@@ -276,6 +276,9 @@ struct pch_gbe_regs {
276276
#define PCH_GBE_RX_DMA_EN 0x00000002 /* Enables Receive DMA */
277277
#define PCH_GBE_TX_DMA_EN 0x00000001 /* Enables Transmission DMA */
278278

279+
/* RX DMA STATUS */
280+
#define PCH_GBE_IDLE_CHECK 0xFFFFFFFE
281+
279282
/* Wake On LAN Status */
280283
#define PCH_GBE_WLS_BR 0x00000008 /* Broadcas Address */
281284
#define PCH_GBE_WLS_MLT 0x00000004 /* Multicast Address */
@@ -471,6 +474,7 @@ struct pch_gbe_tx_desc {
471474
struct pch_gbe_buffer {
472475
struct sk_buff *skb;
473476
dma_addr_t dma;
477+
unsigned char *rx_buffer;
474478
unsigned long time_stamp;
475479
u16 length;
476480
bool mapped;
@@ -511,6 +515,9 @@ struct pch_gbe_tx_ring {
511515
struct pch_gbe_rx_ring {
512516
struct pch_gbe_rx_desc *desc;
513517
dma_addr_t dma;
518+
unsigned char *rx_buff_pool;
519+
dma_addr_t rx_buff_pool_logic;
520+
unsigned int rx_buff_pool_size;
514521
unsigned int size;
515522
unsigned int count;
516523
unsigned int next_to_use;
@@ -622,6 +629,7 @@ struct pch_gbe_adapter {
622629
unsigned long rx_buffer_len;
623630
unsigned long tx_queue_len;
624631
bool have_msi;
632+
bool rx_stop_flag;
625633
};
626634

627635
extern const char pch_driver_version[];

0 commit comments

Comments
 (0)